diff --git a/.agents/skills/launch/SKILL.md b/.agents/skills/launch/SKILL.md
index f967f6d0c1d..20f207907ac 100644
--- a/.agents/skills/launch/SKILL.md
+++ b/.agents/skills/launch/SKILL.md
@@ -111,6 +111,30 @@ agent-browser snapshot -i
 - Code OSS uses the default user data directory. Unlike VS Code Insiders, you don't typically need `--user-data-dir` since there's usually only one Code OSS instance running.
 - If you see "Sent env to running instance. Terminating..." it means Code OSS is already running and forwarded your args to the existing instance. Quit Code OSS and relaunch with the flag, or use `--user-data-dir=/tmp/code-oss-debug` to force a new instance.
 
+## Launching the Sessions App (Agent Sessions Window)
+
+The Sessions app is a separate workbench mode launched with the `--sessions` flag. It uses a dedicated user data directory to avoid conflicts with the main Code OSS instance.
+
+```bash
+cd <repo-root>  # the root of your VS Code checkout
+./scripts/code.sh --sessions --remote-debugging-port=9224
+```
+
+Wait for the window to fully initialize, then connect:
+
+```bash
+# Wait for Sessions app to start, retry until connected
+for i in 1 2 3 4 5; do agent-browser connect 9224 2>/dev/null && break || sleep 3; done
+
+# Verify you're connected to the right target (not about:blank)
+agent-browser tab
+agent-browser snapshot -i
+```
+
+**Tips:**
+- The `--sessions` flag launches the Agent Sessions workbench instead of the standard VS Code workbench.
+- Set `VSCODE_SKIP_PRELAUNCH=1` to skip the compile step if you've already built.
+
 ## Launching VS Code Extensions for Debugging
 
 To debug a VS Code extension via agent-browser, launch VS Code Insiders with `--extensionDevelopmentPath` and `--remote-debugging-port`. Use `--user-data-dir` to avoid conflicting with an already-running instance.
diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
deleted file mode 120000
index ff807266877..00000000000
--- a/.claude/CLAUDE.md
+++ /dev/null
@@ -1 +0,0 @@
-../.github/copilot-instructions.md
\ No newline at end of file
diff --git a/.claude/skills/launch b/.claude/skills/launch
deleted file mode 120000
index b41e2b420ad..00000000000
--- a/.claude/skills/launch
+++ /dev/null
@@ -1 +0,0 @@
-../../.agents/skills/launch
\ No newline at end of file
diff --git a/.eslint-plugin-local/code-no-icons-in-localized-strings.ts b/.eslint-plugin-local/code-no-icons-in-localized-strings.ts
new file mode 100644
index 00000000000..8f4251dfd41
--- /dev/null
+++ b/.eslint-plugin-local/code-no-icons-in-localized-strings.ts
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/utils';
+
+/**
+ * Prevents theme icon syntax `$(iconName)` from appearing inside localized
+ * string arguments. Localizers may translate or corrupt the icon syntax,
+ * breaking rendering. Icon references should be kept outside the localized
+ * string - either prepended via concatenation or passed as a placeholder
+ * argument.
+ *
+ * Examples:
+ * ❌ localize('key', "$(gear) Settings")
+ * ✅ '$(gear) ' + localize('key', "Settings")
+ * ✅ localize('key', "Like {0}", '$(gear)')
+ *
+ * ❌ nls.localize('key', "$(loading~spin) Loading...")
+ * ✅ '$(loading~spin) ' + nls.localize('key', "Loading...")
+ */
+export default new class NoIconsInLocalizedStrings implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noIconInLocalizedString: 'Theme icon syntax $(…) should not appear inside localized strings. Move it outside the localize call or pass it as a placeholder argument.'
+		},
+		docs: {
+			description: 'Prevents $(icon) theme icon syntax inside localize() string arguments',
+		},
+		type: 'problem',
+		schema: false,
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		// Matches $(iconName) or $(iconName~modifier) but not escaped \$(...)
+		const iconPattern = /(?<!\\)\$\([a-zA-Z][\w~-]*\)/;
+
+		function isLocalizeCall(callee: TSESTree.CallExpression['callee']): { isLocalize: boolean; messageArgIndex: number } {
+			// Direct localize('key', "message", ...) or localize2('key', "message", ...)
+			if (callee.type === 'Identifier' && (callee.name === 'localize' || callee.name === 'localize2')) {
+				return { isLocalize: true, messageArgIndex: 1 };
+			}
+
+			// nls.localize('key', "message", ...) or *.localize(...)
+			if (callee.type === 'MemberExpression' && callee.property.type === 'Identifier' && callee.property.name === 'localize') {
+				return { isLocalize: true, messageArgIndex: 1 };
+			}
+
+			return { isLocalize: false, messageArgIndex: -1 };
+		}
+
+		function getStringValue(node: TSESTree.Node): string | undefined {
+			if (node.type === 'Literal' && typeof node.value === 'string') {
+				return node.value;
+			}
+			if (node.type === 'TemplateLiteral' && node.expressions.length === 0 && node.quasis.length === 1) {
+				return node.quasis[0].value.cooked ?? undefined;
+			}
+			return undefined;
+		}
+
+		function checkCallExpression(node: TSESTree.CallExpression) {
+			const { isLocalize, messageArgIndex } = isLocalizeCall(node.callee);
+			if (!isLocalize) {
+				return;
+			}
+
+			// The first argument may be a string key or an object { key, comment }.
+			// Adjust the message argument index if the first arg is an object.
+			let actualMessageArgIndex = messageArgIndex;
+			const firstArg = node.arguments[0];
+			if (firstArg && firstArg.type === 'ObjectExpression') {
+				// localize({ key: '...', comment: [...] }, "message", ...)
+				actualMessageArgIndex = 1;
+			}
+
+			const messageArg = node.arguments[actualMessageArgIndex];
+			if (!messageArg) {
+				return;
+			}
+
+			const messageValue = getStringValue(messageArg);
+			if (messageValue !== undefined && iconPattern.test(messageValue)) {
+				context.report({
+					node: messageArg,
+					messageId: 'noIconInLocalizedString'
+				});
+			}
+		}
+
+		return {
+			CallExpression: (node: any) => checkCallExpression(node as TSESTree.CallExpression)
+		};
+	}
+};
diff --git a/.eslint-plugin-local/code-no-static-node-module-import.ts b/.eslint-plugin-local/code-no-static-node-module-import.ts
new file mode 100644
index 00000000000..674e5f9e6eb
--- /dev/null
+++ b/.eslint-plugin-local/code-no-static-node-module-import.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TSESTree } from '@typescript-eslint/typescript-estree';
+import * as eslint from 'eslint';
+import { builtinModules } from 'module';
+import { join, normalize, relative } from 'path';
+import minimatch from 'minimatch';
+import { createImportRuleListener } from './utils.ts';
+
+const nodeBuiltins = new Set([
+	...builtinModules,
+	...builtinModules.map(m => `node:${m}`)
+]);
+
+const REPO_ROOT = normalize(join(import.meta.dirname, '../'));
+
+export default new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			staticImport: 'Static imports of \'{{module}}\' are not allowed here because they are loaded synchronously on startup. Use a dynamic `await import(...)` or `import type` instead.'
+		},
+		docs: {
+			description: 'Disallow static imports of node_modules packages to prevent synchronous loading on startup. Allows Node.js built-ins, electron, relative imports, and whitelisted file paths.'
+		},
+		schema: {
+			type: 'array',
+			items: {
+				type: 'string'
+			}
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const allowedPaths = context.options as string[];
+		const filePath = normalize(relative(REPO_ROOT, normalize(context.getFilename()))).replace(/\\/g, '/');
+
+		// Skip whitelisted files
+		if (allowedPaths.some(pattern => filePath === pattern || minimatch(filePath, pattern))) {
+			return {};
+		}
+
+		return createImportRuleListener((node, value) => {
+			// Allow `import type` and `export type` declarations
+			if (node.parent?.type === TSESTree.AST_NODE_TYPES.ImportDeclaration && node.parent.importKind === 'type') {
+				return;
+			}
+			if (node.parent && 'exportKind' in node.parent && node.parent.exportKind === 'type') {
+				return;
+			}
+
+			// Allow relative imports
+			if (value.startsWith('.')) {
+				return;
+			}
+
+			// Allow Node.js built-in modules
+			if (nodeBuiltins.has(value)) {
+				return;
+			}
+
+			// Allow electron
+			if (value === 'electron') {
+				return;
+			}
+
+			context.report({
+				loc: node.parent!.loc,
+				messageId: 'staticImport',
+				data: {
+					module: value
+				}
+			});
+		});
+	}
+};
diff --git a/.eslint-plugin-local/code-no-telemetry-common-property.ts b/.eslint-plugin-local/code-no-telemetry-common-property.ts
new file mode 100644
index 00000000000..2627a09c0a4
--- /dev/null
+++ b/.eslint-plugin-local/code-no-telemetry-common-property.ts
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
+
+const telemetryMethods = new Set(['publicLog', 'publicLog2', 'publicLogError', 'publicLogError2']);
+
+/**
+ * Common telemetry property names that are automatically added to every event.
+ * Telemetry events must not set these because they would collide with / be
+ * overwritten by the common properties that the telemetry pipeline injects.
+ *
+ * Collected from:
+ *   - src/vs/platform/telemetry/common/commonProperties.ts  (resolveCommonProperties)
+ *   - src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
+ *   - src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
+ */
+const commonTelemetryProperties = new Set([
+	'common.machineid',
+	'common.sqmid',
+	'common.devdeviceid',
+	'sessionid',
+	'commithash',
+	'version',
+	'common.releasedate',
+	'common.platformversion',
+	'common.platform',
+	'common.nodeplatform',
+	'common.nodearch',
+	'common.product',
+	'common.msftinternal',
+	'timestamp',
+	'common.timesincesessionstart',
+	'common.sequence',
+	'common.snap',
+	'common.platformdetail',
+	'common.version.shell',
+	'common.version.renderer',
+	'common.firstsessiondate',
+	'common.lastsessiondate',
+	'common.isnewsession',
+	'common.remoteauthority',
+	'common.cli',
+	'common.useragent',
+	'common.istouchdevice',
+]);
+
+export default new class NoTelemetryCommonProperty implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noCommonProperty: 'Telemetry events must not contain the common property "{{name}}". Common properties are automatically added by the telemetry pipeline and will be dropped.',
+		},
+		schema: false,
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		/**
+		 * Check whether any property key in an object expression is a reserved common telemetry property.
+		 */
+		function checkObjectForCommonProperties(node: ESTree.ObjectExpression) {
+			for (const prop of node.properties) {
+				if (prop.type === 'Property') {
+					let name: string | undefined;
+					if (prop.key.type === 'Identifier') {
+						name = prop.key.name;
+					} else if (prop.key.type === 'Literal' && typeof prop.key.value === 'string') {
+						name = prop.key.value;
+					}
+					if (name && commonTelemetryProperties.has(name.toLowerCase())) {
+						context.report({
+							node: prop.key,
+							messageId: 'noCommonProperty',
+							data: { name },
+						});
+					}
+				}
+			}
+		}
+
+		return {
+			['CallExpression[callee.property.type="Identifier"]'](node: ESTree.CallExpression) {
+				const callee = node.callee;
+				if (callee.type !== 'MemberExpression') {
+					return;
+				}
+				const prop = callee.property;
+				if (prop.type !== 'Identifier' || !telemetryMethods.has(prop.name)) {
+					return;
+				}
+				// The data argument is the second argument for publicLog/publicLog2/publicLogError/publicLogError2
+				const dataArg = node.arguments[1];
+				if (dataArg && dataArg.type === 'ObjectExpression') {
+					checkObjectForCommonProperties(dataArg);
+				}
+			},
+		};
+	}
+};
diff --git a/.eslint-plugin-local/code-translation-remind.ts b/.eslint-plugin-local/code-translation-remind.ts
index 42032321167..ed636ec0cb6 100644
--- a/.eslint-plugin-local/code-translation-remind.ts
+++ b/.eslint-plugin-local/code-translation-remind.ts
@@ -26,18 +26,19 @@ export default new class TranslationRemind implements eslint.Rule.RuleModule {
 
 	private _checkImport(context: eslint.Rule.RuleContext, node: TSESTree.Node, path: string) {
 
-		if (path !== TranslationRemind.NLS_MODULE) {
+		if (path !== TranslationRemind.NLS_MODULE && !path.endsWith('/nls.js')) {
 			return;
 		}
 
 		const currentFile = context.getFilename();
 		const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
 		const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
-		if (!matchService && !matchPart) {
+		const matchSessionsPart = currentFile.match(/vs\/sessions\/contrib\/\w+/);
+		if (!matchService && !matchPart && !matchSessionsPart) {
 			return;
 		}
 
-		const resource = matchService ? matchService[0] : matchPart![0];
+		const resource = matchService ? matchService[0] : matchPart ? matchPart[0] : matchSessionsPart![0];
 		let resourceDefined = false;
 
 		let json;
@@ -47,9 +48,10 @@ export default new class TranslationRemind implements eslint.Rule.RuleModule {
 			console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
 			return;
 		}
-		const workbenchResources = JSON.parse(json).workbench;
+		const parsed = JSON.parse(json);
+		const resources = [...parsed.workbench, ...parsed.sessions];
 
-		workbenchResources.forEach((existingResource: any) => {
+		resources.forEach((existingResource: any) => {
 			if (existingResource.name === resource) {
 				resourceDefined = true;
 				return;
diff --git a/.github/CODENOTIFY b/.github/CODENOTIFY
index eaf90f0dd1a..3091e0050f0 100644
--- a/.github/CODENOTIFY
+++ b/.github/CODENOTIFY
@@ -41,8 +41,8 @@ src/vs/platform/secrets/** @TylerLeonhardt
 src/vs/platform/sharedProcess/** @bpasero
 src/vs/platform/state/** @bpasero
 src/vs/platform/storage/** @bpasero
-src/vs/platform/terminal/electron-main/** @Tyriar
-src/vs/platform/terminal/node/** @Tyriar
+src/vs/platform/terminal/electron-main/** @anthonykim1
+src/vs/platform/terminal/node/** @anthonykim1
 src/vs/platform/utilityProcess/** @bpasero
 src/vs/platform/window/** @bpasero
 src/vs/platform/windows/** @bpasero
diff --git a/.github/classifier.json b/.github/classifier.json
index 32b68800113..39ebd9e38b2 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -16,7 +16,7 @@
 		"bracket-pair-guides": {"assign": ["hediet"]},
 		"breadcrumbs": {"assign": ["jrieken"]},
 		"callhierarchy": {"assign": ["jrieken"]},
-		"chat-terminal": {"assign": ["Tyriar"]},
+		"chat-terminal": {"assign": ["meganrogge"]},
 		"chat-terminal-output-monitor": {"assign": ["meganrogge"]},
 		"chrome-devtools": {"assign": ["deepak1556"]},
 		"cloud-changes": {"assign": ["joyceerhl"]},
@@ -228,18 +228,18 @@
 		"terminal-env-collection": {"assign": ["anthonykim1"]},
 		"terminal-external": {"assign": ["anthonykim1"]},
 		"terminal-find": {"assign": ["anthonykim1"]},
-		"terminal-inline-chat": {"assign": ["Tyriar", "meganrogge"]},
-		"terminal-input": {"assign": ["Tyriar"]},
+		"terminal-inline-chat": {"assign": ["meganrogge"]},
+		"terminal-input": {"assign": ["anthonykim1"]},
 		"terminal-layout": {"assign": ["anthonykim1"]},
-		"terminal-ligatures": {"assign": ["Tyriar"]},
+		"terminal-ligatures": {"assign": ["anthonykim1"]},
 		"terminal-links": {"assign": ["anthonykim1"]},
 		"terminal-local-echo": {"assign": ["anthonykim1"]},
-		"terminal-parser": {"assign": ["Tyriar"]},
-		"terminal-persistence": {"assign": ["Tyriar"]},
+		"terminal-parser": {"assign": ["anthonykim1"]},
+		"terminal-persistence": {"assign": ["anthonykim1"]},
 		"terminal-process": {"assign": ["anthonykim1"]},
 		"terminal-profiles": {"assign": ["meganrogge"]},
 		"terminal-quick-fix": {"assign": ["meganrogge"]},
-		"terminal-rendering": {"assign": ["Tyriar"]},
+		"terminal-rendering": {"assign": ["anthonykim1"]},
 		"terminal-shell-bash": {"assign": ["anthonykim1"]},
 		"terminal-shell-cmd": {"assign": ["anthonykim1"]},
 		"terminal-shell-fish": {"assign": ["anthonykim1"]},
@@ -283,7 +283,7 @@
 		"workbench-auxwindow": {"assign": ["bpasero"]},
 		"workbench-banner": {"assign": ["lszomoru", "sbatten"]},
 		"workbench-cli": {"assign": ["bpasero"]},
-		"workbench-diagnostics": {"assign": ["Tyriar"]},
+		"workbench-diagnostics": {"assign": ["rebornix"]},
 		"workbench-dnd": {"assign": ["bpasero"]},
 		"workbench-editor-grid": {"assign": ["benibenj"]},
 		"workbench-editor-groups": {"assign": ["bpasero"]},
@@ -293,7 +293,7 @@
 		"workbench-fonts": {"assign": []},
 		"workbench-history": {"assign": ["bpasero"]},
 		"workbench-hot-exit": {"assign": ["bpasero"]},
-		"workbench-hover": {"assign": ["Tyriar", "benibenj"]},
+		"workbench-hover": {"assign": ["benibenj"]},
 		"workbench-launch": {"assign": []},
 		"workbench-link": {"assign": []},
 		"workbench-multiroot": {"assign": ["bpasero"]},
diff --git a/.github/commands.json b/.github/commands.json
index 978a0960eab..c52e21eeb8d 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -631,7 +631,7 @@
 		"addLabel": "capi",
 		"removeLabel": "~capi",
 		"assign": [
-			"samvantran",
+			"rheapatel",
 			"sharonlo"
 		],
 		"comment": "Thank you for creating this issue! Please provide one or more `requestIds` to help the platform team investigate. You can follow instructions [found here](https://github.com/microsoft/vscode/wiki/Copilot-Issues#language-model-requests-and-responses) to locate the `requestId` value.\n\nHappy Coding!"
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 8d56465c45a..54502973051 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -145,6 +145,7 @@ function f(x: number, y: string): void { }
 - You MUST NOT use storage keys of another component only to make changes to that component. You MUST come up with proper API to change another component.
 - Use `IEditorService` to open editors instead of `IEditorGroupsService.activeGroup.openEditor` to ensure that the editor opening logic is properly followed and to avoid bypassing important features such as `revealIfOpened` or `preserveFocus`.
 - Avoid using `bind()`, `call()` and `apply()` solely to control `this` or partially apply arguments; prefer arrow functions or closures to capture the necessary context, and use these methods only when required by an API or interoperability.
+- Avoid using events to drive control flow between components. Instead, prefer direct method calls or service interactions to ensure clearer dependencies and easier traceability of logic. Events should be reserved for broadcasting state changes or notifications rather than orchestrating behavior across components.
 
 ## Learnings
 - Minimize the amount of assertions in tests. Prefer one snapshot-style `assert.deepStrictEqual` over multiple precise assertions, as they are much more difficult to understand and to update.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 07296619597..f7e3481c75b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,27 +8,3 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    allow:
-      - dependency-name: "@vscode/component-explorer"
-      - dependency-name: "@vscode/component-explorer-cli"
-    groups:
-      component-explorer:
-        patterns:
-          - "@vscode/component-explorer"
-          - "@vscode/component-explorer-cli"
-  - package-ecosystem: "npm"
-    directory: "/build/vite"
-    schedule:
-      interval: "daily"
-    allow:
-      - dependency-name: "@vscode/component-explorer"
-      - dependency-name: "@vscode/component-explorer-vite-plugin"
-    groups:
-      component-explorer:
-        patterns:
-          - "@vscode/component-explorer"
-          - "@vscode/component-explorer-vite-plugin"
diff --git a/.github/hooks/hooks.json b/.github/hooks/hooks.json
index 5e27e6db893..4457634963e 100644
--- a/.github/hooks/hooks.json
+++ b/.github/hooks/hooks.json
@@ -4,8 +4,7 @@
 		"sessionStart": [
 			{
 				"type": "command",
-				"bash": "if [ -f ~/.vscode-worktree-setup ]; then nohup bash -c 'npm ci && npm run compile' > /tmp/worktree-setup-$(date +%Y-%m-%d_%H-%M-%S).log 2>&1 & fi",
-				"powershell": "if (Test-Path \"$env:USERPROFILE\\.vscode-worktree-setup\") { $log = \"$env:TEMP\\worktree-setup-$(Get-Date -Format 'yyyy-MM-dd_HH-mm-ss').log\"; $dir = $PWD.Path; Start-Job -ScriptBlock { param($d, $l) Set-Location $d; & { npm ci; if ($LASTEXITCODE -eq 0) { npm run compile } } *> $l } -ArgumentList $dir, $log | Out-Null }"
+				"bash": ""
 			}
 		],
 		"sessionEnd": [
diff --git a/.github/instructions/agentHostTesting.instructions.md b/.github/instructions/agentHostTesting.instructions.md
new file mode 100644
index 00000000000..7ffbbe4ff6e
--- /dev/null
+++ b/.github/instructions/agentHostTesting.instructions.md
@@ -0,0 +1,27 @@
+---
+description: Architecture documentation for VS Code AI Customization view. Use when working in `src/vs/workbench/contrib/chat/browser/aiCustomization`
+applyTo: 'src/vs/platform/agentHost/**'
+---
+
+# Agent Host
+
+The agent host communicates via the Agent Host Protocol. The specification for this lives in a directory `../agent-host-protocol` as a sibling of the VS Code directory.
+
+If this directory doesn't exist, you should use the "ask questions" tool to ask the user if they want to clone `git@github.com:microsoft/agent-host-protocol.git` to that directory. After doing so, you should also prompt the user to add `file:///<path/to/agent-host-protocol>/plugins/copilot-plugin` as a plugin in their `chat.pluginLocations` settings.
+
+## Overall Protocol
+
+The sessions process is a portable, standalone server that multiple clients can connect to. Clients see a synchronized view of sessions and can send commands that are reflected back as state-changing actions. The protocol is designed around four requirements:
+
+1. **Synchronized multi-client state** — an immutable, redux-like state tree mutated exclusively by actions flowing through pure reducers. While there is the option to implement functionality via imperative commands, we ALWAYS prefer to model features as pure state and actions.
+2. **Lazy loading** — clients subscribe to state by URI and load data on demand. The session list is fetched imperatively. Large content (images, long tool outputs) is stored by reference and fetched separately.
+3. **Write-ahead with reconciliation** — clients optimistically apply their own actions locally, then reconcile when the server echoes them back alongside any concurrent actions from other clients or the server itself.
+4. **Forward-compatible versioning** — newer clients can connect to older servers. A single protocol version number maps to a capabilities object; clients check capabilities before using features.
+
+See the agent host protocol documentation for more details.
+
+## End to End Testing
+
+You can run `node ./scripts/code-agent-host.js` to start an agent host. If you pass `--enable-mock-agent`, then the `ScriptedMockAgent` will be used.
+
+By default this will listen on `ws://127.0.0.1:8081`. You can then use the `ahp-websocket` client, when available, to connect to and communicate with it.
diff --git a/.github/instructions/oss.instructions.md b/.github/instructions/oss.instructions.md
new file mode 100644
index 00000000000..2e73cdbbbc2
--- /dev/null
+++ b/.github/instructions/oss.instructions.md
@@ -0,0 +1,34 @@
+---
+applyTo: '{ThirdPartyNotices.txt,cli/ThirdPartyNotices.txt,cglicenses.json,cgmanifest.json}'
+---
+
+# OSS License Review
+
+When reviewing changes to these files, verify:
+
+## ThirdPartyNotices.txt
+
+- Every new entry has a license type header (e.g., "MIT License", "Apache License 2.0")
+- License text is present and non-empty for every entry
+- License text matches the declared license type (e.g., MIT-declared entry actually contains MIT license text, not Apache)
+- Removed entries are cleanly removed (no leftover fragments)
+- Entries are sorted alphabetically by package name
+
+## cglicenses.json
+
+- New overrides have a justification comment
+- No obviously stale entries for packages no longer in the dependency tree
+
+## cgmanifest.json
+
+- Package versions match what's actually installed
+- Repository URLs are valid and point to real source repositories
+- Newly added license identifiers should use SPDX format where possible
+- License identifiers match the corresponding ThirdPartyNotices.txt entries
+
+## Red Flags
+
+- Any **newly added** copyleft license (GPL, LGPL, AGPL) — flag immediately (existing copyleft entries like ffmpeg are pre-approved)
+- Any "UNKNOWN" or placeholder license text
+- License text that appears truncated or corrupted
+- A package declared as MIT but with Apache/BSD/other license text (or vice versa)
diff --git a/.github/prompts/fix-error.prompt.md b/.github/prompts/fix-error.prompt.md
index 1cdc8fa90b4..e833fb07e1e 100644
--- a/.github/prompts/fix-error.prompt.md
+++ b/.github/prompts/fix-error.prompt.md
@@ -9,9 +9,52 @@ The user has given you a GitHub issue URL for an unhandled error from the VS Cod
 
 Follow the `fix-errors` skill guidelines to fix this error. Key principles:
 
-1. **Do NOT fix at the crash site.** Do not add guards, try/catch, or fallback values at the bottom of the stack trace. That only masks the problem.
-2. **Trace the data flow upward** through the call stack to find the producer of invalid data.
-3. **If the producer is cross-process** (e.g., IPC) and cannot be identified from the stack alone, **enrich the error message** with diagnostic context (data type, truncated value, operation name) so the next telemetry cycle reveals the source. Do NOT silently swallow the error.
-4. **If the producer is identifiable**, fix it directly.
+1. **Read the error construction code first.** Before proposing any fix, search the codebase for where the error is constructed (the `new Error(...)` or custom error class instantiation). Read the surrounding code to understand:
+   - What conditions trigger the error (thresholds, validation checks, categorization logic)
+   - What parameters, classifications, or categories the error encodes
+   - What the intended meaning of each category is and what action each warrants
+   - Whether the error is a symptom of invalid data, a threshold-based warning, or a design-time signal
+   Use this understanding to determine the correct fix strategy. Do NOT assume what the error means from its message alone — the construction code is the source of truth.
+2. **Do NOT fix at the crash site.** Do not add guards, try/catch, or fallback values at the bottom of the stack trace. That only masks the problem.
+3. **Trace the data flow upward** through the call stack to find the producer of invalid data.
+4. **If the producer is cross-process** (e.g., IPC) and cannot be identified from the stack alone, **enrich the error message** with diagnostic context (data type, truncated value, operation name) so the next telemetry cycle reveals the source. Do NOT silently swallow the error.
+5. **If the producer is identifiable**, fix it directly.
 
 After making changes, check for compilation errors via the build task and run relevant unit tests.
+
+## Submitting the Fix
+
+After the fix is validated (compilation clean, tests pass):
+
+1. **Create a branch**: `git checkout -b <github-username>/<short-description>` (e.g., `bryanchen-d/fix-notebook-index-error`).
+2. **Commit**: Stage changed files and commit with a message like `fix: <brief description> (#<issue-number>)`.
+3. **Push**: `git push -u origin <branch-name>`.
+4. **Create a draft PR** with a description that includes these sections:
+   - **Summary**: A concise description of what was changed and why.
+   - **Issue link**: `Fixes #<issue-number>` so GitHub auto-closes the issue when the PR merges.
+   - **Trigger scenarios**: What user actions or system conditions cause this error to surface.
+   - **Code flow diagram**: A Mermaid swimlane/sequence diagram showing the call chain from trigger to error. Use participant labels for the key components (e.g., classes, modules, processes). Example:
+     ````
+     ```mermaid
+     sequenceDiagram
+         participant A as CallerComponent
+         participant B as MiddleLayer
+         participant C as LowLevelUtil
+         A->>B: someOperation(data)
+         B->>C: validate(data)
+         C-->>C: data is invalid
+         C->>B: throws "error message"
+         B->>A: unhandled error propagates
+     ```
+     ````
+   - **Manual validation steps**: Concrete, step-by-step instructions a reviewer can follow to reproduce the original error and verify the fix. Include specific setup requirements (e.g., file types to open, settings to change, actions to perform). If the error cannot be easily reproduced manually, explain why and describe what alternative validation was performed (e.g., unit tests, code inspection).
+   - **How the fix works**: A brief explanation of the fix approach, with a note per changed file.
+5. **Monitor the PR — BLOCKING**: You MUST NOT complete the task until the monitoring loop below is done.
+   - Wait 2 minutes after each push, then check for Copilot review comments using `gh pr view <number> --json reviews,comments` and `gh api repos/{owner}/{repo}/pulls/{number}/comments`.
+   - If there are review comments, evaluate each one:
+     - If valid, apply the fix in a new commit, push, and **resolve the comment thread** using the GitHub GraphQL API (`resolveReviewThread` mutation with the thread's node ID).
+     - If not applicable, leave a reply explaining why.
+     - After addressing comments, update the PR description if the changes affect the summary, diagram, or per-file notes.
+   - **Re-run tests** after addressing review comments to confirm nothing regressed.
+   - After each push, repeat the wait-and-check cycle. Continue until **two consecutive checks return zero new comments**.
+6. **Verify CI**: After the monitoring loop is done, check that CI checks are passing using `gh pr checks <number>`. If any required checks fail, investigate and fix. Do NOT complete the task with failing CI.
diff --git a/.github/skills/accessibility/SKILL.md b/.github/skills/accessibility/SKILL.md
index 1d141f0c092..591e85ff812 100644
--- a/.github/skills/accessibility/SKILL.md
+++ b/.github/skills/accessibility/SKILL.md
@@ -1,8 +1,22 @@
 ---
 name: accessibility
-description: Accessibility guidelines for VS Code features — covers accessibility help dialogs, accessible views, verbosity settings, accessibility signals, ARIA alerts/status announcements, keyboard navigation, and ARIA labels/roles. Applies to both new interactive UI surfaces and updates to existing features. Use when creating new UI or updating existing UI features.
+description: Primary accessibility skill for VS Code. REQUIRED for new feature and contribution work, and also applies to updates of existing UI. Covers accessibility help dialogs, accessible views, verbosity settings, signals, ARIA announcements, keyboard navigation, and ARIA labels/roles.
 ---
 
+## When to Use This Skill
+
+Use this skill for any VS Code feature work that introduces or changes interactive UI.
+Use this skill by default for new features and contributions, including when the request does not explicitly mention accessibility.
+
+Trigger examples:
+- "add a new feature"
+- "implement a new panel/view/widget"
+- "add a new command or workflow"
+- "new contribution in workbench/editor/extensions"
+- "update existing UI interactions"
+
+Do not skip this skill just because accessibility is not named in the prompt.
+
 When adding a **new interactive UI surface** to VS Code — a panel, view, widget, editor overlay, dialog, or any rich focusable component the user interacts with — you **must** provide three accessibility components (if they do not already exist for the feature):
 
 1. **An Accessibility Help Dialog** — opened via the accessibility help keybinding when the feature has focus.
@@ -47,10 +61,7 @@ An accessibility help dialog tells the user what the feature does, which keyboar
 The simplest approach is to return an `AccessibleContentProvider` directly from `getProvider()`. This is the most common pattern in the codebase (used by chat, inline chat, quick chat, etc.):
 
 ```ts
-import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '…/accessibleView.js';
-import { IAccessibleViewImplementation } from '…/accessibleViewRegistry.js';
-import { AccessibilityVerbositySettingId } from '…/accessibilityConfiguration.js';
-import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId, IAccessibleViewContentProvider, IAccessibleViewOptions } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { IAccessibleViewImplementation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { AccessibilityVerbositySettingId } from '../../../../platform/accessibility/common/accessibilityConfiguration.js';
 
diff --git a/.github/skills/azure-pipelines/SKILL.md b/.github/skills/azure-pipelines/SKILL.md
index 97904019952..8903496983c 100644
--- a/.github/skills/azure-pipelines/SKILL.md
+++ b/.github/skills/azure-pipelines/SKILL.md
@@ -92,8 +92,8 @@ node .github/skills/azure-pipelines/azure-pipeline.ts queue --parameter "VSCODE_
 |--------|-------------|
 | `--branch <name>` | Source branch to build (default: current git branch) |
 | `--definition <id>` | Pipeline definition ID (default: 111) |
-| `--parameter <entry>` | Pipeline parameter in `KEY=value` format (repeatable) |
-| `--parameters <list>` | Space-separated parameters in `KEY=value KEY2=value2` format |
+| `--parameter <entry>` | Pipeline parameter in `KEY=value` format (repeatable); **use this when the value contains spaces** |
+| `--parameters <list>` | Space-separated parameters in `KEY=value KEY2=value2` format; values **must not** contain spaces |
 | `--dry-run` | Print the command without executing |
 
 ### Product Build Queue Parameters (`build/azure-pipelines/product-build.yml`)
diff --git a/.github/skills/azure-pipelines/azure-pipeline.ts b/.github/skills/azure-pipelines/azure-pipeline.ts
index fbb74b5dd4a..3032f01c6fd 100644
--- a/.github/skills/azure-pipelines/azure-pipeline.ts
+++ b/.github/skills/azure-pipelines/azure-pipeline.ts
@@ -556,7 +556,11 @@ class AzureDevOpsClient {
 
 	protected runAzCommand(args: string[]): Promise<string> {
 		return new Promise((resolve, reject) => {
-			const proc = spawn('az', args, { shell: true });
+			// Use shell: false so that argument values with spaces are passed verbatim
+			// to the process without shell word-splitting. On Windows, az is a .cmd
+			// file and cannot be executed directly, so we must use az.cmd.
+			const azBin = process.platform === 'win32' ? 'az.cmd' : 'az';
+			const proc = spawn(azBin, args, { shell: false });
 			let stdout = '';
 			let stderr = '';
 
@@ -778,8 +782,8 @@ function printQueueUsage(): void {
 	console.log('Options:');
 	console.log('  --branch <name>       Source branch to build (default: current git branch)');
 	console.log('  --definition <id>     Pipeline definition ID (default: 111)');
-	console.log('  --parameter <entry>   Pipeline parameter in "KEY=value" format (repeatable)');
-	console.log('  --parameters <list>   Space-separated parameter list in "KEY=value KEY2=value2" format');
+	console.log('  --parameter <entry>   Pipeline parameter in "KEY=value" format (repeatable); use this for values with spaces');
+	console.log('  --parameters <list>   Space-separated parameter list in "KEY=value KEY2=value2" format (values must not contain spaces)');
 	console.log('  --dry-run             Print the command without executing');
 	console.log('  --help                Show this help message');
 	console.log('');
@@ -887,7 +891,8 @@ async function runQueueCommand(args: string[]): Promise<void> {
 			cmdArgs.push('--parameters', ...parsedArgs.parameters);
 		}
 		cmdArgs.push('--output', 'json');
-		console.log(`az ${cmdArgs.join(' ')}`);
+		const displayArgs = cmdArgs.map(a => a.includes(' ') ? `"${a}"` : a);
+		console.log(`az ${displayArgs.join(' ')}`);
 		process.exit(0);
 	}
 
@@ -1539,6 +1544,15 @@ async function runAllTests(): Promise<void> {
 			assert.ok(cmd.includes('OTHER=test'));
 		});
 
+		it('queueBuild passes parameter values with spaces verbatim', async () => {
+			const client = new TestableAzureDevOpsClient(ORGANIZATION, PROJECT);
+			await client.queueBuild('111', 'main', ['VSCODE_BUILD_TYPE=Product Build']);
+
+			const cmd = client.capturedCommands[0];
+			assert.ok(cmd.includes('--parameters'));
+			assert.deepStrictEqual(cmd[cmd.indexOf('--parameters') + 1], 'VSCODE_BUILD_TYPE=Product Build');
+		});
+
 		it('getBuild constructs correct az command', async () => {
 			const client = new TestableAzureDevOpsClient(ORGANIZATION, PROJECT);
 			await client.getBuild('12345');
diff --git a/.github/skills/chat-customizations-editor/SKILL.md b/.github/skills/chat-customizations-editor/SKILL.md
new file mode 100644
index 00000000000..8d4ce8edda1
--- /dev/null
+++ b/.github/skills/chat-customizations-editor/SKILL.md
@@ -0,0 +1,182 @@
+---
+name: chat-customizations-editor
+description: Use when working on the Chat Customizations editor — the management UI for agents, skills, instructions, hooks, prompts, MCP servers, and plugins.
+---
+
+# Chat Customizations Editor
+
+Split-view management pane for AI customization items across workspace, user, extension, and plugin storage. Supports harness-based filtering (Local, Copilot CLI, Claude).
+
+## Spec
+
+**`src/vs/sessions/AI_CUSTOMIZATIONS.md`** — always read before making changes, always update after.
+
+## Key Folders
+
+| Folder | What |
+|--------|------|
+| `src/vs/workbench/contrib/chat/common/` | `ICustomizationHarnessService`, `ISectionOverride`, `IStorageSourceFilter` — shared interfaces and filter helpers |
+| `src/vs/workbench/contrib/chat/browser/aiCustomization/` | Management editor, list widgets (prompts, MCP, plugins), harness service registration |
+| `src/vs/sessions/contrib/chat/browser/` | Sessions-window overrides (harness service, workspace service) |
+| `src/vs/sessions/contrib/sessions/browser/` | Sessions tree view counts and toolbar |
+
+When changing harness descriptor interfaces or factory functions, verify both core and sessions registrations compile.
+
+## Key Interfaces
+
+- **`IHarnessDescriptor`** — drives all UI behavior declaratively (hidden sections, button overrides, file filters, agent gating). See spec for full field reference.
+- **`ISectionOverride`** — per-section button customization (command invocation, root file creation, type labels, file extensions).
+- **`IStorageSourceFilter`** — controls which storage sources and user roots are visible per harness/type.
+
+Principle: the UI widgets read everything from the descriptor — no harness-specific conditionals in widget code.
+
+## Testing
+
+Component explorer fixtures (see `component-fixtures` skill): `aiCustomizationListWidget.fixture.ts`, `aiCustomizationManagementEditor.fixture.ts` under `src/vs/workbench/test/browser/componentFixtures/`.
+
+### Screenshotting specific tabs
+
+The management editor fixture supports a `selectedSection` option to render any tab. Each tab has Dark/Light variants auto-generated by `defineThemedFixtureGroup`.
+
+**Available fixture IDs** (use with `mcp_component-exp_screenshot`):
+
+| Fixture ID pattern | Tab shown |
+|---|---|
+| `chat/aiCustomizations/aiCustomizationManagementEditor/AgentsTab/{Dark,Light}` | Agents |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/SkillsTab/{Dark,Light}` | Skills |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/InstructionsTab/{Dark,Light}` | Instructions |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/HooksTab/{Dark,Light}` | Hooks |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/PromptsTab/{Dark,Light}` | Prompts |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/McpServersTab/{Dark,Light}` | MCP Servers |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/PluginsTab/{Dark,Light}` | Plugins |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/LocalHarness/{Dark,Light}` | Default (Agents, Local harness) |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/CliHarness/{Dark,Light}` | Default (Agents, CLI harness) |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/ClaudeHarness/{Dark,Light}` | Default (Agents, Claude harness) |
+| `chat/aiCustomizations/aiCustomizationManagementEditor/Sessions/{Dark,Light}` | Sessions window variant |
+
+**Adding a new tab fixture:** Add a variant to the `defineThemedFixtureGroup` in `aiCustomizationManagementEditor.fixture.ts`:
+```typescript
+MyNewTab: defineComponentFixture({
+    labels: { kind: 'screenshot' },
+    render: ctx => renderEditor(ctx, {
+        harness: CustomizationHarness.VSCode,
+        selectedSection: AICustomizationManagementSection.MySection,
+    }),
+}),
+```
+
+The `selectedSection` calls `editor.selectSectionById()` after `setInput`, which navigates to the specified tab and re-layouts.
+
+### Populating test data
+
+Each customization type requires its own mock path in `createMockPromptsService`:
+- **Agents** — `getCustomAgents()` returns agent objects
+- **Skills** — `findAgentSkills()` returns `IAgentSkill[]`
+- **Prompts** — `getPromptSlashCommands()` returns `IChatPromptSlashCommand[]`
+- **Instructions/Hooks** — `listPromptFiles()` filtered by `PromptsType`
+- **MCP Servers** — `mcpWorkspaceServers`/`mcpUserServers` arrays passed to `IMcpWorkbenchService` mock
+- **Plugins** — `IPluginMarketplaceService.installedPlugins` and `IAgentPluginService.plugins` observables
+
+All test data lives in `allFiles` (prompt-based items) and the `mcpWorkspace/UserServers` arrays. Add enough items per category (8+) to invoke scrolling.
+
+### Exercising built-in grouping
+
+The list widget regroups items from the default chat extension under a "Built-in" header. Three things must be in place for fixtures to exercise this:
+1. Include `BUILTIN_STORAGE` in the harness descriptor's visible sources
+2. Mock `IProductService.defaultChatAgent.chatExtensionId` (e.g., `'GitHub.copilot-chat'`)
+3. Give mock items extension provenance via `extensionId` / `extensionDisplayName` matching that ID
+
+Without all three, built-in regrouping silently doesn't run and the fixture only shows flat lists.
+
+### Editor contribution service mocks
+
+The management editor embeds a `CodeEditorWidget`. Electron-side editor contributions (e.g., `AgentFeedbackEditorWidgetContribution`) are instantiated automatically and crash if their injected services aren't registered. The fixture must mock at minimum:
+- `IAgentFeedbackService` — needs `onDidChangeFeedback`, `onDidChangeNavigation` as `Event.None`
+- `ICodeReviewService` — needs `getReviewState()` / `getPRReviewState()` returning idle observables
+- `IChatEditingService` — needs `editingSessionsObs` as empty observable
+- `IAgentSessionsService` — needs `model.sessions` as empty array
+
+These are cross-layer imports from `vs/sessions/` — use `// eslint-disable-next-line local/code-import-patterns` on the import lines.
+
+### CI regression gates
+
+Key fixtures have `blocksCi: true` in their labels. The `screenshot-test.yml` GitHub Action captures screenshots on every PR to `main` and **fails the CI status check** if any `blocks-ci`-labeled fixture's screenshot changes. This catches layout regressions automatically.
+
+Currently gated fixtures: `LocalHarness`, `McpServersTab`, `McpServersTabNarrow`, `AgentsTabNarrow`. When adding a new section or layout-critical fixture, add `blocksCi: true`:
+
+```typescript
+MyFixture: defineComponentFixture({
+    labels: { kind: 'screenshot', blocksCi: true },
+    render: ctx => renderEditor(ctx, { ... }),
+}),
+```
+
+Don't add `blocksCi` to every fixture — only ones that cover critical layout paths (default view, section with list + footer, narrow viewport). Too many gated fixtures creates noisy CI.
+
+### Screenshot stability
+
+Scrollbar fade transitions cause screenshot instability — the scrollbar shifts from `visible` to `invisible fade` class ~2 seconds after a programmatic scroll. After calling `revealLastItem()` or any scroll action, wait for the transition to complete before the fixture's render promise resolves:
+
+```typescript
+await new Promise(resolve => setTimeout(resolve, 2400));
+// Then optionally poll until .scrollbar.vertical loses the 'visible' class
+```
+
+### Running unit tests
+
+```bash
+./scripts/test.sh --grep "applyStorageSourceFilter|customizationCounts"
+npm run compile-check-ts-native && npm run valid-layers-check
+```
+
+See the `sessions` skill for sessions-window specific guidance.
+
+## Debugging Layout in the Real Product
+
+Component fixtures use mock data and a fixed container size. Layout bugs caused by reflow timing, real data shapes, or narrow window sizes often **don't reproduce in fixtures**. When a user reports a broken layout, debug in the live Code OSS product.
+
+For launching Code OSS with CDP and connecting `agent-browser`, see the **`launch` skill**. Use `--user-data-dir /tmp/code-oss-debug` to avoid colliding with an already-running instance from another worktree.
+
+### Navigating to the customizations editor
+
+After connecting, use `snapshot -i` to find the "Open Customizations" button (in the Chat panel header), then click it. To switch sections, use `eval` with a DOM click since sidebar items aren't interactive refs:
+
+```bash
+npx agent-browser eval "const items = [...document.querySelectorAll('.section-list-item')]; \
+  items.find(el => el.textContent?.includes('MCP'))?.click();"
+```
+
+### Inspecting widget layout
+
+`agent-browser eval` doesn't always print return values. Use `document.title` as a return channel:
+
+```bash
+npx agent-browser eval "const w = document.querySelector('.mcp-list-widget'); \
+  const lc = w?.querySelector('.mcp-list-container'); \
+  const rows = lc?.querySelectorAll('.monaco-list-row'); \
+  document.title = 'DBG:rows=' + (rows?.length ?? -1) \
+    + ',listH=' + (lc?.offsetHeight ?? -1) \
+    + ',seStH=' + (lc?.querySelector('.monaco-scrollable-element')?.style?.height ?? '') \
+    + ',wH=' + (w?.offsetHeight ?? -1);"
+npx agent-browser eval "document.title" 2>&1
+```
+
+Key diagnostics:
+- **`rows`** — fewer than expected means `list.layout()` never received the correct viewport height.
+- **`seStH`** — empty means the list was never properly laid out.
+- **`listH` vs `wH`** — list container height should be widget height minus search bar minus footer.
+
+### Common layout issues
+
+| Symptom | Root cause | Fix pattern |
+|---------|-----------|-------------|
+| List shows 0-1 rows in a tall container | `layout()` bailed out because `offsetHeight` returned 0 during `display:none → visible` transition | Defer layout via `DOM.getWindow(this.element).requestAnimationFrame(...)` |
+| Badge or row content clips at right edge | Widget container missing `overflow: hidden` | Add `overflow: hidden` to the widget's CSS class |
+| Items visible in fixture but not in product | Fixture uses many mock items; real product has few | Add fixture variants with fewer items or narrower dimensions (`width`/`height` options) |
+
+### Fixture vs real product gaps
+
+Fixtures render at a fixed size (default 900×600) with many mock items. They won't catch:
+- **Reflow timing** — the real product's `display:none → visible` transition may not have reflowed before `layout()` fires
+- **Narrow windows** — add narrow fixture variants (e.g., `width: 550, height: 400`)
+- **Real data counts** — a user with 1 MCP server sees very different layout than a fixture with 12
diff --git a/.github/skills/fix-ci-failures/SKILL.md b/.github/skills/fix-ci-failures/SKILL.md
new file mode 100644
index 00000000000..4e05478ad78
--- /dev/null
+++ b/.github/skills/fix-ci-failures/SKILL.md
@@ -0,0 +1,269 @@
+---
+name: fix-ci-failures
+description: Investigate and fix CI failures on a pull request. Use when CI checks fail on a PR branch — covers finding the PR, identifying failed checks, downloading logs and artifacts, extracting the failure cause, and iterating on a fix. Requires the `gh` CLI.
+---
+
+# Investigating and Fixing CI Failures
+
+This skill guides you through diagnosing and fixing CI failures on a PR using the `gh` CLI. The user has the PR branch checked out locally.
+
+## Workflow Overview
+
+1. Identify the current branch and its PR
+2. Check CI status and find failed checks
+3. Download logs for failed jobs
+4. Extract and understand the failure
+5. Fix the issue and push
+
+---
+
+## Step 1: Identify the Branch and PR
+
+```bash
+# Get the current branch name
+git branch --show-current
+
+# Find the PR for this branch
+gh pr view --json number,title,url,statusCheckRollup
+```
+
+If no PR is found, the user may need to specify the PR number.
+
+---
+
+## Step 2: Check CI Status
+
+```bash
+# List all checks and their status (pass/fail/pending)
+gh pr checks --json name,state,link,bucket
+
+# Filter to only failed checks
+gh pr checks --json name,state,link,bucket --jq '.[] | select(.bucket == "fail")'
+```
+
+The `link` field contains the URL to the GitHub Actions job. Extract the **run ID** from the URL — it's the number after `/runs/`:
+```
+https://github.com/microsoft/vscode/actions/runs/<RUN_ID>/job/<JOB_ID>
+```
+
+If checks are still `IN_PROGRESS`, wait for them to complete before downloading logs:
+```bash
+gh pr checks --watch --fail-fast
+```
+
+---
+
+## Step 3: Get Failed Job Details
+
+```bash
+# List failed jobs in a run (use the run ID from the check link)
+gh run view <RUN_ID> --json jobs --jq '.jobs[] | select(.conclusion == "failure") | {name: .name, id: .databaseId}'
+```
+
+---
+
+## Step 4: Download Failure Logs
+
+There are two approaches depending on the type of failure.
+
+### Option A: View Failed Step Logs Directly
+
+Best for build/compile/lint failures where the error is in the step output:
+
+```bash
+# View only the failed step logs (most useful — shows just the errors)
+gh run view <RUN_ID> --job <JOB_ID> --log-failed
+```
+
+> **Important**: `--log-failed` requires the **entire run** to complete, not just the failed job. If other jobs are still running, this command will block or error. Use **Option C** below to get logs for a completed job while the run is still in progress.
+
+The output can be large. Pipe through `tail` or `grep` to focus:
+```bash
+# Last 100 lines of failed output
+gh run view <RUN_ID> --job <JOB_ID> --log-failed | tail -100
+
+# Search for common error patterns
+gh run view <RUN_ID> --job <JOB_ID> --log-failed | grep -E "Error|FAIL|error TS|AssertionError|failing"
+```
+
+### Option B: Download Artifacts
+
+Best for integration test failures where detailed logs (terminal logs, ext host logs, crash dumps) are uploaded as artifacts:
+
+```bash
+# List available artifacts for a run
+gh run download <RUN_ID> --pattern '*' --dir /dev/null 2>&1 || gh run view <RUN_ID> --json jobs --jq '.jobs[].name'
+
+# Download log artifacts for a specific failed job
+# Artifact naming convention: logs-<platform>-<arch>-<test-type>-<attempt>
+# Examples: logs-linux-x64-electron-1, logs-linux-x64-remote-1
+gh run download <RUN_ID> -n "logs-linux-x64-electron-1" -D /tmp/ci-logs
+
+# Download crash dumps if available
+gh run download <RUN_ID> -n "crash-dump-linux-x64-electron-1" -D /tmp/ci-crashes
+```
+
+> **Tip**: Use the test runner name from the failed check (e.g., "Linux / Electron" → `electron`, "Linux / Remote" → `remote`) and platform map ("Windows" → `windows-x64`, "Linux" → `linux-x64`, "macOS" → `macos-arm64`) to construct the artifact name.
+
+> **Warning**: Log artifacts may be empty if the test runner crashed before producing output (e.g., Electron download failure). In that case, fall back to **Option C**.
+
+### Option C: Download Per-Job Logs via API (works while run is in progress)
+
+When the run is still in progress but the failed job has completed, use the GitHub API to download that job's step logs directly:
+
+```bash
+# Save the full job log to a temp file (can be very large — 30k+ lines)
+gh api repos/microsoft/vscode/actions/jobs/<JOB_ID>/logs > "$TMPDIR/ci-job-log.txt"
+```
+
+Then search the saved file. **Start with `##[error]`** — this is the GitHub Actions error annotation that marks the exact line where the step failed:
+
+```bash
+# Step 1: Find the error annotation (fastest path to the failure)
+grep -n '##\[error\]' "$TMPDIR/ci-job-log.txt"
+
+# Step 2: Read context around the error (e.g., if error is on line 34371, read 200 lines before it)
+sed -n '34171,34371p' "$TMPDIR/ci-job-log.txt"
+```
+
+If `##[error]` doesn't reveal enough, use broader patterns:
+```bash
+# Find test failures, exceptions, and crash indicators
+grep -n -E 'HTTPError|ECONNRESET|ETIMEDOUT|502|exit code|Process completed|node:internal|triggerUncaughtException' "$TMPDIR/ci-job-log.txt" | head -20
+```
+
+> **Why save to a file?** The API response for a full job log can be 30k+ lines. Tool output gets truncated, so always redirect to a file first, then search.
+
+### VS Code Log Artifacts Structure
+
+Downloaded log artifacts typically contain:
+```
+logs-linux-x64-electron-1/
+  main.log              # Main process log
+  terminal.log          # Terminal/pty host log (key for run_in_terminal issues)
+  window1/
+    renderer.log        # Renderer process log
+    exthost/
+      exthost.log       # Extension host log (key for extension test failures)
+```
+
+Key files to examine first:
+- **Test assertion failures**: Check `exthost.log` for the extension host output and stack traces
+- **Terminal/sandbox issues**: Check `terminal.log` for rewriter pipeline, shell integration, and strategy logs
+- **Crash/hang**: Check `main.log` and look for crash dumps artifacts
+
+---
+
+## Step 5: Extract the Failure
+
+### For Test Failures
+
+Look for the test runner output in the failed step log:
+```bash
+# Find failing test names and assertion messages
+gh run view <RUN_ID> --job <JOB_ID> --log-failed | grep -A 5 "failing\|AssertionError\|Expected\|Unexpected"
+```
+
+Common patterns in VS Code CI:
+- **`AssertionError [ERR_ASSERTION]`**: Test assertion failed — check expected vs actual values
+- **`Extension host test runner exit code: 1`**: Integration test suite had failures
+- **`Command produced no output`**: Shell integration may not have captured command output (see terminal.log)
+- **`Error: Timeout`**: Test timed out — could be a hang or slow CI machine
+
+### For Build Failures
+
+```bash
+# Find TypeScript compilation errors
+gh run view <RUN_ID> --job <JOB_ID> --log-failed | grep "error TS"
+
+# Find hygiene/lint errors
+gh run view <RUN_ID> --job <JOB_ID> --log-failed | grep -E "eslint|stylelint|hygiene"
+```
+
+---
+
+## Step 6: Determine if Failures are Related to the PR
+
+Before fixing, determine if the failure is caused by the PR changes or is a pre-existing/infrastructure issue:
+
+1. **Check if the failing test is in code you changed** — if the test is in a completely unrelated area, it may be a flake
+2. **Check the test name** — does it relate to the feature area you modified?
+3. **Look at the failure output** — does it reference code paths your PR touches?
+4. **Check if the same tests fail on main** — if identical failures exist on recent main commits, it's a pre-existing issue
+5. **Look for infrastructure failures** — network timeouts, npm registry errors, and machine-level issues are not caused by code changes
+
+```bash
+# Check recent runs on main for the same workflow
+gh run list --branch main --workflow pr-linux-test.yml --limit 5 --json databaseId,conclusion,displayTitle
+```
+
+### Recognizing Infrastructure / Flaky Failures
+
+Not all CI failures are caused by code changes. Common infrastructure failures:
+
+**Network / Registry issues**:
+- `npm ERR! network`, `ETIMEDOUT`, `ECONNRESET`, `EAI_AGAIN` — npm registry unreachable
+- `error: RPC failed; curl 56`, `fetch-pack: unexpected disconnect` — git network failure
+- `Error: unable to get local issuer certificate` — TLS/certificate issues
+- `rate limit exceeded` — GitHub API rate limiting
+- `HTTPError: Request failed with status code 502` on `electron/electron/releases` — Electron CDN download failure (common in the `node.js integration tests` step, which downloads Electron at runtime)
+
+**Machine / Environment issues**:
+- `No space left on device` — CI disk full
+- `ENOMEM`, `JavaScript heap out of memory` — CI machine ran out of memory
+- `The runner has received a shutdown signal` — CI preemption / timeout
+- `Error: The operation was canceled` — GitHub Actions cancelled the job
+- `Xvfb failed to start` — display server for headless Linux tests failed
+
+**Test flakes** (not infrastructure, but not your fault either):
+- Timeouts on tests that normally pass — slow CI machine
+- Race conditions in async tests
+- Shell integration not reporting exit codes (see terminal.log for `exitCode: undefined`)
+
+**What to do with infrastructure failures**:
+1. **Don't change code** — the failure isn't caused by your PR
+2. **Re-run the failed jobs** via the GitHub UI or:
+   ```bash
+   gh run rerun <RUN_ID> --failed
+   ```
+3. If failures persist across re-runs, check if main is also broken:
+   ```bash
+   gh run list --branch main --limit 10 --json databaseId,conclusion,displayTitle
+   ```
+4. If main is broken too, wait for it to be fixed — your PR is not the cause
+
+---
+
+## Step 7: Fix and Iterate
+
+1. Make the fix locally
+2. Verify compilation: check the `VS Code - Build` task or run `npm run compile-check-ts-native`
+3. Run relevant unit tests locally: `./scripts/test.sh --grep "<pattern>"`
+4. Commit and push:
+   ```bash
+   git add -A
+   git commit -m "fix: <description>"
+   git push
+   ```
+5. Watch CI again:
+   ```bash
+   gh pr checks --watch --fail-fast
+   ```
+
+---
+
+## Quick Reference
+
+| Task | Command |
+|------|---------|
+| Find PR for branch | `gh pr view --json number,url` |
+| List all checks | `gh pr checks --json name,state,bucket` |
+| List failed checks only | `gh pr checks --json name,state,link,bucket --jq '.[] \| select(.bucket == "fail")'` |
+| Watch checks until done | `gh pr checks --watch --fail-fast` |
+| Failed jobs in a run | `gh run view <RUN_ID> --json jobs --jq '.jobs[] \| select(.conclusion == "failure") \| {name, id: .databaseId}'` |
+| View failed step logs | `gh run view <RUN_ID> --job <JOB_ID> --log-failed` (requires full run to complete) |
+| Download job log via API | `gh api repos/microsoft/vscode/actions/jobs/<JOB_ID>/logs > "$TMPDIR/ci-job-log.txt"` (works while run is in progress) |
+| Find error line in log | `grep -n '##\[error\]' "$TMPDIR/ci-job-log.txt"` |
+| Download log artifacts | `gh run download <RUN_ID> -n "<artifact-name>" -D /tmp/ci-logs` |
+| Re-run failed jobs | `gh run rerun <RUN_ID> --failed` |
+| Recent main runs | `gh run list --branch main --workflow <workflow>.yml --limit 5` |
diff --git a/.github/skills/fix-errors/SKILL.md b/.github/skills/fix-errors/SKILL.md
index 7a03d11ee0c..f2afd203619 100644
--- a/.github/skills/fix-errors/SKILL.md
+++ b/.github/skills/fix-errors/SKILL.md
@@ -62,6 +62,34 @@ throw new Error(`[UriError]: Scheme contains illegal characters. scheme:"${ret.s
 
 **Right fix (when producer is known)**: Fix the code that sends malformed data. For example, if an authentication provider passes a stringified URI instead of a `UriComponents` object to a logger creation call, fix that call site to pass the proper object.
 
+## Understanding error construction before fixing
+
+Before proposing any fix, **always find and read the code that constructs the error**. Search the codebase for the error class name or a unique substring of the error message. The construction code reveals:
+
+- **What conditions trigger the error** — thresholds, validation checks, state assertions
+- **What classifications or categories the error encodes** — the error may have subtypes that require different fix strategies
+- **What the error's parameters mean** — numeric values, ratios, or flags embedded in the message often encode diagnostic context
+- **Whether the error is actionable** — some errors are threshold-based warnings where the threshold may be legitimately exceeded by design
+
+Use this understanding to determine the correct fix strategy. The construction code is the source of truth — do NOT assume what the error means from its message alone.
+
+### Example: Listener leak errors
+
+Searching for `ListenerLeakError` leads to `src/vs/base/common/event.ts`, where the construction code reveals:
+
+```typescript
+const kind = topCount / listenerCount > 0.3 ? 'dominated' : 'popular';
+const error = new ListenerLeakError(kind, message, topStack);
+```
+
+Reading this code tells you:
+- The error has two categories based on a ratio
+- **Dominated** (ratio > 30%): one code path accounts for most listeners → that code path is the problem, fix its disposal
+- **Popular** (ratio ≤ 30%): many diverse code paths each contribute a few listeners → the identified stack trace is NOT the root cause; it's just the most identical stack among many. Investigate the emitter and its aggregate subscribers instead
+- For popular leaks: do NOT remove caching/pooling/reuse patterns that appear in the top stack — they exist to solve other problems. If the aggregate count is by design (e.g., many menus subscribing to a shared context key service), close the issue as "not planned"
+
+This analysis came from reading the construction code, not from memorized rules about listener leaks.
+
 ## Guidelines
 
 - Prefer enriching error messages over adding try/catch guards
diff --git a/.github/skills/unit-tests/SKILL.md b/.github/skills/unit-tests/SKILL.md
new file mode 100644
index 00000000000..f2a8b66c5a3
--- /dev/null
+++ b/.github/skills/unit-tests/SKILL.md
@@ -0,0 +1,87 @@
+---
+name: unit-tests
+description: Use when running unit tests in the VS Code repo. Covers the runTests tool, scripts/test.sh (macOS/Linux) and scripts/test.bat (Windows), and their supported arguments for filtering, globbing, and debugging tests.
+---
+
+# Running Unit Tests
+
+## Preferred: Use the `runTests` tool
+
+If the `runTests` tool is available, **prefer it** over running shell commands. It provides structured output with detailed pass/fail information and supports filtering by file and test name.
+
+- Pass absolute paths to test files via the `files` parameter.
+- Pass test names via the `testNames` parameter to filter which tests run.
+- Set `mode="coverage"` to collect coverage.
+
+Example (conceptual): run tests in `src/vs/editor/test/common/model.test.ts` with test name filter `"should split lines"`.
+
+## Fallback: Shell scripts
+
+When the `runTests` tool is not available (e.g. in CLI environments), use the platform-appropriate script from the repo root:
+
+- **macOS / Linux:** `./scripts/test.sh [options]`
+- **Windows:** `.\scripts\test.bat [options]`
+
+These scripts download Electron if needed and launch the Mocha test runner.
+
+### Commonly used options
+
+#### `--run <file>` - Run tests from a specific file
+
+Accepts a **source file path** (starting with `src/`). The runner strips the `src/` prefix and the `.ts`/`.js` extension automatically to resolve the compiled module.
+
+```bash
+./scripts/test.sh --run src/vs/editor/test/common/model.test.ts
+```
+
+Multiple files can be specified by repeating `--run`:
+
+```bash
+./scripts/test.sh --run src/vs/editor/test/common/model.test.ts --run src/vs/editor/test/common/range.test.ts
+```
+
+#### `--grep <pattern>` (aliases: `-g`, `-f`) - Filter tests by name
+
+Runs only tests whose full title matches the pattern (passed to Mocha's `--grep`).
+
+```bash
+./scripts/test.sh --grep "should split lines"
+```
+
+Combine with `--run` to filter tests within a specific file:
+
+```bash
+./scripts/test.sh --run src/vs/editor/test/common/model.test.ts --grep "should split lines"
+```
+
+#### `--runGlob <pattern>` (aliases: `--glob`, `--runGrep`) - Run tests matching a glob
+
+Runs all test files matching a glob pattern against the compiled output directory. Useful for running all tests under a feature area.
+
+```bash
+./scripts/test.sh --runGlob "**/editor/test/**/*.test.js"
+```
+
+Note: the glob runs against compiled `.js` files in the output directory, not source `.ts` files.
+
+#### `--coverage` - Generate a coverage report
+
+```bash
+./scripts/test.sh --run src/vs/editor/test/common/model.test.ts --coverage
+```
+
+#### `--timeout <ms>` - Set test timeout
+
+Override the default Mocha timeout for long-running tests.
+
+```bash
+./scripts/test.sh --run src/vs/editor/test/common/model.test.ts --timeout 10000
+```
+
+### Integration tests
+
+Integration tests (files ending in `.integrationTest.ts` or located in `extensions/`) are **not run** by `scripts/test.sh`. Use `scripts/test-integration.sh` (or `scripts/test-integration.bat`) instead.
+
+### Compilation requirement
+
+Tests run against compiled JavaScript output. Ensure the `VS Code - Build` watch task is running or that compilation has completed before running tests. Test failures caused by stale output are a common pitfall.
diff --git a/.github/skills/update-screenshots/SKILL.md b/.github/skills/update-screenshots/SKILL.md
index 46172cfee2d..294125273ef 100644
--- a/.github/skills/update-screenshots/SKILL.md
+++ b/.github/skills/update-screenshots/SKILL.md
@@ -72,7 +72,16 @@ git add test/componentFixtures/.screenshots/baseline/
 git commit -m "update screenshot baselines from CI"
 ```
 
-### 7. Verify
+### 7. Push LFS objects before pushing
+
+Screenshot baselines are stored in Git LFS. The `git lfs pre-push` hook is not active in this repo (husky overwrites it), so LFS objects are NOT automatically uploaded on `git push`. You must push them manually before pushing the branch, otherwise the push will fail with `GH008: Your push referenced unknown Git LFS objects`.
+
+```bash
+git lfs push --all origin <branch-name>
+git push
+```
+
+### 8. Verify
 
 Confirm the baselines are updated by listing the files:
 
diff --git a/.github/workflows/api-proposal-version-check.yml b/.github/workflows/api-proposal-version-check.yml
index 23f6e052f9f..ee082dee49f 100644
--- a/.github/workflows/api-proposal-version-check.yml
+++ b/.github/workflows/api-proposal-version-check.yml
@@ -23,16 +23,19 @@ jobs:
   check-version-changes:
     name: Check API Proposal Version Changes
     # Run on PR events, or on issue_comment if it's on a PR and contains the override command
-    if: false # temporarily disabled
-      # github.event_name == 'pull_request' ||
-      # (github.event_name == 'issue_comment' &&
-      #  github.event.issue.pull_request &&
-      #  contains(github.event.comment.body, '/api-proposal-change-required'))
+    if: |
+      github.event_name == 'pull_request' ||
+      (github.event_name == 'issue_comment' &&
+       github.event.issue.pull_request &&
+       contains(github.event.comment.body, '/api-proposal-change-required') &&
+       (github.event.comment.author_association == 'OWNER' ||
+        github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'COLLABORATOR'))
     runs-on: ubuntu-latest
     steps:
       - name: Get PR info
         id: pr_info
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             let prNumber, headSha, baseSha;
@@ -59,7 +62,7 @@ jobs:
 
       - name: Check for override comment
         id: check_override
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const prNumber = ${{ steps.pr_info.outputs.number }};
@@ -71,25 +74,50 @@ jobs:
 
             // Only accept overrides from trusted users (repo members/collaborators)
             const trustedAssociations = ['OWNER', 'MEMBER', 'COLLABORATOR'];
-            const overrideComment = comments.find(comment =>
-              comment.body.includes('/api-proposal-change-required') &&
-              trustedAssociations.includes(comment.author_association)
-            );
+            let overrideComment = null;
+            const untrustedOverrides = [];
+
+            comments.forEach((comment, index) => {
+              const hasOverrideText = comment.body.includes('/api-proposal-change-required');
+              const isTrusted = trustedAssociations.includes(comment.author_association);
+              console.log(`Comment ${index + 1}:`);
+              console.log(`  Author: ${comment.user.login}`);
+              console.log(`  Author association: ${comment.author_association}`);
+              console.log(`  Created at: ${comment.created_at}`);
+              console.log(`  Contains override command: ${hasOverrideText}`);
+              console.log(`  Author is trusted: ${isTrusted}`);
+              console.log(`  Would be valid override: ${hasOverrideText && isTrusted}`);
+
+              if (hasOverrideText) {
+                if (isTrusted && !overrideComment) {
+                  overrideComment = comment;
+                } else if (!isTrusted) {
+                  untrustedOverrides.push(comment);
+                }
+              }
+            });
 
             if (overrideComment) {
-              console.log(`Override comment found by ${overrideComment.user.login} (${overrideComment.author_association})`);
+              console.log(`✅ Override comment FOUND`);
+              console.log(`  Comment ID: ${overrideComment.id}`);
+              console.log(`  Author: ${overrideComment.user.login}`);
+              console.log(`  Association: ${overrideComment.author_association}`);
+              console.log(`  Created at: ${overrideComment.created_at}`);
               core.setOutput('override_found', 'true');
               core.setOutput('override_user', overrideComment.user.login);
             } else {
-              // Check if there's an override from an untrusted user
-              const untrustedOverride = comments.find(comment =>
-                comment.body.includes('/api-proposal-change-required') &&
-                !trustedAssociations.includes(comment.author_association)
-              );
-              if (untrustedOverride) {
-                console.log(`Override comment by ${untrustedOverride.user.login} ignored (${untrustedOverride.author_association} is not trusted)`);
+              if (untrustedOverrides.length > 0) {
+                console.log(`⚠️ Found ${untrustedOverrides.length} override comment(s) from UNTRUSTED user(s):`);
+                untrustedOverrides.forEach((comment, index) => {
+                  console.log(`  Untrusted override ${index + 1}:`);
+                  console.log(`    Author: ${comment.user.login}`);
+                  console.log(`    Association: ${comment.author_association}`);
+                  console.log(`    Created at: ${comment.created_at}`);
+                  console.log(`    Comment ID: ${comment.id}`);
+                });
+                console.log(`  Trusted associations are: ${trustedAssociations.join(', ')}`);
               }
-              console.log('No valid override comment found');
+              console.log('❌ No valid override comment found');
               core.setOutput('override_found', 'false');
             }
 
@@ -102,7 +130,7 @@ jobs:
           (github.event.comment.author_association == 'OWNER' ||
            github.event.comment.author_association == 'MEMBER' ||
            github.event.comment.author_association == 'COLLABORATOR')
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const headSha = '${{ steps.pr_info.outputs.head_sha }}';
@@ -213,7 +241,7 @@ jobs:
 
       - name: Post warning comment
         if: steps.check_override.outputs.override_found != 'true' && steps.version_check.outputs.version_changed == 'true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const prNumber = ${{ steps.pr_info.outputs.number }};
diff --git a/.github/workflows/no-engineering-system-changes.yml b/.github/workflows/no-engineering-system-changes.yml
index 45d1ae55f62..be9cf34d077 100644
--- a/.github/workflows/no-engineering-system-changes.yml
+++ b/.github/workflows/no-engineering-system-changes.yml
@@ -21,22 +21,52 @@ jobs:
             echo "engineering_systems_modified=false" >> $GITHUB_OUTPUT
             echo "No engineering systems were modified in this PR"
           fi
+      - name: Allow automated distro updates
+        id: distro_exception
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login == 'vs-code-engineering[bot]' }}
+        run: |
+          # Allow the vs-code-engineering bot ONLY when package.json is the
+          # sole changed file and the diff exclusively touches the "distro" field.
+          ONLY_PKG=$(jq -e '. == ["package.json"]' "$HOME/files.json" > /dev/null 2>&1 && echo true || echo false)
+          if [[ "$ONLY_PKG" != "true" ]]; then
+            echo "Bot modified files beyond package.json — not allowed"
+            echo "allowed=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          DIFF=$(gh pr diff ${{ github.event.pull_request.number }} --repo ${{ github.repository }}) || {
+            echo "Failed to fetch PR diff — not allowed"
+            echo "allowed=false" >> $GITHUB_OUTPUT
+            exit 0
+          }
+          CHANGED_LINES=$(echo "$DIFF" | grep -E '^[+-]' | grep -vE '^(\+\+\+|---)' | wc -l)
+          DISTRO_LINES=$(echo "$DIFF" | grep -cE '^[+-][[:space:]]*"distro"[[:space:]]*:' || true)
+
+          if [[ "$CHANGED_LINES" -eq 2 && "$DISTRO_LINES" -eq 2 ]]; then
+            echo "Distro-only update by bot — allowing"
+            echo "allowed=true" >> $GITHUB_OUTPUT
+          else
+            echo "Bot changed more than the distro field — not allowed"
+            echo "allowed=false" >> $GITHUB_OUTPUT
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Prevent Copilot from modifying engineering systems
-        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login == 'Copilot' }}
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.distro_exception.outputs.allowed != 'true' && github.event.pull_request.user.login == 'Copilot' }}
         run: |
           echo "Copilot is not allowed to modify .github/workflows, build folder files, or package.json files."
           echo "If you need to update engineering systems, please do so manually or through authorized means."
           exit 1
       - uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d # v2.4.0
         id: get_permissions
-        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.distro_exception.outputs.allowed != 'true' && github.event.pull_request.user.login != 'Copilot' }}
         with:
           route: GET /repos/microsoft/vscode/collaborators/${{ github.event.pull_request.user.login }}/permission
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Set control output variable
         id: control
-        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.distro_exception.outputs.allowed != 'true' && github.event.pull_request.user.login != 'Copilot' }}
         run: |
           echo "user: ${{ github.event.pull_request.user.login }}"
           echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
@@ -44,7 +74,7 @@ jobs:
           echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
           echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT
       - name: Check for engineering system changes
-        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.control.outputs.should_run == 'true' }}
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.distro_exception.outputs.allowed != 'true' && steps.control.outputs.should_run == 'true' }}
         run: |
           echo "Changes to .github/workflows/, build/ folder files, or package.json files aren't allowed in PRs."
           exit 1
diff --git a/.github/workflows/no-package-lock-changes.yml b/.github/workflows/no-package-lock-changes.yml
deleted file mode 100644
index 04ea8a43a80..00000000000
--- a/.github/workflows/no-package-lock-changes.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Prevent package-lock.json changes in PRs
-
-on: pull_request
-permissions: {}
-
-jobs:
-  main:
-    name: Prevent package-lock.json changes in PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get file changes
-        uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
-        id: file_changes
-      - name: Check if lockfiles were modified
-        id: lockfile_check
-        run: |
-          if cat $HOME/files.json | jq -e 'any(test("package-lock\\.json$|Cargo\\.lock$"))' > /dev/null; then
-            echo "lockfiles_modified=true" >> $GITHUB_OUTPUT
-            echo "Lockfiles were modified in this PR"
-          else
-            echo "lockfiles_modified=false" >> $GITHUB_OUTPUT
-            echo "No lockfiles were modified in this PR"
-          fi
-      - name: Prevent Copilot from modifying lockfiles
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && github.event.pull_request.user.login == 'Copilot' }}
-        run: |
-          echo "Copilot is not allowed to modify package-lock.json or Cargo.lock files."
-          echo "If you need to update dependencies, please do so manually or through authorized means."
-          exit 1
-      - uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d # v2.4.0
-        id: get_permissions
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
-        with:
-          route: GET /repos/microsoft/vscode/collaborators/{username}/permission
-          username: ${{ github.event.pull_request.user.login }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set control output variable
-        id: control
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
-        run: |
-          echo "user: ${{ github.event.pull_request.user.login }}"
-          echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
-          echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
-          echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
-          echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT
-      - name: Check for lockfile changes
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && steps.control.outputs.should_run == 'true' }}
-        run: |
-          echo "Changes to package-lock.json/Cargo.lock files aren't allowed in PRs."
-          exit 1
diff --git a/.github/workflows/pr-linux-cli-test.yml b/.github/workflows/pr-linux-cli-test.yml
index 003e1344fb6..70874649dd5 100644
--- a/.github/workflows/pr-linux-cli-test.yml
+++ b/.github/workflows/pr-linux-cli-test.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   linux-cli-test:
     name: ${{ inputs.job_name }}
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     env:
       RUSTUP_TOOLCHAIN: ${{ inputs.rustup_toolchain }}
     steps:
diff --git a/.github/workflows/pr-linux-test.yml b/.github/workflows/pr-linux-test.yml
index 7922ec107f9..c2d20a7d21d 100644
--- a/.github/workflows/pr-linux-test.yml
+++ b/.github/workflows/pr-linux-test.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   linux-test:
     name: ${{ inputs.job_name }}
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     env:
       ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}
       NPM_ARCH: x64
@@ -42,7 +42,9 @@ jobs:
             libxkbfile-dev \
             libkrb5-dev \
             libgbm1 \
-            rpm
+            rpm \
+            bubblewrap \
+            socat
           sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
           sudo chmod +x /etc/init.d/xvfb
           sudo update-rc.d xvfb defaults
diff --git a/.github/workflows/pr-node-modules.yml b/.github/workflows/pr-node-modules.yml
index 68e65fd1298..952938c0df4 100644
--- a/.github/workflows/pr-node-modules.yml
+++ b/.github/workflows/pr-node-modules.yml
@@ -10,7 +10,7 @@ permissions: {}
 jobs:
   compile:
     name: Compile
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout microsoft/vscode
         uses: actions/checkout@v6
@@ -86,7 +86,7 @@ jobs:
 
   linux:
     name: Linux
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     env:
       NPM_ARCH: x64
       VSCODE_ARCH: x64
diff --git a/.github/workflows/pr-win32-test.yml b/.github/workflows/pr-win32-test.yml
index 2bde317b480..c9ac6ef0374 100644
--- a/.github/workflows/pr-win32-test.yml
+++ b/.github/workflows/pr-win32-test.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   windows-test:
     name: ${{ inputs.job_name }}
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-windows-2022-x64 ]
+    runs-on: windows-2022
     env:
       ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}
       NPM_ARCH: x64
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index bb87ac077bc..c470f35e069 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,7 +10,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: {}
+permissions:
+  contents: read
 
 env:
   VSCODE_QUALITY: 'oss'
@@ -18,7 +19,7 @@ env:
 jobs:
   compile:
     name: Compile & Hygiene
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout microsoft/vscode
         uses: actions/checkout@v6
diff --git a/.github/workflows/screenshot-test.yml b/.github/workflows/screenshot-test.yml
index c3107065279..01f186a1c81 100644
--- a/.github/workflows/screenshot-test.yml
+++ b/.github/workflows/screenshot-test.yml
@@ -18,7 +18,6 @@ concurrency:
 
 jobs:
   screenshots:
-    if: false # temporarily disabled
     name: Checking Component Screenshots
     runs-on: ubuntu-latest
     steps:
@@ -55,12 +54,12 @@ jobs:
         run: npx playwright install chromium
 
       - name: Capture screenshots
-        run: npx component-explorer screenshot --project ./test/componentFixtures/component-explorer.json
+        run: ./node_modules/.bin/component-explorer screenshot --project ./test/componentFixtures/component-explorer.json
 
       - name: Compare screenshots
         id: compare
         run: |
-          npx component-explorer screenshot:compare \
+          ./node_modules/.bin/component-explorer screenshot:compare \
             --project ./test/componentFixtures \
             --report ./test/componentFixtures/.screenshots/report
         continue-on-error: true
@@ -93,19 +92,33 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           REPORT="test/componentFixtures/.screenshots/report/report.json"
+          STATE="success"
           if [ -f "$REPORT" ]; then
             CHANGED=$(node -e "const r = require('./$REPORT'); console.log(r.summary.added + r.summary.removed + r.summary.changed)")
             TITLE="⚠ ${CHANGED} screenshots changed"
+            BLOCKS_CI=$(node -e "
+              const r = require('./$REPORT');
+              const blocking = Object.entries(r.fixtures).filter(([, f]) =>
+                f.status !== 'unchanged' && (f.labels || []).includes('blocks-ci')
+              );
+              if (blocking.length > 0) {
+                console.log(blocking.map(([name]) => name).join(', '));
+              }
+            ")
+            if [ -n "$BLOCKS_CI" ]; then
+              STATE="failure"
+              TITLE="❌ ${CHANGED} screenshots changed (blocks CI: ${BLOCKS_CI})"
+            fi
           else
             TITLE="✅ Screenshots match"
           fi
 
           SHA="${{ github.event.pull_request.head.sha || github.sha }}"
-          DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json"
+          DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json&search=changed"
 
           gh api "repos/${{ github.repository }}/statuses/$SHA" \
             --input - <<EOF || echo "::warning::Could not create commit status (expected for fork PRs)"
-          {"state":"success","target_url":"$DETAILS_URL","description":"$TITLE","context":"Component Screenshots"}
+          {"state":"$STATE","target_url":"$DETAILS_URL","description":"$TITLE","context":"Component Screenshots"}
           EOF
 
       # - name: Post PR comment
diff --git a/.github/workflows/sessions-e2e.yml b/.github/workflows/sessions-e2e.yml
index bf23ca14745..47ef5fb46bd 100644
--- a/.github/workflows/sessions-e2e.yml
+++ b/.github/workflows/sessions-e2e.yml
@@ -1,13 +1,13 @@
 name: Sessions E2E Tests
 
-on:
-  pull_request:
-    branches:
-      - main
-      - 'release/*'
-    paths:
-      - 'src/vs/sessions/**'
-      - 'scripts/code-sessions-web.*'
+# on:
+#   pull_request:
+#     branches:
+#       - main
+#       - 'release/*'
+#     paths:
+#       - 'src/vs/sessions/**'
+#       - 'scripts/code-sessions-web.*'
 
 permissions:
   contents: read
@@ -59,7 +59,7 @@ jobs:
 
       - name: Upload failure screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: sessions-e2e-failures
           path: src/vs/sessions/test/e2e/out/failure-*.png
diff --git a/.gitignore b/.gitignore
index e5ca4dd32cc..65cb1937168 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,21 +30,16 @@ test/componentFixtures/.screenshots/*
 !test/componentFixtures/.screenshots/baseline/
 dist
 .playwright-cli
+.claude/
 .agents/agents/*.local.md
-.claude/agents/*.local.md
 .github/agents/*.local.md
 .agents/agents/*.local.agent.md
-.claude/agents/*.local.agent.md
 .github/agents/*.local.agent.md
 .agents/hooks/*.local.json
-.claude/hooks/*.local.json
 .github/hooks/*.local.json
 .agents/instructions/*.local.instructions.md
-.claude/instructions/*.local.instructions.md
 .github/instructions/*.local.instructions.md
 .agents/prompts/*.local.prompt.md
-.claude/prompts/*.local.prompt.md
 .github/prompts/*.local.prompt.md
 .agents/skills/.local/
-.claude/skills/.local/
 .github/skills/.local/
diff --git a/.mailmap b/.mailmap
index 4834393cff7..5bd99619330 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,3 @@
-Daniel Imms <daimms@microsoft.com> Daniel Imms <tyriar@tyriar.com>
 Raymond Zhao <raymondzhao@microsoft.com>
 Tyler Leonhardt <tyleonha@microsoft.com> Tyler Leonhardt <me@tylerleonhardt.com>
 João Moreno <joao.moreno@microsoft.com> João Moreno <mail@joaomoreno.com>
diff --git a/.npmrc b/.npmrc
index a275846ab5c..e846219142b 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="39.8.0"
-ms_build_id="13470701"
+target="39.8.3"
+ms_build_id="13658728"
 runtime="electron"
 ignore-scripts=false
 build_from_source="true"
diff --git a/.nvmrc b/.nvmrc
index 85e502778f6..32a2d7bd80d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.22.0
+22.22.1
diff --git a/.vscode/extensions/vscode-extras/src/npmUpToDateFeature.ts b/.vscode/extensions/vscode-extras/src/npmUpToDateFeature.ts
index 8927b0b7064..f21e36604fb 100644
--- a/.vscode/extensions/vscode-extras/src/npmUpToDateFeature.ts
+++ b/.vscode/extensions/vscode-extras/src/npmUpToDateFeature.ts
@@ -112,7 +112,7 @@ export class NpmUpToDateFeature extends vscode.Disposable {
 		}
 		try {
 			const script = path.join(workspaceRoot, 'build', 'npm', 'installStateHash.ts');
-			const output = cp.execFileSync(process.execPath, [script], {
+			const output = cp.execFileSync(process.execPath, [script, '--ignore-node-version'], {
 				cwd: workspaceRoot,
 				timeout: 10_000,
 				encoding: 'utf8',
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 47d901042e3..24c1abde456 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -52,6 +52,15 @@
 				"${workspaceFolder}/out/**/*.js"
 			]
 		},
+		{
+			"type": "node",
+			"request": "attach",
+			"name": "Attach to Agent Host Process",
+			"port": 5878,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			]
+		},
 		{
 			"type": "node",
 			"request": "attach",
@@ -651,7 +660,7 @@
 			"name": "Component Explorer (Edge)",
 			"type": "msedge",
 			"request": "launch",
-			"url": "http://localhost:5337/___explorer",
+			"url": "${taskVar:componentExplorerUrl}",
 			"preLaunchTask": "Launch Component Explorer",
 			"presentation": {
 				"group": "1_component_explorer",
@@ -662,7 +671,7 @@
 			"name": "Component Explorer (Chrome)",
 			"type": "chrome",
 			"request": "launch",
-			"url": "http://localhost:5337/___explorer",
+			"url": "${taskVar:componentExplorerUrl}",
 			"preLaunchTask": "Launch Component Explorer",
 			"presentation": {
 				"group": "1_component_explorer",
@@ -701,6 +710,7 @@
 				"Attach to Main Process",
 				"Attach to Extension Host",
 				"Attach to Shared Process",
+				"Attach to Agent Host Process"
 			],
 			"preLaunchTask": "Ensure Prelaunch Dependencies",
 			"presentation": {
diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index 40235fad54e..c039ae27ce8 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -7,82 +7,32 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"1.111.0\""
+    "value": "$MILESTONE=milestone:\"1.113.0\"\n\n$TPI_CREATION=2026-03-23 // Used to find fixes that need to be verified"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "# Preparation"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Pull Requests on the Milestone"
+    "value": "## Prep: Open PRs and Issues"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:pr is:open"
+    "value": "org:microsoft $MILESTONE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item\norg:microsoft $MILESTONE is:pr is:open"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## Unverified Older Insiders-Released Issues"
+    "value": "## Verification: Missing Steps"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "org:microsoft -$MILESTONE is:issue is:closed reason:completed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan -label:error-telemetry"
+    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:verification-steps-needed -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:z-author-verified -label:unreleased -label:*not-reproducible"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## Unverified Older Insiders-Released Feature Requests"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft -$MILESTONE is:issue is:closed reason:completed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate -label:error-telemetry"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Issues on the Milestone"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:open -label:iteration-plan -label:endgame-plan -label:testplan-item"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Feature Requests Missing Labels"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Open Test Plan Items without milestone"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:open label:testplan-item no:milestone"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Testing"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Test Plan Items"
+    "value": "## Testing & Verification"
   },
   {
     "kind": 2,
@@ -92,66 +42,11 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "## Verification Needed"
+    "value": "These are bugs we created and closed after running the TPI tool. They need to be `verified` manually"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified -label:on-testplan"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Verification"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Verifiable Fixes"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:z-author-verified -label:unreleased -label:*not-reproducible -label:*out-of-scope"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Verifiable Fixes Missing Steps"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug label:verification-steps-needed -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:z-author-verified -label:unreleased -label:*not-reproducible"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## Unreleased Fixes"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:z-author-verified label:unreleased -label:*not-reproducible"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "## All Unverified Fixes"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:z-author-verified -label:*not-reproducible"
-  },
-  {
-    "kind": 1,
-    "language": "markdown",
-    "value": "# Candidates"
-  },
-  {
-    "kind": 2,
-    "language": "github-issues",
-    "value": "org:microsoft $MILESTONE is:issue is:open label:candidate"
+    "value": "org:microsoft $MILESTONE is:issue is:closed label:bug reason:completed -label:verified created:>=$TPI_CREATION"
   }
 ]
\ No newline at end of file
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index f44d9c4a45b..8ee3e6cbe3b 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -7,12 +7,12 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"1.111.0\"\n\n$MINE=assignee:@me"
+    "value": "$MILESTONE=milestone:\"1.113.0\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:TylerLeonhardt -author:Tyriar -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya -author:bryanchen-d -author:cwebster-99 -author:rwoll -author:lostintangent -author:jukasper -author:zhichli"
+    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:TylerLeonhardt -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya -author:bryanchen-d -author:cwebster-99 -author:rwoll -author:lostintangent -author:jukasper -author:zhichli"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index c4bc569e9da..e5c0bd60fbb 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce repo:microsoft/vscode-copilot-issues repo:microsoft/vscode-extension-samples\n\n// current milestone name\n$MILESTONE=milestone:\"March 2026\"\n"
+    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce repo:microsoft/vscode-copilot-issues repo:microsoft/vscode-extension-samples\n\n// current milestone name\n$MILESTONE=milestone:\"1.114.0\"\n"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/verification.github-issues b/.vscode/notebooks/verification.github-issues
index 1c7e9dc1843..84e36a975d5 100644
--- a/.vscode/notebooks/verification.github-issues
+++ b/.vscode/notebooks/verification.github-issues
@@ -32,7 +32,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo"
+    "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo"
   },
   {
     "kind": 1,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bd45f6441fa..99f937bdf9d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,7 +12,6 @@
 	"chat.tools.edits.autoApprove": {
 		".github/skills/azure-pipelines/azure-pipeline.ts": false
 	},
-	"chat.viewSessions.enabled": true,
 	"chat.editing.explainChanges.enabled": true,
 	// --- Editor ---
 	"editor.insertSpaces": false,
@@ -72,6 +71,7 @@
 		"extensions/terminal-suggest/src/completions/upstream/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
+		"src/vs/platform/agentHost/common/state/protocol/**": true,
 		"test/integration/browser/out/**": true,
 		// "src/vs/sessions/**": true
 	},
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index e6bf967ddf0..e0b2a048d9a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -235,20 +235,29 @@
 				"command": ".\\scripts\\code.bat"
 			},
 			"args": [
-				"--sessions"
+				"--sessions",
+				"--user-data-dir=${userHome}/.vscode-oss-sessions-dev",
+				"--extensions-dir=${userHome}/.vscode-oss-sessions-dev/extensions"
 			],
 			"problemMatcher": []
 		},
 		{
-			"label": "Run and Compile Dev Sessions",
-			"type": "shell",
-			"command": "npm run transpile-client && ./scripts/code.sh",
-			"windows": {
-				"command": "npm run transpile-client && .\\scripts\\code.bat"
-			},
-			"args": [
-				"--sessions"
-			],
+			"label": "Transpile Client",
+			"type": "npm",
+			"script": "transpile-client",
+			"problemMatcher": []
+		},
+		{
+			"label": "Run and Compile Sessions - OSS",
+			"dependsOn": ["Transpile Client", "Run Dev Sessions"],
+			"dependsOrder": "sequence",
+			"inSessions": true,
+			"problemMatcher": []
+		},
+		{
+			"label": "Run and Compile Code - OSS",
+			"dependsOn": ["Transpile Client", "Run Dev"],
+			"dependsOrder": "sequence",
 			"inSessions": true,
 			"problemMatcher": []
 		},
@@ -386,8 +395,9 @@
 		{
 			"label": "Launch Component Explorer",
 			"type": "shell",
-			"command": "npx component-explorer serve -c ./test/componentFixtures/component-explorer.json -vv",
+			"command": "npx component-explorer serve -c ./test/componentFixtures/component-explorer.json -vv --kill-if-running",
 			"isBackground": true,
+			"inSessions": true,
 			"problemMatcher": {
 				"owner": "component-explorer",
 				"fileLocation": "absolute",
@@ -400,9 +410,32 @@
 				"background": {
 					"activeOnStart": true,
 					"beginsPattern": ".*Setting up sessions.*",
-					"endsPattern": "Redirection server listening on.*"
+					"endsPattern": "  current: (?<componentExplorerUrl>.*) \\(current\\)"
 				}
 			}
+		},
+		{
+			"label": "Install & Watch",
+			"type": "shell",
+			"command": "npm ci && npm run watch",
+			"windows": {
+				"command": "cmd /c \"npm ci && npm run watch\""
+			},
+			"inSessions": true,
+			"runOptions": {
+				"runOn": "worktreeCreated"
+			}
+		},
+		{
+			"label": "Echo E2E Status",
+			"type": "shell",
+			"command": "pwsh",
+			"args": [
+				"-NoProfile",
+				"-Command",
+				"Write-Output \"134 passed, 0 failed, 1 skipped, 135 total\"; Start-Sleep -Seconds 2; Write-Output \"[PASS] E2E Tests\"; Write-Output \"Watching for changes...\""
+			],
+			"isBackground": false
 		}
 	]
 }
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 0a15b3ff5fc..c4883fd0ad0 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -524,6 +524,580 @@ Title to copyright in this work will at all times remain with copyright holders.
 
 ---------------------------------------------------------
 
+dompurify 3.2.7 - Apache 2.0
+https://github.com/cure53/DOMPurify
+
+DOMPurify
+Copyright 2025 Dr.-Ing. Mario Heiderich, Cure53
+
+DOMPurify is free software; you can redistribute it and/or modify it under the
+terms of either:
+
+a) the Apache License Version 2.0, or
+b) the Mozilla Public License Version 2.0
+
+-----------------------------------------------------------------------------
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+-----------------------------------------------------------------------------
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 dotenv-org/dotenv-vscode 0.26.0 - MIT License
 https://github.com/dotenv-org/dotenv-vscode
 
@@ -2277,7 +2851,7 @@ written authorization of the copyright holder.
 
 ---------------------------------------------------------
 
-vscode-codicons 0.0.41 - MIT and Creative Commons Attribution 4.0
+vscode-codicons 0.0.46-0 - MIT and Creative Commons Attribution 4.0
 https://github.com/microsoft/vscode-codicons
 
 Attribution 4.0 International
diff --git a/build/.moduleignore b/build/.moduleignore
index ed36151130c..faa4973e2dc 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -188,3 +188,28 @@ zone.js/dist/**
 @xterm/xterm-addon-*/fixtures/**
 @xterm/xterm-addon-*/out/**
 @xterm/xterm-addon-*/out-test/**
+
+# @github/copilot - strip unneeded binaries and files
+@github/copilot/sdk/index.js
+@github/copilot/prebuilds/**
+@github/copilot/clipboard/**
+@github/copilot/ripgrep/**
+@github/copilot/**/keytar.node
+
+# @github/copilot platform binaries - not needed
+@github/copilot-darwin-arm64/**
+@github/copilot-darwin-x64/**
+@github/copilot-linux-arm64/**
+@github/copilot-linux-x64/**
+@github/copilot-win32-arm64/**
+@github/copilot-win32-x64/**
+
+# @github/copilot-sdk - strip the nested @github/copilot CLI runtime
+# The SDK only needs its own dist/ files; the CLI is resolved via cliPath at runtime
+@github/copilot-sdk/node_modules/@github/copilot/**
+@github/copilot-sdk/node_modules/@github/copilot-darwin-arm64/**
+@github/copilot-sdk/node_modules/@github/copilot-darwin-x64/**
+@github/copilot-sdk/node_modules/@github/copilot-linux-arm64/**
+@github/copilot-sdk/node_modules/@github/copilot-linux-x64/**
+@github/copilot-sdk/node_modules/@github/copilot-win32-arm64/**
+@github/copilot-sdk/node_modules/@github/copilot-win32-x64/**
diff --git a/build/.npmrc b/build/.npmrc
index 551822f79cd..f1c087f86b5 100644
--- a/build/.npmrc
+++ b/build/.npmrc
@@ -4,3 +4,4 @@ build_from_source="true"
 legacy-peer-deps="true"
 force_process_config="true"
 timeout=180000
+min-release-age="1"
diff --git a/build/azure-pipelines/common/releaseBuild.ts b/build/azure-pipelines/common/releaseBuild.ts
index 3cd8082308e..708978a130c 100644
--- a/build/azure-pipelines/common/releaseBuild.ts
+++ b/build/azure-pipelines/common/releaseBuild.ts
@@ -66,15 +66,8 @@ async function main(force: boolean): Promise<void> {
 
 	console.log(`Releasing build ${commit}...`);
 
-	let rolloutDurationMs = undefined;
-
-	// If the build is insiders or exploration, start a rollout of 4 hours
-	if (quality === 'insider') {
-		rolloutDurationMs = 4 * 60 * 60 * 1000; // 4 hours
-	}
-
 	const scripts = client.database('builds').container(quality).scripts;
-	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit, rolloutDurationMs]));
+	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
 }
 
 const [, , force] = process.argv;
diff --git a/build/azure-pipelines/common/sanity-tests.yml b/build/azure-pipelines/common/sanity-tests.yml
index ce6d95dd7e5..fdf6b2cd3dd 100644
--- a/build/azure-pipelines/common/sanity-tests.yml
+++ b/build/azure-pipelines/common/sanity-tests.yml
@@ -33,9 +33,9 @@ jobs:
       outputs:
         - output: pipelineArtifact
           targetPath: $(SCREENSHOTS_DIR)
-          artifactName: screenshots-${{ parameters.name }}
+          artifactName: screenshots-${{ parameters.name }}-$(System.JobAttempt)
           displayName: Publish Screenshots
-          condition: succeededOrFailed()
+          condition: and(succeededOrFailed(), eq(variables.HAS_SCREENSHOTS, 'true'))
           continueOnError: true
           sbomEnabled: false
     variables:
@@ -171,6 +171,25 @@ jobs:
           condition: and(succeeded(), ne(variables.DOCKER_CACHE_HIT, 'true'))
           displayName: Save Docker Image
 
+      - ${{ if eq(parameters.os, 'windows') }}:
+        - script: |
+            @echo off
+            dir /b "$(SCREENSHOTS_DIR)" 2>nul | findstr . >nul
+            if %errorlevel%==0 (
+              echo ##vso[task.setvariable variable=HAS_SCREENSHOTS]true
+            )
+            exit /b 0
+          displayName: Check Screenshots
+          condition: succeededOrFailed()
+
+      - ${{ else }}:
+        - bash: |
+            if [ -n "$(ls -A "$(SCREENSHOTS_DIR)" 2>/dev/null)" ]; then
+              echo "##vso[task.setvariable variable=HAS_SCREENSHOTS]true"
+            fi
+          displayName: Check Screenshots
+          condition: succeededOrFailed()
+
       - task: PublishTestResults@2
         inputs:
           testResultsFormat: JUnit
diff --git a/build/azure-pipelines/product-npm-package-validate.yml b/build/azure-pipelines/dependencies-check.yml
similarity index 80%
rename from build/azure-pipelines/product-npm-package-validate.yml
rename to build/azure-pipelines/dependencies-check.yml
index 37483396b23..2c0d32b751a 100644
--- a/build/azure-pipelines/product-npm-package-validate.yml
+++ b/build/azure-pipelines/dependencies-check.yml
@@ -1,8 +1,16 @@
 trigger: none
 
-pr:
-  branches:
-    include: ["main"]
+pr: none
+
+parameters:
+  - name: GITHUB_APP_ID
+    type: string
+  - name: GITHUB_APP_INSTALLATION_ID
+    type: string
+  - name: GITHUB_APP_PRIVATE_KEY
+    type: string
+  - name: GITHUB_CHECK_RUN_ID
+    type: string
 
 variables:
   - name: NPM_REGISTRY
@@ -12,11 +20,11 @@ variables:
 
 jobs:
   - job: ValidateNpmPackages
-    displayName: Valiate NPM packages against Terrapin
+    displayName: Validate package-lock.json, Cargo.lock changes via Azure DevOps pipeline
     pool:
       name: 1es-ubuntu-22.04-x64
       os: linux
-    timeoutInMinutes: 40000
+    timeoutInMinutes: 1300
     variables:
       VSCODE_ARCH: x64
     steps:
@@ -75,10 +83,10 @@ jobs:
       - script: |
           set -e
 
-          for attempt in {1..12}; do
+          for attempt in {1..120}; do
             if [ $attempt -gt 1 ]; then
-              echo "Attempt $attempt: Waiting for 30 minutes before retrying..."
-              sleep 1800
+              echo "Attempt $attempt: Waiting for 10 minutes before retrying..."
+              sleep 600
             fi
 
             echo "Attempt $attempt: Running npm ci"
@@ -94,7 +102,7 @@ jobs:
             fi
           done
 
-          echo "npm i failed after 12 attempts"
+          echo "giving up after 120 attempts (20 hours)"
           exit 1
         env:
           npm_command: 'install --ignore-scripts'
@@ -102,7 +110,7 @@ jobs:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: Install dependencies with retries
-        timeoutInMinutes: 400
+        timeoutInMinutes: 1300
         condition: and(succeeded(), eq(variables['SHOULD_VALIDATE'], 'true'))
 
       - script: |
@@ -114,3 +122,13 @@ jobs:
       - script: .github/workflows/check-clean-git-state.sh
         displayName: Check clean git state
         condition: and(succeeded(), eq(variables['SHOULD_VALIDATE'], 'true'))
+
+      - script: node build/azure-pipelines/update-dependencies-check.ts
+        displayName: Update GitHub check run
+        condition: always()
+        env:
+          GITHUB_APP_ID: ${{ parameters.GITHUB_APP_ID }}
+          GITHUB_APP_INSTALLATION_ID: ${{ parameters.GITHUB_APP_INSTALLATION_ID }}
+          GITHUB_APP_PRIVATE_KEY: ${{ parameters.GITHUB_APP_PRIVATE_KEY }}
+          CHECK_RUN_ID: ${{ parameters.GITHUB_CHECK_RUN_ID }}
+          AGENT_JOBSTATUS: $(Agent.JobStatus)
diff --git a/build/azure-pipelines/github-check-run.js b/build/azure-pipelines/github-check-run.js
new file mode 100644
index 00000000000..e6c2a8a892d
--- /dev/null
+++ b/build/azure-pipelines/github-check-run.js
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+
+const crypto = require('crypto');
+const https = require('https');
+
+/**
+ * @param {string} appId
+ * @param {string} privateKey
+ * @returns {string}
+ */
+function createJwt(appId, privateKey) {
+	const now = Math.floor(Date.now() / 1000);
+	const header = Buffer.from(JSON.stringify({ alg: 'RS256', typ: 'JWT' })).toString('base64url');
+	const payload = Buffer.from(JSON.stringify({ iat: now - 60, exp: now + 600, iss: appId })).toString('base64url');
+	const signature = crypto.sign('sha256', Buffer.from(`${header}.${payload}`), privateKey).toString('base64url');
+	return `${header}.${payload}.${signature}`;
+}
+
+/**
+ * @param {import('https').RequestOptions} options
+ * @param {object} [body]
+ * @returns {Promise<any>}
+ */
+function request(options, body) {
+	return new Promise((resolve, reject) => {
+		const req = https.request(options, res => {
+			let data = '';
+			res.on('data', chunk => data += chunk);
+			res.on('end', () => {
+				if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+					resolve(JSON.parse(data));
+				} else {
+					reject(new Error(`HTTP ${res.statusCode}: ${data}`));
+				}
+			});
+		});
+		req.on('error', reject);
+		if (body) {
+			req.write(JSON.stringify(body));
+		}
+		req.end();
+	});
+}
+
+/**
+ * @param {string} jwt
+ * @param {string} installationId
+ * @returns {Promise<string>}
+ */
+async function getInstallationToken(jwt, installationId) {
+	/** @type {{ token: string }} */
+	const result = await request({
+		hostname: 'api.github.com',
+		path: `/app/installations/${encodeURIComponent(installationId)}/access_tokens`,
+		method: 'POST',
+		headers: {
+			'Authorization': `Bearer ${jwt}`,
+			'Accept': 'application/vnd.github+json',
+			'User-Agent': 'VSCode-ADO-Pipeline',
+			'X-GitHub-Api-Version': '2022-11-28'
+		}
+	});
+	return result.token;
+}
+
+/**
+ * @param {string} token
+ * @param {string} checkRunId
+ * @param {string} conclusion
+ * @param {string} detailsUrl
+ */
+function updateCheckRun(token, checkRunId, conclusion, detailsUrl) {
+	return request({
+		hostname: 'api.github.com',
+		path: `/repos/microsoft/vscode/check-runs/${encodeURIComponent(checkRunId)}`,
+		method: 'PATCH',
+		headers: {
+			'Authorization': `token ${token}`,
+			'Accept': 'application/vnd.github+json',
+			'User-Agent': 'VSCode-ADO-Pipeline',
+			'X-GitHub-Api-Version': '2022-11-28'
+		}
+	}, {
+		status: 'completed',
+		conclusion,
+		completed_at: new Date().toISOString(),
+		details_url: detailsUrl
+	});
+}
+
+async function main() {
+	const appId = process.env.GITHUB_APP_ID;
+	const privateKey = process.env.GITHUB_APP_PRIVATE_KEY;
+	const installationId = process.env.GITHUB_APP_INSTALLATION_ID;
+	const checkRunId = process.env.CHECK_RUN_ID;
+	const jobStatus = process.env.AGENT_JOBSTATUS;
+	const detailsUrl = `${process.env.SYSTEM_COLLECTIONURI}${process.env.SYSTEM_TEAMPROJECT}/_build/results?buildId=${process.env.BUILD_BUILDID}`;
+
+	if (!appId || !privateKey || !installationId || !checkRunId) {
+		throw new Error('Missing required environment variables');
+	}
+
+	const jwt = createJwt(appId, privateKey);
+	const token = await getInstallationToken(jwt, installationId);
+
+	/** @type {string} */
+	let conclusion;
+	switch (jobStatus) {
+		case 'Succeeded':
+		case 'SucceededWithIssues':
+			conclusion = 'success';
+			break;
+		case 'Canceled':
+			conclusion = 'cancelled';
+			break;
+		default:
+			conclusion = 'failure';
+			break;
+	}
+
+	await updateCheckRun(token, checkRunId, conclusion, detailsUrl);
+	console.log(`Updated check run ${checkRunId} with conclusion: ${conclusion}`);
+}
+
+main().catch(err => {
+	console.error(err);
+	process.exit(1);
+});
diff --git a/build/azure-pipelines/linux/product-build-linux-node-modules.yml b/build/azure-pipelines/linux/product-build-linux-node-modules.yml
index 290a3fe1b29..ad0e1498160 100644
--- a/build/azure-pipelines/linux/product-build-linux-node-modules.yml
+++ b/build/azure-pipelines/linux/product-build-linux-node-modules.yml
@@ -41,7 +41,9 @@ jobs:
             libxkbfile-dev \
             libkrb5-dev \
             libgbm1 \
-            rpm
+            rpm \
+            bubblewrap \
+            socat
           sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
           sudo chmod +x /etc/init.d/xvfb
           sudo update-rc.d xvfb defaults
diff --git a/build/azure-pipelines/linux/steps/product-build-linux-compile.yml b/build/azure-pipelines/linux/steps/product-build-linux-compile.yml
index 82e1a19107d..4b5a5d08cd0 100644
--- a/build/azure-pipelines/linux/steps/product-build-linux-compile.yml
+++ b/build/azure-pipelines/linux/steps/product-build-linux-compile.yml
@@ -48,7 +48,9 @@ steps:
         libxkbfile-dev \
         libkrb5-dev \
         libgbm1 \
-        rpm
+        rpm \
+        bubblewrap \
+        socat
       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
       sudo chmod +x /etc/init.d/xvfb
       sudo update-rc.d xvfb defaults
@@ -345,7 +347,7 @@ steps:
         - script: |
             set -e
             npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
-            sudo -E docker run -e VSCODE_ARCH -e VSCODE_QUALITY -v $(pwd):/work -w /work vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64 /bin/bash -c "./build/azure-pipelines/linux/build-snap.sh"
+            sudo -E docker run -e VSCODE_ARCH -e VSCODE_QUALITY -v $(pwd):/work -w /work vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64@sha256:ab4a88c4d85e0d7a85acabba59543f7143f575bab2c0b2b07f5b77d4a7e491ff /bin/bash -c "./build/azure-pipelines/linux/build-snap.sh"
 
             SNAP_ROOT="$(pwd)/.build/linux/snap/$(VSCODE_ARCH)"
             SNAP_EXTRACTED_PATH=$(find $SNAP_ROOT -maxdepth 1 -type d -name 'code-*')
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index e016db50686..fa1cc1a7699 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -122,7 +122,7 @@ variables:
   - name: VSCODE_BUILD_STAGE_WEB
     value: ${{ eq(parameters.VSCODE_BUILD_WEB, true) }}
   - name: VSCODE_CIBUILD
-    value: ${{ or(in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), eq(parameters.VSCODE_BUILD_TYPE, 'CI')) }}
+    value: ${{ or(and(in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))), eq(parameters.VSCODE_BUILD_TYPE, 'CI')) }}
   - name: VSCODE_PUBLISH
     value: ${{ and(eq(parameters.VSCODE_PUBLISH, true), eq(variables.VSCODE_CIBUILD, false)) }}
   - name: VSCODE_SCHEDULEDBUILD
@@ -710,7 +710,7 @@ extends:
                   baseImage: ubuntu:24.04
                   arch: arm64
 
-        - ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false)) }}:
+        - ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
           - stage: ApproveRelease
             dependsOn: [] # run in parallel to compile stage
             pool:
@@ -739,6 +739,50 @@ extends:
                     parameters:
                       VSCODE_RELEASE: ${{ parameters.VSCODE_RELEASE }}
 
+      - ${{ if and(in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}:
+        - stage: TriggerStableBuild
+          displayName: Trigger Stable Build
+          dependsOn: []
+          pool:
+            name: 1es-ubuntu-22.04-x64
+            os: linux
+          jobs:
+            - job: TriggerStableBuild
+              displayName: Trigger Stable Build
+              steps:
+                - checkout: none
+                - script: |
+                    set -e
+                    node -e '
+                      async function main() {
+                        const body = JSON.stringify({
+                          definition: { id: Number(process.env.DEFINITION_ID) },
+                          sourceBranch: process.env.SOURCE_BRANCH,
+                          sourceVersion: process.env.SOURCE_VERSION,
+                          templateParameters: { VSCODE_QUALITY: "stable", VSCODE_RELEASE: "false" }
+                        });
+                        console.log(`Triggering stable build on ${process.env.SOURCE_BRANCH} @ ${process.env.SOURCE_VERSION}...`);
+                        const response = await fetch(process.env.BUILDS_API_URL, {
+                          method: "POST",
+                          headers: { "Authorization": `Bearer ${process.env.SYSTEM_ACCESSTOKEN}`, "Content-Type": "application/json" },
+                          body
+                        });
+                        if (!response.ok) {
+                          throw new Error(`Request failed with status ${response.status}: ${await response.text()}`);
+                        }
+                        const build = await response.json();
+                        console.log(`Build queued successfully — ID: ${build.id}, URL: ${build._links.web.href}`);
+                      }
+                      main().catch(err => { console.error(err); process.exit(1); });
+                    '
+                  displayName: Queue stable build
+                  env:
+                    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+                    DEFINITION_ID: $(System.DefinitionId)
+                    SOURCE_BRANCH: $(Build.SourceBranch)
+                    SOURCE_VERSION: $(Build.SourceVersion)
+                    BUILDS_API_URL: $(System.TeamFoundationCollectionUri)$(System.TeamProject)/_apis/build/builds?api-version=7.0
+
       - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
         - stage: node_modules
           dependsOn: []
diff --git a/build/azure-pipelines/product-sanity-tests.yml b/build/azure-pipelines/product-sanity-tests.yml
index ade0b96878b..8f555f30a1f 100644
--- a/build/azure-pipelines/product-sanity-tests.yml
+++ b/build/azure-pipelines/product-sanity-tests.yml
@@ -15,7 +15,6 @@ parameters:
   - name: buildCommit
     displayName: Published Build Commit
     type: string
-    default: ''
 
   - name: npmRegistry
     displayName: Custom NPM Registry URL
@@ -28,17 +27,9 @@ variables:
   - name: Codeql.SkipTaskAutoInjection
     value: true
   - name: BUILD_COMMIT
-    ${{ if ne(parameters.buildCommit, '') }}:
-      value: ${{ parameters.buildCommit }}
-    ${{ else }}:
-      value: $(resources.pipeline.vscode.sourceCommit)
+    value: ${{ parameters.buildCommit }}
   - name: BUILD_QUALITY
-    ${{ if ne(parameters.buildCommit, '') }}:
-      value: ${{ parameters.buildQuality }}
-    ${{ elseif startsWith(variables['Build.SourceBranch'], 'refs/heads/release/') }}:
-      value: stable
-    ${{ else }}:
-      value: insider
+    value: ${{ parameters.buildQuality }}
   - name: NPM_REGISTRY
     value: ${{ parameters.npmRegistry }}
 
@@ -50,17 +41,6 @@ resources:
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
-  pipelines:
-    - pipeline: vscode
-      # allow-any-unicode-next-line
-      source: '⭐️ VS Code'
-      trigger:
-        stages:
-          - Publish
-        branches:
-          include:
-            - main
-            - release/*
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
diff --git a/build/azure-pipelines/update-dependencies-check.ts b/build/azure-pipelines/update-dependencies-check.ts
new file mode 100644
index 00000000000..5923770fc2e
--- /dev/null
+++ b/build/azure-pipelines/update-dependencies-check.ts
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import crypto from 'crypto';
+import https from 'https';
+
+function createJwt(appId: string, privateKey: string): string {
+	const now = Math.floor(Date.now() / 1000);
+	const header = Buffer.from(JSON.stringify({ alg: 'RS256', typ: 'JWT' })).toString('base64url');
+	const payload = Buffer.from(JSON.stringify({ iat: now - 60, exp: now + 600, iss: appId })).toString('base64url');
+	const signature = crypto.sign('sha256', Buffer.from(`${header}.${payload}`), privateKey).toString('base64url');
+	return `${header}.${payload}.${signature}`;
+}
+
+function request(options: https.RequestOptions, body?: object): Promise<Record<string, unknown>> {
+	return new Promise((resolve, reject) => {
+		const req = https.request(options, res => {
+			let data = '';
+			res.on('data', chunk => data += chunk);
+			res.on('end', () => {
+				if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+					resolve(JSON.parse(data));
+				} else {
+					reject(new Error(`HTTP ${res.statusCode}: ${data}`));
+				}
+			});
+		});
+		req.on('error', reject);
+		if (body) {
+			req.write(JSON.stringify(body));
+		}
+		req.end();
+	});
+}
+
+async function getInstallationToken(jwt: string, installationId: string): Promise<string> {
+	const result = await request({
+		hostname: 'api.github.com',
+		path: `/app/installations/${encodeURIComponent(installationId)}/access_tokens`,
+		method: 'POST',
+		headers: {
+			'Authorization': `Bearer ${jwt}`,
+			'Accept': 'application/vnd.github+json',
+			'User-Agent': 'VSCode-ADO-Pipeline',
+			'X-GitHub-Api-Version': '2022-11-28'
+		}
+	});
+	return result.token as string;
+}
+
+function updateCheckRun(token: string, checkRunId: string, conclusion: string, detailsUrl: string) {
+	return request({
+		hostname: 'api.github.com',
+		path: `/repos/microsoft/vscode/check-runs/${encodeURIComponent(checkRunId)}`,
+		method: 'PATCH',
+		headers: {
+			'Authorization': `token ${token}`,
+			'Accept': 'application/vnd.github+json',
+			'User-Agent': 'VSCode-ADO-Pipeline',
+			'X-GitHub-Api-Version': '2022-11-28'
+		}
+	}, {
+		status: 'completed',
+		conclusion,
+		completed_at: new Date().toISOString(),
+		details_url: detailsUrl
+	});
+}
+
+async function main() {
+	const appId = process.env.GITHUB_APP_ID;
+	const privateKey = process.env.GITHUB_APP_PRIVATE_KEY;
+	const installationId = process.env.GITHUB_APP_INSTALLATION_ID;
+	const checkRunId = process.env.CHECK_RUN_ID;
+	const jobStatus = process.env.AGENT_JOBSTATUS;
+	const detailsUrl = `${process.env.SYSTEM_COLLECTIONURI}${process.env.SYSTEM_TEAMPROJECT}/_build/results?buildId=${process.env.BUILD_BUILDID}`;
+
+	if (!appId || !privateKey || !installationId || !checkRunId) {
+		throw new Error('Missing required environment variables');
+	}
+
+	const jwt = createJwt(appId, privateKey);
+	const token = await getInstallationToken(jwt, installationId);
+
+	let conclusion: string;
+	switch (jobStatus) {
+		case 'Succeeded':
+		case 'SucceededWithIssues':
+			conclusion = 'success';
+			break;
+		case 'Canceled':
+			conclusion = 'cancelled';
+			break;
+		default:
+			conclusion = 'failure';
+			break;
+	}
+
+	await updateCheckRun(token, checkRunId, conclusion, detailsUrl);
+	console.log(`Updated check run ${checkRunId} with conclusion: ${conclusion}`);
+}
+
+main().catch(err => {
+	console.error(err);
+	process.exit(1);
+});
diff --git a/build/azure-pipelines/win32/product-build-win32-cli.yml b/build/azure-pipelines/win32/product-build-win32-cli.yml
index 78461a959ed..20e49d34866 100644
--- a/build/azure-pipelines/win32/product-build-win32-cli.yml
+++ b/build/azure-pipelines/win32/product-build-win32-cli.yml
@@ -120,6 +120,9 @@ jobs:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           displayName: ✍️ Codesign
 
+        - powershell: Remove-Item -Path "$(Build.ArtifactStagingDirectory)/sign/CodeSignSummary*.md" -Force -ErrorAction SilentlyContinue
+          displayName: Remove CodeSignSummary
+
         - task: ArchiveFiles@2
           displayName: Archive signed CLI
           inputs:
diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml
index e3356effa95..2580588a743 100644
--- a/build/azure-pipelines/win32/sdl-scan-win32.yml
+++ b/build/azure-pipelines/win32/sdl-scan-win32.yml
@@ -100,7 +100,11 @@ steps:
     env:
       VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
 
-  - powershell: npm run compile
+  - template: ../common/install-builtin-extensions.yml@self
+
+  - powershell: npm run gulp core-ci
+    env:
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Compile
 
   - powershell: npm run gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
diff --git a/build/buildfile.ts b/build/buildfile.ts
index 47b0476892c..80c97ff1daa 100644
--- a/build/buildfile.ts
+++ b/build/buildfile.ts
@@ -24,6 +24,7 @@ export const workbenchDesktop = [
 	createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
 	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
 	createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
+	createModuleDescription('vs/platform/agentHost/node/agentHostMain'),
 	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
 	createModuleDescription('vs/workbench/workbench.desktop.main'),
 	createModuleDescription('vs/sessions/sessions.desktop.main')
@@ -53,7 +54,8 @@ export const codeServer = [
 	// 'vs/server/node/server.cli' is not included here because it gets inlined via ./src/server-cli.js
 	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
 	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
-	createModuleDescription('vs/platform/terminal/node/ptyHostMain')
+	createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
+	createModuleDescription('vs/platform/agentHost/node/agentHostMain')
 ];
 
 export const entrypoint = createModuleDescription;
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 5d8343f42a9..3a0e930f3f4 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-d70954386008ad2c65d9849bb89955ab3c7dd08763256ae0d91d8604e8894d64 *chromedriver-v39.8.0-darwin-arm64.zip
-2f6b654337133c13440aafdaf9e8b15f5ebb244e7d49f20977f03438e9bb8adb *chromedriver-v39.8.0-darwin-x64.zip
-ef8681bb6b6af42cdf0e14c9ce188f035e01620781308c06cd3c6b922aaea2e6 *chromedriver-v39.8.0-linux-arm64.zip
-c03fea6ac2b743d771407dc5f58809f44d2a885b1830b847957823cac2e7b222 *chromedriver-v39.8.0-linux-armv7l.zip
-4bb7c6d9b3a7bfdd89edd0db98e63599ebf6dacdb888d5985bbb73f6153acc0c *chromedriver-v39.8.0-linux-x64.zip
-aad1f6f970b5636d637c1c242766fbaa5bebe2707a605a38aadc7b40724b3d11 *chromedriver-v39.8.0-mas-arm64.zip
-e89ebebe3a135d3ce40168152a0aabfd055b9fa6b118262a6df18405fd2ea433 *chromedriver-v39.8.0-mas-x64.zip
-232e1a0460f6a59056499cccfff3265bf92eae22f20f02f2419e5e49552aaed7 *chromedriver-v39.8.0-win32-arm64.zip
-ab92f46cc55da7c719175b50203c734781828389b8b3a1a535204bf0dc7d1296 *chromedriver-v39.8.0-win32-ia32.zip
-a40eb521063e4ea6791ed4005815fa8ac259c1febc850246a83a47ce120121ce *chromedriver-v39.8.0-win32-x64.zip
-d6a33b4c3c0de845ea23d1e2614c6c6d3bbe35b771bb63ae521c4db11373b021 *electron-api.json
-5425323fdb23167870075e944ec6cf3ae383fbe45ad141d08b1d9689030ccd05 *electron-v39.8.0-darwin-arm64-dsym-snapshot.zip
-aa32ab00ee58d8827cd53ca561b8c26b7cb7e2ad8cb0801acdda117ee728388e *electron-v39.8.0-darwin-arm64-dsym.zip
-f94e589804a3394a4735543b888927be873f8f402899d0debe32a9dc570d6285 *electron-v39.8.0-darwin-arm64-symbols.zip
-681d82c2ec6677ff0bf12f5bb1808b5a51dcbf10894bd0298641015119a3e04d *electron-v39.8.0-darwin-arm64.zip
-a95e83b5cde762a37e64229e5669b0c19b95aac148689d96ca344535109eb983 *electron-v39.8.0-darwin-x64-dsym-snapshot.zip
-8c989d8ca835ecdd93d49d9627f5548272c0ed03e263392b21ed287960b29e41 *electron-v39.8.0-darwin-x64-dsym.zip
-b4b6fda9c5b9063a104318645aa29ef4738dd099da2b722e3e9b6dde5e098418 *electron-v39.8.0-darwin-x64-symbols.zip
-ec53f2ba79498410323bb96a19ce98741bf28666cc9d83e07d11dadcc5506f38 *electron-v39.8.0-darwin-x64.zip
-9141e64f9d4ea7f0e6a43ae364c8232a0dac79ecec44de2d4a0e5d688fbb742c *electron-v39.8.0-linux-arm64-debug.zip
-5fac949d5331abaff0643dbcda7cc187e548cd4bf9d198c1ffc361383bfaa79f *electron-v39.8.0-linux-arm64-symbols.zip
-c9db883fa671237fbc16256cf89aba55b9fcfbd9825fec32a6d57724a6446fe1 *electron-v39.8.0-linux-arm64.zip
-b26ac10e84f6b7d338c13a38547aa66b5e9afbe2f1355b183ebc2ff8f428cfa9 *electron-v39.8.0-linux-armv7l-debug.zip
-16c47c008a8783f6c8d6387fe01ea15425161befbf4211e4667bbdd6bb806ef0 *electron-v39.8.0-linux-armv7l-symbols.zip
-b1b37fd450a5081a876c2b00b6ca007d454747a7d1d8f04feb16119d6ace94c6 *electron-v39.8.0-linux-armv7l.zip
-1e8039cdf60b27785771c9e3f3c4c39fad37602bb0e6b75a30f83c57fdbef069 *electron-v39.8.0-linux-x64-debug.zip
-ff9ca169c6e79649dd4c5a49a82a8d4b1761b62fbe14c15c61bf534381a9f653 *electron-v39.8.0-linux-x64-symbols.zip
-854076cc4c63d6d6c320df1ca3f4bd7084ef9f9bb47c7b75d80feb2c2ed920b4 *electron-v39.8.0-linux-x64.zip
-91bc313cbd009435552d8d5efff5d6ed0ff15465743c2629dac1cfe99ac34e4d *electron-v39.8.0-mas-arm64-dsym-snapshot.zip
-974f10f80ec6c65f8d9f2ac1ccd8c4395bb34e24e2b09dc0ff80bd351099692e *electron-v39.8.0-mas-arm64-dsym.zip
-b3878bc9198cff324b7c829ce2fbea7a4ee505f2f99b0bb3c11ac5e60651be59 *electron-v39.8.0-mas-arm64-symbols.zip
-48dac99c757a850b0db7b38c1b95e08270f690a7ea1b58872e45308c2f7c8c93 *electron-v39.8.0-mas-arm64.zip
-1a6e4df1092f89ed46833938d6dd1b3036640037bd09f0630a369ae386a7c872 *electron-v39.8.0-mas-x64-dsym-snapshot.zip
-81425eb867527341af64c00726bd462957fec4d5f073922df891d830addbc5bc *electron-v39.8.0-mas-x64-dsym.zip
-748ce154e894a27b117b46354cc288dc9442fade844c637b59fe1c1f3f7c625d *electron-v39.8.0-mas-x64-symbols.zip
-91f8f7d4eb1a42ac4fa0eaa93034c8e6155ccb50718f9f55541ce2be4a4ed6d0 *electron-v39.8.0-mas-x64.zip
-b775b7584afb84e52b0a770e1e63a2f17384b66eeebe845e0c5c82beacaf7e93 *electron-v39.8.0-win32-arm64-pdb.zip
-ac62373d11ed682b4fcdae27de2bd72ebf7d46d3b569f5fcf242de01786d0948 *electron-v39.8.0-win32-arm64-symbols.zip
-b701e63ca5d443d9bd1b653ea0e2b7479f0d834a3d1bd9f10a3b745d29607154 *electron-v39.8.0-win32-arm64-toolchain-profile.zip
-08b79fa5deabbcace447f1e15eb99b3b117b42a84b71ad5b0f52d2da68a34192 *electron-v39.8.0-win32-arm64.zip
-f4fb798d76a0c2f80717ef1607571537dbbb07f1cc5f177048bcfd17046c2255 *electron-v39.8.0-win32-ia32-pdb.zip
-37c1d2988793604294724b648589fca6459472021189abab1550d5e1eecff1a7 *electron-v39.8.0-win32-ia32-symbols.zip
-b701e63ca5d443d9bd1b653ea0e2b7479f0d834a3d1bd9f10a3b745d29607154 *electron-v39.8.0-win32-ia32-toolchain-profile.zip
-59b70a12abedb550795614bc74c5803787e824da3529a631fdb5c2b5aad00196 *electron-v39.8.0-win32-ia32.zip
-0357c6fb0d7198c45cba0e8c939473ea1d971e1efe801bc84e2c559141b368e7 *electron-v39.8.0-win32-x64-pdb.zip
-8e6f4e8516d15aecde5244beac315067c13513c7074383086523eef2638a5e8d *electron-v39.8.0-win32-x64-symbols.zip
-b701e63ca5d443d9bd1b653ea0e2b7479f0d834a3d1bd9f10a3b745d29607154 *electron-v39.8.0-win32-x64-toolchain-profile.zip
-9edc111b22aee1a0efb5103d6d3b48645af57b48214eeb48f75f9edfc3e271d6 *electron-v39.8.0-win32-x64.zip
-b6eca0e05fcff2464382278dff52367f6f21eb1a580dd8a0a954fc16397ab085 *electron.d.ts
-27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.8.0-darwin-arm64.zip
-321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.8.0-darwin-x64.zip
-52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.8.0-linux-arm64.zip
-622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.8.0-linux-armv7l.zip
-ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.8.0-linux-x64.zip
-27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.8.0-mas-arm64.zip
-321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.8.0-mas-x64.zip
-3ba7c7507181e0d4836f70f3d8800b4e9ba379e1086e9e89fda7ff9b3b9ad2cb *ffmpeg-v39.8.0-win32-arm64.zip
-f37e7d51b8403e2ed8ca192bc6ae759cf63d80010e747b15eeb7120b575578b2 *ffmpeg-v39.8.0-win32-ia32.zip
-b252e232438010f9683e8fd10c3bf0631df78e42a6ae11d6cb7aa7e6ac11185f *ffmpeg-v39.8.0-win32-x64.zip
-365735192f58a7f7660100227ec348ba3df604415ff5264b54d93cb6cf5f6f6f *hunspell_dictionaries.zip
-6384ee31daa39de4dd4bd3aa225cdb14cdddb7f463a2c1663b38a79e122a13e2 *libcxx-objects-v39.8.0-linux-arm64.zip
-9748b3272e52a8274fe651def2d6ae2dad7a3771b520dd105f46f4020ba9d63b *libcxx-objects-v39.8.0-linux-armv7l.zip
-74d47a155ecc6c2054418c7c3e0540f32b983ebdc65e8b4ea5d3e257d29b3f4f *libcxx-objects-v39.8.0-linux-x64.zip
-c0755fbb84011664bd36459fc6e06a603078dccd3b7b260f6ed6ad1d409f79f7 *libcxx_headers.zip
-3ea41e9bd56e8f52ab8562c1406ba9416abe3993640935e981cbbd77c0f2654b *libcxxabi_headers.zip
-befcd6067f35d911a6a87b927e79dc531cb7bea39e85f86a65e9ab82ef0cece1 *mksnapshot-v39.8.0-darwin-arm64.zip
-f0e692655298ffed60630c3e6490ced69e9d8726e85bcaecfa34485f3a991469 *mksnapshot-v39.8.0-darwin-x64.zip
-d5d0901cd1eafdf921d2a0d1565829cf60f454a71ce74fa60db98780fd8a1a96 *mksnapshot-v39.8.0-linux-arm64-x64.zip
-1bc0a3294d258a59846aa5c5359cd8b0f43831ebd7c3e1dde9a6cfaa39d845bf *mksnapshot-v39.8.0-linux-armv7l-x64.zip
-4e414dbe75f460cb34508608db984aa6f4d274f333fa327a3d631da4a516da8f *mksnapshot-v39.8.0-linux-x64.zip
-c51c86e3a11ad75fb4f7559798f6d64ec7def19583c96ce08de7ee5796568841 *mksnapshot-v39.8.0-mas-arm64.zip
-6544d1e93adea1e9a694f9b9f539d96f84df647d9c9319b29d4fc88751ff9075 *mksnapshot-v39.8.0-mas-x64.zip
-372b4685c53f19ccc72c33d78c1283d9389c72f42cd48224439fe4f89199caa0 *mksnapshot-v39.8.0-win32-arm64-x64.zip
-199e9244f4522a4a02aece09a6a33887b24d7ec837640d39c930170e4b3caa57 *mksnapshot-v39.8.0-win32-ia32.zip
-970e979e7a8b70f300f7854cb571756d9049bc42b44a6153a9ce3a18e1a83243 *mksnapshot-v39.8.0-win32-x64.zip
+0ab48e3e8888b5c33950be0c36da939aa989df7609d3c32140c5e5371ea53abb *chromedriver-v39.8.3-darwin-arm64.zip
+b7103565ffb4068dc705c50ce3039ed3178cac350301abf82545de54ac3bc849 *chromedriver-v39.8.3-darwin-x64.zip
+e7e43ee7a3d14482ce488d0b0bc338a026a00ee544e5a3d55aed220af6b5da0e *chromedriver-v39.8.3-linux-arm64.zip
+060223baebe6d8f9e8c7367bf561dd558fca03509edcc3bce660c42f96ad73ea *chromedriver-v39.8.3-linux-armv7l.zip
+854a6f921684e59866aed9db0e9f61d28f756f70b7898f947359b4d04dba76db *chromedriver-v39.8.3-linux-x64.zip
+f70ea58bc5e4e51eec51f65e153cfd36eea568ecd571c2815a4c05a457b6923d *chromedriver-v39.8.3-mas-arm64.zip
+8e3e1450bc544bff712ffab0ba365d1ed2c9b79116b4ec4750a46c8607242ed4 *chromedriver-v39.8.3-mas-x64.zip
+c07e35a2a5a673c8902452571f3436ca8b774fa4628ad9e42f179d3c935f4ed7 *chromedriver-v39.8.3-win32-arm64.zip
+d0361344208d8bdf58500d08ae1bb723b9ccdc66fc736c2fc6c9f011bcc6e47d *chromedriver-v39.8.3-win32-ia32.zip
+e2e91fd7d97e3e9806d22c4990253cbd5e466cdfa1a8e4c86c72431f7d3a8d0f *chromedriver-v39.8.3-win32-x64.zip
+f004c879e159edf3eb403bd43bc76c3069b0b375c6dfae5b249b96d543e51e26 *electron-api.json
+21a5324aaed782fead97b2e50f833373148392d4c13ec818f80f142e800c6158 *electron-v39.8.3-darwin-arm64-dsym-snapshot.zip
+bb9c14900f48aabb7d272149ba4b60813b366f1e67f95b510da73355e15ba78c *electron-v39.8.3-darwin-arm64-dsym.zip
+8a42b50a0841e7bfefc49e704f5cfdb3cbb7b9a507ac74b9982004a9350a202d *electron-v39.8.3-darwin-arm64-symbols.zip
+e1b9e03a56fc27ad567c8d2bb32a21e0e2afe6a095f71c26df5b8b8ed8dd8d4c *electron-v39.8.3-darwin-arm64.zip
+5b474116e398286a80def6509fa255481ab88fbb52b1770dfd5d39ddff124c6b *electron-v39.8.3-darwin-x64-dsym-snapshot.zip
+14648a98eef5a28c1158f0580a813617d9ce6d77a8b7881c389acfff34d328cd *electron-v39.8.3-darwin-x64-dsym.zip
+231e13b26c39cceecec359e74c00e4d6a13de3ae9fb6459f18846f91f214074f *electron-v39.8.3-darwin-x64-symbols.zip
+22cf6f6147d5d632e2a8ad5207504a18db94a8c96e3f4f65f792822eaed7bf1c *electron-v39.8.3-darwin-x64.zip
+fdf25df8857e1ef2cdb0a5be71b78dfb9923a6061cf11336577c6a4368ecfdcd *electron-v39.8.3-linux-arm64-debug.zip
+731bf3f908a1efe871e862852087b67027c791427284f057d42376634d4d53d3 *electron-v39.8.3-linux-arm64-symbols.zip
+e1a0e6939fe2d10c1f807888f74dbbb9f28a2cfc25e28bb8168f5513513fc124 *electron-v39.8.3-linux-arm64.zip
+65893fd03097eadb0c89eb95ded97e97a9910bbc53634f12170cfb40b9165832 *electron-v39.8.3-linux-armv7l-debug.zip
+997acce3540d16f9e0551cde811021999a4276c970bfe42ed77c3fd769ba6d05 *electron-v39.8.3-linux-armv7l-symbols.zip
+5d5825966a3b2678c50121c81ed3fb8c39d35c3798dd0413a19afaac04109ef9 *electron-v39.8.3-linux-armv7l.zip
+52b44ef60f73ef7b7c8461f520a1048da3601d9cc869262ec63f507cd6591e78 *electron-v39.8.3-linux-x64-debug.zip
+c4e1fa21d21724ab7f5bcdb6c1bfc03dca837ebcca00d6af56944041499d35a9 *electron-v39.8.3-linux-x64-symbols.zip
+5866d6c6f8fcf15967279107d2387edfa4589c5a00ad52d4b770d7504106a734 *electron-v39.8.3-linux-x64.zip
+3ff4c9fb99f40dda465486fa6fa23eaedd89b87dcd9cce402a171accfcacc9bd *electron-v39.8.3-mas-arm64-dsym-snapshot.zip
+9401101eabaf5e55063b9fad94bf3ac2fe9d743ff88ec638a3c6c665b2266564 *electron-v39.8.3-mas-arm64-dsym.zip
+0905e57da501b64436dff51b1378bae311cb1276372dc39dedb7aef44f1b947a *electron-v39.8.3-mas-arm64-symbols.zip
+1af2cdee3405c0b8e1c8145a65891b249ac737dd35d959cebd6833970ad5eb08 *electron-v39.8.3-mas-arm64.zip
+9e8c6b7b880ac726cda52aaf2b02bc9f0750559be85ef1583789d52b617914b9 *electron-v39.8.3-mas-x64-dsym-snapshot.zip
+483ce280606a61c7ed4394e99008ad6fc7e2ce9c35149c5ad745bce9ee78a7a2 *electron-v39.8.3-mas-x64-dsym.zip
+1e16529ab1ee8404b1623df611077abcbbbabc1f825a57e93e2ef2b1f7ba788a *electron-v39.8.3-mas-x64-symbols.zip
+19df399b352db2c3b3f26f830700b17adf697b70e4d361b1e0f20790e6e703b6 *electron-v39.8.3-mas-x64.zip
+bdfd01e7c55ea4beb90afd4285ab3639e3a66808ec993389e9eaf62c3edcb5e9 *electron-v39.8.3-win32-arm64-pdb.zip
+7329264c9d308a78081509cb4173f0bd931522655d2f434ad858555e735e5721 *electron-v39.8.3-win32-arm64-symbols.zip
+b701e63ca5d443d9bd1b653ea0e2b7479f0d834a3d1bd9f10a3b745d29607154 *electron-v39.8.3-win32-arm64-toolchain-profile.zip
+699933ff8c4d7216fc0318f239a5f593f06487c0dc9c3722b8744f6a44fca94e *electron-v39.8.3-win32-arm64.zip
+1ffab5a8419a1a93476e2edc09754a52bbe9f3d39915e097f2a1ee50ffdbbd13 *electron-v39.8.3-win32-ia32-pdb.zip
+6445047728d64a09db80205c24135f140ba60c25433d833f581c57092638b875 *electron-v39.8.3-win32-ia32-symbols.zip
+b701e63ca5d443d9bd1b653ea0e2b7479f0d834a3d1bd9f10a3b745d29607154 *electron-v39.8.3-win32-ia32-toolchain-profile.zip
+b80bb96a4eda2c2b6bd223d2d8b6abfc39abdebac0b36cf74cd70661d43258a5 *electron-v39.8.3-win32-ia32.zip
+c8e3cab205bdfe42f916a4428fe0a5e88b6f90e8482e297dadfe1234420abb8f *electron-v39.8.3-win32-x64-pdb.zip
+eda4a2f01e388eccfc2ecc7587b0987d123ae01e5b832b73a0a76bb62680bd7c *electron-v39.8.3-win32-x64-symbols.zip
+b701e63ca5d443d9bd1b653ea0e2b7479f0d834a3d1bd9f10a3b745d29607154 *electron-v39.8.3-win32-x64-toolchain-profile.zip
+12eabd7c5f08823525034c1ff3ab286f271af802928e0f224b458235e2689c5a *electron-v39.8.3-win32-x64.zip
+d5345fc0cb336a425f7a25885f67969452746cbf30cc1e95449f7a68221aab07 *electron.d.ts
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.8.3-darwin-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.8.3-darwin-x64.zip
+52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.8.3-linux-arm64.zip
+622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.8.3-linux-armv7l.zip
+ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.8.3-linux-x64.zip
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.8.3-mas-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.8.3-mas-x64.zip
+06d402e51bf66fd1a0eddc7e8329b31eb8a1bc6c829e5bc13694708a010feb07 *ffmpeg-v39.8.3-win32-arm64.zip
+4b1c2ddedebbf32b7792fb788ddce577f2dc6f8ecccd913e72e842068b2f81e5 *ffmpeg-v39.8.3-win32-ia32.zip
+0cf0f521a452d6fdfe1313b81284d646e991954e91c356d805f5c066f2ecf278 *ffmpeg-v39.8.3-win32-x64.zip
+bb2d6ec64c43e5a41da5bc55a3daa2b7ef8a0dee722dc73f4fa31bcae5487cb2 *hunspell_dictionaries.zip
+7fd663a5eeaf4d0a93785ea4ea715d21464c70c1341b7d8629c96a7bfe24044a *libcxx-objects-v39.8.3-linux-arm64.zip
+bdd7e9f732b97b6be2c8293d9391bce3a5cd60feae1c762a0dda0790493da7a2 *libcxx-objects-v39.8.3-linux-armv7l.zip
+0de009f84fed7c1bba087ff161674177ca91951fca2f4c60850be0bffb42dfdf *libcxx-objects-v39.8.3-linux-x64.zip
+8ae7fd5c3bdc332f9f49830a9316e470d43f17e6ad6adbd05ac629d03d1718c2 *libcxx_headers.zip
+9b988e2bb379c6d3094872f600944ad3284510cf225f86368c4f43270b89673c *libcxxabi_headers.zip
+d504296ed183e3f460028a73b4a5e2bcd99bc4a3c74b8dc73ba987719c005458 *mksnapshot-v39.8.3-darwin-arm64.zip
+b18b8a0e902cf86961d53486826fb07feb3ac98e018b2849cf2bb13150077b13 *mksnapshot-v39.8.3-darwin-x64.zip
+7d9dc2ceb3f88d8d532af5b90387479ade571a0370489429571871d386c12322 *mksnapshot-v39.8.3-linux-arm64-x64.zip
+84114ba67259f52ae462210544e815b602d70b71162f7f70982a7c36db54b4fa *mksnapshot-v39.8.3-linux-armv7l-x64.zip
+be08392f0964d2166bb84212d225c5380fde9b12e622599cb040f45524ff7882 *mksnapshot-v39.8.3-linux-x64.zip
+ffebb01a6fe568ec51391f9585e8abf1a93a566a7c991b2abacc33cc2e94d705 *mksnapshot-v39.8.3-mas-arm64.zip
+858a8ee80b6f826b1d24a9458b8acb0fcc9805ee3c309652d60ed5c07b578113 *mksnapshot-v39.8.3-mas-x64.zip
+dbc82c573f1ba098b6d321ad79c6580f27066d94e13fd93c0b7650a54150eb5c *mksnapshot-v39.8.3-win32-arm64-x64.zip
+c8f7c43741b20da99558db596d32c86ebff3483aaf6b3e2539cd85a471b92043 *mksnapshot-v39.8.3-win32-ia32.zip
+000941eeb8e1169d581120df7d42aa0b76e33de99a06528a9c4767bcffb74cbf *mksnapshot-v39.8.3-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index c5cb12c7972..5b1c61efa07 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-5ed4db0fcf1eaf84d91ad12462631d73bf4576c1377e192d222e48026a902640  node-v22.22.0-darwin-arm64.tar.gz
-5ea50c9d6dea3dfa3abb66b2656f7a4e1c8cef23432b558d45fb538c7b5dedce  node-v22.22.0-darwin-x64.tar.gz
-25ba95dfb96871fa2ef977f11f95ea90818c8fa15c0f2110771db08d4ba423be  node-v22.22.0-linux-arm64.tar.gz
-a92684d8720589f19776fb186c5a3a4d273c13436fc8c44b61dd3eeef81f0d3a  node-v22.22.0-linux-armv7l.tar.gz
-c33c39ed9c80deddde77c960d00119918b9e352426fd604ba41638d6526a4744  node-v22.22.0-linux-x64.tar.gz
-fd44256121597d6a3707f4c7730b4e3733eacb5a95cc78a099f601d7e7f8290d  win-arm64/node.exe
-bae898add4643fcf890a83ad8ae56e20dce7e781cab161a53991ceba70c99ffb  win-x64/node.exe
+679ad4966339e4ef4900f57996714864e4211b898825bb840c3086c419fbcef2  node-v22.22.1-darwin-arm64.tar.gz
+07b13722d558790fca20bb1ecf61bde24b7a4863111f7be77fc57251a407359a  node-v22.22.1-darwin-x64.tar.gz
+1d1690e9aba47e887a275abc6d8f7317e571a0700deaef493f768377e99155f5  node-v22.22.1-linux-arm64.tar.gz
+2b592d21609ef299d1e3918bb806ed62ba715d4109b0f8ec11b132af9fa42d70  node-v22.22.1-linux-armv7l.tar.gz
+07c8aafa60644fb81adefa1ee7da860eb1920851ffdc9a37020ab0be47fbc10e  node-v22.22.1-linux-x64.tar.gz
+993b56091266aec4a41653ea3e70b5b18fadc78952030ca0329309240030859c  win-arm64/node.exe
+923a41f268ab49ede2e3363fbdd9e790609e385c6f3ca880b4ee9a56a8133e5a  win-x64/node.exe
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
index 9e90e31491f..46544b0c4d9 100644
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -10,6 +10,30 @@ import { makeUniversalApp } from 'vscode-universal-bundler';
 
 const root = path.dirname(path.dirname(import.meta.dirname));
 
+const nodeModulesBases = [
+	path.join('Contents', 'Resources', 'app', 'node_modules'),
+	path.join('Contents', 'Resources', 'app', 'node_modules.asar.unpacked'),
+];
+
+/**
+ * Ensures a directory exists in both the x64 and arm64 app bundles by copying
+ * it from whichever build has it to the one that does not. This is needed for
+ * platform-specific native module directories that npm only installs for the
+ * host architecture.
+ */
+function crossCopyPlatformDir(x64AppPath: string, arm64AppPath: string, relativePath: string): void {
+	const inX64 = path.join(x64AppPath, relativePath);
+	const inArm64 = path.join(arm64AppPath, relativePath);
+
+	if (fs.existsSync(inX64) && !fs.existsSync(inArm64)) {
+		fs.mkdirSync(inArm64, { recursive: true });
+		fs.cpSync(inX64, inArm64, { recursive: true });
+	} else if (fs.existsSync(inArm64) && !fs.existsSync(inX64)) {
+		fs.mkdirSync(inX64, { recursive: true });
+		fs.cpSync(inArm64, inX64, { recursive: true });
+	}
+}
+
 async function main(buildDir?: string) {
 	const arch = process.env['VSCODE_ARCH'];
 
@@ -25,10 +49,33 @@ async function main(buildDir?: string) {
 	const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
 	const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
 
+	// Copilot SDK ships platform-specific native binaries that npm only installs
+	// for the host architecture. The universal app merger requires both builds to
+	// have identical file trees, so we cross-copy each missing directory from the
+	// other build. The binaries are then excluded from comparison (filesToSkip)
+	// and the x64 binary is tagged as arch-specific (x64ArchFiles) so the merger
+	// keeps both.
+	for (const plat of ['darwin-x64', 'darwin-arm64']) {
+		for (const base of nodeModulesBases) {
+			// @github/copilot-{platform} packages (e.g. copilot-darwin-x64)
+			crossCopyPlatformDir(x64AppPath, arm64AppPath, path.join(base, '@github', `copilot-${plat}`));
+			// @github/copilot/prebuilds/{platform} (pty.node, spawn-helper)
+			crossCopyPlatformDir(x64AppPath, arm64AppPath, path.join(base, '@github', 'copilot', 'prebuilds', plat));
+		}
+	}
+
 	const filesToSkip = [
 		'**/CodeResources',
 		'**/Credits.rtf',
-		'**/policies/{*.mobileconfig,**/*.plist}'
+		'**/policies/{*.mobileconfig,**/*.plist}',
+		'**/node_modules/@github/copilot-darwin-x64/**',
+		'**/node_modules/@github/copilot-darwin-arm64/**',
+		'**/node_modules.asar.unpacked/@github/copilot-darwin-x64/**',
+		'**/node_modules.asar.unpacked/@github/copilot-darwin-arm64/**',
+		'**/node_modules/@github/copilot/prebuilds/darwin-x64/**',
+		'**/node_modules/@github/copilot/prebuilds/darwin-arm64/**',
+		'**/node_modules.asar.unpacked/@github/copilot/prebuilds/darwin-x64/**',
+		'**/node_modules.asar.unpacked/@github/copilot/prebuilds/darwin-arm64/**',
 	];
 
 	await makeUniversalApp({
@@ -38,7 +85,7 @@ async function main(buildDir?: string) {
 		outAppPath,
 		force: true,
 		mergeASARs: true,
-		x64ArchFiles: '{*/kerberos.node,**/extensions/microsoft-authentication/dist/libmsalruntime.dylib,**/extensions/microsoft-authentication/dist/msal-node-runtime.node}',
+		x64ArchFiles: '{*/kerberos.node,**/extensions/microsoft-authentication/dist/libmsalruntime.dylib,**/extensions/microsoft-authentication/dist/msal-node-runtime.node,**/node_modules/@github/copilot-darwin-*/copilot,**/node_modules/@github/copilot/prebuilds/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot-darwin-*/copilot,**/node_modules.asar.unpacked/@github/copilot/prebuilds/darwin-*/*}',
 		filesToSkipComparison: (file: string) => {
 			for (const expected of filesToSkip) {
 				if (minimatch(file, expected)) {
diff --git a/build/darwin/verify-macho.ts b/build/darwin/verify-macho.ts
index 7770b9c36cd..bec37b2dd8e 100644
--- a/build/darwin/verify-macho.ts
+++ b/build/darwin/verify-macho.ts
@@ -26,6 +26,14 @@ const FILES_TO_SKIP = [
 	// MSAL runtime files are only present in ARM64 builds
 	'**/extensions/microsoft-authentication/dist/libmsalruntime.dylib',
 	'**/extensions/microsoft-authentication/dist/msal-node-runtime.node',
+	// Copilot SDK: universal app has both x64 and arm64 platform packages
+	'**/node_modules/@github/copilot-darwin-x64/**',
+	'**/node_modules/@github/copilot-darwin-arm64/**',
+	'**/node_modules.asar.unpacked/@github/copilot-darwin-x64/**',
+	'**/node_modules.asar.unpacked/@github/copilot-darwin-arm64/**',
+	// Copilot prebuilds: single-arch binaries in per-platform directories
+	'**/node_modules/@github/copilot/prebuilds/darwin-*/**',
+	'**/node_modules.asar.unpacked/@github/copilot/prebuilds/darwin-*/**',
 ];
 
 function isFileSkipped(file: string): boolean {
diff --git a/build/gulpfile.extensions.ts b/build/gulpfile.extensions.ts
index 8f9ac9b2b21..e0137816c8c 100644
--- a/build/gulpfile.extensions.ts
+++ b/build/gulpfile.extensions.ts
@@ -309,13 +309,6 @@ async function buildWebExtensions(isWatch: boolean): Promise<void> {
 		{ ignore: ['**/node_modules'] }
 	);
 
-	// Find all webpack configs, excluding those that will be esbuilt
-	const esbuildExtensionDirs = new Set(esbuildConfigLocations.map(p => path.dirname(p)));
-	const webpackConfigLocations = (await nodeUtil.promisify(glob)(
-		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
-		{ ignore: ['**/node_modules'] }
-	)).filter(configPath => !esbuildExtensionDirs.has(path.dirname(configPath)));
-
 	const promises: Promise<unknown>[] = [];
 
 	// Esbuild for extensions
@@ -330,10 +323,5 @@ async function buildWebExtensions(isWatch: boolean): Promise<void> {
 		);
 	}
 
-	// Run webpack for remaining extensions
-	if (webpackConfigLocations.length > 0) {
-		promises.push(ext.webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath }))));
-	}
-
 	await Promise.all(promises);
 }
diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts
index 0ad08ab6fbe..f3ba46d9f89 100644
--- a/build/gulpfile.reh.ts
+++ b/build/gulpfile.reh.ts
@@ -34,6 +34,7 @@ import * as cp from 'child_process';
 import log from 'fancy-log';
 import buildfile from './buildfile.ts';
 import { fetchUrls, fetchGithub } from './lib/fetch.ts';
+import { getCopilotExcludeFilter, copyCopilotNativeDeps } from './lib/copilot.ts';
 import jsonEditor from 'gulp-json-editor';
 
 
@@ -343,6 +344,7 @@ function packageTask(type: string, platform: string, arch: string, sourceFolderN
 			.pipe(filter(['**', '!**/package-lock.json', '!**/*.{js,css}.map']))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, `.moduleignore.${process.platform}`)))
+			.pipe(filter(getCopilotExcludeFilter(platform, arch)))
 			.pipe(jsFilter)
 			.pipe(util.stripSourceMappingURL())
 			.pipe(jsFilter.restore);
@@ -461,6 +463,13 @@ function patchWin32DependenciesTask(destinationFolderName: string) {
 	};
 }
 
+function copyCopilotNativeDepsTaskREH(platform: string, arch: string, destinationFolderName: string) {
+	return async () => {
+		const nodeModulesDir = path.join(BUILD_ROOT, destinationFolderName, 'node_modules');
+		copyCopilotNativeDeps(platform, arch, nodeModulesDir);
+	};
+}
+
 /**
  * @param product The parsed product.json file contents
  */
@@ -509,7 +518,8 @@ function tweakProductForServerWeb(product: typeof import('../product.json')) {
 				compileNativeExtensionsBuildTask,
 				gulp.task(`node-${platform}-${arch}`) as task.Task,
 				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
+				packageTask(type, platform, arch, sourceFolderName, destinationFolderName),
+				copyCopilotNativeDepsTaskREH(platform, arch, destinationFolderName)
 			];
 
 			if (platform === 'win32') {
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index e33ae905ad1..336a8947fbb 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -31,6 +31,7 @@ import minimist from 'minimist';
 import { compileBuildWithoutManglingTask, compileBuildWithManglingTask } from './gulpfile.compile.ts';
 import { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask } from './gulpfile.extensions.ts';
 import { copyCodiconsTask } from './lib/compilation.ts';
+import { getCopilotExcludeFilter, copyCopilotNativeDeps } from './lib/copilot.ts';
 import type { EmbeddedProductInfo } from './lib/embeddedType.ts';
 import { useEsbuildTranspile } from './buildConfig.ts';
 import { promisify } from 'util';
@@ -43,8 +44,6 @@ const glob = promisify(globCallback);
 const rcedit = promisify(rceditCallback);
 const root = path.dirname(import.meta.dirname);
 const commit = getVersion(root);
-const useVersionedUpdate = process.platform === 'win32' && (product as typeof product & { win32VersionedUpdate?: boolean })?.win32VersionedUpdate;
-const versionedResourcesFolder = useVersionedUpdate ? commit!.substring(0, 10) : '';
 
 // Build
 const vscodeEntryPoints = [
@@ -102,6 +101,7 @@ const vscodeResourceIncludes = [
 	// Sessions
 	'out-build/vs/sessions/contrib/chat/browser/media/*.svg',
 	'out-build/vs/sessions/prompts/*.prompt.md',
+	'out-build/vs/sessions/skills/**/SKILL.md',
 
 	// Extensions
 	'out-build/vs/workbench/contrib/extensions/browser/media/{theme-icon.png,language-icon.svg}',
@@ -325,6 +325,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 
 	const task = () => {
 		const out = sourceFolderName;
+		const versionedResourcesFolder = util.getVersionedResourcesFolder(platform, commit!);
 
 		const checksums = computeChecksums(out, [
 			'vs/base/parts/sandbox/electron-browser/preload.js',
@@ -437,12 +438,14 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 			.pipe(filter(depFilterPattern))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, `.moduleignore.${process.platform}`)))
+			.pipe(filter(getCopilotExcludeFilter(platform, arch)))
 			.pipe(jsFilter)
 			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
 			.pipe(jsFilter.restore)
 			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
 				'**/*.node',
 				'**/@vscode/ripgrep/bin/*',
+				'**/@github/copilot-*/**',
 				'**/node-pty/build/Release/*',
 				'**/node-pty/build/Release/conpty/*',
 				'**/node-pty/lib/worker/conoutSocketWorker.js',
@@ -532,6 +535,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 				darwinMiniAppName: embedded.nameShort,
 				darwinMiniAppBundleIdentifier: embedded.darwinBundleIdentifier,
 				darwinMiniAppIcon: 'resources/darwin/sessions.icns',
+				darwinMiniAppAssetsCar: 'resources/darwin/sessions.car',
 				darwinMiniAppBundleURLTypes: [{
 					role: 'Viewer',
 					name: embedded.nameLong,
@@ -568,7 +572,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 		if (platform === 'win32') {
 			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));
 
-			if (useVersionedUpdate) {
+			if (versionedResourcesFolder) {
 				result = es.merge(result, gulp.src('resources/win32/versioned/bin/code.cmd', { base: 'resources/win32/versioned' })
 					.pipe(replace('@@NAME@@', product.nameShort))
 					.pipe(replace('@@VERSIONFOLDER@@', versionedResourcesFolder))
@@ -646,6 +650,7 @@ function patchWin32DependenciesTask(destinationFolderName: string) {
 	const cwd = path.join(path.dirname(root), destinationFolderName);
 
 	return async () => {
+		const versionedResourcesFolder = util.getVersionedResourcesFolder('win32', commit!);
 		const deps = (await Promise.all([
 			glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@parcel/watcher/**' }),
 			glob('**/rg.exe', { cwd }),
@@ -677,6 +682,21 @@ function patchWin32DependenciesTask(destinationFolderName: string) {
 	};
 }
 
+function copyCopilotNativeDepsTask(platform: string, arch: string, destinationFolderName: string) {
+	const outputDir = path.join(path.dirname(root), destinationFolderName);
+
+	return async () => {
+		// On Windows with win32VersionedUpdate, app resources live under a
+		// commit-hash prefix: {output}/{commitHash}/resources/app/
+		const versionedResourcesFolder = util.getVersionedResourcesFolder(platform, commit!);
+		const appBase = platform === 'darwin'
+			? path.join(outputDir, `${product.nameLong}.app`, 'Contents', 'Resources', 'app')
+			: path.join(outputDir, versionedResourcesFolder, 'resources', 'app');
+
+		copyCopilotNativeDeps(platform, arch, path.join(appBase, 'node_modules'));
+	};
+}
+
 const buildRoot = path.dirname(root);
 
 const BUILD_TARGETS = [
@@ -701,7 +721,8 @@ BUILD_TARGETS.forEach(buildTarget => {
 		const packageTasks: task.Task[] = [
 			compileNativeExtensionsBuildTask,
 			util.rimraf(path.join(buildRoot, destinationFolderName)),
-			packageTask(platform, arch, sourceFolderName, destinationFolderName, opts)
+			packageTask(platform, arch, sourceFolderName, destinationFolderName, opts),
+			copyCopilotNativeDepsTask(platform, arch, destinationFolderName)
 		];
 
 		if (platform === 'win32') {
diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts
index 0f81323c98d..c393e8247f1 100644
--- a/build/gulpfile.vscode.win32.ts
+++ b/build/gulpfile.vscode.win32.ts
@@ -122,6 +122,7 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
 			definitions['ProxyExeBasename'] = embedded.nameShort;
 			definitions['ProxyAppUserId'] = embedded.win32AppUserModelId;
 			definitions['ProxyNameLong'] = embedded.nameLong;
+			definitions['ProxyExeUrlProtocol'] = embedded.urlProtocol;
 		}
 
 		if (quality === 'stable' || quality === 'insider') {
diff --git a/build/lib/copilot.ts b/build/lib/copilot.ts
new file mode 100644
index 00000000000..f182c9829a9
--- /dev/null
+++ b/build/lib/copilot.ts
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * The platforms that @github/copilot ships platform-specific packages for.
+ * These are the `@github/copilot-{platform}` optional dependency packages.
+ */
+export const copilotPlatforms = [
+	'darwin-arm64', 'darwin-x64',
+	'linux-arm64', 'linux-x64',
+	'win32-arm64', 'win32-x64',
+];
+
+/**
+ * Converts VS Code build platform/arch to the values that Node.js reports
+ * at runtime via `process.platform` and `process.arch`.
+ *
+ * The copilot SDK's `loadNativeModule` looks up native binaries under
+ * `prebuilds/${process.platform}-${process.arch}/`, so the directory names
+ * must match these runtime values exactly.
+ */
+function toNodePlatformArch(platform: string, arch: string): { nodePlatform: string; nodeArch: string } {
+	// alpine is musl-linux; Node still reports process.platform === 'linux'
+	let nodePlatform = platform === 'alpine' ? 'linux' : platform;
+	let nodeArch = arch;
+
+	if (arch === 'armhf') {
+		// VS Code build uses 'armhf'; Node reports process.arch === 'arm'
+		nodeArch = 'arm';
+	} else if (arch === 'alpine') {
+		// Legacy: { platform: 'linux', arch: 'alpine' } means alpine-x64
+		nodePlatform = 'linux';
+		nodeArch = 'x64';
+	}
+
+	return { nodePlatform, nodeArch };
+}
+
+/**
+ * Returns a glob filter that strips @github/copilot platform packages
+ * for architectures other than the build target.
+ *
+ * For platforms the copilot SDK doesn't natively support (e.g. alpine, armhf),
+ * ALL platform packages are stripped - that's fine because the SDK doesn't ship
+ * binaries for those platforms anyway, and we replace them with VS Code's own.
+ */
+export function getCopilotExcludeFilter(platform: string, arch: string): string[] {
+	const { nodePlatform, nodeArch } = toNodePlatformArch(platform, arch);
+	const targetPlatformArch = `${nodePlatform}-${nodeArch}`;
+	const nonTargetPlatforms = copilotPlatforms.filter(p => p !== targetPlatformArch);
+
+	// Strip wrong-architecture @github/copilot-{platform} packages.
+	// All copilot prebuilds are stripped by .moduleignore; VS Code's own
+	// node-pty is copied into the prebuilds location by a post-packaging task.
+	const excludes = nonTargetPlatforms.map(p => `!**/node_modules/@github/copilot-${p}/**`);
+
+	return ['**', ...excludes];
+}
+
+/**
+ * Copies VS Code's own node-pty binaries into the copilot SDK's
+ * expected locations so the copilot CLI subprocess can find them at runtime.
+ * The copilot-bundled prebuilds are stripped by .moduleignore;
+ * this replaces them with the same binaries VS Code already ships, avoiding
+ * new system dependency requirements.
+ *
+ * This works even for platforms the copilot SDK doesn't natively support
+ * (e.g. alpine, armhf) because the SDK's native module loader simply
+ * looks for `prebuilds/{process.platform}-{process.arch}/pty.node` - it
+ * doesn't validate the platform against a supported list.
+ *
+ * Failures are logged but do not throw, to avoid breaking the build on
+ * platforms where something unexpected happens.
+ *
+ * @param nodeModulesDir Absolute path to the node_modules directory that
+ *   contains both the source binaries (node-pty) and the copilot SDK
+ *   target directories.
+ */
+export function copyCopilotNativeDeps(platform: string, arch: string, nodeModulesDir: string): void {
+	const { nodePlatform, nodeArch } = toNodePlatformArch(platform, arch);
+	const platformArch = `${nodePlatform}-${nodeArch}`;
+
+	const copilotBase = path.join(nodeModulesDir, '@github', 'copilot');
+	if (!fs.existsSync(copilotBase)) {
+		console.warn(`[copyCopilotNativeDeps] @github/copilot not found at ${copilotBase}, skipping`);
+		return;
+	}
+
+	const nodePtySource = path.join(nodeModulesDir, 'node-pty', 'build', 'Release');
+	if (!fs.existsSync(nodePtySource)) {
+		console.warn(`[copyCopilotNativeDeps] node-pty source not found at ${nodePtySource}, skipping`);
+		return;
+	}
+
+	try {
+		// Copy node-pty (pty.node + spawn-helper on Unix, conpty.node + conpty/ on Windows)
+		// into copilot prebuilds so the SDK finds them via loadNativeModule.
+		const copilotPrebuildsDir = path.join(copilotBase, 'prebuilds', platformArch);
+		fs.mkdirSync(copilotPrebuildsDir, { recursive: true });
+		fs.cpSync(nodePtySource, copilotPrebuildsDir, { recursive: true });
+		console.log(`[copyCopilotNativeDeps] Copied node-pty from ${nodePtySource} to ${copilotPrebuildsDir}`);
+	} catch (err) {
+		console.warn(`[copyCopilotNativeDeps] Failed to copy node-pty for ${platformArch}: ${err}`);
+	}
+}
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 5710f4d6919..c5a74b53e04 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -20,10 +20,8 @@ import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
 import buffer from 'gulp-buffer';
 import * as jsoncParser from 'jsonc-parser';
-import webpack from 'webpack';
 import { getProductionDependencies } from './dependencies.ts';
 import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts';
-import { getVersion } from './getVersion.ts';
 import { fetchUrls, fetchGithub } from './fetch.ts';
 import { createTsgoStream, spawnTsgo } from './tsgo.ts';
 import vzip from 'gulp-vinyl-zip';
@@ -32,8 +30,8 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 const root = path.dirname(path.dirname(import.meta.dirname));
-const commit = getVersion(root);
-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
+// const commit = getVersion(root);
+// const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
 
 function minifyExtensionResources(input: Stream): Stream {
 	const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
@@ -65,32 +63,24 @@ function updateExtensionPackageJSON(input: Stream, update: (data: any) => any):
 		.pipe(packageJsonFilter.restore);
 }
 
-function fromLocal(extensionPath: string, forWeb: boolean, disableMangle: boolean): Stream {
+function fromLocal(extensionPath: string, forWeb: boolean, _disableMangle: boolean): Stream {
 
 	const esbuildConfigFileName = forWeb
 		? 'esbuild.browser.mts'
 		: 'esbuild.mts';
 
-	const webpackConfigFileName = forWeb
-		? `extension-browser.webpack.config.js`
-		: `extension.webpack.config.js`;
-
 	const hasEsbuild = fs.existsSync(path.join(extensionPath, esbuildConfigFileName));
-	const hasWebpack = fs.existsSync(path.join(extensionPath, webpackConfigFileName));
 
 	let input: Stream;
 	let isBundled = false;
 
 	if (hasEsbuild) {
-		// Unlike webpack, esbuild only does bundling so we still want to run a separate type check step
+		// Esbuild only does bundling so we still want to run a separate type check step
 		input = es.merge(
 			fromLocalEsbuild(extensionPath, esbuildConfigFileName),
 			...getBuildRootsForExtension(extensionPath).map(root => typeCheckExtensionStream(root, forWeb)),
 		);
 		isBundled = true;
-	} else if (hasWebpack) {
-		input = fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle);
-		isBundled = true;
 	} else {
 		input = fromLocalNormal(extensionPath);
 	}
@@ -122,132 +112,6 @@ export function typeCheckExtensionStream(extensionPath: string, forWeb: boolean)
 	return createTsgoStream(tsconfigPath, { taskName: 'typechecking extension (tsgo)', noEmit: true });
 }
 
-function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string, disableMangle: boolean): Stream {
-	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
-	const webpack = require('webpack');
-	const webpackGulp = require('webpack-stream');
-	const result = es.through();
-
-	const packagedDependencies: string[] = [];
-	const stripOutSourceMaps: string[] = [];
-	const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
-	if (packageJsonConfig.dependencies) {
-		const webpackConfig = require(path.join(extensionPath, webpackConfigFileName));
-		const webpackRootConfig = webpackConfig.default;
-		for (const key in webpackRootConfig.externals) {
-			if (key in packageJsonConfig.dependencies) {
-				packagedDependencies.push(key);
-			}
-		}
-
-		if (webpackConfig.StripOutSourceMaps) {
-			for (const filePath of webpackConfig.StripOutSourceMaps) {
-				stripOutSourceMaps.push(filePath);
-			}
-		}
-	}
-
-	// TODO: add prune support based on packagedDependencies to vsce.PackageManager.Npm similar
-	// to vsce.PackageManager.Yarn.
-	// A static analysis showed there are no webpack externals that are dependencies of the current
-	// local extensions so we can use the vsce.PackageManager.None config to ignore dependencies list
-	// as a temporary workaround.
-	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.None, packagedDependencies }).then(fileNames => {
-		const files = fileNames
-			.map(fileName => path.join(extensionPath, fileName))
-			.map(filePath => new File({
-				path: filePath,
-				stat: fs.statSync(filePath),
-				base: extensionPath,
-				contents: fs.createReadStream(filePath)
-			}));
-
-		// check for a webpack configuration files, then invoke webpack
-		// and merge its output with the files stream.
-		const webpackConfigLocations = (glob.sync(
-			path.join(extensionPath, '**', webpackConfigFileName),
-			{ ignore: ['**/node_modules'] }
-		) as string[]);
-		const webpackStreams = webpackConfigLocations.flatMap(webpackConfigPath => {
-
-			const webpackDone = (err: Error | undefined, stats: any) => {
-				fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
-				if (err) {
-					result.emit('error', err);
-				}
-				const { compilation } = stats;
-				if (compilation.errors.length > 0) {
-					result.emit('error', compilation.errors.join('\n'));
-				}
-				if (compilation.warnings.length > 0) {
-					result.emit('error', compilation.warnings.join('\n'));
-				}
-			};
-
-			const exportedConfig = require(webpackConfigPath).default;
-			return (Array.isArray(exportedConfig) ? exportedConfig : [exportedConfig]).map(config => {
-				const webpackConfig = {
-					...config,
-					...{ mode: 'production' }
-				};
-				if (disableMangle) {
-					if (Array.isArray(config.module.rules)) {
-						for (const rule of config.module.rules) {
-							if (Array.isArray(rule.use)) {
-								for (const use of rule.use) {
-									if (String(use.loader).endsWith('mangle-loader.js')) {
-										use.options.disabled = true;
-									}
-								}
-							}
-						}
-					}
-				}
-				const relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path);
-
-				return webpackGulp(webpackConfig, webpack, webpackDone)
-					.pipe(es.through(function (data) {
-						data.stat = data.stat || {};
-						data.base = extensionPath;
-						this.emit('data', data);
-					}))
-					.pipe(es.through(function (data: File) {
-						// source map handling:
-						// * rewrite sourceMappingURL
-						// * save to disk so that upload-task picks this up
-						if (path.extname(data.basename) === '.js') {
-							if (stripOutSourceMaps.indexOf(data.relative) >= 0) { // remove source map
-								const contents = (data.contents as Buffer).toString('utf8');
-								data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, ''), 'utf8');
-							} else {
-								const contents = (data.contents as Buffer).toString('utf8');
-								data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
-									return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
-								}), 'utf8');
-							}
-						}
-
-						this.emit('data', data);
-					}));
-			});
-		});
-
-		es.merge(...webpackStreams, es.readArray(files))
-			// .pipe(es.through(function (data) {
-			// 	// debug
-			// 	console.log('out', data.path, data.contents.length);
-			// 	this.emit('data', data);
-			// }))
-			.pipe(result);
-
-	}).catch(err => {
-		console.error(extensionPath);
-		console.error(packagedDependencies);
-		result.emit('error', err);
-	});
-
-	return result.pipe(createStatsStream(path.basename(extensionPath)));
-}
 
 function fromLocalNormal(extensionPath: string): Stream {
 	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
@@ -274,6 +138,14 @@ function fromLocalNormal(extensionPath: string): Stream {
 function fromLocalEsbuild(extensionPath: string, esbuildConfigFileName: string): Stream {
 	const vsce = require('@vscode/vsce') as typeof import('@vscode/vsce');
 	const result = es.through();
+	const extensionName = path.basename(extensionPath);
+
+	// Extensions built with esbuild can still externalize runtime dependencies.
+	// Ensure those externals are included in the packaged built-in extension.
+	const packagedDependenciesByExtension: Record<string, string[]> = {
+		'git': ['@vscode/fs-copyfile']
+	};
+	const packagedDependencies = packagedDependenciesByExtension[extensionName] ?? [];
 
 	const esbuildScript = path.join(extensionPath, esbuildConfigFileName);
 
@@ -299,6 +171,25 @@ function fromLocalEsbuild(extensionPath: string, esbuildConfigFileName: string):
 		// After esbuild completes, collect all files using vsce
 		return vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.None });
 	}).then(fileNames => {
+		if (packagedDependencies.length > 0) {
+			const packagedDependencyFileNames = packagedDependencies.flatMap(dependency =>
+				glob.sync(path.join(extensionPath, 'node_modules', dependency, '**'), { nodir: true, dot: true })
+					.map(filePath => path.relative(extensionPath, filePath))
+					.filter(filePath => {
+						// Exclude non-.node files from build directories to avoid timestamp-sensitive
+						// artifacts (e.g. Makefile) that break macOS universal builds due to SHA mismatches.
+						const parts = filePath.split(path.sep);
+						const buildIndex = parts.indexOf('build');
+						if (buildIndex !== -1) {
+							return filePath.endsWith('.node');
+						}
+						return true;
+					})
+			);
+
+			fileNames = Array.from(new Set([...fileNames, ...packagedDependencyFileNames]));
+		}
+
 		const files = fileNames
 			.map(fileName => path.join(extensionPath, fileName))
 			.map(filePath => new File({
@@ -311,6 +202,7 @@ function fromLocalEsbuild(extensionPath: string, esbuildConfigFileName: string):
 		es.readArray(files).pipe(result);
 	}).catch(err => {
 		console.error(extensionPath);
+		console.error(packagedDependencies);
 		result.emit('error', err);
 	});
 
@@ -405,6 +297,7 @@ export function fromGithub({ name, version, repo, sha256, metadata }: IExtension
  * platform that is being built.
  */
 const nativeExtensions = [
+	'git',
 	'microsoft-authentication',
 ];
 
@@ -649,70 +542,6 @@ export function translatePackageJSON(packageJSON: string, packageNLSPath: string
 
 const extensionsPath = path.join(root, 'extensions');
 
-export async function webpackExtensions(taskName: string, isWatch: boolean, webpackConfigLocations: { configPath: string; outputRoot?: string }[]) {
-	const webpack = require('webpack') as typeof import('webpack');
-
-	const webpackConfigs: webpack.Configuration[] = [];
-
-	for (const { configPath, outputRoot } of webpackConfigLocations) {
-		const configOrFnOrArray = require(configPath).default;
-		function addConfig(configOrFnOrArray: webpack.Configuration | ((env: unknown, args: unknown) => webpack.Configuration) | webpack.Configuration[]) {
-			for (const configOrFn of Array.isArray(configOrFnOrArray) ? configOrFnOrArray : [configOrFnOrArray]) {
-				const config = typeof configOrFn === 'function' ? configOrFn({}, {}) : configOrFn;
-				if (outputRoot) {
-					config.output!.path = path.join(outputRoot, path.relative(path.dirname(configPath), config.output!.path!));
-				}
-				webpackConfigs.push(config);
-			}
-		}
-		addConfig(configOrFnOrArray);
-	}
-
-	function reporter(fullStats: any) {
-		if (Array.isArray(fullStats.children)) {
-			for (const stats of fullStats.children) {
-				const outputPath = stats.outputPath;
-				if (outputPath) {
-					const relativePath = path.relative(extensionsPath, outputPath).replace(/\\/g, '/');
-					const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
-					fancyLog(`Finished ${ansiColors.green(taskName)} ${ansiColors.cyan(match![0])} with ${stats.errors.length} errors.`);
-				}
-				if (Array.isArray(stats.errors)) {
-					stats.errors.forEach((error: any) => {
-						fancyLog.error(error);
-					});
-				}
-				if (Array.isArray(stats.warnings)) {
-					stats.warnings.forEach((warning: any) => {
-						fancyLog.warn(warning);
-					});
-				}
-			}
-		}
-	}
-	return new Promise<void>((resolve, reject) => {
-		if (isWatch) {
-			webpack(webpackConfigs).watch({}, (err, stats) => {
-				if (err) {
-					reject();
-				} else {
-					reporter(stats?.toJson());
-				}
-			});
-		} else {
-			webpack(webpackConfigs).run((err, stats) => {
-				if (err) {
-					fancyLog.error(err);
-					reject();
-				} else {
-					reporter(stats?.toJson());
-					resolve();
-				}
-			});
-		}
-	});
-}
-
 export async function esbuildExtensions(taskName: string, isWatch: boolean, scripts: { script: string; outputRoot?: string }[]): Promise<void> {
 	function reporter(stdError: string, script: string) {
 		const matches = (stdError || '').match(/\> (.+): error: (.+)?/g);
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 921137824ee..d2b50232093 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -170,6 +170,10 @@
 			"name": "vs/workbench/contrib/inlineChat",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/imageCarousel",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/chat",
 			"project": "vscode-workbench"
@@ -561,6 +565,132 @@
 		{
 			"name": "vs/workbench/contrib/list",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/browserView",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/dropOrPasteInto",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/editTelemetry",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/inlineCompletions",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/mcp",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/meteredConnection",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/processExplorer",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/remoteCodingAgents",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/telemetry",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/welcomeAgentSessions",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/accounts",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/chat",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/request",
+			"project": "vscode-workbench"
+		}
+	],
+	"sessions": [
+		{
+			"name": "vs/sessions",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/accountMenu",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/agentFeedback",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/aiCustomizationTreeView",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/applyCommitsToParentRepo",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/changes",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/chat",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/copilotChatSessions",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/codeReview",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/fileTreeView",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/files",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/git",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/logs",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/remoteAgentHost",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/sessions",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/terminal",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/welcome",
+			"project": "vscode-sessions"
+		},
+		{
+			"name": "vs/sessions/contrib/chatDebug",
+			"project": "vscode-sessions"
 		}
 	]
 }
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 8ebcb1f177b..61ed524f35b 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -391,7 +391,8 @@ const editorProject: string = 'vscode-editor',
 	workbenchProject: string = 'vscode-workbench',
 	extensionsProject: string = 'vscode-extensions',
 	setupProject: string = 'vscode-setup',
-	serverProject: string = 'vscode-server';
+	serverProject: string = 'vscode-server',
+	sessionsProject: string = 'vscode-sessions';
 
 export function getResource(sourceFile: string): Resource {
 	let resource: string;
@@ -416,6 +417,11 @@ export function getResource(sourceFile: string): Resource {
 		return { name: resource, project: workbenchProject };
 	} else if (/^vs\/workbench/.test(sourceFile)) {
 		return { name: 'vs/workbench', project: workbenchProject };
+	} else if (/^vs\/sessions\/contrib/.test(sourceFile)) {
+		resource = sourceFile.split('/', 4).join('/');
+		return { name: resource, project: sessionsProject };
+	} else if (/^vs\/sessions/.test(sourceFile)) {
+		return { name: 'vs/sessions', project: sessionsProject };
 	}
 
 	throw new Error(`Could not identify the XLF bundle for ${sourceFile}`);
@@ -737,6 +743,10 @@ export function prepareI18nPackFiles(resultingTranslationPaths: TranslationPath[
 		if (EXTERNAL_EXTENSIONS.find(e => e === resource)) {
 			project = extensionsProject;
 		}
+		// vscode-setup has its own import path via prepareIslFiles
+		if (project === setupProject) {
+			return;
+		}
 		const contents = xlf.contents!.toString();
 		log(`Found ${project}: ${resource}`);
 		const parsePromise = getL10nFilesFromXlf(contents);
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 5b0fc9b6ad5..f0b99e4e493 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -646,6 +646,12 @@
 		"--vscode-searchEditor-findMatchBorder",
 		"--vscode-searchEditor-textInputBorder",
 		"--vscode-selection-background",
+		"--vscode-sessionsAuxiliaryBar-background",
+		"--vscode-sessionsChatBar-background",
+		"--vscode-sessionsPanel-background",
+		"--vscode-sessionsSidebar-background",
+		"--vscode-sessionsSidebarHeader-background",
+		"--vscode-sessionsSidebarHeader-foreground",
 		"--vscode-sessionsUpdateButton-downloadedBackground",
 		"--vscode-sessionsUpdateButton-downloadingBackground",
 		"--vscode-settings-checkboxBackground",
diff --git a/build/lib/test/i18n.test.ts b/build/lib/test/i18n.test.ts
index 7d5bb0433fe..6c9409bcb4a 100644
--- a/build/lib/test/i18n.test.ts
+++ b/build/lib/test/i18n.test.ts
@@ -31,7 +31,8 @@ suite('XLF Parser Tests', () => {
 
 	test('JSON file source path to Transifex resource match', () => {
 		const editorProject: string = 'vscode-editor',
-			workbenchProject: string = 'vscode-workbench';
+			workbenchProject: string = 'vscode-workbench',
+			sessionsProject: string = 'vscode-sessions';
 
 		const platform: i18n.Resource = { name: 'vs/platform', project: editorProject },
 			editorContrib = { name: 'vs/editor/contrib', project: editorProject },
@@ -40,7 +41,9 @@ suite('XLF Parser Tests', () => {
 			code = { name: 'vs/code', project: workbenchProject },
 			workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject },
 			workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject },
-			workbench = { name: 'vs/workbench', project: workbenchProject };
+			workbench = { name: 'vs/workbench', project: workbenchProject },
+			sessionsContrib = { name: 'vs/sessions/contrib/chat', project: sessionsProject },
+			sessions = { name: 'vs/sessions', project: sessionsProject };
 
 		assert.deepStrictEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
 		assert.deepStrictEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
@@ -50,5 +53,7 @@ suite('XLF Parser Tests', () => {
 		assert.deepStrictEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
 		assert.deepStrictEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
 		assert.deepStrictEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
+		assert.deepStrictEqual(i18n.getResource('vs/sessions/contrib/chat/browser/chatWidget'), sessionsContrib);
+		assert.deepStrictEqual(i18n.getResource('vs/sessions/browser/layoutActions'), sessions);
 	});
 });
diff --git a/build/lib/util.ts b/build/lib/util.ts
index e4d01e143c9..4203e6e6530 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -381,6 +381,12 @@ export function getElectronVersion(): Record<string, string> {
 	return { electronVersion, msBuildId };
 }
 
+export function getVersionedResourcesFolder(platform: string, commit: string): string {
+	const productJson = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
+	const useVersionedUpdate = platform === 'win32' && productJson.win32VersionedUpdate;
+	return useVersionedUpdate ? commit.substring(0, 10) : '';
+}
+
 export class VinylStat implements fs.Stats {
 
 	readonly dev: number;
diff --git a/build/next/index.ts b/build/next/index.ts
index a5bb0796da0..565bafc72ec 100644
--- a/build/next/index.ts
+++ b/build/next/index.ts
@@ -101,6 +101,7 @@ const desktopEntryPoints = [
 	'vs/workbench/contrib/debug/node/telemetryApp',
 	'vs/platform/files/node/watcher/watcherMain',
 	'vs/platform/terminal/node/ptyHostMain',
+	'vs/platform/agentHost/node/agentHostMain',
 	'vs/workbench/api/node/extensionHostProcess',
 ];
 
@@ -128,6 +129,7 @@ const serverEntryPoints = [
 	'vs/workbench/api/node/extensionHostProcess',
 	'vs/platform/files/node/watcher/watcherMain',
 	'vs/platform/terminal/node/ptyHostMain',
+	'vs/platform/agentHost/node/agentHostMain',
 ];
 
 // Bootstrap files per target
@@ -280,8 +282,9 @@ const desktopResourcePatterns = [
 	'vs/workbench/browser/parts/editor/media/*.png',
 	'vs/workbench/contrib/debug/browser/media/*.png',
 
-	// Sessions - built-in prompts
+	// Sessions - built-in prompts and skills
 	'vs/sessions/prompts/*.prompt.md',
+	'vs/sessions/skills/**/SKILL.md',
 ];
 
 // Resources for server target (minimal - no UI)
diff --git a/build/npm/gyp/package-lock.json b/build/npm/gyp/package-lock.json
index 3142db6e89d..8c499c6740f 100644
--- a/build/npm/gyp/package-lock.json
+++ b/build/npm/gyp/package-lock.json
@@ -1069,9 +1069,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.10.tgz",
-      "integrity": "sha512-8mOPs1//5q/rlkNSPcCegA6hiHJYDmSLEI8aMH/CdSQJNWztHC9WHNam5zdQlfpTwB9Xp7IBEsHfV5LKMJGVAw==",
+      "version": "7.5.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
+      "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
diff --git a/build/npm/installStateHash.ts b/build/npm/installStateHash.ts
index f52c0a4696d..0b3d9898015 100644
--- a/build/npm/installStateHash.ts
+++ b/build/npm/installStateHash.ts
@@ -87,7 +87,7 @@ function hashContent(content: string): string {
 	return hash.digest('hex');
 }
 
-export function computeState(): PostinstallState {
+export function computeState(options?: { ignoreNodeVersion?: boolean }): PostinstallState {
 	const fileHashes: Record<string, string> = {};
 	for (const filePath of collectInputFiles()) {
 		const key = path.relative(root, filePath);
@@ -97,7 +97,7 @@ export function computeState(): PostinstallState {
 			// file may not be readable
 		}
 	}
-	return { nodeVersion: process.versions.node, fileHashes };
+	return { nodeVersion: options?.ignoreNodeVersion ? '' : process.versions.node, fileHashes };
 }
 
 export function computeContents(): Record<string, string> {
@@ -141,18 +141,23 @@ export function readSavedContents(): Record<string, string> | undefined {
 
 // When run directly, output state as JSON for tooling (e.g. the vscode-extras extension).
 if (import.meta.filename === process.argv[1]) {
-	if (process.argv[2] === '--normalize-file') {
-		const filePath = process.argv[3];
+	const args = new Set(process.argv.slice(2));
+
+	if (args.has('--normalize-file')) {
+		const filePath = process.argv[process.argv.indexOf('--normalize-file') + 1];
 		if (!filePath) {
 			process.exit(1);
 		}
 		process.stdout.write(normalizeFileContent(filePath));
 	} else {
+		const ignoreNodeVersion = args.has('--ignore-node-version');
+		const current = computeState({ ignoreNodeVersion });
+		const saved = readSavedState();
 		console.log(JSON.stringify({
 			root,
 			stateContentsFile,
-			current: computeState(),
-			saved: readSavedState(),
+			current,
+			saved: saved && ignoreNodeVersion ? { nodeVersion: '', fileHashes: saved.fileHashes } : saved,
 			files: [...collectInputFiles(), stateFile],
 		}));
 	}
diff --git a/build/npm/postinstall.ts b/build/npm/postinstall.ts
index ae2651cd188..db659fa78a4 100644
--- a/build/npm/postinstall.ts
+++ b/build/npm/postinstall.ts
@@ -182,6 +182,32 @@ function clearInheritedNpmrcConfig(dir: string, env: NodeJS.ProcessEnv): void {
 	}
 }
 
+function ensureAgentHarnessLink(sourceRelativePath: string, linkPath: string): 'existing' | 'junction' | 'symlink' | 'hard link' {
+	if (fs.existsSync(linkPath)) {
+		return 'existing';
+	}
+
+	const sourcePath = path.resolve(path.dirname(linkPath), sourceRelativePath);
+	const isDirectory = fs.statSync(sourcePath).isDirectory();
+
+	try {
+		if (process.platform === 'win32' && isDirectory) {
+			fs.symlinkSync(sourcePath, linkPath, 'junction');
+			return 'junction';
+		}
+
+		fs.symlinkSync(sourceRelativePath, linkPath, isDirectory ? 'dir' : 'file');
+		return 'symlink';
+	} catch (error) {
+		if (process.platform === 'win32' && !isDirectory && (error as NodeJS.ErrnoException).code === 'EPERM') {
+			fs.linkSync(sourcePath, linkPath);
+			return 'hard link';
+		}
+
+		throw error;
+	}
+}
+
 async function runWithConcurrency(tasks: (() => Promise<void>)[], concurrency: number): Promise<void> {
 	const errors: Error[] = [];
 	let index = 0;
@@ -288,6 +314,37 @@ async function main() {
 
 	fs.writeFileSync(stateFile, JSON.stringify(_state));
 	fs.writeFileSync(stateContentsFile, JSON.stringify(computeContents()));
+
+	// Symlink .claude/ files to their canonical locations to test Claude agent harness
+	const claudeDir = path.join(root, '.claude');
+	fs.mkdirSync(claudeDir, { recursive: true });
+
+	const claudeMdLink = path.join(claudeDir, 'CLAUDE.md');
+	const claudeMdLinkType = ensureAgentHarnessLink(path.join('..', '.github', 'copilot-instructions.md'), claudeMdLink);
+	if (claudeMdLinkType !== 'existing') {
+		log('.', `Created ${claudeMdLinkType} .claude/CLAUDE.md -> .github/copilot-instructions.md`);
+	}
+
+	const claudeSkillsLink = path.join(claudeDir, 'skills');
+	const claudeSkillsLinkType = ensureAgentHarnessLink(path.join('..', '.agents', 'skills'), claudeSkillsLink);
+	if (claudeSkillsLinkType !== 'existing') {
+		log('.', `Created ${claudeSkillsLinkType} .claude/skills -> .agents/skills`);
+	}
+
+	// Temporary: patch @github/copilot-sdk session.js to fix ESM import
+	// (missing .js extension on vscode-jsonrpc/node). Fixed upstream in v0.1.32.
+	// TODO: Remove once @github/copilot-sdk is updated to >=0.1.32
+	for (const dir of ['', 'remote']) {
+		const sessionFile = path.join(root, dir, 'node_modules', '@github', 'copilot-sdk', 'dist', 'session.js');
+		if (fs.existsSync(sessionFile)) {
+			const content = fs.readFileSync(sessionFile, 'utf8');
+			const patched = content.replace(/from "vscode-jsonrpc\/node"/g, 'from "vscode-jsonrpc/node.js"');
+			if (content !== patched) {
+				fs.writeFileSync(sessionFile, patched);
+				log(dir || '.', 'Patched @github/copilot-sdk session.js (vscode-jsonrpc ESM import fix)');
+			}
+		}
+	}
 }
 
 main().catch(err => {
diff --git a/build/npm/preinstall.ts b/build/npm/preinstall.ts
index dd53ff44671..82d1919e454 100644
--- a/build/npm/preinstall.ts
+++ b/build/npm/preinstall.ts
@@ -29,10 +29,10 @@ if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
 	const requiredMinor = parseInt(requiredVersionMatch[2]);
 	const requiredPatch = parseInt(requiredVersionMatch[3]);
 
-	if (majorNodeVersion < requiredMajor ||
-		(majorNodeVersion === requiredMajor && minorNodeVersion < requiredMinor) ||
-		(majorNodeVersion === requiredMajor && minorNodeVersion === requiredMinor && patchNodeVersion < requiredPatch)) {
-		console.error(`\x1b[1;31m*** Please use Node.js v${requiredVersion} or later for development. Currently using v${process.versions.node}.\x1b[0;0m`);
+	if (majorNodeVersion !== requiredMajor ||
+		minorNodeVersion < requiredMinor ||
+		(minorNodeVersion === requiredMinor && patchNodeVersion < requiredPatch)) {
+		console.error(`\x1b[1;31m*** Please use Node.js v${requiredVersion} or newer with the same major version (${requiredMajor}) as specified in .nvmrc. Currently using v${process.versions.node}.\x1b[0;0m`);
 		throw new Error();
 	}
 }
diff --git a/build/npm/update-localization-extension.ts b/build/npm/update-localization-extension.ts
index cb7981b9388..45371dd9cd0 100644
--- a/build/npm/update-localization-extension.ts
+++ b/build/npm/update-localization-extension.ts
@@ -120,7 +120,7 @@ function update(options: Options) {
 			});
 	});
 }
-if (path.basename(process.argv[1]) === 'update-localization-extension.js') {
+if (path.basename(process.argv[1]) === 'update-localization-extension.ts') {
 	const options = minimist(process.argv.slice(2), {
 		string: ['location', 'externalExtensionsLocation']
 	}) as Options;
diff --git a/build/package-lock.json b/build/package-lock.json
index 644e16f901b..cc1acf90b97 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -3494,22 +3494,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
-      "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/fast-xml-parser": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
-      "integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
+      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
       "dev": true,
       "funding": [
         {
@@ -3519,8 +3506,25 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.0.0",
-        "strnum": "^2.1.2"
+        "path-expression-matcher": "^1.1.3"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.5.7",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.7.tgz",
+      "integrity": "sha512-LteOsISQ2GEiDHZch6L9hB0+MLoYVLToR7xotrzU0opCICBkxOPgHAy1HxAvtxfJNXDJpgAsQN30mkrfpO2Prg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.1.4",
+        "path-expression-matcher": "^1.1.3",
+        "strnum": "^2.2.0"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -5100,6 +5104,22 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
+    "node_modules/path-expression-matcher": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.1.3.tgz",
+      "integrity": "sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -6145,9 +6165,9 @@
       }
     },
     "node_modules/strnum": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
-      "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.1.tgz",
+      "integrity": "sha512-BwRvNd5/QoAtyW1na1y1LsJGQNvRlkde6Q/ipqqEaivoMdV+B1OMOTVdwR+N/cwVUcIt9PYyHmV8HyexCZSupg==",
       "dev": true,
       "funding": [
         {
@@ -6556,9 +6576,9 @@
       "license": "MIT"
     },
     "node_modules/underscore": {
-      "version": "1.13.7",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
-      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
+      "version": "1.13.8",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz",
+      "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/build/vite/package-lock.json b/build/vite/package-lock.json
index b9b854eacf2..8d0937b8faf 100644
--- a/build/vite/package-lock.json
+++ b/build/vite/package-lock.json
@@ -8,13 +8,166 @@
       "name": "@vscode/sample-source",
       "version": "0.0.0",
       "devDependencies": {
-        "@vscode/component-explorer": "^0.1.1-20",
-        "@vscode/component-explorer-vite-plugin": "^0.1.1-19",
+        "@vscode/component-explorer": "^0.1.1-24",
+        "@vscode/component-explorer-vite-plugin": "^0.1.1-24",
         "@vscode/rollup-plugin-esm-url": "^1.0.1-1",
         "rollup": "*",
         "vite": "npm:rolldown-vite@latest"
       }
     },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "node_modules/@actions/github": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-2.2.0.tgz",
+      "integrity": "sha512-9UAZqn8ywdR70n3GwVle4N8ALosQs4z50N7XMXrSTUVOmVpaBC5kE3TRTT7qQdi3OaQV24mjGuJZsHUmhD+ZXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/http-client": "^1.0.3",
+        "@octokit/graphql": "^4.3.1",
+        "@octokit/rest": "^16.43.1"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
+      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tunnel": "0.0.6"
+      }
+    },
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz",
+      "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@emnapi/core": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
@@ -49,6 +202,65 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@hediet/semver": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@hediet/semver/-/semver-0.2.2.tgz",
+      "integrity": "sha512-sdH+TwXwaYOgnKij3QQbJERl2HkJ+l8idWINwHBI+8nXl1yuTCMerDLDPC48t1wbr849qBTpJTV1EJXlh7OGAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/exec": "^1.0.4",
+        "@actions/github": "^2.2.0",
+        "@typescript-eslint/eslint-plugin": "^3.0.1",
+        "@typescript-eslint/parser": "^3.0.1",
+        "eslint": "^7.1.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz",
@@ -66,6 +278,322 @@
         "url": "https://github.com/sponsors/Brooooooklyn"
       }
     },
+    "node_modules/@octokit/auth-token": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
+      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
+      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.3",
+        "@octokit/request": "^10.0.6",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "before-after-hook": "^4.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/auth-token": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/endpoint": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.3.tgz",
+      "integrity": "sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/graphql": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
+      "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@octokit/request": "^10.0.6",
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/request": {
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.8.tgz",
+      "integrity": "sha512-SJZNwY9pur9Agf7l87ywFi14W+Hd9Jg6Ifivsd33+/bGUQIjNujdFiXII2/qSlN2ybqUHfp5xpekMEjIBTjlSw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@octokit/endpoint": "^11.0.3",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "json-with-bigint": "^3.5.3",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/request-error": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@octokit/types": "^16.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^27.0.0"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/before-after-hook": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz",
+      "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true
+    },
+    "node_modules/@octokit/core/node_modules/universal-user-agent": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^5.6.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
+      "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz",
+      "integrity": "sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^2.0.1"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+      "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": ">= 8"
+      }
+    },
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
+      "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz",
+      "integrity": "sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^2.0.1",
+        "deprecation": "^2.3.1"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+      "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": ">= 8"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "16.43.2",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz",
+      "integrity": "sha512-ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^2.4.0",
+        "@octokit/plugin-paginate-rest": "^1.1.1",
+        "@octokit/plugin-request-log": "^1.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "2.4.0",
+        "@octokit/request": "^5.2.0",
+        "@octokit/request-error": "^1.0.2",
+        "atob-lite": "^2.0.0",
+        "before-after-hook": "^2.0.0",
+        "btoa-lite": "^1.0.0",
+        "deprecation": "^2.0.0",
+        "lodash.get": "^4.4.2",
+        "lodash.set": "^4.3.2",
+        "lodash.uniq": "^4.5.0",
+        "octokit-pagination-methods": "^1.1.0",
+        "once": "^1.4.0",
+        "universal-user-agent": "^4.0.0"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/request-error": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz",
+      "integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^2.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/types": {
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+      "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": ">= 8"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/universal-user-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz",
+      "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "os-name": "^3.1.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
+      "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^12.11.0"
+      }
+    },
     "node_modules/@oxc-project/runtime": {
       "version": "0.101.0",
       "resolved": "https://registry.npmjs.org/@oxc-project/runtime/-/runtime-0.101.0.tgz",
@@ -675,6 +1203,13 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@types/eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -682,24 +1217,187 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@vscode/component-explorer": {
-      "version": "0.1.1-20",
-      "resolved": "https://registry.npmjs.org/@vscode/component-explorer/-/component-explorer-0.1.1-20.tgz",
-      "integrity": "sha512-HvMWH+wK0SWC+eKZ2cL2LSsWnXiQjyQRURUgW2FBd8SM1G99+kKce0ESTYSr4b0tNJ1/FONE0ixADFlSRduzTg==",
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "25.3.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.5.tgz",
+      "integrity": "sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "undici-types": "~7.18.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz",
+      "integrity": "sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "3.10.1",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^3.0.0",
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz",
+      "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/types": "3.10.1",
+        "@typescript-eslint/typescript-estree": "3.10.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz",
+      "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/eslint-visitor-keys": "^1.0.0",
+        "@typescript-eslint/experimental-utils": "3.10.1",
+        "@typescript-eslint/types": "3.10.1",
+        "@typescript-eslint/typescript-estree": "3.10.1",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz",
+      "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz",
+      "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@typescript-eslint/types": "3.10.1",
+        "@typescript-eslint/visitor-keys": "3.10.1",
+        "debug": "^4.1.1",
+        "glob": "^7.1.6",
+        "is-glob": "^4.0.1",
+        "lodash": "^4.17.15",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz",
+      "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@vscode/component-explorer": {
+      "version": "0.1.1-27",
+      "resolved": "https://registry.npmjs.org/@vscode/component-explorer/-/component-explorer-0.1.1-27.tgz",
+      "integrity": "sha512-FAxC9WlYOaRx6XfU3/ceI2bCOPQp45CpQehUyhG3AbDxLuM8Kv2VyJYJiSsQ0Z2a8cah/3CB729oIiINO19mdw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@hediet/semver": "^0.2.2",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
       }
     },
     "node_modules/@vscode/component-explorer-vite-plugin": {
-      "version": "0.1.1-19",
-      "resolved": "https://registry.npmjs.org/@vscode/component-explorer-vite-plugin/-/component-explorer-vite-plugin-0.1.1-19.tgz",
-      "integrity": "sha512-V0wMhLvHMbeUHOzwGrBPMwwvcbGhXXaQTCGc9hNfF4fjUutOtQFu5o+9XKDG1hIcKgk5qyvcRoXjVazBcg19lA==",
+      "version": "0.1.1-27",
+      "resolved": "https://registry.npmjs.org/@vscode/component-explorer-vite-plugin/-/component-explorer-vite-plugin-0.1.1-27.tgz",
+      "integrity": "sha512-wX2Z9e5E3ZdiPRTRIUYOBaReYOfGXd+iseNPAcdfx8gNKJiXrceco4gdKCQv3+WEyvLI3uT/oGdP9ecDcR6mbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@hediet/semver": "^0.2.2",
         "tinyglobby": "^0.2.0"
       },
       "peerDependencies": {
@@ -717,6 +1415,242 @@
         "rollup": "^3.0.0 || ^4.0.0"
       }
     },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/atob-lite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz",
+      "integrity": "sha512-LEeSAWeh2Gfa2FtlQE1shxQ8zi5F9GHarrGKz08TMdODD5T4eH6BMsvtnhbWZ+XQn+Gb6om/917ucvRu7l7ukw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/btoa-lite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
+      "integrity": "sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/detect-libc": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
@@ -727,6 +1661,415 @@
         "node": ">=8"
       }
     },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+      "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/execa/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/execa/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/fast-content-type-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz",
+      "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -745,6 +2088,48 @@
         }
       }
     },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -760,6 +2145,203 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -767,6 +2349,73 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-with-bigint": {
+      "version": "3.5.7",
+      "resolved": "https://registry.npmjs.org/json-with-bigint/-/json-with-bigint-3.5.7.tgz",
+      "integrity": "sha512-7ei3MdAI5+fJPVnKlW77TKNKwQ5ppSzWvhPuSuINT/GYW9ZOC1eRKOuhV9yHG5aEsUPj9BBx5JIekkmoLHxZOw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/lightningcss": {
       "version": "1.31.1",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.31.1.tgz",
@@ -1028,6 +2677,49 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.set": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
+      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -1041,6 +2733,39 @@
         "loose-envify": "cli.js"
       }
     },
+    "node_modules/macos-release": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz",
+      "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -1060,6 +2785,156 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/octokit-pagination-methods": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz",
+      "integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-name": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -1109,6 +2984,47 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
+      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/react": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
@@ -1136,6 +3052,56 @@
         "react": "^18.3.1"
       }
     },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/rolldown": {
       "version": "1.0.0-beta.53",
       "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-beta.53.tgz",
@@ -1223,6 +3189,67 @@
         "loose-envify": "^1.1.0"
       }
     },
+    "node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -1233,6 +3260,125 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz",
+      "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
@@ -1250,6 +3396,13 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -1258,6 +3411,111 @@
       "license": "0BSD",
       "optional": true
     },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vite": {
       "name": "rolldown-vite",
       "version": "7.3.1",
@@ -1334,6 +3592,73 @@
           "optional": true
         }
       }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/windows-release": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz",
+      "integrity": "sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true,
+      "license": "ISC"
     }
   }
 }
diff --git a/build/vite/package.json b/build/vite/package.json
index 67e2f227e40..05a96fa1ffd 100644
--- a/build/vite/package.json
+++ b/build/vite/package.json
@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@vscode/component-explorer": "^0.1.1-20",
-    "@vscode/component-explorer-vite-plugin": "^0.1.1-19",
+    "@vscode/component-explorer": "^0.1.1-24",
+    "@vscode/component-explorer-vite-plugin": "^0.1.1-24",
     "@vscode/rollup-plugin-esm-url": "^1.0.1-1",
     "rollup": "*",
     "vite": "npm:rolldown-vite@latest"
diff --git a/build/win32/code.iss b/build/win32/code.iss
index 935f17dbe41..53016d814ae 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -86,7 +86,7 @@ Type: files; Name: "{app}\updating_version"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
 Name: "addcontextmenufiles"; Description: "{cm:AddContextMenuFiles,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked
-Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked; Check: not ShouldUseWindows11ContextMenu
+Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked
 Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#NameShort}}"; GroupDescription: "{cm:Other}"
 Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
@@ -1284,15 +1284,24 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}Contex
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: not ShouldUseWindows11ContextMenu
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles; Check: not ShouldUseWindows11ContextMenu
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not ShouldUseWindows11ContextMenu
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not ShouldUseWindows11ContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Flags: uninsdeletekey; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Flags: uninsdeletekey; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Flags: uninsdeletekey; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Check: ShouldInstallLegacyFolderContextMenu
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Check: ShouldInstallLegacyFolderContextMenu
+
+; URL Protocol handler for proxy executable
+#ifdef ProxyExeBasename
+#ifdef ProxyExeUrlProtocol
+Root: HKCU; Subkey: "Software\Classes\{#ProxyExeUrlProtocol}"; ValueType: string; ValueName: ""; ValueData: "URL:{#ProxyExeUrlProtocol}"; Flags: uninsdeletekey
+Root: HKCU; Subkey: "Software\Classes\{#ProxyExeUrlProtocol}"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletekey
+Root: HKCU; Subkey: "Software\Classes\{#ProxyExeUrlProtocol}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ProxyExeBasename}.exe"" --open-url -- ""%1"""; Flags: uninsdeletekey
+#endif
+#endif
 
 ; Environment
 #if "user" == InstallTarget
@@ -1527,6 +1536,68 @@ begin
   Result := IsWindows11OrLater() and not IsWindows10ContextMenuForced();
 end;
 
+function HasLegacyFileContextMenu(): Boolean;
+begin
+  Result := RegKeyExists({#EnvironmentRootKey}, 'Software\Classes\*\shell\{#RegValueName}\command');
+end;
+
+function HasLegacyFolderContextMenu(): Boolean;
+begin
+  Result := RegKeyExists({#EnvironmentRootKey}, 'Software\Classes\directory\shell\{#RegValueName}\command');
+end;
+
+function ShouldRepairFolderContextMenu(): Boolean;
+begin
+  // Repair folder context menu during updates if:
+  // 1. This is a background update (not a fresh install or manual re-install)
+  // 2. Windows 11+ with forced classic context menu
+  // 3. Legacy file context menu exists (user previously selected it)
+  // 4. Legacy folder context menu is MISSING
+  Result := IsBackgroundUpdate()
+    and IsWindows11OrLater()
+    and IsWindows10ContextMenuForced()
+    and HasLegacyFileContextMenu()
+    and not HasLegacyFolderContextMenu();
+end;
+
+function ShouldInstallLegacyFolderContextMenu(): Boolean;
+begin
+  Result := (WizardIsTaskSelected('addcontextmenufolders') and not ShouldUseWindows11ContextMenu()) or ShouldRepairFolderContextMenu();
+end;
+
+function BoolToStr(Value: Boolean): String;
+begin
+  if Value then
+    Result := 'true'
+  else
+    Result := 'false';
+end;
+
+procedure LogContextMenuInstallState();
+begin
+  Log(
+    'Context menu state: '
+    + 'isBackgroundUpdate=' + BoolToStr(IsBackgroundUpdate())
+    + ', isWindows11OrLater=' + BoolToStr(IsWindows11OrLater())
+    + ', isWindows10ContextMenuForced=' + BoolToStr(IsWindows10ContextMenuForced())
+    + ', shouldUseWindows11ContextMenu=' + BoolToStr(ShouldUseWindows11ContextMenu())
+    + ', hasLegacyFileContextMenu=' + BoolToStr(HasLegacyFileContextMenu())
+    + ', hasLegacyFolderContextMenu=' + BoolToStr(HasLegacyFolderContextMenu())
+    + ', shouldRepairFolderContextMenu=' + BoolToStr(ShouldRepairFolderContextMenu())
+    + ', shouldInstallLegacyFolderContextMenu=' + BoolToStr(ShouldInstallLegacyFolderContextMenu())
+    + ', addcontextmenufiles=' + BoolToStr(WizardIsTaskSelected('addcontextmenufiles'))
+    + ', addcontextmenufolders=' + BoolToStr(WizardIsTaskSelected('addcontextmenufolders'))
+  );
+end;
+
+procedure DeleteLegacyContextMenuRegistryKeys();
+begin
+  RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\*\shell\{#RegValueName}');
+  RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\shell\{#RegValueName}');
+  RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\background\shell\{#RegValueName}');
+  RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\Drive\shell\{#RegValueName}');
+end;
+
 function GetAppMutex(Value: string): string;
 begin
   if IsBackgroundUpdate() then
@@ -1604,14 +1675,6 @@ begin
     Result := ExpandConstant('{#ApplicationName}.cmd');
 end;
 
-function BoolToStr(Value: Boolean): String;
-begin
-  if Value then
-    Result := 'true'
-  else
-    Result := 'false';
-end;
-
 function QualityIsInsiders(): boolean;
 begin
   if '{#Quality}' = 'insider' then
@@ -1634,30 +1697,43 @@ end;
 function AppxPackageInstalled(const name: String; var ResultCode: Integer): Boolean;
 begin
   AppxPackageFullname := '';
+  ResultCode := -1;
   try
     Log('Get-AppxPackage for package with name: ' + name);
     ExecAndLogOutput('powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Get-AppxPackage -Name ''' + name + ''' | Select-Object -ExpandProperty PackageFullName'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode, @ExecAndGetFirstLineLog);
   except
     Log(GetExceptionMessage);
+    ResultCode := -1;
   end;
   if (AppxPackageFullname <> '') then
     Result := True
   else
-    Result := False
+    Result := False;
+
+  Log('Get-AppxPackage result: name=' + name + ', installed=' + BoolToStr(Result) + ', resultCode=' + IntToStr(ResultCode) + ', packageFullName=' + AppxPackageFullname);
 end;
 
 procedure AddAppxPackage();
 var
   AddAppxPackageResultCode: Integer;
+  IsCurrentAppxInstalled: Boolean;
 begin
-  if not SessionEndFileExists() and not AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), AddAppxPackageResultCode) then begin
+  if SessionEndFileExists() then begin
+    Log('Skipping Add-AppxPackage because session end was detected.');
+    exit;
+  end;
+
+  IsCurrentAppxInstalled := AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), AddAppxPackageResultCode);
+  if not IsCurrentAppxInstalled then begin
     Log('Installing appx ' + AppxPackageFullname + ' ...');
 #if "user" == InstallTarget
     ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Add-AppxPackage -Path ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx\{#AppxPackage}') + ''' -ExternalLocation ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode);
 #else
     ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Add-AppxPackage -Stage ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx\{#AppxPackage}') + ''' -ExternalLocation ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx') + '''; Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx\{#AppxPackage}') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode);
 #endif
-    Log('Add-AppxPackage complete.');
+    Log('Add-AppxPackage complete with result code ' + IntToStr(AddAppxPackageResultCode) + '.');
+  end else begin
+    Log('Skipping Add-AppxPackage because package is already installed.');
   end;
 end;
 
@@ -1670,6 +1746,7 @@ begin
   if QualityIsInsiders() and not SessionEndFileExists() and AppxPackageInstalled('Microsoft.VSCodeInsiders', RemoveAppxPackageResultCode) then begin
     Log('Deleting old appx ' + AppxPackageFullname + ' installation...');
     ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Remove-AppxPackage -Package ''' + AppxPackageFullname + ''''), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode);
+    Log('Remove-AppxPackage for old appx completed with result code ' + IntToStr(RemoveAppxPackageResultCode) + '.');
     DeleteFile(ExpandConstant('{app}\appx\code_insiders_explorer_{#Arch}.appx'));
     DeleteFile(ExpandConstant('{app}\appx\code_insiders_explorer_command.dll'));
   end;
@@ -1680,7 +1757,9 @@ begin
 #else
     ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('$packages = Get-AppxPackage ''' + ExpandConstant('{#AppxPackageName}') + '''; foreach ($package in $packages) { Remove-AppxProvisionedPackage -PackageName $package.PackageFullName -Online }; foreach ($package in $packages) { Remove-AppxPackage -Package $package.PackageFullName -AllUsers }'), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode);
 #endif
-    Log('Remove-AppxPackage for current appx installation complete.');
+    Log('Remove-AppxPackage for current appx installation complete with result code ' + IntToStr(RemoveAppxPackageResultCode) + '.');
+  end else if not SessionEndFileExists() then begin
+    Log('Skipping Remove-AppxPackage for current appx because package is not installed.');
   end;
 end;
 #endif
@@ -1692,6 +1771,8 @@ var
 begin
   if CurStep = ssPostInstall then
   begin
+    LogContextMenuInstallState();
+
 #ifdef AppxPackageName
     // Remove the appx package when user has forced Windows 10 context menus via
     // registry. This handles the case where the user previously had the appx
@@ -1701,10 +1782,7 @@ begin
     end;
     // Remove the old context menu registry keys
     if ShouldUseWindows11ContextMenu() then begin
-      RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\*\shell\{#RegValueName}');
-      RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\shell\{#RegValueName}');
-      RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\background\shell\{#RegValueName}');
-      RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\Drive\shell\{#RegValueName}');
+      DeleteLegacyContextMenuRegistryKeys();
     end;
 #endif
 
@@ -1817,6 +1895,7 @@ begin
   if not CurUninstallStep = usUninstall then begin
     exit;
   end;
+
 #ifdef AppxPackageName
   RemoveAppxPackage();
 #endif
diff --git a/cglicenses.json b/cglicenses.json
index 48d2c3b093c..2793b7fe2d6 100644
--- a/cglicenses.json
+++ b/cglicenses.json
@@ -209,21 +209,6 @@
 			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 		]
 	},
-	{
-		// Reason: Missing license file
-		"name": "readable-web-to-node-stream",
-		"fullLicenseText": [
-			"(The MIT License)",
-			"",
-			"Copyright (c) 2019 Borewit",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
-		]
-	},
 	{
 		// Reason: The substack org has been deleted on GH
 		"name": "concat-map",
@@ -750,5 +735,64 @@
 		// Reason: mono-repo
 		"name": "@jridgewell/trace-mapping",
 		"fullLicenseTextUri": "https://raw.githubusercontent.com/jridgewell/sourcemaps/refs/heads/main/packages/trace-mapping/LICENSE"
+	},
+	{
+		// Reason: License text from https://github.com/github/copilot-cli/blob/master/LICENSE.md
+		// does not include a copyright statement.
+		"name": "@github/copilot",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		"name": "@github/copilot-darwin-arm64",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		"name": "@github/copilot-darwin-x64",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		"name": "@github/copilot-linux-arm64",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		"name": "@github/copilot-linux-x64",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		"name": "@github/copilot-win32-arm64",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		"name": "@github/copilot-win32-x64",
+		"prependLicenseText": [
+			"Copyright (c) GitHub, Inc."
+		]
+	},
+	{
+		// Reason: NPM package does not include repository URL
+		"name": "@vscode/fs-copyfile",
+		"fullLicenseText": [
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"MIT License",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
 	}
 ]
diff --git a/cgmanifest.json b/cgmanifest.json
index 1b1e1711ccf..a617dd1c78c 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -516,12 +516,12 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "6add85e4c46b8be383c8b637102d6b6fd206adce",
-					"tag": "22.22.0"
+					"commitHash": "b4acf0c9393e4b31c4937564f059c672967161d8",
+					"tag": "22.22.1"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "22.22.0"
+			"version": "22.22.1"
 		},
 		{
 			"component": {
@@ -529,13 +529,13 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "69c8cbf259da0f84e9c1db04958516a68f7170aa",
-					"tag": "39.8.0"
+					"commitHash": "e6928c13198c854aa014c319d72eea599e2e0ee7",
+					"tag": "39.8.3"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "39.8.0"
+			"version": "39.8.3"
 		},
 		{
 			"component": {
@@ -606,7 +606,7 @@
 				}
 			},
 			"license": "MIT and Creative Commons Attribution 4.0",
-			"version": "0.0.41"
+			"version": "0.0.46-0"
 		},
 		{
 			"component": {
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index afe353213b1..e50f85de23a 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2865,9 +2865,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
 dependencies = [
  "filetime",
  "libc",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 423224e10c5..6f54ec61cbb 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -53,7 +53,7 @@ cfg-if = "1.0.0"
 pin-project = "1.1.0"
 console = "0.15.7"
 bytes = "1.11.1"
-tar = "0.4.38"
+tar = "0.4.45"
 
 [build-dependencies]
 serde = { version="1.0.163", features = ["derive"] }
diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt
index 6e21ddb3729..39091fdc1db 100644
--- a/cli/ThirdPartyNotices.txt
+++ b/cli/ThirdPartyNotices.txt
@@ -722,9 +722,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -1922,9 +1922,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5287,9 +5287,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5328,9 +5328,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5369,9 +5369,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5410,9 +5410,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5451,9 +5451,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5492,9 +5492,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5533,9 +5533,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5574,9 +5574,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5615,9 +5615,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5656,9 +5656,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5697,9 +5697,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5738,9 +5738,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5779,9 +5779,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -5820,9 +5820,9 @@ Furthermore, the crates are (usually automatically) derived from Apple SDKs,
 and that may have implications for licensing, see below for details.
 
 [#23]: https://github.com/madsmtm/objc2/issues/23
-[MIT]: https://opensource.org/license/MIT
-[Zlib]: https://zlib.net/zlib_license.html
-[Apache-2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[MIT]: ./LICENSE-MIT.txt
+[Zlib]: ./LICENSE-ZLIB.txt
+[Apache-2.0]: ./LICENSE-APACHE.txt
 
 
 ## Apple SDKs
@@ -10137,7 +10137,7 @@ DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-tar 0.4.44 - MIT OR Apache-2.0
+tar 0.4.45 - MIT OR Apache-2.0
 https://github.com/alexcrichton/tar-rs
 
 Copyright (c) The tar-rs Project Contributors
@@ -14089,9 +14089,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-Some files in the "tests/data" subdirectory of this repository are under other
-licences; see files named LICENSE.*.txt for details.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
diff --git a/cli/src/bin/code/main.rs b/cli/src/bin/code/main.rs
index b73d0aa885b..6c301ca9502 100644
--- a/cli/src/bin/code/main.rs
+++ b/cli/src/bin/code/main.rs
@@ -8,7 +8,7 @@ use std::process::Command;
 
 use clap::Parser;
 use cli::{
-	commands::{args, serve_web, tunnels, update, version, CommandContext},
+	commands::{agent_host, args, serve_web, tunnels, update, version, CommandContext},
 	constants::get_default_user_agent,
 	desktop, log,
 	state::LauncherPaths,
@@ -103,6 +103,10 @@ async fn main() -> Result<(), std::convert::Infallible> {
 				serve_web::serve_web(context!(), sw_args).await
 			}
 
+			Some(args::Commands::AgentHost(ah_args)) => {
+				agent_host::agent_host(context!(), ah_args).await
+			}
+
 			Some(args::Commands::Tunnel(mut tunnel_args)) => match tunnel_args.subcommand.take() {
 				Some(args::TunnelSubcommand::Prune) => tunnels::prune(context!()).await,
 				Some(args::TunnelSubcommand::Unregister) => tunnels::unregister(context!()).await,
diff --git a/cli/src/commands.rs b/cli/src/commands.rs
index 027716947a3..1b706653c6e 100644
--- a/cli/src/commands.rs
+++ b/cli/src/commands.rs
@@ -5,6 +5,7 @@
 
 mod context;
 
+pub mod agent_host;
 pub mod args;
 pub mod serve_web;
 pub mod tunnels;
diff --git a/cli/src/commands/agent_host.rs b/cli/src/commands/agent_host.rs
new file mode 100644
index 00000000000..a5291281ba0
--- /dev/null
+++ b/cli/src/commands/agent_host.rs
@@ -0,0 +1,738 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+use std::convert::Infallible;
+use std::fs;
+use std::io::{Read, Write};
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+
+use hyper::service::{make_service_fn, service_fn};
+use hyper::{Body, Request, Response, Server};
+use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio::sync::Mutex;
+
+use crate::async_pipe::{get_socket_name, get_socket_rw_stream, AsyncPipe};
+use crate::constants::VSCODE_CLI_QUALITY;
+use crate::download_cache::DownloadCache;
+use crate::log;
+use crate::options::Quality;
+use crate::tunnels::paths::{get_server_folder_name, SERVER_FOLDER_NAME};
+use crate::tunnels::shutdown_signal::ShutdownRequest;
+use crate::update_service::{
+	unzip_downloaded_release, Platform, Release, TargetKind, UpdateService,
+};
+use crate::util::command::new_script_command;
+use crate::util::errors::AnyError;
+use crate::util::http::{self, ReqwestSimpleHttp};
+use crate::util::io::SilentCopyProgress;
+use crate::util::sync::{new_barrier, Barrier, BarrierOpener};
+use crate::{
+	tunnels::legal,
+	util::{errors::CodeError, prereqs::PreReqChecker},
+};
+
+use super::{args::AgentHostArgs, CommandContext};
+
+/// How often to check for server updates.
+const UPDATE_CHECK_INTERVAL: Duration = Duration::from_secs(24 * 60 * 60);
+/// How often to re-check whether the server has exited when an update is pending.
+const UPDATE_POLL_INTERVAL: Duration = Duration::from_secs(10 * 60);
+/// How long to wait for the server to signal readiness.
+const STARTUP_TIMEOUT: Duration = Duration::from_secs(30);
+
+/// Runs a local agent host server. Downloads the latest VS Code server on
+/// demand, starts it with `--enable-remote-auto-shutdown`, and proxies
+/// WebSocket connections from a local TCP port to the server's agent host
+/// socket. The server auto-shuts down when idle; the CLI checks for updates
+/// in the background and starts the latest version on the next connection.
+pub async fn agent_host(ctx: CommandContext, mut args: AgentHostArgs) -> Result<i32, AnyError> {
+	legal::require_consent(&ctx.paths, args.accept_server_license_terms)?;
+
+	let platform: Platform = PreReqChecker::new().verify().await?;
+
+	if !args.without_connection_token {
+		if let Some(p) = args.connection_token_file.as_deref() {
+			let token = fs::read_to_string(PathBuf::from(p))
+				.map_err(CodeError::CouldNotReadConnectionTokenFile)?;
+			args.connection_token = Some(token.trim().to_string());
+		} else {
+			let token_path = ctx.paths.root().join("agent-host-token");
+			let token = mint_connection_token(&token_path, args.connection_token.clone())
+				.map_err(CodeError::CouldNotCreateConnectionTokenFile)?;
+			args.connection_token = Some(token);
+			args.connection_token_file = Some(token_path.to_string_lossy().to_string());
+		}
+	}
+
+	let manager = AgentHostManager::new(&ctx, platform, args.clone())?;
+
+	// Eagerly resolve the latest version so the first connection is fast.
+	// Skip when using a dev override since updates don't apply.
+	if option_env!("VSCODE_CLI_OVERRIDE_SERVER_PATH").is_none() {
+		match manager.get_latest_release().await {
+			Ok(release) => {
+				if let Err(e) = manager.ensure_downloaded(&release).await {
+					warning!(ctx.log, "Error downloading latest server version: {}", e);
+				}
+			}
+			Err(e) => warning!(ctx.log, "Error resolving initial server version: {}", e),
+		}
+
+		// Start background update checker
+		let manager_for_updates = manager.clone();
+		tokio::spawn(async move {
+			manager_for_updates.run_update_loop().await;
+		});
+	}
+
+	// Bind the HTTP/WebSocket proxy
+	let mut shutdown = ShutdownRequest::create_rx([ShutdownRequest::CtrlC]);
+
+	let addr: SocketAddr = match &args.host {
+		Some(h) => SocketAddr::new(h.parse().map_err(CodeError::InvalidHostAddress)?, args.port),
+		None => SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), args.port),
+	};
+	let builder = Server::try_bind(&addr).map_err(CodeError::CouldNotListenOnInterface)?;
+	let bound_addr = builder.local_addr();
+
+	let mut url = format!("ws://{bound_addr}");
+	if let Some(ct) = &args.connection_token {
+		url.push_str(&format!("?tkn={ct}"));
+	}
+	ctx.log
+		.result(format!("Agent host proxy listening on {url}"));
+
+	let manager_for_svc = manager.clone();
+	let make_svc = move || {
+		let mgr = manager_for_svc.clone();
+		let service = service_fn(move |req| {
+			let mgr = mgr.clone();
+			async move { handle_request(mgr, req).await }
+		});
+		async move { Ok::<_, Infallible>(service) }
+	};
+
+	let server_future = builder
+		.serve(make_service_fn(|_| make_svc()))
+		.with_graceful_shutdown(async {
+			let _ = shutdown.wait().await;
+		});
+
+	let r = server_future.await;
+	manager.kill_running_server().await;
+	r.map_err(CodeError::CouldNotListenOnInterface)?;
+
+	Ok(0)
+}
+
+// ---- AgentHostManager -------------------------------------------------------
+
+/// State of the running VS Code server process.
+struct RunningServer {
+	child: tokio::process::Child,
+	commit: String,
+}
+
+/// Manages the VS Code server lifecycle: on-demand start, auto-restart
+/// after idle shutdown, and background update checking.
+struct AgentHostManager {
+	log: log::Logger,
+	args: AgentHostArgs,
+	platform: Platform,
+	cache: DownloadCache,
+	update_service: UpdateService,
+	/// The latest known release, with the time it was checked.
+	latest_release: Mutex<Option<(Instant, Release)>>,
+	/// The currently running server, if any.
+	running: Mutex<Option<RunningServer>>,
+	/// Barrier that opens when a server is ready (socket path available).
+	/// Reset each time a new server is started.
+	ready: Mutex<Option<Barrier<Result<PathBuf, String>>>>,
+}
+
+impl AgentHostManager {
+	fn new(
+		ctx: &CommandContext,
+		platform: Platform,
+		args: AgentHostArgs,
+	) -> Result<Arc<Self>, CodeError> {
+		// Seed latest_release from cache if available
+		let cache = ctx.paths.server_cache.clone();
+		Ok(Arc::new(Self {
+			log: ctx.log.clone(),
+			args,
+			platform,
+			cache,
+			update_service: UpdateService::new(
+				ctx.log.clone(),
+				Arc::new(ReqwestSimpleHttp::with_client(ctx.http.clone())),
+			),
+			latest_release: Mutex::new(None),
+			running: Mutex::new(None),
+			ready: Mutex::new(None),
+		}))
+	}
+
+	/// Returns the socket path to a running server, starting one if needed.
+	async fn ensure_server(self: &Arc<Self>) -> Result<PathBuf, CodeError> {
+		// Fast path: if we already have a barrier, wait on it
+		{
+			let ready = self.ready.lock().await;
+			if let Some(barrier) = &*ready {
+				if barrier.is_open() {
+					// Check if the process is still running
+					let running = self.running.lock().await;
+					if running.is_some() {
+						return barrier
+							.clone()
+							.wait()
+							.await
+							.unwrap()
+							.map_err(CodeError::ServerDownloadError);
+					}
+				} else {
+					// Still starting up, wait for it
+					let mut barrier = barrier.clone();
+					drop(ready);
+					return barrier
+						.wait()
+						.await
+						.unwrap()
+						.map_err(CodeError::ServerDownloadError);
+				}
+			}
+		}
+
+		// Need to start a new server
+		self.start_server().await
+	}
+
+	/// Starts the server with the latest already-downloaded version.
+	/// Only blocks on a network fetch if no version has been downloaded yet.
+	async fn start_server(self: &Arc<Self>) -> Result<PathBuf, CodeError> {
+		let (release, server_dir) = self.get_cached_or_download().await?;
+
+		let (mut barrier, opener) = new_barrier::<Result<PathBuf, String>>();
+		{
+			let mut ready = self.ready.lock().await;
+			*ready = Some(barrier.clone());
+		}
+
+		let self_clone = self.clone();
+		let release_clone = release.clone();
+		tokio::spawn(async move {
+			self_clone
+				.run_server(release_clone, server_dir, opener)
+				.await;
+		});
+
+		barrier
+			.wait()
+			.await
+			.unwrap()
+			.map_err(CodeError::ServerDownloadError)
+	}
+
+	/// Runs the server process to completion, handling readiness signaling.
+	async fn run_server(
+		self: &Arc<Self>,
+		release: Release,
+		server_dir: PathBuf,
+		opener: BarrierOpener<Result<PathBuf, String>>,
+	) {
+		let executable = if let Some(p) = option_env!("VSCODE_CLI_OVERRIDE_SERVER_PATH") {
+			PathBuf::from(p)
+		} else {
+			server_dir
+				.join(SERVER_FOLDER_NAME)
+				.join("bin")
+				.join(release.quality.server_entrypoint())
+		};
+
+		let agent_host_socket = get_socket_name();
+		let mut cmd = new_script_command(&executable);
+		cmd.stdin(std::process::Stdio::null());
+		cmd.stderr(std::process::Stdio::piped());
+		cmd.stdout(std::process::Stdio::piped());
+		cmd.arg("--socket-path");
+		cmd.arg(get_socket_name());
+		cmd.arg("--agent-host-path");
+		cmd.arg(&agent_host_socket);
+		cmd.args([
+			"--start-server",
+			"--accept-server-license-terms",
+			"--enable-remote-auto-shutdown",
+		]);
+
+		if let Some(a) = &self.args.server_data_dir {
+			cmd.arg("--server-data-dir");
+			cmd.arg(a);
+		}
+		if self.args.without_connection_token {
+			cmd.arg("--without-connection-token");
+		}
+		if let Some(ct) = &self.args.connection_token_file {
+			cmd.arg("--connection-token-file");
+			cmd.arg(ct);
+		}
+		cmd.env_remove("VSCODE_DEV");
+
+		let mut child = match cmd.spawn() {
+			Ok(c) => c,
+			Err(e) => {
+				opener.open(Err(e.to_string()));
+				return;
+			}
+		};
+
+		let commit_prefix = &release.commit[..release.commit.len().min(7)];
+		let (mut stdout, mut stderr) = (
+			BufReader::new(child.stdout.take().unwrap()).lines(),
+			BufReader::new(child.stderr.take().unwrap()).lines(),
+		);
+
+		// Wait for readiness with a timeout
+		let mut opener = Some(opener);
+		let socket_path = agent_host_socket.clone();
+		let startup_deadline = tokio::time::sleep(STARTUP_TIMEOUT);
+		tokio::pin!(startup_deadline);
+
+		let mut ready = false;
+		loop {
+			tokio::select! {
+				Ok(Some(l)) = stdout.next_line() => {
+					debug!(self.log, "[{} stdout]: {}", commit_prefix, l);
+				if !ready && l.contains("Agent host server listening on") {
+						ready = true;
+						if let Some(o) = opener.take() {
+							o.open(Ok(socket_path.clone()));
+						}
+					}
+				}
+				Ok(Some(l)) = stderr.next_line() => {
+					debug!(self.log, "[{} stderr]: {}", commit_prefix, l);
+				}
+				_ = &mut startup_deadline, if !ready => {
+					warning!(self.log, "[{}]: Server did not become ready within {}s", commit_prefix, STARTUP_TIMEOUT.as_secs());
+					// Don't fail — the server may still start up, just slowly
+					if let Some(o) = opener.take() {
+						o.open(Ok(socket_path.clone()));
+					}
+					ready = true;
+				}
+				e = child.wait() => {
+					info!(self.log, "[{} process]: exited: {:?}", commit_prefix, e);
+					if let Some(o) = opener.take() {
+						o.open(Err(format!("Server exited before ready: {e:?}")));
+					}
+					break;
+				}
+			}
+
+			if ready {
+				break;
+			}
+		}
+
+		// Store the running server state
+		{
+			let mut running = self.running.lock().await;
+			*running = Some(RunningServer {
+				child,
+				commit: release.commit.clone(),
+			});
+		}
+
+		if !ready {
+			return;
+		}
+
+		info!(self.log, "[{}]: Server ready", commit_prefix);
+
+		// Continue reading output until the process exits
+		let log = self.log.clone();
+		let commit_prefix = commit_prefix.to_string();
+		let self_clone = self.clone();
+		tokio::spawn(async move {
+			loop {
+				tokio::select! {
+					Ok(Some(l)) = stdout.next_line() => {
+						debug!(log, "[{} stdout]: {}", commit_prefix, l);
+					}
+					Ok(Some(l)) = stderr.next_line() => {
+						debug!(log, "[{} stderr]: {}", commit_prefix, l);
+					}
+					else => break,
+				}
+			}
+
+			// Server process has exited (auto-shutdown or crash)
+			info!(log, "[{}]: Server process ended", commit_prefix);
+			let mut running = self_clone.running.lock().await;
+			if let Some(r) = &*running {
+				if r.commit == commit_prefix || r.commit.starts_with(&commit_prefix) {
+					// Only clear if it's still our server
+				}
+			}
+			*running = None;
+		});
+	}
+
+	/// Returns a release and its local directory. Prefers the latest known
+	/// release if it has already been downloaded; otherwise falls back to any
+	/// cached version. Only fetches from the network and downloads if
+	/// nothing is cached at all.
+	async fn get_cached_or_download(&self) -> Result<(Release, PathBuf), CodeError> {
+		// When using a dev override, skip the update service entirely -
+		// the override path is used directly by run_server().
+		if option_env!("VSCODE_CLI_OVERRIDE_SERVER_PATH").is_some() {
+			let release = Release {
+				name: String::new(),
+				commit: String::from("dev"),
+				platform: self.platform,
+				target: TargetKind::Server,
+				quality: Quality::Insiders,
+			};
+			return Ok((release, PathBuf::new()));
+		}
+
+		// Best case: the latest known release is already downloaded
+		if let Some((_, release)) = &*self.latest_release.lock().await {
+			let name = get_server_folder_name(release.quality, &release.commit);
+			if let Some(dir) = self.cache.exists(&name) {
+				return Ok((release.clone(), dir));
+			}
+		}
+
+		let quality = VSCODE_CLI_QUALITY
+			.ok_or_else(|| CodeError::UpdatesNotConfigured("no configured quality"))
+			.and_then(|q| {
+				Quality::try_from(q).map_err(|_| CodeError::UpdatesNotConfigured("unknown quality"))
+			})?;
+
+		// Fall back to any cached version (still instant, just not the newest).
+		// Cache entries are named "<quality>-<commit>" via get_server_folder_name.
+		for entry in self.cache.get() {
+			if let Some(dir) = self.cache.exists(&entry) {
+				let (entry_quality, commit) = match entry.split_once('-') {
+					Some((q, c)) => match Quality::try_from(q.to_lowercase().as_str()) {
+						Ok(parsed) => (parsed, c.to_string()),
+						Err(_) => (quality, entry.clone()),
+					},
+					None => (quality, entry.clone()),
+				};
+				let release = Release {
+					name: String::new(),
+					commit,
+					platform: self.platform,
+					target: TargetKind::Server,
+					quality: entry_quality,
+				};
+				return Ok((release, dir));
+			}
+		}
+
+		// Nothing cached — must fetch and download (blocks the first connection)
+		info!(self.log, "No cached server version, downloading latest...");
+		let release = self.get_latest_release().await?;
+		let dir = self.ensure_downloaded(&release).await?;
+		Ok((release, dir))
+	}
+
+	/// Ensures the release is downloaded, returning the server directory.
+	async fn ensure_downloaded(&self, release: &Release) -> Result<PathBuf, CodeError> {
+		let cache_name = get_server_folder_name(release.quality, &release.commit);
+		if let Some(dir) = self.cache.exists(&cache_name) {
+			return Ok(dir);
+		}
+
+		info!(self.log, "Downloading server {}", release.commit);
+		let release = release.clone();
+		let log = self.log.clone();
+		let update_service = self.update_service.clone();
+		self.cache
+			.create(&cache_name, |target_dir| async move {
+				let tmpdir = tempfile::tempdir().unwrap();
+				let response = update_service.get_download_stream(&release).await?;
+				let name = response.url_path_basename().unwrap();
+				let archive_path = tmpdir.path().join(name);
+				http::download_into_file(
+					&archive_path,
+					log.get_download_logger("Downloading server:"),
+					response,
+				)
+				.await?;
+				let server_dir = target_dir.join(SERVER_FOLDER_NAME);
+				unzip_downloaded_release(&archive_path, &server_dir, SilentCopyProgress())?;
+				Ok(())
+			})
+			.await
+			.map_err(|e| CodeError::ServerDownloadError(e.to_string()))
+	}
+
+	/// Gets the latest release, caching the result.
+	async fn get_latest_release(&self) -> Result<Release, CodeError> {
+		let mut latest = self.latest_release.lock().await;
+		let now = Instant::now();
+
+		let quality = VSCODE_CLI_QUALITY
+			.ok_or_else(|| CodeError::UpdatesNotConfigured("no configured quality"))
+			.and_then(|q| {
+				Quality::try_from(q).map_err(|_| CodeError::UpdatesNotConfigured("unknown quality"))
+			})?;
+
+		let result = self
+			.update_service
+			.get_latest_commit(self.platform, TargetKind::Server, quality)
+			.await
+			.map_err(|e| CodeError::UpdateCheckFailed(e.to_string()));
+
+		// If the update service is unavailable, fall back to the cached version
+		if let (Err(e), Some((_, previous))) = (&result, latest.clone()) {
+			warning!(self.log, "Error checking for updates, using cached: {}", e);
+			*latest = Some((now, previous.clone()));
+			return Ok(previous);
+		}
+
+		let release = result?;
+		debug!(self.log, "Resolved server version: {}", release);
+		*latest = Some((now, release.clone()));
+		Ok(release)
+	}
+
+	/// Background loop: checks for updates periodically and pre-downloads
+	/// new versions when the server is idle.
+	async fn run_update_loop(self: Arc<Self>) {
+		let mut interval = tokio::time::interval(UPDATE_CHECK_INTERVAL);
+		interval.tick().await; // skip the immediate first tick
+
+		loop {
+			interval.tick().await;
+
+			let new_release = match self.get_latest_release().await {
+				Ok(r) => r,
+				Err(e) => {
+					warning!(self.log, "Update check failed: {}", e);
+					continue;
+				}
+			};
+
+			// Check if we already have this version
+			let name = get_server_folder_name(new_release.quality, &new_release.commit);
+			if self.cache.exists(&name).is_some() {
+				continue;
+			}
+
+			info!(self.log, "New server version available: {}", new_release);
+
+			// Wait until the server is not running before downloading
+			loop {
+				{
+					let running = self.running.lock().await;
+					if running.is_none() {
+						break;
+					}
+				}
+				debug!(self.log, "Server still running, waiting before updating...");
+				tokio::time::sleep(UPDATE_POLL_INTERVAL).await;
+			}
+
+			// Download the new version
+			match self.ensure_downloaded(&new_release).await {
+				Ok(_) => info!(self.log, "Updated server to {}", new_release),
+				Err(e) => warning!(self.log, "Failed to download update: {}", e),
+			}
+		}
+	}
+
+	/// Kills the currently running server, if any.
+	async fn kill_running_server(&self) {
+		let mut running = self.running.lock().await;
+		if let Some(mut server) = running.take() {
+			let _ = server.child.kill().await;
+		}
+	}
+}
+
+// ---- HTTP/WebSocket proxy ---------------------------------------------------
+
+/// Proxies an incoming HTTP/WebSocket request to the agent host's Unix socket.
+async fn handle_request(
+	manager: Arc<AgentHostManager>,
+	req: Request<Body>,
+) -> Result<Response<Body>, Infallible> {
+	let socket_path = match manager.ensure_server().await {
+		Ok(p) => p,
+		Err(e) => {
+			error!(manager.log, "Error starting agent host: {:?}", e);
+			return Ok(Response::builder()
+				.status(503)
+				.body(Body::from(format!("Error starting agent host: {e:?}")))
+				.unwrap());
+		}
+	};
+
+	let is_upgrade = req.headers().contains_key(hyper::header::UPGRADE);
+
+	let rw = match get_socket_rw_stream(&socket_path).await {
+		Ok(rw) => rw,
+		Err(e) => {
+			error!(
+				manager.log,
+				"Error connecting to agent host socket: {:?}", e
+			);
+			return Ok(Response::builder()
+				.status(503)
+				.body(Body::from(format!("Error connecting to agent host: {e:?}")))
+				.unwrap());
+		}
+	};
+
+	if is_upgrade {
+		Ok(forward_ws_to_server(rw, req).await)
+	} else {
+		Ok(forward_http_to_server(rw, req).await)
+	}
+}
+
+/// Proxies a standard HTTP request through the socket.
+async fn forward_http_to_server(rw: AsyncPipe, req: Request<Body>) -> Response<Body> {
+	let (mut request_sender, connection) =
+		match hyper::client::conn::Builder::new().handshake(rw).await {
+			Ok(r) => r,
+			Err(e) => return connection_err(e),
+		};
+
+	tokio::spawn(connection);
+
+	request_sender
+		.send_request(req)
+		.await
+		.unwrap_or_else(connection_err)
+}
+
+/// Proxies a WebSocket upgrade request through the socket.
+async fn forward_ws_to_server(rw: AsyncPipe, mut req: Request<Body>) -> Response<Body> {
+	let (mut request_sender, connection) =
+		match hyper::client::conn::Builder::new().handshake(rw).await {
+			Ok(r) => r,
+			Err(e) => return connection_err(e),
+		};
+
+	tokio::spawn(connection);
+
+	let mut proxied_req = Request::builder().uri(req.uri());
+	for (k, v) in req.headers() {
+		proxied_req = proxied_req.header(k, v);
+	}
+
+	let mut res = request_sender
+		.send_request(proxied_req.body(Body::empty()).unwrap())
+		.await
+		.unwrap_or_else(connection_err);
+
+	let mut proxied_res = Response::new(Body::empty());
+	*proxied_res.status_mut() = res.status();
+	for (k, v) in res.headers() {
+		proxied_res.headers_mut().insert(k, v.clone());
+	}
+
+	if res.status() == hyper::StatusCode::SWITCHING_PROTOCOLS {
+		tokio::spawn(async move {
+			let (s_req, s_res) =
+				tokio::join!(hyper::upgrade::on(&mut req), hyper::upgrade::on(&mut res));
+
+			if let (Ok(mut s_req), Ok(mut s_res)) = (s_req, s_res) {
+				let _ = tokio::io::copy_bidirectional(&mut s_req, &mut s_res).await;
+			}
+		});
+	}
+
+	proxied_res
+}
+
+fn connection_err(err: hyper::Error) -> Response<Body> {
+	Response::builder()
+		.status(503)
+		.body(Body::from(format!(
+			"Error connecting to agent host: {err:?}"
+		)))
+		.unwrap()
+}
+
+fn mint_connection_token(path: &Path, prefer_token: Option<String>) -> std::io::Result<String> {
+	#[cfg(not(windows))]
+	use std::os::unix::fs::OpenOptionsExt;
+
+	let mut f = fs::OpenOptions::new();
+	f.create(true);
+	f.write(true);
+	f.read(true);
+	#[cfg(not(windows))]
+	f.mode(0o600);
+	let mut f = f.open(path)?;
+
+	if prefer_token.is_none() {
+		let mut t = String::new();
+		f.read_to_string(&mut t)?;
+		let t = t.trim();
+		if !t.is_empty() {
+			return Ok(t.to_string());
+		}
+	}
+
+	f.set_len(0)?;
+	let prefer_token = prefer_token.unwrap_or_else(|| uuid::Uuid::new_v4().to_string());
+	f.write_all(prefer_token.as_bytes())?;
+	Ok(prefer_token)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use std::fs;
+
+	#[test]
+	fn mint_connection_token_generates_and_persists() {
+		let dir = tempfile::tempdir().unwrap();
+		let path = dir.path().join("token");
+
+		// First call with no preference generates a UUID and persists it
+		let token1 = mint_connection_token(&path, None).unwrap();
+		assert!(!token1.is_empty());
+		assert_eq!(fs::read_to_string(&path).unwrap(), token1);
+
+		// Second call with no preference reads the existing token
+		let token2 = mint_connection_token(&path, None).unwrap();
+		assert_eq!(token1, token2);
+	}
+
+	#[test]
+	fn mint_connection_token_respects_preferred() {
+		let dir = tempfile::tempdir().unwrap();
+		let path = dir.path().join("token");
+
+		// Providing a preferred token writes it to the file
+		let token = mint_connection_token(&path, Some("my-token".to_string())).unwrap();
+		assert_eq!(token, "my-token");
+		assert_eq!(fs::read_to_string(&path).unwrap(), "my-token");
+	}
+
+	#[test]
+	fn mint_connection_token_preferred_overwrites_existing() {
+		let dir = tempfile::tempdir().unwrap();
+		let path = dir.path().join("token");
+
+		mint_connection_token(&path, None).unwrap();
+
+		// Providing a preference overwrites any existing token
+		let token = mint_connection_token(&path, Some("override".to_string())).unwrap();
+		assert_eq!(token, "override");
+		assert_eq!(fs::read_to_string(&path).unwrap(), "override");
+	}
+}
diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs
index 6301bdd3104..9211cdc38d4 100644
--- a/cli/src/commands/args.rs
+++ b/cli/src/commands/args.rs
@@ -185,6 +185,10 @@ pub enum Commands {
 	/// Runs the control server on process stdin/stdout
 	#[clap(hide = true)]
 	CommandShell(CommandShellArgs),
+
+	/// Runs a local agent host server.
+	#[clap(name = "agent-host")]
+	AgentHost(AgentHostArgs),
 }
 
 #[derive(Args, Debug, Clone)]
@@ -221,6 +225,31 @@ pub struct ServeWebArgs {
 	pub commit_id: Option<String>,
 }
 
+#[derive(Args, Debug, Clone)]
+pub struct AgentHostArgs {
+	/// Host to listen on, defaults to 'localhost'
+	#[clap(long)]
+	pub host: Option<String>,
+	/// Port to listen on. If 0 is passed a random free port is picked.
+	#[clap(long, default_value_t = 0)]
+	pub port: u16,
+	/// A secret that must be included with all requests.
+	#[clap(long)]
+	pub connection_token: Option<String>,
+	/// A file containing a secret that must be included with all requests.
+	#[clap(long)]
+	pub connection_token_file: Option<String>,
+	/// Run without a connection token. Only use this if the connection is secured by other means.
+	#[clap(long)]
+	pub without_connection_token: bool,
+	/// If set, the user accepts the server license terms and the server will be started without a user prompt.
+	#[clap(long)]
+	pub accept_server_license_terms: bool,
+	/// Specifies the directory that server data is kept in.
+	#[clap(long)]
+	pub server_data_dir: Option<String>,
+}
+
 #[derive(Args, Debug, Clone)]
 pub struct CommandShellArgs {
 	#[clap(flatten)]
diff --git a/eslint.config.js b/eslint.config.js
index e7bc3f37aaa..26943ddee99 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -92,6 +92,7 @@ export default tseslint.config(
 			'local/code-no-localized-model-description': 'warn',
 			'local/code-policy-localization-key-match': 'warn',
 			'local/code-no-localization-template-literals': 'error',
+			'local/code-no-icons-in-localized-strings': 'warn',
 			'local/code-no-http-import': ['warn', { target: 'src/vs/**' }],
 			'local/code-no-deep-import-of-internal': ['error', { '.*Internal': true, 'searchExtTypesInternal': false }],
 			'local/code-layering': [
@@ -183,6 +184,18 @@ export default tseslint.config(
 			]
 		}
 	},
+	// Disallow common telemetry properties in event data
+	{
+		files: [
+			'src/**/*.ts',
+		],
+		plugins: {
+			'local': pluginLocal,
+		},
+		rules: {
+			'local/code-no-telemetry-common-property': 'warn',
+		}
+	},
 	// Disallow 'in' operator except in type predicates
 	{
 		files: [
@@ -322,6 +335,7 @@ export default tseslint.config(
 			'src/vs/workbench/services/remote/common/tunnelModel.ts',
 			'src/vs/workbench/services/search/common/textSearchManager.ts',
 			'src/vs/workbench/test/browser/workbenchTestServices.ts',
+			'src/vs/platform/agentHost/common/state/protocol/reducers.ts',
 			'test/automation/src/playwrightDriver.ts',
 			'.eslint-plugin-local/**/*',
 		],
@@ -1042,6 +1056,33 @@ export default tseslint.config(
 			]
 		}
 	},
+	// electron-main layer: prevent static imports of heavy node_modules
+	// that would be synchronously loaded on startup
+	{
+		files: [
+			'src/vs/code/electron-main/**/*.ts',
+			'src/vs/code/node/**/*.ts',
+			'src/vs/platform/*/electron-main/**/*.ts',
+			'src/vs/platform/*/node/**/*.ts',
+		],
+		languageOptions: {
+			parser: tseslint.parser,
+		},
+		plugins: {
+			'local': pluginLocal,
+		},
+		rules: {
+			'local/code-no-static-node-module-import': [
+				'error',
+				// Files that run in separate processes, not on the electron-main startup path
+				'src/vs/platform/agentHost/node/copilot/**/*.ts',
+				'src/vs/platform/files/node/watcher/**/*.ts',
+				'src/vs/platform/terminal/node/**/*.ts',
+				// Files that use small, safe modules
+				'src/vs/platform/environment/node/argv.ts',
+			]
+		}
+	},
 	// browser/electron-browser layer
 	{
 		files: [
@@ -1456,6 +1497,7 @@ export default tseslint.config(
 					// - electron-main
 					'when': 'hasNode',
 					'allow': [
+						'@github/copilot-sdk',
 						'@parcel/watcher',
 						'@vscode/sqlite3',
 						'@vscode/vscode-languagedetection',
@@ -1498,6 +1540,7 @@ export default tseslint.config(
 						'vscode-regexpp',
 						'vscode-textmate',
 						'worker_threads',
+						'ws',
 						'@xterm/addon-clipboard',
 						'@xterm/addon-image',
 						'@xterm/addon-ligatures',
@@ -1947,11 +1990,14 @@ export default tseslint.config(
 						'vs/editor/~',
 						'vs/editor/contrib/*/~',
 						'vs/editor/editor.all.js',
+						'vs/sessions/~',
+						'vs/sessions/services/*/~',
+						'vs/sessions/contrib/*/~',
 						'vs/workbench/~',
 						'vs/workbench/api/~',
 						'vs/workbench/services/*/~',
 						'vs/workbench/contrib/*/~',
-						'vs/workbench/contrib/terminal/terminal.all.js'
+						'vs/workbench/contrib/terminal/terminal.all.js',
 					]
 				},
 				{
@@ -1965,6 +2011,7 @@ export default tseslint.config(
 						'vs/editor/contrib/*/~',
 						'vs/editor/editor.all.js',
 						'vs/sessions/~',
+						'vs/sessions/services/*/~',
 						'vs/sessions/contrib/*/~',
 						'vs/workbench/~',
 						'vs/workbench/api/~',
@@ -1977,13 +2024,14 @@ export default tseslint.config(
 					'target': 'src/vs/sessions/sessions.web.main.ts',
 					'layer': 'browser',
 					'restrictions': [
-						'vs/base/*/~',
+						'vs/base/~',
 						'vs/base/parts/*/~',
 						'vs/platform/*/~',
 						'vs/editor/~',
 						'vs/editor/contrib/*/~',
 						'vs/editor/editor.all.js',
 						'vs/sessions/~',
+						'vs/sessions/services/*/~',
 						'vs/sessions/contrib/*/~',
 						'vs/workbench/~',
 						'vs/workbench/api/~',
@@ -2083,6 +2131,7 @@ export default tseslint.config(
 						'vs/editor/contrib/*/~',
 						'vs/workbench/~',
 						'vs/workbench/services/*/~',
+						'vs/sessions/~',
 						'vs/sessions/services/*/~',
 						{
 							'when': 'test',
@@ -2271,21 +2320,13 @@ export default tseslint.config(
 			'@typescript-eslint': tseslint.plugin,
 		},
 		rules: {
-			'@typescript-eslint/naming-convention': [
+			'no-restricted-syntax': [
 				'warn',
 				{
-					'selector': 'default',
-					'modifiers': ['private'],
-					'format': null,
-					'leadingUnderscore': 'require'
+					selector: ':matches(PropertyDefinition, TSParameterProperty, MethodDefinition[key.name!="constructor"])[accessibility="private"]',
+					message: 'Use #private instead',
 				},
-				{
-					'selector': 'default',
-					'modifiers': ['public'],
-					'format': null,
-					'leadingUnderscore': 'forbid'
-				}
-			]
+			],
 		}
 	},
 	// Additional extension strictness rules
@@ -2349,7 +2390,10 @@ export default tseslint.config(
 					'selector': `NewExpression[callee.object.name='Intl']`,
 					'message': 'Use safeIntl helper instead for safe and lazy use of potentially expensive Intl methods.'
 				},
+				{
+					'selector': 'TSAsExpression[typeAnnotation.type="TSTypeReference"][typeAnnotation.typeName.type="TSQualifiedName"][typeAnnotation.typeName.left.type="Identifier"][typeAnnotation.typeName.left.name="sinon"][typeAnnotation.typeName.right.name="SinonStub"]',
+					'message': `Avoid casting with 'as sinon.SinonStub'. Prefer typed stubs from 'sinon.stub(...)' or capture the stub in a typed variable.`
+				},
 			],
 		}
-	},
-);
+	});
diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json
index 6eb3de2f572..fa99e209e40 100644
--- a/extensions/csharp/cgmanifest.json
+++ b/extensions/csharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/csharp-tmLanguage",
 					"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
-					"commitHash": "2e6860d87d4019b0b793b1e21e9e5c82185a01aa"
+					"commitHash": "32ee13e806edf480ef9423adcf5ecf61ba39561b"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index 89b08d5c5b2..e344197ccb4 100644
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/2e6860d87d4019b0b793b1e21e9e5c82185a01aa",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/32ee13e806edf480ef9423adcf5ecf61ba39561b",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -5578,6 +5578,12 @@
 				{
 					"include": "#preprocessor-app-directive-property"
 				},
+				{
+					"include": "#preprocessor-app-directive-exclude"
+				},
+				{
+					"include": "#preprocessor-app-directive-include"
+				},
 				{
 					"include": "#preprocessor-app-directive-project"
 				},
@@ -5627,6 +5633,28 @@
 				}
 			}
 		},
+		"preprocessor-app-directive-exclude": {
+			"match": "\\b(exclude)\\b\\s*(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.exclude.cs"
+				},
+				"2": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-app-directive-include": {
+			"match": "\\b(include)\\b\\s*(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.include.cs"
+				},
+				"2": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
 		"preprocessor-app-directive-project": {
 			"match": "\\b(project)\\b\\s*(.*)?\\s*",
 			"captures": {
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 1fd31eeae79..0abce3a2cfb 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -218,7 +218,7 @@
             },
             "scope": "resource",
             "default": [],
-            "description": "%css.lint.validProperties.desc%"
+            "markdownDescription": "%css.lint.validProperties.desc%"
           },
           "css.lint.ieHack": {
             "type": "string",
@@ -534,7 +534,7 @@
             },
             "scope": "resource",
             "default": [],
-            "description": "%scss.lint.validProperties.desc%"
+            "markdownDescription": "%scss.lint.validProperties.desc%"
           },
           "scss.lint.ieHack": {
             "type": "string",
@@ -840,7 +840,7 @@
             },
             "scope": "resource",
             "default": [],
-            "description": "%less.lint.validProperties.desc%"
+            "markdownDescription": "%less.lint.validProperties.desc%"
           },
           "less.lint.ieHack": {
             "type": "string",
diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
index 057ec214bc2..d3de22412c2 100644
--- a/extensions/css-language-features/package.nls.json
+++ b/extensions/css-language-features/package.nls.json
@@ -33,7 +33,7 @@
 	"css.format.enable.desc": "Enable/disable default CSS formatter.",
 	"css.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"css.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
-	"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators `>`, `+`, `~` (e.g. `a > b`).",
 	"css.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
 	"css.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"css.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#css.format.preserveNewLines#` is enabled.",
@@ -67,7 +67,7 @@
 	"less.format.enable.desc": "Enable/disable default LESS formatter.",
 	"less.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"less.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
-	"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators `>`, `+`, `~` (e.g. `a > b`).",
 	"less.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
 	"less.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"less.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#less.format.preserveNewLines#` is enabled.",
@@ -101,7 +101,7 @@
 	"scss.format.enable.desc": "Enable/disable default SCSS formatter.",
 	"scss.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"scss.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
-	"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators `>`, `+`, `~` (e.g. `a > b`).",
 	"scss.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
 	"scss.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"scss.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#scss.format.preserveNewLines#` is enabled.",
diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
index 2a58c39641d..683bcc7f307 100644
--- a/extensions/emmet/package.nls.json
+++ b/extensions/emmet/package.nls.json
@@ -50,10 +50,10 @@
 	"emmetPreferencesFormatNoIndentTags": "An array of tag names that should never get inner indentation.",
 	"emmetPreferencesFormatForceIndentTags": "An array of tag names that should always get inner indentation.",
 	"emmetPreferencesAllowCompactBoolean": "If `true`, compact notation of boolean attributes are produced.",
-	"emmetPreferencesCssWebkitProperties": "Comma separated CSS properties that get the 'webkit' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'webkit' prefix.",
-	"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the 'moz' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'moz' prefix.",
-	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
-	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the 'ms' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'ms' prefix.",
+	"emmetPreferencesCssWebkitProperties": "Comma separated CSS properties that get the `webkit` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `webkit` prefix.",
+	"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the `moz` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `moz` prefix.",
+	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the `o` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `o` prefix.",
+	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the `ms` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `ms` prefix.",
 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
 	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in CSS/SCSS/Less files is parsed.",
 	"emmetPreferencesOutputInlineBreak": "The number of sibling inline elements needed for line breaks to be placed between those elements. If `0`, inline elements are always expanded onto a single line.",
diff --git a/extensions/git/esbuild.mts b/extensions/git/esbuild.mts
index 1b397880bc6..52037129935 100644
--- a/extensions/git/esbuild.mts
+++ b/extensions/git/esbuild.mts
@@ -32,4 +32,7 @@ run({
 	},
 	srcDir,
 	outdir: outDir,
+	additionalOptions: {
+		external: ['vscode', '@vscode/fs-copyfile'],
+	},
 }, process.argv, copyNonTsFiles);
diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index b552ce9fa5b..ceff06a20e8 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -11,8 +11,9 @@
       "dependencies": {
         "@joaomoreno/unique-names-generator": "^5.2.0",
         "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/fs-copyfile": "2.0.0",
         "byline": "^5.0.0",
-        "file-type": "16.5.4",
+        "file-type": "21.3.2",
         "picomatch": "2.3.1",
         "vscode-uri": "^2.0.0",
         "which": "4.0.0"
@@ -28,6 +29,16 @@
         "vscode": "^1.5.0"
       }
     },
+    "node_modules/@borewit/text-codec": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@borewit/text-codec/-/text-codec-0.2.1.tgz",
+      "integrity": "sha512-k7vvKPbf7J2fZ5klGRD9AeKfUvojuZIQ3BT5u7Jfv+puwXkUBUT5PVyMDfJZpy30CBDXGMgw7fguK/lpOMBvgw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/@joaomoreno/unique-names-generator": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@joaomoreno/unique-names-generator/-/unique-names-generator-5.2.0.tgz",
@@ -161,10 +172,28 @@
       "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
       "license": "MIT"
     },
+    "node_modules/@tokenizer/inflate": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@tokenizer/inflate/-/inflate-0.4.1.tgz",
+      "integrity": "sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.3",
+        "token-types": "^6.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+      "license": "MIT"
     },
     "node_modules/@types/byline": {
       "version": "4.2.31",
@@ -218,6 +247,19 @@
         "vscode": "^1.75.0"
       }
     },
+    "node_modules/@vscode/fs-copyfile": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@vscode/fs-copyfile/-/fs-copyfile-2.0.0.tgz",
+      "integrity": "sha512-ARb4+9rN905WjJtQ2mSBG/q4pjJkSRun/MkfCeRkk7h/5J8w4vd18NCePFJ/ZucIwXx/7mr9T6nz9Vtt1tk7hg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=22.6.0"
+      }
+    },
     "node_modules/byline": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
@@ -226,17 +268,36 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/file-type": {
-      "version": "16.5.4",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
-      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
       "dependencies": {
-        "readable-web-to-node-stream": "^3.0.0",
-        "strtok3": "^6.2.4",
-        "token-types": "^4.1.1"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/file-type": {
+      "version": "21.3.2",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.3.2.tgz",
+      "integrity": "sha512-DLkUvGwep3poOV2wpzbHCOnSKGk1LzyXTv+aHFgN2VFl96wnp8YA9YjO2qPzg5PuL8q/SW9Pdi6WTkYOIh995w==",
+      "license": "MIT",
+      "dependencies": {
+        "@tokenizer/inflate": "^0.4.1",
+        "strtok3": "^10.3.4",
+        "token-types": "^6.1.1",
+        "uint8array-extras": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -259,12 +320,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/isexe": {
       "version": "3.1.1",
@@ -274,17 +331,17 @@
         "node": ">=16"
       }
     },
-    "node_modules/peek-readable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
-      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "license": "MIT"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -297,71 +354,16 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
-      "dependencies": {
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "node_modules/strtok3": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
-      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "version": "10.3.4",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.4.tgz",
+      "integrity": "sha512-KIy5nylvC5le1OdaaoCJ07L+8iQzJHGH6pWDuzS+d07Cu7n1MZ2x26P8ZKIWfbK02+XIL8Mp4RkWeqdUCrDMfg==",
+      "license": "MIT",
       "dependencies": {
-        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^4.1.0"
+        "@tokenizer/token": "^0.3.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "type": "github",
@@ -369,21 +371,35 @@
       }
     },
     "node_modules/token-types": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz",
-      "integrity": "sha512-P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.1.2.tgz",
+      "integrity": "sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==",
+      "license": "MIT",
       "dependencies": {
+        "@borewit/text-codec": "^0.2.1",
         "@tokenizer/token": "^0.3.0",
         "ieee754": "^1.2.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/Borewit"
       }
     },
+    "node_modules/uint8array-extras": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.5.0.tgz",
+      "integrity": "sha512-rvKSBiC5zqCCiDZ9kAOszZcDvdAHwwIKJG33Ykj43OKcWsnmcBRL09YTU4nOeHZ8Y2a7l1MgTd08SBe9A8Qj6A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/undici-types": {
       "version": "6.20.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
@@ -391,11 +407,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
     "node_modules/vscode-uri": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.0.tgz",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 1fbac49569f..723d36fe7ba 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -38,6 +38,7 @@
     "scmTextDocument",
     "scmValidation",
     "statusBarItemTooltip",
+    "taskRunOptions",
     "tabInputMultiDiff",
     "tabInputTextMerge",
     "textEditorDiffInformation",
@@ -4346,8 +4347,9 @@
   "dependencies": {
     "@joaomoreno/unique-names-generator": "^5.2.0",
     "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/fs-copyfile": "2.0.0",
     "byline": "^5.0.0",
-    "file-type": "16.5.4",
+    "file-type": "21.3.2",
     "picomatch": "2.3.1",
     "vscode-uri": "^2.0.0",
     "which": "4.0.0"
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index b97337596d1..d003348045f 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -212,6 +212,10 @@ export class ApiRepository implements Repository {
 		return this.#repository.diffBetweenWithStats(ref1, ref2, path);
 	}
 
+	diffBetweenWithStats2(ref: string, path?: string): Promise<DiffChange[]> {
+		return this.#repository.diffBetweenWithStats2(ref, path);
+	}
+
 	hashObject(data: string): Promise<string> {
 		return this.#repository.hashObject(data);
 	}
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 8a258ba5741..95da0f84c74 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -278,6 +278,7 @@ export interface Repository {
 	diffBetween(ref1: string, ref2: string, path: string): Promise<string>;
 	diffBetweenPatch(ref1: string, ref2: string, path?: string): Promise<string>;
 	diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<DiffChange[]>;
+	diffBetweenWithStats2(ref: string, path?: string): Promise<DiffChange[]>;
 
 	hashObject(data: string): Promise<string>;
 
diff --git a/extensions/git/src/diagnostics.ts b/extensions/git/src/diagnostics.ts
index a8c1a3deea3..64bf11076fe 100644
--- a/extensions/git/src/diagnostics.ts
+++ b/extensions/git/src/diagnostics.ts
@@ -85,7 +85,11 @@ export class GitCommitInputBoxDiagnosticsManager {
 			const threshold = index === 0 ? inputValidationSubjectLength ?? inputValidationLength : inputValidationLength;
 
 			if (line.text.length > threshold) {
-				const diagnostic = new Diagnostic(line.range, l10n.t('{0} characters over {1} in current line', line.text.length - threshold, threshold), this.severity);
+				const charactersOver = line.text.length - threshold;
+				const lineLengthMessage = charactersOver === 1
+					? l10n.t('{0} character over {1} in current line', charactersOver, threshold)
+					: l10n.t('{0} characters over {1} in current line', charactersOver, threshold);
+				const diagnostic = new Diagnostic(line.range, lineLengthMessage, this.severity);
 				diagnostic.code = DiagnosticCodes.line_length;
 
 				diagnostics.push(diagnostic);
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 90284866a51..14e61bc3f8b 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -10,7 +10,7 @@ import * as cp from 'child_process';
 import { fileURLToPath } from 'url';
 import which from 'which';
 import { EventEmitter } from 'events';
-import * as filetype from 'file-type';
+import { fileTypeFromBuffer } from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant, relativePathWithNoFallback, Mutable } from './util';
 import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode';
 import type { Commit as ApiCommit, Ref, Branch, Remote, LogOptions, Change, CommitOptions, RefQuery as ApiRefQuery, InitOptions, DiffChange, Worktree as ApiWorktree } from './api/git';
@@ -1691,7 +1691,7 @@ export class Repository {
 		}
 
 		if (!isText) {
-			const result = await filetype.fromBuffer(buffer);
+			const result = await fileTypeFromBuffer(buffer);
 
 			if (!result) {
 				return { mimetype: 'application/octet-stream' };
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index bd6b6a5c7ff..657ecaa5534 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { cp } from '@vscode/fs-copyfile';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
 import * as fs from 'fs';
 import * as fsPromises from 'fs/promises';
 import * as path from 'path';
 import picomatch from 'picomatch';
-import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, ExcludeSettingOptions, FileDecoration, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, ThemeIcon, Uri, window, workspace, WorkspaceEdit } from 'vscode';
+import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, CustomExecution, Disposable, Event, EventEmitter, ExcludeSettingOptions, FileDecoration, l10n, LogLevel, LogOutputChannel, Memento, ProcessExecution, ProgressLocation, ProgressOptions, RelativePattern, scm, ShellExecution, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, Task, TaskPanelKind, TaskRevealKind, TaskRunOn, tasks, ThemeColor, ThemeIcon, Uri, window, workspace, WorkspaceEdit, WorkspaceFolder } from 'vscode';
 import { ActionButton } from './actionButton';
 import { ApiRepository } from './api/api1';
 import type { Branch, BranchQuery, Change, CommitOptions, DiffChange, FetchOptions, LogOptions, Ref, Remote, RepositoryKind } from './api/git';
@@ -464,9 +465,9 @@ class DotGitWatcher implements IFileWatcher {
 		const rootWatcher = watch(repository.dotGit.path);
 		this.disposables.push(rootWatcher);
 
-		// Ignore changes to the "index.lock" file, and watchman fsmonitor hook (https://git-scm.com/docs/githooks#_fsmonitor_watchman) cookie files.
+		// Ignore changes to the "index.lock" file (including worktree index.lock files), and watchman fsmonitor hook (https://git-scm.com/docs/githooks#_fsmonitor_watchman) cookie files.
 		// Watchman creates a cookie file inside the git directory whenever a query is run (https://facebook.github.io/watchman/docs/cookies.html).
-		const filteredRootWatcher = filterEvent(rootWatcher.event, uri => uri.scheme === 'file' && !/\/\.git(\/index\.lock)?$|\/\.watchman-cookie-/.test(uri.path));
+		const filteredRootWatcher = filterEvent(rootWatcher.event, uri => uri.scheme === 'file' && !/\/\.git(\/index\.lock|\/worktrees\/[^/]+\/index\.lock)?$|\/\.watchman-cookie-/.test(uri.path));
 		this.event = anyEvent(filteredRootWatcher, this.emitter.event);
 
 		repository.onDidRunGitStatus(this.updateTransientWatchers, this, this.disposables);
@@ -931,7 +932,7 @@ export class Repository implements Disposable {
 
 		// FS changes should trigger `git status`:
 		// 	- any change inside the repository working tree
-		//	- any change whithin the first level of the `.git` folder, except the folder itself and `index.lock`
+		//	- any change within the first level of the `.git` folder, except the folder itself and `index.lock` (repository and worktree)
 		const onFileChange = anyEvent(onRepositoryWorkingTreeFileChange, onRepositoryDotGitFileChange);
 		onFileChange(this.onFileChange, this, this.disposables);
 
@@ -940,12 +941,17 @@ export class Repository implements Disposable {
 
 		this.disposables.push(new FileEventLogger(onRepositoryWorkingTreeFileChange, onRepositoryDotGitFileChange, logger));
 
-		// Parent source control
-		const parentRoot = repository.kind === 'submodule'
-			? repository.dotGit.superProjectPath
-			: repository.kind === 'worktree' && repository.dotGit.commonPath
-				? path.dirname(repository.dotGit.commonPath)
-				: undefined;
+		// Parent source control. Repositories opened in the Sessions app
+		// don't use the parent/child relationship and it is expected for
+		// a worktree repository to be opened while the main repository
+		// is closed.
+		const parentRoot = workspace.isAgentSessionsWorkspace
+			? undefined
+			: repository.kind === 'submodule'
+				? repository.dotGit.superProjectPath
+				: repository.kind === 'worktree' && repository.dotGit.commonPath
+					? path.dirname(repository.dotGit.commonPath)
+					: undefined;
 		const parent = parentRoot
 			? this.repositoryResolver.getRepository(parentRoot)?.sourceControl
 			: undefined;
@@ -1225,6 +1231,14 @@ export class Repository implements Disposable {
 			this.repository.diffBetweenWithStats(`${ref1}...${ref2}`, { path, similarityThreshold }));
 	}
 
+	diffBetweenWithStats2(ref: string, path?: string): Promise<DiffChange[]> {
+		const scopedConfig = workspace.getConfiguration('git', Uri.file(this.root));
+		const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
+
+		return this.run(Operation.Diff, () =>
+			this.repository.diffBetweenWithStats(ref, { path, similarityThreshold }));
+	}
+
 	diffTrees(treeish1: string, treeish2?: string): Promise<DiffChange[]> {
 		const scopedConfig = workspace.getConfiguration('git', Uri.file(this.root));
 		const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
@@ -1892,15 +1906,41 @@ export class Repository implements Disposable {
 				this.globalState.update(`${Repository.WORKTREE_ROOT_STORAGE_KEY}:${this.root}`, newWorktreeRoot);
 			}
 
-			// Copy worktree include files. We explicitly do not await this
-			// since we don't want to block the worktree creation on the
-			// copy operation.
-			this._copyWorktreeIncludeFiles(worktreePath!);
+			this._setupWorktree(worktreePath!);
 
 			return worktreePath!;
 		});
 	}
 
+	private async _setupWorktree(worktreePath: string): Promise<void> {
+		// Copy worktree include files and wait for the copy to complete
+		// before running any worktree-created tasks.
+		await this._copyWorktreeIncludeFiles(worktreePath);
+
+		await this._runWorktreeCreatedTasks(worktreePath);
+	}
+
+	private async _runWorktreeCreatedTasks(worktreePath: string): Promise<void> {
+		try {
+			const allTasks = await tasks.fetchTasks();
+			const worktreeTasks = allTasks.filter(task => task.runOptions.runOn === TaskRunOn.WorktreeCreated);
+
+			for (const task of worktreeTasks) {
+				const worktreeTask = retargetTaskToWorktree(task, worktreePath);
+				if (!worktreeTask) {
+					this.logger.warn(`[Repository][_runWorktreeCreatedTasks] Skipped task '${task.name}' because it could not be retargeted to worktree '${worktreePath}'.`);
+					continue;
+				}
+
+				tasks.executeTask(worktreeTask).then(undefined, err => {
+					this.logger.warn(`[Repository][_runWorktreeCreatedTasks] Failed to execute worktree-created task '${task.name}' for '${worktreePath}': ${err}`);
+				});
+			}
+		} catch (err) {
+			this.logger.warn(`[Repository][_runWorktreeCreatedTasks] Failed to execute worktree-created tasks for '${worktreePath}': ${err}`);
+		}
+	}
+
 	private async _getWorktreeIncludePaths(): Promise<Set<string>> {
 		const config = workspace.getConfiguration('git', Uri.file(this.root));
 		const worktreeIncludeFiles = config.get<string[]>('worktreeIncludeFiles', []);
@@ -1930,59 +1970,76 @@ export class Repository implements Disposable {
 			gitIgnoredFiles.delete(uri.fsPath);
 		}
 
-		// Add the folder paths for git ignored files
+		// Compute the base directory for each glob pattern (the fixed
+		// prefix before any wildcard characters). This will be used to
+		// optimize the upward traversal when adding parent directories.
+		const filePatternBases = new Set<string>();
+		for (const pattern of worktreeIncludeFiles) {
+			const segments = pattern.split(/[\/\\]/);
+			const fixedSegments: string[] = [];
+			for (const seg of segments) {
+				if (/[*?{}[\]]/.test(seg)) {
+					break;
+				}
+				fixedSegments.push(seg);
+			}
+			filePatternBases.add(path.join(this.root, ...fixedSegments));
+		}
+
+		// Add the folder paths for git ignored files, walking
+		// up only to the nearest file pattern base directory.
 		const gitIgnoredPaths = new Set(gitIgnoredFiles);
 
 		for (const filePath of gitIgnoredFiles) {
 			let dir = path.dirname(filePath);
-			while (dir !== this.root && !gitIgnoredFiles.has(dir)) {
+			while (dir !== this.root && !gitIgnoredPaths.has(dir)) {
 				gitIgnoredPaths.add(dir);
+				if (filePatternBases.has(dir)) {
+					break;
+				}
 				dir = path.dirname(dir);
 			}
 		}
 
-		return gitIgnoredPaths;
+		// Find minimal set of paths (folders and files) to copy. Keep only topmost
+		// paths — if a directory is already in the set, all its descendants are
+		// implicitly included and don't need separate entries.
+		let lastTopmost: string | undefined;
+		const pathsToCopy = new Set<string>();
+		for (const p of Array.from(gitIgnoredPaths).sort()) {
+			if (lastTopmost && (p === lastTopmost || p.startsWith(lastTopmost + path.sep))) {
+				continue;
+			}
+			pathsToCopy.add(p);
+			lastTopmost = p;
+		}
+
+		return pathsToCopy;
 	}
 
 	private async _copyWorktreeIncludeFiles(worktreePath: string): Promise<void> {
-		const gitIgnoredPaths = await this._getWorktreeIncludePaths();
-		if (gitIgnoredPaths.size === 0) {
+		const worktreeIncludePaths = await this._getWorktreeIncludePaths();
+		if (worktreeIncludePaths.size === 0) {
 			return;
 		}
 
 		try {
-			// Find minimal set of paths (folders and files) to copy.
-			// The goal is to reduce the number of copy operations
-			// needed.
-			const pathsToCopy = new Set<string>();
-			for (const filePath of gitIgnoredPaths) {
-				const relativePath = path.relative(this.root, filePath);
-				const firstSegment = relativePath.split(path.sep)[0];
-				pathsToCopy.add(path.join(this.root, firstSegment));
-			}
-
-			const startTime = Date.now();
+			const startTime = performance.now();
 			const limiter = new Limiter<void>(15);
-			const files = Array.from(pathsToCopy);
+			const files = Array.from(worktreeIncludePaths);
 
 			// Copy files
-			const results = await Promise.allSettled(files.map(sourceFile =>
-				limiter.queue(async () => {
+			const results = await Promise.allSettled(files.map(sourceFile => {
+				return limiter.queue(async () => {
 					const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
 					await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
-					await fsPromises.cp(sourceFile, targetFile, {
-						filter: src => gitIgnoredPaths.has(src),
-						force: true,
-						mode: fs.constants.COPYFILE_FICLONE,
-						recursive: true,
-						verbatimSymlinks: true
-					});
-				})
-			));
+					await cp(sourceFile, targetFile, { force: true, recursive: true, verbatimSymlinks: true });
+				});
+			}));
 
 			// Log any failed operations
 			const failedOperations = results.filter(r => r.status === 'rejected');
-			this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length}/${files.length} folder(s)/file(s) to worktree. [${Date.now() - startTime}ms]`);
+			this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length}/${files.length} folder(s)/file(s) to worktree. [${(performance.now() - startTime).toFixed(2)}ms]`);
 
 			if (failedOperations.length > 0) {
 				window.showWarningMessage(l10n.t('Failed to copy {0} folder(s)/file(s) to the worktree.', failedOperations.length));
@@ -3349,3 +3406,56 @@ export class Repository implements Disposable {
 		this.disposables = dispose(this.disposables);
 	}
 }
+
+function retargetTaskToWorktree(task: Task, worktreePath: string): Task | undefined {
+	const execution = retargetTaskExecution(task.execution, worktreePath);
+	if (!execution) {
+		return undefined;
+	}
+
+	const worktreeFolder: WorkspaceFolder = {
+		uri: Uri.file(worktreePath),
+		name: path.basename(worktreePath),
+		index: workspace.workspaceFolders?.length ?? 0
+	};
+
+	const worktreeTask = new Task({ ...task.definition }, worktreeFolder, task.name, task.source, execution, task.problemMatchers);
+	worktreeTask.detail = task.detail;
+	worktreeTask.group = task.group;
+	worktreeTask.isBackground = task.isBackground;
+	worktreeTask.presentationOptions = { ...task.presentationOptions, reveal: TaskRevealKind.Never, panel: TaskPanelKind.New };
+	worktreeTask.runOptions = { ...task.runOptions };
+
+	return worktreeTask;
+}
+
+function retargetTaskExecution(execution: ProcessExecution | ShellExecution | CustomExecution | undefined, worktreePath: string): ProcessExecution | ShellExecution | CustomExecution | undefined {
+	if (!execution) {
+		return undefined;
+	}
+
+	if (execution instanceof ProcessExecution) {
+		return new ProcessExecution(execution.process, execution.args, {
+			...execution.options,
+			cwd: worktreePath
+		});
+	}
+
+	if (execution instanceof ShellExecution) {
+		if (execution.commandLine !== undefined) {
+			return new ShellExecution(execution.commandLine, {
+				...execution.options,
+				cwd: worktreePath
+			});
+		}
+
+		if (execution.command !== undefined) {
+			return new ShellExecution(execution.command, execution.args ?? [], {
+				...execution.options,
+				cwd: worktreePath
+			});
+		}
+	}
+
+	return execution;
+}
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 2a7ad5259ac..a34d12aaa48 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -27,6 +27,7 @@
 		"../../src/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmTextDocument.d.ts",
 		"../../src/vscode-dts/vscode.proposed.statusBarItemTooltip.d.ts",
+		"../../src/vscode-dts/vscode.proposed.taskRunOptions.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
 		"../../src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts",
diff --git a/extensions/github/esbuild.mts b/extensions/github/esbuild.mts
index f91916e622d..51494c329a5 100644
--- a/extensions/github/esbuild.mts
+++ b/extensions/github/esbuild.mts
@@ -16,4 +16,10 @@ run({
 	},
 	srcDir,
 	outdir: outDir,
+	additionalOptions: {
+		banner: {
+			// The tunnel package uses `require` and needs this shim to work in an ESM environment
+			js: `import { createRequire } from 'module'; const require = createRequire(import.meta.url);`,
+		},
+	},
 }, process.argv);
diff --git a/extensions/grunt/src/main.ts b/extensions/grunt/src/main.ts
index b94b00c4462..9c2fee82b50 100644
--- a/extensions/grunt/src/main.ts
+++ b/extensions/grunt/src/main.ts
@@ -18,9 +18,9 @@ function exists(file: string): Promise<boolean> {
 	});
 }
 
-function exec(command: string, options: cp.ExecOptions): Promise<{ stdout: string; stderr: string }> {
+function exec(command: string, args: string[], options: cp.ExecFileOptions): Promise<{ stdout: string; stderr: string }> {
 	return new Promise<{ stdout: string; stderr: string }>((resolve, reject) => {
-		cp.exec(command, options, (error, stdout, stderr) => {
+		cp.execFile(command, args, options, (error, stdout, stderr) => {
 			if (error) {
 				reject({ error, stdout, stderr });
 			}
@@ -143,9 +143,9 @@ class FolderDetector {
 			return emptyTasks;
 		}
 
-		const commandLine = `${await this._gruntCommand} --help --no-color`;
+		const gruntCommand = await this._gruntCommand;
 		try {
-			const { stdout, stderr } = await exec(commandLine, { cwd: rootPath });
+			const { stdout, stderr } = await exec(gruntCommand, ['--help', '--no-color'], { cwd: rootPath });
 			if (stderr) {
 				getOutputChannel().appendLine(stderr);
 				showError();
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index fe0a23cb591..1368b6cda47 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -59,17 +59,17 @@
               "url": {
                 "type": "string",
                 "default": "/user.schema.json",
-                "description": "%json.schemas.url.desc%"
+                "markdownDescription": "%json.schemas.url.desc%"
               },
               "fileMatch": {
                 "type": "array",
                 "items": {
                   "type": "string",
                   "default": "MyFile.json",
-                  "description": "%json.schemas.fileMatch.item.desc%"
+                  "markdownDescription": "%json.schemas.fileMatch.item.desc%"
                 },
                 "minItems": 1,
-                "description": "%json.schemas.fileMatch.desc%"
+                "markdownDescription": "%json.schemas.fileMatch.desc%"
               },
               "schema": {
                 "$ref": "http://json-schema.org/draft-07/schema#",
@@ -141,7 +141,7 @@
           "additionalProperties": {
             "type": "boolean"
           },
-          "description": "%json.schemaDownload.trustedDomains.desc%",
+          "markdownDescription": "%json.schemaDownload.trustedDomains.desc%",
           "tags": [
             "usesOnlineServices"
           ]
diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json
index 9052d3781c9..30199b2bb33 100644
--- a/extensions/json-language-features/package.nls.json
+++ b/extensions/json-language-features/package.nls.json
@@ -2,12 +2,12 @@
 	"displayName": "JSON Language Features",
 	"description": "Provides rich language support for JSON files.",
 	"json.schemas.desc": "Associate schemas to JSON files in the current project.",
-	"json.schemas.url.desc": "A URL or absolute file path to a schema. Can be a relative path (starting with './') in workspace and workspace folder settings.",
-	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas. `*` and '**' can be used as a wildcard. Exclusion patterns can also be defined and start with '!'. A file matches when there is at least one matching pattern and the last matching pattern is not an exclusion pattern.",
-	"json.schemas.fileMatch.item.desc": "A file pattern that can contain '*' and '**' to match against when resolving JSON files to schemas. When beginning with '!', it defines an exclusion pattern.",
+	"json.schemas.url.desc": "A URL or absolute file path to a schema. Can be a relative path (starting with `./`) in workspace and workspace folder settings.",
+	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas. `*` and `**` can be used as a wildcard. Exclusion patterns can also be defined and start with `!`. A file matches when there is at least one matching pattern and the last matching pattern is not an exclusion pattern.",
+	"json.schemas.fileMatch.item.desc": "A file pattern that can contain `*` and `**` to match against when resolving JSON files to schemas. When beginning with `!`, it defines an exclusion pattern.",
 	"json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.",
 	"json.format.enable.desc": "Enable/disable default JSON formatter",
-	"json.format.keepLines.desc" : "Keep all existing new lines when formatting.",
+	"json.format.keepLines.desc": "Keep all existing new lines when formatting.",
 	"json.validate.enable.desc": "Enable/disable JSON validation.",
 	"json.tracing.desc": "Traces the communication between VS Code and the JSON language server.",
 	"json.colorDecorators.enable.desc": "Enables or disables color decorators",
@@ -20,5 +20,5 @@
 	"json.command.clearCache": "Clear Schema Cache",
 	"json.command.sort": "Sort Document",
 	"json.workspaceTrust": "The extension requires workspace trust to load schemas from http and https.",
-	"json.schemaDownload.trustedDomains.desc": "List of trusted domains for downloading JSON schemas over http(s). Use '*' to trust all domains. '*' can also be used as a wildcard in domain names."
+	"json.schemaDownload.trustedDomains.desc": "List of trusted domains for downloading JSON schemas over http(s). Use `*` to trust all domains. `*` can also be used as a wildcard in domain names."
 }
diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index 811cbcd2e91..edfb856aacc 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -11,7 +11,7 @@ import {
 
 import { runSafe, runSafeAsync } from './utils/runner';
 import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
-import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions } from 'vscode-json-languageservice';
+import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions, SeverityLevel } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 import { Utils, URI } from 'vscode-uri';
 import * as l10n from '@vscode/l10n';
@@ -216,7 +216,13 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			schemas?: JSONSchemaSettings[];
 			format?: { enable?: boolean };
 			keepLines?: { enable?: boolean };
-			validate?: { enable?: boolean };
+			validate?: {
+				enable?: boolean;
+				comments?: SeverityLevel;
+				trailingCommas?: SeverityLevel;
+				schemaValidation?: SeverityLevel;
+				schemaRequest?: SeverityLevel;
+			};
 			resultLimit?: number;
 			jsonFoldingLimit?: number;
 			jsoncFoldingLimit?: number;
@@ -242,6 +248,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 	let schemaAssociations: ISchemaAssociations | SchemaConfiguration[] | undefined = undefined;
 	let formatterRegistrations: Thenable<Disposable>[] | null = null;
 	let validateEnabled = true;
+	let commentsSeverity: SeverityLevel | undefined = undefined;
+	let trailingCommasSeverity: SeverityLevel | undefined = undefined;
+	let schemaValidationSeverity: SeverityLevel | undefined = undefined;
+	let schemaRequestSeverity: SeverityLevel | undefined = undefined;
 	let keepLinesEnabled = false;
 
 	// The settings have changed. Is sent on server activation as well.
@@ -250,6 +260,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		runtime.configureHttpRequests?.(settings?.http?.proxy, !!settings.http?.proxyStrictSSL);
 		jsonConfigurationSettings = settings.json?.schemas;
 		validateEnabled = !!settings.json?.validate?.enable;
+		commentsSeverity = settings.json?.validate?.comments;
+		trailingCommasSeverity = settings.json?.validate?.trailingCommas;
+		schemaValidationSeverity = settings.json?.validate?.schemaValidation;
+		schemaRequestSeverity = settings.json?.validate?.schemaRequest;
 		keepLinesEnabled = settings.json?.keepLines?.enable || false;
 		updateConfiguration();
 
@@ -388,7 +402,12 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			return []; // ignore empty documents
 		}
 		const jsonDocument = getJSONDocument(textDocument);
-		const documentSettings: DocumentLanguageSettings = textDocument.languageId === 'jsonc' ? { comments: 'ignore', trailingCommas: 'warning' } : { comments: 'error', trailingCommas: 'error' };
+		const documentSettings: DocumentLanguageSettings = {
+			comments: commentsSeverity ?? (textDocument.languageId === 'jsonc' ? 'ignore' : 'error'),
+			trailingCommas: trailingCommasSeverity ?? (textDocument.languageId === 'jsonc' ? 'warning' : 'error'),
+			schemaValidation: schemaValidationSeverity,
+			schemaRequest: schemaRequestSeverity
+		};
 		return await languageService.doValidation(textDocument, jsonDocument, documentSettings);
 	}
 
diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json
index e8c9413cb07..936d6124cee 100644
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "93454227ce9a7aa92f41b157c6a74f3971b4ae14"
+					"commitHash": "25cc285b5e8accab4ff7725eeb8594f458b45ce4"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/julia/syntaxes/julia.tmLanguage.json b/extensions/julia/syntaxes/julia.tmLanguage.json
index b222b3ba644..c7a6b4da10f 100644
--- a/extensions/julia/syntaxes/julia.tmLanguage.json
+++ b/extensions/julia/syntaxes/julia.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/93454227ce9a7aa92f41b157c6a74f3971b4ae14",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/25cc285b5e8accab4ff7725eeb8594f458b45ce4",
 	"name": "Julia",
 	"scopeName": "source.julia",
 	"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@@ -301,7 +301,7 @@
 		"keyword": {
 			"patterns": [
 				{
-					"match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|module|baremodule|where)\\b",
+					"match": "\\b(?<![:_\\.])(?:function|mutable\\s+struct|struct|macro|quote|abstract\\s+type|primitive\\s+type|typegroup|module|baremodule|where)\\b",
 					"name": "keyword.other.julia"
 				},
 				{
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index 0b127e039fe..d0a71fd8cfc 100644
--- a/extensions/latex/cgmanifest.json
+++ b/extensions/latex/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "1f62731d63abfd134e03f4744fcbccadac4e0153"
+					"commitHash": "76dc409348227db00f6779772f7763dc90cdf22e"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
index 45e1ae4f7ed..bc5e8595364 100644
--- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jlelong/vscode-latex-basics/commit/1f62731d63abfd134e03f4744fcbccadac4e0153",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/3eb98ef3aeceedbe3366d6a5192ad6d2948721e8",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -3619,6 +3619,23 @@
 				}
 			]
 		},
+		"unbalanced-env": {
+			"patterns": [
+				{
+					"match": "(\\s*\\\\(?:begin|end)\\{(\\p{Alphabetic}+\\*?)\\})",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"include": "#macro-with-args-tokenizer"
+								}
+							]
+						}
+					},
+					"name": "meta.function.environment.general.latex"
+				}
+			]
+		},
 		"all-balanced-env": {
 			"patterns": [
 				{
@@ -3878,6 +3895,9 @@
 				{
 					"include": "#documentclass-usepackage-macro"
 				},
+				{
+					"include": "#unbalanced-env"
+				},
 				{
 					"include": "#input-macro"
 				},
diff --git a/extensions/mangle-loader.js b/extensions/mangle-loader.js
deleted file mode 100644
index ed32a85e633..00000000000
--- a/extensions/mangle-loader.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// @ts-check
-
-const fs = require('fs');
-const webpack = require('webpack');
-const fancyLog = require('fancy-log');
-const ansiColors = require('ansi-colors');
-const { Mangler } = require('../build/lib/mangle/index.js');
-
-/**
- * Map of project paths to mangled file contents
- *
- * @type {Map<string, Promise<Map<string, { out: string; sourceMap?: string }>>>}
- */
-const mangleMap = new Map();
-
-/**
- * @param {string} projectPath
- */
-function getMangledFileContents(projectPath) {
-	let entry = mangleMap.get(projectPath);
-	if (!entry) {
-		const log = (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data);
-		log(`Mangling ${projectPath}`);
-		const ts2tsMangler = new Mangler(projectPath, log, { mangleExports: true, manglePrivateFields: true });
-		entry = ts2tsMangler.computeNewFileContents();
-		mangleMap.set(projectPath, entry);
-	}
-
-	return entry;
-}
-
-/**
- * @type {webpack.LoaderDefinitionFunction}
- */
-module.exports = async function (source, sourceMap, meta) {
-	if (this.mode !== 'production') {
-		// Only enable mangling in production builds
-		return source;
-	}
-	if (true) {
-		// disable mangling for now, SEE https://github.com/microsoft/vscode/issues/204692
-		return source;
-	}
-	const options = this.getOptions();
-	if (options.disabled) {
-		// Dynamically disabled
-		return source;
-	}
-
-	if (source !== fs.readFileSync(this.resourcePath).toString()) {
-		// File content has changed by previous webpack steps.
-		// Skip mangling.
-		return source;
-	}
-
-	const callback = this.async();
-
-	const fileContentsMap = await getMangledFileContents(options.configFile);
-
-	const newContents = fileContentsMap.get(this.resourcePath);
-	callback(null, newContents?.out ?? source, sourceMap, meta);
-};
diff --git a/extensions/markdown-language-features/preview-src/activeLineMarker.ts b/extensions/markdown-language-features/preview-src/activeLineMarker.ts
index 75c1ed7cbc9..0e63dad4599 100644
--- a/extensions/markdown-language-features/preview-src/activeLineMarker.ts
+++ b/extensions/markdown-language-features/preview-src/activeLineMarker.ts
@@ -5,27 +5,27 @@
 import { getElementsForSourceLine } from './scroll-sync';
 
 export class ActiveLineMarker {
-	private _current: any;
+	#current: HTMLElement | undefined;
 
 	onDidChangeTextEditorSelection(line: number, documentVersion: number) {
 		const { previous } = getElementsForSourceLine(line, documentVersion);
-		this._update(previous && (previous.codeElement || previous.element));
+		this.#update(previous && (previous.codeElement || previous.element));
 	}
 
-	private _update(before: HTMLElement | undefined) {
-		this._unmarkActiveElement(this._current);
-		this._markActiveElement(before);
-		this._current = before;
+	#update(before: HTMLElement | undefined) {
+		this.#unmarkActiveElement(this.#current);
+		this.#markActiveElement(before);
+		this.#current = before;
 	}
 
-	private _unmarkActiveElement(element: HTMLElement | undefined) {
+	#unmarkActiveElement(element: HTMLElement | undefined) {
 		if (!element) {
 			return;
 		}
 		element.classList.toggle('code-active-line', false);
 	}
 
-	private _markActiveElement(element: HTMLElement | undefined) {
+	#markActiveElement(element: HTMLElement | undefined) {
 		if (!element) {
 			return;
 		}
diff --git a/extensions/markdown-language-features/preview-src/csp.ts b/extensions/markdown-language-features/preview-src/csp.ts
index fcc38352da8..4db9d7b116f 100644
--- a/extensions/markdown-language-features/preview-src/csp.ts
+++ b/extensions/markdown-language-features/preview-src/csp.ts
@@ -11,45 +11,49 @@ import { getStrings } from './strings';
  * Shows an alert when there is a content security policy violation.
  */
 export class CspAlerter {
-	private _didShow = false;
-	private _didHaveCspWarning = false;
+	#didShow = false;
+	#didHaveCspWarning = false;
 
-	private _messaging?: MessagePoster;
+	#messaging?: MessagePoster;
+
+	readonly #settingsManager: SettingsManager;
 
 	constructor(
-		private readonly _settingsManager: SettingsManager,
+		settingsManager: SettingsManager,
 	) {
+		this.#settingsManager = settingsManager;
+
 		document.addEventListener('securitypolicyviolation', () => {
-			this._onCspWarning();
+			this.#onCspWarning();
 		});
 
 		window.addEventListener('message', (event) => {
 			if (event?.data && event.data.name === 'vscode-did-block-svg') {
-				this._onCspWarning();
+				this.#onCspWarning();
 			}
 		});
 	}
 
 	public setPoster(poster: MessagePoster) {
-		this._messaging = poster;
-		if (this._didHaveCspWarning) {
-			this._showCspWarning();
+		this.#messaging = poster;
+		if (this.#didHaveCspWarning) {
+			this.#showCspWarning();
 		}
 	}
 
-	private _onCspWarning() {
-		this._didHaveCspWarning = true;
-		this._showCspWarning();
+	#onCspWarning() {
+		this.#didHaveCspWarning = true;
+		this.#showCspWarning();
 	}
 
-	private _showCspWarning() {
+	#showCspWarning() {
 		const strings = getStrings();
-		const settings = this._settingsManager.settings;
+		const settings = this.#settingsManager.settings;
 
-		if (this._didShow || settings.disableSecurityWarnings || !this._messaging) {
+		if (this.#didShow || settings.disableSecurityWarnings || !this.#messaging) {
 			return;
 		}
-		this._didShow = true;
+		this.#didShow = true;
 
 		const notification = document.createElement('a');
 		notification.innerText = strings.cspAlertMessageText;
@@ -59,7 +63,7 @@ export class CspAlerter {
 		notification.setAttribute('role', 'button');
 		notification.setAttribute('aria-label', strings.cspAlertMessageLabel);
 		notification.onclick = () => {
-			this._messaging!.postMessage('showPreviewSecuritySelector', { source: settings.source });
+			this.#messaging!.postMessage('showPreviewSecuritySelector', { source: settings.source });
 		};
 		document.body.appendChild(notification);
 	}
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index bd5683bf0d5..d481bb24e53 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -27,12 +27,14 @@ const vscode = acquireVsCodeApi();
 interface State {
 	scrollProgress?: number;
 	resource?: string;
+	line?: number;
+	fragment?: string;
 }
 
 const originalState: State = vscode.getState() ?? {};
-const state = {
+const state: State = {
 	...originalState,
-	...getData<any>('data-state')
+	...getData<Partial<State>>('data-state')
 };
 
 if (typeof originalState.scrollProgress !== 'undefined' && originalState?.resource !== state.resource) {
@@ -342,10 +344,10 @@ document.addEventListener('click', event => {
 		return;
 	}
 
-	let node: any = event.target;
+	let node = event.target as Element | null;
 	while (node) {
-		if (node.tagName && node.tagName === 'A' && node.href) {
-			if (node.getAttribute('href').startsWith('#')) {
+		if (node.tagName && node.tagName === 'A' && (node as HTMLAnchorElement).href) {
+			if (node.getAttribute('href')?.startsWith('#')) {
 				return;
 			}
 
@@ -353,13 +355,13 @@ document.addEventListener('click', event => {
 			if (!hrefText) {
 				hrefText = node.getAttribute('href');
 				// Pass through known schemes
-				if (passThroughLinkSchemes.some(scheme => hrefText.startsWith(scheme))) {
+				if (hrefText && passThroughLinkSchemes.some(scheme => hrefText!.startsWith(scheme))) {
 					return;
 				}
 			}
 
 			// If original link doesn't look like a url, delegate back to VS Code to resolve
-			if (!/^[a-z\-]+:/i.test(hrefText)) {
+			if (hrefText && !/^[a-z\-]+:/i.test(hrefText)) {
 				messaging.postMessage('openLink', { href: hrefText });
 				event.preventDefault();
 				event.stopPropagation();
@@ -368,7 +370,7 @@ document.addEventListener('click', event => {
 
 			return;
 		}
-		node = node.parentNode;
+		node = node.parentElement;
 	}
 }, true);
 
diff --git a/extensions/markdown-language-features/preview-src/loading.ts b/extensions/markdown-language-features/preview-src/loading.ts
index c6e6d27acd9..f3270b22214 100644
--- a/extensions/markdown-language-features/preview-src/loading.ts
+++ b/extensions/markdown-language-features/preview-src/loading.ts
@@ -5,15 +5,20 @@
 import { MessagePoster } from './messaging';
 
 export class StyleLoadingMonitor {
-	private readonly _unloadedStyles: string[] = [];
-	private _finishedLoading: boolean = false;
+	readonly #unloadedStyles: string[] = [];
+	#finishedLoading: boolean = false;
 
-	private _poster?: MessagePoster;
+	#poster?: MessagePoster;
 
 	constructor() {
-		const onStyleLoadError = (event: any) => {
-			const source = event.target.dataset.source;
-			this._unloadedStyles.push(source);
+		const onStyleLoadError = (event: Event | string) => {
+			if (!(event instanceof Event)) {
+				return;
+			}
+			const source = (event.target as HTMLElement | null)?.dataset.source;
+			if (source) {
+				this.#unloadedStyles.push(source);
+			}
 		};
 
 		window.addEventListener('DOMContentLoaded', () => {
@@ -25,18 +30,18 @@ export class StyleLoadingMonitor {
 		});
 
 		window.addEventListener('load', () => {
-			if (!this._unloadedStyles.length) {
+			if (!this.#unloadedStyles.length) {
 				return;
 			}
-			this._finishedLoading = true;
-			this._poster?.postMessage('previewStyleLoadError', { unloadedStyles: this._unloadedStyles });
+			this.#finishedLoading = true;
+			this.#poster?.postMessage('previewStyleLoadError', { unloadedStyles: this.#unloadedStyles });
 		});
 	}
 
 	public setPoster(poster: MessagePoster): void {
-		this._poster = poster;
-		if (this._finishedLoading) {
-			poster.postMessage('previewStyleLoadError', { unloadedStyles: this._unloadedStyles });
+		this.#poster = poster;
+		if (this.#finishedLoading) {
+			poster.postMessage('previewStyleLoadError', { unloadedStyles: this.#unloadedStyles });
 		}
 	}
 }
diff --git a/extensions/markdown-language-features/preview-src/messaging.ts b/extensions/markdown-language-features/preview-src/messaging.ts
index 1fb29f0b55b..0458cac997c 100644
--- a/extensions/markdown-language-features/preview-src/messaging.ts
+++ b/extensions/markdown-language-features/preview-src/messaging.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SettingsManager } from './settings';
+import type { WebviewApi } from 'vscode-webview';
 import type { FromWebviewMessage } from '../types/previewMessaging';
+import { SettingsManager } from './settings';
 
 export interface MessagePoster {
 	/**
@@ -16,7 +17,7 @@ export interface MessagePoster {
 	): void;
 }
 
-export const createPosterForVsCode = (vscode: any, settingsManager: SettingsManager): MessagePoster => {
+export const createPosterForVsCode = (vscode: WebviewApi<unknown>, settingsManager: SettingsManager): MessagePoster => {
 	return {
 		postMessage<T extends FromWebviewMessage.Type>(
 			type: T['type'],
diff --git a/extensions/markdown-language-features/preview-src/scroll-sync.ts b/extensions/markdown-language-features/preview-src/scroll-sync.ts
index 4f5e3f7d2fe..f4eae58d47c 100644
--- a/extensions/markdown-language-features/preview-src/scroll-sync.ts
+++ b/extensions/markdown-language-features/preview-src/scroll-sync.ts
@@ -9,7 +9,7 @@ const codeLineClass = 'code-line';
 
 
 export class CodeLineElement {
-	private readonly _detailParentElements: readonly HTMLDetailsElement[];
+	readonly #detailParentElements: readonly HTMLDetailsElement[];
 
 	constructor(
 		readonly element: HTMLElement,
@@ -17,11 +17,11 @@ export class CodeLineElement {
 		readonly codeElement?: HTMLElement,
 		readonly endLine?: number,
 	) {
-		this._detailParentElements = Array.from(getParentsWithTagName<HTMLDetailsElement>(element, 'DETAILS'));
+		this.#detailParentElements = Array.from(getParentsWithTagName<HTMLDetailsElement>(element, 'DETAILS'));
 	}
 
 	get isVisible(): boolean {
-		if (this._detailParentElements.some(x => !x.open)) {
+		if (this.#detailParentElements.some(x => !x.open)) {
 			return false;
 		}
 
diff --git a/extensions/markdown-language-features/preview-src/settings.ts b/extensions/markdown-language-features/preview-src/settings.ts
index 0fb5d0c2686..6d642b58c64 100644
--- a/extensions/markdown-language-features/preview-src/settings.ts
+++ b/extensions/markdown-language-features/preview-src/settings.ts
@@ -33,13 +33,13 @@ export function getData<T = {}>(key: string): T {
 }
 
 export class SettingsManager {
-	private _settings: PreviewSettings = getData('data-settings');
+	#settings: PreviewSettings = getData('data-settings');
 
 	public get settings(): PreviewSettings {
-		return this._settings;
+		return this.#settings;
 	}
 
 	public updateSettings(newSettings: PreviewSettings) {
-		this._settings = newSettings;
+		this.#settings = newSettings;
 	}
 }
diff --git a/extensions/markdown-language-features/src/client/client.ts b/extensions/markdown-language-features/src/client/client.ts
index bf7be3f3206..dc279f02d84 100644
--- a/extensions/markdown-language-features/src/client/client.ts
+++ b/extensions/markdown-language-features/src/client/client.ts
@@ -17,37 +17,43 @@ export type LanguageClientConstructor = (name: string, description: string, clie
 
 export class MdLanguageClient implements IDisposable {
 
+	readonly #client: BaseLanguageClient;
+	readonly #workspace: VsCodeMdWorkspace;
+
 	constructor(
-		private readonly _client: BaseLanguageClient,
-		private readonly _workspace: VsCodeMdWorkspace,
-	) { }
+		client: BaseLanguageClient,
+		workspace: VsCodeMdWorkspace,
+	) {
+		this.#client = client;
+		this.#workspace = workspace;
+	}
 
 	dispose(): void {
-		this._client.stop();
-		this._workspace.dispose();
+		this.#client.stop();
+		this.#workspace.dispose();
 	}
 
 	resolveLinkTarget(linkText: string, uri: vscode.Uri): Promise<proto.ResolvedDocumentLinkTarget> {
-		return this._client.sendRequest(proto.resolveLinkTarget, { linkText, uri: uri.toString() });
+		return this.#client.sendRequest(proto.resolveLinkTarget, { linkText, uri: uri.toString() });
 	}
 
 	getEditForFileRenames(files: ReadonlyArray<{ oldUri: string; newUri: string }>, token: vscode.CancellationToken) {
-		return this._client.sendRequest(proto.getEditForFileRenames, files, token);
+		return this.#client.sendRequest(proto.getEditForFileRenames, files, token);
 	}
 
 	getReferencesToFileInWorkspace(resource: vscode.Uri, token: vscode.CancellationToken) {
-		return this._client.sendRequest(proto.getReferencesToFileInWorkspace, { uri: resource.toString() }, token);
+		return this.#client.sendRequest(proto.getReferencesToFileInWorkspace, { uri: resource.toString() }, token);
 	}
 
 	prepareUpdatePastedLinks(doc: vscode.Uri, ranges: readonly vscode.Range[], token: vscode.CancellationToken) {
-		return this._client.sendRequest(proto.prepareUpdatePastedLinks, {
+		return this.#client.sendRequest(proto.prepareUpdatePastedLinks, {
 			uri: doc.toString(),
 			ranges: ranges.map(range => Range.create(range.start.line, range.start.character, range.end.line, range.end.character)),
 		}, token);
 	}
 
 	getUpdatePastedLinksEdit(pastingIntoDoc: vscode.Uri, edits: readonly vscode.TextEdit[], metadata: string, token: vscode.CancellationToken) {
-		return this._client.sendRequest(proto.getUpdatePastedLinksEdit, {
+		return this.#client.sendRequest(proto.getUpdatePastedLinksEdit, {
 			metadata,
 			pasteIntoDoc: pastingIntoDoc.toString(),
 			edits: edits.map(edit => TextEdit.replace(edit.range, edit.newText)),
diff --git a/extensions/markdown-language-features/src/client/fileWatchingManager.ts b/extensions/markdown-language-features/src/client/fileWatchingManager.ts
index e2010edda8a..c617a73634d 100644
--- a/extensions/markdown-language-features/src/client/fileWatchingManager.ts
+++ b/extensions/markdown-language-features/src/client/fileWatchingManager.ts
@@ -17,12 +17,12 @@ type DirWatcherEntry = {
 
 export class FileWatcherManager {
 
-	private readonly _fileWatchers = new Map<number, {
+	readonly #fileWatchers = new Map<number, {
 		readonly watcher: vscode.FileSystemWatcher;
 		readonly dirWatchers: DirWatcherEntry[];
 	}>();
 
-	private readonly _dirWatchers = new ResourceMap<{
+	readonly #dirWatchers = new ResourceMap<{
 		readonly watcher: vscode.FileSystemWatcher;
 		refCount: number;
 	}>();
@@ -35,7 +35,7 @@ export class FileWatcherManager {
 
 		const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(uri, '*'), !listeners.create, !listeners.change, !listeners.delete);
 		const parentDirWatchers: DirWatcherEntry[] = [];
-		this._fileWatchers.set(id, { watcher, dirWatchers: parentDirWatchers });
+		this.#fileWatchers.set(id, { watcher, dirWatchers: parentDirWatchers });
 
 		if (listeners.create) { watcher.onDidCreate(listeners.create); }
 		if (listeners.change) { watcher.onDidChange(listeners.change); }
@@ -46,12 +46,12 @@ export class FileWatcherManager {
 			for (let dirUri = Utils.dirname(uri); dirUri.path.length > 1; dirUri = Utils.dirname(dirUri)) {
 				const disposables: IDisposable[] = [];
 
-				let parentDirWatcher = this._dirWatchers.get(dirUri);
+				let parentDirWatcher = this.#dirWatchers.get(dirUri);
 				if (!parentDirWatcher) {
 					const glob = new vscode.RelativePattern(Utils.dirname(dirUri), Utils.basename(dirUri));
 					const parentWatcher = vscode.workspace.createFileSystemWatcher(glob, !listeners.create, true, !listeners.delete);
 					parentDirWatcher = { refCount: 0, watcher: parentWatcher };
-					this._dirWatchers.set(dirUri, parentDirWatcher);
+					this.#dirWatchers.set(dirUri, parentDirWatcher);
 				}
 				parentDirWatcher.refCount++;
 
@@ -81,16 +81,16 @@ export class FileWatcherManager {
 	}
 
 	delete(id: number): void {
-		const entry = this._fileWatchers.get(id);
+		const entry = this.#fileWatchers.get(id);
 		if (entry) {
 			for (const dirWatcher of entry.dirWatchers) {
 				disposeAll(dirWatcher.disposables);
 
-				const dirWatcherEntry = this._dirWatchers.get(dirWatcher.uri);
+				const dirWatcherEntry = this.#dirWatchers.get(dirWatcher.uri);
 				if (dirWatcherEntry) {
 					if (--dirWatcherEntry.refCount <= 0) {
 						dirWatcherEntry.watcher.dispose();
-						this._dirWatchers.delete(dirWatcher.uri);
+						this.#dirWatchers.delete(dirWatcher.uri);
 					}
 				}
 			}
@@ -98,6 +98,6 @@ export class FileWatcherManager {
 			entry.watcher.dispose();
 		}
 
-		this._fileWatchers.delete(id);
+		this.#fileWatchers.delete(id);
 	}
 }
diff --git a/extensions/markdown-language-features/src/client/inMemoryDocument.ts b/extensions/markdown-language-features/src/client/inMemoryDocument.ts
index 953f0da7c89..2726adb6de1 100644
--- a/extensions/markdown-language-features/src/client/inMemoryDocument.ts
+++ b/extensions/markdown-language-features/src/client/inMemoryDocument.ts
@@ -9,7 +9,7 @@ import { ITextDocument } from '../types/textDocument';
 
 export class InMemoryDocument implements ITextDocument {
 
-	private readonly _doc: TextDocument;
+	readonly #doc: TextDocument;
 
 	public readonly uri: vscode.Uri;
 	public readonly version: number;
@@ -21,15 +21,15 @@ export class InMemoryDocument implements ITextDocument {
 	) {
 		this.uri = uri;
 		this.version = version;
-		this._doc = TextDocument.create(this.uri.toString(), 'markdown', 0, contents);
+		this.#doc = TextDocument.create(this.uri.toString(), 'markdown', 0, contents);
 	}
 
 	getText(range?: vscode.Range): string {
-		return this._doc.getText(range);
+		return this.#doc.getText(range);
 	}
 
 	positionAt(offset: number): vscode.Position {
-		const pos = this._doc.positionAt(offset);
+		const pos = this.#doc.positionAt(offset);
 		return new vscode.Position(pos.line, pos.character);
 	}
 }
diff --git a/extensions/markdown-language-features/src/client/workspace.ts b/extensions/markdown-language-features/src/client/workspace.ts
index 9ea3173c9cc..b07a93ade78 100644
--- a/extensions/markdown-language-features/src/client/workspace.ts
+++ b/extensions/markdown-language-features/src/client/workspace.ts
@@ -17,47 +17,47 @@ import { ResourceMap } from '../util/resourceMap';
  */
 export class VsCodeMdWorkspace extends Disposable {
 
-	private readonly _watcher: vscode.FileSystemWatcher | undefined;
+	readonly #watcher: vscode.FileSystemWatcher | undefined;
 
-	private readonly _documentCache = new ResourceMap<ITextDocument>();
+	readonly #documentCache = new ResourceMap<ITextDocument>();
 
-	private readonly _utf8Decoder = new TextDecoder('utf-8');
+	readonly #utf8Decoder = new TextDecoder('utf-8');
 
 	constructor() {
 		super();
 
-		this._watcher = this._register(vscode.workspace.createFileSystemWatcher('**/*.md'));
+		this.#watcher = this._register(vscode.workspace.createFileSystemWatcher('**/*.md'));
 
-		this._register(this._watcher.onDidChange(async resource => {
-			this._documentCache.delete(resource);
+		this._register(this.#watcher.onDidChange(async resource => {
+			this.#documentCache.delete(resource);
 		}));
 
-		this._register(this._watcher.onDidDelete(resource => {
-			this._documentCache.delete(resource);
+		this._register(this.#watcher.onDidDelete(resource => {
+			this.#documentCache.delete(resource);
 		}));
 
 		this._register(vscode.workspace.onDidOpenTextDocument(e => {
-			this._documentCache.delete(e.uri);
+			this.#documentCache.delete(e.uri);
 		}));
 
 		this._register(vscode.workspace.onDidCloseTextDocument(e => {
-			this._documentCache.delete(e.uri);
+			this.#documentCache.delete(e.uri);
 		}));
 	}
 
-	private _isRelevantMarkdownDocument(doc: vscode.TextDocument) {
+	#isRelevantMarkdownDocument(doc: vscode.TextDocument) {
 		return isMarkdownFile(doc) && doc.uri.scheme !== 'vscode-bulkeditpreview';
 	}
 
 	public async getOrLoadMarkdownDocument(resource: vscode.Uri): Promise<ITextDocument | undefined> {
-		const existing = this._documentCache.get(resource);
+		const existing = this.#documentCache.get(resource);
 		if (existing) {
 			return existing;
 		}
 
-		const matchingDocument = vscode.workspace.textDocuments.find((doc) => this._isRelevantMarkdownDocument(doc) && doc.uri.toString() === resource.toString());
+		const matchingDocument = vscode.workspace.textDocuments.find((doc) => this.#isRelevantMarkdownDocument(doc) && doc.uri.toString() === resource.toString());
 		if (matchingDocument) {
-			this._documentCache.set(resource, matchingDocument);
+			this.#documentCache.set(resource, matchingDocument);
 			return matchingDocument;
 		}
 
@@ -69,9 +69,9 @@ export class VsCodeMdWorkspace extends Disposable {
 			const bytes = await vscode.workspace.fs.readFile(resource);
 
 			// We assume that markdown is in UTF-8
-			const text = this._utf8Decoder.decode(bytes);
+			const text = this.#utf8Decoder.decode(bytes);
 			const doc = new InMemoryDocument(resource, text, 0);
-			this._documentCache.set(resource, doc);
+			this.#documentCache.set(resource, doc);
 			return doc;
 		} catch {
 			return undefined;
diff --git a/extensions/markdown-language-features/src/commandManager.ts b/extensions/markdown-language-features/src/commandManager.ts
index ae2c4985066..0563db020c7 100644
--- a/extensions/markdown-language-features/src/commandManager.ts
+++ b/extensions/markdown-language-features/src/commandManager.ts
@@ -12,27 +12,27 @@ export interface Command {
 }
 
 export class CommandManager {
-	private readonly _commands = new Map<string, vscode.Disposable>();
+	readonly #commands = new Map<string, vscode.Disposable>();
 
 	public dispose() {
-		for (const registration of this._commands.values()) {
+		for (const registration of this.#commands.values()) {
 			registration.dispose();
 		}
-		this._commands.clear();
+		this.#commands.clear();
 	}
 
 	public register<T extends Command>(command: T): vscode.Disposable {
-		this._registerCommand(command.id, command.execute, command);
+		this.#registerCommand(command.id, command.execute, command);
 		return new vscode.Disposable(() => {
-			this._commands.delete(command.id);
+			this.#commands.delete(command.id);
 		});
 	}
 
-	private _registerCommand(id: string, impl: (...args: any[]) => void, thisArg?: any) {
-		if (this._commands.has(id)) {
+	#registerCommand(id: string, impl: (...args: any[]) => void, thisArg?: any) {
+		if (this.#commands.has(id)) {
 			return;
 		}
 
-		this._commands.set(id, vscode.commands.registerCommand(id, impl, thisArg));
+		this.#commands.set(id, vscode.commands.registerCommand(id, impl, thisArg));
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/copyImage.ts b/extensions/markdown-language-features/src/commands/copyImage.ts
index 86fd349c730..09a683ecfb2 100644
--- a/extensions/markdown-language-features/src/commands/copyImage.ts
+++ b/extensions/markdown-language-features/src/commands/copyImage.ts
@@ -10,12 +10,16 @@ import { MarkdownPreviewManager } from '../preview/previewManager';
 export class CopyImageCommand implements Command {
 	public readonly id = '_markdown.copyImage';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-	) { }
+		webviewManager: MarkdownPreviewManager,
+	) {
+		this.#webviewManager = webviewManager;
+	}
 
 	public execute(args: { id: string; resource: string }) {
 		const source = vscode.Uri.parse(args.resource);
-		this._webviewManager.findPreview(source)?.copyImage(args.id);
+		this.#webviewManager.findPreview(source)?.copyImage(args.id);
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/openImage.ts b/extensions/markdown-language-features/src/commands/openImage.ts
index 64b1831df0d..4a121fd6989 100644
--- a/extensions/markdown-language-features/src/commands/openImage.ts
+++ b/extensions/markdown-language-features/src/commands/openImage.ts
@@ -10,12 +10,16 @@ import { MarkdownPreviewManager } from '../preview/previewManager';
 export class OpenImageCommand implements Command {
 	public readonly id = '_markdown.openImage';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-	) { }
+		webviewManager: MarkdownPreviewManager,
+	) {
+		this.#webviewManager = webviewManager;
+	}
 
 	public execute(args: { resource: string; imageSource: string }) {
 		const source = vscode.Uri.parse(args.resource);
-		this._webviewManager.openDocumentLink(args.imageSource, source);
+		this.#webviewManager.openDocumentLink(args.imageSource, source);
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/refreshPreview.ts b/extensions/markdown-language-features/src/commands/refreshPreview.ts
index a94fa797462..52f320098b7 100644
--- a/extensions/markdown-language-features/src/commands/refreshPreview.ts
+++ b/extensions/markdown-language-features/src/commands/refreshPreview.ts
@@ -10,13 +10,19 @@ import { MarkdownPreviewManager } from '../preview/previewManager';
 export class RefreshPreviewCommand implements Command {
 	public readonly id = 'markdown.preview.refresh';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+	readonly #engine: MarkdownItEngine;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-		private readonly _engine: MarkdownItEngine
-	) { }
+		webviewManager: MarkdownPreviewManager,
+		engine: MarkdownItEngine
+	) {
+		this.#webviewManager = webviewManager;
+		this.#engine = engine;
+	}
 
 	public execute() {
-		this._engine.cleanCache();
-		this._webviewManager.refresh();
+		this.#engine.cleanCache();
+		this.#webviewManager.refresh();
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/reloadPlugins.ts b/extensions/markdown-language-features/src/commands/reloadPlugins.ts
index 16be408bbef..5d410780a2b 100644
--- a/extensions/markdown-language-features/src/commands/reloadPlugins.ts
+++ b/extensions/markdown-language-features/src/commands/reloadPlugins.ts
@@ -10,14 +10,20 @@ import { MarkdownPreviewManager } from '../preview/previewManager';
 export class ReloadPlugins implements Command {
 	public readonly id = 'markdown.api.reloadPlugins';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+	readonly #engine: MarkdownItEngine;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-		private readonly _engine: MarkdownItEngine,
-	) { }
+		webviewManager: MarkdownPreviewManager,
+		engine: MarkdownItEngine,
+	) {
+		this.#webviewManager = webviewManager;
+		this.#engine = engine;
+	}
 
 	public execute(): void {
-		this._engine.reloadPlugins();
-		this._engine.cleanCache();
-		this._webviewManager.refresh();
+		this.#engine.reloadPlugins();
+		this.#engine.cleanCache();
+		this.#webviewManager.refresh();
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/renderDocument.ts b/extensions/markdown-language-features/src/commands/renderDocument.ts
index ccefddedbd2..ffcbab6d41a 100644
--- a/extensions/markdown-language-features/src/commands/renderDocument.ts
+++ b/extensions/markdown-language-features/src/commands/renderDocument.ts
@@ -10,11 +10,15 @@ import { ITextDocument } from '../types/textDocument';
 export class RenderDocument implements Command {
 	public readonly id = 'markdown.api.render';
 
+	readonly #engine: MarkdownItEngine;
+
 	public constructor(
-		private readonly _engine: MarkdownItEngine
-	) { }
+		engine: MarkdownItEngine
+	) {
+		this.#engine = engine;
+	}
 
 	public async execute(document: ITextDocument | string): Promise<string> {
-		return (await (this._engine.render(document))).html;
+		return (await (this.#engine.render(document))).html;
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/showPreview.ts b/extensions/markdown-language-features/src/commands/showPreview.ts
index d5d430ade0e..4d59062c1a1 100644
--- a/extensions/markdown-language-features/src/commands/showPreview.ts
+++ b/extensions/markdown-language-features/src/commands/showPreview.ts
@@ -53,14 +53,20 @@ async function showPreview(
 export class ShowPreviewCommand implements Command {
 	public readonly id = 'markdown.showPreview';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+	readonly #telemetryReporter: TelemetryReporter;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-		private readonly _telemetryReporter: TelemetryReporter
-	) { }
+		webviewManager: MarkdownPreviewManager,
+		telemetryReporter: TelemetryReporter
+	) {
+		this.#webviewManager = webviewManager;
+		this.#telemetryReporter = telemetryReporter;
+	}
 
 	public execute(mainUri?: vscode.Uri, allUris?: vscode.Uri[], previewSettings?: DynamicPreviewSettings) {
 		for (const uri of Array.isArray(allUris) ? allUris : [mainUri]) {
-			showPreview(this._webviewManager, this._telemetryReporter, uri, {
+			showPreview(this.#webviewManager, this.#telemetryReporter, uri, {
 				sideBySide: false,
 				locked: previewSettings?.locked
 			});
@@ -71,13 +77,19 @@ export class ShowPreviewCommand implements Command {
 export class ShowPreviewToSideCommand implements Command {
 	public readonly id = 'markdown.showPreviewToSide';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+	readonly #telemetryReporter: TelemetryReporter;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-		private readonly _telemetryReporter: TelemetryReporter
-	) { }
+		webviewManager: MarkdownPreviewManager,
+		telemetryReporter: TelemetryReporter
+	) {
+		this.#webviewManager = webviewManager;
+		this.#telemetryReporter = telemetryReporter;
+	}
 
 	public execute(uri?: vscode.Uri, previewSettings?: DynamicPreviewSettings) {
-		showPreview(this._webviewManager, this._telemetryReporter, uri, {
+		showPreview(this.#webviewManager, this.#telemetryReporter, uri, {
 			sideBySide: true,
 			locked: previewSettings?.locked
 		});
@@ -88,13 +100,19 @@ export class ShowPreviewToSideCommand implements Command {
 export class ShowLockedPreviewToSideCommand implements Command {
 	public readonly id = 'markdown.showLockedPreviewToSide';
 
+	readonly #webviewManager: MarkdownPreviewManager;
+	readonly #telemetryReporter: TelemetryReporter;
+
 	public constructor(
-		private readonly _webviewManager: MarkdownPreviewManager,
-		private readonly _telemetryReporter: TelemetryReporter
-	) { }
+		webviewManager: MarkdownPreviewManager,
+		telemetryReporter: TelemetryReporter
+	) {
+		this.#webviewManager = webviewManager;
+		this.#telemetryReporter = telemetryReporter;
+	}
 
 	public execute(uri?: vscode.Uri) {
-		showPreview(this._webviewManager, this._telemetryReporter, uri, {
+		showPreview(this.#webviewManager, this.#telemetryReporter, uri, {
 			sideBySide: true,
 			locked: true
 		});
diff --git a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
index 7ea5a4079ed..fb6cd9ce9e7 100644
--- a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
+++ b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
@@ -12,19 +12,25 @@ import { isMarkdownFile } from '../util/file';
 export class ShowPreviewSecuritySelectorCommand implements Command {
 	public readonly id = 'markdown.showPreviewSecuritySelector';
 
+	readonly #previewSecuritySelector: PreviewSecuritySelector;
+	readonly #previewManager: MarkdownPreviewManager;
+
 	public constructor(
-		private readonly _previewSecuritySelector: PreviewSecuritySelector,
-		private readonly _previewManager: MarkdownPreviewManager
-	) { }
+		previewSecuritySelector: PreviewSecuritySelector,
+		previewManager: MarkdownPreviewManager
+	) {
+		this.#previewSecuritySelector = previewSecuritySelector;
+		this.#previewManager = previewManager;
+	}
 
 	public execute(resource: string | undefined) {
-		if (this._previewManager.activePreviewResource) {
-			this._previewSecuritySelector.showSecuritySelectorForResource(this._previewManager.activePreviewResource);
+		if (this.#previewManager.activePreviewResource) {
+			this.#previewSecuritySelector.showSecuritySelectorForResource(this.#previewManager.activePreviewResource);
 		} else if (resource) {
 			const source = vscode.Uri.parse(resource);
-			this._previewSecuritySelector.showSecuritySelectorForResource(source.query ? vscode.Uri.parse(source.query) : source);
+			this.#previewSecuritySelector.showSecuritySelectorForResource(source.query ? vscode.Uri.parse(source.query) : source);
 		} else if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
-			this._previewSecuritySelector.showSecuritySelectorForResource(vscode.window.activeTextEditor.document.uri);
+			this.#previewSecuritySelector.showSecuritySelectorForResource(vscode.window.activeTextEditor.document.uri);
 		}
 	}
 }
diff --git a/extensions/markdown-language-features/src/commands/showSource.ts b/extensions/markdown-language-features/src/commands/showSource.ts
index 87d6b21ec68..3a6bb3e0e20 100644
--- a/extensions/markdown-language-features/src/commands/showSource.ts
+++ b/extensions/markdown-language-features/src/commands/showSource.ts
@@ -10,12 +10,16 @@ import { MarkdownPreviewManager } from '../preview/previewManager';
 export class ShowSourceCommand implements Command {
 	public readonly id = 'markdown.showSource';
 
+	readonly #previewManager: MarkdownPreviewManager;
+
 	public constructor(
-		private readonly _previewManager: MarkdownPreviewManager
-	) { }
+		previewManager: MarkdownPreviewManager
+	) {
+		this.#previewManager = previewManager;
+	}
 
 	public execute() {
-		const { activePreviewResource, activePreviewResourceColumn } = this._previewManager;
+		const { activePreviewResource, activePreviewResourceColumn } = this.#previewManager;
 		if (activePreviewResource && activePreviewResourceColumn) {
 			return vscode.workspace.openTextDocument(activePreviewResource).then(document => {
 				return vscode.window.showTextDocument(document, activePreviewResourceColumn);
diff --git a/extensions/markdown-language-features/src/commands/toggleLock.ts b/extensions/markdown-language-features/src/commands/toggleLock.ts
index 9975d4872bb..0bc4656d08f 100644
--- a/extensions/markdown-language-features/src/commands/toggleLock.ts
+++ b/extensions/markdown-language-features/src/commands/toggleLock.ts
@@ -9,11 +9,15 @@ import { MarkdownPreviewManager } from '../preview/previewManager';
 export class ToggleLockCommand implements Command {
 	public readonly id = 'markdown.preview.toggleLock';
 
+	readonly #previewManager: MarkdownPreviewManager;
+
 	public constructor(
-		private readonly _previewManager: MarkdownPreviewManager
-	) { }
+		previewManager: MarkdownPreviewManager
+	) {
+		this.#previewManager = previewManager;
+	}
 
 	public execute() {
-		this._previewManager.toggleLock();
+		this.#previewManager.toggleLock();
 	}
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts
index 7791d6b19e4..e59a207487d 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts
@@ -36,14 +36,18 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 		...Object.values(rootMediaMimesTypes).map(type => `${type}/*`),
 	];
 
-	private readonly _yieldTo = [
+	readonly #yieldTo = [
 		vscode.DocumentDropOrPasteEditKind.Text,
 		vscode.DocumentDropOrPasteEditKind.Empty.append('markdown', 'link', 'image', 'attachment'), // Prefer notebook attachments
 	];
 
+	readonly #parser: IMdParser;
+
 	constructor(
-		private readonly _parser: IMdParser,
-	) { }
+		parser: IMdParser,
+	) {
+		this.#parser = parser;
+	}
 
 	public async provideDocumentDropEdits(
 		document: vscode.TextDocument,
@@ -51,8 +55,8 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 		dataTransfer: vscode.DataTransfer,
 		token: vscode.CancellationToken,
 	): Promise<vscode.DocumentDropEdit | undefined> {
-		const edit = await this._createEdit(document, [new vscode.Range(position, position)], dataTransfer, {
-			insert: this._getEnabled(document, 'editor.drop.enabled'),
+		const edit = await this.#createEdit(document, [new vscode.Range(position, position)], dataTransfer, {
+			insert: this.#getEnabled(document, 'editor.drop.enabled'),
 			copyIntoWorkspace: vscode.workspace.getConfiguration('markdown', document).get<CopyFilesSettings>('editor.drop.copyIntoWorkspace', CopyFilesSettings.MediaFiles)
 		}, undefined, token);
 
@@ -64,7 +68,7 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 		dropEdit.title = edit.label;
 		dropEdit.kind = edit.kind;
 		dropEdit.additionalEdit = edit.additionalEdits;
-		dropEdit.yieldTo = [...this._yieldTo, ...edit.yieldTo];
+		dropEdit.yieldTo = [...this.#yieldTo, ...edit.yieldTo];
 		return dropEdit;
 	}
 
@@ -75,8 +79,8 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 		context: vscode.DocumentPasteEditContext,
 		token: vscode.CancellationToken,
 	): Promise<vscode.DocumentPasteEdit[] | undefined> {
-		const edit = await this._createEdit(document, ranges, dataTransfer, {
-			insert: this._getEnabled(document, 'editor.paste.enabled'),
+		const edit = await this.#createEdit(document, ranges, dataTransfer, {
+			insert: this.#getEnabled(document, 'editor.paste.enabled'),
 			copyIntoWorkspace: vscode.workspace.getConfiguration('markdown', document).get<CopyFilesSettings>('editor.paste.copyIntoWorkspace', CopyFilesSettings.MediaFiles)
 		}, context, token);
 
@@ -86,11 +90,11 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 
 		const pasteEdit = new vscode.DocumentPasteEdit(edit.snippet, edit.label, edit.kind);
 		pasteEdit.additionalEdit = edit.additionalEdits;
-		pasteEdit.yieldTo = [...this._yieldTo, ...edit.yieldTo];
+		pasteEdit.yieldTo = [...this.#yieldTo, ...edit.yieldTo];
 		return [pasteEdit];
 	}
 
-	private _getEnabled(document: vscode.TextDocument, settingName: string): InsertMarkdownLink {
+	#getEnabled(document: vscode.TextDocument, settingName: string): InsertMarkdownLink {
 		const setting = vscode.workspace.getConfiguration('markdown', document).get<boolean | InsertMarkdownLink>(settingName, true);
 		// Convert old boolean values to new enum setting
 		if (setting === false) {
@@ -102,7 +106,7 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 		}
 	}
 
-	private async _createEdit(
+	async #createEdit(
 		document: vscode.TextDocument,
 		ranges: readonly vscode.Range[],
 		dataTransfer: vscode.DataTransfer,
@@ -117,27 +121,27 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 			return;
 		}
 
-		let edit = await this._createEditForMediaFiles(document, dataTransfer, settings.copyIntoWorkspace, token);
+		let edit = await this.#createEditForMediaFiles(document, dataTransfer, settings.copyIntoWorkspace, token);
 		if (token.isCancellationRequested) {
 			return;
 		}
 
 		if (!edit) {
-			edit = await this._createEditFromUriListData(document, ranges, dataTransfer, context, token);
+			edit = await this.#createEditFromUriListData(document, ranges, dataTransfer, context, token);
 		}
 
 		if (!edit || token.isCancellationRequested) {
 			return;
 		}
 
-		if (!(await shouldInsertMarkdownLinkByDefault(this._parser, document, settings.insert, ranges, token))) {
+		if (!(await shouldInsertMarkdownLinkByDefault(this.#parser, document, settings.insert, ranges, token))) {
 			edit.yieldTo.push(vscode.DocumentDropOrPasteEditKind.Empty.append('uri'));
 		}
 
 		return edit;
 	}
 
-	private async _createEditFromUriListData(
+	async #createEditFromUriListData(
 		document: vscode.TextDocument,
 		ranges: readonly vscode.Range[],
 		dataTransfer: vscode.DataTransfer,
@@ -194,7 +198,7 @@ class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, v
 	 *
 	 * This tries copying files outside of the workspace into the workspace.
 	 */
-	private async _createEditForMediaFiles(
+	async #createEditForMediaFiles(
 		document: vscode.TextDocument,
 		dataTransfer: vscode.DataTransfer,
 		copyIntoWorkspace: CopyFilesSettings,
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts
index 1625977a72c..fe9030704c1 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts
@@ -12,7 +12,7 @@ import { CopyFileConfiguration, getCopyFileConfiguration, parseGlob, resolveCopy
 
 export class NewFilePathGenerator {
 
-	private readonly _usedPaths = new Set<string>();
+	readonly #usedPaths = new Set<string>();
 
 	async getNewFilePath(
 		document: vscode.TextDocument,
@@ -33,13 +33,13 @@ export class NewFilePathGenerator {
 
 			const name = i === 0 ? baseName : `${baseName}-${i}`;
 			const uri = vscode.Uri.joinPath(root, name + ext);
-			if (this._wasPathAlreadyUsed(uri)) {
+			if (this.#wasPathAlreadyUsed(uri)) {
 				continue;
 			}
 
 			// Try overwriting if it already exists
 			if (config.overwriteBehavior === 'overwrite') {
-				this._usedPaths.add(uri.toString());
+				this.#usedPaths.add(uri.toString());
 				return { uri, overwrite: true };
 			}
 
@@ -47,17 +47,17 @@ export class NewFilePathGenerator {
 			try {
 				await vscode.workspace.fs.stat(uri);
 			} catch {
-				if (!this._wasPathAlreadyUsed(uri)) {
+				if (!this.#wasPathAlreadyUsed(uri)) {
 					// Does not exist
-					this._usedPaths.add(uri.toString());
+					this.#usedPaths.add(uri.toString());
 					return { uri, overwrite: false };
 				}
 			}
 		}
 	}
 
-	private _wasPathAlreadyUsed(uri: vscode.Uri) {
-		return this._usedPaths.has(uri.toString());
+	#wasPathAlreadyUsed(uri: vscode.Uri) {
+		return this.#usedPaths.has(uri.toString());
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts
index a947216fe32..faad54e10c3 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts
@@ -21,9 +21,13 @@ class PasteUrlEditProvider implements vscode.DocumentPasteEditProvider {
 
 	public static readonly pasteMimeTypes = [Mime.textPlain];
 
+	readonly #parser: IMdParser;
+
 	constructor(
-		private readonly _parser: IMdParser,
-	) { }
+		parser: IMdParser,
+	) {
+		this.#parser = parser;
+	}
 
 	async provideDocumentPasteEdits(
 		document: vscode.TextDocument,
@@ -64,7 +68,7 @@ class PasteUrlEditProvider implements vscode.DocumentPasteEditProvider {
 		workspaceEdit.set(document.uri, edit.edits);
 		pasteEdit.additionalEdit = workspaceEdit;
 
-		if (!(await shouldInsertMarkdownLinkByDefault(this._parser, document, pasteUrlSetting, ranges, token))) {
+		if (!(await shouldInsertMarkdownLinkByDefault(this.#parser, document, pasteUrlSetting, ranges, token))) {
 			pasteEdit.yieldTo = [
 				vscode.DocumentDropOrPasteEditKind.Text,
 				vscode.DocumentDropOrPasteEditKind.Empty.append('uri')
diff --git a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
index 8df16f4dcc6..871333cf4a4 100644
--- a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
@@ -19,18 +19,18 @@ export enum DiagnosticCode {
 
 class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 
-	private static readonly _addToIgnoreLinksCommandId = '_markdown.addToIgnoreLinks';
+	static readonly #addToIgnoreLinksCommandId = '_markdown.addToIgnoreLinks';
 
-	private static readonly _metadata: vscode.CodeActionProviderMetadata = {
+	static readonly #metadata: vscode.CodeActionProviderMetadata = {
 		providedCodeActionKinds: [
 			vscode.CodeActionKind.QuickFix
 		],
 	};
 
 	public static register(selector: vscode.DocumentSelector, commandManager: CommandManager): vscode.Disposable {
-		const reg = vscode.languages.registerCodeActionsProvider(selector, new AddToIgnoreLinksQuickFixProvider(), AddToIgnoreLinksQuickFixProvider._metadata);
+		const reg = vscode.languages.registerCodeActionsProvider(selector, new AddToIgnoreLinksQuickFixProvider(), AddToIgnoreLinksQuickFixProvider.#metadata);
 		const commandReg = commandManager.register({
-			id: AddToIgnoreLinksQuickFixProvider._addToIgnoreLinksCommandId,
+			id: AddToIgnoreLinksQuickFixProvider.#addToIgnoreLinksCommandId,
 			execute(resource: vscode.Uri, path: string) {
 				const settingId = 'validate.ignoredLinks';
 				const config = vscode.workspace.getConfiguration('markdown', resource);
@@ -58,7 +58,7 @@ class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 							vscode.CodeActionKind.QuickFix);
 
 						fix.command = {
-							command: AddToIgnoreLinksQuickFixProvider._addToIgnoreLinksCommandId,
+							command: AddToIgnoreLinksQuickFixProvider.#addToIgnoreLinksCommandId,
 							title: '',
 							arguments: [document.uri, hrefText],
 						};
diff --git a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
index bda8b721e8b..23a2ed9e770 100644
--- a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
@@ -13,9 +13,13 @@ export class FindFileReferencesCommand implements Command {
 
 	public readonly id = 'markdown.findAllFileReferences';
 
+	readonly #client: MdLanguageClient;
+
 	constructor(
-		private readonly _client: MdLanguageClient,
-	) { }
+		client: MdLanguageClient,
+	) {
+		this.#client = client;
+	}
 
 	public async execute(resource?: vscode.Uri) {
 		resource ??= vscode.window.activeTextEditor?.document.uri;
@@ -28,7 +32,7 @@ export class FindFileReferencesCommand implements Command {
 			location: vscode.ProgressLocation.Window,
 			title: vscode.l10n.t("Finding file references")
 		}, async (_progress, token) => {
-			const locations = (await this._client.getReferencesToFileInWorkspace(resource, token)).map(loc => {
+			const locations = (await this.#client.getReferencesToFileInWorkspace(resource, token)).map(loc => {
 				return new vscode.Location(vscode.Uri.parse(loc.uri), convertRange(loc.range));
 			});
 
diff --git a/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
index 5d42a033842..d912caa9060 100644
--- a/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
@@ -33,46 +33,48 @@ interface RenameAction {
 
 class UpdateLinksOnFileRenameHandler extends Disposable {
 
-	private readonly _delayer = new Delayer(50);
-	private readonly _pendingRenames = new Set<RenameAction>();
+	readonly #delayer = new Delayer(50);
+	readonly #pendingRenames = new Set<RenameAction>();
+	readonly #client: MdLanguageClient;
 
 	public constructor(
-		private readonly _client: MdLanguageClient,
+		client: MdLanguageClient,
 	) {
 		super();
+		this.#client = client;
 
 		this._register(vscode.workspace.onDidRenameFiles(async (e) => {
 			await Promise.all(e.files.map(async (rename) => {
-				if (await this._shouldParticipateInLinkUpdate(rename.newUri)) {
-					this._pendingRenames.add(rename);
+				if (await this.#shouldParticipateInLinkUpdate(rename.newUri)) {
+					this.#pendingRenames.add(rename);
 				}
 			}));
 
-			if (this._pendingRenames.size) {
-				this._delayer.trigger(() => {
+			if (this.#pendingRenames.size) {
+				this.#delayer.trigger(() => {
 					vscode.window.withProgress({
 						location: vscode.ProgressLocation.Window,
 						title: vscode.l10n.t("Checking for Markdown links to update")
-					}, () => this._flushRenames());
+					}, () => this.#flushRenames());
 				});
 			}
 		}));
 	}
 
-	private async _flushRenames(): Promise<void> {
-		const renames = Array.from(this._pendingRenames);
-		this._pendingRenames.clear();
+	async #flushRenames(): Promise<void> {
+		const renames = Array.from(this.#pendingRenames);
+		this.#pendingRenames.clear();
 
-		const result = await this._getEditsForFileRename(renames, noopToken);
+		const result = await this.#getEditsForFileRename(renames, noopToken);
 
 		if (result?.edit.size) {
-			if (await this._confirmActionWithUser(result.resourcesBeingRenamed)) {
+			if (await this.#confirmActionWithUser(result.resourcesBeingRenamed)) {
 				await vscode.workspace.applyEdit(result.edit);
 			}
 		}
 	}
 
-	private async _confirmActionWithUser(newResources: readonly vscode.Uri[]): Promise<boolean> {
+	async #confirmActionWithUser(newResources: readonly vscode.Uri[]): Promise<boolean> {
 		if (!newResources.length) {
 			return false;
 		}
@@ -81,7 +83,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 		const setting = config.get<UpdateLinksOnFileMoveSetting>(settingNames.enabled);
 		switch (setting) {
 			case UpdateLinksOnFileMoveSetting.Prompt:
-				return this._promptUser(newResources);
+				return this.#promptUser(newResources);
 			case UpdateLinksOnFileMoveSetting.Always:
 				return true;
 			case UpdateLinksOnFileMoveSetting.Never:
@@ -89,7 +91,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 				return false;
 		}
 	}
-	private async _shouldParticipateInLinkUpdate(newUri: vscode.Uri): Promise<boolean> {
+	async #shouldParticipateInLinkUpdate(newUri: vscode.Uri): Promise<boolean> {
 		const config = vscode.workspace.getConfiguration('markdown', newUri);
 		const setting = config.get<UpdateLinksOnFileMoveSetting>(settingNames.enabled);
 		if (setting === UpdateLinksOnFileMoveSetting.Never) {
@@ -113,7 +115,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 		return false;
 	}
 
-	private async _promptUser(newResources: readonly vscode.Uri[]): Promise<boolean> {
+	async #promptUser(newResources: readonly vscode.Uri[]): Promise<boolean> {
 		if (!newResources.length) {
 			return false;
 		}
@@ -138,7 +140,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 		const choice = await vscode.window.showInformationMessage(
 			newResources.length === 1
 				? vscode.l10n.t("Update Markdown links for '{0}'?", Utils.basename(newResources[0]))
-				: this._getConfirmMessage(vscode.l10n.t("Update Markdown links for the following {0} files?", newResources.length), newResources), {
+				: this.#getConfirmMessage(vscode.l10n.t("Update Markdown links for the following {0} files?", newResources.length), newResources), {
 			modal: true,
 		}, rejectItem, acceptItem, alwaysItem, neverItem);
 
@@ -154,7 +156,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 				config.update(
 					settingNames.enabled,
 					UpdateLinksOnFileMoveSetting.Always,
-					this._getConfigTargetScope(config, settingNames.enabled));
+					this.#getConfigTargetScope(config, settingNames.enabled));
 				return true;
 			}
 			case neverItem: {
@@ -162,7 +164,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 				config.update(
 					settingNames.enabled,
 					UpdateLinksOnFileMoveSetting.Never,
-					this._getConfigTargetScope(config, settingNames.enabled));
+					this.#getConfigTargetScope(config, settingNames.enabled));
 				return false;
 			}
 			default: {
@@ -171,8 +173,8 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 		}
 	}
 
-	private async _getEditsForFileRename(renames: readonly RenameAction[], token: vscode.CancellationToken): Promise<{ edit: vscode.WorkspaceEdit; resourcesBeingRenamed: vscode.Uri[] } | undefined> {
-		const result = await this._client.getEditForFileRenames(renames.map(rename => ({ oldUri: rename.oldUri.toString(), newUri: rename.newUri.toString() })), token);
+	async #getEditsForFileRename(renames: readonly RenameAction[], token: vscode.CancellationToken): Promise<{ edit: vscode.WorkspaceEdit; resourcesBeingRenamed: vscode.Uri[] } | undefined> {
+		const result = await this.#client.getEditForFileRenames(renames.map(rename => ({ oldUri: rename.oldUri.toString(), newUri: rename.newUri.toString() })), token);
 		if (!result?.edit.documentChanges?.length) {
 			return undefined;
 		}
@@ -192,7 +194,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 		};
 	}
 
-	private _getConfirmMessage(start: string, resourcesToConfirm: readonly vscode.Uri[]): string {
+	#getConfirmMessage(start: string, resourcesToConfirm: readonly vscode.Uri[]): string {
 		const MAX_CONFIRM_FILES = 10;
 
 		const paths = [start];
@@ -211,7 +213,7 @@ class UpdateLinksOnFileRenameHandler extends Disposable {
 		return paths.join('\n');
 	}
 
-	private _getConfigTargetScope(config: vscode.WorkspaceConfiguration, settingsName: string): vscode.ConfigurationTarget {
+	#getConfigTargetScope(config: vscode.WorkspaceConfiguration, settingsName: string): vscode.ConfigurationTarget {
 		const inspected = config.inspect(settingsName);
 		if (inspected?.workspaceFolderValue) {
 			return vscode.ConfigurationTarget.WorkspaceFolder;
diff --git a/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts b/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts
index f8a7128eb05..b27a869db0e 100644
--- a/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/updateLinksOnPaste.ts
@@ -13,16 +13,20 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 
 	public static readonly metadataMime = 'application/vnd.vscode.markdown.updatelinks.metadata';
 
+	readonly #client: MdLanguageClient;
+
 	constructor(
-		private readonly _client: MdLanguageClient,
-	) { }
+		client: MdLanguageClient,
+	) {
+		this.#client = client;
+	}
 
 	async prepareDocumentPaste(document: vscode.TextDocument, ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise<void> {
-		if (!this._isEnabled(document)) {
+		if (!this.#isEnabled(document)) {
 			return;
 		}
 
-		const metadata = await this._client.prepareUpdatePastedLinks(document.uri, ranges, token);
+		const metadata = await this.#client.prepareUpdatePastedLinks(document.uri, ranges, token);
 		if (token.isCancellationRequested) {
 			return;
 		}
@@ -37,7 +41,7 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		context: vscode.DocumentPasteEditContext,
 		token: vscode.CancellationToken,
 	): Promise<vscode.DocumentPasteEdit[] | undefined> {
-		if (!this._isEnabled(document)) {
+		if (!this.#isEnabled(document)) {
 			return;
 		}
 
@@ -56,7 +60,7 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		// - copy empty line
 		// - Copy with multiple cursors and paste into multiple locations
 		// - ...
-		const edits = await this._client.getUpdatePastedLinksEdit(document.uri, ranges.map(x => new vscode.TextEdit(x, text)), metadata, token);
+		const edits = await this.#client.getUpdatePastedLinksEdit(document.uri, ranges.map(x => new vscode.TextEdit(x, text)), metadata, token);
 		if (!edits?.length || token.isCancellationRequested) {
 			return;
 		}
@@ -73,7 +77,7 @@ class UpdatePastedLinksEditProvider implements vscode.DocumentPasteEditProvider
 		return [pasteEdit];
 	}
 
-	private _isEnabled(document: vscode.TextDocument): boolean {
+	#isEnabled(document: vscode.TextDocument): boolean {
 		return vscode.workspace.getConfiguration('markdown', document.uri).get<boolean>('editor.updateLinksOnPaste.enabled', true);
 	}
 }
diff --git a/extensions/markdown-language-features/src/logging.ts b/extensions/markdown-language-features/src/logging.ts
index b5ea76f3608..30839d8c756 100644
--- a/extensions/markdown-language-features/src/logging.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -12,11 +12,11 @@ export interface ILogger {
 }
 
 export class VsCodeOutputLogger extends Disposable implements ILogger {
-	private _outputChannelValue?: vscode.LogOutputChannel;
+	#outputChannelValue?: vscode.LogOutputChannel;
 
-	private get _outputChannel() {
-		this._outputChannelValue ??= this._register(vscode.window.createOutputChannel('Markdown', { log: true }));
-		return this._outputChannelValue;
+	get #outputChannel() {
+		this.#outputChannelValue ??= this._register(vscode.window.createOutputChannel('Markdown', { log: true }));
+		return this.#outputChannelValue;
 	}
 
 	constructor() {
@@ -24,6 +24,6 @@ export class VsCodeOutputLogger extends Disposable implements ILogger {
 	}
 
 	public trace(title: string, message: string, data?: any): void {
-		this._outputChannel.trace(`${title}: ${message}`, ...(data ? [JSON.stringify(data, null, 4)] : []));
+		this.#outputChannel.trace(`${title}: ${message}`, ...(data ? [JSON.stringify(data, null, 4)] : []));
 	}
 }
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 0f4c7eb6717..4ed3186c380 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -44,37 +44,37 @@ const pluginSourceMap: MarkdownIt.PluginSimple = (md): void => {
 type MarkdownItConfig = Readonly<Required<Pick<MarkdownIt.Options, 'breaks' | 'linkify' | 'typographer'>>>;
 
 class TokenCache {
-	private _cachedDocument?: {
+	#cachedDocument?: {
 		readonly uri: vscode.Uri;
 		readonly version: number;
 		readonly config: MarkdownItConfig;
 	};
-	private _tokens?: MarkdownIt.Token[];
+	#tokens?: MarkdownIt.Token[];
 
 	public tryGetCached(document: ITextDocument, config: MarkdownItConfig): MarkdownIt.Token[] | undefined {
-		if (this._cachedDocument
-			&& this._cachedDocument.uri.toString() === document.uri.toString()
-			&& document.version >= 0 && this._cachedDocument.version === document.version
-			&& this._cachedDocument.config.breaks === config.breaks
-			&& this._cachedDocument.config.linkify === config.linkify
+		if (this.#cachedDocument
+			&& this.#cachedDocument.uri.toString() === document.uri.toString()
+			&& document.version >= 0 && this.#cachedDocument.version === document.version
+			&& this.#cachedDocument.config.breaks === config.breaks
+			&& this.#cachedDocument.config.linkify === config.linkify
 		) {
-			return this._tokens;
+			return this.#tokens;
 		}
 		return undefined;
 	}
 
 	public update(document: ITextDocument, config: MarkdownItConfig, tokens: MarkdownIt.Token[]) {
-		this._cachedDocument = {
+		this.#cachedDocument = {
 			uri: document.uri,
 			version: document.version,
 			config,
 		};
-		this._tokens = tokens;
+		this.#tokens = tokens;
 	}
 
 	public clean(): void {
-		this._cachedDocument = undefined;
-		this._tokens = undefined;
+		this.#cachedDocument = undefined;
+		this.#tokens = undefined;
 	}
 }
 
@@ -98,40 +98,45 @@ export interface IMdParser {
 
 export class MarkdownItEngine implements IMdParser {
 
-	private _md?: Promise<MarkdownIt>;
+	#md?: Promise<MarkdownIt>;
 
-	private readonly _tokenCache = new TokenCache();
+	readonly #tokenCache = new TokenCache();
 
 	public readonly slugifier: ISlugifier;
 
-	public constructor(
-		private readonly _contributionProvider: MarkdownContributionProvider,
-		slugifier: ISlugifier,
-		private readonly _logger: ILogger,
-	) {
-		this.slugifier = slugifier;
+	readonly #contributionProvider: MarkdownContributionProvider;
+	readonly #logger: ILogger;
 
-		_contributionProvider.onContributionsChanged(() => {
+	public constructor(
+		contributionProvider: MarkdownContributionProvider,
+		slugifier: ISlugifier,
+		logger: ILogger,
+	) {
+		this.#contributionProvider = contributionProvider;
+		this.slugifier = slugifier;
+		this.#logger = logger;
+
+		contributionProvider.onContributionsChanged(() => {
 			// Markdown plugin contributions may have changed
-			this._md = undefined;
-			this._tokenCache.clean();
+			this.#md = undefined;
+			this.#tokenCache.clean();
 		});
 	}
 
 
 	public async getEngine(resource: vscode.Uri | undefined): Promise<MarkdownIt> {
-		const config = this._getConfig(resource);
-		return this._getEngine(config);
+		const config = this.#getConfig(resource);
+		return this.#getEngine(config);
 	}
 
-	private async _getEngine(config: MarkdownItConfig): Promise<MarkdownIt> {
-		if (!this._md) {
-			this._md = (async () => {
+	async #getEngine(config: MarkdownItConfig): Promise<MarkdownIt> {
+		if (!this.#md) {
+			this.#md = (async () => {
 				const markdownIt = await import('markdown-it');
 				let md: MarkdownIt = markdownIt.default(await getMarkdownOptions(() => md));
 				md.linkify.set({ fuzzyLink: false });
 
-				for (const plugin of this._contributionProvider.contributions.markdownItPlugins.values()) {
+				for (const plugin of this.#contributionProvider.contributions.markdownItPlugins.values()) {
 					try {
 						md = (await plugin)(md);
 					} catch (e) {
@@ -154,43 +159,43 @@ export class MarkdownItEngine implements IMdParser {
 					alt: ['paragraph', 'reference', 'blockquote', 'list']
 				});
 
-				this._addImageRenderer(md);
-				this._addFencedRenderer(md);
-				this._addLinkNormalizer(md);
-				this._addLinkValidator(md);
-				this._addNamedHeaders(md);
-				this._addLinkRenderer(md);
+				this.#addImageRenderer(md);
+				this.#addFencedRenderer(md);
+				this.#addLinkNormalizer(md);
+				this.#addLinkValidator(md);
+				this.#addNamedHeaders(md);
+				this.#addLinkRenderer(md);
 				md.use(pluginSourceMap);
 				return md;
 			})();
 		}
 
-		const md = await this._md!;
+		const md = await this.#md!;
 		md.set(config);
 		return md;
 	}
 
 	public reloadPlugins() {
-		this._md = undefined;
+		this.#md = undefined;
 	}
 
-	private _tokenizeDocument(
+	#tokenizeDocument(
 		document: ITextDocument,
 		config: MarkdownItConfig,
 		engine: MarkdownIt
 	): MarkdownIt.Token[] {
-		const cached = this._tokenCache.tryGetCached(document, config);
+		const cached = this.#tokenCache.tryGetCached(document, config);
 		if (cached) {
 			return cached;
 		}
 
-		this._logger.trace('MarkdownItEngine', `tokenizeDocument - ${document.uri}`);
-		const tokens = this._tokenizeString(document.getText(), engine);
-		this._tokenCache.update(document, config, tokens);
+		this.#logger.trace('MarkdownItEngine', `tokenizeDocument - ${document.uri}`);
+		const tokens = this.#tokenizeString(document.getText(), engine);
+		this.#tokenCache.update(document, config, tokens);
 		return tokens;
 	}
 
-	private _tokenizeString(text: string, engine: MarkdownIt) {
+	#tokenizeString(text: string, engine: MarkdownIt) {
 		const env: RenderEnv = {
 			currentDocument: undefined,
 			containingImages: new Set<string>(),
@@ -201,12 +206,12 @@ export class MarkdownItEngine implements IMdParser {
 	}
 
 	public async render(input: ITextDocument | string, resourceProvider?: WebviewResourceProvider): Promise<RenderOutput> {
-		const config = this._getConfig(typeof input === 'string' ? undefined : input.uri);
-		const engine = await this._getEngine(config);
+		const config = this.#getConfig(typeof input === 'string' ? undefined : input.uri);
+		const engine = await this.#getEngine(config);
 
 		const tokens = typeof input === 'string'
-			? this._tokenizeString(input, engine)
-			: this._tokenizeDocument(input, config, engine);
+			? this.#tokenizeString(input, engine)
+			: this.#tokenizeDocument(input, config, engine);
 
 		const env: RenderEnv = {
 			containingImages: new Set<string>(),
@@ -227,16 +232,16 @@ export class MarkdownItEngine implements IMdParser {
 	}
 
 	public async tokenize(document: ITextDocument): Promise<MarkdownIt.Token[]> {
-		const config = this._getConfig(document.uri);
-		const engine = await this._getEngine(config);
-		return this._tokenizeDocument(document, config, engine);
+		const config = this.#getConfig(document.uri);
+		const engine = await this.#getEngine(config);
+		return this.#tokenizeDocument(document, config, engine);
 	}
 
 	public cleanCache(): void {
-		this._tokenCache.clean();
+		this.#tokenCache.clean();
 	}
 
-	private _getConfig(resource?: vscode.Uri): MarkdownItConfig {
+	#getConfig(resource?: vscode.Uri): MarkdownItConfig {
 		const config = MarkdownPreviewConfiguration.getForResource(resource ?? null);
 		return {
 			breaks: config.previewLineBreaks,
@@ -245,7 +250,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _addImageRenderer(md: MarkdownIt): void {
+	#addImageRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules.image;
 		md.renderer.rules.image = (tokens: MarkdownIt.Token[], idx: number, options, env: RenderEnv, self) => {
 			const token = tokens[idx];
@@ -254,7 +259,7 @@ export class MarkdownItEngine implements IMdParser {
 				env.containingImages?.add(src);
 
 				if (!token.attrGet('data-src')) {
-					token.attrSet('src', this._toResourceUri(src, env.currentDocument, env.resourceProvider));
+					token.attrSet('src', this.#toResourceUri(src, env.currentDocument, env.resourceProvider));
 					token.attrSet('data-src', src);
 				}
 			}
@@ -267,7 +272,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _addFencedRenderer(md: MarkdownIt): void {
+	#addFencedRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules['fenced'];
 		md.renderer.rules['fenced'] = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
 			const token = tokens[idx];
@@ -283,7 +288,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _addLinkNormalizer(md: MarkdownIt): void {
+	#addLinkNormalizer(md: MarkdownIt): void {
 		const normalizeLink = md.normalizeLink;
 		md.normalizeLink = (link: string) => {
 			try {
@@ -299,7 +304,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _addLinkValidator(md: MarkdownIt): void {
+	#addLinkValidator(md: MarkdownIt): void {
 		const validateLink = md.validateLink;
 		md.validateLink = (link: string) => {
 			return validateLink(link)
@@ -309,10 +314,10 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _addNamedHeaders(md: MarkdownIt): void {
+	#addNamedHeaders(md: MarkdownIt): void {
 		const original = md.renderer.rules.heading_open;
 		md.renderer.rules.heading_open = (tokens: MarkdownIt.Token[], idx: number, options, env: unknown, self) => {
-			const title = this._tokenToPlainText(tokens[idx + 1]);
+			const title = this.#tokenToPlainText(tokens[idx + 1]);
 			const slug = (env as RenderEnv).slugifier ? (env as RenderEnv).slugifier.add(title) : this.slugifier.fromHeading(title);
 			tokens[idx].attrSet('id', slug.value);
 
@@ -324,9 +329,9 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _tokenToPlainText(token: MarkdownIt.Token): string {
+	#tokenToPlainText(token: MarkdownIt.Token): string {
 		if (token.children) {
-			return token.children.map(x => this._tokenToPlainText(x)).join('');
+			return token.children.map(x => this.#tokenToPlainText(x)).join('');
 		}
 
 		switch (token.type) {
@@ -339,7 +344,7 @@ export class MarkdownItEngine implements IMdParser {
 		}
 	}
 
-	private _addLinkRenderer(md: MarkdownIt): void {
+	#addLinkRenderer(md: MarkdownIt): void {
 		const original = md.renderer.rules.link_open;
 
 		md.renderer.rules.link_open = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
@@ -357,7 +362,7 @@ export class MarkdownItEngine implements IMdParser {
 		};
 	}
 
-	private _toResourceUri(href: string, currentDocument: vscode.Uri | undefined, resourceProvider: WebviewResourceProvider | undefined): string {
+	#toResourceUri(href: string, currentDocument: vscode.Uri | undefined, resourceProvider: WebviewResourceProvider | undefined): string {
 		try {
 			// Support file:// links
 			if (isOfScheme(Schemes.file, href)) {
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
index 1357b03d1de..568a0f0b638 100644
--- a/extensions/markdown-language-features/src/markdownExtensions.ts
+++ b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -119,36 +119,38 @@ export interface MarkdownContributionProvider {
 
 class VSCodeExtensionMarkdownContributionProvider extends Disposable implements MarkdownContributionProvider {
 
-	private _contributions?: MarkdownContributions;
+	#contributions?: MarkdownContributions;
+	readonly #extensionContext: vscode.ExtensionContext;
 
 	public constructor(
-		private readonly _extensionContext: vscode.ExtensionContext,
+		extensionContext: vscode.ExtensionContext,
 	) {
 		super();
+		this.#extensionContext = extensionContext;
 
 		this._register(vscode.extensions.onDidChange(() => {
-			const currentContributions = this._getCurrentContributions();
-			const existingContributions = this._contributions || MarkdownContributions.Empty;
+			const currentContributions = this.#getCurrentContributions();
+			const existingContributions = this.#contributions || MarkdownContributions.Empty;
 			if (!MarkdownContributions.equal(existingContributions, currentContributions)) {
-				this._contributions = currentContributions;
-				this._onContributionsChanged.fire(this);
+				this.#contributions = currentContributions;
+				this.#onContributionsChanged.fire(this);
 			}
 		}));
 	}
 
 	public get extensionUri() {
-		return this._extensionContext.extensionUri;
+		return this.#extensionContext.extensionUri;
 	}
 
-	private readonly _onContributionsChanged = this._register(new vscode.EventEmitter<this>());
-	public readonly onContributionsChanged = this._onContributionsChanged.event;
+	readonly #onContributionsChanged = this._register(new vscode.EventEmitter<this>());
+	public readonly onContributionsChanged = this.#onContributionsChanged.event;
 
 	public get contributions(): MarkdownContributions {
-		this._contributions ??= this._getCurrentContributions();
-		return this._contributions;
+		this.#contributions ??= this.#getCurrentContributions();
+		return this.#contributions;
 	}
 
-	private _getCurrentContributions(): MarkdownContributions {
+	#getCurrentContributions(): MarkdownContributions {
 		return vscode.extensions.all
 			.map(MarkdownContributions.fromExtension)
 			.reduce(MarkdownContributions.merge, MarkdownContributions.Empty);
diff --git a/extensions/markdown-language-features/src/preview/documentRenderer.ts b/extensions/markdown-language-features/src/preview/documentRenderer.ts
index 61182a24436..f96fce9b745 100644
--- a/extensions/markdown-language-features/src/preview/documentRenderer.ts
+++ b/extensions/markdown-language-features/src/preview/documentRenderer.ts
@@ -41,16 +41,28 @@ export interface ImageInfo {
 }
 
 export class MdDocumentRenderer {
+
+	readonly #engine: MarkdownItEngine;
+	readonly #context: vscode.ExtensionContext;
+	readonly #cspArbiter: ContentSecurityPolicyArbiter;
+	readonly #contributionProvider: MarkdownContributionProvider;
+	readonly #logger: ILogger;
+
 	constructor(
-		private readonly _engine: MarkdownItEngine,
-		private readonly _context: vscode.ExtensionContext,
-		private readonly _cspArbiter: ContentSecurityPolicyArbiter,
-		private readonly _contributionProvider: MarkdownContributionProvider,
-		private readonly _logger: ILogger
+		engine: MarkdownItEngine,
+		context: vscode.ExtensionContext,
+		cspArbiter: ContentSecurityPolicyArbiter,
+		contributionProvider: MarkdownContributionProvider,
+		logger: ILogger
 	) {
+		this.#engine = engine;
+		this.#context = context;
+		this.#cspArbiter = cspArbiter;
+		this.#contributionProvider = contributionProvider;
+		this.#logger = logger;
 		this.iconPath = {
-			dark: vscode.Uri.joinPath(this._context.extensionUri, 'media', 'preview-dark.svg'),
-			light: vscode.Uri.joinPath(this._context.extensionUri, 'media', 'preview-light.svg'),
+			dark: vscode.Uri.joinPath(this.#context.extensionUri, 'media', 'preview-dark.svg'),
+			light: vscode.Uri.joinPath(this.#context.extensionUri, 'media', 'preview-light.svg'),
 		};
 	}
 
@@ -76,15 +88,15 @@ export class MdDocumentRenderer {
 			scrollPreviewWithEditor: config.scrollPreviewWithEditor,
 			scrollEditorWithPreview: config.scrollEditorWithPreview,
 			doubleClickToSwitchToEditor: config.doubleClickToSwitchToEditor,
-			disableSecurityWarnings: this._cspArbiter.shouldDisableSecurityWarnings(),
+			disableSecurityWarnings: this.#cspArbiter.shouldDisableSecurityWarnings(),
 			webviewResourceRoot: resourceProvider.asWebviewUri(markdownDocument.uri).toString(),
 		};
 
-		this._logger.trace('DocumentRenderer', `provideTextDocumentContent - ${markdownDocument.uri}`, initialData);
+		this.#logger.trace('DocumentRenderer', `provideTextDocumentContent - ${markdownDocument.uri}`, initialData);
 
 		// Content Security Policy
 		const nonce = generateUuid();
-		const csp = this._getCsp(resourceProvider, sourceUri, nonce);
+		const csp = this.#getCsp(resourceProvider, sourceUri, nonce);
 
 		const body = await this.renderBody(markdownDocument, resourceProvider);
 		if (token.isCancellationRequested) {
@@ -92,7 +104,7 @@ export class MdDocumentRenderer {
 		}
 
 		const html = `<!DOCTYPE html>
-			<html style="${escapeAttribute(this._getSettingsOverrideStyles(config))}">
+			<html style="${escapeAttribute(this.#getSettingsOverrideStyles(config))}">
 			<head>
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 				<meta http-equiv="Content-Security-Policy" content="${escapeAttribute(csp)}">
@@ -101,12 +113,12 @@ export class MdDocumentRenderer {
 					data-strings="${escapeAttribute(JSON.stringify(previewStrings))}"
 					data-state="${escapeAttribute(JSON.stringify(state || {}))}"
 					data-initial-md-content="${escapeAttribute(body.html)}">
-				<script src="${this._extensionResourcePath(resourceProvider, 'pre.js')}" nonce="${nonce}"></script>
-				${this._getStyles(resourceProvider, sourceUri, config, imageInfo)}
+				<script src="${this.#extensionResourcePath(resourceProvider, 'pre.js')}" nonce="${nonce}"></script>
+				${this.#getStyles(resourceProvider, sourceUri, config, imageInfo)}
 				<base href="${resourceProvider.asWebviewUri(markdownDocument.uri)}">
 			</head>
 			<body class="vscode-body ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
-				${this._getScripts(resourceProvider, nonce)}
+				${this.#getScripts(resourceProvider, nonce)}
 			</body>
 			</html>`;
 		return {
@@ -119,7 +131,7 @@ export class MdDocumentRenderer {
 		markdownDocument: vscode.TextDocument,
 		resourceProvider: WebviewResourceProvider,
 	): Promise<MarkdownContentProviderOutput> {
-		const rendered = await this._engine.render(markdownDocument, resourceProvider);
+		const rendered = await this.#engine.render(markdownDocument, resourceProvider);
 		const html = `<div class="markdown-body" dir="auto">${rendered.html}<div class="code-line" data-line="${markdownDocument.lineCount}"></div></div>`;
 		return {
 			html,
@@ -138,13 +150,13 @@ export class MdDocumentRenderer {
 			</html>`;
 	}
 
-	private _extensionResourcePath(resourceProvider: WebviewResourceProvider, mediaFile: string): string {
+	#extensionResourcePath(resourceProvider: WebviewResourceProvider, mediaFile: string): string {
 		const webviewResource = resourceProvider.asWebviewUri(
-			vscode.Uri.joinPath(this._context.extensionUri, 'media', mediaFile));
+			vscode.Uri.joinPath(this.#context.extensionUri, 'media', mediaFile));
 		return webviewResource.toString();
 	}
 
-	private _fixHref(resourceProvider: WebviewResourceProvider, resource: vscode.Uri, href: string): string {
+	#fixHref(resourceProvider: WebviewResourceProvider, resource: vscode.Uri, href: string): string {
 		if (!href) {
 			return href;
 		}
@@ -168,18 +180,18 @@ export class MdDocumentRenderer {
 		return resourceProvider.asWebviewUri(vscode.Uri.joinPath(uri.Utils.dirname(resource), href)).toString();
 	}
 
-	private _computeCustomStyleSheetIncludes(resourceProvider: WebviewResourceProvider, resource: vscode.Uri, config: MarkdownPreviewConfiguration): string {
+	#computeCustomStyleSheetIncludes(resourceProvider: WebviewResourceProvider, resource: vscode.Uri, config: MarkdownPreviewConfiguration): string {
 		if (!Array.isArray(config.styles)) {
 			return '';
 		}
 		const out: string[] = [];
 		for (const style of config.styles) {
-			out.push(`<link rel="stylesheet" class="code-user-style" data-source="${escapeAttribute(style)}" href="${escapeAttribute(this._fixHref(resourceProvider, resource, style))}" type="text/css" media="screen">`);
+			out.push(`<link rel="stylesheet" class="code-user-style" data-source="${escapeAttribute(style)}" href="${escapeAttribute(this.#fixHref(resourceProvider, resource, style))}" type="text/css" media="screen">`);
 		}
 		return out.join('\n');
 	}
 
-	private _getSettingsOverrideStyles(config: MarkdownPreviewConfiguration): string {
+	#getSettingsOverrideStyles(config: MarkdownPreviewConfiguration): string {
 		return [
 			config.fontFamily ? `--markdown-font-family: ${config.fontFamily};` : '',
 			isNaN(config.fontSize) ? '' : `--markdown-font-size: ${config.fontSize}px;`,
@@ -187,7 +199,7 @@ export class MdDocumentRenderer {
 		].join(' ');
 	}
 
-	private _getImageStabilizerStyles(imageInfo: readonly ImageInfo[]): string {
+	#getImageStabilizerStyles(imageInfo: readonly ImageInfo[]): string {
 		if (!imageInfo.length) {
 			return '';
 		}
@@ -204,20 +216,20 @@ export class MdDocumentRenderer {
 		return ret;
 	}
 
-	private _getStyles(resourceProvider: WebviewResourceProvider, resource: vscode.Uri, config: MarkdownPreviewConfiguration, imageInfo: readonly ImageInfo[]): string {
+	#getStyles(resourceProvider: WebviewResourceProvider, resource: vscode.Uri, config: MarkdownPreviewConfiguration, imageInfo: readonly ImageInfo[]): string {
 		const baseStyles: string[] = [];
-		for (const resource of this._contributionProvider.contributions.previewStyles) {
+		for (const resource of this.#contributionProvider.contributions.previewStyles) {
 			baseStyles.push(`<link rel="stylesheet" type="text/css" href="${escapeAttribute(resourceProvider.asWebviewUri(resource))}">`);
 		}
 
 		return `${baseStyles.join('\n')}
-			${this._computeCustomStyleSheetIncludes(resourceProvider, resource, config)}
-			${this._getImageStabilizerStyles(imageInfo)}`;
+			${this.#computeCustomStyleSheetIncludes(resourceProvider, resource, config)}
+			${this.#getImageStabilizerStyles(imageInfo)}`;
 	}
 
-	private _getScripts(resourceProvider: WebviewResourceProvider, nonce: string): string {
+	#getScripts(resourceProvider: WebviewResourceProvider, nonce: string): string {
 		const out: string[] = [];
-		for (const resource of this._contributionProvider.contributions.previewScripts) {
+		for (const resource of this.#contributionProvider.contributions.previewScripts) {
 			out.push(`<script async
 				src="${escapeAttribute(resourceProvider.asWebviewUri(resource))}"
 				nonce="${nonce}"
@@ -226,13 +238,13 @@ export class MdDocumentRenderer {
 		return out.join('\n');
 	}
 
-	private _getCsp(
+	#getCsp(
 		provider: WebviewResourceProvider,
 		resource: vscode.Uri,
 		nonce: string
 	): string {
 		const rule = provider.cspSource.split(';')[0];
-		switch (this._cspArbiter.getSecurityLevelForResource(resource)) {
+		switch (this.#cspArbiter.getSecurityLevelForResource(resource)) {
 			case MarkdownPreviewSecurityLevel.AllowInsecureContent:
 				return `default-src 'none'; img-src 'self' ${rule} http: https: data:; media-src 'self' ${rule} http: https: data:; script-src 'nonce-${nonce}'; style-src 'self' ${rule} 'unsafe-inline' http: https: data:; font-src 'self' ${rule} http: https: data:;`;
 
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 819702da3f2..a96a0ae028f 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -10,7 +10,7 @@ import { MarkdownContributionProvider } from '../markdownExtensions';
 import { Disposable } from '../util/dispose';
 import { isMarkdownFile } from '../util/file';
 import { MdLinkOpener } from '../util/openDocumentLink';
-import { WebviewResourceProvider } from '../util/resources';
+import { areUrisEqual, WebviewResourceProvider } from '../util/resources';
 import { urlToUri } from '../util/url';
 import { ImageInfo, MdDocumentRenderer } from './documentRenderer';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
@@ -21,16 +21,16 @@ import type { FromWebviewMessage, ToWebviewMessage } from '../../types/previewMe
 export class PreviewDocumentVersion {
 
 	public readonly resource: vscode.Uri;
-	private readonly _version: number;
+	readonly #version: number;
 
 	public constructor(document: vscode.TextDocument) {
 		this.resource = document.uri;
-		this._version = document.version;
+		this.#version = document.version;
 	}
 
 	public equals(other: PreviewDocumentVersion): boolean {
-		return this.resource.fsPath === other.resource.fsPath
-			&& this._version === other._version;
+		return areUrisEqual(this.resource, other.resource)
+			&& this.#version === other.#version;
 	}
 }
 
@@ -42,60 +42,74 @@ interface MarkdownPreviewDelegate {
 
 class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 
-	private static readonly _unwatchedImageSchemes = new Set(['https', 'http', 'data']);
+	static readonly #unwatchedImageSchemes = new Set(['https', 'http', 'data']);
 
-	private _disposed: boolean = false;
+	#disposed: boolean = false;
 
-	private readonly _delay = 300;
-	private _throttleTimer: any;
+	readonly #delay = 300;
+	#throttleTimer: any;
 
-	private readonly _resource: vscode.Uri;
-	private readonly _webviewPanel: vscode.WebviewPanel;
+	readonly #resource: vscode.Uri;
+	readonly #webviewPanel: vscode.WebviewPanel;
 
-	private _line: number | undefined;
-	private readonly _scrollToFragment: string | undefined;
-	private _firstUpdate = true;
-	private _currentVersion?: PreviewDocumentVersion;
-	private _isScrolling = false;
-	private _scrollingTimer?: NodeJS.Timeout;
+	#line: number | undefined;
+	readonly #scrollToFragment: string | undefined;
+	#firstUpdate = true;
+	#currentVersion?: PreviewDocumentVersion;
+	#isScrolling = false;
+	#scrollingTimer?: NodeJS.Timeout;
 
-	private _imageInfo: readonly ImageInfo[] = [];
-	private readonly _fileWatchersBySrc = new Map</* src: */ string, vscode.FileSystemWatcher>();
+	#imageInfo: readonly ImageInfo[] = [];
+	readonly #fileWatchersBySrc = new Map</* src: */ string, vscode.FileSystemWatcher>();
 
-	private readonly _onScrollEmitter = this._register(new vscode.EventEmitter<LastScrollLocation>());
-	public readonly onScroll = this._onScrollEmitter.event;
+	readonly #onScrollEmitter = this._register(new vscode.EventEmitter<LastScrollLocation>());
+	public readonly onScroll = this.#onScrollEmitter.event;
 
-	private readonly _disposeCts = this._register(new vscode.CancellationTokenSource());
+	readonly #disposeCts = this._register(new vscode.CancellationTokenSource());
+
+	readonly #delegate: MarkdownPreviewDelegate;
+	readonly #contentProvider: MdDocumentRenderer;
+	readonly #previewConfigurations: MarkdownPreviewConfigurationManager;
+	readonly #logger: ILogger;
+	readonly #contributionProvider: MarkdownContributionProvider;
+	readonly #opener: MdLinkOpener;
 
 	constructor(
 		webview: vscode.WebviewPanel,
 		resource: vscode.Uri,
 		startingScroll: StartingScrollLocation | undefined,
-		private readonly _delegate: MarkdownPreviewDelegate,
-		private readonly _contentProvider: MdDocumentRenderer,
-		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
-		private readonly _logger: ILogger,
-		private readonly _contributionProvider: MarkdownContributionProvider,
-		private readonly _opener: MdLinkOpener,
+		delegate: MarkdownPreviewDelegate,
+		contentProvider: MdDocumentRenderer,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
+		logger: ILogger,
+		contributionProvider: MarkdownContributionProvider,
+		opener: MdLinkOpener,
 	) {
 		super();
 
-		this._webviewPanel = webview;
-		this._resource = resource;
+		this.#delegate = delegate;
+		this.#contentProvider = contentProvider;
+		this.#previewConfigurations = previewConfigurations;
+		this.#logger = logger;
+		this.#contributionProvider = contributionProvider;
+		this.#opener = opener;
+
+		this.#webviewPanel = webview;
+		this.#resource = resource;
 
 		switch (startingScroll?.type) {
 			case 'line':
 				if (!isNaN(startingScroll.line!)) {
-					this._line = startingScroll.line;
+					this.#line = startingScroll.line;
 				}
 				break;
 
 			case 'fragment':
-				this._scrollToFragment = startingScroll.fragment;
+				this.#scrollToFragment = startingScroll.fragment;
 				break;
 		}
 
-		this._register(_contributionProvider.onContributionsChanged(() => {
+		this._register(contributionProvider.onContributionsChanged(() => {
 			setTimeout(() => this.refresh(true), 0);
 		}));
 
@@ -123,26 +137,26 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}));
 		}
 
-		this._register(this._webviewPanel.webview.onDidReceiveMessage((e: FromWebviewMessage.Type) => {
-			if (e.source !== this._resource.toString()) {
+		this._register(this.#webviewPanel.webview.onDidReceiveMessage((e: FromWebviewMessage.Type) => {
+			if (e.source !== this.#resource.toString()) {
 				return;
 			}
 
 			switch (e.type) {
 				case 'cacheImageSizes':
-					this._imageInfo = e.imageData;
+					this.#imageInfo = e.imageData;
 					break;
 
 				case 'revealLine':
-					this._onDidScrollPreview(e.line);
+					this.#onDidScrollPreview(e.line);
 					break;
 
 				case 'didClick':
-					this._onDidClickPreview(e.line);
+					this.#onDidClickPreview(e.line);
 					break;
 
 				case 'openLink':
-					this._onDidClickPreviewLink(e.href);
+					this.#onDidClickPreviewLink(e.href);
 					break;
 
 				case 'showPreviewSecuritySelector':
@@ -160,29 +174,29 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	}
 
 	override dispose() {
-		this._disposeCts.cancel();
+		this.#disposeCts.cancel();
 
 		super.dispose();
 
-		this._disposed = true;
+		this.#disposed = true;
 
-		clearTimeout(this._throttleTimer);
-		for (const entry of this._fileWatchersBySrc.values()) {
+		clearTimeout(this.#throttleTimer);
+		for (const entry of this.#fileWatchersBySrc.values()) {
 			entry.dispose();
 		}
-		this._fileWatchersBySrc.clear();
+		this.#fileWatchersBySrc.clear();
 	}
 
 	public get resource(): vscode.Uri {
-		return this._resource;
+		return this.#resource;
 	}
 
 	public get state() {
 		return {
-			resource: this._resource.toString(),
-			line: this._line,
-			fragment: this._scrollToFragment,
-			...this._delegate.getAdditionalState(),
+			resource: this.#resource.toString(),
+			line: this.#line,
+			fragment: this.#scrollToFragment,
+			...this.#delegate.getAdditionalState(),
 		};
 	}
 
@@ -192,78 +206,79 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	*/
 	public refresh(forceUpdate: boolean = false) {
 		// Schedule update if none is pending
-		if (!this._throttleTimer) {
-			if (this._firstUpdate) {
-				this._updatePreview(true);
+		if (!this.#throttleTimer) {
+			if (this.#firstUpdate) {
+				this.#updatePreview(true);
 			} else {
-				this._throttleTimer = setTimeout(() => this._updatePreview(forceUpdate), this._delay);
+				this.#throttleTimer = setTimeout(() => this.#updatePreview(forceUpdate), this.#delay);
 			}
 		}
 
-		this._firstUpdate = false;
+		this.#firstUpdate = false;
 	}
 
 
 	public isPreviewOf(resource: vscode.Uri): boolean {
-		return this._resource.fsPath === resource.fsPath;
+		return areUrisEqual(this.#resource, resource);
 	}
 
 	public postMessage(msg: ToWebviewMessage.Type) {
-		if (!this._disposed) {
-			this._webviewPanel.webview.postMessage(msg);
+		if (!this.#disposed) {
+			this.#webviewPanel.webview.postMessage(msg);
 		}
 	}
 
 	public scrollTo(topLine: number) {
-		if (this._disposed) {
+		if (this.#disposed) {
 			return;
 		}
 
-		if (this._isScrolling) {
+		if (this.#isScrolling) {
+			this.#isScrolling = false;
 			return;
 		}
 
-		this._logger.trace('MarkdownPreview', 'updateForView', { markdownFile: this._resource });
-		this._line = topLine;
+		this.#logger.trace('MarkdownPreview', 'updateForView', { markdownFile: this.#resource });
+		this.#line = topLine;
 		this.postMessage({
 			type: 'updateView',
 			line: topLine,
-			source: this._resource.toString()
+			source: this.#resource.toString()
 		});
 	}
 
-	private async _updatePreview(forceUpdate?: boolean): Promise<void> {
-		clearTimeout(this._throttleTimer);
-		this._throttleTimer = undefined;
+	async #updatePreview(forceUpdate?: boolean): Promise<void> {
+		clearTimeout(this.#throttleTimer);
+		this.#throttleTimer = undefined;
 
-		if (this._disposed) {
+		if (this.#disposed) {
 			return;
 		}
 
 		let document: vscode.TextDocument;
 		try {
-			document = await vscode.workspace.openTextDocument(this._resource);
+			document = await vscode.workspace.openTextDocument(this.#resource);
 		} catch {
-			if (!this._disposed) {
-				await this._showFileNotFoundError();
+			if (!this.#disposed) {
+				await this.#showFileNotFoundError();
 			}
 			return;
 		}
 
-		if (this._disposed) {
+		if (this.#disposed) {
 			return;
 		}
 
 		const pendingVersion = new PreviewDocumentVersion(document);
-		if (!forceUpdate && this._currentVersion?.equals(pendingVersion)) {
-			if (this._line) {
-				this.scrollTo(this._line);
+		if (!forceUpdate && this.#currentVersion?.equals(pendingVersion)) {
+			if (this.#line) {
+				this.scrollTo(this.#line);
 			}
 			return;
 		}
 
-		const shouldReloadPage = forceUpdate || !this._currentVersion || this._currentVersion.resource.toString() !== pendingVersion.resource.toString() || !this._webviewPanel.visible;
-		this._currentVersion = pendingVersion;
+		const shouldReloadPage = forceUpdate || !this.#currentVersion || this.#currentVersion.resource.toString() !== pendingVersion.resource.toString() || !this.#webviewPanel.visible;
+		this.#currentVersion = pendingVersion;
 
 		let selectedLine: number | undefined = undefined;
 		for (const editor of vscode.window.visibleTextEditors) {
@@ -274,21 +289,21 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		}
 
 		const content = await (shouldReloadPage
-			? this._contentProvider.renderDocument(document, this, this._previewConfigurations, this._line, selectedLine, this.state, this._imageInfo, this._disposeCts.token)
-			: this._contentProvider.renderBody(document, this));
+			? this.#contentProvider.renderDocument(document, this, this.#previewConfigurations, this.#line, selectedLine, this.state, this.#imageInfo, this.#disposeCts.token)
+			: this.#contentProvider.renderBody(document, this));
 
 		// Another call to `doUpdate` may have happened.
 		// Make sure we are still updating for the correct document
-		if (this._currentVersion?.equals(pendingVersion)) {
-			this._updateWebviewContent(content.html, shouldReloadPage);
-			this._updateImageWatchers(content.containingImages);
+		if (this.#currentVersion?.equals(pendingVersion)) {
+			this.#updateWebviewContent(content.html, shouldReloadPage);
+			this.#updateImageWatchers(content.containingImages);
 		}
 	}
 
-	private _onDidScrollPreview(line: number) {
-		this._line = line;
-		this._onScrollEmitter.fire({ line: this._line, uri: this._resource });
-		const config = this._previewConfigurations.loadAndCacheConfiguration(this._resource);
+	#onDidScrollPreview(line: number) {
+		this.#line = line;
+		this.#onScrollEmitter.fire({ line: this.#line, uri: this.#resource });
+		const config = this.#previewConfigurations.loadAndCacheConfiguration(this.#resource);
 		if (!config.scrollEditorWithPreview) {
 			return;
 		}
@@ -298,18 +313,18 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 				continue;
 			}
 
-			this._isScrolling = true;
-			if (this._scrollingTimer) {
-				clearTimeout(this._scrollingTimer);
+			this.#isScrolling = true;
+			if (this.#scrollingTimer) {
+				clearTimeout(this.#scrollingTimer);
 			}
-			this._scrollingTimer = setTimeout(() => {
-				this._isScrolling = false;
+			this.#scrollingTimer = setTimeout(() => {
+				this.#isScrolling = false;
 			}, 200);
 			scrollEditorToLine(line, editor);
 		}
 	}
 
-	private async _onDidClickPreview(line: number): Promise<void> {
+	async #onDidClickPreview(line: number): Promise<void> {
 		// fix #82457, find currently opened but unfocused source tab
 		await vscode.commands.executeCommand('markdown.showSource');
 
@@ -328,97 +343,97 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}
 		}
 
-		await vscode.workspace.openTextDocument(this._resource)
+		await vscode.workspace.openTextDocument(this.#resource)
 			.then(vscode.window.showTextDocument)
 			.then((editor) => {
 				revealLineInEditor(editor);
 			}, () => {
-				vscode.window.showErrorMessage(vscode.l10n.t('Could not open {0}', this._resource.toString()));
+				vscode.window.showErrorMessage(vscode.l10n.t('Could not open {0}', this.#resource.toString()));
 			});
 	}
 
-	private async _showFileNotFoundError() {
-		this._webviewPanel.webview.html = this._contentProvider.renderFileNotFoundDocument(this._resource);
+	async #showFileNotFoundError() {
+		this.#webviewPanel.webview.html = this.#contentProvider.renderFileNotFoundDocument(this.#resource);
 	}
 
-	private _updateWebviewContent(html: string, reloadPage: boolean): void {
-		if (this._disposed) {
+	#updateWebviewContent(html: string, reloadPage: boolean): void {
+		if (this.#disposed) {
 			return;
 		}
 
-		if (this._delegate.getTitle) {
-			this._webviewPanel.title = this._delegate.getTitle(this._resource);
+		if (this.#delegate.getTitle) {
+			this.#webviewPanel.title = this.#delegate.getTitle(this.#resource);
 		}
-		this._webviewPanel.webview.options = this._getWebviewOptions();
+		this.#webviewPanel.webview.options = this.#getWebviewOptions();
 
 		if (reloadPage) {
-			this._webviewPanel.webview.html = html;
+			this.#webviewPanel.webview.html = html;
 		} else {
 			this.postMessage({
 				type: 'updateContent',
 				content: html,
-				source: this._resource.toString(),
+				source: this.#resource.toString(),
 			});
 		}
 	}
 
-	private _updateImageWatchers(srcs: Set<string>) {
+	#updateImageWatchers(srcs: Set<string>) {
 		// Delete stale file watchers.
-		for (const [src, watcher] of this._fileWatchersBySrc) {
+		for (const [src, watcher] of this.#fileWatchersBySrc) {
 			if (!srcs.has(src)) {
 				watcher.dispose();
-				this._fileWatchersBySrc.delete(src);
+				this.#fileWatchersBySrc.delete(src);
 			}
 		}
 
 		// Create new file watchers.
-		const root = vscode.Uri.joinPath(this._resource, '../');
+		const root = vscode.Uri.joinPath(this.#resource, '../');
 		for (const src of srcs) {
 			const uri = urlToUri(src, root);
-			if (uri && !MarkdownPreview._unwatchedImageSchemes.has(uri.scheme) && !this._fileWatchersBySrc.has(src)) {
+			if (uri && !MarkdownPreview.#unwatchedImageSchemes.has(uri.scheme) && !this.#fileWatchersBySrc.has(src)) {
 				const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(uri, '*'));
 				watcher.onDidChange(() => {
 					this.refresh(true);
 				});
-				this._fileWatchersBySrc.set(src, watcher);
+				this.#fileWatchersBySrc.set(src, watcher);
 			}
 		}
 	}
 
-	private _getWebviewOptions(): vscode.WebviewOptions {
+	#getWebviewOptions(): vscode.WebviewOptions {
 		return {
 			enableScripts: true,
 			enableForms: false,
-			localResourceRoots: this._getLocalResourceRoots()
+			localResourceRoots: this.#getLocalResourceRoots()
 		};
 	}
 
-	private _getLocalResourceRoots(): ReadonlyArray<vscode.Uri> {
-		const baseRoots = Array.from(this._contributionProvider.contributions.previewResourceRoots);
+	#getLocalResourceRoots(): ReadonlyArray<vscode.Uri> {
+		const baseRoots = Array.from(this.#contributionProvider.contributions.previewResourceRoots);
 
-		const folder = vscode.workspace.getWorkspaceFolder(this._resource);
+		const folder = vscode.workspace.getWorkspaceFolder(this.#resource);
 		if (folder) {
 			const workspaceRoots = vscode.workspace.workspaceFolders?.map(folder => folder.uri);
 			if (workspaceRoots) {
 				baseRoots.push(...workspaceRoots);
 			}
 		} else {
-			baseRoots.push(uri.Utils.dirname(this._resource));
+			baseRoots.push(uri.Utils.dirname(this.#resource));
 		}
 
 		return baseRoots;
 	}
 
-	private async _onDidClickPreviewLink(href: string) {
+	async #onDidClickPreviewLink(href: string) {
 		const config = vscode.workspace.getConfiguration('markdown', this.resource);
 		const openLinks = config.get<string>('preview.openMarkdownLinks', 'inPreview');
 		if (openLinks === 'inPreview') {
-			const resolved = await this._opener.resolveDocumentLink(href, this.resource);
+			const resolved = await this.#opener.resolveDocumentLink(href, this.resource);
 			if (resolved.kind === 'file') {
 				try {
 					const doc = await vscode.workspace.openTextDocument(vscode.Uri.from(resolved.uri));
 					if (isMarkdownFile(doc)) {
-						return this._delegate.openPreviewLinkToMarkdownFile(doc.uri, resolved.fragment ? decodeURIComponent(resolved.fragment) : undefined);
+						return this.#delegate.openPreviewLinkToMarkdownFile(doc.uri, resolved.fragment ? decodeURIComponent(resolved.fragment) : undefined);
 					}
 				} catch {
 					// Noop
@@ -426,21 +441,21 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}
 		}
 
-		return this._opener.openDocumentLink(href, this.resource);
+		return this.#opener.openDocumentLink(href, this.resource);
 	}
 
 	//#region WebviewResourceProvider
 
 	asWebviewUri(resource: vscode.Uri) {
-		return this._webviewPanel.webview.asWebviewUri(resource);
+		return this.#webviewPanel.webview.asWebviewUri(resource);
 	}
 
 	get cspSource() {
 		return [
-			this._webviewPanel.webview.cspSource,
+			this.#webviewPanel.webview.cspSource,
 
 			// On web, we also need to allow loading of resources from contributed extensions
-			...this._contributionProvider.contributions.previewResourceRoots
+			...this.#contributionProvider.contributions.previewResourceRoots
 				.filter(root => root.scheme === 'http' || root.scheme === 'https')
 				.map(root => {
 					const dirRoot = root.path.endsWith('/') ? root : root.with({ path: root.path + '/' });
@@ -490,13 +505,16 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, topmostLineMonitor, logger, contributionProvider, opener, scrollLine);
 	}
 
-	private readonly _preview: MarkdownPreview;
+	readonly #preview: MarkdownPreview;
+
+	readonly #webviewPanel: vscode.WebviewPanel;
+	readonly #previewConfigurations: MarkdownPreviewConfigurationManager;
 
 	private constructor(
-		private readonly _webviewPanel: vscode.WebviewPanel,
+		webviewPanel: vscode.WebviewPanel,
 		resource: vscode.Uri,
 		contentProvider: MdDocumentRenderer,
-		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
 		topmostLineMonitor: TopmostLineMonitor,
 		logger: ILogger,
 		contributionProvider: MarkdownContributionProvider,
@@ -504,52 +522,56 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 		scrollLine?: number,
 	) {
 		super();
+
+		this.#webviewPanel = webviewPanel;
+		this.#previewConfigurations = previewConfigurations;
+
 		const topScrollLocation = scrollLine ? new StartingScrollLine(scrollLine) : undefined;
-		this._preview = this._register(new MarkdownPreview(this._webviewPanel, resource, topScrollLocation, {
+		this.#preview = this._register(new MarkdownPreview(this.#webviewPanel, resource, topScrollLocation, {
 			getAdditionalState: () => { return {}; },
 			openPreviewLinkToMarkdownFile: (markdownLink, fragment) => {
 				return vscode.commands.executeCommand('vscode.openWith', markdownLink.with({
 					fragment
-				}), StaticMarkdownPreview.customEditorViewType, this._webviewPanel.viewColumn);
+				}), StaticMarkdownPreview.customEditorViewType, this.#webviewPanel.viewColumn);
 			}
-		}, contentProvider, _previewConfigurations, logger, contributionProvider, opener));
+		}, contentProvider, previewConfigurations, logger, contributionProvider, opener));
 
-		this._register(this._webviewPanel.onDidDispose(() => {
+		this._register(this.#webviewPanel.onDidDispose(() => {
 			this.dispose();
 		}));
 
-		this._register(this._webviewPanel.onDidChangeViewState(e => {
-			this._onDidChangeViewState.fire(e);
+		this._register(this.#webviewPanel.onDidChangeViewState(e => {
+			this.#onDidChangeViewState.fire(e);
 		}));
 
-		this._register(this._preview.onScroll((scrollInfo) => {
+		this._register(this.#preview.onScroll((scrollInfo) => {
 			topmostLineMonitor.setPreviousStaticEditorLine(scrollInfo);
 		}));
 
 		this._register(topmostLineMonitor.onDidChanged(event => {
-			if (this._preview.isPreviewOf(event.resource)) {
-				this._preview.scrollTo(event.line);
+			if (this.#preview.isPreviewOf(event.resource)) {
+				this.#preview.scrollTo(event.line);
 			}
 		}));
 	}
 
 	copyImage(id: string) {
-		this._webviewPanel.reveal();
-		this._preview.postMessage({
+		this.#webviewPanel.reveal();
+		this.#preview.postMessage({
 			type: 'copyImage',
 			source: this.resource.toString(),
 			id: id
 		});
 	}
 
-	private readonly _onDispose = this._register(new vscode.EventEmitter<void>());
-	public readonly onDispose = this._onDispose.event;
+	readonly #onDispose = this._register(new vscode.EventEmitter<void>());
+	public readonly onDispose = this.#onDispose.event;
 
-	private readonly _onDidChangeViewState = this._register(new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>());
-	public readonly onDidChangeViewState = this._onDidChangeViewState.event;
+	readonly #onDidChangeViewState = this._register(new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>());
+	public readonly onDidChangeViewState = this.#onDidChangeViewState.event;
 
 	override dispose() {
-		this._onDispose.fire();
+		this.#onDispose.fire();
 		super.dispose();
 	}
 
@@ -562,21 +584,21 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 	}
 
 	public refresh() {
-		this._preview.refresh(true);
+		this.#preview.refresh(true);
 	}
 
 	public updateConfiguration() {
-		if (this._previewConfigurations.hasConfigurationChanged(this._preview.resource)) {
+		if (this.#previewConfigurations.hasConfigurationChanged(this.#preview.resource)) {
 			this.refresh();
 		}
 	}
 
 	public get resource() {
-		return this._preview.resource;
+		return this.#preview.resource;
 	}
 
 	public get resourceColumn() {
-		return this._webviewPanel.viewColumn || vscode.ViewColumn.One;
+		return this.#webviewPanel.viewColumn || vscode.ViewColumn.One;
 	}
 }
 
@@ -591,11 +613,11 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 
 	public static readonly viewType = 'markdown.preview';
 
-	private readonly _resourceColumn: vscode.ViewColumn;
-	private _locked: boolean;
+	readonly #resourceColumn: vscode.ViewColumn;
+	#locked: boolean;
 
-	private readonly _webviewPanel: vscode.WebviewPanel;
-	private _preview: MarkdownPreview;
+	readonly #webviewPanel: vscode.WebviewPanel;
+	#preview: MarkdownPreview;
 
 	public static revive(
 		input: DynamicPreviewInput,
@@ -625,7 +647,7 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 	): DynamicMarkdownPreview {
 		const webview = vscode.window.createWebviewPanel(
 			DynamicMarkdownPreview.viewType,
-			DynamicMarkdownPreview._getPreviewTitle(input.resource, input.locked),
+			DynamicMarkdownPreview.#getPreviewTitle(input.resource, input.locked),
 			previewColumn, { enableFindWidget: true, });
 
 		webview.iconPath = contentProvider.iconPath;
@@ -634,43 +656,57 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, opener);
 	}
 
+	readonly #contentProvider: MdDocumentRenderer;
+	readonly #previewConfigurations: MarkdownPreviewConfigurationManager;
+	readonly #logger: ILogger;
+	readonly #topmostLineMonitor: TopmostLineMonitor;
+	readonly #contributionProvider: MarkdownContributionProvider;
+	readonly #opener: MdLinkOpener;
+
 	private constructor(
 		webview: vscode.WebviewPanel,
 		input: DynamicPreviewInput,
-		private readonly _contentProvider: MdDocumentRenderer,
-		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
-		private readonly _logger: ILogger,
-		private readonly _topmostLineMonitor: TopmostLineMonitor,
-		private readonly _contributionProvider: MarkdownContributionProvider,
-		private readonly _opener: MdLinkOpener,
+		contentProvider: MdDocumentRenderer,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
+		logger: ILogger,
+		topmostLineMonitor: TopmostLineMonitor,
+		contributionProvider: MarkdownContributionProvider,
+		opener: MdLinkOpener,
 	) {
 		super();
 
-		this._webviewPanel = webview;
+		this.#contentProvider = contentProvider;
+		this.#previewConfigurations = previewConfigurations;
+		this.#logger = logger;
+		this.#topmostLineMonitor = topmostLineMonitor;
+		this.#contributionProvider = contributionProvider;
+		this.#opener = opener;
 
-		this._resourceColumn = input.resourceColumn;
-		this._locked = input.locked;
+		this.#webviewPanel = webview;
 
-		this._preview = this._createPreview(input.resource, typeof input.line === 'number' ? new StartingScrollLine(input.line) : undefined);
+		this.#resourceColumn = input.resourceColumn;
+		this.#locked = input.locked;
+
+		this.#preview = this.#createPreview(input.resource, typeof input.line === 'number' ? new StartingScrollLine(input.line) : undefined);
 
 		this._register(webview.onDidDispose(() => { this.dispose(); }));
 
-		this._register(this._webviewPanel.onDidChangeViewState(e => {
-			this._onDidChangeViewStateEmitter.fire(e);
+		this._register(this.#webviewPanel.onDidChangeViewState(e => {
+			this.#onDidChangeViewStateEmitter.fire(e);
 		}));
 
-		this._register(this._topmostLineMonitor.onDidChanged(event => {
-			if (this._preview.isPreviewOf(event.resource)) {
-				this._preview.scrollTo(event.line);
+		this._register(this.#topmostLineMonitor.onDidChanged(event => {
+			if (this.#preview.isPreviewOf(event.resource)) {
+				this.#preview.scrollTo(event.line);
 			}
 		}));
 
 		this._register(vscode.window.onDidChangeTextEditorSelection(event => {
-			if (this._preview.isPreviewOf(event.textEditor.document.uri)) {
-				this._preview.postMessage({
+			if (this.#preview.isPreviewOf(event.textEditor.document.uri)) {
+				this.#preview.postMessage({
 					type: 'onDidChangeTextEditorSelection',
 					line: event.selections[0].active.line,
-					source: this._preview.resource.toString()
+					source: this.#preview.resource.toString()
 				});
 			}
 		}));
@@ -681,7 +717,7 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 				return;
 			}
 
-			if (isMarkdownFile(editor.document) && !this._locked && !this._preview.isPreviewOf(editor.document.uri)) {
+			if (isMarkdownFile(editor.document) && !this.#locked && !this.#preview.isPreviewOf(editor.document.uri)) {
 				const line = getVisibleLine(editor);
 				this.update(editor.document.uri, line ? new StartingScrollLine(line) : undefined);
 			}
@@ -689,56 +725,56 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 	}
 
 	copyImage(id: string) {
-		this._webviewPanel.reveal();
-		this._preview.postMessage({
+		this.#webviewPanel.reveal();
+		this.#preview.postMessage({
 			type: 'copyImage',
 			source: this.resource.toString(),
 			id: id
 		});
 	}
 
-	private readonly _onDisposeEmitter = this._register(new vscode.EventEmitter<void>());
-	public readonly onDispose = this._onDisposeEmitter.event;
+	readonly #onDisposeEmitter = this._register(new vscode.EventEmitter<void>());
+	public readonly onDispose = this.#onDisposeEmitter.event;
 
-	private readonly _onDidChangeViewStateEmitter = this._register(new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>());
-	public readonly onDidChangeViewState = this._onDidChangeViewStateEmitter.event;
+	readonly #onDidChangeViewStateEmitter = this._register(new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>());
+	public readonly onDidChangeViewState = this.#onDidChangeViewStateEmitter.event;
 
 	override dispose() {
-		this._preview.dispose();
-		this._webviewPanel.dispose();
+		this.#preview.dispose();
+		this.#webviewPanel.dispose();
 
-		this._onDisposeEmitter.fire();
-		this._onDisposeEmitter.dispose();
+		this.#onDisposeEmitter.fire();
+		this.#onDisposeEmitter.dispose();
 		super.dispose();
 	}
 
 	public get resource() {
-		return this._preview.resource;
+		return this.#preview.resource;
 	}
 
 	public get resourceColumn() {
-		return this._resourceColumn;
+		return this.#resourceColumn;
 	}
 
 	public reveal(viewColumn: vscode.ViewColumn) {
-		this._webviewPanel.reveal(viewColumn);
+		this.#webviewPanel.reveal(viewColumn);
 	}
 
 	public refresh() {
-		this._preview.refresh(true);
+		this.#preview.refresh(true);
 	}
 
 	public updateConfiguration() {
-		if (this._previewConfigurations.hasConfigurationChanged(this._preview.resource)) {
+		if (this.#previewConfigurations.hasConfigurationChanged(this.#preview.resource)) {
 			this.refresh();
 		}
 	}
 
 	public update(newResource: vscode.Uri, scrollLocation?: StartingScrollLocation) {
-		if (this._preview.isPreviewOf(newResource)) {
+		if (this.#preview.isPreviewOf(newResource)) {
 			switch (scrollLocation?.type) {
 				case 'line':
-					this._preview.scrollTo(scrollLocation.line);
+					this.#preview.scrollTo(scrollLocation.line);
 					return;
 
 				case 'fragment':
@@ -750,16 +786,16 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 			}
 		}
 
-		this._preview.dispose();
-		this._preview = this._createPreview(newResource, scrollLocation);
+		this.#preview.dispose();
+		this.#preview = this.#createPreview(newResource, scrollLocation);
 	}
 
 	public toggleLock() {
-		this._locked = !this._locked;
-		this._webviewPanel.title = DynamicMarkdownPreview._getPreviewTitle(this._preview.resource, this._locked);
+		this.#locked = !this.#locked;
+		this.#webviewPanel.title = DynamicMarkdownPreview.#getPreviewTitle(this.#preview.resource, this.#locked);
 	}
 
-	private static _getPreviewTitle(resource: vscode.Uri, locked: boolean): string {
+	static #getPreviewTitle(resource: vscode.Uri, locked: boolean): string {
 		const resourceLabel = uri.Utils.basename(resource);
 		return locked
 			? vscode.l10n.t('[Preview] {0}', resourceLabel)
@@ -767,7 +803,7 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 	}
 
 	public get position(): vscode.ViewColumn | undefined {
-		return this._webviewPanel.viewColumn;
+		return this.#webviewPanel.viewColumn;
 	}
 
 	public matchesResource(
@@ -779,34 +815,34 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 			return false;
 		}
 
-		if (this._locked) {
-			return otherLocked && this._preview.isPreviewOf(otherResource);
+		if (this.#locked) {
+			return otherLocked && this.#preview.isPreviewOf(otherResource);
 		} else {
 			return !otherLocked;
 		}
 	}
 
 	public matches(otherPreview: DynamicMarkdownPreview): boolean {
-		return this.matchesResource(otherPreview._preview.resource, otherPreview.position, otherPreview._locked);
+		return this.matchesResource(otherPreview.#preview.resource, otherPreview.position, otherPreview.#locked);
 	}
 
-	private _createPreview(resource: vscode.Uri, startingScroll?: StartingScrollLocation): MarkdownPreview {
-		return new MarkdownPreview(this._webviewPanel, resource, startingScroll, {
-			getTitle: (resource) => DynamicMarkdownPreview._getPreviewTitle(resource, this._locked),
+	#createPreview(resource: vscode.Uri, startingScroll?: StartingScrollLocation): MarkdownPreview {
+		return new MarkdownPreview(this.#webviewPanel, resource, startingScroll, {
+			getTitle: (resource) => DynamicMarkdownPreview.#getPreviewTitle(resource, this.#locked),
 			getAdditionalState: () => {
 				return {
 					resourceColumn: this.resourceColumn,
-					locked: this._locked,
+					locked: this.#locked,
 				};
 			},
 			openPreviewLinkToMarkdownFile: (link: vscode.Uri, fragment?: string) => {
 				this.update(link, fragment ? new StartingScrollFragment(fragment) : undefined);
 			}
 		},
-			this._contentProvider,
-			this._previewConfigurations,
-			this._logger,
-			this._contributionProvider,
-			this._opener);
+			this.#contentProvider,
+			this.#previewConfigurations,
+			this.#logger,
+			this.#contributionProvider,
+			this.#opener);
 	}
 }
diff --git a/extensions/markdown-language-features/src/preview/previewConfig.ts b/extensions/markdown-language-features/src/preview/previewConfig.ts
index 01d63403377..ac240b97eb7 100644
--- a/extensions/markdown-language-features/src/preview/previewConfig.ts
+++ b/extensions/markdown-language-features/src/preview/previewConfig.ts
@@ -73,24 +73,24 @@ export class MarkdownPreviewConfiguration {
 }
 
 export class MarkdownPreviewConfigurationManager {
-	private readonly _previewConfigurationsForWorkspaces = new Map<string, MarkdownPreviewConfiguration>();
+	readonly #previewConfigurationsForWorkspaces = new Map<string, MarkdownPreviewConfiguration>();
 
 	public loadAndCacheConfiguration(
 		resource: vscode.Uri
 	): MarkdownPreviewConfiguration {
 		const config = MarkdownPreviewConfiguration.getForResource(resource);
-		this._previewConfigurationsForWorkspaces.set(this._getKey(resource), config);
+		this.#previewConfigurationsForWorkspaces.set(this.#getKey(resource), config);
 		return config;
 	}
 
 	public hasConfigurationChanged(resource: vscode.Uri): boolean {
-		const key = this._getKey(resource);
-		const currentConfig = this._previewConfigurationsForWorkspaces.get(key);
+		const key = this.#getKey(resource);
+		const currentConfig = this.#previewConfigurationsForWorkspaces.get(key);
 		const newConfig = MarkdownPreviewConfiguration.getForResource(resource);
 		return !currentConfig?.isEqualTo(newConfig);
 	}
 
-	private _getKey(
+	#getKey(
 		resource: vscode.Uri
 	): string {
 		const folder = vscode.workspace.getWorkspaceFolder(resource);
diff --git a/extensions/markdown-language-features/src/preview/previewManager.ts b/extensions/markdown-language-features/src/preview/previewManager.ts
index 3aa126da063..cc1f7fda40b 100644
--- a/extensions/markdown-language-features/src/preview/previewManager.ts
+++ b/extensions/markdown-language-features/src/preview/previewManager.ts
@@ -24,23 +24,23 @@ export interface DynamicPreviewSettings {
 
 class PreviewStore<T extends IManagedMarkdownPreview> extends Disposable {
 
-	private readonly _previews = new Set<T>();
+	readonly #previews = new Set<T>();
 
 	public override dispose(): void {
 		super.dispose();
-		for (const preview of this._previews) {
+		for (const preview of this.#previews) {
 			preview.dispose();
 		}
-		this._previews.clear();
+		this.#previews.clear();
 	}
 
 	[Symbol.iterator](): Iterator<T> {
-		return this._previews[Symbol.iterator]();
+		return this.#previews[Symbol.iterator]();
 	}
 
 	public get(resource: vscode.Uri, previewSettings: DynamicPreviewSettings): T | undefined {
-		const previewColumn = this._resolvePreviewColumn(previewSettings);
-		for (const preview of this._previews) {
+		const previewColumn = this.#resolvePreviewColumn(previewSettings);
+		for (const preview of this.#previews) {
 			if (preview.matchesResource(resource, previewColumn, previewSettings.locked)) {
 				return preview;
 			}
@@ -49,14 +49,14 @@ class PreviewStore<T extends IManagedMarkdownPreview> extends Disposable {
 	}
 
 	public add(preview: T) {
-		this._previews.add(preview);
+		this.#previews.add(preview);
 	}
 
 	public delete(preview: T) {
-		this._previews.delete(preview);
+		this.#previews.delete(preview);
 	}
 
-	private _resolvePreviewColumn(previewSettings: DynamicPreviewSettings): vscode.ViewColumn | undefined {
+	#resolvePreviewColumn(previewSettings: DynamicPreviewSettings): vscode.ViewColumn | undefined {
 		if (previewSettings.previewColumn === vscode.ViewColumn.Active) {
 			return vscode.window.tabGroups.activeTabGroup.viewColumn;
 		}
@@ -71,22 +71,32 @@ class PreviewStore<T extends IManagedMarkdownPreview> extends Disposable {
 
 export class MarkdownPreviewManager extends Disposable implements vscode.WebviewPanelSerializer, vscode.CustomTextEditorProvider {
 
-	private readonly _topmostLineMonitor = new TopmostLineMonitor();
-	private readonly _previewConfigurations = new MarkdownPreviewConfigurationManager();
+	readonly #topmostLineMonitor = new TopmostLineMonitor();
+	readonly #previewConfigurations = new MarkdownPreviewConfigurationManager();
 
-	private readonly _dynamicPreviews = this._register(new PreviewStore<DynamicMarkdownPreview>());
-	private readonly _staticPreviews = this._register(new PreviewStore<StaticMarkdownPreview>());
+	readonly #dynamicPreviews = this._register(new PreviewStore<DynamicMarkdownPreview>());
+	readonly #staticPreviews = this._register(new PreviewStore<StaticMarkdownPreview>());
 
-	private _activePreview: IManagedMarkdownPreview | undefined = undefined;
+	#activePreview: IManagedMarkdownPreview | undefined = undefined;
+
+	readonly #contentProvider: MdDocumentRenderer;
+	readonly #logger: ILogger;
+	readonly #contributions: MarkdownContributionProvider;
+	readonly #opener: MdLinkOpener;
 
 	public constructor(
-		private readonly _contentProvider: MdDocumentRenderer,
-		private readonly _logger: ILogger,
-		private readonly _contributions: MarkdownContributionProvider,
-		private readonly _opener: MdLinkOpener,
+		contentProvider: MdDocumentRenderer,
+		logger: ILogger,
+		contributions: MarkdownContributionProvider,
+		opener: MdLinkOpener,
 	) {
 		super();
 
+		this.#contentProvider = contentProvider;
+		this.#logger = logger;
+		this.#contributions = contributions;
+		this.#opener = opener;
+
 		this._register(vscode.window.registerWebviewPanelSerializer(DynamicMarkdownPreview.viewType, this));
 
 		this._register(vscode.window.registerCustomEditorProvider(StaticMarkdownPreview.customEditorViewType, this, {
@@ -96,7 +106,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		this._register(vscode.window.onDidChangeActiveTextEditor(textEditor => {
 			// When at a markdown file, apply existing scroll settings
 			if (textEditor?.document && isMarkdownFile(textEditor.document)) {
-				const line = this._topmostLineMonitor.getPreviousStaticEditorLineByUri(textEditor.document.uri);
+				const line = this.#topmostLineMonitor.getPreviousStaticEditorLineByUri(textEditor.document.uri);
 				if (typeof line === 'number') {
 					scrollEditorToLine(line, textEditor);
 				}
@@ -105,19 +115,19 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 	}
 
 	public refresh() {
-		for (const preview of this._dynamicPreviews) {
+		for (const preview of this.#dynamicPreviews) {
 			preview.refresh();
 		}
-		for (const preview of this._staticPreviews) {
+		for (const preview of this.#staticPreviews) {
 			preview.refresh();
 		}
 	}
 
 	public updateConfiguration() {
-		for (const preview of this._dynamicPreviews) {
+		for (const preview of this.#dynamicPreviews) {
 			preview.updateConfiguration();
 		}
-		for (const preview of this._staticPreviews) {
+		for (const preview of this.#staticPreviews) {
 			preview.updateConfiguration();
 		}
 	}
@@ -126,11 +136,11 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		resource: vscode.Uri,
 		settings: DynamicPreviewSettings
 	): void {
-		let preview = this._dynamicPreviews.get(resource, settings);
+		let preview = this.#dynamicPreviews.get(resource, settings);
 		if (preview) {
 			preview.reveal(settings.previewColumn);
 		} else {
-			preview = this._createNewDynamicPreview(resource, settings);
+			preview = this.#createNewDynamicPreview(resource, settings);
 		}
 
 		preview.update(
@@ -140,15 +150,15 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 	}
 
 	public get activePreviewResource() {
-		return this._activePreview?.resource;
+		return this.#activePreview?.resource;
 	}
 
 	public get activePreviewResourceColumn() {
-		return this._activePreview?.resourceColumn;
+		return this.#activePreview?.resourceColumn;
 	}
 
 	public findPreview(resource: vscode.Uri): IManagedMarkdownPreview | undefined {
-		for (const preview of [...this._dynamicPreviews, ...this._staticPreviews]) {
+		for (const preview of [...this.#dynamicPreviews, ...this.#staticPreviews]) {
 			if (preview.resource.fsPath === resource.fsPath) {
 				return preview;
 			}
@@ -157,12 +167,12 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 	}
 
 	public toggleLock() {
-		const preview = this._activePreview;
+		const preview = this.#activePreview;
 		if (preview instanceof DynamicMarkdownPreview) {
 			preview.toggleLock();
 
 			// Close any previews that are now redundant, such as having two dynamic previews in the same editor group
-			for (const otherPreview of this._dynamicPreviews) {
+			for (const otherPreview of this.#dynamicPreviews) {
 				if (otherPreview !== preview && preview.matches(otherPreview)) {
 					otherPreview.dispose();
 				}
@@ -172,7 +182,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 
 	public openDocumentLink(linkText: string, fromResource: vscode.Uri) {
 		const viewColumn = this.findPreview(fromResource)?.resourceColumn;
-		return this._opener.openDocumentLink(linkText, fromResource, viewColumn);
+		return this.#opener.openDocumentLink(linkText, fromResource, viewColumn);
 	}
 
 	public async deserializeWebviewPanel(
@@ -188,14 +198,14 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			const preview = DynamicMarkdownPreview.revive(
 				{ resource, locked, line, resourceColumn },
 				webview,
-				this._contentProvider,
-				this._previewConfigurations,
-				this._logger,
-				this._topmostLineMonitor,
-				this._contributions,
-				this._opener);
+				this.#contentProvider,
+				this.#previewConfigurations,
+				this.#logger,
+				this.#topmostLineMonitor,
+				this.#contributions,
+				this.#opener);
 
-			this._registerDynamicPreview(preview);
+			this.#registerDynamicPreview(preview);
 		} catch (e) {
 			console.error(e);
 
@@ -237,23 +247,23 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		document: vscode.TextDocument,
 		webview: vscode.WebviewPanel
 	): Promise<void> {
-		const lineNumber = this._topmostLineMonitor.getPreviousStaticTextEditorLineByUri(document.uri);
+		const lineNumber = this.#topmostLineMonitor.getPreviousStaticTextEditorLineByUri(document.uri);
 		const preview = StaticMarkdownPreview.revive(
 			document.uri,
 			webview,
-			this._contentProvider,
-			this._previewConfigurations,
-			this._topmostLineMonitor,
-			this._logger,
-			this._contributions,
-			this._opener,
+			this.#contentProvider,
+			this.#previewConfigurations,
+			this.#topmostLineMonitor,
+			this.#logger,
+			this.#contributions,
+			this.#opener,
 			lineNumber
 		);
-		this._registerStaticPreview(preview);
-		this._activePreview = preview;
+		this.#registerStaticPreview(preview);
+		this.#activePreview = preview;
 	}
 
-	private _createNewDynamicPreview(
+	#createNewDynamicPreview(
 		resource: vscode.Uri,
 		previewSettings: DynamicPreviewSettings
 	): DynamicMarkdownPreview {
@@ -267,52 +277,52 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 				line: scrollLine,
 			},
 			previewSettings.previewColumn,
-			this._contentProvider,
-			this._previewConfigurations,
-			this._logger,
-			this._topmostLineMonitor,
-			this._contributions,
-			this._opener);
+			this.#contentProvider,
+			this.#previewConfigurations,
+			this.#logger,
+			this.#topmostLineMonitor,
+			this.#contributions,
+			this.#opener);
 
-		this._activePreview = preview;
-		return this._registerDynamicPreview(preview);
+		this.#activePreview = preview;
+		return this.#registerDynamicPreview(preview);
 	}
 
-	private _registerDynamicPreview(preview: DynamicMarkdownPreview): DynamicMarkdownPreview {
-		this._dynamicPreviews.add(preview);
+	#registerDynamicPreview(preview: DynamicMarkdownPreview): DynamicMarkdownPreview {
+		this.#dynamicPreviews.add(preview);
 
 		preview.onDispose(() => {
-			this._dynamicPreviews.delete(preview);
+			this.#dynamicPreviews.delete(preview);
 		});
 
-		this._trackActive(preview);
+		this.#trackActive(preview);
 
 		preview.onDidChangeViewState(() => {
 			// Remove other dynamic previews in our column
-			disposeAll(Array.from(this._dynamicPreviews).filter(otherPreview => preview !== otherPreview && preview.matches(otherPreview)));
+			disposeAll(Array.from(this.#dynamicPreviews).filter(otherPreview => preview !== otherPreview && preview.matches(otherPreview)));
 		});
 		return preview;
 	}
 
-	private _registerStaticPreview(preview: StaticMarkdownPreview): StaticMarkdownPreview {
-		this._staticPreviews.add(preview);
+	#registerStaticPreview(preview: StaticMarkdownPreview): StaticMarkdownPreview {
+		this.#staticPreviews.add(preview);
 
 		preview.onDispose(() => {
-			this._staticPreviews.delete(preview);
+			this.#staticPreviews.delete(preview);
 		});
 
-		this._trackActive(preview);
+		this.#trackActive(preview);
 		return preview;
 	}
 
-	private _trackActive(preview: IManagedMarkdownPreview): void {
+	#trackActive(preview: IManagedMarkdownPreview): void {
 		preview.onDidChangeViewState(({ webviewPanel }) => {
-			this._activePreview = webviewPanel.active ? preview : undefined;
+			this.#activePreview = webviewPanel.active ? preview : undefined;
 		});
 
 		preview.onDispose(() => {
-			if (this._activePreview === preview) {
-				this._activePreview = undefined;
+			if (this.#activePreview === preview) {
+				this.#activePreview = undefined;
 			}
 		});
 	}
diff --git a/extensions/markdown-language-features/src/preview/security.ts b/extensions/markdown-language-features/src/preview/security.ts
index 0ba1a9f61f0..292e19563c9 100644
--- a/extensions/markdown-language-features/src/preview/security.ts
+++ b/extensions/markdown-language-features/src/preview/security.ts
@@ -27,31 +27,37 @@ export interface ContentSecurityPolicyArbiter {
 }
 
 export class ExtensionContentSecurityPolicyArbiter implements ContentSecurityPolicyArbiter {
-	private readonly _old_trusted_workspace_key = 'trusted_preview_workspace:';
-	private readonly _security_level_key = 'preview_security_level:';
-	private readonly _should_disable_security_warning_key = 'preview_should_show_security_warning:';
+	readonly #old_trusted_workspace_key = 'trusted_preview_workspace:';
+	readonly #security_level_key = 'preview_security_level:';
+	readonly #should_disable_security_warning_key = 'preview_should_show_security_warning:';
+
+	readonly #globalState: vscode.Memento;
+	readonly #workspaceState: vscode.Memento;
 
 	constructor(
-		private readonly _globalState: vscode.Memento,
-		private readonly _workspaceState: vscode.Memento
-	) { }
+		globalState: vscode.Memento,
+		workspaceState: vscode.Memento
+	) {
+		this.#globalState = globalState;
+		this.#workspaceState = workspaceState;
+	}
 
 	public getSecurityLevelForResource(resource: vscode.Uri): MarkdownPreviewSecurityLevel {
 		// Use new security level setting first
-		const level = this._globalState.get<MarkdownPreviewSecurityLevel | undefined>(this._security_level_key + this._getRoot(resource), undefined);
+		const level = this.#globalState.get<MarkdownPreviewSecurityLevel | undefined>(this.#security_level_key + this.#getRoot(resource), undefined);
 		if (typeof level !== 'undefined') {
 			return level;
 		}
 
 		// Fallback to old trusted workspace setting
-		if (this._globalState.get<boolean>(this._old_trusted_workspace_key + this._getRoot(resource), false)) {
+		if (this.#globalState.get<boolean>(this.#old_trusted_workspace_key + this.#getRoot(resource), false)) {
 			return MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent;
 		}
 		return MarkdownPreviewSecurityLevel.Strict;
 	}
 
 	public setSecurityLevelForResource(resource: vscode.Uri, level: MarkdownPreviewSecurityLevel): Thenable<void> {
-		return this._globalState.update(this._security_level_key + this._getRoot(resource), level);
+		return this.#globalState.update(this.#security_level_key + this.#getRoot(resource), level);
 	}
 
 	public shouldAllowSvgsForResource(resource: vscode.Uri) {
@@ -60,14 +66,14 @@ export class ExtensionContentSecurityPolicyArbiter implements ContentSecurityPol
 	}
 
 	public shouldDisableSecurityWarnings(): boolean {
-		return this._workspaceState.get<boolean>(this._should_disable_security_warning_key, false);
+		return this.#workspaceState.get<boolean>(this.#should_disable_security_warning_key, false);
 	}
 
 	public setShouldDisableSecurityWarning(disabled: boolean): Thenable<void> {
-		return this._workspaceState.update(this._should_disable_security_warning_key, disabled);
+		return this.#workspaceState.update(this.#should_disable_security_warning_key, disabled);
 	}
 
-	private _getRoot(resource: vscode.Uri): vscode.Uri {
+	#getRoot(resource: vscode.Uri): vscode.Uri {
 		if (vscode.workspace.workspaceFolders) {
 			const folderForResource = vscode.workspace.getWorkspaceFolder(resource);
 			if (folderForResource) {
@@ -85,10 +91,16 @@ export class ExtensionContentSecurityPolicyArbiter implements ContentSecurityPol
 
 export class PreviewSecuritySelector {
 
+	readonly #cspArbiter: ContentSecurityPolicyArbiter;
+	readonly #webviewManager: MarkdownPreviewManager;
+
 	public constructor(
-		private readonly _cspArbiter: ContentSecurityPolicyArbiter,
-		private readonly _webviewManager: MarkdownPreviewManager
-	) { }
+		cspArbiter: ContentSecurityPolicyArbiter,
+		webviewManager: MarkdownPreviewManager
+	) {
+		this.#cspArbiter = cspArbiter;
+		this.#webviewManager = webviewManager;
+	}
 
 	public async showSecuritySelectorForResource(resource: vscode.Uri): Promise<void> {
 		interface PreviewSecurityPickItem extends vscode.QuickPickItem {
@@ -99,7 +111,7 @@ export class PreviewSecuritySelector {
 			return when ? '• ' : '';
 		}
 
-		const currentSecurityLevel = this._cspArbiter.getSecurityLevelForResource(resource);
+		const currentSecurityLevel = this.#cspArbiter.getSecurityLevelForResource(resource);
 		const selection = await vscode.window.showQuickPick<PreviewSecurityPickItem>(
 			[
 				{
@@ -124,7 +136,7 @@ export class PreviewSecuritySelector {
 					description: ''
 				}, {
 					type: 'toggle',
-					label: this._cspArbiter.shouldDisableSecurityWarnings()
+					label: this.#cspArbiter.shouldDisableSecurityWarnings()
 						? vscode.l10n.t("Enable preview security warnings in this workspace")
 						: vscode.l10n.t("Disable preview security warning in this workspace"),
 					description: vscode.l10n.t("Does not affect the content security level")
@@ -142,12 +154,12 @@ export class PreviewSecuritySelector {
 		}
 
 		if (selection.type === 'toggle') {
-			this._cspArbiter.setShouldDisableSecurityWarning(!this._cspArbiter.shouldDisableSecurityWarnings());
-			this._webviewManager.refresh();
+			this.#cspArbiter.setShouldDisableSecurityWarning(!this.#cspArbiter.shouldDisableSecurityWarnings());
+			this.#webviewManager.refresh();
 			return;
 		} else {
-			await this._cspArbiter.setSecurityLevelForResource(resource, selection.type);
+			await this.#cspArbiter.setSecurityLevelForResource(resource, selection.type);
 		}
-		this._webviewManager.refresh();
+		this.#webviewManager.refresh();
 	}
 }
diff --git a/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts b/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
index d676fa9ffbc..59fdbb13cfd 100644
--- a/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
+++ b/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
@@ -15,10 +15,10 @@ export interface LastScrollLocation {
 
 export class TopmostLineMonitor extends Disposable {
 
-	private readonly _pendingUpdates = new ResourceMap<number>();
-	private readonly _throttle = 50;
-	private readonly _previousTextEditorInfo = new ResourceMap<LastScrollLocation>();
-	private readonly _previousStaticEditorInfo = new ResourceMap<LastScrollLocation>();
+	readonly #pendingUpdates = new ResourceMap<number>();
+	readonly #throttle = 50;
+	readonly #previousTextEditorInfo = new ResourceMap<LastScrollLocation>();
+	readonly #previousStaticEditorInfo = new ResourceMap<LastScrollLocation>();
 
 	constructor() {
 		super();
@@ -39,32 +39,32 @@ export class TopmostLineMonitor extends Disposable {
 		}));
 	}
 
-	private readonly _onChanged = this._register(new vscode.EventEmitter<{ readonly resource: vscode.Uri; readonly line: number }>());
-	public readonly onDidChanged = this._onChanged.event;
+	readonly #onChanged = this._register(new vscode.EventEmitter<{ readonly resource: vscode.Uri; readonly line: number }>());
+	public readonly onDidChanged = this.#onChanged.event;
 
 	public setPreviousStaticEditorLine(scrollLocation: LastScrollLocation): void {
-		this._previousStaticEditorInfo.set(scrollLocation.uri, scrollLocation);
+		this.#previousStaticEditorInfo.set(scrollLocation.uri, scrollLocation);
 	}
 
 	public getPreviousStaticEditorLineByUri(resource: vscode.Uri): number | undefined {
-		const scrollLoc = this._previousStaticEditorInfo.get(resource);
-		this._previousStaticEditorInfo.delete(resource);
+		const scrollLoc = this.#previousStaticEditorInfo.get(resource);
+		this.#previousStaticEditorInfo.delete(resource);
 		return scrollLoc?.line;
 	}
 
 
 	public setPreviousTextEditorLine(scrollLocation: LastScrollLocation): void {
-		this._previousTextEditorInfo.set(scrollLocation.uri, scrollLocation);
+		this.#previousTextEditorInfo.set(scrollLocation.uri, scrollLocation);
 	}
 
 	public getPreviousTextEditorLineByUri(resource: vscode.Uri): number | undefined {
-		const scrollLoc = this._previousTextEditorInfo.get(resource);
-		this._previousTextEditorInfo.delete(resource);
+		const scrollLoc = this.#previousTextEditorInfo.get(resource);
+		this.#previousTextEditorInfo.delete(resource);
 		return scrollLoc?.line;
 	}
 
 	public getPreviousStaticTextEditorLineByUri(resource: vscode.Uri): number | undefined {
-		const state = this._previousStaticEditorInfo.get(resource);
+		const state = this.#previousStaticEditorInfo.get(resource);
 		return state?.line;
 	}
 
@@ -72,20 +72,20 @@ export class TopmostLineMonitor extends Disposable {
 		resource: vscode.Uri,
 		line: number
 	) {
-		if (!this._pendingUpdates.has(resource)) {
+		if (!this.#pendingUpdates.has(resource)) {
 			// schedule update
 			setTimeout(() => {
-				if (this._pendingUpdates.has(resource)) {
-					this._onChanged.fire({
+				if (this.#pendingUpdates.has(resource)) {
+					this.#onChanged.fire({
 						resource,
-						line: this._pendingUpdates.get(resource) as number
+						line: this.#pendingUpdates.get(resource) as number
 					});
-					this._pendingUpdates.delete(resource);
+					this.#pendingUpdates.delete(resource);
 				}
-			}, this._throttle);
+			}, this.#throttle);
 		}
 
-		this._pendingUpdates.set(resource, line);
+		this.#pendingUpdates.set(resource, line);
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/telemetryReporter.ts b/extensions/markdown-language-features/src/telemetryReporter.ts
index 808acc4ceab..059e468aa54 100644
--- a/extensions/markdown-language-features/src/telemetryReporter.ts
+++ b/extensions/markdown-language-features/src/telemetryReporter.ts
@@ -24,21 +24,21 @@ const nullReporter = new class NullTelemetryReporter implements TelemetryReporte
 };
 
 class ExtensionReporter implements TelemetryReporter {
-	private readonly _reporter: VSCodeTelemetryReporter;
+	readonly #reporter: VSCodeTelemetryReporter;
 
 	constructor(
 		packageInfo: IPackageInfo
 	) {
-		this._reporter = new VSCodeTelemetryReporter(packageInfo.aiKey);
+		this.#reporter = new VSCodeTelemetryReporter(packageInfo.aiKey);
 	}
 	sendTelemetryEvent(eventName: string, properties?: {
 		[key: string]: string;
 	}) {
-		this._reporter.sendTelemetryEvent(eventName, properties);
+		this.#reporter.sendTelemetryEvent(eventName, properties);
 	}
 
 	dispose() {
-		this._reporter.dispose();
+		this.#reporter.dispose();
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/test/engine.ts b/extensions/markdown-language-features/src/test/engine.ts
index 31d780850b5..7778ab7b05f 100644
--- a/extensions/markdown-language-features/src/test/engine.ts
+++ b/extensions/markdown-language-features/src/test/engine.ts
@@ -13,11 +13,11 @@ const emptyContributions = new class implements MarkdownContributionProvider {
 	readonly extensionUri = vscode.Uri.file('/');
 	readonly contributions = MarkdownContributions.Empty;
 
-	private readonly _onContributionsChanged = new vscode.EventEmitter<this>();
-	readonly onContributionsChanged = this._onContributionsChanged.event;
+	readonly #onContributionsChanged = new vscode.EventEmitter<this>();
+	readonly onContributionsChanged = this.#onContributionsChanged.event;
 
 	dispose() {
-		this._onContributionsChanged.dispose();
+		this.#onContributionsChanged.dispose();
 	}
 };
 
diff --git a/extensions/markdown-language-features/src/util/async.ts b/extensions/markdown-language-features/src/util/async.ts
index 49bcbe6402b..90b2a40ed2c 100644
--- a/extensions/markdown-language-features/src/util/async.ts
+++ b/extensions/markdown-language-features/src/util/async.ts
@@ -10,55 +10,55 @@ export interface ITask<T> {
 export class Delayer<T> {
 
 	public defaultDelay: number;
-	private _timeout: any; // Timer
-	private _cancelTimeout: Promise<T | null> | null;
-	private _onSuccess: ((value: T | PromiseLike<T> | undefined) => void) | null;
-	private _task: ITask<T> | null;
+	#timeout: any; // Timer
+	#cancelTimeout: Promise<T | null> | null;
+	#onSuccess: ((value: T | PromiseLike<T> | undefined) => void) | null;
+	#task: ITask<T> | null;
 
 	constructor(defaultDelay: number) {
 		this.defaultDelay = defaultDelay;
-		this._timeout = null;
-		this._cancelTimeout = null;
-		this._onSuccess = null;
-		this._task = null;
+		this.#timeout = null;
+		this.#cancelTimeout = null;
+		this.#onSuccess = null;
+		this.#task = null;
 	}
 
 	dispose() {
-		this._doCancelTimeout();
+		this.#doCancelTimeout();
 	}
 
 	public trigger(task: ITask<T>, delay: number = this.defaultDelay): Promise<T | null> {
-		this._task = task;
+		this.#task = task;
 		if (delay >= 0) {
-			this._doCancelTimeout();
+			this.#doCancelTimeout();
 		}
 
-		if (!this._cancelTimeout) {
-			this._cancelTimeout = new Promise<T | undefined>((resolve) => {
-				this._onSuccess = resolve;
+		if (!this.#cancelTimeout) {
+			this.#cancelTimeout = new Promise<T | undefined>((resolve) => {
+				this.#onSuccess = resolve;
 			}).then(() => {
-				this._cancelTimeout = null;
-				this._onSuccess = null;
-				const result = this._task?.() ?? null;
-				this._task = null;
+				this.#cancelTimeout = null;
+				this.#onSuccess = null;
+				const result = this.#task?.() ?? null;
+				this.#task = null;
 				return result;
 			});
 		}
 
-		if (delay >= 0 || this._timeout === null) {
-			this._timeout = setTimeout(() => {
-				this._timeout = null;
-				this._onSuccess?.(undefined);
+		if (delay >= 0 || this.#timeout === null) {
+			this.#timeout = setTimeout(() => {
+				this.#timeout = null;
+				this.#onSuccess?.(undefined);
 			}, delay >= 0 ? delay : this.defaultDelay);
 		}
 
-		return this._cancelTimeout;
+		return this.#cancelTimeout;
 	}
 
-	private _doCancelTimeout(): void {
-		if (this._timeout !== null) {
-			clearTimeout(this._timeout);
-			this._timeout = null;
+	#doCancelTimeout(): void {
+		if (this.#timeout !== null) {
+			clearTimeout(this.#timeout);
+			this.#timeout = null;
 		}
 	}
 }
diff --git a/extensions/markdown-language-features/src/util/cancellation.ts b/extensions/markdown-language-features/src/util/cancellation.ts
index 45556cb6f1d..a0aa6583864 100644
--- a/extensions/markdown-language-features/src/util/cancellation.ts
+++ b/extensions/markdown-language-features/src/util/cancellation.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 
 export const noopToken: vscode.CancellationToken = new class implements vscode.CancellationToken {
-	private readonly _onCancellationRequestedEmitter = new vscode.EventEmitter<void>();
-	onCancellationRequested = this._onCancellationRequestedEmitter.event;
+	readonly #onCancellationRequestedEmitter = new vscode.EventEmitter<void>();
+	onCancellationRequested = this.#onCancellationRequestedEmitter.event;
 
 	get isCancellationRequested() { return false; }
 };
diff --git a/extensions/markdown-language-features/src/util/dispose.ts b/extensions/markdown-language-features/src/util/dispose.ts
index f222642908e..064302623fd 100644
--- a/extensions/markdown-language-features/src/util/dispose.ts
+++ b/extensions/markdown-language-features/src/util/dispose.ts
@@ -28,20 +28,20 @@ export interface IDisposable {
 }
 
 export abstract class Disposable {
-	private _isDisposed = false;
+	#isDisposed = false;
 
 	protected _disposables: vscode.Disposable[] = [];
 
 	public dispose(): any {
-		if (this._isDisposed) {
+		if (this.#isDisposed) {
 			return;
 		}
-		this._isDisposed = true;
+		this.#isDisposed = true;
 		disposeAll(this._disposables);
 	}
 
 	protected _register<T extends IDisposable>(value: T): T {
-		if (this._isDisposed) {
+		if (this.#isDisposed) {
 			value.dispose();
 		} else {
 			this._disposables.push(value);
@@ -50,6 +50,6 @@ export abstract class Disposable {
 	}
 
 	protected get isDisposed() {
-		return this._isDisposed;
+		return this.#isDisposed;
 	}
 }
diff --git a/extensions/markdown-language-features/src/util/openDocumentLink.ts b/extensions/markdown-language-features/src/util/openDocumentLink.ts
index 285dd91029b..20c0343171f 100644
--- a/extensions/markdown-language-features/src/util/openDocumentLink.ts
+++ b/extensions/markdown-language-features/src/util/openDocumentLink.ts
@@ -14,21 +14,38 @@ enum OpenMarkdownLinks {
 
 export class MdLinkOpener {
 
+	readonly #client: MdLanguageClient;
+
 	constructor(
-		private readonly _client: MdLanguageClient,
-	) { }
+		client: MdLanguageClient,
+	) {
+		this.#client = client;
+	}
 
 	public async resolveDocumentLink(linkText: string, fromResource: vscode.Uri): Promise<proto.ResolvedDocumentLinkTarget> {
-		return this._client.resolveLinkTarget(linkText, fromResource);
+		return this.#client.resolveLinkTarget(linkText, fromResource);
 	}
 
 	public async openDocumentLink(linkText: string, fromResource: vscode.Uri, viewColumn?: vscode.ViewColumn): Promise<void> {
-		const resolved = await this._client.resolveLinkTarget(linkText, fromResource);
+		const resolved = await this.#client.resolveLinkTarget(linkText, fromResource);
 		if (!resolved) {
 			return;
 		}
 
-		const uri = vscode.Uri.from(resolved.uri);
+		let uri = vscode.Uri.from(resolved.uri);
+		let rangeSelection: vscode.Range | undefined;
+		if (resolved.kind === 'file' && !resolved.position) {
+			if (uri.fragment) {
+				rangeSelection = getSelectionFromLocationFragment(uri.fragment);
+			} else {
+				const locationFragment = getLocationFragmentFromLinkText(linkText);
+				if (locationFragment) {
+					uri = uri.with({ fragment: locationFragment });
+					rangeSelection = getSelectionFromLocationFragment(locationFragment);
+				}
+			}
+		}
+
 		switch (resolved.kind) {
 			case 'external':
 				return vscode.commands.executeCommand('vscode.open', uri);
@@ -50,7 +67,9 @@ export class MdLinkOpener {
 				}
 
 				return vscode.commands.executeCommand('vscode.open', uri, {
-					selection: resolved.position ? new vscode.Range(resolved.position.line, resolved.position.character, resolved.position.line, resolved.position.character) : undefined,
+					selection: resolved.position
+						? new vscode.Range(resolved.position.line, resolved.position.character, resolved.position.line, resolved.position.character)
+						: rangeSelection,
 					viewColumn: viewColumn ?? getViewColumn(fromResource),
 				} satisfies vscode.TextDocumentShowOptions);
 			}
@@ -58,6 +77,72 @@ export class MdLinkOpener {
 	}
 }
 
+function getSelectionFromLocationFragment(fragment: string): vscode.Range | undefined {
+	const match = /^L?(\d+)(?:,(\d+))?(?:-L?(\d+)(?:,(\d+))?)?$/i.exec(fragment);
+	if (!match) {
+		return undefined;
+	}
+
+	const startLineNumber = parseInt(match[1], 10);
+	if (isNaN(startLineNumber) || startLineNumber <= 0) {
+		return undefined;
+	}
+
+	const startColumn = match[2] ? parseInt(match[2], 10) : 1;
+	const endLineNumberRaw = match[3] ? parseInt(match[3], 10) : undefined;
+	if (typeof endLineNumberRaw !== 'undefined' && endLineNumberRaw <= 0) {
+		return undefined;
+	}
+	const endLineNumber = endLineNumberRaw;
+	const endColumn = match[3] ? (match[4] ? parseInt(match[4], 10) : 1) : undefined;
+
+	let normalizedStartLine = startLineNumber;
+	let normalizedStartColumn = startColumn;
+	let normalizedEndLine = endLineNumber;
+	let normalizedEndColumn = endColumn ?? 1;
+
+	if (typeof normalizedEndLine === 'number') {
+		if (normalizedEndLine < normalizedStartLine || (normalizedEndLine === normalizedStartLine && normalizedEndColumn < normalizedStartColumn)) {
+			const tmpLine = normalizedStartLine;
+			const tmpColumn = normalizedStartColumn;
+			normalizedStartLine = normalizedEndLine;
+			normalizedStartColumn = normalizedEndColumn;
+			normalizedEndLine = tmpLine;
+			normalizedEndColumn = tmpColumn;
+		}
+	}
+
+	const start = new vscode.Position(normalizedStartLine - 1, Math.max(0, normalizedStartColumn - 1));
+	const end = typeof normalizedEndLine === 'number'
+		? new vscode.Position(normalizedEndLine - 1, Math.max(0, normalizedEndColumn - 1))
+		: start;
+
+	return new vscode.Range(start, end);
+}
+
+function getLocationFragmentFromLinkText(linkText: string): string | undefined {
+	const fragmentStart = linkText.indexOf('#');
+	if (fragmentStart < 0) {
+		return undefined;
+	}
+
+	let fragment: string;
+	try {
+		fragment = decodeURIComponent(linkText.slice(fragmentStart + 1));
+	} catch {
+		return undefined;
+	}
+	if (!fragment) {
+		return undefined;
+	}
+
+	if (/^L?\d+(?:,\d+)?(?:-L?\d+(?:,\d+)?)?$/i.test(fragment)) {
+		return fragment;
+	}
+
+	return undefined;
+}
+
 function getViewColumn(resource: vscode.Uri): vscode.ViewColumn {
 	const config = vscode.workspace.getConfiguration('markdown', resource);
 	const openLinks = config.get<OpenMarkdownLinks>('links.openLocation', OpenMarkdownLinks.currentGroup);
diff --git a/extensions/markdown-language-features/src/util/resourceMap.ts b/extensions/markdown-language-features/src/util/resourceMap.ts
index 99dd71a8718..10eb8e22890 100644
--- a/extensions/markdown-language-features/src/util/resourceMap.ts
+++ b/extensions/markdown-language-features/src/util/resourceMap.ts
@@ -11,53 +11,53 @@ const defaultResourceToKey = (resource: vscode.Uri): string => resource.toString
 
 export class ResourceMap<T> {
 
-	private readonly _map = new Map<string, { readonly uri: vscode.Uri; readonly value: T }>();
+	readonly #map = new Map<string, { readonly uri: vscode.Uri; readonly value: T }>();
 
-	private readonly _toKey: ResourceToKey;
+	readonly #toKey: ResourceToKey;
 
 	constructor(toKey: ResourceToKey = defaultResourceToKey) {
-		this._toKey = toKey;
+		this.#toKey = toKey;
 	}
 
 	public set(uri: vscode.Uri, value: T): this {
-		this._map.set(this._toKey(uri), { uri, value });
+		this.#map.set(this.#toKey(uri), { uri, value });
 		return this;
 	}
 
 	public get(resource: vscode.Uri): T | undefined {
-		return this._map.get(this._toKey(resource))?.value;
+		return this.#map.get(this.#toKey(resource))?.value;
 	}
 
 	public has(resource: vscode.Uri): boolean {
-		return this._map.has(this._toKey(resource));
+		return this.#map.has(this.#toKey(resource));
 	}
 
 	public get size(): number {
-		return this._map.size;
+		return this.#map.size;
 	}
 
 	public clear(): void {
-		this._map.clear();
+		this.#map.clear();
 	}
 
 	public delete(resource: vscode.Uri): boolean {
-		return this._map.delete(this._toKey(resource));
+		return this.#map.delete(this.#toKey(resource));
 	}
 
 	public *values(): IterableIterator<T> {
-		for (const entry of this._map.values()) {
+		for (const entry of this.#map.values()) {
 			yield entry.value;
 		}
 	}
 
 	public *keys(): IterableIterator<vscode.Uri> {
-		for (const entry of this._map.values()) {
+		for (const entry of this.#map.values()) {
 			yield entry.uri;
 		}
 	}
 
 	public *entries(): IterableIterator<[vscode.Uri, T]> {
-		for (const entry of this._map.values()) {
+		for (const entry of this.#map.values()) {
 			yield [entry.uri, entry.value];
 		}
 	}
diff --git a/extensions/markdown-language-features/src/util/resources.ts b/extensions/markdown-language-features/src/util/resources.ts
index f1f2d0886ab..3edb0bdf48f 100644
--- a/extensions/markdown-language-features/src/util/resources.ts
+++ b/extensions/markdown-language-features/src/util/resources.ts
@@ -11,3 +11,22 @@ export interface WebviewResourceProvider {
 	readonly cspSource: string;
 }
 
+export function areUrisEqual(uri1: vscode.Uri, uri2: vscode.Uri): boolean {
+	if (uri1.scheme !== uri2.scheme) {
+		return false;
+	}
+
+	if (uri1.authority !== uri2.authority) {
+		return false;
+	}
+
+	if (uri1.scheme === 'file') {
+		if (process.platform === 'win32') {
+			return uri1.fsPath.toLowerCase() === uri2.fsPath.toLowerCase();
+		}
+
+		return uri1.fsPath === uri2.fsPath;
+	}
+
+	return uri1.toString() === uri2.toString();
+}
diff --git a/extensions/markdown-math/.npmrc b/extensions/markdown-math/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/markdown-math/.npmrc
+++ b/extensions/markdown-math/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/media-preview/.npmrc b/extensions/media-preview/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/media-preview/.npmrc
+++ b/extensions/media-preview/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/merge-conflict/.npmrc b/extensions/merge-conflict/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/merge-conflict/.npmrc
+++ b/extensions/merge-conflict/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/mermaid-chat-features/.npmrc b/extensions/mermaid-chat-features/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/mermaid-chat-features/.npmrc
+++ b/extensions/mermaid-chat-features/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/microsoft-authentication/.npmrc b/extensions/microsoft-authentication/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/microsoft-authentication/.npmrc
+++ b/extensions/microsoft-authentication/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/notebook-renderers/.npmrc b/extensions/notebook-renderers/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/notebook-renderers/.npmrc
+++ b/extensions/notebook-renderers/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/notebook-renderers/package-lock.json b/extensions/notebook-renderers/package-lock.json
index 7908a9bf049..d567d591ea8 100644
--- a/extensions/notebook-renderers/package-lock.json
+++ b/extensions/notebook-renderers/package-lock.json
@@ -605,9 +605,9 @@
 			}
 		},
 		"node_modules/undici": {
-			"version": "7.22.0",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-7.22.0.tgz",
-			"integrity": "sha512-RqslV2Us5BrllB+JeiZnK4peryVTndy9Dnqq62S3yYRRTj0tFQCwEniUy2167skdGOy3vqRzEvl1Dm4sV2ReDg==",
+			"version": "7.24.1",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-7.24.1.tgz",
+			"integrity": "sha512-5xoBibbmnjlcR3jdqtY2Lnx7WbrD/tHlT01TmvqZUFVc9Q1w4+j5hbnapTqbcXITMH1ovjq/W7BkqBilHiVAaA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
diff --git a/extensions/npm/.npmrc b/extensions/npm/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/npm/.npmrc
+++ b/extensions/npm/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 7db2ec0e2d5..81985c8b294 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -295,7 +295,7 @@
           "default": false,
           "scope": "resource",
           "deprecationMessage": "The NPM Script Explorer is now available in 'Views' menu in the Explorer in all folders.",
-          "description": "%config.npm.enableScriptExplorer%"
+          "markdownDescription": "%config.npm.enableScriptExplorer%"
         },
         "npm.enableRunFromFolder": {
           "type": "boolean",
@@ -333,7 +333,7 @@
         },
         "npm.scriptHover": {
           "type": "boolean",
-          "description": "%config.npm.scriptHover%",
+          "markdownDescription": "%config.npm.scriptHover%",
           "default": true,
           "scope": "window"
         }
diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
index 56a77ff4f82..1235a5519c1 100644
--- a/extensions/npm/package.nls.json
+++ b/extensions/npm/package.nls.json
@@ -19,12 +19,12 @@
 	"config.npm.scriptRunner.node": "Use Node.js as the script runner.",
 	"config.npm.scriptRunner.auto": "Auto-detect which script runner to use based on lock files and installed package managers.",
 	"config.npm.exclude": "Configure glob patterns for folders that should be excluded from automatic script detection.",
-	"config.npm.enableScriptExplorer": "Enable an explorer view for npm scripts when there is no top-level 'package.json' file.",
+	"config.npm.enableScriptExplorer": "Enable an explorer view for npm scripts when there is no top-level `package.json` file.",
 	"config.npm.scriptExplorerAction": "The default click action used in the NPM Scripts Explorer: `open` or `run`, the default is `open`.",
 	"config.npm.scriptExplorerExclude": "An array of regular expressions that indicate which scripts should be excluded from the NPM Scripts view.",
 	"config.npm.enableRunFromFolder": "Enable running npm scripts contained in a folder from the Explorer context menu.",
 	"config.npm.fetchOnlinePackageInfo": "Fetch data from https://registry.npmjs.org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.",
-	"config.npm.scriptHover": "Display hover with 'Run' and 'Debug' commands for scripts.",
+	"config.npm.scriptHover": "Display hover with `Run` and `Debug` commands for scripts.",
 	"npm.parseError": "Npm task detection: failed to parse the file {0}",
 	"taskdef.script": "The npm script to customize.",
 	"taskdef.path": "The path to the folder of the package.json file that provides the script. Can be omitted.",
diff --git a/extensions/php-language-features/.npmrc b/extensions/php-language-features/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/php-language-features/.npmrc
+++ b/extensions/php-language-features/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json
index 1fe92816e2c..df48ca23b5d 100644
--- a/extensions/php/cgmanifest.json
+++ b/extensions/php/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-php",
 					"repositoryUrl": "https://github.com/KapitanOczywisty/language-php",
-					"commitHash": "a0f3d9a3b0d017181455ed515e48a36607a90e3b"
+					"commitHash": "cd607a522b79c457fe78bf7a1b04511d1c49f693"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index afa1a5bbb67..1434a4e0cae 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/KapitanOczywisty/language-php/commit/a0f3d9a3b0d017181455ed515e48a36607a90e3b",
+	"version": "https://github.com/KapitanOczywisty/language-php/commit/cd607a522b79c457fe78bf7a1b04511d1c49f693",
 	"scopeName": "source.php",
 	"patterns": [
 		{
@@ -118,7 +118,7 @@
 							"include": "#scope-resolution"
 						},
 						{
-							"match": "(?xi)\n\\b(as)\n\\s+(final|abstract|public|private|protected|static)\n\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+							"match": "(?xi)\n\\b(as)\n\\s+(\n  (final|abstract)\n  |(public|private|protected)\n  |(static)\n)\n\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 							"captures": {
 								"1": {
 									"name": "keyword.other.use-as.php"
@@ -127,6 +127,15 @@
 									"name": "storage.modifier.php"
 								},
 								"3": {
+									"name": "storage.modifier.inheritance.${3:/downcase}.php"
+								},
+								"4": {
+									"name": "storage.modifier.visibility.${4:/downcase}.php"
+								},
+								"5": {
+									"name": "storage.modifier.static.php"
+								},
+								"6": {
 									"name": "entity.other.alias.php"
 								}
 							}
@@ -140,8 +149,19 @@
 								"2": {
 									"patterns": [
 										{
-											"match": "^(?:final|abstract|public|private|protected|static)$",
-											"name": "storage.modifier.php"
+											"match": "(?xi)\n\\b(?:\n  (final|abstract)\n  |(public|private|protected)\n  |(static)\n)\\b",
+											"name": "storage.modifier.php",
+											"captures": {
+												"1": {
+													"name": "storage.modifier.inheritance.${1:/downcase}.php"
+												},
+												"2": {
+													"name": "storage.modifier.visibility.${2:/downcase}.php"
+												},
+												"3": {
+													"name": "storage.modifier.static.php"
+												}
+											}
 										},
 										{
 											"match": ".+",
@@ -299,12 +319,15 @@
 					"contentName": "meta.enum.body.php",
 					"patterns": [
 						{
-							"match": "(?i)\\b(case)\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
+							"match": "(?i)\\b((case))\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)",
 							"captures": {
 								"1": {
 									"name": "storage.modifier.php"
 								},
 								"2": {
+									"name": "storage.type.enum.case.php"
+								},
+								"3": {
 									"name": "constant.enum.php"
 								}
 							}
@@ -320,17 +343,21 @@
 			]
 		},
 		{
-			"begin": "(?ix)\n(?:\n  \\b((?:(?:final|abstract|readonly)\\s+)*)(class)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*(?:(readonly)\\s+)?\\b(class)\\b # anonymous class\n)",
+			"begin": "(?ix)\n(?:\n  \\b((?:(?:final|abstract|readonly)\\s+)*)(class)\\s+([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*(?:((readonly))\\s+)?\\b(class)\\b # anonymous class\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"match": "final|abstract",
-							"name": "storage.modifier.${0:/downcase}.php"
-						},
-						{
-							"match": "readonly",
-							"name": "storage.modifier.php"
+							"match": "(?i)(final|abstract)|(readonly)",
+							"name": "storage.modifier.php",
+							"captures": {
+								"1": {
+									"name": "storage.modifier.inheritance.${1:/downcase}.php"
+								},
+								"2": {
+									"name": "storage.modifier.readonly.php"
+								}
+							}
 						}
 					]
 				},
@@ -354,6 +381,9 @@
 					"name": "storage.modifier.php"
 				},
 				"7": {
+					"name": "storage.modifier.readonly.php"
+				},
+				"8": {
 					"name": "storage.type.class.php"
 				}
 			},
@@ -663,8 +693,16 @@
 				"1": {
 					"patterns": [
 						{
-							"match": "final|abstract|public|private|protected",
-							"name": "storage.modifier.php"
+							"match": "(?i)(final|abstract)|(public|private|protected)",
+							"name": "storage.modifier.php",
+							"captures": {
+								"1": {
+									"name": "storage.modifier.inheritance.${1:/downcase}.php"
+								},
+								"2": {
+									"name": "storage.modifier.visibility.${2:/downcase}.php"
+								}
+							}
 						}
 					]
 				},
@@ -703,8 +741,19 @@
 						"1": {
 							"patterns": [
 								{
-									"match": "(?:public|private|protected)(?:\\(set\\))?|readonly",
-									"name": "storage.modifier.php"
+									"match": "(?xi)\n\\b((public|private|protected)\\(set\\))\n|\\b(public|private|protected)\\b\n|\\b(readonly)\\b",
+									"name": "storage.modifier.php",
+									"captures": {
+										"1": {
+											"name": "storage.modifier.visibility.set.${2:/downcase}.php"
+										},
+										"3": {
+											"name": "storage.modifier.visibility.${3:/downcase}.php"
+										},
+										"4": {
+											"name": "storage.modifier.readonly.php"
+										}
+									}
 								}
 							]
 						},
@@ -755,8 +804,19 @@
 				"1": {
 					"patterns": [
 						{
-							"match": "final|abstract|public|private|protected|static",
-							"name": "storage.modifier.php"
+							"match": "(?xi)\n(final|abstract)\n|(public|private|protected)\n|(static)",
+							"name": "storage.modifier.php",
+							"captures": {
+								"1": {
+									"name": "storage.modifier.inheritance.${1:/downcase}.php"
+								},
+								"2": {
+									"name": "storage.modifier.visibility.${2:/downcase}.php"
+								},
+								"3": {
+									"name": "storage.modifier.static.php"
+								}
+							}
 						}
 					]
 				},
@@ -814,8 +874,19 @@
 				"1": {
 					"patterns": [
 						{
-							"match": "(?:public|private|protected)(?:\\(set\\))?|static|readonly",
-							"name": "storage.modifier.php"
+							"match": "(?xi)\n\\b((public|private|protected)\\(set\\))\n|\\b(public|private|protected)\\b\n|\\b(readonly|static)\\b",
+							"name": "storage.modifier.php",
+							"captures": {
+								"1": {
+									"name": "storage.modifier.visibility.set.${2:/downcase}.php"
+								},
+								"3": {
+									"name": "storage.modifier.visibility.${3:/downcase}.php"
+								},
+								"4": {
+									"name": "storage.modifier.${4:/downcase}.php"
+								}
+							}
 						}
 					]
 				},
@@ -885,7 +956,7 @@
 			]
 		},
 		{
-			"match": "(?i)(\\()\\s*(array|real|double|float|int(?:eger)?|bool(?:ean)?|string|object|binary|unset)\\s*(\\))",
+			"match": "(?ix)\n(\\()\n\\s*\n(\n    (bool|int|float|string|array|object)\n    |(binary|boolean|integer|double|real|unset)\n)\n\\s*\n(\\))",
 			"captures": {
 				"1": {
 					"name": "punctuation.definition.storage-type.begin.bracket.round.php"
@@ -894,6 +965,9 @@
 					"name": "storage.type.php"
 				},
 				"3": {
+					"name": "storage.type.cast.${3:/downcase}.php"
+				},
+				"5": {
 					"name": "punctuation.definition.storage-type.end.bracket.round.php"
 				}
 			}
@@ -907,8 +981,22 @@
 			"name": "storage.type.const.php"
 		},
 		{
-			"match": "(?i)\\b(global|abstract|final|private|protected|public|static)\\b",
-			"name": "storage.modifier.php"
+			"match": "(?xi)\n\\b(?:\n  (global)\n  |(abstract|final)\n  |(private|protected|public)\n  |(static)\n)\\b",
+			"name": "storage.modifier.php",
+			"captures": {
+				"1": {
+					"name": "storage.modifier.global.php"
+				},
+				"2": {
+					"name": "storage.modifier.inheritance.${2:/downcase}.php"
+				},
+				"3": {
+					"name": "storage.modifier.visibility.${3:/downcase}.php"
+				},
+				"4": {
+					"name": "storage.modifier.static.php"
+				}
+			}
 		},
 		{
 			"include": "#object"
@@ -2823,14 +2911,17 @@
 						"1": {
 							"name": "keyword.other.phpdoc.php"
 						},
-						"3": {
+						"2": {
 							"name": "storage.modifier.php"
 						},
+						"3": {
+							"name": "storage.modifier.visibility.${3:/downcase}.php"
+						},
 						"4": {
 							"name": "invalid.illegal.wrong-access-type.phpdoc.php"
 						}
 					},
-					"match": "^\\s*\\*\\s*(@access)\\s+((public|private|protected)|(.+))\\s*$"
+					"match": "^\\s*\\*\\s*(@access)\\s+(?i:((public|private|protected))|(.+))\\s*$"
 				},
 				{
 					"captures": {
@@ -3251,6 +3342,9 @@
 					"match": "\\\\[\\\\'`\"]",
 					"name": "constant.character.escape.php"
 				},
+				{
+					"match": "N(?=')"
+				},
 				{
 					"match": "`(?=((\\\\`)|[^`'])*('|$))",
 					"name": "string.quoted.other.backtick.unclosed.sql"
diff --git a/extensions/references-view/.npmrc b/extensions/references-view/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/references-view/.npmrc
+++ b/extensions/references-view/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/shared.webpack.config.mjs b/extensions/shared.webpack.config.mjs
deleted file mode 100644
index 12b1ea522a4..00000000000
--- a/extensions/shared.webpack.config.mjs
+++ /dev/null
@@ -1,209 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// @ts-check
-import path from 'node:path';
-import fs from 'node:fs';
-import merge from 'merge-options';
-import CopyWebpackPlugin from 'copy-webpack-plugin';
-import webpack from 'webpack';
-import { createRequire } from 'node:module';
-
-/** @typedef {import('webpack').Configuration} WebpackConfig **/
-
-const require = createRequire(import.meta.url);
-
-const tsLoaderOptions = {
-	compilerOptions: {
-		'sourceMap': true,
-	},
-	onlyCompileBundledFiles: true,
-};
-
-function withNodeDefaults(/**@type WebpackConfig & { context: string }*/extConfig) {
-	const defaultConfig = {
-		mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
-		target: 'node', // extensions run in a node context
-		node: {
-			__dirname: false // leave the __dirname-behaviour intact
-		},
-
-		resolve: {
-			conditionNames: ['import', 'require', 'node-addons', 'node'],
-			mainFields: ['module', 'main'],
-			extensions: ['.ts', '.js'], // support ts-files and js-files
-			extensionAlias: {
-				// this is needed to resolve dynamic imports that now require the .js extension
-				'.js': ['.js', '.ts'],
-			}
-		},
-		module: {
-			rules: [{
-				test: /\.ts$/,
-				exclude: /node_modules/,
-				use: [
-					{
-						// configure TypeScript loader:
-						// * enable sources maps for end-to-end source maps
-						loader: 'ts-loader',
-						options: tsLoaderOptions
-					},
-					// disable mangling for now, SEE https://github.com/microsoft/vscode/issues/204692
-					// {
-					// 	loader: path.resolve(import.meta.dirname, 'mangle-loader.js'),
-					// 	options: {
-					// 		configFile: path.join(extConfig.context, 'tsconfig.json')
-					// 	},
-					// },
-				]
-			}]
-		},
-		externals: {
-			'electron': 'commonjs electron', // ignored to avoid bundling from node_modules
-			'vscode': 'commonjs vscode', // ignored because it doesn't exist,
-			'applicationinsights-native-metrics': 'commonjs applicationinsights-native-metrics', // ignored because we don't ship native module
-			'@azure/functions-core': 'commonjs azure/functions-core', // optional dependency of appinsights that we don't use
-			'@opentelemetry/tracing': 'commonjs @opentelemetry/tracing', // ignored because we don't ship this module
-			'@opentelemetry/instrumentation': 'commonjs @opentelemetry/instrumentation', // ignored because we don't ship this module
-			'@azure/opentelemetry-instrumentation-azure-sdk': 'commonjs @azure/opentelemetry-instrumentation-azure-sdk', // ignored because we don't ship this module
-		},
-		output: {
-			// all output goes into `dist`.
-			// packaging depends on that and this must always be like it
-			filename: '[name].js',
-			path: path.join(extConfig.context, 'dist'),
-			libraryTarget: 'commonjs',
-		},
-		// yes, really source maps
-		devtool: 'source-map',
-		plugins: nodePlugins(extConfig.context),
-	};
-
-	return merge(defaultConfig, extConfig);
-}
-
-/**
- *
- * @param {string} context
- */
-function nodePlugins(context) {
-	// Need to find the top-most `package.json` file
-	const folderName = path.relative(import.meta.dirname, context).split(/[\\\/]/)[0];
-	const pkgPath = path.join(import.meta.dirname, folderName, 'package.json');
-	const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-	const id = `${pkg.publisher}.${pkg.name}`;
-	return [
-		new CopyWebpackPlugin({
-			patterns: [
-				{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
-			]
-		})
-	];
-}
-/**
- * @typedef {{
- * 	configFile?: string
- * }} AdditionalBrowserConfig
- */
-
-function withBrowserDefaults(/**@type WebpackConfig & { context: string }*/extConfig, /** @type AdditionalBrowserConfig */ additionalOptions = {}) {
-	/** @type WebpackConfig */
-	const defaultConfig = {
-		mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
-		target: 'webworker', // extensions run in a webworker context
-		resolve: {
-			mainFields: ['browser', 'module', 'main'],
-			extensions: ['.ts', '.js'], // support ts-files and js-files
-			fallback: {
-				'path': require.resolve('path-browserify'),
-				'os': require.resolve('os-browserify'),
-				'util': require.resolve('util')
-			},
-			extensionAlias: {
-				// this is needed to resolve dynamic imports that now require the .js extension
-				'.js': ['.js', '.ts'],
-			},
-		},
-		module: {
-			rules: [{
-				test: /\.ts$/,
-				exclude: /node_modules/,
-				use: [
-					{
-						// configure TypeScript loader:
-						// * enable sources maps for end-to-end source maps
-						loader: 'ts-loader',
-						options: {
-							...tsLoaderOptions,
-							//							...(additionalOptions ? {} : { configFile: additionalOptions.configFile }),
-						}
-					},
-					// disable mangling for now, SEE https://github.com/microsoft/vscode/issues/204692
-					// {
-					// 	loader: path.resolve(import.meta.dirname, 'mangle-loader.js'),
-					// 	options: {
-					// 		configFile: path.join(extConfig.context, additionalOptions?.configFile ?? 'tsconfig.json')
-					// 	},
-					// },
-				]
-			}, {
-				test: /\.wasm$/,
-				type: 'asset/inline'
-			}]
-		},
-		externals: {
-			'vscode': 'commonjs vscode', // ignored because it doesn't exist,
-			'applicationinsights-native-metrics': 'commonjs applicationinsights-native-metrics', // ignored because we don't ship native module
-			'@azure/functions-core': 'commonjs azure/functions-core', // optional dependency of appinsights that we don't use
-			'@opentelemetry/tracing': 'commonjs @opentelemetry/tracing', // ignored because we don't ship this module
-			'@opentelemetry/instrumentation': 'commonjs @opentelemetry/instrumentation', // ignored because we don't ship this module
-			'@azure/opentelemetry-instrumentation-azure-sdk': 'commonjs @azure/opentelemetry-instrumentation-azure-sdk', // ignored because we don't ship this module
-		},
-		performance: {
-			hints: false
-		},
-		output: {
-			// all output goes into `dist`.
-			// packaging depends on that and this must always be like it
-			filename: '[name].js',
-			path: path.join(extConfig.context, 'dist', 'browser'),
-			libraryTarget: 'commonjs',
-		},
-		// yes, really source maps
-		devtool: 'source-map',
-		plugins: browserPlugins(extConfig.context)
-	};
-
-	return merge(defaultConfig, extConfig);
-}
-
-/**
- *
- * @param {string} context
- */
-function browserPlugins(context) {
-	// Need to find the top-most `package.json` file
-	// const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0];
-	// const pkgPath = path.join(__dirname, folderName, 'package.json');
-	// const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-	// const id = `${pkg.publisher}.${pkg.name}`;
-	return [
-		new webpack.optimize.LimitChunkCountPlugin({
-			maxChunks: 1
-		}),
-		new CopyWebpackPlugin({
-			patterns: [
-				{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
-			]
-		}),
-		new webpack.DefinePlugin({
-			'process.platform': JSON.stringify('web'),
-			'process.env': JSON.stringify({}),
-			'process.env.BROWSER_ENV': JSON.stringify('true')
-		})
-	];
-}
-
-export default withNodeDefaults;
-export { withNodeDefaults as node, withBrowserDefaults as browser, nodePlugins, browserPlugins };
diff --git a/extensions/simple-browser/.npmrc b/extensions/simple-browser/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/simple-browser/.npmrc
+++ b/extensions/simple-browser/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index 59a0c8677fe..bf4dfcb250a 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -42,6 +42,14 @@
         "category": "Simple Browser"
       }
     ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "simpleBrowser.show",
+          "when": "isWeb"
+        }
+      ]
+    },
     "configuration": [
       {
         "title": "Simple Browser",
@@ -51,12 +59,6 @@
             "default": true,
             "title": "Focus Lock Indicator Enabled",
             "description": "%configuration.focusLockIndicator.enabled.description%"
-          },
-          "simpleBrowser.useIntegratedBrowser": {
-            "type": "boolean",
-            "default": true,
-            "markdownDescription": "%configuration.useIntegratedBrowser.description%",
-            "scope": "application"
           }
         }
       }
diff --git a/extensions/simple-browser/package.nls.json b/extensions/simple-browser/package.nls.json
index 0b88b068fbc..496dc28dfdd 100644
--- a/extensions/simple-browser/package.nls.json
+++ b/extensions/simple-browser/package.nls.json
@@ -1,6 +1,5 @@
 {
 	"displayName": "Simple Browser",
 	"description": "A very basic built-in webview for displaying web content.",
-	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser.",
-	"configuration.useIntegratedBrowser.description": "When enabled, the `simpleBrowser.show` command will open URLs in the integrated browser instead of the Simple Browser webview. **Note:** This setting is only available on desktop."
+	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser."
 }
diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts
index 75ee87d4da7..ddcdc52b42d 100644
--- a/extensions/simple-browser/src/extension.ts
+++ b/extensions/simple-browser/src/extension.ts
@@ -15,7 +15,6 @@ declare class URL {
 const openApiCommand = 'simpleBrowser.api.open';
 const showCommand = 'simpleBrowser.show';
 const integratedBrowserCommand = 'workbench.action.browser.open';
-const useIntegratedBrowserSetting = 'simpleBrowser.useIntegratedBrowser';
 
 const enabledHosts = new Set<string>([
 	'localhost',
@@ -37,12 +36,6 @@ const openerId = 'simpleBrowser.open';
  * Checks if the integrated browser should be used instead of the simple browser
  */
 async function shouldUseIntegratedBrowser(): Promise<boolean> {
-	const config = vscode.workspace.getConfiguration();
-	if (!config.get<boolean>(useIntegratedBrowserSetting, true)) {
-		return false;
-	}
-
-	// Verify that the integrated browser command is available
 	const commands = await vscode.commands.getCommands(true);
 	return commands.includes(integratedBrowserCommand);
 }
diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json
index c338d174d2a..fe0d8f977b1 100644
--- a/extensions/sql/cgmanifest.json
+++ b/extensions/sql/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "microsoft/vscode-mssql",
 					"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
-					"commitHash": "5fd71951c51e0a8385fb546ccebf0716a549fedf"
+					"commitHash": "c002f514dd81fa71fa304d4c36f8d2767dbf2f9d"
 				}
 			},
 			"license": "MIT",
-			"version": "1.34.0"
+			"version": "1.0.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json
index 4be5b47334c..fb1da651dc3 100644
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-mssql/commit/5fd71951c51e0a8385fb546ccebf0716a549fedf",
+	"version": "https://github.com/microsoft/vscode-mssql/commit/c002f514dd81fa71fa304d4c36f8d2767dbf2f9d",
 	"name": "SQL",
 	"scopeName": "source.sql",
 	"patterns": [
@@ -528,7 +528,7 @@
 						}
 					},
 					"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
-					"match": "(N)?(')[^']*(')",
+					"match": "(?:(?<![a-zA-Z0-9_])(N))?(')[^']*(')",
 					"name": "string.quoted.single.sql"
 				},
 				{
diff --git a/extensions/terminal-suggest/.npmrc b/extensions/terminal-suggest/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/terminal-suggest/.npmrc
+++ b/extensions/terminal-suggest/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/theme-2026/.vscodeignore b/extensions/theme-2026/.vscodeignore
deleted file mode 100644
index 7ef29eaaabf..00000000000
--- a/extensions/theme-2026/.vscodeignore
+++ /dev/null
@@ -1,5 +0,0 @@
-CUSTOMIZATION.md
-node_modules/**
-.vscode/**
-.gitignore
-**/*.map
diff --git a/extensions/theme-2026/package.json b/extensions/theme-2026/package.json
deleted file mode 100644
index 8360afdac5c..00000000000
--- a/extensions/theme-2026/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"name": "theme-2026",
-	"displayName": "2026 Themes",
-	"description": "Modern, minimal light and dark themes for 2026 with consistent neutral palette and accessible color contrast",
-	"version": "0.1.0",
-	"publisher": "vscode",
-	"license": "MIT",
-	"engines": {
-		"vscode": "^1.85.0"
-	},
-	"categories": [
-		"Themes"
-	],
-	"contributes": {
-		"themes": [
-			{
-				"id": "Experimental Light",
-				"label": "VS Code Light",
-				"uiTheme": "vs",
-				"path": "./themes/2026-light.json"
-			},
-			{
-				"id": "Experimental Dark",
-				"label": "VS Code Dark",
-				"uiTheme": "vs-dark",
-				"path": "./themes/2026-dark.json"
-			}
-		]
-	}
-}
diff --git a/extensions/theme-2026/package.nls.json b/extensions/theme-2026/package.nls.json
deleted file mode 100644
index 639cf87f44e..00000000000
--- a/extensions/theme-2026/package.nls.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"displayName": "2026 Themes",
-	"description": "Modern, minimal light and dark themes for 2026 with consistent neutral palette and accessible color contrast",
-	"2026-light-label": "2026 Light",
-	"2026-dark-label": "2026 Dark"
-}
diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json
index edff700e9a8..da70493255a 100644
--- a/extensions/theme-defaults/package.json
+++ b/extensions/theme-defaults/package.json
@@ -14,25 +14,37 @@
   "contributes": {
     "themes": [
       {
-        "id": "Default Dark+",
+        "id": "VS Code Light",
+        "label": "%vsCodeLightThemeLabel%",
+        "uiTheme": "vs",
+        "path": "./themes/2026-light.json"
+      },
+      {
+        "id": "VS Code Dark",
+        "label": "%vsCodeDarkThemeLabel%",
+        "uiTheme": "vs-dark",
+        "path": "./themes/2026-dark.json"
+      },
+      {
+        "id": "Dark+",
         "label": "%darkPlusColorThemeLabel%",
         "uiTheme": "vs-dark",
         "path": "./themes/dark_plus.json"
       },
       {
-        "id": "Default Dark Modern",
+        "id": "Dark Modern",
         "label": "%darkModernThemeLabel%",
         "uiTheme": "vs-dark",
         "path": "./themes/dark_modern.json"
       },
       {
-        "id": "Default Light+",
+        "id": "Light+",
         "label": "%lightPlusColorThemeLabel%",
         "uiTheme": "vs",
         "path": "./themes/light_plus.json"
       },
       {
-        "id": "Default Light Modern",
+        "id": "Light Modern",
         "label": "%lightModernThemeLabel%",
         "uiTheme": "vs",
         "path": "./themes/light_modern.json"
diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json
index cacbd6b8d9a..1e9bbdc6a59 100644
--- a/extensions/theme-defaults/package.nls.json
+++ b/extensions/theme-defaults/package.nls.json
@@ -1,6 +1,8 @@
 {
 	"displayName": "Default Themes",
 	"description": "The default Visual Studio light and dark themes",
+	"vsCodeLightThemeLabel": "VS Code Light",
+	"vsCodeDarkThemeLabel": "VS Code Dark",
 	"darkPlusColorThemeLabel": "Dark+",
 	"darkModernThemeLabel": "Dark Modern",
 	"lightPlusColorThemeLabel": "Light+",
diff --git a/extensions/theme-2026/themes/2026-dark.json b/extensions/theme-defaults/themes/2026-dark.json
similarity index 90%
rename from extensions/theme-2026/themes/2026-dark.json
rename to extensions/theme-defaults/themes/2026-dark.json
index d204a5506b0..9427640c404 100644
--- a/extensions/theme-2026/themes/2026-dark.json
+++ b/extensions/theme-defaults/themes/2026-dark.json
@@ -18,9 +18,9 @@
 		"textPreformat.background": "#262626",
 		"textPreformat.foreground": "#8C8C8C",
 		"textSeparator.foreground": "#2a2a2aFF",
-		"button.background": "#3994BCF2",
+		"button.background": "#297AA0",
 		"button.foreground": "#FFFFFF",
-		"button.hoverBackground": "#3E9BC4",
+		"button.hoverBackground": "#2B7DA3",
 		"button.border": "#333536FF",
 		"button.secondaryHoverBackground": "#FFFFFF10",
 		"checkbox.background": "#242526",
@@ -57,7 +57,7 @@
 		"list.activeSelectionForeground": "#ededed",
 		"list.inactiveSelectionBackground": "#2C2D2E",
 		"list.inactiveSelectionForeground": "#ededed",
-		"list.hoverBackground": "#262728",
+		"list.hoverBackground": "#FFFFFF0D",
 		"list.hoverForeground": "#bfbfbf",
 		"list.dropBackground": "#3994BC1A",
 		"toolbar.hoverBackground": "#FFFFFF18",
@@ -221,9 +221,9 @@
 		"activityWarningBadge.background": "#CCA700",
 		"activityErrorBadge.foreground": "#FFFFFF",
 		"activityErrorBadge.background": "#f48771",
-		"extensionButton.prominentBackground": "#3994BC",
+		"extensionButton.prominentBackground": "#297AA0",
 		"extensionButton.prominentForeground": "#FFFFFF",
-		"extensionButton.prominentHoverBackground": "#3E9BC4",
+		"extensionButton.prominentHoverBackground": "#2B7DA3",
 		"pickerGroup.border": "#2A2B2CFF",
 		"pickerGroup.foreground": "#bfbfbf",
 		"quickInput.background": "#202122",
@@ -281,7 +281,7 @@
 				"string.comment"
 			],
 			"settings": {
-				"foreground": "#768390"
+				"foreground": "#8b949e"
 			}
 		},
 		{
@@ -290,7 +290,7 @@
 				"constant.character"
 			],
 			"settings": {
-				"foreground": "#F47067"
+				"foreground": "#ff7b72"
 			}
 		},
 		{
@@ -303,7 +303,7 @@
 				"entity"
 			],
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
@@ -313,7 +313,7 @@
 				"meta.definition.variable"
 			],
 			"settings": {
-				"foreground": "#F69D50"
+				"foreground": "#ffa657"
 			}
 		},
 		{
@@ -327,13 +327,13 @@
 				"meta.embedded.expression"
 			],
 			"settings": {
-				"foreground": "#ADBAC7"
+				"foreground": "#c9d1d9"
 			}
 		},
 		{
 			"scope": "entity.name.function",
 			"settings": {
-				"foreground": "#DCBDFB"
+				"foreground": "#d2a8ff"
 			}
 		},
 		{
@@ -342,13 +342,13 @@
 				"support.class.component"
 			],
 			"settings": {
-				"foreground": "#8DDB8C"
+				"foreground": "#7ee787"
 			}
 		},
 		{
 			"scope": "keyword",
 			"settings": {
-				"foreground": "#F47067"
+				"foreground": "#ff7b72"
 			}
 		},
 		{
@@ -357,7 +357,7 @@
 				"storage.type"
 			],
 			"settings": {
-				"foreground": "#F47067"
+				"foreground": "#ff7b72"
 			}
 		},
 		{
@@ -367,7 +367,7 @@
 				"storage.type.java"
 			],
 			"settings": {
-				"foreground": "#ADBAC7"
+				"foreground": "#c9d1d9"
 			}
 		},
 		{
@@ -376,66 +376,66 @@
 				"string punctuation.section.embedded source"
 			],
 			"settings": {
-				"foreground": "#96D0FF"
+				"foreground": "#a5d6ff"
 			}
 		},
 		{
 			"scope": "support",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
 			"scope": "meta.property-name",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
 			"scope": "variable",
 			"settings": {
-				"foreground": "#F69D50"
+				"foreground": "#ffa657"
 			}
 		},
 		{
 			"scope": "variable.other",
 			"settings": {
-				"foreground": "#ADBAC7"
+				"foreground": "#c9d1d9"
 			}
 		},
 		{
 			"scope": "invalid.broken",
 			"settings": {
-				"foreground": "#FF938A",
+				"foreground": "#ffa198",
 				"fontStyle": "italic"
 			}
 		},
 		{
 			"scope": "invalid.deprecated",
 			"settings": {
-				"foreground": "#FF938A",
+				"foreground": "#ffa198",
 				"fontStyle": "italic"
 			}
 		},
 		{
 			"scope": "invalid.illegal",
 			"settings": {
-				"foreground": "#FF938A",
+				"foreground": "#ffa198",
 				"fontStyle": "italic"
 			}
 		},
 		{
 			"scope": "invalid.unimplemented",
 			"settings": {
-				"foreground": "#FF938A",
+				"foreground": "#ffa198",
 				"fontStyle": "italic"
 			}
 		},
 		{
 			"scope": "carriage-return",
 			"settings": {
-				"foreground": "#CDD9E5",
-				"background": "#F47067",
+				"foreground": "#f0f6fc",
+				"background": "#8b1111",
 				"fontStyle": "italic underline",
 				"content": "^M"
 			}
@@ -443,13 +443,13 @@
 		{
 			"scope": "message.error",
 			"settings": {
-				"foreground": "#FF938A"
+				"foreground": "#ffa198"
 			}
 		},
 		{
 			"scope": "string variable",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
@@ -458,7 +458,7 @@
 				"string.regexp"
 			],
 			"settings": {
-				"foreground": "#96D0FF"
+				"foreground": "#a5d6ff"
 			}
 		},
 		{
@@ -469,44 +469,44 @@
 				"string.regexp string.regexp.arbitrary-repitition"
 			],
 			"settings": {
-				"foreground": "#96D0FF"
+				"foreground": "#a5d6ff"
 			}
 		},
 		{
 			"scope": "string.regexp constant.character.escape",
 			"settings": {
-				"foreground": "#8DDB8C",
+				"foreground": "#7ee787",
 				"fontStyle": "bold"
 			}
 		},
 		{
 			"scope": "support.constant",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
 			"scope": "support.variable",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
 			"scope": "support.type.property-name.json",
 			"settings": {
-				"foreground": "#8DDB8C"
+				"foreground": "#7ee787"
 			}
 		},
 		{
 			"scope": "meta.module-reference",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
 			"scope": "punctuation.definition.list.begin.markdown",
 			"settings": {
-				"foreground": "#F69D50"
+				"foreground": "#ffa657"
 			}
 		},
 		{
@@ -515,27 +515,27 @@
 				"markup.heading entity.name"
 			],
 			"settings": {
-				"foreground": "#6CB6FF",
+				"foreground": "#79c0ff",
 				"fontStyle": "bold"
 			}
 		},
 		{
 			"scope": "markup.quote",
 			"settings": {
-				"foreground": "#8DDB8C"
+				"foreground": "#7ee787"
 			}
 		},
 		{
 			"scope": "markup.italic",
 			"settings": {
-				"foreground": "#ADBAC7",
+				"foreground": "#c9d1d9",
 				"fontStyle": "italic"
 			}
 		},
 		{
 			"scope": "markup.bold",
 			"settings": {
-				"foreground": "#ADBAC7",
+				"foreground": "#c9d1d9",
 				"fontStyle": "bold"
 			}
 		},
@@ -558,7 +558,7 @@
 		{
 			"scope": "markup.inline.raw",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
@@ -568,8 +568,8 @@
 				"punctuation.definition.deleted"
 			],
 			"settings": {
-				"foreground": "#FF938A",
-				"background": "#5D0F12"
+				"foreground": "#ffa198",
+				"background": "#490202"
 			}
 		},
 		{
@@ -577,7 +577,7 @@
 				"punctuation.section.embedded"
 			],
 			"settings": {
-				"foreground": "#F47067"
+				"foreground": "#ff7b72"
 			}
 		},
 		{
@@ -587,8 +587,8 @@
 				"punctuation.definition.inserted"
 			],
 			"settings": {
-				"foreground": "#8DDB8C",
-				"background": "#113417"
+				"foreground": "#7ee787",
+				"background": "#04260f"
 			}
 		},
 		{
@@ -597,8 +597,8 @@
 				"punctuation.definition.changed"
 			],
 			"settings": {
-				"foreground": "#F69D50",
-				"background": "#682D0F"
+				"foreground": "#ffa657",
+				"background": "#5a1e02"
 			}
 		},
 		{
@@ -607,34 +607,34 @@
 				"markup.untracked"
 			],
 			"settings": {
-				"foreground": "#2D333B",
-				"background": "#6CB6FF"
+				"foreground": "#0d1117",
+				"background": "#79c0ff"
 			}
 		},
 		{
 			"scope": "meta.diff.range",
 			"settings": {
-				"foreground": "#DCBDFB",
+				"foreground": "#d2a8ff",
 				"fontStyle": "bold"
 			}
 		},
 		{
 			"scope": "meta.diff.header",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
 			"scope": "meta.separator",
 			"settings": {
-				"foreground": "#6CB6FF",
+				"foreground": "#79c0ff",
 				"fontStyle": "bold"
 			}
 		},
 		{
 			"scope": "meta.output",
 			"settings": {
-				"foreground": "#6CB6FF"
+				"foreground": "#79c0ff"
 			}
 		},
 		{
@@ -647,13 +647,13 @@
 				"brackethighlighter.quote"
 			],
 			"settings": {
-				"foreground": "#768390"
+				"foreground": "#8b949e"
 			}
 		},
 		{
 			"scope": "brackethighlighter.unmatched",
 			"settings": {
-				"foreground": "#FF938A"
+				"foreground": "#ffa198"
 			}
 		},
 		{
@@ -662,7 +662,7 @@
 				"string.other.link"
 			],
 			"settings": {
-				"foreground": "#96D0FF"
+				"foreground": "#a5d6ff"
 			}
 		},
 		{
diff --git a/extensions/theme-2026/themes/2026-light.json b/extensions/theme-defaults/themes/2026-light.json
similarity index 99%
rename from extensions/theme-2026/themes/2026-light.json
rename to extensions/theme-defaults/themes/2026-light.json
index 6df7171b0d2..2beaf9f6840 100644
--- a/extensions/theme-2026/themes/2026-light.json
+++ b/extensions/theme-defaults/themes/2026-light.json
@@ -108,9 +108,9 @@
 		"menu.border": "#E4E5E6FF",
 		"commandCenter.foreground": "#202020",
 		"commandCenter.activeForeground": "#202020",
-		"commandCenter.background": "#FAFAFD",
+		"commandCenter.background": "#FFFFFF",
 		"commandCenter.activeBackground": "#DADADA4f",
-		"commandCenter.border": "#D8D8D8",
+		"commandCenter.border": "#D8D8D8AA",
 		"editor.background": "#FFFFFF",
 		"editor.foreground": "#202020",
 		"editorLineNumber.foreground": "#606060",
diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json
index 574d89f9c4a..bc4b9ce91bc 100644
--- a/extensions/theme-defaults/themes/dark_modern.json
+++ b/extensions/theme-defaults/themes/dark_modern.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "vscode://schemas/color-theme",
-	"name": "Default Dark Modern",
+	"name": "Dark Modern",
 	"include": "./dark_plus.json",
 	"colors": {
 		"activityBar.activeBorder": "#0078D4",
diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json
index 1576ef7e5c1..84aa2b21038 100644
--- a/extensions/theme-defaults/themes/light_modern.json
+++ b/extensions/theme-defaults/themes/light_modern.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "vscode://schemas/color-theme",
-	"name": "Default Light Modern",
+	"name": "Light Modern",
 	"include": "./light_plus.json",
 	"colors": {
 		"activityBar.activeBorder": "#005FB8",
diff --git a/extensions/tunnel-forwarding/.npmrc b/extensions/tunnel-forwarding/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/tunnel-forwarding/.npmrc
+++ b/extensions/tunnel-forwarding/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/typescript-language-features/.npmrc b/extensions/typescript-language-features/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/typescript-language-features/.npmrc
+++ b/extensions/typescript-language-features/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index fb58ac53c25..879be480493 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -2423,7 +2423,7 @@
           },
           "js/ts.tsserver.node.path": {
             "type": "string",
-            "description": "%configuration.tsserver.nodePath%",
+            "markdownDescription": "%configuration.tsserver.nodePath%",
             "scope": "window",
             "keywords": [
               "TypeScript"
@@ -2431,7 +2431,7 @@
           },
           "typescript.tsserver.nodePath": {
             "type": "string",
-            "description": "%configuration.tsserver.nodePath%",
+            "markdownDescription": "%configuration.tsserver.nodePath%",
             "markdownDeprecationMessage": "%configuration.tsserver.nodePath.unifiedDeprecationMessage%",
             "scope": "window"
           },
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 28b65dc0736..48955c38552 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -317,7 +317,7 @@
 	"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.projectWideIntellisense.suppressSemanticErrors#` instead.",
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#js/ts.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 	"configuration.tsserver.web.typeAcquisition.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.typeAcquisition.enabled#` instead.",
-	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
+	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or `node` if you want VS Code to detect a Node installation.",
 	"configuration.tsserver.nodePath.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.node.path#` instead.",
 	"configuration.tsserver.watchOptions.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.watchOptions#` instead.",
 	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
index 915de13e13c..adac2436edf 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
@@ -53,10 +53,9 @@ export default class FileConfigurationManager extends Disposable {
 		document: vscode.TextDocument,
 		token: vscode.CancellationToken
 	): Promise<void> {
-		const formattingOptions = this.getFormattingOptions(document);
-		if (formattingOptions) {
-			return this.ensureConfigurationOptions(document, formattingOptions, token);
-		}
+		const formattingOptions = this.getFormattingOptions(document)
+			?? { tabSize: undefined, insertSpaces: undefined };
+		return this.ensureConfigurationOptions(document, formattingOptions, token);
 	}
 
 	private getFormattingOptions(document: vscode.TextDocument): FormattingOptions | undefined {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 507f9e6628a..ae18dff741c 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -1217,9 +1217,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		/* __GDPR__
 			"typingsInstalled" : {
 				"owner": "mjbvz",
-				"installedPackages" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-				"installSuccess": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				"typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"installedPackages": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"installSuccess": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"${include}": [
 					"${TypeScriptCommonProperties}"
 				]
diff --git a/extensions/vscode-api-tests/.npmrc b/extensions/vscode-api-tests/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/vscode-api-tests/.npmrc
+++ b/extensions/vscode-api-tests/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index e5167429902..0ba8a2d2999 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -7,6 +7,7 @@
   "enabledApiProposals": [
     "activeComment",
     "authSession",
+    "browser",
     "environmentPower",
     "chatParticipantPrivate",
     "chatPromptFiles",
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/browser.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/browser.test.ts
new file mode 100644
index 00000000000..0791391e6af
--- /dev/null
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/browser.test.ts
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as vscode from 'vscode';
+import { window, commands, ViewColumn } from 'vscode';
+import { assertNoRpc, closeAllEditors } from '../utils';
+
+(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('vscode API - browser', () => {
+
+	teardown(async function () {
+		assertNoRpc();
+		await closeAllEditors();
+	});
+
+	// #region window.browserTabs / activeBrowserTab
+
+	test('browserTabs is an array', () => {
+		assert.ok(Array.isArray(window.browserTabs));
+	});
+
+	test('activeBrowserTab is undefined when no browser tab is open', () => {
+		assert.strictEqual(window.activeBrowserTab, undefined);
+	});
+
+	// #endregion
+
+	// #region openBrowserTab
+
+	test('openBrowserTab returns a BrowserTab with url, title, and icon', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+
+		assert.ok(tab);
+		assert.strictEqual(tab.url, 'about:blank');
+		assert.ok(tab.title);
+		assert.ok(tab.icon);
+	});
+
+	test('openBrowserTab adds tab to browserTabs', async () => {
+		const before = window.browserTabs.length;
+		await window.openBrowserTab('about:blank');
+		assert.strictEqual(window.browserTabs.length, before + 1);
+	});
+
+	test('openBrowserTab with viewColumn.Beside', async () => {
+		const tab = await window.openBrowserTab('about:blank', { viewColumn: ViewColumn.Beside });
+		assert.ok(tab);
+		assert.strictEqual(tab.url, 'about:blank');
+	});
+
+	test('openBrowserTab with preserveFocus', async () => {
+		const tab = await window.openBrowserTab('about:blank', { preserveFocus: true });
+		assert.ok(tab);
+	});
+
+	test('openBrowserTab with background', async () => {
+		const tab = await window.openBrowserTab('about:blank', { background: true });
+		assert.ok(tab);
+	});
+
+	// #endregion
+
+	// #region BrowserTab.close
+
+	test('BrowserTab.close removes the tab from browserTabs', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+		const countBefore = window.browserTabs.length;
+
+		await tab.close();
+
+		assert.strictEqual(window.browserTabs.length, countBefore - 1);
+	});
+
+	test('Can move a browser tab to a new group and close it successfully', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+		assert.ok(window.browserTabs.includes(tab));
+
+		await commands.executeCommand('workbench.action.moveEditorToNextGroup');
+
+		await tab.close();
+		assert.ok(!window.browserTabs.includes(tab));
+	});
+
+	// #endregion
+
+	// #region onDidOpenBrowserTab
+
+	test('onDidOpenBrowserTab fires when a tab is opened', async () => {
+		const opened = new Promise<vscode.BrowserTab>(resolve => {
+			const disposable = window.onDidOpenBrowserTab(tab => {
+				disposable.dispose();
+				resolve(tab);
+			});
+		});
+
+		const tab = await window.openBrowserTab('about:blank');
+		const firedTab = await opened;
+		assert.strictEqual(firedTab.url, tab.url);
+	});
+
+	// #endregion
+
+	// #region onDidCloseBrowserTab
+
+	test('onDidCloseBrowserTab fires when a tab is closed', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+
+		const closed = new Promise<vscode.BrowserTab>(resolve => {
+			const disposable = window.onDidCloseBrowserTab(t => {
+				disposable.dispose();
+				resolve(t);
+			});
+		});
+
+		await tab.close();
+		const firedTab = await closed;
+		assert.ok(firedTab);
+	});
+
+	// #endregion
+
+	// #region activeBrowserTab / onDidChangeActiveBrowserTab
+
+	test('activeBrowserTab is set after opening a tab', async () => {
+		await window.openBrowserTab('about:blank');
+		assert.ok(window.activeBrowserTab);
+	});
+
+	test('onDidChangeActiveBrowserTab fires when active tab changes', async () => {
+		const changed = new Promise<vscode.BrowserTab | undefined>(resolve => {
+			const disposable = window.onDidChangeActiveBrowserTab(tab => {
+				disposable.dispose();
+				resolve(tab);
+			});
+		});
+
+		await window.openBrowserTab('about:blank');
+		const activeTab = await changed;
+		assert.ok(activeTab);
+	});
+
+	// #endregion
+
+	// #region CDP sessions
+
+	test('startCDPSession returns a session with expected API', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+		const session = await tab.startCDPSession();
+
+		assert.ok(session);
+		assert.ok(session.onDidReceiveMessage);
+		assert.ok(session.onDidClose);
+		assert.ok(typeof session.sendMessage === 'function');
+		assert.ok(typeof session.close === 'function');
+
+		await session.close();
+	});
+
+	test('CDP sendMessage and onDidReceiveMessage round-trip', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+		const session = await tab.startCDPSession();
+
+		const response = new Promise<any>(resolve => {
+			const disposable = session.onDidReceiveMessage((msg: any) => {
+				if (msg.id === 1) {
+					disposable.dispose();
+					resolve(msg);
+				}
+			});
+		});
+
+		await session.sendMessage({ id: 1, method: 'Target.getTargets' });
+		const msg = await response;
+		assert.ok(msg.result);
+		const targets: any[] = msg.result.targetInfos;
+		assert.equal(targets.length, 1);
+		assert.equal(targets[0].url, 'about:blank');
+
+		await session.close();
+	});
+
+	test('CDP session.close fires onDidClose', async () => {
+		const tab = await window.openBrowserTab('about:blank');
+		const session = await tab.startCDPSession();
+
+		const closed = new Promise<void>(resolve => {
+			const disposable = session.onDidClose(() => {
+				disposable.dispose();
+				resolve();
+			});
+		});
+
+		await session.close();
+		await closed;
+	});
+
+	// #endregion
+});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/chat.runInTerminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/chat.runInTerminal.test.ts
new file mode 100644
index 00000000000..f3b7f7e9f81
--- /dev/null
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/chat.runInTerminal.test.ts
@@ -0,0 +1,387 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import { DeferredPromise, assertNoRpc, closeAllEditors, disposeAll } from '../utils';
+
+const isWindows = process.platform === 'win32';
+const isMacOS = process.platform === 'darwin';
+const sandboxFileSystemSetting = isMacOS
+	? 'chat.tools.terminal.sandbox.macFileSystem'
+	: 'chat.tools.terminal.sandbox.linuxFileSystem';
+
+/**
+ * Extracts all text content from a LanguageModelToolResult.
+ */
+function extractTextContent(result: vscode.LanguageModelToolResult): string {
+	return result.content
+		.filter((c): c is vscode.LanguageModelTextPart => c instanceof vscode.LanguageModelTextPart)
+		.map(c => c.value)
+		.join('');
+}
+
+(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('chat - run_in_terminal', () => {
+
+	let disposables: vscode.Disposable[] = [];
+
+	setup(async () => {
+		disposables = [];
+
+		// Register a dummy default model required for participant requests
+		disposables.push(vscode.lm.registerLanguageModelChatProvider('copilot', {
+			async provideLanguageModelChatInformation(_options, _token) {
+				return [{
+					id: 'test-lm',
+					name: 'test-lm',
+					family: 'test',
+					version: '1.0.0',
+					maxInputTokens: 100,
+					maxOutputTokens: 100,
+					isDefault: true,
+					isUserSelectable: true,
+					capabilities: {}
+				}];
+			},
+			async provideLanguageModelChatResponse(_model, _messages, _options, _progress, _token) {
+				return undefined;
+			},
+			async provideTokenCount(_model, _text, _token) {
+				return 1;
+			},
+		}));
+
+		// Enable global auto-approve + skip the confirmation dialog via test-mode context key
+		const chatToolsConfig = vscode.workspace.getConfiguration('chat.tools.global');
+		await chatToolsConfig.update('autoApprove', true, vscode.ConfigurationTarget.Global);
+		await vscode.commands.executeCommand('setContext', 'vscode.chat.tools.global.autoApprove.testMode', true);
+	});
+
+	teardown(async () => {
+		assertNoRpc();
+		await closeAllEditors();
+		disposeAll(disposables);
+		participantRegistered = false;
+		pendingResult = undefined;
+		pendingCommand = undefined;
+		pendingTimeout = undefined;
+
+		const chatToolsConfig = vscode.workspace.getConfiguration('chat.tools.global');
+		await chatToolsConfig.update('autoApprove', undefined, vscode.ConfigurationTarget.Global);
+		await vscode.commands.executeCommand('setContext', 'vscode.chat.tools.global.autoApprove.testMode', undefined);
+	});
+
+	/**
+	 * Helper: invokes run_in_terminal via a chat participant and returns the tool result text.
+	 * Each call creates a new chat session to avoid participant re-registration issues.
+	 */
+	let participantRegistered = false;
+	let pendingResult: DeferredPromise<vscode.LanguageModelToolResult> | undefined;
+	let pendingCommand: string | undefined;
+	let pendingTimeout: number | undefined;
+
+	function setupParticipant() {
+		if (participantRegistered) {
+			return;
+		}
+		participantRegistered = true;
+		const participant = vscode.chat.createChatParticipant('api-test.participant', async (request, _context, _progress, _token) => {
+			if (!pendingResult || !pendingCommand) {
+				return {};
+			}
+			const currentResult = pendingResult;
+			const currentCommand = pendingCommand;
+			const currentTimeout = pendingTimeout ?? 15000;
+			pendingResult = undefined;
+			pendingCommand = undefined;
+			pendingTimeout = undefined;
+			try {
+				const result = await vscode.lm.invokeTool('run_in_terminal', {
+					input: {
+						command: currentCommand,
+						explanation: 'Integration test command',
+						goal: 'Test run_in_terminal output',
+						isBackground: false,
+						timeout: currentTimeout
+					},
+					toolInvocationToken: request.toolInvocationToken,
+				});
+				currentResult.complete(result);
+			} catch (e) {
+				currentResult.error(e);
+			}
+			return {};
+		});
+		disposables.push(participant);
+	}
+
+	async function invokeRunInTerminal(command: string, timeout = 15000): Promise<string> {
+		setupParticipant();
+
+		const resultPromise = new DeferredPromise<vscode.LanguageModelToolResult>();
+		pendingResult = resultPromise;
+		pendingCommand = command;
+		pendingTimeout = timeout;
+
+		await vscode.commands.executeCommand('workbench.action.chat.newChat');
+		vscode.commands.executeCommand('workbench.action.chat.open', { query: '@participant test' });
+
+		const result = await resultPromise.p;
+		return extractTextContent(result);
+	}
+
+	test('tool should be registered with expected schema', async function () {
+		this.timeout(15000);
+		// The run_in_terminal tool is registered asynchronously (it needs to
+		// resolve terminal profiles), so poll until it appears.
+		let tool: vscode.LanguageModelToolInformation | undefined;
+		for (let i = 0; i < 50; i++) {
+			tool = vscode.lm.tools.find(t => t.name === 'run_in_terminal');
+			if (tool) {
+				break;
+			}
+			await new Promise(r => setTimeout(r, 200));
+		}
+		assert.ok(tool, 'run_in_terminal tool should be registered');
+		assert.ok(tool.inputSchema, 'Tool should have an input schema');
+
+		const schema = tool.inputSchema as { properties?: Record<string, unknown> };
+		assert.ok(schema.properties?.['command'], 'Schema should have a command property');
+		assert.ok(schema.properties?.['explanation'], 'Schema should have an explanation property');
+		assert.ok(schema.properties?.['goal'], 'Schema should have a goal property');
+		assert.ok(schema.properties?.['isBackground'], 'Schema should have an isBackground property');
+	});
+
+	// --- Shell integration OFF (fast idle polling) ---
+
+	suite('shell integration off', () => {
+
+		setup(async () => {
+			const termConfig = vscode.workspace.getConfiguration('terminal.integrated');
+			await termConfig.update('shellIntegration.enabled', false, vscode.ConfigurationTarget.Global);
+			await termConfig.update('shellIntegration.timeout', 0, vscode.ConfigurationTarget.Global);
+
+			const toolConfig = vscode.workspace.getConfiguration('chat.tools.terminal');
+			await toolConfig.update('idlePollInterval', 100, vscode.ConfigurationTarget.Global);
+		});
+
+		teardown(async () => {
+			const termConfig = vscode.workspace.getConfiguration('terminal.integrated');
+			await termConfig.update('shellIntegration.enabled', undefined, vscode.ConfigurationTarget.Global);
+			await termConfig.update('shellIntegration.timeout', undefined, vscode.ConfigurationTarget.Global);
+
+			const toolConfig = vscode.workspace.getConfiguration('chat.tools.terminal');
+			await toolConfig.update('idlePollInterval', undefined, vscode.ConfigurationTarget.Global);
+		});
+
+		defineTests(false);
+	});
+
+	// --- Shell integration ON ---
+
+	suite('shell integration on', () => {
+		defineTests(true);
+	});
+
+	function defineTests(hasShellIntegration: boolean) {
+
+		// --- Sandbox OFF tests ---
+
+		suite('sandbox off', () => {
+
+			test('echo command returns exactly the echoed text', async function () {
+				this.timeout(60000);
+
+				const marker = `MARKER_${Date.now()}_ECHO`;
+				const output = await invokeRunInTerminal(`echo ${marker}`);
+
+				assert.strictEqual(output.trim(), marker);
+			});
+
+			test('no-output command reports empty output, not prompt echo (issue #303531)', async function () {
+				this.timeout(60000);
+
+				// `true` on Unix exits 0 with no output; `cmd /c rem` on Windows is a no-op
+				const command = isWindows ? 'cmd /c rem' : 'true';
+				const output = await invokeRunInTerminal(command);
+
+				assert.strictEqual(output.trim(), 'Command produced no output');
+			});
+
+			test('multi-line output preserves all lines in order', async function () {
+				this.timeout(60000);
+
+				const m1 = `M1_${Date.now()}`;
+				const m2 = `M2_${Date.now()}`;
+				const m3 = `M3_${Date.now()}`;
+				// Use `;` on Windows (PowerShell) since `&&` is rewritten to `;`
+				const sep = isWindows ? ';' : '&&';
+				const output = await invokeRunInTerminal(`echo ${m1} ${sep} echo ${m2} ${sep} echo ${m3}`);
+
+				// Without shell integration, idle polling may miss the
+				// output on slow CI machines.
+				const acceptable = [
+					`${m1}\n${m2}\n${m3}`,
+					...(!hasShellIntegration ? ['Command produced no output'] : []),
+				];
+				assert.ok(acceptable.includes(output.trim()), `Unexpected output: ${JSON.stringify(output.trim())}`);
+			});
+
+			(isWindows ? test : test.skip)('&& operators are converted to ; on PowerShell', async function () {
+				this.timeout(60000);
+
+				const m1 = `CHAIN_${Date.now()}_A`;
+				const m2 = `CHAIN_${Date.now()}_B`;
+				const output = await invokeRunInTerminal(`echo ${m1} && echo ${m2}`);
+
+				// The rewriter prepends a note explaining the simplification
+				const trimmed = output.trim();
+				assert.ok(trimmed.startsWith('Note: The tool simplified the command to'), `Expected rewrite note, got: ${trimmed}`);
+				assert.ok(trimmed.endsWith(`${m1}\n${m2}`), `Expected markers at end, got: ${trimmed}`);
+			});
+
+			test('non-zero exit code is reported', async function () {
+				this.timeout(60000);
+
+				// Use a subshell so we don't kill the shared terminal
+				const command = isWindows ? 'cmd /c exit 42' : 'bash -c "exit 42"';
+				const output = await invokeRunInTerminal(command);
+
+				// Without shell integration, exit codes are unavailable.
+				// On Windows with shell integration, `cmd /c exit 42` may report
+				// exit code 1 instead of 42 due to how PowerShell propagates
+				// cmd.exe exit codes through shell integration sequences.
+				const acceptable = [
+					'Command produced no output\nCommand exited with code 42',
+					...(!hasShellIntegration ? ['Command produced no output'] : []),
+					...(isWindows && hasShellIntegration ? ['Command produced no output\nCommand exited with code 1'] : []),
+				];
+				assert.ok(acceptable.includes(output.trim()), `Unexpected output: ${JSON.stringify(output.trim())}`);
+			});
+
+			test('output with special characters is captured verbatim', async function () {
+				this.timeout(60000);
+
+				const marker = `SP_${Date.now()}`;
+				const output = await invokeRunInTerminal(`echo "${marker} hello & world"`);
+
+				assert.strictEqual(output.trim(), `${marker} hello & world`);
+			});
+
+		});
+
+		// --- Sandbox ON tests (macOS and Linux only) ---
+
+		(isWindows ? suite.skip : suite)('sandbox on', () => {
+
+			setup(async () => {
+				const sandboxConfig = vscode.workspace.getConfiguration('chat.tools.terminal.sandbox');
+				await sandboxConfig.update('enabled', true, vscode.ConfigurationTarget.Global);
+			});
+
+			teardown(async () => {
+				const sandboxConfig = vscode.workspace.getConfiguration('chat.tools.terminal.sandbox');
+				await sandboxConfig.update('enabled', undefined, vscode.ConfigurationTarget.Global);
+			});
+
+			test('echo works in sandbox and output is clean', async function () {
+				this.timeout(60000);
+
+				const marker = `SANDBOX_ECHO_${Date.now()}`;
+				const output = await invokeRunInTerminal(`echo ${marker}`);
+
+				assert.strictEqual(output.trim(), marker);
+			});
+
+			test('network requests are blocked', async function () {
+				this.timeout(60000);
+
+				const output = await invokeRunInTerminal('curl -s --max-time 5 https://example.com');
+
+				// Without shell integration, exit code is unavailable and
+				// curl produces no sandbox-specific error strings, so the
+				// sandbox analyzer may not trigger.
+				const acceptable = [
+					[
+						'Command failed while running in sandboxed mode. If the command failed due to sandboxing:',
+						`- If it would be reasonable to extend the sandbox rules, work with the user to update allowWrite for file system access problems in ${sandboxFileSystemSetting}, or to add required domains to chat.tools.terminal.sandbox.network.allowedDomains.`,
+						'- Otherwise, immediately retry the command with requestUnsandboxedExecution=true. Do NOT ask the user \u2014 setting this flag automatically shows a confirmation prompt to the user.',
+						'',
+						'Here is the output of the command:',
+						'',
+						'',
+						'',
+						'Command produced no output',
+						'Command exited with code 56',
+					].join('\n'),
+					...(!hasShellIntegration ? ['Command produced no output'] : []),
+				];
+				assert.ok(acceptable.includes(output.trim()), `Unexpected output: ${JSON.stringify(output.trim())}`);
+			});
+
+			test('cannot write to /tmp', async function () {
+				this.timeout(60000);
+
+				const marker = `SANDBOX_TMP_${Date.now()}`;
+				const output = await invokeRunInTerminal(`echo "${marker}" > /tmp/${marker}.txt`);
+
+				// macOS sandbox-exec returns "Operation not permitted" via /bin/bash;
+				// Linux read-only bind mount returns "Read-only file system" via /usr/bin/bash.
+				// Some shells include "line N:" in the error (e.g. "/usr/bin/bash: line 1: …").
+				const shellError = isMacOS
+					? `/bin/bash: /tmp/${marker}.txt: Operation not permitted`
+					: `/usr/bin/bash: line 1: /tmp/${marker}.txt: Read-only file system`;
+				const sandboxBody = [
+					`- If it would be reasonable to extend the sandbox rules, work with the user to update allowWrite for file system access problems in ${sandboxFileSystemSetting}, or to add required domains to chat.tools.terminal.sandbox.network.allowedDomains.`,
+					'- Otherwise, immediately retry the command with requestUnsandboxedExecution=true. Do NOT ask the user \u2014 setting this flag automatically shows a confirmation prompt to the user.',
+					'',
+					'Here is the output of the command:',
+					'',
+					shellError,
+				].join('\n');
+				const acceptable = [
+					// With shell integration: known failure with exit code
+					`Command failed while running in sandboxed mode. If the command failed due to sandboxing:\n${sandboxBody}\n\nCommand exited with code 1`,
+					// Without shell integration: heuristic detection, no exit code
+					...(!hasShellIntegration ? [`Command ran in sandboxed mode and may have been blocked by the sandbox. If the command failed due to sandboxing:\n${sandboxBody}`] : []),
+				];
+				assert.ok(acceptable.includes(output.trim()), `Unexpected output: ${JSON.stringify(output.trim())}`);
+			});
+
+			test('can read files outside the workspace', async function () {
+				this.timeout(60000);
+
+				const output = await invokeRunInTerminal('head -1 /etc/shells');
+
+				const trimmed = output.trim();
+				// macOS: "# List of acceptable shells for chpass(1)."
+				// Linux: "# /etc/shells: valid login shells"
+				assert.ok(
+					trimmed.startsWith('#'),
+					`Expected a comment line from /etc/shells, got: ${trimmed}`
+				);
+			});
+
+			test('can write inside the workspace folder', async function () {
+				this.timeout(60000);
+
+				const marker = `SANDBOX_WS_${Date.now()}`;
+				const output = await invokeRunInTerminal(`echo "${marker}" > .sandbox-test-${marker}.tmp && cat .sandbox-test-${marker}.tmp && rm .sandbox-test-${marker}.tmp`);
+
+				assert.strictEqual(output.trim(), marker);
+			});
+
+			test('$TMPDIR is writable inside the sandbox', async function () {
+				this.timeout(60000);
+
+				const marker = `SANDBOX_TMPDIR_${Date.now()}`;
+				const output = await invokeRunInTerminal(`echo "${marker}" > "$TMPDIR/${marker}.tmp" && cat "$TMPDIR/${marker}.tmp" && rm "$TMPDIR/${marker}.tmp"`);
+
+				assert.strictEqual(output.trim(), marker);
+			});
+		});
+	}
+});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
index 6ed6c911718..863f18bb29e 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
@@ -60,6 +60,7 @@ suite('chat', () => {
 
 	test('participant and slash command history', async () => {
 		const onRequest = setupParticipant();
+		await commands.executeCommand('workbench.action.chat.newChat');
 		commands.executeCommand('workbench.action.chat.open', { query: '@participant /hello friend' });
 
 		const deferred = new DeferredPromise<void>();
diff --git a/extensions/vscode-colorize-perf-tests/.npmrc b/extensions/vscode-colorize-perf-tests/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/vscode-colorize-perf-tests/.npmrc
+++ b/extensions/vscode-colorize-perf-tests/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/vscode-colorize-tests/.npmrc b/extensions/vscode-colorize-tests/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/vscode-colorize-tests/.npmrc
+++ b/extensions/vscode-colorize-tests/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
index 2b8a1e05fc7..29e53e19941 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json b/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
index 659360a9f42..2536d6cff91 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
index 66807538fed..313fe87c9b6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
@@ -10,7 +10,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
index 0c325bffb21..f62cb7a04dc 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json b/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json
index c8ca0791cb3..40ff4020319 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "markup.deleted: #CE9178",
 			"dark_modern": "markup.deleted: #CE9178",
 			"hc_light": "markup.deleted: #5A5A5A",
-			"light_modern": "markup.deleted: #A31515"
+			"light_modern": "markup.deleted: #A31515",
+			"2026-dark": "markup.deleted: #FFA198",
+			"2026-light": "markup.deleted: #82071E"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "markup.changed: #569CD6",
 			"dark_modern": "markup.changed: #569CD6",
 			"hc_light": "markup.changed: #0451A5",
-			"light_modern": "markup.changed: #0451A5"
+			"light_modern": "markup.changed: #0451A5",
+			"2026-dark": "markup.changed: #FFA657",
+			"2026-light": "markup.changed: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "markup.inserted: #B5CEA8",
 			"dark_modern": "markup.inserted: #B5CEA8",
 			"hc_light": "markup.inserted: #096D48",
-			"light_modern": "markup.inserted: #098658"
+			"light_modern": "markup.inserted: #098658",
+			"2026-dark": "markup.inserted: #7EE787",
+			"2026-light": "markup.inserted: #116329"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json b/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
index cc259fb8072..3c940def854 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
index 71a5a901280..3faabca24ed 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.modifier.package.java: #D4D4D4",
 			"dark_modern": "storage.modifier.package.java: #D4D4D4",
 			"hc_light": "storage.modifier.package.java: #000000",
-			"light_modern": "storage.modifier.package.java: #000000"
+			"light_modern": "storage.modifier.package.java: #000000",
+			"2026-dark": "storage.modifier.package.java: #D4D4D4",
+			"2026-light": "storage.modifier.package.java: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.modifier.import.java: #D4D4D4",
 			"dark_modern": "storage.modifier.import.java: #D4D4D4",
 			"hc_light": "storage.modifier.import.java: #000000",
-			"light_modern": "storage.modifier.import.java: #000000"
+			"light_modern": "storage.modifier.import.java: #000000",
+			"2026-dark": "storage.modifier.import.java: #D4D4D4",
+			"2026-light": "storage.modifier.import.java: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "variable.language.wildcard.java: #D4D4D4",
 			"dark_modern": "variable.language.wildcard.java: #D4D4D4",
 			"hc_light": "variable.language.wildcard.java: #000000",
-			"light_modern": "variable.language.wildcard.java: #000000"
+			"light_modern": "variable.language.wildcard.java: #000000",
+			"2026-dark": "variable.language.wildcard.java: #D4D4D4",
+			"2026-light": "variable.language.wildcard.java: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "storage.type.java: #4EC9B0",
 			"dark_modern": "storage.type.java: #4EC9B0",
 			"hc_light": "storage.type.java: #185E73",
-			"light_modern": "storage.type.java: #267F99"
+			"light_modern": "storage.type.java: #267F99",
+			"2026-dark": "storage.type.java: #C9D1D9",
+			"2026-light": "storage.type.java: #1F2328"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "storage.type.annotation.java: #4EC9B0",
 			"dark_modern": "storage.type.annotation.java: #4EC9B0",
 			"hc_light": "storage.type.annotation.java: #185E73",
-			"light_modern": "storage.type.annotation.java: #267F99"
+			"light_modern": "storage.type.annotation.java: #267F99",
+			"2026-dark": "storage.type.annotation.java: #4EC9B0",
+			"2026-light": "storage.type.annotation.java: #267F99"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "storage.type.annotation.java: #4EC9B0",
 			"dark_modern": "storage.type.annotation.java: #4EC9B0",
 			"hc_light": "storage.type.annotation.java: #185E73",
-			"light_modern": "storage.type.annotation.java: #267F99"
+			"light_modern": "storage.type.annotation.java: #267F99",
+			"2026-dark": "storage.type.annotation.java: #4EC9B0",
+			"2026-light": "storage.type.annotation.java: #267F99"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "storage.type.primitive.java: #4EC9B0",
 			"dark_modern": "storage.type.primitive.java: #4EC9B0",
 			"hc_light": "storage.type.primitive.java: #185E73",
-			"light_modern": "storage.type.primitive.java: #267F99"
+			"light_modern": "storage.type.primitive.java: #267F99",
+			"2026-dark": "storage.type.primitive.java: #4EC9B0",
+			"2026-light": "storage.type.primitive.java: #267F99"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "storage.type.java: #4EC9B0",
 			"dark_modern": "storage.type.java: #4EC9B0",
 			"hc_light": "storage.type.java: #185E73",
-			"light_modern": "storage.type.java: #267F99"
+			"light_modern": "storage.type.java: #267F99",
+			"2026-dark": "storage.type.java: #C9D1D9",
+			"2026-light": "storage.type.java: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "storage.type.generic.java: #4EC9B0",
 			"dark_modern": "storage.type.generic.java: #4EC9B0",
 			"hc_light": "storage.type.generic.java: #185E73",
-			"light_modern": "storage.type.generic.java: #267F99"
+			"light_modern": "storage.type.generic.java: #267F99",
+			"2026-dark": "storage.type.generic.java: #4EC9B0",
+			"2026-light": "storage.type.generic.java: #267F99"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json b/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json
index 0ee7e4c7e7b..e9d6cf7a95d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json
@@ -10,7 +10,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "support.function.git-rebase: #D4D4D4",
 			"dark_modern": "support.function.git-rebase: #9CDCFE",
 			"hc_light": "support.function.git-rebase: #0451A5",
-			"light_modern": "support.function.git-rebase: #0451A5"
+			"light_modern": "support.function.git-rebase: #0451A5",
+			"2026-dark": "support.function.git-rebase: #9CDCFE",
+			"2026-light": "support.function.git-rebase: #0451A5"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "constant.sha.git-rebase: #B5CEA8",
 			"dark_modern": "constant.sha.git-rebase: #B5CEA8",
 			"hc_light": "constant.sha.git-rebase: #096D48",
-			"light_modern": "constant.sha.git-rebase: #098658"
+			"light_modern": "constant.sha.git-rebase: #098658",
+			"2026-dark": "constant.sha.git-rebase: #B5CEA8",
+			"2026-light": "constant.sha.git-rebase: #098658"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
index cc1450808af..79a50ebdd99 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
@@ -10,7 +10,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
index f79882e54e4..b4f2e6ace85 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
index fa41ab9c049..9eb9486d8dc 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded.begin.php: #569CD6",
 			"hc_light": "punctuation.section.embedded.begin.php: #0F4A85",
-			"light_modern": "punctuation.section.embedded.begin.php: #800000"
+			"light_modern": "punctuation.section.embedded.begin.php: #800000",
+			"2026-dark": "punctuation.section.embedded.begin.php: #569CD6",
+			"2026-light": "punctuation.section.embedded.begin.php: #800000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded.end.php: #569CD6",
 			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
-			"light_modern": "punctuation.section.embedded.end.php: #800000"
+			"light_modern": "punctuation.section.embedded.end.php: #800000",
+			"2026-dark": "punctuation.section.embedded.end.php: #569CD6",
+			"2026-light": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded.end.php: #569CD6",
 			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
-			"light_modern": "punctuation.section.embedded.end.php: #800000"
+			"light_modern": "punctuation.section.embedded.end.php: #800000",
+			"2026-dark": "punctuation.section.embedded.end.php: #569CD6",
+			"2026-light": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
index c8c2d57d903..13dc4c598f7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
index e5267d62494..2f6eb3e93eb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
@@ -10,7 +10,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.yaml: #0F4A85",
-			"light_modern": "string.quoted.single.yaml: #0000FF"
+			"light_modern": "string.quoted.single.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.yaml: #0000FF"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json
index 60bff0cddfc..bfba2dcb652 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
index b03ac95a7f9..f6a052d63ec 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
@@ -10,7 +10,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json b/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json
index 1f650e7f45e..dd6c51aa4a7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json
index 2309da55308..bdf2f055252 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json
index d32ea47f217..13c4ff8294f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json
index cadc88d9671..4ef477bf4db 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173216_sh.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json
index 4c038d48fdd..a9bb5ecd476 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173224_sh.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json
index c1875bfa986..48ff14f29e9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
index 79e4727a417..0c0b6e7d502 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
index a5e6addc3b1..b35aa692ff3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
index 67b874115af..2821d886e3b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json
index 645a855fc16..c210408f519 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json
@@ -10,7 +10,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
index 0dc90cecce7..42e5a16d283 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
@@ -10,7 +10,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
-			"light_modern": "string.comment.buffered.block.pug: #0000FF"
+			"light_modern": "string.comment.buffered.block.pug: #0000FF",
+			"2026-dark": "string.comment: #8B949E",
+			"2026-light": "string.comment.buffered.block.pug: #0000FF"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
index 9897e09a654..0089834fa46 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
index 3c4f2e0571d..48cc3fe2de2 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
index 16438692b78..46c06c5be95 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
 			"dark_modern": "entity.name.scope-resolution: #4EC9B0",
 			"hc_light": "entity.name.scope-resolution: #185E73",
-			"light_modern": "entity.name.scope-resolution: #267F99"
+			"light_modern": "entity.name.scope-resolution: #267F99",
+			"2026-dark": "entity.name.scope-resolution: #4EC9B0",
+			"2026-light": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json
index c3eebff0ef4..be2a1a5432c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
 			"dark_modern": "entity.name.scope-resolution: #4EC9B0",
 			"hc_light": "entity.name.scope-resolution: #185E73",
-			"light_modern": "entity.name.scope-resolution: #267F99"
+			"light_modern": "entity.name.scope-resolution: #267F99",
+			"2026-dark": "entity.name.scope-resolution: #4EC9B0",
+			"2026-light": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json
index 2b5d45b6adb..6867522ef47 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
index 3381f6448d0..835a5985b12 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "entity.name.tag.less: #D7BA7D",
 			"dark_modern": "entity.name.tag.less: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.less: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
index e78169f5e01..bea21f5c872 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
@@ -10,7 +10,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
index 5e41ff044b4..c6d27e1926b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.html: #0F4A85",
-			"light_modern": "string.unquoted.html: #0000FF"
+			"light_modern": "string.unquoted.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.html: #0000FF"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.html: #0F4A85",
-			"light_modern": "string.unquoted.html: #0000FF"
+			"light_modern": "string.unquoted.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.html: #0000FF"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
index 432ecde8cce..b47d0647da1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json
index 50919dc27de..c845bfb9c68 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json
index a45de974884..cd4360068db 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
index 68717cc4939..85c2bdcbad4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
index da9e674e46c..c86f2c0b9e4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.enummember: #4FC1FF",
 			"hc_light": "variable.other.enummember: #02715D",
-			"light_modern": "variable.other.enummember: #0070C1"
+			"light_modern": "variable.other.enummember: #0070C1",
+			"2026-dark": "variable.other.enummember: #79C0FF",
+			"2026-light": "variable.other.enummember: #0550AE"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
index c1988500c97..3240d1b770e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
index 4282511c5e8..c2106dfa307 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json
index 177ea3c978c..3db2af531ff 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json
index 130b3a92fcc..a92de7c1653 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
index a365ac3d098..d20d078d41b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json
index 748ac943c3c..6923cf3c3c0 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json
index 1b1f1bb887c..044213ca32e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
index 64a84418eb3..beb4bc62753 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
@@ -10,7 +10,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.character-class.regexp: #D16969",
 			"hc_light": "constant.character.character-class.regexp: #811F3F",
-			"light_modern": "constant.character.character-class.regexp: #811F3F"
+			"light_modern": "constant.character.character-class.regexp: #811F3F",
+			"2026-dark": "constant.character.character-class.regexp: #D16969",
+			"2026-light": "constant.character.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "source.coffee.embedded: #D4D4D4",
 			"dark_modern": "source.coffee.embedded: #9CDCFE",
 			"hc_light": "source.coffee.embedded: #264F78",
-			"light_modern": "source.coffee.embedded: #E50000"
+			"light_modern": "source.coffee.embedded: #E50000",
+			"2026-dark": "source.coffee.embedded: #9CDCFE",
+			"2026-light": "source.coffee.embedded: #E50000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json
index 8c1a7f610c2..3d8f45d2d0b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json
index c138146ccbc..46b5cad7c2f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
index a20f8fe4a3b..945240fe8a3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
@@ -10,7 +10,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
index 7d7b3bbe3e5..ca48e1499fd 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
index 4fa10b042fa..c7ae8c8640c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
index 853018d8458..8568987fce8 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json b/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json
index 0bf691548b3..acdb0b8d485 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bib.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_c.json b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
index fbbf86a1c70..95985d729b2 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
index 19e19cec621..5ce572d43bb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
 			"dark_modern": "entity.name.scope-resolution: #4EC9B0",
 			"hc_light": "entity.name.scope-resolution: #185E73",
-			"light_modern": "entity.name.scope-resolution: #267F99"
+			"light_modern": "entity.name.scope-resolution: #267F99",
+			"2026-dark": "entity.name.scope-resolution: #4EC9B0",
+			"2026-light": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "source.cpp keyword.operator.new: #C586C0",
 			"dark_modern": "source.cpp keyword.operator.new: #C586C0",
 			"hc_light": "source.cpp keyword.operator.new: #B5200D",
-			"light_modern": "source.cpp keyword.operator.new: #AF00DB"
+			"light_modern": "source.cpp keyword.operator.new: #AF00DB",
+			"2026-dark": "source.cpp keyword.operator.new: #C586C0",
+			"2026-light": "source.cpp keyword.operator.new: #AF00DB"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded.assembly: #CE9178",
 			"hc_light": "meta.embedded.assembly: #0F4A85",
-			"light_modern": "meta.embedded.assembly: #A31515"
+			"light_modern": "meta.embedded.assembly: #A31515",
+			"2026-dark": "meta.embedded.assembly: #CE9178",
+			"2026-light": "meta.embedded.assembly: #A31515"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
index 23597c44358..5b8beedb069 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "storage: #569CD6",
 			"dark_modern": "storage: #569CD6",
 			"hc_light": "storage: #0F4A85",
-			"light_modern": "storage: #0000FF"
+			"light_modern": "storage: #0000FF",
+			"2026-dark": "storage: #FF7B72",
+			"2026-light": "storage: #CF222E"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json b/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json
index 5403d20a7d8..c6b61a29a44 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_code-snippets.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
index 52efa92c373..931349e7e5d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
@@ -10,7 +10,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.character-class.regexp: #D16969",
 			"hc_light": "constant.character.character-class.regexp: #811F3F",
-			"light_modern": "constant.character.character-class.regexp: #811F3F"
+			"light_modern": "constant.character.character-class.regexp: #811F3F",
+			"2026-dark": "constant.character.character-class.regexp: #D16969",
+			"2026-light": "constant.character.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.character-class.regexp: #D16969",
 			"hc_light": "constant.character.character-class.regexp: #811F3F",
-			"light_modern": "constant.character.character-class.regexp: #811F3F"
+			"light_modern": "constant.character.character-class.regexp: #811F3F",
+			"2026-dark": "constant.character.character-class.regexp: #D16969",
+			"2026-light": "constant.character.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control.anchor.regexp: #DCDCAA",
 			"hc_light": "keyword.control.anchor.regexp: #EE0000",
-			"light_modern": "keyword.control.anchor.regexp: #EE0000"
+			"light_modern": "keyword.control.anchor.regexp: #EE0000",
+			"2026-dark": "keyword.control.anchor.regexp: #DCDCAA",
+			"2026-light": "keyword.control.anchor.regexp: #EE0000"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
index 652cc4824eb..ca010005fb1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.other.using: #C586C0",
 			"dark_modern": "keyword.other.using: #C586C0",
 			"hc_light": "keyword.other.using: #B5200D",
-			"light_modern": "keyword.other.using: #AF00DB"
+			"light_modern": "keyword.other.using: #AF00DB",
+			"2026-dark": "keyword.other.using: #C586C0",
+			"2026-light": "keyword.other.using: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.namespace: #4EC9B0",
 			"dark_modern": "entity.name.namespace: #4EC9B0",
 			"hc_light": "entity.name.namespace: #185E73",
-			"light_modern": "entity.name.namespace: #267F99"
+			"light_modern": "entity.name.namespace: #267F99",
+			"2026-dark": "entity.name.namespace: #4EC9B0",
+			"2026-light": "entity.name.namespace: #267F99"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
 			"dark_modern": "entity.name.scope-resolution: #4EC9B0",
 			"hc_light": "entity.name.scope-resolution: #185E73",
-			"light_modern": "entity.name.scope-resolution: #267F99"
+			"light_modern": "entity.name.scope-resolution: #267F99",
+			"2026-dark": "entity.name.scope-resolution: #4EC9B0",
+			"2026-light": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "keyword.other.operator: #C586C0",
 			"dark_modern": "keyword.other.operator: #C586C0",
 			"hc_light": "keyword.other.operator: #B5200D",
-			"light_modern": "keyword.other.operator: #AF00DB"
+			"light_modern": "keyword.other.operator: #AF00DB",
+			"2026-dark": "keyword.other.operator: #C586C0",
+			"2026-light": "keyword.other.operator: #AF00DB"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.operator.custom-literal: #DCDCAA",
 			"hc_light": "entity.name.operator.custom-literal: #5E2CBC",
-			"light_modern": "entity.name.operator.custom-literal: #795E26"
+			"light_modern": "entity.name.operator.custom-literal: #795E26",
+			"2026-dark": "entity.name.operator.custom-literal: #DCDCAA",
+			"2026-light": "entity.name.operator.custom-literal: #795E26"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.operator.custom-literal: #DCDCAA",
 			"hc_light": "entity.name.operator.custom-literal: #5E2CBC",
-			"light_modern": "entity.name.operator.custom-literal: #795E26"
+			"light_modern": "entity.name.operator.custom-literal: #795E26",
+			"2026-dark": "entity.name.operator.custom-literal: #DCDCAA",
+			"2026-light": "entity.name.operator.custom-literal: #795E26"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded.assembly: #CE9178",
 			"hc_light": "meta.embedded.assembly: #0F4A85",
-			"light_modern": "meta.embedded.assembly: #A31515"
+			"light_modern": "meta.embedded.assembly: #A31515",
+			"2026-dark": "meta.embedded.assembly: #CE9178",
+			"2026-light": "meta.embedded.assembly: #A31515"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "entity.name.scope-resolution: #4EC9B0",
 			"dark_modern": "entity.name.scope-resolution: #4EC9B0",
 			"hc_light": "entity.name.scope-resolution: #185E73",
-			"light_modern": "entity.name.scope-resolution: #267F99"
+			"light_modern": "entity.name.scope-resolution: #267F99",
+			"2026-dark": "entity.name.scope-resolution: #4EC9B0",
+			"2026-light": "entity.name.scope-resolution: #267F99"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
index 7f4bbb7758b..74bfd23f96f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.other.directive.using: #C586C0",
 			"dark_modern": "keyword.other.directive.using: #C586C0",
 			"hc_light": "keyword.other.directive.using: #B5200D",
-			"light_modern": "keyword.other.directive.using: #AF00DB"
+			"light_modern": "keyword.other.directive.using: #AF00DB",
+			"2026-dark": "keyword.other.directive.using: #C586C0",
+			"2026-light": "keyword.other.directive.using: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
index 4307f03ed1e..f6990babe9d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "entity.name.variable: #9CDCFE",
 			"hc_light": "entity.name.variable: #001080",
-			"light_modern": "entity.name.variable: #001080"
+			"light_modern": "entity.name.variable: #001080",
+			"2026-dark": "entity.name.variable: #9CDCFE",
+			"2026-light": "entity.name.variable: #001080"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
index 71722fd00db..f2936b89cec 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.deprecated: #FFA198",
+			"2026-light": "invalid.deprecated: #82071E"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.deprecated: #FFA198",
+			"2026-light": "invalid.deprecated: #82071E"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.deprecated: #FFA198",
+			"2026-light": "invalid.deprecated: #82071E"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.deprecated: #FFA198",
+			"2026-light": "invalid.deprecated: #82071E"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.deprecated: #FFA198",
+			"2026-light": "invalid.deprecated: #82071E"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -9250,7 +10570,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -9264,7 +10586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9278,7 +10602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9292,7 +10618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9306,7 +10634,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9320,7 +10650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9334,7 +10666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9348,7 +10682,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9362,7 +10698,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9376,7 +10714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9390,7 +10730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9404,7 +10746,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9418,7 +10762,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9432,7 +10778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9446,7 +10794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9460,7 +10810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9474,7 +10826,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9488,7 +10842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9502,7 +10858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9516,7 +10874,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9530,7 +10890,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9544,7 +10906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9558,7 +10922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9572,7 +10938,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9586,7 +10954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9600,7 +10970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9614,7 +10986,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9628,7 +11002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9642,7 +11018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9656,7 +11034,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9670,7 +11050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9684,7 +11066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9698,7 +11082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9712,7 +11098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9726,7 +11114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9740,7 +11130,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9754,7 +11146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9768,7 +11162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9782,7 +11178,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9796,7 +11194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9810,7 +11210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9824,7 +11226,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9838,7 +11242,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9852,7 +11258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9866,7 +11274,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9880,7 +11290,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9894,7 +11306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9908,7 +11322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9922,7 +11338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9936,7 +11354,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9950,7 +11370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9964,7 +11386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9978,7 +11402,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9992,7 +11418,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10006,7 +11434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10020,7 +11450,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -10034,7 +11466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10048,7 +11482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10062,7 +11498,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -10076,7 +11514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10090,7 +11530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10104,7 +11546,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10118,7 +11562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10132,7 +11578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10146,7 +11594,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10160,7 +11610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10174,7 +11626,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -10188,7 +11642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10202,7 +11658,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10216,7 +11674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10230,7 +11690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10244,7 +11706,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10258,7 +11722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10272,7 +11738,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10286,7 +11754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10300,7 +11770,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -10314,7 +11786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10328,7 +11802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10342,7 +11818,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10356,7 +11834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10370,7 +11850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10384,7 +11866,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10398,7 +11882,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10412,7 +11898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10426,7 +11914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10440,7 +11930,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10454,7 +11946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10468,7 +11962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10482,7 +11978,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10496,7 +11994,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10510,7 +12010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10524,7 +12026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10538,7 +12042,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10552,7 +12058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10566,7 +12074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10580,7 +12090,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10594,7 +12106,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10608,7 +12122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10622,7 +12138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10636,7 +12154,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -10650,7 +12170,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -10664,7 +12186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10678,7 +12202,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -10692,7 +12218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10706,7 +12234,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -10720,7 +12250,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -10734,7 +12266,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -10748,7 +12282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10762,7 +12298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10776,7 +12314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10790,7 +12330,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -10804,7 +12346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10818,7 +12362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10832,7 +12378,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -10846,7 +12394,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -10860,7 +12410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10874,7 +12426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10888,7 +12442,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -10902,7 +12458,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -10916,7 +12474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10930,7 +12490,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -10944,7 +12506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10958,7 +12522,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -10972,7 +12538,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -10986,7 +12554,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -11000,7 +12570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11014,7 +12586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11028,7 +12602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11042,7 +12618,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11056,7 +12634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11070,7 +12650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11084,7 +12666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11098,7 +12682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11112,7 +12698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11126,7 +12714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11140,7 +12730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11154,7 +12746,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11168,7 +12762,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11182,7 +12778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11196,7 +12794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11210,7 +12810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11224,7 +12826,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11238,7 +12842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11252,7 +12858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11266,7 +12874,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -11280,7 +12890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11294,7 +12906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11308,7 +12922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -11322,7 +12938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11336,7 +12954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11350,7 +12970,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11364,7 +12986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11378,7 +13002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11392,7 +13018,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -11406,7 +13034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11420,7 +13050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11434,7 +13066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11448,7 +13082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11462,7 +13098,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11476,7 +13114,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11490,7 +13130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11504,7 +13146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11518,7 +13162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11532,7 +13178,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11546,7 +13194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11560,7 +13210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11574,7 +13226,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -11588,7 +13242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11602,7 +13258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11616,7 +13274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -11630,7 +13290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11644,7 +13306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11658,7 +13322,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11672,7 +13338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11686,7 +13354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11700,7 +13370,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -11714,7 +13386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11728,7 +13402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11742,7 +13418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11756,7 +13434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11770,7 +13450,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11784,7 +13466,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -11798,7 +13482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11812,7 +13498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11826,7 +13514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11840,7 +13530,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11854,7 +13546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11868,7 +13562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11882,7 +13578,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -11896,7 +13594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11910,7 +13610,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -11924,7 +13626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11938,7 +13642,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11952,7 +13658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11966,7 +13674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11980,7 +13690,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -11994,7 +13706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12008,7 +13722,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12022,7 +13738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12036,7 +13754,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12050,7 +13770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12064,7 +13786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12078,7 +13802,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12092,7 +13818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12106,7 +13834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12120,7 +13850,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12134,7 +13866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12148,7 +13882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12162,7 +13898,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12176,7 +13914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12190,7 +13930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12204,7 +13946,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12218,7 +13962,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12232,7 +13978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12246,7 +13994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12260,7 +14010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12274,7 +14026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12288,7 +14042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12302,7 +14058,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12316,7 +14074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12330,7 +14090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12344,7 +14106,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12358,7 +14122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12372,7 +14138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12386,7 +14154,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12400,7 +14170,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12414,7 +14186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12428,7 +14202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12442,7 +14218,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12456,7 +14234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12470,7 +14250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12484,7 +14266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12498,7 +14282,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12512,7 +14298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12526,7 +14314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12540,7 +14330,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12554,7 +14346,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12568,7 +14362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12582,7 +14378,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12596,7 +14394,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -12610,7 +14410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12624,7 +14426,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -12638,7 +14442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12652,7 +14458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12666,7 +14474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12680,7 +14490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12694,7 +14506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12708,7 +14522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12722,7 +14538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12736,7 +14554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12750,7 +14570,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12764,7 +14586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12778,7 +14602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12792,7 +14618,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12806,7 +14634,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12820,7 +14650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12834,7 +14666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12848,7 +14682,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -12862,7 +14698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12876,7 +14714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12890,7 +14730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12904,7 +14746,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12918,7 +14762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12932,7 +14778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12946,7 +14794,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12960,7 +14810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12974,7 +14826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12988,7 +14842,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13002,7 +14858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13016,7 +14874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13030,7 +14890,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13044,7 +14906,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -13058,7 +14922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13072,7 +14938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13086,7 +14954,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13100,7 +14970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13114,7 +14986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13128,7 +15002,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13142,7 +15018,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -13156,7 +15034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13170,7 +15050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13184,7 +15066,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -13198,7 +15082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13212,7 +15098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13226,7 +15114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13240,7 +15130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13254,7 +15146,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13268,7 +15162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13282,7 +15178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13296,7 +15194,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13310,7 +15210,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -13324,7 +15226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13338,7 +15242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13352,7 +15258,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -13366,7 +15274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13380,7 +15290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13394,7 +15306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13408,7 +15322,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -13422,7 +15338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13436,7 +15354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13450,7 +15370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13464,7 +15386,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -13478,7 +15402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13492,7 +15418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13506,7 +15434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13520,7 +15450,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13534,7 +15466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13548,7 +15482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13562,7 +15498,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13576,7 +15514,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -13590,7 +15530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13604,7 +15546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13618,7 +15562,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -13632,7 +15578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13646,7 +15594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13660,7 +15610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13674,7 +15626,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13688,7 +15642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13702,7 +15658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13716,7 +15674,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -13730,7 +15690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13744,7 +15706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
index e926933337e..96a5084192d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function.preprocessor: #569CD6",
 			"hc_light": "entity.name.function.preprocessor: #0F4A85",
-			"light_modern": "entity.name.function.preprocessor: #0000FF"
+			"light_modern": "entity.name.function.preprocessor: #0000FF",
+			"2026-dark": "entity.name.function.preprocessor: #569CD6",
+			"2026-light": "entity.name.function.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "keyword.operator.cast: #569CD6",
 			"dark_modern": "keyword.operator.cast: #569CD6",
 			"hc_light": "keyword.operator.cast: #0F4A85",
-			"light_modern": "keyword.operator.cast: #0000FF"
+			"light_modern": "keyword.operator.cast: #0000FF",
+			"2026-dark": "keyword.operator.cast: #569CD6",
+			"2026-light": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9250,7 +10570,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9264,7 +10586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9278,7 +10602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9292,7 +10618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9306,7 +10634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9320,7 +10650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9334,7 +10666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9348,7 +10682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9362,7 +10698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9376,7 +10714,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9390,7 +10730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9404,7 +10746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9418,7 +10762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9432,7 +10778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9446,7 +10794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9460,7 +10810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9474,7 +10826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9488,7 +10842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9502,7 +10858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9516,7 +10874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9530,7 +10890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9544,7 +10906,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9558,7 +10922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9572,7 +10938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9586,7 +10954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9600,7 +10970,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9614,7 +10986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9628,7 +11002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9642,7 +11018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9656,7 +11034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9670,7 +11050,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9684,7 +11066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9698,7 +11082,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9712,7 +11098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9726,7 +11114,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9740,7 +11130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9754,7 +11146,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9768,7 +11162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9782,7 +11178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9796,7 +11194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9810,7 +11210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9824,7 +11226,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -9838,7 +11242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9852,7 +11258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9866,7 +11274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9880,7 +11290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9894,7 +11306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9908,7 +11322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9922,7 +11338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9936,7 +11354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9950,7 +11370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9964,7 +11386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9978,7 +11402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9992,7 +11418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10006,7 +11434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10020,7 +11450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10034,7 +11466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10048,7 +11482,9 @@
 			"hc_black": "keyword.operator.cast: #569CD6",
 			"dark_modern": "keyword.operator.cast: #569CD6",
 			"hc_light": "keyword.operator.cast: #0F4A85",
-			"light_modern": "keyword.operator.cast: #0000FF"
+			"light_modern": "keyword.operator.cast: #0000FF",
+			"2026-dark": "keyword.operator.cast: #569CD6",
+			"2026-light": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -10062,7 +11498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10076,7 +11514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10090,7 +11530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10104,7 +11546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10118,7 +11562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10132,7 +11578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10146,7 +11594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10160,7 +11610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10174,7 +11626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10188,7 +11642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10202,7 +11658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10216,7 +11674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10230,7 +11690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10244,7 +11706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10258,7 +11722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10272,7 +11738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10286,7 +11754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10300,7 +11770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10314,7 +11786,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10328,7 +11802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10342,7 +11818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10356,7 +11834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10370,7 +11850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10384,7 +11866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10398,7 +11882,9 @@
 			"hc_black": "keyword.operator.cast: #569CD6",
 			"dark_modern": "keyword.operator.cast: #569CD6",
 			"hc_light": "keyword.operator.cast: #0F4A85",
-			"light_modern": "keyword.operator.cast: #0000FF"
+			"light_modern": "keyword.operator.cast: #0000FF",
+			"2026-dark": "keyword.operator.cast: #569CD6",
+			"2026-light": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -10412,7 +11898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10426,7 +11914,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10440,7 +11930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10454,7 +11946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10468,7 +11962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10482,7 +11978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10496,7 +11994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10510,7 +12010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10524,7 +12026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10538,7 +12042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10552,7 +12058,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10566,7 +12074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10580,7 +12090,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10594,7 +12106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10608,7 +12122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10622,7 +12138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10636,7 +12154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10650,7 +12170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10664,7 +12186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10678,7 +12202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10692,7 +12218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10706,7 +12234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10720,7 +12250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10734,7 +12266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10748,7 +12282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10762,7 +12298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10776,7 +12314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10790,7 +12330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10804,7 +12346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10818,7 +12362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10832,7 +12378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10846,7 +12394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10860,7 +12410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10874,7 +12426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10888,7 +12442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10902,7 +12458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10916,7 +12474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10930,7 +12490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10944,7 +12506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10958,7 +12522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10972,7 +12538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10986,7 +12554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11000,7 +12570,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11014,7 +12586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11028,7 +12602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11042,7 +12618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11056,7 +12634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11070,7 +12650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11084,7 +12666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11098,7 +12682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11112,7 +12698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11126,7 +12714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11140,7 +12730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11154,7 +12746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11168,7 +12762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11182,7 +12778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11196,7 +12794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11210,7 +12810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11224,7 +12826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11238,7 +12842,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11252,7 +12858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11266,7 +12874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11280,7 +12890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11294,7 +12906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11308,7 +12922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11322,7 +12938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11336,7 +12954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11350,7 +12970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11364,7 +12986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11378,7 +13002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11392,7 +13018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11406,7 +13034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11420,7 +13050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11434,7 +13066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11448,7 +13082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11462,7 +13098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11476,7 +13114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11490,7 +13130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11504,7 +13146,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11518,7 +13162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11532,7 +13178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11546,7 +13194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11560,7 +13210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11574,7 +13226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11588,7 +13242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11602,7 +13258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11616,7 +13274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11630,7 +13290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11644,7 +13306,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11658,7 +13322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11672,7 +13338,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11686,7 +13354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11700,7 +13370,9 @@
 			"hc_black": "keyword.operator.cast: #569CD6",
 			"dark_modern": "keyword.operator.cast: #569CD6",
 			"hc_light": "keyword.operator.cast: #0F4A85",
-			"light_modern": "keyword.operator.cast: #0000FF"
+			"light_modern": "keyword.operator.cast: #0000FF",
+			"2026-dark": "keyword.operator.cast: #569CD6",
+			"2026-light": "keyword.operator.cast: #0000FF"
 		}
 	},
 	{
@@ -11714,7 +13386,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11728,7 +13402,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -11742,7 +13418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11756,7 +13434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11770,7 +13450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11784,7 +13466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11798,7 +13482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11812,7 +13498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11826,7 +13514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11840,7 +13530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11854,7 +13546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11868,7 +13562,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -11882,7 +13578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11896,7 +13594,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -11910,7 +13610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11924,7 +13626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11938,7 +13642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11952,7 +13658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11966,7 +13674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11980,7 +13690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11994,7 +13706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12008,7 +13722,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12022,7 +13738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12036,7 +13754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12050,7 +13770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12064,7 +13786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12078,7 +13802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12092,7 +13818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12106,7 +13834,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -12120,7 +13850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12134,7 +13866,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -12148,7 +13882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12162,7 +13898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12176,7 +13914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12190,7 +13930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12204,7 +13946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12218,7 +13962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12232,7 +13978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12246,7 +13994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12260,7 +14010,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12274,7 +14026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12288,7 +14042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12302,7 +14058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12316,7 +14074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12330,7 +14090,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12344,7 +14106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12358,7 +14122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12372,7 +14138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12386,7 +14154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12400,7 +14170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12414,7 +14186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12428,7 +14202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12442,7 +14218,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12456,7 +14234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12470,7 +14250,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12484,7 +14266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12498,7 +14282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12512,7 +14298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12526,7 +14314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12540,7 +14330,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -12554,7 +14346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12568,7 +14362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -12582,7 +14378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12596,7 +14394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12610,7 +14410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12624,7 +14426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12638,7 +14442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12652,7 +14458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12666,7 +14474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12680,7 +14490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12694,7 +14506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12708,7 +14522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12722,7 +14538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12736,7 +14554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12750,7 +14570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12764,7 +14586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12778,7 +14602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12792,7 +14618,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12806,7 +14634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12820,7 +14650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12834,7 +14666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12848,7 +14682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12862,7 +14698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12876,7 +14714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12890,7 +14730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12904,7 +14746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12918,7 +14762,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12932,7 +14778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12946,7 +14794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12960,7 +14810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12974,7 +14826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12988,7 +14842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13002,7 +14858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13016,7 +14874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13030,7 +14890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13044,7 +14906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13058,7 +14922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13072,7 +14938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13086,7 +14954,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13100,7 +14970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13114,7 +14986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13128,7 +15002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13142,7 +15018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13156,7 +15034,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13170,7 +15050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13184,7 +15066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13198,7 +15082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13212,7 +15098,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -13226,7 +15114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13240,7 +15130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13254,7 +15146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13268,7 +15162,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13282,7 +15178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13296,7 +15194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13310,7 +15210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13324,7 +15226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13338,7 +15242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13352,7 +15258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13366,7 +15274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13380,7 +15290,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13394,7 +15306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13408,7 +15322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13422,7 +15338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13436,7 +15354,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -13450,7 +15370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13464,7 +15386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13478,7 +15402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13492,7 +15418,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13506,7 +15434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13520,7 +15450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13534,7 +15466,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13548,7 +15482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13562,7 +15498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13576,7 +15514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13590,7 +15530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13604,7 +15546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13618,7 +15562,9 @@
 			"hc_black": "keyword.operator.sizeof: #569CD6",
 			"dark_modern": "keyword.operator.sizeof: #569CD6",
 			"hc_light": "keyword.operator.sizeof: #0F4A85",
-			"light_modern": "keyword.operator.sizeof: #0000FF"
+			"light_modern": "keyword.operator.sizeof: #0000FF",
+			"2026-dark": "keyword.operator.sizeof: #569CD6",
+			"2026-light": "keyword.operator.sizeof: #0000FF"
 		}
 	},
 	{
@@ -13632,7 +15578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13646,7 +15594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13660,7 +15610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13674,7 +15626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13688,7 +15642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13702,7 +15658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13716,7 +15674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13730,7 +15690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13744,7 +15706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13758,7 +15722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13772,7 +15738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13786,7 +15754,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13800,7 +15770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13814,7 +15786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13828,7 +15802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13842,7 +15818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13856,7 +15834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13870,7 +15850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13884,7 +15866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13898,7 +15882,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13912,7 +15898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13926,7 +15914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13940,7 +15930,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -13954,7 +15946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13968,7 +15962,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13982,7 +15978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13996,7 +15994,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14010,7 +16010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14024,7 +16026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14038,7 +16042,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14052,7 +16058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14066,7 +16074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14080,7 +16090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14094,7 +16106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14108,7 +16122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14122,7 +16138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14136,7 +16154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14150,7 +16170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14164,7 +16186,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14178,7 +16202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14192,7 +16218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14206,7 +16234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14220,7 +16250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14234,7 +16266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14248,7 +16282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14262,7 +16298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14276,7 +16314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14290,7 +16330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14304,7 +16346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14318,7 +16362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14332,7 +16378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14346,7 +16394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -14360,7 +16410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14374,7 +16426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14388,7 +16442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14402,7 +16458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14416,7 +16474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14430,7 +16490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14444,7 +16506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -14458,7 +16522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14472,7 +16538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -14486,7 +16554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14500,7 +16570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -14514,7 +16586,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -14528,7 +16602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14542,7 +16618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14556,7 +16634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14570,7 +16650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14584,7 +16666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14598,7 +16682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14612,7 +16698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14626,7 +16714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14640,7 +16730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14654,7 +16746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14668,7 +16762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14682,7 +16778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14696,7 +16794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14710,7 +16810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14724,7 +16826,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -14738,7 +16842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14752,7 +16858,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14766,7 +16874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14780,7 +16890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14794,7 +16906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14808,7 +16922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14822,7 +16938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14836,7 +16954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14850,7 +16970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14864,7 +16986,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -14878,7 +17002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14892,7 +17018,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -14906,7 +17034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14920,7 +17050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14934,7 +17066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14948,7 +17082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14962,7 +17098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14976,7 +17114,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -14990,7 +17130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15004,7 +17146,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -15018,7 +17162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15032,7 +17178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15046,7 +17194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15060,7 +17210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15074,7 +17226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15088,7 +17242,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -15102,7 +17258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15116,7 +17274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15130,7 +17290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15144,7 +17306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15158,7 +17322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -15172,7 +17338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -15186,7 +17354,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -15200,7 +17370,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -15214,7 +17386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15228,7 +17402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15242,7 +17418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15256,7 +17434,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -15270,7 +17450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15284,7 +17466,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15298,7 +17482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15312,7 +17498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15326,7 +17514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
index dc43f74e3c8..8d9567624fa 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json b/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json
index 238ca7a5d02..ee583633bcc 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_diff.json
@@ -10,7 +10,9 @@
 			"hc_black": "meta.diff.header: #000080",
 			"dark_modern": "meta.diff.header: #569CD6",
 			"hc_light": "meta.diff.header: #062F4A",
-			"light_modern": "meta.diff.header: #000080"
+			"light_modern": "meta.diff.header: #000080",
+			"2026-dark": "meta.diff.header: #79C0FF",
+			"2026-light": "meta.diff.header: #0550AE"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "meta.diff.header: #000080",
 			"dark_modern": "meta.diff.header: #569CD6",
 			"hc_light": "meta.diff.header: #062F4A",
-			"light_modern": "meta.diff.header: #000080"
+			"light_modern": "meta.diff.header: #000080",
+			"2026-dark": "meta.diff.header.from-file: #FFA198",
+			"2026-light": "meta.diff.header.from-file: #82071E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "meta.diff.header: #000080",
 			"dark_modern": "meta.diff.header: #569CD6",
 			"hc_light": "meta.diff.header: #062F4A",
-			"light_modern": "meta.diff.header: #000080"
+			"light_modern": "meta.diff.header: #000080",
+			"2026-dark": "meta.diff.header.from-file: #FFA198",
+			"2026-light": "meta.diff.header.from-file: #82071E"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "meta.diff.header: #000080",
 			"dark_modern": "meta.diff.header: #569CD6",
 			"hc_light": "meta.diff.header: #062F4A",
-			"light_modern": "meta.diff.header: #000080"
+			"light_modern": "meta.diff.header: #000080",
+			"2026-dark": "meta.diff.header.to-file: #7EE787",
+			"2026-light": "meta.diff.header.to-file: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "meta.diff.header: #000080",
 			"dark_modern": "meta.diff.header: #569CD6",
 			"hc_light": "meta.diff.header: #062F4A",
-			"light_modern": "meta.diff.header: #000080"
+			"light_modern": "meta.diff.header: #000080",
+			"2026-dark": "meta.diff.header.to-file: #7EE787",
+			"2026-light": "meta.diff.header.to-file: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.diff.range: #D2A8FF",
+			"2026-light": "meta.diff.range: #8250DF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.diff.range: #D2A8FF",
+			"2026-light": "meta.diff.range: #8250DF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.diff.range: #D2A8FF",
+			"2026-light": "meta.diff.range: #8250DF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.diff.range: #D2A8FF",
+			"2026-light": "meta.diff.range: #8250DF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.diff.range: #D2A8FF",
+			"2026-light": "meta.diff.range: #8250DF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "markup.deleted: #CE9178",
 			"dark_modern": "markup.deleted: #CE9178",
 			"hc_light": "markup.deleted: #5A5A5A",
-			"light_modern": "markup.deleted: #A31515"
+			"light_modern": "markup.deleted: #A31515",
+			"2026-dark": "punctuation.definition.deleted: #FFA198",
+			"2026-light": "punctuation.definition.deleted: #82071E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "markup.deleted: #CE9178",
 			"dark_modern": "markup.deleted: #CE9178",
 			"hc_light": "markup.deleted: #5A5A5A",
-			"light_modern": "markup.deleted: #A31515"
+			"light_modern": "markup.deleted: #A31515",
+			"2026-dark": "markup.deleted: #FFA198",
+			"2026-light": "markup.deleted: #82071E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "markup.inserted: #B5CEA8",
 			"dark_modern": "markup.inserted: #B5CEA8",
 			"hc_light": "markup.inserted: #096D48",
-			"light_modern": "markup.inserted: #098658"
+			"light_modern": "markup.inserted: #098658",
+			"2026-dark": "punctuation.definition.inserted: #7EE787",
+			"2026-light": "punctuation.definition.inserted: #116329"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "markup.inserted: #B5CEA8",
 			"dark_modern": "markup.inserted: #B5CEA8",
 			"hc_light": "markup.inserted: #096D48",
-			"light_modern": "markup.inserted: #098658"
+			"light_modern": "markup.inserted: #098658",
+			"2026-dark": "markup.inserted: #7EE787",
+			"2026-light": "markup.inserted: #116329"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_env.json b/extensions/vscode-colorize-tests/test/colorize-results/test_env.json
index a0eb219fea5..8cb2aaab59e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_env.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_env.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
index 078717226a7..d21c2c672e3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
index d6b2ef38ebb..818384ee73b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type.numeric.go: #4EC9B0",
 			"hc_light": "storage.type.numeric.go: #185E73",
-			"light_modern": "storage.type.numeric.go: #267F99"
+			"light_modern": "storage.type.numeric.go: #267F99",
+			"2026-dark": "storage.type.numeric.go: #4EC9B0",
+			"2026-light": "storage.type.numeric.go: #267F99"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.placeholder: #9CDCFE",
 			"hc_light": "constant.other.placeholder: #001080",
-			"light_modern": "constant.other.placeholder: #001080"
+			"light_modern": "constant.other.placeholder: #001080",
+			"2026-dark": "constant.other.placeholder: #FF7B72",
+			"2026-light": "constant.other.placeholder: #CF222E"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
index 2fb630ed130..c0ca0845ea3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
 			"dark_modern": "storage.type.primitive.groovy: #4EC9B0",
 			"hc_light": "storage.type.primitive.groovy: #185E73",
-			"light_modern": "storage.type.primitive.groovy: #267F99"
+			"light_modern": "storage.type.primitive.groovy: #267F99",
+			"2026-dark": "storage.type.primitive.groovy: #4EC9B0",
+			"2026-light": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9250,7 +10570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9264,7 +10586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9278,7 +10602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9292,7 +10618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9306,7 +10634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9320,7 +10650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9334,7 +10666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9348,7 +10682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9362,7 +10698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9376,7 +10714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9390,7 +10730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9404,7 +10746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -9418,7 +10762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -9432,7 +10778,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9446,7 +10794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9460,7 +10810,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9474,7 +10826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9488,7 +10842,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9502,7 +10858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9516,7 +10874,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -9530,7 +10890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9544,7 +10906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9558,7 +10922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9572,7 +10938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9586,7 +10954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9600,7 +10970,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9614,7 +10986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9628,7 +11002,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9642,7 +11018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9656,7 +11034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9670,7 +11050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9684,7 +11066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9698,7 +11082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9712,7 +11098,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9726,7 +11114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9740,7 +11130,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9754,7 +11146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9768,7 +11162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9782,7 +11178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9796,7 +11194,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -9810,7 +11210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9824,7 +11226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9838,7 +11242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9852,7 +11258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -9866,7 +11274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9880,7 +11290,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9894,7 +11306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9908,7 +11322,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -9922,7 +11338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9936,7 +11354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9950,7 +11370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9964,7 +11386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -9978,7 +11402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9992,7 +11418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10006,7 +11434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10020,7 +11450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -10034,7 +11466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10048,7 +11482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10062,7 +11498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10076,7 +11514,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -10090,7 +11530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10104,7 +11546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10118,7 +11562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10132,7 +11578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10146,7 +11594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10160,7 +11610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10174,7 +11626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10188,7 +11642,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10202,7 +11658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10216,7 +11674,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10230,7 +11690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10244,7 +11706,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -10258,7 +11722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10272,7 +11738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10286,7 +11754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10300,7 +11770,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10314,7 +11786,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10328,7 +11802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10342,7 +11818,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -10356,7 +11834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10370,7 +11850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10384,7 +11866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10398,7 +11882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10412,7 +11898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -10426,7 +11914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10440,7 +11930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10454,7 +11946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10468,7 +11962,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10482,7 +11978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10496,7 +11994,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -10510,7 +12010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10524,7 +12026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10538,7 +12042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10552,7 +12058,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10566,7 +12074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10580,7 +12090,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10594,7 +12106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10608,7 +12122,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -10622,7 +12138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10636,7 +12154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10650,7 +12170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10664,7 +12186,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -10678,7 +12202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10692,7 +12218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10706,7 +12234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10720,7 +12250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10734,7 +12266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10748,7 +12282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10762,7 +12298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10776,7 +12314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10790,7 +12330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10804,7 +12346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10818,7 +12362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10832,7 +12378,9 @@
 			"hc_black": "meta.definition.variable.name: #9CDCFE",
 			"dark_modern": "meta.definition.variable.name: #9CDCFE",
 			"hc_light": "meta.definition.variable.name: #001080",
-			"light_modern": "meta.definition.variable.name: #001080"
+			"light_modern": "meta.definition.variable.name: #001080",
+			"2026-dark": "meta.definition.variable.name: #9CDCFE",
+			"2026-light": "meta.definition.variable.name: #001080"
 		}
 	},
 	{
@@ -10846,7 +12394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10860,7 +12410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10874,7 +12426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10888,7 +12442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -10902,7 +12458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10916,7 +12474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10930,7 +12490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -10944,7 +12506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10958,7 +12522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10972,7 +12538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -10986,7 +12554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11000,7 +12570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11014,7 +12586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11028,7 +12602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11042,7 +12618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11056,7 +12634,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -11070,7 +12650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -11084,7 +12666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11098,7 +12682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11112,7 +12698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11126,7 +12714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -11140,7 +12730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11154,7 +12746,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11168,7 +12762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11182,7 +12778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11196,7 +12794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11210,7 +12810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11224,7 +12826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11238,7 +12842,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -11252,7 +12858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11266,7 +12874,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11280,7 +12890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11294,7 +12906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -11308,7 +12922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11322,7 +12938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11336,7 +12954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -11350,7 +12970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11364,7 +12986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11378,7 +13002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11392,7 +13018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11406,7 +13034,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -11420,7 +13050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11434,7 +13066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11448,7 +13082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11462,7 +13098,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -11476,7 +13114,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11490,7 +13130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11504,7 +13146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11518,7 +13162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11532,7 +13178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11546,7 +13194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11560,7 +13210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11574,7 +13226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11588,7 +13242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11602,7 +13258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11616,7 +13274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11630,7 +13290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11644,7 +13306,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -11658,7 +13322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11672,7 +13338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11686,7 +13354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11700,7 +13370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11714,7 +13386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11728,7 +13402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11742,7 +13418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11756,7 +13434,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -11770,7 +13450,9 @@
 			"hc_black": "source.groovy.embedded: #FFFFFF",
 			"dark_modern": "source.groovy.embedded: #D4D4D4",
 			"hc_light": "source.groovy.embedded: #292929",
-			"light_modern": "source.groovy.embedded: #000000"
+			"light_modern": "source.groovy.embedded: #000000",
+			"2026-dark": "source.groovy.embedded: #D4D4D4",
+			"2026-light": "source.groovy.embedded: #000000"
 		}
 	},
 	{
@@ -11784,7 +13466,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -11798,7 +13482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11812,7 +13498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11826,7 +13514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11840,7 +13530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11854,7 +13546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11868,7 +13562,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11882,7 +13578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11896,7 +13594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11910,7 +13610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11924,7 +13626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11938,7 +13642,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -11952,7 +13658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -11966,7 +13674,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -11980,7 +13690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11994,7 +13706,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12008,7 +13722,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12022,7 +13738,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12036,7 +13754,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12050,7 +13770,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12064,7 +13786,9 @@
 			"hc_black": "storage.type.annotation.groovy: #4EC9B0",
 			"dark_modern": "storage.type.annotation.groovy: #4EC9B0",
 			"hc_light": "storage.type.annotation.groovy: #185E73",
-			"light_modern": "storage.type.annotation.groovy: #267F99"
+			"light_modern": "storage.type.annotation.groovy: #267F99",
+			"2026-dark": "storage.type.annotation.groovy: #4EC9B0",
+			"2026-light": "storage.type.annotation.groovy: #267F99"
 		}
 	},
 	{
@@ -12078,7 +13802,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -12092,7 +13818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12106,7 +13834,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12120,7 +13850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12134,7 +13866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12148,7 +13882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12162,7 +13898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12176,7 +13914,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -12190,7 +13930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12204,7 +13946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12218,7 +13962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12232,7 +13978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12246,7 +13994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12260,7 +14010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12274,7 +14026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12288,7 +14042,9 @@
 			"hc_black": "storage.type.object.array.groovy: #4EC9B0",
 			"dark_modern": "storage.type.object.array.groovy: #4EC9B0",
 			"hc_light": "storage.type.object.array.groovy: #185E73",
-			"light_modern": "storage.type.object.array.groovy: #267F99"
+			"light_modern": "storage.type.object.array.groovy: #267F99",
+			"2026-dark": "storage.type.object.array.groovy: #4EC9B0",
+			"2026-light": "storage.type.object.array.groovy: #267F99"
 		}
 	},
 	{
@@ -12302,7 +14058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12316,7 +14074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12330,7 +14090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12344,7 +14106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12358,7 +14122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12372,7 +14138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12386,7 +14154,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12400,7 +14170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12414,7 +14186,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12428,7 +14202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12442,7 +14218,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12456,7 +14234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12470,7 +14250,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12484,7 +14266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12498,7 +14282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12512,7 +14298,9 @@
 			"hc_black": "storage.type.groovy: #4EC9B0",
 			"dark_modern": "storage.type.groovy: #4EC9B0",
 			"hc_light": "storage.type.groovy: #185E73",
-			"light_modern": "storage.type.groovy: #267F99"
+			"light_modern": "storage.type.groovy: #267F99",
+			"2026-dark": "storage.type.groovy: #4EC9B0",
+			"2026-light": "storage.type.groovy: #267F99"
 		}
 	},
 	{
@@ -12526,7 +14314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12540,7 +14330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12554,7 +14346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12568,7 +14362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12582,7 +14378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12596,7 +14394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12610,7 +14410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12624,7 +14426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12638,7 +14442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12652,7 +14458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12666,7 +14474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12680,7 +14490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -12694,7 +14506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12708,7 +14522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -12722,7 +14538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -12736,7 +14554,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -12750,7 +14570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12764,7 +14586,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12778,7 +14602,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12792,7 +14618,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12806,7 +14634,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12820,7 +14650,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier.import: #C9D1D9",
+			"2026-light": "storage.modifier.import: #1F2328"
 		}
 	},
 	{
@@ -12834,7 +14666,9 @@
 			"hc_black": "storage.type.annotation.groovy: #4EC9B0",
 			"dark_modern": "storage.type.annotation.groovy: #4EC9B0",
 			"hc_light": "storage.type.annotation.groovy: #185E73",
-			"light_modern": "storage.type.annotation.groovy: #267F99"
+			"light_modern": "storage.type.annotation.groovy: #267F99",
+			"2026-dark": "storage.type.annotation.groovy: #4EC9B0",
+			"2026-light": "storage.type.annotation.groovy: #267F99"
 		}
 	},
 	{
@@ -12848,7 +14682,9 @@
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
 			"dark_modern": "storage.type.primitive.groovy: #4EC9B0",
 			"hc_light": "storage.type.primitive.groovy: #185E73",
-			"light_modern": "storage.type.primitive.groovy: #267F99"
+			"light_modern": "storage.type.primitive.groovy: #267F99",
+			"2026-dark": "storage.type.primitive.groovy: #4EC9B0",
+			"2026-light": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -12862,7 +14698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12876,7 +14714,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12890,7 +14730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12904,7 +14746,9 @@
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
 			"dark_modern": "storage.type.primitive.groovy: #4EC9B0",
 			"hc_light": "storage.type.primitive.groovy: #185E73",
-			"light_modern": "storage.type.primitive.groovy: #267F99"
+			"light_modern": "storage.type.primitive.groovy: #267F99",
+			"2026-dark": "storage.type.primitive.groovy: #4EC9B0",
+			"2026-light": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -12918,7 +14762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12932,7 +14778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -12946,7 +14794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12960,7 +14810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12974,7 +14826,9 @@
 			"hc_black": "storage.type.primitive.groovy: #4EC9B0",
 			"dark_modern": "storage.type.primitive.groovy: #4EC9B0",
 			"hc_light": "storage.type.primitive.groovy: #185E73",
-			"light_modern": "storage.type.primitive.groovy: #267F99"
+			"light_modern": "storage.type.primitive.groovy: #267F99",
+			"2026-dark": "storage.type.primitive.groovy: #4EC9B0",
+			"2026-light": "storage.type.primitive.groovy: #267F99"
 		}
 	},
 	{
@@ -12988,7 +14842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13002,7 +14858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -13016,7 +14874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13030,7 +14890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13044,7 +14906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13058,7 +14922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13072,7 +14938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13086,7 +14954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13100,7 +14970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13114,7 +14986,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13128,7 +15002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13142,7 +15018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13156,7 +15034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13170,7 +15050,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13184,7 +15066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13198,7 +15082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13212,7 +15098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13226,7 +15114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13240,7 +15130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13254,7 +15146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13268,7 +15162,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
index 2ee4ccd1f3b..a149f77a4fc 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
index b79247facaa..f03a4783156 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.handlebars: #0F4A85",
-			"light_modern": "string.quoted.double.handlebars: #0000FF"
+			"light_modern": "string.quoted.double.handlebars: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.handlebars: #0000FF"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "support.constant.handlebars: #DCDCAA",
 			"dark_modern": "support.constant.handlebars: #DCDCAA",
 			"hc_light": "support.constant.handlebars: #5E2CBC",
-			"light_modern": "support.constant.handlebars: #795E26"
+			"light_modern": "support.constant.handlebars: #795E26",
+			"2026-dark": "support.constant.handlebars: #DCDCAA",
+			"2026-light": "support.constant.handlebars: #795E26"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
index 5325987d5da..d0024304b0f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
index 6257a7ad456..eab14289f12 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.html: #0F4A85",
-			"light_modern": "string.unquoted.html: #0000FF"
+			"light_modern": "string.unquoted.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.html: #0000FF"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
index 418312f5e07..3a8a7bdbea3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
index deb5a66740a..13bd0ee8fe7 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
index c4bb55a1e22..09e28148753 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_json.json b/extensions/vscode-colorize-tests/test/colorize-results/test_json.json
index 60a9755e349..c8ce732f65a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_json.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_json.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
index ed8845d9816..7eb06d6637b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.jsx.children: #C9D1D9",
+			"2026-light": "meta.jsx.children: #1F2328"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.jsx.children: #C9D1D9",
+			"2026-light": "meta.jsx.children: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.jsx.children: #C9D1D9",
+			"2026-light": "meta.jsx.children: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.jsx.children: #C9D1D9",
+			"2026-light": "meta.jsx.children: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.tag.attributes: #C9D1D9",
+			"2026-light": "meta.tag.attributes: #1F2328"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.tag.attributes: #C9D1D9",
+			"2026-light": "meta.tag.attributes: #1F2328"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded.expression: #C9D1D9",
+			"2026-light": "meta.embedded.expression: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.jsx.children: #C9D1D9",
+			"2026-light": "meta.jsx.children: #1F2328"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.jsx.children: #C9D1D9",
+			"2026-light": "meta.jsx.children: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class.component: #7EE787",
+			"2026-light": "support.class.component: #116329"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.tag.attributes: #C9D1D9",
+			"2026-light": "meta.tag.attributes: #1F2328"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.tag.attributes: #C9D1D9",
+			"2026-light": "meta.tag.attributes: #1F2328"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.tag.attributes: #C9D1D9",
+			"2026-light": "meta.tag.attributes: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
index a66224dd9e6..ac2c8afa54f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.constant.media: #CE9178",
 			"dark_modern": "support.constant.media: #CE9178",
 			"hc_light": "support.constant.media: #0451A5",
-			"light_modern": "support.constant.media: #0451A5"
+			"light_modern": "support.constant.media: #0451A5",
+			"2026-dark": "support.constant.media: #CE9178",
+			"2026-light": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "support.constant.media: #CE9178",
 			"dark_modern": "support.constant.media: #CE9178",
 			"hc_light": "support.constant.media: #0451A5",
-			"light_modern": "support.constant.media: #0451A5"
+			"light_modern": "support.constant.media: #0451A5",
+			"2026-dark": "support.constant.media: #CE9178",
+			"2026-light": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "entity.name.tag.less: #D7BA7D",
 			"dark_modern": "entity.name.tag.less: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.less: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.class: #800000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "entity.name.tag.less: #D7BA7D",
 			"dark_modern": "entity.name.tag.less: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.less: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "entity.name.tag.less: #D7BA7D",
 			"dark_modern": "entity.name.tag.less: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.less: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "entity.name.tag.less: #D7BA7D",
 			"dark_modern": "entity.name.tag.less: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.less: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "entity.other.attribute-name.parent.less: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.parent.less: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.parent.less: #0F4A85",
-			"light_modern": "entity.other.attribute-name.parent.less: #800000"
+			"light_modern": "entity.other.attribute-name.parent.less: #800000",
+			"2026-dark": "entity.other.attribute-name.parent.less: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.parent.less: #800000"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"dark_modern": "source.css.less entity.other.attribute-name.id: #D7BA7D",
 			"hc_light": "source.css.less entity.other.attribute-name.id: #0F4A85",
-			"light_modern": "source.css.less entity.other.attribute-name.id: #800000"
+			"light_modern": "source.css.less entity.other.attribute-name.id: #800000",
+			"2026-dark": "source.css.less entity.other.attribute-name.id: #D7BA7D",
+			"2026-light": "source.css.less entity.other.attribute-name.id: #800000"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json
index 853eea1a14c..28bc0c2aa4b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_log.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
index c7a93a0446f..5a78c937aff 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
index c6c7e2d6278..4cc6638d4df 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.minus.exponent: #B5CEA8",
 			"hc_light": "keyword.operator.minus.exponent: #096D48",
-			"light_modern": "keyword.operator.minus.exponent: #098658"
+			"light_modern": "keyword.operator.minus.exponent: #098658",
+			"2026-dark": "keyword.operator.minus.exponent: #B5CEA8",
+			"2026-light": "keyword.operator.minus.exponent: #098658"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
index 7fd99b59bc0..c56dced3606 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
@@ -10,7 +10,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string.other.link: #A5D6FF",
+			"2026-light": "string.other.link: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.single.html: #0F4A85",
-			"light_modern": "string.quoted.single.html: #0000FF"
+			"light_modern": "string.quoted.single.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.single.html: #0000FF"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.html: #0F4A85",
-			"light_modern": "string.quoted.double.html: #0000FF"
+			"light_modern": "string.quoted.double.html: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.html: #0000FF"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.italic: #C586C0",
 			"hc_light": "markup.italic: #800080",
-			"light_modern": "markup.italic: #800080"
+			"light_modern": "markup.italic: #800080",
+			"2026-dark": "markup.italic: #C9D1D9",
+			"2026-light": "markup.italic: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.italic: #C586C0",
 			"hc_light": "markup.italic: #800080",
-			"light_modern": "markup.italic: #800080"
+			"light_modern": "markup.italic: #800080",
+			"2026-dark": "markup.italic: #C9D1D9",
+			"2026-light": "markup.italic: #1F2328"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.italic: #C586C0",
 			"hc_light": "markup.italic: #800080",
-			"light_modern": "markup.italic: #800080"
+			"light_modern": "markup.italic: #800080",
+			"2026-dark": "markup.italic: #C9D1D9",
+			"2026-light": "markup.italic: #1F2328"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.inline.raw: #CE9178",
 			"hc_light": "markup.inline.raw: #0F4A85",
-			"light_modern": "markup.inline.raw: #800000"
+			"light_modern": "markup.inline.raw: #800000",
+			"2026-dark": "markup.inline.raw: #79C0FF",
+			"2026-light": "markup.inline.raw: #0550AE"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.inline.raw: #CE9178",
 			"hc_light": "markup.inline.raw: #0F4A85",
-			"light_modern": "markup.inline.raw: #800000"
+			"light_modern": "markup.inline.raw: #800000",
+			"2026-dark": "markup.inline.raw: #79C0FF",
+			"2026-light": "markup.inline.raw: #0550AE"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.inline.raw: #CE9178",
 			"hc_light": "markup.inline.raw: #0F4A85",
-			"light_modern": "markup.inline.raw: #800000"
+			"light_modern": "markup.inline.raw: #800000",
+			"2026-dark": "markup.inline.raw: #79C0FF",
+			"2026-light": "markup.inline.raw: #0550AE"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"2026-light": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "markup.quote: #7EE787",
+			"2026-light": "markup.quote: #116329"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "markup.quote: #7EE787",
+			"2026-light": "markup.quote: #116329"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"2026-light": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"2026-light": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "markup.quote: #7EE787",
+			"2026-light": "markup.quote: #116329"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "markup.quote: #7EE787",
+			"2026-light": "markup.quote: #116329"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.quote.begin.markdown: #6A9955",
 			"hc_light": "punctuation.definition.quote.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.quote.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.quote.begin.markdown: #6A9955",
+			"2026-light": "punctuation.definition.quote.begin.markdown: #0451A5"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "markup.quote: #7EE787",
+			"2026-light": "markup.quote: #116329"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "markup.quote: #7EE787",
+			"2026-light": "markup.quote: #116329"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.separator: #79C0FF",
+			"2026-light": "meta.separator: #0550AE"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.separator: #79C0FF",
+			"2026-light": "meta.separator: #0550AE"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.separator: #79C0FF",
+			"2026-light": "meta.separator: #0550AE"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string.other.link: #A5D6FF",
+			"2026-light": "string.other.link: #0A3069"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string.other.link: #A5D6FF",
+			"2026-light": "string.other.link: #0A3069"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string.other.link: #A5D6FF",
+			"2026-light": "string.other.link: #0A3069"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string.other.link: #A5D6FF",
+			"2026-light": "string.other.link: #0A3069"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading entity.name: #79C0FF",
+			"2026-light": "markup.heading entity.name: #0550AE"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "punctuation.definition.list.begin.markdown: #6796E6",
 			"hc_light": "punctuation.definition.list.begin.markdown: #0451A5",
-			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5"
+			"light_modern": "punctuation.definition.list.begin.markdown: #0451A5",
+			"2026-dark": "punctuation.definition.list.begin.markdown: #FFA657",
+			"2026-light": "punctuation.definition.list.begin.markdown: #953800"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string.other.link: #A5D6FF",
+			"2026-light": "string.other.link: #0A3069"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
index eeb16d5b737..5e4c0f019cb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "meta.preprocessor: #569CD6",
 			"dark_modern": "meta.preprocessor: #569CD6",
 			"hc_light": "meta.preprocessor: #0F4A85",
-			"light_modern": "meta.preprocessor: #0000FF"
+			"light_modern": "meta.preprocessor: #0000FF",
+			"2026-dark": "meta.preprocessor: #569CD6",
+			"2026-light": "meta.preprocessor: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.minus.exponent: #B5CEA8",
 			"hc_light": "keyword.operator.minus.exponent: #096D48",
-			"light_modern": "keyword.operator.minus.exponent: #098658"
+			"light_modern": "keyword.operator.minus.exponent: #098658",
+			"2026-dark": "keyword.operator.minus.exponent: #B5CEA8",
+			"2026-light": "keyword.operator.minus.exponent: #098658"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_p6.json b/extensions/vscode-colorize-tests/test/colorize-results/test_p6.json
index c4c2106a171..71a00ce35ba 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_p6.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_p6.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
index ea79b0e2006..13dd2e0860b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded.begin.php: #569CD6",
 			"hc_light": "punctuation.section.embedded.begin.php: #0F4A85",
-			"light_modern": "punctuation.section.embedded.begin.php: #800000"
+			"light_modern": "punctuation.section.embedded.begin.php: #800000",
+			"2026-dark": "punctuation.section.embedded.begin.php: #569CD6",
+			"2026-light": "punctuation.section.embedded.begin.php: #800000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "meta.embedded: #FFFFFF",
 			"dark_modern": "meta.embedded: #D4D4D4",
 			"hc_light": "meta.embedded: #292929",
-			"light_modern": "meta.embedded: #000000"
+			"light_modern": "meta.embedded: #000000",
+			"2026-dark": "meta.embedded: #D4D4D4",
+			"2026-light": "meta.embedded: #000000"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded.end.php: #569CD6",
 			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
-			"light_modern": "punctuation.section.embedded.end.php: #800000"
+			"light_modern": "punctuation.section.embedded.end.php: #800000",
+			"2026-dark": "punctuation.section.embedded.end.php: #569CD6",
+			"2026-light": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded.end.php: #569CD6",
 			"hc_light": "punctuation.section.embedded.end.php: #0F4A85",
-			"light_modern": "punctuation.section.embedded.end.php: #800000"
+			"light_modern": "punctuation.section.embedded.end.php: #800000",
+			"2026-dark": "punctuation.section.embedded.end.php: #569CD6",
+			"2026-light": "punctuation.section.embedded.end.php: #800000"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
index 1a80edc135c..788c4589996 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
index 7fee15950e9..5cd32c1cb2a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "source.powershell variable.other.member: #DCDCAA",
 			"dark_modern": "source.powershell variable.other.member: #DCDCAA",
 			"hc_light": "source.powershell variable.other.member: #5E2CBC",
-			"light_modern": "source.powershell variable.other.member: #795E26"
+			"light_modern": "source.powershell variable.other.member: #795E26",
+			"2026-dark": "source.powershell variable.other.member: #DCDCAA",
+			"2026-light": "source.powershell variable.other.member: #795E26"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
index eb506aa3365..4b30aae9bbf 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
@@ -10,7 +10,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
-			"light_modern": "string.comment.buffered.block.pug: #0000FF"
+			"light_modern": "string.comment.buffered.block.pug: #0000FF",
+			"2026-dark": "string.comment: #8B949E",
+			"2026-light": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
-			"light_modern": "string.comment.buffered.block.pug: #0000FF"
+			"light_modern": "string.comment.buffered.block.pug: #0000FF",
+			"2026-dark": "string.comment: #8B949E",
+			"2026-light": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
-			"light_modern": "string.comment.buffered.block.pug: #0000FF"
+			"light_modern": "string.comment.buffered.block.pug: #0000FF",
+			"2026-dark": "string.comment: #8B949E",
+			"2026-light": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "meta.object-literal.key: #9CDCFE",
 			"dark_modern": "meta.object-literal.key: #9CDCFE",
 			"hc_light": "meta.object-literal.key: #001080",
-			"light_modern": "meta.object-literal.key: #001080"
+			"light_modern": "meta.object-literal.key: #001080",
+			"2026-dark": "meta.object-literal.key: #9CDCFE",
+			"2026-light": "meta.object-literal.key: #001080"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.object.member: #C9D1D9",
+			"2026-light": "meta.object.member: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.comment.buffered.block.pug: #0F4A85",
-			"light_modern": "string.comment.buffered.block.pug: #0000FF"
+			"light_modern": "string.comment.buffered.block.pug: #0000FF",
+			"2026-dark": "string.comment: #8B949E",
+			"2026-light": "string.comment.buffered.block.pug: #0000FF"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.interpolated.pug: #0F4A85",
-			"light_modern": "string.interpolated.pug: #0000FF"
+			"light_modern": "string.interpolated.pug: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.interpolated.pug: #0000FF"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.interpolated.pug: #0F4A85",
-			"light_modern": "string.interpolated.pug: #0000FF"
+			"light_modern": "string.interpolated.pug: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.interpolated.pug: #0000FF"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.interpolated.pug: #0F4A85",
-			"light_modern": "string.interpolated.pug: #0000FF"
+			"light_modern": "string.interpolated.pug: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.interpolated.pug: #0000FF"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json
index e8d718cad72..4cfd3f2466a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.operator.logical.python: #569CD6",
 			"dark_modern": "keyword.operator.logical.python: #569CD6",
 			"hc_light": "keyword.operator.logical.python: #0F4A85",
-			"light_modern": "keyword.operator.logical.python: #0000FF"
+			"light_modern": "keyword.operator.logical.python: #0000FF",
+			"2026-dark": "keyword.operator.logical.python: #569CD6",
+			"2026-light": "keyword.operator.logical.python: #0000FF"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "keyword.operator.logical.python: #569CD6",
 			"dark_modern": "keyword.operator.logical.python: #569CD6",
 			"hc_light": "keyword.operator.logical.python: #0F4A85",
-			"light_modern": "keyword.operator.logical.python: #0000FF"
+			"light_modern": "keyword.operator.logical.python: #0000FF",
+			"2026-dark": "keyword.operator.logical.python: #569CD6",
+			"2026-light": "keyword.operator.logical.python: #0000FF"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "variable.legacy.builtin.python: #FFFFFF",
 			"dark_modern": "variable.legacy.builtin.python: #D4D4D4",
 			"hc_light": "variable.legacy.builtin.python: #292929",
-			"light_modern": "variable.legacy.builtin.python: #000000"
+			"light_modern": "variable.legacy.builtin.python: #000000",
+			"2026-dark": "variable.legacy.builtin.python: #D4D4D4",
+			"2026-light": "variable.legacy.builtin.python: #000000"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "keyword.operator.logical.python: #569CD6",
 			"dark_modern": "keyword.operator.logical.python: #569CD6",
 			"hc_light": "keyword.operator.logical.python: #0F4A85",
-			"light_modern": "keyword.operator.logical.python: #0000FF"
+			"light_modern": "keyword.operator.logical.python: #0000FF",
+			"2026-dark": "keyword.operator.logical.python: #569CD6",
+			"2026-light": "keyword.operator.logical.python: #0000FF"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "keyword.operator.logical.python: #569CD6",
 			"dark_modern": "keyword.operator.logical.python: #569CD6",
 			"hc_light": "keyword.operator.logical.python: #0F4A85",
-			"light_modern": "keyword.operator.logical.python: #0000FF"
+			"light_modern": "keyword.operator.logical.python: #0000FF",
+			"2026-dark": "keyword.operator.logical.python: #569CD6",
+			"2026-light": "keyword.operator.logical.python: #0000FF"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "support.other.parenthesis.regexp: #CE9178",
 			"hc_light": "support.other.parenthesis.regexp: #D16969",
-			"light_modern": "support.other.parenthesis.regexp: #D16969"
+			"light_modern": "support.other.parenthesis.regexp: #D16969",
+			"2026-dark": "support.other.parenthesis.regexp: #CE9178",
+			"2026-light": "support.other.parenthesis.regexp: #D16969"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.character.set.begin.regexp: #CE9178",
 			"hc_light": "punctuation.character.set.begin.regexp: #D16969",
-			"light_modern": "punctuation.character.set.begin.regexp: #D16969"
+			"light_modern": "punctuation.character.set.begin.regexp: #D16969",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.set.regexp: #D16969",
 			"hc_light": "constant.character.set.regexp: #811F3F",
-			"light_modern": "constant.character.set.regexp: #811F3F"
+			"light_modern": "constant.character.set.regexp: #811F3F",
+			"2026-dark": "constant.character.set.regexp: #D16969",
+			"2026-light": "constant.character.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.character.set.end.regexp: #CE9178",
 			"hc_light": "punctuation.character.set.end.regexp: #D16969",
-			"light_modern": "punctuation.character.set.end.regexp: #D16969"
+			"light_modern": "punctuation.character.set.end.regexp: #D16969",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "support.other.parenthesis.regexp: #CE9178",
 			"hc_light": "support.other.parenthesis.regexp: #D16969",
-			"light_modern": "support.other.parenthesis.regexp: #D16969"
+			"light_modern": "support.other.parenthesis.regexp: #D16969",
+			"2026-dark": "support.other.parenthesis.regexp: #CE9178",
+			"2026-light": "support.other.parenthesis.regexp: #D16969"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "support.other.parenthesis.regexp: #CE9178",
 			"hc_light": "support.other.parenthesis.regexp: #D16969",
-			"light_modern": "support.other.parenthesis.regexp: #D16969"
+			"light_modern": "support.other.parenthesis.regexp: #D16969",
+			"2026-dark": "support.other.parenthesis.regexp: #CE9178",
+			"2026-light": "support.other.parenthesis.regexp: #D16969"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.character.set.begin.regexp: #CE9178",
 			"hc_light": "punctuation.character.set.begin.regexp: #D16969",
-			"light_modern": "punctuation.character.set.begin.regexp: #D16969"
+			"light_modern": "punctuation.character.set.begin.regexp: #D16969",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.set.regexp: #D16969",
 			"hc_light": "constant.character.set.regexp: #811F3F",
-			"light_modern": "constant.character.set.regexp: #811F3F"
+			"light_modern": "constant.character.set.regexp: #811F3F",
+			"2026-dark": "constant.character.set.regexp: #D16969",
+			"2026-light": "constant.character.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.character.set.end.regexp: #CE9178",
 			"hc_light": "punctuation.character.set.end.regexp: #D16969",
-			"light_modern": "punctuation.character.set.end.regexp: #D16969"
+			"light_modern": "punctuation.character.set.end.regexp: #D16969",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "support.other.parenthesis.regexp: #CE9178",
 			"hc_light": "support.other.parenthesis.regexp: #D16969",
-			"light_modern": "support.other.parenthesis.regexp: #D16969"
+			"light_modern": "support.other.parenthesis.regexp: #D16969",
+			"2026-dark": "support.other.parenthesis.regexp: #CE9178",
+			"2026-light": "support.other.parenthesis.regexp: #D16969"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "support.other.parenthesis.regexp: #CE9178",
 			"hc_light": "support.other.parenthesis.regexp: #D16969",
-			"light_modern": "support.other.parenthesis.regexp: #D16969"
+			"light_modern": "support.other.parenthesis.regexp: #D16969",
+			"2026-dark": "support.other.parenthesis.regexp: #CE9178",
+			"2026-light": "support.other.parenthesis.regexp: #D16969"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "support: #79C0FF",
+			"2026-light": "support: #0550AE"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "support.other.parenthesis.regexp: #CE9178",
 			"hc_light": "support.other.parenthesis.regexp: #D16969",
-			"light_modern": "support.other.parenthesis.regexp: #D16969"
+			"light_modern": "support.other.parenthesis.regexp: #D16969",
+			"2026-dark": "support.other.parenthesis.regexp: #CE9178",
+			"2026-light": "support.other.parenthesis.regexp: #D16969"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "variable.legacy.builtin.python: #FFFFFF",
 			"dark_modern": "variable.legacy.builtin.python: #D4D4D4",
 			"hc_light": "variable.legacy.builtin.python: #292929",
-			"light_modern": "variable.legacy.builtin.python: #000000"
+			"light_modern": "variable.legacy.builtin.python: #000000",
+			"2026-dark": "variable.legacy.builtin.python: #D4D4D4",
+			"2026-light": "variable.legacy.builtin.python: #000000"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.character.set.begin.regexp: #CE9178",
 			"hc_light": "punctuation.character.set.begin.regexp: #D16969",
-			"light_modern": "punctuation.character.set.begin.regexp: #D16969"
+			"light_modern": "punctuation.character.set.begin.regexp: #D16969",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.set.regexp: #D16969",
 			"hc_light": "constant.character.set.regexp: #811F3F",
-			"light_modern": "constant.character.set.regexp: #811F3F"
+			"light_modern": "constant.character.set.regexp: #811F3F",
+			"2026-dark": "constant.character.set.regexp: #D16969",
+			"2026-light": "constant.character.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
index 4d56b651660..683af8444e4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
index 032617573e4..57de9e15b16 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99",
+			"2026-dark": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"2026-light": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99",
+			"2026-dark": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"2026-light": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99",
+			"2026-dark": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"2026-light": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99",
+			"2026-dark": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"2026-light": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99",
+			"2026-dark": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"2026-light": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99",
+			"2026-dark": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"2026-light": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "punctuation.section.embedded: #569CD6",
 			"dark_modern": "punctuation.section.embedded: #569CD6",
 			"hc_light": "punctuation.section.embedded: #0F4A85",
-			"light_modern": "punctuation.section.embedded: #0000FF"
+			"light_modern": "punctuation.section.embedded: #0000FF",
+			"2026-dark": "punctuation.section.embedded: #FF7B72",
+			"2026-light": "punctuation.section.embedded: #CF222E"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_regexp.ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test_regexp.ts.json
index 3a792cdb289..c956996bec0 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_regexp.ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_regexp.ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.set.regexp: #D16969",
+			"2026-light": "constant.other.character-class.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.set.regexp: #D16969",
+			"2026-light": "constant.other.character-class.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.negation.regexp: #CE9178",
 			"hc_light": "keyword.operator.negation.regexp: #D16969",
-			"light_modern": "keyword.operator.negation.regexp: #D16969"
+			"light_modern": "keyword.operator.negation.regexp: #D16969",
+			"2026-dark": "keyword.operator.negation.regexp: #CE9178",
+			"2026-light": "keyword.operator.negation.regexp: #D16969"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.set.regexp: #D16969",
+			"2026-light": "constant.other.character-class.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control.anchor.regexp: #DCDCAA",
 			"hc_light": "keyword.control.anchor.regexp: #EE0000",
-			"light_modern": "keyword.control.anchor.regexp: #EE0000"
+			"light_modern": "keyword.control.anchor.regexp: #EE0000",
+			"2026-dark": "keyword.control.anchor.regexp: #DCDCAA",
+			"2026-light": "keyword.control.anchor.regexp: #EE0000"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.negation.regexp: #CE9178",
 			"hc_light": "keyword.operator.negation.regexp: #D16969",
-			"light_modern": "keyword.operator.negation.regexp: #D16969"
+			"light_modern": "keyword.operator.negation.regexp: #D16969",
+			"2026-dark": "keyword.operator.negation.regexp: #CE9178",
+			"2026-light": "keyword.operator.negation.regexp: #D16969"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character: #569CD6",
 			"hc_light": "constant.character: #0F4A85",
-			"light_modern": "constant.character: #0000FF"
+			"light_modern": "constant.character: #0000FF",
+			"2026-dark": "constant.character: #FF7B72",
+			"2026-light": "constant.character: #CF222E"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable.other.constant: #4FC1FF",
 			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"light_modern": "variable.other.constant: #0070C1",
+			"2026-dark": "variable.other.constant: #79C0FF",
+			"2026-light": "variable.other.constant: #0550AE"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control.anchor.regexp: #DCDCAA",
 			"hc_light": "keyword.control.anchor.regexp: #EE0000",
-			"light_modern": "keyword.control.anchor.regexp: #EE0000"
+			"light_modern": "keyword.control.anchor.regexp: #EE0000",
+			"2026-dark": "keyword.control.anchor.regexp: #DCDCAA",
+			"2026-light": "keyword.control.anchor.regexp: #EE0000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant: #79C0FF",
+			"2026-light": "constant: #0550AE"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control.anchor.regexp: #DCDCAA",
 			"hc_light": "keyword.control.anchor.regexp: #EE0000",
-			"light_modern": "keyword.control.anchor.regexp: #EE0000"
+			"light_modern": "keyword.control.anchor.regexp: #EE0000",
+			"2026-dark": "keyword.control.anchor.regexp: #DCDCAA",
+			"2026-light": "keyword.control.anchor.regexp: #EE0000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.negation.regexp: #CE9178",
 			"hc_light": "keyword.operator.negation.regexp: #D16969",
-			"light_modern": "keyword.operator.negation.regexp: #D16969"
+			"light_modern": "keyword.operator.negation.regexp: #D16969",
+			"2026-dark": "keyword.operator.negation.regexp: #CE9178",
+			"2026-light": "keyword.operator.negation.regexp: #D16969"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.set.regexp: #D16969",
 			"hc_light": "constant.other.character-class.set.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.set.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.set.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.set.regexp: #D16969",
+			"2026-light": "constant.other.character-class.set.regexp: #811F3F"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.character-class.regexp: #CE9178",
 			"hc_light": "punctuation.definition.character-class.regexp: #D16969",
-			"light_modern": "punctuation.definition.character-class.regexp: #D16969"
+			"light_modern": "punctuation.definition.character-class.regexp: #D16969",
+			"2026-dark": "punctuation.definition.character-class.regexp: #CE9178",
+			"2026-light": "punctuation.definition.character-class.regexp: #D16969"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.quantifier.regexp: #D7BA7D",
 			"hc_light": "keyword.operator.quantifier.regexp: #000000",
-			"light_modern": "keyword.operator.quantifier.regexp: #000000"
+			"light_modern": "keyword.operator.quantifier.regexp: #000000",
+			"2026-dark": "keyword.operator.quantifier.regexp: #D7BA7D",
+			"2026-light": "keyword.operator.quantifier.regexp: #000000"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "string.regexp constant.character.escape: #7EE787",
+			"2026-light": "string.regexp constant.character.escape: #116329"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator.or.regexp: #DCDCAA",
 			"hc_light": "keyword.operator.or.regexp: #EE0000",
-			"light_modern": "keyword.operator.or.regexp: #EE0000"
+			"light_modern": "keyword.operator.or.regexp: #EE0000",
+			"2026-dark": "keyword.operator.or.regexp: #DCDCAA",
+			"2026-light": "keyword.operator.or.regexp: #EE0000"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.assertion.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.assertion.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.assertion.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.assertion.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.assertion.regexp: #D16969"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "constant.other.character-class.regexp: #D16969",
 			"hc_light": "constant.other.character-class.regexp: #811F3F",
-			"light_modern": "constant.other.character-class.regexp: #811F3F"
+			"light_modern": "constant.other.character-class.regexp: #811F3F",
+			"2026-dark": "constant.other.character-class.regexp: #D16969",
+			"2026-light": "constant.other.character-class.regexp: #811F3F"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "punctuation.definition.group.regexp: #CE9178",
 			"hc_light": "punctuation.definition.group.regexp: #D16969",
-			"light_modern": "punctuation.definition.group.regexp: #D16969"
+			"light_modern": "punctuation.definition.group.regexp: #D16969",
+			"2026-dark": "punctuation.definition.group.regexp: #CE9178",
+			"2026-light": "punctuation.definition.group.regexp: #D16969"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
index 01f18f457a2..455352e23bc 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.namespace: #4EC9B0",
 			"dark_modern": "entity.name.namespace: #4EC9B0",
 			"hc_light": "entity.name.namespace: #185E73",
-			"light_modern": "entity.name.namespace: #267F99"
+			"light_modern": "entity.name.namespace: #267F99",
+			"2026-dark": "entity.name.namespace: #4EC9B0",
+			"2026-light": "entity.name.namespace: #267F99"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.namespace: #4EC9B0",
 			"dark_modern": "entity.name.namespace: #4EC9B0",
 			"hc_light": "entity.name.namespace: #185E73",
-			"light_modern": "entity.name.namespace: #267F99"
+			"light_modern": "entity.name.namespace: #267F99",
+			"2026-dark": "entity.name.namespace: #4EC9B0",
+			"2026-light": "entity.name.namespace: #267F99"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
index a2838df578b..d1c397f0683 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.italic: #C586C0",
 			"hc_light": "markup.italic: #800080",
-			"light_modern": "markup.italic: #800080"
+			"light_modern": "markup.italic: #800080",
+			"2026-dark": "markup.italic: #C9D1D9",
+			"2026-light": "markup.italic: #1F2328"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "markup.bold: #569CD6",
 			"hc_light": "markup.bold: #000080",
-			"light_modern": "markup.bold: #000080"
+			"light_modern": "markup.bold: #000080",
+			"2026-dark": "markup.bold: #C9D1D9",
+			"2026-light": "markup.bold: #1F2328"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "markup.heading: #6796E6",
 			"dark_modern": "markup.heading: #569CD6",
 			"hc_light": "markup.heading: #0F4A85",
-			"light_modern": "markup.heading: #800000"
+			"light_modern": "markup.heading: #800000",
+			"2026-dark": "markup.heading: #79C0FF",
+			"2026-light": "markup.heading: #0550AE"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
index 933ebf2ba5c..01306057758 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"dark_modern": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
 			"hc_light": "source.css entity.other.attribute-name.pseudo-class: #0F4A85",
-			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000"
+			"light_modern": "source.css entity.other.attribute-name.pseudo-class: #800000",
+			"2026-dark": "source.css entity.other.attribute-name.pseudo-class: #D7BA7D",
+			"2026-light": "source.css entity.other.attribute-name.pseudo-class: #800000"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "support.constant: #79C0FF",
+			"2026-light": "support.constant: #0550AE"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "support.constant.media: #CE9178",
 			"dark_modern": "support.constant.media: #CE9178",
 			"hc_light": "support.constant.media: #0451A5",
-			"light_modern": "support.constant.media: #0451A5"
+			"light_modern": "support.constant.media: #0451A5",
+			"2026-dark": "support.constant.media: #CE9178",
+			"2026-light": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9250,7 +10570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9264,7 +10586,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9278,7 +10602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9292,7 +10618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9306,7 +10634,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -9320,7 +10650,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -9334,7 +10666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9348,7 +10682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9362,7 +10698,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9376,7 +10714,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9390,7 +10730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9404,7 +10746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9418,7 +10762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9432,7 +10778,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9446,7 +10794,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9460,7 +10810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9474,7 +10826,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9488,7 +10842,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -9502,7 +10858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9516,7 +10874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9530,7 +10890,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9544,7 +10906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9558,7 +10922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9572,7 +10938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9586,7 +10954,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9600,7 +10970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9614,7 +10986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9628,7 +11002,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -9642,7 +11018,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -9656,7 +11034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9670,7 +11050,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -9684,7 +11066,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -9698,7 +11082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9712,7 +11098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9726,7 +11114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9740,7 +11130,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9754,7 +11146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9768,7 +11162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9782,7 +11178,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -9796,7 +11194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9810,7 +11210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9824,7 +11226,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9838,7 +11242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9852,7 +11258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9866,7 +11274,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9880,7 +11290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9894,7 +11306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9908,7 +11322,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9922,7 +11338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9936,7 +11354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9950,7 +11370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9964,7 +11386,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9978,7 +11402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9992,7 +11418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10006,7 +11434,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -10020,7 +11450,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -10034,7 +11466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10048,7 +11482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10062,7 +11498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10076,7 +11514,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10090,7 +11530,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10104,7 +11546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10118,7 +11562,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -10132,7 +11578,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -10146,7 +11594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10160,7 +11610,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -10174,7 +11626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10188,7 +11642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10202,7 +11658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -10216,7 +11674,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -10230,7 +11690,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -10244,7 +11706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10258,7 +11722,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10272,7 +11738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10286,7 +11754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10300,7 +11770,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10314,7 +11786,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10328,7 +11802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10342,7 +11818,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -10356,7 +11834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10370,7 +11850,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10384,7 +11866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10398,7 +11882,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10412,7 +11898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10426,7 +11914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10440,7 +11930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10454,7 +11946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10468,7 +11962,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10482,7 +11978,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10496,7 +11994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10510,7 +12010,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -10524,7 +12026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10538,7 +12042,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10552,7 +12058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10566,7 +12074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10580,7 +12090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10594,7 +12106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10608,7 +12122,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10622,7 +12138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10636,7 +12154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10650,7 +12170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10664,7 +12186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10678,7 +12202,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10692,7 +12218,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10706,7 +12234,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10720,7 +12250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10734,7 +12266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -10748,7 +12282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10762,7 +12298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10776,7 +12314,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10790,7 +12330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10804,7 +12346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10818,7 +12362,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10832,7 +12378,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -10846,7 +12394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10860,7 +12410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10874,7 +12426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10888,7 +12442,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -10902,7 +12458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10916,7 +12474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10930,7 +12490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10944,7 +12506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -10958,7 +12522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10972,7 +12538,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10986,7 +12554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11000,7 +12570,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -11014,7 +12586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11028,7 +12602,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11042,7 +12618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11056,7 +12634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11070,7 +12650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11084,7 +12666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11098,7 +12682,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11112,7 +12698,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11126,7 +12714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11140,7 +12730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11154,7 +12746,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11168,7 +12762,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11182,7 +12778,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11196,7 +12794,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11210,7 +12810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11224,7 +12826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -11238,7 +12842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11252,7 +12858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11266,7 +12874,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11280,7 +12890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11294,7 +12906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11308,7 +12922,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11322,7 +12938,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -11336,7 +12954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11350,7 +12970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11364,7 +12986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11378,7 +13002,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11392,7 +13018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11406,7 +13034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11420,7 +13050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11434,7 +13066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11448,7 +13082,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11462,7 +13098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11476,7 +13114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11490,7 +13130,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -11504,7 +13146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11518,7 +13162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11532,7 +13178,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11546,7 +13194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11560,7 +13210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11574,7 +13226,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11588,7 +13242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11602,7 +13258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11616,7 +13274,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -11630,7 +13290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11644,7 +13306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11658,7 +13322,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -11672,7 +13338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11686,7 +13354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11700,7 +13370,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -11714,7 +13386,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -11728,7 +13402,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -11742,7 +13418,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -11756,7 +13434,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -11770,7 +13450,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -11784,7 +13466,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -11798,7 +13482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11812,7 +13498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11826,7 +13514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11840,7 +13530,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11854,7 +13546,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11868,7 +13562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11882,7 +13578,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11896,7 +13594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11910,7 +13610,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11924,7 +13626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11938,7 +13642,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11952,7 +13658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11966,7 +13674,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11980,7 +13690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -11994,7 +13706,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12008,7 +13722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12022,7 +13738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12036,7 +13754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12050,7 +13770,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12064,7 +13786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12078,7 +13802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12092,7 +13818,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12106,7 +13834,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12120,7 +13850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12134,7 +13866,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12148,7 +13882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12162,7 +13898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12176,7 +13914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12190,7 +13930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12204,7 +13946,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12218,7 +13962,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12232,7 +13978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12246,7 +13994,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12260,7 +14010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12274,7 +14026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12288,7 +14042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12302,7 +14058,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12316,7 +14074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12330,7 +14090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12344,7 +14106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12358,7 +14122,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12372,7 +14138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12386,7 +14154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12400,7 +14170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12414,7 +14186,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12428,7 +14202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12442,7 +14218,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12456,7 +14234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12470,7 +14250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12484,7 +14266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12498,7 +14282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12512,7 +14298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12526,7 +14314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12540,7 +14330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12554,7 +14346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12568,7 +14362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12582,7 +14378,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -12596,7 +14394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12610,7 +14410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12624,7 +14426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12638,7 +14442,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -12652,7 +14458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12666,7 +14474,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -12680,7 +14490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12694,7 +14506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12708,7 +14522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12722,7 +14538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12736,7 +14554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -12750,7 +14570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -12764,7 +14586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -12778,7 +14602,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -12792,7 +14618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -12806,7 +14634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.definition.variable: #FFA657",
+			"2026-light": "meta.definition.variable: #953800"
 		}
 	},
 	{
@@ -12820,7 +14650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12834,7 +14666,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -12848,7 +14682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12862,7 +14698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12876,7 +14714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12890,7 +14730,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12904,7 +14746,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12918,7 +14762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12932,7 +14778,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -12946,7 +14794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12960,7 +14810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12974,7 +14826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -12988,7 +14842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13002,7 +14858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13016,7 +14874,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13030,7 +14890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13044,7 +14906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13058,7 +14922,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -13072,7 +14938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13086,7 +14954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13100,7 +14970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13114,7 +14986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13128,7 +15002,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13142,7 +15018,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13156,7 +15034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13170,7 +15050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13184,7 +15066,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13198,7 +15082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13212,7 +15098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13226,7 +15114,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -13240,7 +15130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13254,7 +15146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13268,7 +15162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13282,7 +15178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13296,7 +15194,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -13310,7 +15210,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -13324,7 +15226,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -13338,7 +15242,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13352,7 +15258,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13366,7 +15274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13380,7 +15290,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -13394,7 +15306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13408,7 +15322,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13422,7 +15338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13436,7 +15354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13450,7 +15370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13464,7 +15386,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13478,7 +15402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13492,7 +15418,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13506,7 +15434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13520,7 +15450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13534,7 +15466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13548,7 +15482,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -13562,7 +15498,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -13576,7 +15514,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -13590,7 +15530,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -13604,7 +15546,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -13618,7 +15562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13632,7 +15578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13646,7 +15594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13660,7 +15610,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -13674,7 +15626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13688,7 +15642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13702,7 +15658,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -13716,7 +15674,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -13730,7 +15690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13744,7 +15706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13758,7 +15722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13772,7 +15738,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -13786,7 +15754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13800,7 +15770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13814,7 +15786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13828,7 +15802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13842,7 +15818,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -13856,7 +15834,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -13870,7 +15850,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -13884,7 +15866,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13898,7 +15882,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13912,7 +15898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13926,7 +15914,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -13940,7 +15930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13954,7 +15946,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -13968,7 +15962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -13982,7 +15978,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -13996,7 +15994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14010,7 +16010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14024,7 +16026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14038,7 +16042,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -14052,7 +16058,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14066,7 +16074,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14080,7 +16090,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14094,7 +16106,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -14108,7 +16122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14122,7 +16138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14136,7 +16154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14150,7 +16170,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14164,7 +16186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14178,7 +16202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14192,7 +16218,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -14206,7 +16234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14220,7 +16250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14234,7 +16266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14248,7 +16282,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14262,7 +16298,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14276,7 +16314,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14290,7 +16330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14304,7 +16346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -14318,7 +16362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14332,7 +16378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14346,7 +16394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14360,7 +16410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14374,7 +16426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14388,7 +16442,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -14402,7 +16458,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -14416,7 +16474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -14430,7 +16490,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14444,7 +16506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14458,7 +16522,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14472,7 +16538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14486,7 +16554,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14500,7 +16570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -14514,7 +16586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14528,7 +16602,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14542,7 +16618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14556,7 +16634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14570,7 +16650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14584,7 +16666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14598,7 +16682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14612,7 +16698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14626,7 +16714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14640,7 +16730,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -14654,7 +16746,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -14668,7 +16762,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14682,7 +16778,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14696,7 +16794,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14710,7 +16810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14724,7 +16826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14738,7 +16842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14752,7 +16858,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -14766,7 +16874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14780,7 +16890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14794,7 +16906,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -14808,7 +16922,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -14822,7 +16938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14836,7 +16954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14850,7 +16970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14864,7 +16986,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14878,7 +17002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14892,7 +17018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14906,7 +17034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14920,7 +17050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14934,7 +17066,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14948,7 +17082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14962,7 +17098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14976,7 +17114,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -14990,7 +17130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15004,7 +17146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -15018,7 +17162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15032,7 +17178,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15046,7 +17194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15060,7 +17210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15074,7 +17226,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -15088,7 +17242,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -15102,7 +17258,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -15116,7 +17274,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15130,7 +17290,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15144,7 +17306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15158,7 +17322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -15172,7 +17338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15186,7 +17354,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15200,7 +17370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15214,7 +17386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15228,7 +17402,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15242,7 +17418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15256,7 +17434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15270,7 +17450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15284,7 +17466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15298,7 +17482,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15312,7 +17498,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15326,7 +17514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15340,7 +17530,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15354,7 +17546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15368,7 +17562,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15382,7 +17578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15396,7 +17594,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15410,7 +17610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15424,7 +17626,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15438,7 +17642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15452,7 +17658,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15466,7 +17674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15480,7 +17690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15494,7 +17706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15508,7 +17722,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15522,7 +17738,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -15536,7 +17754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15550,7 +17770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15564,7 +17786,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -15578,7 +17802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15592,7 +17818,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15606,7 +17834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15620,7 +17850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15634,7 +17866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -15648,7 +17882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -15662,7 +17898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -15676,7 +17914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15690,7 +17930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15704,7 +17946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -15718,7 +17962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15732,7 +17978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15746,7 +17994,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15760,7 +18010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15774,7 +18026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15788,7 +18042,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15802,7 +18058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15816,7 +18074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -15830,7 +18090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15844,7 +18106,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15858,7 +18122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15872,7 +18138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15886,7 +18154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15900,7 +18170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15914,7 +18186,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -15928,7 +18202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15942,7 +18218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15956,7 +18234,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -15970,7 +18250,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -15984,7 +18266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -15998,7 +18282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16012,7 +18298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16026,7 +18314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16040,7 +18330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16054,7 +18346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -16068,7 +18362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -16082,7 +18378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -16096,7 +18394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16110,7 +18410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16124,7 +18426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16138,7 +18442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16152,7 +18458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16166,7 +18474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16180,7 +18490,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16194,7 +18506,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16208,7 +18522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16222,7 +18538,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -16236,7 +18554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16250,7 +18570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16264,7 +18586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -16278,7 +18602,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -16292,7 +18618,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -16306,7 +18634,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16320,7 +18650,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16334,7 +18666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16348,7 +18682,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -16362,7 +18698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16376,7 +18714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16390,7 +18730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16404,7 +18746,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -16418,7 +18762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16432,7 +18778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16446,7 +18794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16460,7 +18810,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16474,7 +18826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16488,7 +18842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16502,7 +18858,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -16516,7 +18874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16530,7 +18890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16544,7 +18906,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16558,7 +18922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16572,7 +18938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16586,7 +18954,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -16600,7 +18970,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -16614,7 +18986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16628,7 +19002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16642,7 +19018,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16656,7 +19034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16670,7 +19050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16684,7 +19066,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -16698,7 +19082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16712,7 +19098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16726,7 +19114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16740,7 +19130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16754,7 +19146,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -16768,7 +19162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16782,7 +19178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16796,7 +19194,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16810,7 +19210,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -16824,7 +19226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16838,7 +19242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16852,7 +19258,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -16866,7 +19274,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -16880,7 +19290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16894,7 +19306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16908,7 +19322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16922,7 +19338,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16936,7 +19354,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -16950,7 +19370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16964,7 +19386,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -16978,7 +19402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -16992,7 +19418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17006,7 +19434,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -17020,7 +19450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17034,7 +19466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17048,7 +19482,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -17062,7 +19498,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -17076,7 +19514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17090,7 +19530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17104,7 +19546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -17118,7 +19562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -17132,7 +19578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -17146,7 +19594,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17160,7 +19610,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17174,7 +19626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17188,7 +19642,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -17202,7 +19658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17216,7 +19674,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -17230,7 +19690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17244,7 +19706,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -17258,7 +19722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17272,7 +19738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17286,7 +19754,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -17300,7 +19770,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -17314,7 +19786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17328,7 +19802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17342,7 +19818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17356,7 +19834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17370,7 +19850,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -17384,7 +19866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17398,7 +19882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17412,7 +19898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17426,7 +19914,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -17440,7 +19930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17454,7 +19946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17468,7 +19962,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -17482,7 +19978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17496,7 +19994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17510,7 +20010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -17524,7 +20026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17538,7 +20042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17552,7 +20058,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -17566,7 +20074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17580,7 +20090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17594,7 +20106,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -17608,7 +20122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17622,7 +20138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17636,7 +20154,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -17650,7 +20170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17664,7 +20186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17678,7 +20202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17692,7 +20218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17706,7 +20234,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -17720,7 +20250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17734,7 +20266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17748,7 +20282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17762,7 +20298,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17776,7 +20314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17790,7 +20330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17804,7 +20346,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -17818,7 +20362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17832,7 +20378,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -17846,7 +20394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17860,7 +20410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17874,7 +20426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17888,7 +20442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17902,7 +20458,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -17916,7 +20474,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -17930,7 +20490,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -17944,7 +20506,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17958,7 +20522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -17972,7 +20538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -17986,7 +20554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -18000,7 +20570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18014,7 +20586,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -18028,7 +20602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18042,7 +20618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18056,7 +20634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18070,7 +20650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18084,7 +20666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18098,7 +20682,9 @@
 			"hc_black": "support.type.vendored.property-name: #D4D4D4",
 			"dark_modern": "support.type.vendored.property-name: #9CDCFE",
 			"hc_light": "support.type.vendored.property-name: #264F78",
-			"light_modern": "support.type.vendored.property-name: #E50000"
+			"light_modern": "support.type.vendored.property-name: #E50000",
+			"2026-dark": "support.type.vendored.property-name: #9CDCFE",
+			"2026-light": "support.type.vendored.property-name: #E50000"
 		}
 	},
 	{
@@ -18112,7 +20698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18126,7 +20714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18140,7 +20730,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -18154,7 +20746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18168,7 +20762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18182,7 +20778,9 @@
 			"hc_black": "support.type.vendored.property-name: #D4D4D4",
 			"dark_modern": "support.type.vendored.property-name: #9CDCFE",
 			"hc_light": "support.type.vendored.property-name: #264F78",
-			"light_modern": "support.type.vendored.property-name: #E50000"
+			"light_modern": "support.type.vendored.property-name: #E50000",
+			"2026-dark": "support.type.vendored.property-name: #9CDCFE",
+			"2026-light": "support.type.vendored.property-name: #E50000"
 		}
 	},
 	{
@@ -18196,7 +20794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18210,7 +20810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18224,7 +20826,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -18238,7 +20842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18252,7 +20858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18266,7 +20874,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -18280,7 +20890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18294,7 +20906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18308,7 +20922,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -18322,7 +20938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18336,7 +20954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18350,7 +20970,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18364,7 +20986,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -18378,7 +21002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18392,7 +21018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18406,7 +21034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18420,7 +21050,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -18434,7 +21066,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -18448,7 +21082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18462,7 +21098,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -18476,7 +21114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18490,7 +21130,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18504,7 +21146,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18518,7 +21162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18532,7 +21178,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18546,7 +21194,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18560,7 +21210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18574,7 +21226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18588,7 +21242,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18602,7 +21258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18616,7 +21274,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -18630,7 +21290,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -18644,7 +21306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18658,7 +21322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18672,7 +21338,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18686,7 +21354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18700,7 +21370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18714,7 +21386,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18728,7 +21402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18742,7 +21418,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -18756,7 +21434,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -18770,7 +21450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18784,7 +21466,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -18798,7 +21482,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -18812,7 +21498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18826,7 +21514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18840,7 +21530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18854,7 +21546,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -18868,7 +21562,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -18882,7 +21578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -18896,7 +21594,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -18910,7 +21610,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -18924,7 +21626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18938,7 +21642,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -18952,7 +21658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18966,7 +21674,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -18980,7 +21690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -18994,7 +21706,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19008,7 +21722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19022,7 +21738,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19036,7 +21754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19050,7 +21770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19064,7 +21786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19078,7 +21802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19092,7 +21818,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -19106,7 +21834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19120,7 +21850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19134,7 +21866,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19148,7 +21882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19162,7 +21898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19176,7 +21914,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -19190,7 +21930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19204,7 +21946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19218,7 +21962,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19232,7 +21978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19246,7 +21994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19260,7 +22010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -19274,7 +22026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19288,7 +22042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19302,7 +22058,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19316,7 +22074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19330,7 +22090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19344,7 +22106,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19358,7 +22122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19372,7 +22138,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19386,7 +22154,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19400,7 +22170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19414,7 +22186,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19428,7 +22202,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19442,7 +22218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19456,7 +22234,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19470,7 +22250,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -19484,7 +22266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19498,7 +22282,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -19512,7 +22298,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -19526,7 +22314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19540,7 +22330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19554,7 +22346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19568,7 +22362,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19582,7 +22378,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19596,7 +22394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19610,7 +22410,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -19624,7 +22426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19638,7 +22442,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -19652,7 +22458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19666,7 +22474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19680,7 +22490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19694,7 +22506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19708,7 +22522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -19722,7 +22538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -19736,7 +22554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -19750,7 +22570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19764,7 +22586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19778,7 +22602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19792,7 +22618,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -19806,7 +22634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19820,7 +22650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19834,7 +22666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19848,7 +22682,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -19862,7 +22698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19876,7 +22714,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -19890,7 +22730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19904,7 +22746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19918,7 +22762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19932,7 +22778,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -19946,7 +22794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19960,7 +22810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19974,7 +22826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -19988,7 +22842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20002,7 +22858,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20016,7 +22874,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20030,7 +22890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20044,7 +22906,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -20058,7 +22922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20072,7 +22938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20086,7 +22954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20100,7 +22970,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -20114,7 +22986,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -20128,7 +23002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20142,7 +23018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20156,7 +23034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20170,7 +23050,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -20184,7 +23066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20198,7 +23082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20212,7 +23098,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -20226,7 +23114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20240,7 +23130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -20254,7 +23146,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -20268,7 +23162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20282,7 +23178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20296,7 +23194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20310,7 +23210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20324,7 +23226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20338,7 +23242,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20352,7 +23258,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20366,7 +23274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20380,7 +23290,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -20394,7 +23306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20408,7 +23322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20422,7 +23338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20436,7 +23354,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20450,7 +23370,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20464,7 +23386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20478,7 +23402,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -20492,7 +23418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20506,7 +23434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20520,7 +23450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20534,7 +23466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20548,7 +23482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20562,7 +23498,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -20576,7 +23514,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -20590,7 +23530,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -20604,7 +23546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20618,7 +23562,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -20632,7 +23578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -20646,7 +23594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -20660,7 +23610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20674,7 +23626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -20688,7 +23642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20702,7 +23658,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -20716,7 +23674,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -20730,7 +23690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20744,7 +23706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20758,7 +23722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20772,7 +23738,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -20786,7 +23754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20800,7 +23770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20814,7 +23786,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -20828,7 +23802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -20842,7 +23818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -20856,7 +23834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20870,7 +23850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20884,7 +23866,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -20898,7 +23882,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -20912,7 +23898,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -20926,7 +23914,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20940,7 +23930,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -20954,7 +23946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20968,7 +23962,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -20982,7 +23978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -20996,7 +23994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21010,7 +24010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21024,7 +24026,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21038,7 +24042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21052,7 +24058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21066,7 +24074,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21080,7 +24090,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -21094,7 +24106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21108,7 +24122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21122,7 +24138,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -21136,7 +24154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21150,7 +24170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21164,7 +24186,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21178,7 +24202,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -21192,7 +24218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21206,7 +24234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21220,7 +24250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -21234,7 +24266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -21248,7 +24282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -21262,7 +24298,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -21276,7 +24314,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21290,7 +24330,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21304,7 +24346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21318,7 +24362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21332,7 +24378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21346,7 +24394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -21360,7 +24410,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21374,7 +24426,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21388,7 +24442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21402,7 +24458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21416,7 +24474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21430,7 +24490,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -21444,7 +24506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21458,7 +24522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21472,7 +24538,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -21486,7 +24554,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -21500,7 +24570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21514,7 +24586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21528,7 +24602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21542,7 +24618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -21556,7 +24634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21570,7 +24650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21584,7 +24666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21598,7 +24682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -21612,7 +24698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21626,7 +24714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21640,7 +24730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21654,7 +24746,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -21668,7 +24762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21682,7 +24778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21696,7 +24794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21710,7 +24810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -21724,7 +24826,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21738,7 +24842,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21752,7 +24858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21766,7 +24874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21780,7 +24890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21794,7 +24906,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -21808,7 +24922,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -21822,7 +24938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21836,7 +24954,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -21850,7 +24970,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21864,7 +24986,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21878,7 +25002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21892,7 +25018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21906,7 +25034,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21920,7 +25050,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -21934,7 +25066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21948,7 +25082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -21962,7 +25098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -21976,7 +25114,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -21990,7 +25130,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -22004,7 +25146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22018,7 +25162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22032,7 +25178,9 @@
 			"hc_black": "support.constant.color: #CE9178",
 			"dark_modern": "support.constant.color: #CE9178",
 			"hc_light": "support.constant.color: #0451A5",
-			"light_modern": "support.constant.color: #0451A5"
+			"light_modern": "support.constant.color: #0451A5",
+			"2026-dark": "support.constant.color: #CE9178",
+			"2026-light": "support.constant.color: #0451A5"
 		}
 	},
 	{
@@ -22046,7 +25194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22060,7 +25210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22074,7 +25226,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -22088,7 +25242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22102,7 +25258,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -22116,7 +25274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22130,7 +25290,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -22144,7 +25306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -22158,7 +25322,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -22172,7 +25338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22186,7 +25354,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -22200,7 +25370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22214,7 +25386,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -22228,7 +25402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22242,7 +25418,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -22256,7 +25434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22270,7 +25450,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -22284,7 +25466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22298,7 +25482,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -22312,7 +25498,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -22326,7 +25514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22340,7 +25530,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -22354,7 +25546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22368,7 +25562,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -22382,7 +25578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22396,7 +25594,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -22410,7 +25610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22424,7 +25626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22438,7 +25642,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -22452,7 +25658,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -22466,7 +25674,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -22480,7 +25690,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22494,7 +25706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22508,7 +25722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22522,7 +25738,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -22536,7 +25754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22550,7 +25770,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22564,7 +25786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22578,7 +25802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22592,7 +25818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22606,7 +25834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22620,7 +25850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22634,7 +25866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22648,7 +25882,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22662,7 +25898,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22676,7 +25914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22690,7 +25930,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -22704,7 +25946,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22718,7 +25962,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22732,7 +25978,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22746,7 +25994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22760,7 +26010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22774,7 +26026,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22788,7 +26042,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -22802,7 +26058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22816,7 +26074,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22830,7 +26090,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22844,7 +26106,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -22858,7 +26122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22872,7 +26138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22886,7 +26154,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -22900,7 +26170,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -22914,7 +26186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22928,7 +26202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22942,7 +26218,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -22956,7 +26234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22970,7 +26250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -22984,7 +26266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -22998,7 +26282,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -23012,7 +26298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23026,7 +26314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23040,7 +26330,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -23054,7 +26346,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -23068,7 +26362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23082,7 +26378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23096,7 +26394,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -23110,7 +26410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23124,7 +26426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23138,7 +26442,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -23152,7 +26458,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -23166,7 +26474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23180,7 +26490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23194,7 +26506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -23208,7 +26522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23222,7 +26538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23236,7 +26554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23250,7 +26570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -23264,7 +26586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -23278,7 +26602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23292,7 +26618,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -23306,7 +26634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23320,7 +26650,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -23334,7 +26666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -23348,7 +26682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -23362,7 +26698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23376,7 +26714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23390,7 +26730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23404,7 +26746,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -23418,7 +26762,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -23432,7 +26778,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -23446,7 +26794,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -23460,7 +26810,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -23474,7 +26826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23488,7 +26842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23502,7 +26858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23516,7 +26874,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -23530,7 +26890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23544,7 +26906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23558,7 +26922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23572,7 +26938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23586,7 +26954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23600,7 +26970,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -23614,7 +26986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23628,7 +27002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23642,7 +27018,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -23656,7 +27034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23670,7 +27050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -23684,7 +27066,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -23698,7 +27082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -23712,7 +27098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23726,7 +27114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23740,7 +27130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23754,7 +27146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23768,7 +27162,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -23782,7 +27178,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -23796,7 +27194,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -23810,7 +27210,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -23824,7 +27226,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -23838,7 +27242,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -23852,7 +27258,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -23866,7 +27274,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -23880,7 +27290,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -23894,7 +27306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23908,7 +27322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23922,7 +27338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -23936,7 +27354,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -23950,7 +27370,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -23964,7 +27386,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -23978,7 +27402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -23992,7 +27418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24006,7 +27434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24020,7 +27450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -24034,7 +27466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24048,7 +27482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24062,7 +27498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -24076,7 +27514,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24090,7 +27530,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24104,7 +27546,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24118,7 +27562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24132,7 +27578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24146,7 +27594,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -24160,7 +27610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24174,7 +27626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24188,7 +27642,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24202,7 +27658,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24216,7 +27674,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24230,7 +27690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -24244,7 +27706,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24258,7 +27722,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24272,7 +27738,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24286,7 +27754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24300,7 +27770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24314,7 +27786,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -24328,7 +27802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24342,7 +27818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24356,7 +27834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -24370,7 +27850,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24384,7 +27866,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24398,7 +27882,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -24412,7 +27898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.property-name: #79C0FF",
+			"2026-light": "meta.property-name: #0550AE"
 		}
 	},
 	{
@@ -24426,7 +27914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24440,7 +27930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24454,7 +27946,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -24468,7 +27962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24482,7 +27978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24496,7 +27994,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24510,7 +28010,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24524,7 +28026,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24538,7 +28042,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24552,7 +28058,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24566,7 +28074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24580,7 +28090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24594,7 +28106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24608,7 +28122,9 @@
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.scss: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
-			"light_modern": "entity.other.attribute-name.scss: #800000"
+			"light_modern": "entity.other.attribute-name.scss: #800000",
+			"2026-dark": "entity.other.attribute-name.scss: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -24622,7 +28138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24636,7 +28154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24650,7 +28170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24664,7 +28186,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -24678,7 +28202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24692,7 +28218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24706,7 +28234,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -24720,7 +28250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24734,7 +28266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24748,7 +28282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24762,7 +28298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24776,7 +28314,9 @@
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.scss: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
-			"light_modern": "entity.other.attribute-name.scss: #800000"
+			"light_modern": "entity.other.attribute-name.scss: #800000",
+			"2026-dark": "entity.other.attribute-name.scss: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -24790,7 +28330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24804,7 +28346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24818,7 +28362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24832,7 +28378,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -24846,7 +28394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24860,7 +28410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24874,7 +28426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -24888,7 +28442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24902,7 +28458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24916,7 +28474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24930,7 +28490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24944,7 +28506,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24958,7 +28522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24972,7 +28538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24986,7 +28554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25000,7 +28570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25014,7 +28586,9 @@
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.scss: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
-			"light_modern": "entity.other.attribute-name.scss: #800000"
+			"light_modern": "entity.other.attribute-name.scss: #800000",
+			"2026-dark": "entity.other.attribute-name.scss: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -25028,7 +28602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25042,7 +28618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25056,7 +28634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25070,7 +28650,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -25084,7 +28666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25098,7 +28682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25112,7 +28698,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -25126,7 +28714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25140,7 +28730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25154,7 +28746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25168,7 +28762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25182,7 +28778,9 @@
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.scss: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
-			"light_modern": "entity.other.attribute-name.scss: #800000"
+			"light_modern": "entity.other.attribute-name.scss: #800000",
+			"2026-dark": "entity.other.attribute-name.scss: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -25196,7 +28794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25210,7 +28810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25224,7 +28826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25238,7 +28842,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -25252,7 +28858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25266,7 +28874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25280,7 +28890,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -25294,7 +28906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25308,7 +28922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25322,7 +28938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25336,7 +28954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25350,7 +28970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25364,7 +28986,9 @@
 			"hc_black": "support.type.vendored.property-name: #D4D4D4",
 			"dark_modern": "support.type.vendored.property-name: #9CDCFE",
 			"hc_light": "support.type.vendored.property-name: #264F78",
-			"light_modern": "support.type.vendored.property-name: #E50000"
+			"light_modern": "support.type.vendored.property-name: #E50000",
+			"2026-dark": "support.type.vendored.property-name: #9CDCFE",
+			"2026-light": "support.type.vendored.property-name: #E50000"
 		}
 	},
 	{
@@ -25378,7 +29002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25392,7 +29018,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -25406,7 +29034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25420,7 +29050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25434,7 +29066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25448,7 +29082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25462,7 +29098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25476,7 +29114,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -25490,7 +29130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25504,7 +29146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25518,7 +29162,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -25532,7 +29178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25546,7 +29194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25560,7 +29210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25574,7 +29226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25588,7 +29242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25602,7 +29258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25616,7 +29274,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -25630,7 +29290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25644,7 +29306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25658,7 +29322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -25672,7 +29338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25686,7 +29354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25700,7 +29370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25714,7 +29386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25728,7 +29402,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -25742,7 +29418,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -25756,7 +29434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25770,7 +29450,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -25784,7 +29466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25798,7 +29482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25812,7 +29498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25826,7 +29514,9 @@
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.scss: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
-			"light_modern": "entity.other.attribute-name.scss: #800000"
+			"light_modern": "entity.other.attribute-name.scss: #800000",
+			"2026-dark": "entity.other.attribute-name.scss: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -25840,7 +29530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25854,7 +29546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25868,7 +29562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25882,7 +29578,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -25896,7 +29594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25910,7 +29610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25924,7 +29626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -25938,7 +29642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25952,7 +29658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25966,7 +29674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25980,7 +29690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -25994,7 +29706,9 @@
 			"hc_black": "entity.other.attribute-name.scss: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.scss: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.scss: #0F4A85",
-			"light_modern": "entity.other.attribute-name.scss: #800000"
+			"light_modern": "entity.other.attribute-name.scss: #800000",
+			"2026-dark": "entity.other.attribute-name.scss: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.scss: #800000"
 		}
 	},
 	{
@@ -26008,7 +29722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26022,7 +29738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26036,7 +29754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26050,7 +29770,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -26064,7 +29786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26078,7 +29802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26092,7 +29818,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -26106,7 +29834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26120,7 +29850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26134,7 +29866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26148,7 +29882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26162,7 +29898,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -26176,7 +29914,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -26190,7 +29930,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -26204,7 +29946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26218,7 +29962,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -26232,7 +29978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -26246,7 +29994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26260,7 +30010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26274,7 +30026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26288,7 +30042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26302,7 +30058,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -26316,7 +30074,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -26330,7 +30090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26344,7 +30106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26358,7 +30122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26372,7 +30138,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -26386,7 +30154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26400,7 +30170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26414,7 +30186,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -26428,7 +30202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26442,7 +30218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26456,7 +30234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26470,7 +30250,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -26484,7 +30266,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -26498,7 +30282,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -26512,7 +30298,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -26526,7 +30314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26540,7 +30330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26554,7 +30346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26568,7 +30362,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -26582,7 +30378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26596,7 +30394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26610,7 +30410,9 @@
 			"hc_black": "source.css variable: #D4D4D4",
 			"dark_modern": "source.css variable: #9CDCFE",
 			"hc_light": "source.css variable: #264F78",
-			"light_modern": "source.css variable: #E50000"
+			"light_modern": "source.css variable: #E50000",
+			"2026-dark": "source.css variable: #9CDCFE",
+			"2026-light": "source.css variable: #E50000"
 		}
 	},
 	{
@@ -26624,7 +30426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26638,7 +30442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26652,7 +30458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26666,7 +30474,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -26680,7 +30490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -26694,7 +30506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -26708,7 +30522,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -26722,7 +30538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -26736,7 +30554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
index 0dde2e0748e..893ac29a5d9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "constant.other.option: #569CD6",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "constant.other.option: #0000FF"
+			"light_modern": "constant.other.option: #0000FF",
+			"2026-dark": "constant.other.option: #569CD6",
+			"2026-light": "constant.other.option: #0000FF"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json b/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
index 7221ff4e3dd..afea9d084a0 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "support.variable: #9CDCFE",
 			"dark_modern": "support.variable: #9CDCFE",
 			"hc_light": "support.variable: #001080",
-			"light_modern": "support.variable: #001080"
+			"light_modern": "support.variable: #001080",
+			"2026-dark": "support.variable: #79C0FF",
+			"2026-light": "support.variable: #0550AE"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
index 6c6cc4c26eb..cbe5b1134a9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json
index 13d83201f14..558aebca49c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sty.json
@@ -10,7 +10,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "constant.character: #569CD6",
 			"dark_modern": "constant.character.escape: #D7BA7D",
 			"hc_light": "constant.character.escape: #EE0000",
-			"light_modern": "constant.character.escape: #EE0000"
+			"light_modern": "constant.character.escape: #EE0000",
+			"2026-dark": "constant.character.escape: #D7BA7D",
+			"2026-light": "constant.character.escape: #EE0000"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
index 8b1b64f71f5..6dbd808d413 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
index 7cc786089fd..3b35e7e82f1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.class: #4EC9B0",
 			"dark_modern": "support.class: #4EC9B0",
 			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"light_modern": "support.class: #267F99",
+			"2026-dark": "support.class: #4EC9B0",
+			"2026-light": "support.class: #267F99"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.parameter.function: #C9D1D9",
+			"2026-light": "variable.parameter.function: #1F2328"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
index 68504d08d8e..0c03bd60cab 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9250,7 +10570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9264,7 +10586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9278,7 +10602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9292,7 +10618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9306,7 +10634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9320,7 +10650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9334,7 +10666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9348,7 +10682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9362,7 +10698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9376,7 +10714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9390,7 +10730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9404,7 +10746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9418,7 +10762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9432,7 +10778,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -9446,7 +10794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9460,7 +10810,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -9474,7 +10826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9488,7 +10842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9502,7 +10858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9516,7 +10874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9530,7 +10890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9544,7 +10906,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -9558,7 +10922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9572,7 +10938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9586,7 +10954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9600,7 +10970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9614,7 +10986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9628,7 +11002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9642,7 +11018,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -9656,7 +11034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9670,7 +11050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9684,7 +11066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9698,7 +11082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9712,7 +11098,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -9726,7 +11114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9740,7 +11130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9754,7 +11146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9768,7 +11162,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9782,7 +11178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9796,7 +11194,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9810,7 +11210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9824,7 +11226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9838,7 +11242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9852,7 +11258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9866,7 +11274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9880,7 +11290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9894,7 +11306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9908,7 +11322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -9922,7 +11338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9936,7 +11354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9950,7 +11370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9964,7 +11386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9978,7 +11402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -9992,7 +11418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10006,7 +11434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10020,7 +11450,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -10034,7 +11466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10048,7 +11482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10062,7 +11498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10076,7 +11514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10090,7 +11530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10104,7 +11546,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10118,7 +11562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10132,7 +11578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10146,7 +11594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10160,7 +11610,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -10174,7 +11626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10188,7 +11642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10202,7 +11658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10216,7 +11674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10230,7 +11690,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10244,7 +11706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10258,7 +11722,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -10272,7 +11738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10286,7 +11754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10300,7 +11770,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10314,7 +11786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10328,7 +11802,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -10342,7 +11818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10356,7 +11834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10370,7 +11850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10384,7 +11866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10398,7 +11882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10412,7 +11898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10426,7 +11914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10440,7 +11930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10454,7 +11946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10468,7 +11962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10482,7 +11978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10496,7 +11994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10510,7 +12010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10524,7 +12026,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -10538,7 +12042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10552,7 +12058,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -10566,7 +12074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10580,7 +12090,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -10594,7 +12106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10608,7 +12122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10622,7 +12138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10636,7 +12154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10650,7 +12170,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10664,7 +12186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10678,7 +12202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10692,7 +12218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10706,7 +12234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10720,7 +12250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10734,7 +12266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10748,7 +12282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10762,7 +12298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10776,7 +12314,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -10790,7 +12330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10804,7 +12346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -10818,7 +12362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10832,7 +12378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10846,7 +12394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10860,7 +12410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10874,7 +12426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10888,7 +12442,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -10902,7 +12458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10916,7 +12474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10930,7 +12490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -10944,7 +12506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10958,7 +12522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -10972,7 +12538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -10986,7 +12554,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -11000,7 +12570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11014,7 +12586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11028,7 +12602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11042,7 +12618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11056,7 +12634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11070,7 +12650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11084,7 +12666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11098,7 +12682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11112,7 +12698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11126,7 +12714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11140,7 +12730,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -11154,7 +12746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11168,7 +12762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11182,7 +12778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11196,7 +12794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11210,7 +12810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11224,7 +12826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11238,7 +12842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11252,7 +12858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11266,7 +12874,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -11280,7 +12890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11294,7 +12906,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -11308,7 +12922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11322,7 +12938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11336,7 +12954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11350,7 +12970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11364,7 +12986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11378,7 +13002,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -11392,7 +13018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11406,7 +13034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11420,7 +13050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11434,7 +13066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11448,7 +13082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11462,7 +13098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11476,7 +13114,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -11490,7 +13130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11504,7 +13146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11518,7 +13162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11532,7 +13178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11546,7 +13194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11560,7 +13210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -11574,7 +13226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11588,7 +13242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11602,7 +13258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11616,7 +13274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11630,7 +13290,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11644,7 +13306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11658,7 +13322,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11672,7 +13338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11686,7 +13354,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11700,7 +13370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11714,7 +13386,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -11728,7 +13402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11742,7 +13418,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11756,7 +13434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11770,7 +13450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11784,7 +13466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11798,7 +13482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11812,7 +13498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11826,7 +13514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11840,7 +13530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11854,7 +13546,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -11868,7 +13562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11882,7 +13578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11896,7 +13594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11910,7 +13610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11924,7 +13626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11938,7 +13642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11952,7 +13658,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -11966,7 +13674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -11980,7 +13690,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -11994,7 +13706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12008,7 +13722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12022,7 +13738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12036,7 +13754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12050,7 +13770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12064,7 +13786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12078,7 +13802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12092,7 +13818,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12106,7 +13834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12120,7 +13850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12134,7 +13866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12148,7 +13882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12162,7 +13898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12176,7 +13914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12190,7 +13930,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -12204,7 +13946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12218,7 +13962,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12232,7 +13978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12246,7 +13994,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -12260,7 +14010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12274,7 +14026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12288,7 +14042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12302,7 +14058,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -12316,7 +14074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12330,7 +14090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12344,7 +14106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12358,7 +14122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12372,7 +14138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -12386,7 +14154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12400,7 +14170,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12414,7 +14186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12428,7 +14202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12442,7 +14218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12456,7 +14234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12470,7 +14250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12484,7 +14266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -12498,7 +14282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12512,7 +14298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12526,7 +14314,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12540,7 +14330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12554,7 +14346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12568,7 +14362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12582,7 +14378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12596,7 +14394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12610,7 +14410,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12624,7 +14426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12638,7 +14442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12652,7 +14458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12666,7 +14474,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12680,7 +14490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12694,7 +14506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12708,7 +14522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12722,7 +14538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12736,7 +14554,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12750,7 +14570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12764,7 +14586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12778,7 +14602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12792,7 +14618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12806,7 +14634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12820,7 +14650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -12834,7 +14666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12848,7 +14682,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12862,7 +14698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12876,7 +14714,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12890,7 +14730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12904,7 +14746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12918,7 +14762,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -12932,7 +14778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12946,7 +14794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -12960,7 +14810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -12974,7 +14826,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -12988,7 +14842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13002,7 +14858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13016,7 +14874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13030,7 +14890,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13044,7 +14906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13058,7 +14922,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13072,7 +14938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13086,7 +14954,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13100,7 +14970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13114,7 +14986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13128,7 +15002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13142,7 +15018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13156,7 +15034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13170,7 +15050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13184,7 +15066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13198,7 +15082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13212,7 +15098,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13226,7 +15114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13240,7 +15130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13254,7 +15146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13268,7 +15162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13282,7 +15178,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13296,7 +15194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13310,7 +15210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13324,7 +15226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13338,7 +15242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13352,7 +15258,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13366,7 +15274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13380,7 +15290,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13394,7 +15306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13408,7 +15322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13422,7 +15338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13436,7 +15354,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13450,7 +15370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13464,7 +15386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13478,7 +15402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13492,7 +15418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13506,7 +15434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13520,7 +15450,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13534,7 +15466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13548,7 +15482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13562,7 +15498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13576,7 +15514,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13590,7 +15530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13604,7 +15546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13618,7 +15562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13632,7 +15578,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13646,7 +15594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13660,7 +15610,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13674,7 +15626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13688,7 +15642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13702,7 +15658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13716,7 +15674,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13730,7 +15690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13744,7 +15706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13758,7 +15722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13772,7 +15738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13786,7 +15754,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13800,7 +15770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13814,7 +15786,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13828,7 +15802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13842,7 +15818,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -13856,7 +15834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13870,7 +15850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13884,7 +15866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13898,7 +15882,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13912,7 +15898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13926,7 +15914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -13940,7 +15930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13954,7 +15946,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -13968,7 +15962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -13982,7 +15978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -13996,7 +15994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14010,7 +16010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14024,7 +16026,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14038,7 +16042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14052,7 +16058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14066,7 +16074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14080,7 +16090,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -14094,7 +16106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14108,7 +16122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14122,7 +16138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14136,7 +16154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14150,7 +16170,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -14164,7 +16186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14178,7 +16202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14192,7 +16218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14206,7 +16234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14220,7 +16250,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -14234,7 +16266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14248,7 +16282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14262,7 +16298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14276,7 +16314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14290,7 +16330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14304,7 +16346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14318,7 +16362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14332,7 +16378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14346,7 +16394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -14360,7 +16410,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -14374,7 +16426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14388,7 +16442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14402,7 +16458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14416,7 +16474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -14430,7 +16490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14444,7 +16506,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -14458,7 +16522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14472,7 +16538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -14486,7 +16554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14500,7 +16570,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -14514,7 +16586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -14528,7 +16602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
index 2d8b7a5fbf2..08edffcc339 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
index 117ad95d8b2..259d5d43243 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
@@ -10,7 +10,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.quoted.double.xml: #0F4A85",
-			"light_modern": "string.quoted.double.xml: #0000FF"
+			"light_modern": "string.quoted.double.xml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.quoted.double.xml: #0000FF"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "punctuation.definition.tag: #808080",
 			"dark_modern": "punctuation.definition.tag: #808080",
 			"hc_light": "punctuation.definition.tag: #0F4A85",
-			"light_modern": "punctuation.definition.tag: #800000"
+			"light_modern": "punctuation.definition.tag: #800000",
+			"2026-dark": "punctuation.definition.tag: #808080",
+			"2026-light": "punctuation.definition.tag: #800000"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
index 0908e19e3ea..7902e3b7cc9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity: #79C0FF",
+			"2026-light": "entity: #0550AE"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "punctuation.definition.comment: #8B949E",
+			"2026-light": "punctuation.definition.comment: #6E7781"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.in.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.in.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.in.yaml: #0000FF"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.in.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.in.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.in.yaml: #0000FF"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.in.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.in.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.in.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.in.yaml: #0000FF"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "invalid: #F44747",
 			"dark_modern": "invalid: #F44747",
 			"hc_light": "invalid: #B5200D",
-			"light_modern": "invalid: #CD3131"
+			"light_modern": "invalid: #CD3131",
+			"2026-dark": "invalid.illegal: #FFA198",
+			"2026-light": "invalid.illegal: #82071E"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "meta.block: #C9D1D9",
+			"2026-light": "meta.block: #1F2328"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json b/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json
index a547a91a352..26851609c27 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name.json: #0451A5",
-			"light_modern": "support.type.property-name.json: #0451A5"
+			"light_modern": "support.type.property-name.json: #0451A5",
+			"2026-dark": "support.type.property-name.json: #7EE787",
+			"2026-light": "support.type.property-name.json: #116329"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
index a5a8c33bf22..ab5e408dd84 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
index 046a20d140a..eee4efbc5bd 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json
index 5e8481b6289..9ee2b736587 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
index c7c13ff004c..665dbbc5d18 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "keyword.operator.expression: #569CD6",
 			"dark_modern": "keyword.operator.expression: #569CD6",
 			"hc_light": "keyword.operator.expression: #0F4A85",
-			"light_modern": "keyword.operator.expression: #0000FF"
+			"light_modern": "keyword.operator.expression: #0000FF",
+			"2026-dark": "keyword.operator.expression: #569CD6",
+			"2026-light": "keyword.operator.expression: #0000FF"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json
index 2a122f89471..7274f9c9f20 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json
index 100bf5c3d07..16d2dad934e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
index c1a632297c2..a8e990cca1d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
index 32a1169366f..5be9cafdded 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json
index 6753ae3fa4c..0bf4d8bbce6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
index e57fa0af7ff..e9db897914a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "entity.other.inherited-class: #4EC9B0",
 			"dark_modern": "entity.other.inherited-class: #4EC9B0",
 			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"light_modern": "entity.other.inherited-class: #267F99",
+			"2026-dark": "entity.other.inherited-class: #4EC9B0",
+			"2026-light": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
index ecc84c7516e..f8e032a5141 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
index 1bf36d419d5..3f32faf00e4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "punctuation.definition.template-expression.begin: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.begin: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.begin: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.begin: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.begin: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.begin: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.begin: #0000FF"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "string variable: #79C0FF",
+			"2026-light": "string variable: #0550AE"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "punctuation.definition.template-expression.end: #569CD6",
 			"dark_modern": "punctuation.definition.template-expression.end: #569CD6",
 			"hc_light": "punctuation.definition.template-expression.end: #0F4A85",
-			"light_modern": "punctuation.definition.template-expression.end: #0000FF"
+			"light_modern": "punctuation.definition.template-expression.end: #0000FF",
+			"2026-dark": "punctuation.definition.template-expression.end: #569CD6",
+			"2026-light": "punctuation.definition.template-expression.end: #0000FF"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
index aa495a54f95..adf98b6974d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json
index afaebeb0b9e..1b6d8e683bf 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-variables_css.json
@@ -10,7 +10,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json
index 98adba8bf54..0d3c30273ee 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_css.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.constant.media: #CE9178",
 			"dark_modern": "support.constant.media: #CE9178",
 			"hc_light": "support.constant.media: #0451A5",
-			"light_modern": "support.constant.media: #0451A5"
+			"light_modern": "support.constant.media: #0451A5",
+			"2026-dark": "support.constant.media: #CE9178",
+			"2026-light": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "support.constant.media: #CE9178",
 			"dark_modern": "support.constant.media: #CE9178",
 			"hc_light": "support.constant.media: #0451A5",
-			"light_modern": "support.constant.media: #0451A5"
+			"light_modern": "support.constant.media: #0451A5",
+			"2026-dark": "support.constant.media: #CE9178",
+			"2026-light": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "support.constant.media: #CE9178",
 			"dark_modern": "support.constant.media: #CE9178",
 			"hc_light": "support.constant.media: #0451A5",
-			"light_modern": "support.constant.media: #0451A5"
+			"light_modern": "support.constant.media: #0451A5",
+			"2026-dark": "support.constant.media: #CE9178",
+			"2026-light": "support.constant.media: #0451A5"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "entity.other.attribute-name.id.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.id.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.id.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.id.css: #800000"
+			"light_modern": "entity.other.attribute-name.id.css: #800000",
+			"2026-dark": "entity.other.attribute-name.id.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.id.css: #800000"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "support.constant.font-name: #CE9178",
 			"dark_modern": "support.constant.font-name: #CE9178",
 			"hc_light": "support.constant.font-name: #0451A5",
-			"light_modern": "support.constant.font-name: #0451A5"
+			"light_modern": "support.constant.font-name: #0451A5",
+			"2026-dark": "support.constant.font-name: #CE9178",
+			"2026-light": "support.constant.font-name: #0451A5"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "constant.other.color.rgb-value: #CE9178",
 			"dark_modern": "constant.other.color.rgb-value: #CE9178",
 			"hc_light": "constant.other.color.rgb-value: #0451A5",
-			"light_modern": "constant.other.color.rgb-value: #0451A5"
+			"light_modern": "constant.other.color.rgb-value: #0451A5",
+			"2026-dark": "constant.other.color.rgb-value: #CE9178",
+			"2026-light": "constant.other.color.rgb-value: #0451A5"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "support.function: #DCDCAA",
 			"dark_modern": "support.function: #DCDCAA",
 			"hc_light": "support.function: #5E2CBC",
-			"light_modern": "support.function: #795E26"
+			"light_modern": "support.function: #795E26",
+			"2026-dark": "support.function: #DCDCAA",
+			"2026-light": "support.function: #795E26"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "entity.other.attribute-name.class.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.class.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.class.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.class.css: #800000"
+			"light_modern": "entity.other.attribute-name.class.css: #800000",
+			"2026-dark": "entity.other.attribute-name.class.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.class.css: #800000"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "entity.other.attribute-name: #9CDCFE",
 			"dark_modern": "entity.other.attribute-name: #9CDCFE",
 			"hc_light": "entity.other.attribute-name: #264F78",
-			"light_modern": "entity.other.attribute-name: #E50000"
+			"light_modern": "entity.other.attribute-name: #E50000",
+			"2026-dark": "entity.other.attribute-name: #9CDCFE",
+			"2026-light": "entity.other.attribute-name: #E50000"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"dark_modern": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
 			"hc_light": "entity.other.attribute-name.pseudo-element.css: #0F4A85",
-			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000"
+			"light_modern": "entity.other.attribute-name.pseudo-element.css: #800000",
+			"2026-dark": "entity.other.attribute-name.pseudo-element.css: #D7BA7D",
+			"2026-light": "entity.other.attribute-name.pseudo-element.css: #800000"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "entity.name.tag.css: #D7BA7D",
 			"dark_modern": "entity.name.tag.css: #D7BA7D",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag.css: #D7BA7D",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "keyword.other.unit: #B5CEA8",
 			"dark_modern": "keyword.other.unit: #B5CEA8",
 			"hc_light": "keyword.other.unit: #096D48",
-			"light_modern": "keyword.other.unit: #098658"
+			"light_modern": "keyword.other.unit: #098658",
+			"2026-dark": "keyword.other.unit: #B5CEA8",
+			"2026-light": "keyword.other.unit: #098658"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "entity.name.tag: #569CD6",
 			"dark_modern": "entity.name.tag: #569CD6",
 			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
+			"light_modern": "entity.name.tag: #800000",
+			"2026-dark": "entity.name.tag: #7EE787",
+			"2026-light": "entity.name.tag: #116329"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "support.type.property-name: #D4D4D4",
 			"dark_modern": "support.type.property-name: #9CDCFE",
 			"hc_light": "support.type.property-name: #264F78",
-			"light_modern": "support.type.property-name: #E50000"
+			"light_modern": "support.type.property-name: #E50000",
+			"2026-dark": "support.type.property-name: #9CDCFE",
+			"2026-light": "support.type.property-name: #E50000"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "support.constant.property-value: #CE9178",
 			"dark_modern": "support.constant.property-value: #CE9178",
 			"hc_light": "support.constant.property-value: #0451A5",
-			"light_modern": "support.constant.property-value: #0451A5"
+			"light_modern": "support.constant.property-value: #0451A5",
+			"2026-dark": "support.constant.property-value: #CE9178",
+			"2026-light": "support.constant.property-value: #0451A5"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json
index c6d521cdcb6..933bb9d0344 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ini.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "entity.name: #FFA657",
+			"2026-light": "entity.name: #953800"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_regexp.ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_regexp.ts.json
index b385189ab0b..8f4763ac74a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_regexp.ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_regexp.ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "string.regexp: #D16969",
 			"dark_modern": "string.regexp: #D16969",
 			"hc_light": "string.regexp: #811F3F",
-			"light_modern": "string.regexp: #811F3F"
+			"light_modern": "string.regexp: #811F3F",
+			"2026-dark": "string.regexp: #A5D6FF",
+			"2026-light": "string.regexp: #0A3069"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "keyword: #569CD6",
 			"dark_modern": "keyword: #569CD6",
 			"hc_light": "keyword: #0F4A85",
-			"light_modern": "keyword: #0000FF"
+			"light_modern": "keyword: #0000FF",
+			"2026-dark": "keyword: #FF7B72",
+			"2026-light": "keyword: #CF222E"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
index b31e6daa154..d3006550131 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json
@@ -10,7 +10,9 @@
 			"hc_black": "comment: #7CA668",
 			"dark_modern": "comment: #6A9955",
 			"hc_light": "comment: #515151",
-			"light_modern": "comment: #008000"
+			"light_modern": "comment: #008000",
+			"2026-dark": "comment: #8B949E",
+			"2026-light": "comment: #6E7781"
 		}
 	},
 	{
@@ -24,7 +26,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -38,7 +42,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -52,7 +58,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -66,7 +74,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -80,7 +90,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -94,7 +106,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -108,7 +122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -122,7 +138,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -136,7 +154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -150,7 +170,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -164,7 +186,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -178,7 +202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -192,7 +218,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -206,7 +234,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -220,7 +250,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -234,7 +266,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -248,7 +282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -262,7 +298,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -276,7 +314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -290,7 +330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -304,7 +346,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -318,7 +362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -332,7 +378,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -346,7 +394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -360,7 +410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -374,7 +426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -388,7 +442,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -402,7 +458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -416,7 +474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -430,7 +490,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -444,7 +506,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -458,7 +522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -472,7 +538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -486,7 +554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -500,7 +570,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -514,7 +586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -528,7 +602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -542,7 +618,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -556,7 +634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -570,7 +650,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -584,7 +666,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -598,7 +682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -612,7 +698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -626,7 +714,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -640,7 +730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -654,7 +746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -668,7 +762,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -682,7 +778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -696,7 +794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -710,7 +810,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -724,7 +826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -738,7 +842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -752,7 +858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -766,7 +874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -780,7 +890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -794,7 +906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -808,7 +922,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -822,7 +938,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -836,7 +954,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -850,7 +970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -864,7 +986,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -878,7 +1002,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -892,7 +1018,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -906,7 +1034,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -920,7 +1050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -934,7 +1066,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -948,7 +1082,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -962,7 +1098,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -976,7 +1114,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -990,7 +1130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1004,7 +1146,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1018,7 +1162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1032,7 +1178,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1046,7 +1194,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1060,7 +1210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1074,7 +1226,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1088,7 +1242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1102,7 +1258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1116,7 +1274,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1130,7 +1290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1144,7 +1306,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1158,7 +1322,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1172,7 +1338,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1186,7 +1354,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1200,7 +1370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1214,7 +1386,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1228,7 +1402,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1242,7 +1418,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1256,7 +1434,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1270,7 +1450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1284,7 +1466,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1298,7 +1482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1312,7 +1498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1326,7 +1514,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1340,7 +1530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1354,7 +1546,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1368,7 +1562,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1382,7 +1578,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1396,7 +1594,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -1410,7 +1610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1424,7 +1626,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -1438,7 +1642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1452,7 +1658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1466,7 +1674,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -1480,7 +1690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1494,7 +1706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1508,7 +1722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1522,7 +1738,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1536,7 +1754,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1550,7 +1770,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1564,7 +1786,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1578,7 +1802,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1592,7 +1818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1606,7 +1834,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1620,7 +1850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1634,7 +1866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1648,7 +1882,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1662,7 +1898,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -1676,7 +1914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1690,7 +1930,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1704,7 +1946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1718,7 +1962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1732,7 +1978,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1746,7 +1994,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1760,7 +2010,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1774,7 +2026,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1788,7 +2042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1802,7 +2058,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1816,7 +2074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1830,7 +2090,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1844,7 +2106,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1858,7 +2122,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1872,7 +2138,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1886,7 +2154,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1900,7 +2170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1914,7 +2186,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -1928,7 +2202,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -1942,7 +2218,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -1956,7 +2234,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -1970,7 +2250,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1984,7 +2266,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -1998,7 +2282,9 @@
 			"hc_black": "string: #CE9178",
 			"dark_modern": "string: #CE9178",
 			"hc_light": "string: #0F4A85",
-			"light_modern": "string: #A31515"
+			"light_modern": "string: #A31515",
+			"2026-dark": "string: #A5D6FF",
+			"2026-light": "string: #0A3069"
 		}
 	},
 	{
@@ -2012,7 +2298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2026,7 +2314,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2040,7 +2330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2054,7 +2346,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2068,7 +2362,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2082,7 +2378,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2096,7 +2394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2110,7 +2410,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2124,7 +2426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2138,7 +2442,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2152,7 +2458,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2166,7 +2474,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2180,7 +2490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2194,7 +2506,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2208,7 +2522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2222,7 +2538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2236,7 +2554,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2250,7 +2570,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -2264,7 +2586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2278,7 +2602,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2292,7 +2618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2306,7 +2634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2320,7 +2650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2334,7 +2666,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2348,7 +2682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2362,7 +2698,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2376,7 +2714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2390,7 +2730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2404,7 +2746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2418,7 +2762,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2432,7 +2778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2446,7 +2794,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2460,7 +2810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2474,7 +2826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2488,7 +2842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2502,7 +2858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2516,7 +2874,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -2530,7 +2890,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2544,7 +2906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2558,7 +2922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2572,7 +2938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2586,7 +2954,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2600,7 +2970,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2614,7 +2986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2628,7 +3002,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2642,7 +3018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2656,7 +3034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2670,7 +3050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2684,7 +3066,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2698,7 +3082,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -2712,7 +3098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2726,7 +3114,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -2740,7 +3130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2754,7 +3146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2768,7 +3162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2782,7 +3178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2796,7 +3194,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2810,7 +3210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -2824,7 +3226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2838,7 +3242,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -2852,7 +3258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2866,7 +3274,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2880,7 +3290,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2894,7 +3306,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -2908,7 +3322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2922,7 +3338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2936,7 +3354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2950,7 +3370,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -2964,7 +3386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -2978,7 +3402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -2992,7 +3418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3006,7 +3434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3020,7 +3450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3034,7 +3466,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3048,7 +3482,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -3062,7 +3498,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3076,7 +3514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3090,7 +3530,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3104,7 +3546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3118,7 +3562,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -3132,7 +3578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3146,7 +3594,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3160,7 +3610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3174,7 +3626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3188,7 +3642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3202,7 +3658,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3216,7 +3674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3230,7 +3690,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3244,7 +3706,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3258,7 +3722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3272,7 +3738,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3286,7 +3754,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3300,7 +3770,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -3314,7 +3786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3328,7 +3802,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3342,7 +3818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3356,7 +3834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3370,7 +3850,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3384,7 +3866,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3398,7 +3882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3412,7 +3898,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3426,7 +3914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3440,7 +3930,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3454,7 +3946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3468,7 +3962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3482,7 +3978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3496,7 +3994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3510,7 +4010,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -3524,7 +4026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3538,7 +4042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3552,7 +4058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3566,7 +4074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3580,7 +4090,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3594,7 +4106,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3608,7 +4122,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3622,7 +4138,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3636,7 +4154,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3650,7 +4170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3664,7 +4186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3678,7 +4202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -3692,7 +4218,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3706,7 +4234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3720,7 +4250,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3734,7 +4266,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3748,7 +4282,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -3762,7 +4298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3776,7 +4314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3790,7 +4330,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3804,7 +4346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3818,7 +4362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3832,7 +4378,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3846,7 +4394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3860,7 +4410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3874,7 +4426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3888,7 +4442,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -3902,7 +4458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3916,7 +4474,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -3930,7 +4490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3944,7 +4506,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -3958,7 +4522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3972,7 +4538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -3986,7 +4554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4000,7 +4570,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4014,7 +4586,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4028,7 +4602,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4042,7 +4618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4056,7 +4634,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4070,7 +4650,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4084,7 +4666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4098,7 +4682,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -4112,7 +4698,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4126,7 +4714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4140,7 +4730,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4154,7 +4746,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4168,7 +4762,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -4182,7 +4778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4196,7 +4794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4210,7 +4810,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4224,7 +4826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4238,7 +4842,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4252,7 +4858,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -4266,7 +4874,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4280,7 +4890,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4294,7 +4906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4308,7 +4922,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4322,7 +4938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4336,7 +4954,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4350,7 +4970,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -4364,7 +4986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4378,7 +5002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4392,7 +5018,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -4406,7 +5034,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -4420,7 +5050,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4434,7 +5066,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4448,7 +5082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4462,7 +5098,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4476,7 +5114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4490,7 +5130,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4504,7 +5146,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4518,7 +5162,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4532,7 +5178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4546,7 +5194,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4560,7 +5210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4574,7 +5226,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4588,7 +5242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4602,7 +5258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4616,7 +5274,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4630,7 +5290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4644,7 +5306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4658,7 +5322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4672,7 +5338,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4686,7 +5354,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4700,7 +5370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4714,7 +5386,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4728,7 +5402,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4742,7 +5418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4756,7 +5434,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4770,7 +5450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4784,7 +5466,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4798,7 +5482,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4812,7 +5498,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -4826,7 +5514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4840,7 +5530,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4854,7 +5546,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -4868,7 +5562,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4882,7 +5578,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4896,7 +5594,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4910,7 +5610,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -4924,7 +5626,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4938,7 +5642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -4952,7 +5658,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -4966,7 +5674,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -4980,7 +5690,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4994,7 +5706,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -5008,7 +5722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5022,7 +5738,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5036,7 +5754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5050,7 +5770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5064,7 +5786,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5078,7 +5802,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -5092,7 +5818,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5106,7 +5834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5120,7 +5850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5134,7 +5866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5148,7 +5882,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -5162,7 +5898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5176,7 +5914,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5190,7 +5930,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5204,7 +5946,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5218,7 +5962,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5232,7 +5978,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5246,7 +5994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5260,7 +6010,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5274,7 +6026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5288,7 +6042,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5302,7 +6058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5316,7 +6074,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5330,7 +6090,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5344,7 +6106,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5358,7 +6122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5372,7 +6138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5386,7 +6154,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5400,7 +6170,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5414,7 +6186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5428,7 +6202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5442,7 +6218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5456,7 +6234,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5470,7 +6250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5484,7 +6266,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5498,7 +6282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5512,7 +6298,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -5526,7 +6314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5540,7 +6330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5554,7 +6346,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5568,7 +6362,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5582,7 +6378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5596,7 +6394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5610,7 +6410,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5624,7 +6426,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5638,7 +6442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5652,7 +6458,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5666,7 +6474,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5680,7 +6490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5694,7 +6506,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5708,7 +6522,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5722,7 +6538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5736,7 +6554,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5750,7 +6570,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5764,7 +6586,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5778,7 +6602,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5792,7 +6618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -5806,7 +6634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5820,7 +6650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -5834,7 +6666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5848,7 +6682,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5862,7 +6698,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5876,7 +6714,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -5890,7 +6730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5904,7 +6746,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -5918,7 +6762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5932,7 +6778,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -5946,7 +6794,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5960,7 +6810,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -5974,7 +6826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -5988,7 +6842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6002,7 +6858,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6016,7 +6874,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6030,7 +6890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6044,7 +6906,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -6058,7 +6922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6072,7 +6938,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6086,7 +6954,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6100,7 +6970,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6114,7 +6986,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6128,7 +7002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6142,7 +7018,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6156,7 +7034,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6170,7 +7050,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6184,7 +7066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6198,7 +7082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6212,7 +7098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6226,7 +7114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6240,7 +7130,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6254,7 +7146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6268,7 +7162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6282,7 +7178,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6296,7 +7194,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -6310,7 +7210,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -6324,7 +7226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6338,7 +7242,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6352,7 +7258,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6366,7 +7274,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6380,7 +7290,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6394,7 +7306,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6408,7 +7322,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6422,7 +7338,9 @@
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
-			"light_modern": "support.type: #267F99"
+			"light_modern": "support.type: #267F99",
+			"2026-dark": "support.type: #4EC9B0",
+			"2026-light": "support.type: #267F99"
 		}
 	},
 	{
@@ -6436,7 +7354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6450,7 +7370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6464,7 +7386,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6478,7 +7402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6492,7 +7418,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6506,7 +7434,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6520,7 +7450,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6534,7 +7466,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6548,7 +7482,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6562,7 +7498,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6576,7 +7514,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -6590,7 +7530,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6604,7 +7546,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6618,7 +7562,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6632,7 +7578,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -6646,7 +7594,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6660,7 +7610,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6674,7 +7626,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6688,7 +7642,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6702,7 +7658,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -6716,7 +7674,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -6730,7 +7690,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6744,7 +7706,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6758,7 +7722,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6772,7 +7738,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6786,7 +7754,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -6800,7 +7770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6814,7 +7786,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -6828,7 +7802,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -6842,7 +7818,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6856,7 +7834,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6870,7 +7850,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6884,7 +7866,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6898,7 +7882,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6912,7 +7898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6926,7 +7914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6940,7 +7930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6954,7 +7946,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6968,7 +7962,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -6982,7 +7978,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -6996,7 +7994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7010,7 +8010,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -7024,7 +8026,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7038,7 +8042,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7052,7 +8058,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7066,7 +8074,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7080,7 +8090,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7094,7 +8106,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7108,7 +8122,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7122,7 +8138,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7136,7 +8154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7150,7 +8170,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7164,7 +8186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7178,7 +8202,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7192,7 +8218,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7206,7 +8234,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7220,7 +8250,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7234,7 +8266,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7248,7 +8282,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7262,7 +8298,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7276,7 +8314,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7290,7 +8330,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7304,7 +8346,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -7318,7 +8362,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7332,7 +8378,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7346,7 +8394,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7360,7 +8410,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7374,7 +8426,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7388,7 +8442,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7402,7 +8458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7416,7 +8474,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7430,7 +8490,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7444,7 +8506,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7458,7 +8522,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7472,7 +8538,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7486,7 +8554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7500,7 +8570,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -7514,7 +8586,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7528,7 +8602,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -7542,7 +8618,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7556,7 +8634,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7570,7 +8650,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -7584,7 +8666,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7598,7 +8682,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7612,7 +8698,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7626,7 +8714,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -7640,7 +8730,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7654,7 +8746,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7668,7 +8762,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7682,7 +8778,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7696,7 +8794,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -7710,7 +8810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7724,7 +8826,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7738,7 +8842,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -7752,7 +8858,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7766,7 +8874,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7780,7 +8890,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7794,7 +8906,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7808,7 +8922,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7822,7 +8938,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -7836,7 +8954,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -7850,7 +8970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7864,7 +8986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7878,7 +9002,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7892,7 +9018,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -7906,7 +9034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7920,7 +9050,9 @@
 			"hc_black": "constant.language: #569CD6",
 			"dark_modern": "constant.language: #569CD6",
 			"hc_light": "constant.language: #0F4A85",
-			"light_modern": "constant.language: #0000FF"
+			"light_modern": "constant.language: #0000FF",
+			"2026-dark": "constant.language: #569CD6",
+			"2026-light": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -7934,7 +9066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7948,7 +9082,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7962,7 +9098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7976,7 +9114,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -7990,7 +9130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8004,7 +9146,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8018,7 +9162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8032,7 +9178,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -8046,7 +9194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8060,7 +9210,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8074,7 +9226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8088,7 +9242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8102,7 +9258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8116,7 +9274,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8130,7 +9290,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8144,7 +9306,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8158,7 +9322,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8172,7 +9338,9 @@
 			"hc_black": "storage.modifier: #569CD6",
 			"dark_modern": "storage.modifier: #569CD6",
 			"hc_light": "storage.modifier: #0F4A85",
-			"light_modern": "storage.modifier: #0000FF"
+			"light_modern": "storage.modifier: #0000FF",
+			"2026-dark": "storage.modifier: #569CD6",
+			"2026-light": "storage.modifier: #0000FF"
 		}
 	},
 	{
@@ -8186,7 +9354,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -8200,7 +9370,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8214,7 +9386,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8228,7 +9402,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8242,7 +9418,9 @@
 			"hc_black": "entity.name.type: #4EC9B0",
 			"dark_modern": "entity.name.type: #4EC9B0",
 			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"light_modern": "entity.name.type: #267F99",
+			"2026-dark": "entity.name.type: #4EC9B0",
+			"2026-light": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -8256,7 +9434,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8270,7 +9450,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8284,7 +9466,9 @@
 			"hc_black": "keyword.control: #C586C0",
 			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"light_modern": "keyword.control: #AF00DB",
+			"2026-dark": "keyword.control: #C586C0",
+			"2026-light": "keyword.control: #AF00DB"
 		}
 	},
 	{
@@ -8298,7 +9482,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8312,7 +9498,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8326,7 +9514,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8340,7 +9530,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8354,7 +9546,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8368,7 +9562,9 @@
 			"hc_black": "constant.numeric: #B5CEA8",
 			"dark_modern": "constant.numeric: #B5CEA8",
 			"hc_light": "constant.numeric: #096D48",
-			"light_modern": "constant.numeric: #098658"
+			"light_modern": "constant.numeric: #098658",
+			"2026-dark": "constant.numeric: #B5CEA8",
+			"2026-light": "constant.numeric: #098658"
 		}
 	},
 	{
@@ -8382,7 +9578,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8396,7 +9594,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8410,7 +9610,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8424,7 +9626,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8438,7 +9642,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8452,7 +9658,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8466,7 +9674,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8480,7 +9690,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8494,7 +9706,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8508,7 +9722,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8522,7 +9738,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8536,7 +9754,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8550,7 +9770,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8564,7 +9786,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8578,7 +9802,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8592,7 +9818,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8606,7 +9834,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8620,7 +9850,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8634,7 +9866,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8648,7 +9882,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8662,7 +9898,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8676,7 +9914,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8690,7 +9930,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8704,7 +9946,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8718,7 +9962,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8732,7 +9978,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8746,7 +9994,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8760,7 +10010,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -8774,7 +10026,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8788,7 +10042,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8802,7 +10058,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8816,7 +10074,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8830,7 +10090,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8844,7 +10106,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8858,7 +10122,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8872,7 +10138,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8886,7 +10154,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8900,7 +10170,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -8914,7 +10186,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8928,7 +10202,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8942,7 +10218,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8956,7 +10234,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -8970,7 +10250,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -8984,7 +10266,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -8998,7 +10282,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9012,7 +10298,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9026,7 +10314,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9040,7 +10330,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9054,7 +10346,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9068,7 +10362,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9082,7 +10378,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9096,7 +10394,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9110,7 +10410,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9124,7 +10426,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9138,7 +10442,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9152,7 +10458,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9166,7 +10474,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9180,7 +10490,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9194,7 +10506,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9208,7 +10522,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9222,7 +10538,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9236,7 +10554,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9250,7 +10570,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9264,7 +10586,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9278,7 +10602,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9292,7 +10618,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9306,7 +10634,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9320,7 +10650,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9334,7 +10666,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9348,7 +10682,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9362,7 +10698,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9376,7 +10714,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9390,7 +10730,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9404,7 +10746,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9418,7 +10762,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9432,7 +10778,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9446,7 +10794,9 @@
 			"hc_black": "entity.name.function: #DCDCAA",
 			"dark_modern": "entity.name.function: #DCDCAA",
 			"hc_light": "entity.name.function: #5E2CBC",
-			"light_modern": "entity.name.function: #795E26"
+			"light_modern": "entity.name.function: #795E26",
+			"2026-dark": "entity.name.function: #D2A8FF",
+			"2026-light": "entity.name.function: #8250DF"
 		}
 	},
 	{
@@ -9460,7 +10810,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9474,7 +10826,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9488,7 +10842,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9502,7 +10858,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9516,7 +10874,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9530,7 +10890,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9544,7 +10906,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9558,7 +10922,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9572,7 +10938,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9586,7 +10954,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9600,7 +10970,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9614,7 +10986,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9628,7 +11002,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9642,7 +11018,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9656,7 +11034,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9670,7 +11050,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9684,7 +11066,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9698,7 +11082,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9712,7 +11098,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9726,7 +11114,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9740,7 +11130,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9754,7 +11146,9 @@
 			"hc_black": "variable.language.this: #569CD6",
 			"dark_modern": "variable.language: #569CD6",
 			"hc_light": "variable.language: #0F4A85",
-			"light_modern": "variable.language: #0000FF"
+			"light_modern": "variable.language: #0000FF",
+			"2026-dark": "variable.language: #79C0FF",
+			"2026-light": "variable.language: #0550AE"
 		}
 	},
 	{
@@ -9768,7 +11162,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9782,7 +11178,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9796,7 +11194,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9810,7 +11210,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9824,7 +11226,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9838,7 +11242,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9852,7 +11258,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9866,7 +11274,9 @@
 			"hc_black": "storage.type: #569CD6",
 			"dark_modern": "storage.type: #569CD6",
 			"hc_light": "storage.type: #0F4A85",
-			"light_modern": "storage.type: #0000FF"
+			"light_modern": "storage.type: #0000FF",
+			"2026-dark": "storage.type: #FF7B72",
+			"2026-light": "storage.type: #CF222E"
 		}
 	},
 	{
@@ -9880,7 +11290,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9894,7 +11306,9 @@
 			"hc_black": "keyword.operator: #D4D4D4",
 			"dark_modern": "keyword.operator: #D4D4D4",
 			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"light_modern": "keyword.operator: #000000",
+			"2026-dark": "keyword.operator: #D4D4D4",
+			"2026-light": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -9908,7 +11322,9 @@
 			"hc_black": "keyword.operator.new: #569CD6",
 			"dark_modern": "keyword.operator.new: #569CD6",
 			"hc_light": "keyword.operator.new: #0F4A85",
-			"light_modern": "keyword.operator.new: #0000FF"
+			"light_modern": "keyword.operator.new: #0000FF",
+			"2026-dark": "keyword.operator.new: #569CD6",
+			"2026-light": "keyword.operator.new: #0000FF"
 		}
 	},
 	{
@@ -9922,7 +11338,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable.other: #C9D1D9",
+			"2026-light": "variable.other: #1F2328"
 		}
 	},
 	{
@@ -9936,7 +11354,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9950,7 +11370,9 @@
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"light_modern": "variable: #001080",
+			"2026-dark": "variable: #FFA657",
+			"2026-light": "variable: #953800"
 		}
 	},
 	{
@@ -9964,7 +11386,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9978,7 +11402,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	},
 	{
@@ -9992,7 +11418,9 @@
 			"hc_black": "default: #FFFFFF",
 			"dark_modern": "default: #CCCCCC",
 			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"light_modern": "default: #3B3B3B",
+			"2026-dark": "default: #BBBEBF",
+			"2026-light": "default: #202020"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-test-resolver/.npmrc b/extensions/vscode-test-resolver/.npmrc
index a9c57709666..efe233421c4 100644
--- a/extensions/vscode-test-resolver/.npmrc
+++ b/extensions/vscode-test-resolver/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/package-lock.json b/package-lock.json
index ef57f664424..7ba7159d798 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,26 +1,28 @@
 {
   "name": "code-oss-dev",
-  "version": "1.112.0",
+  "version": "1.114.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "code-oss-dev",
-      "version": "1.112.0",
+      "version": "1.114.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@anthropic-ai/sandbox-runtime": "0.0.23",
+        "@anthropic-ai/sandbox-runtime": "0.0.42",
+        "@github/copilot": "^1.0.11",
+        "@github/copilot-sdk": "^0.2.0",
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "^2.5.6",
         "@types/semver": "^7.5.8",
-        "@vscode/codicons": "^0.0.45-14",
+        "@vscode/codicons": "^0.0.46-1",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/native-watchdog": "^1.4.6",
         "@vscode/policy-watcher": "^1.3.2",
-        "@vscode/proxy-agent": "^0.38.0",
+        "@vscode/proxy-agent": "^0.40.0",
         "@vscode/ripgrep": "^1.17.1",
         "@vscode/spdlog": "^0.15.7",
         "@vscode/sqlite3": "5.1.12-vscode",
@@ -30,16 +32,16 @@
         "@vscode/windows-mutex": "^0.5.0",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.2.0",
-        "@xterm/addon-clipboard": "^0.3.0-beta.180",
-        "@xterm/addon-image": "^0.10.0-beta.180",
-        "@xterm/addon-ligatures": "^0.11.0-beta.180",
-        "@xterm/addon-progress": "^0.3.0-beta.180",
-        "@xterm/addon-search": "^0.17.0-beta.180",
-        "@xterm/addon-serialize": "^0.15.0-beta.180",
-        "@xterm/addon-unicode11": "^0.10.0-beta.180",
-        "@xterm/addon-webgl": "^0.20.0-beta.179",
-        "@xterm/headless": "^6.1.0-beta.180",
-        "@xterm/xterm": "^6.1.0-beta.180",
+        "@xterm/addon-clipboard": "^0.3.0-beta.191",
+        "@xterm/addon-image": "^0.10.0-beta.191",
+        "@xterm/addon-ligatures": "^0.11.0-beta.191",
+        "@xterm/addon-progress": "^0.3.0-beta.191",
+        "@xterm/addon-search": "^0.17.0-beta.191",
+        "@xterm/addon-serialize": "^0.15.0-beta.191",
+        "@xterm/addon-unicode11": "^0.10.0-beta.191",
+        "@xterm/addon-webgl": "^0.20.0-beta.190",
+        "@xterm/headless": "^6.1.0-beta.191",
+        "@xterm/xterm": "^6.1.0-beta.191",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
         "jschardet": "3.1.4",
@@ -48,15 +50,16 @@
         "minimist": "^1.2.8",
         "native-is-elevated": "0.9.0",
         "native-keymap": "^3.3.5",
-        "node-pty": "^1.2.0-beta.10",
+        "node-pty": "^1.2.0-beta.12",
         "open": "^10.1.2",
         "playwright-core": "1.59.0-alpha-2026-02-20",
         "tas-client": "0.3.1",
-        "undici": "^7.18.2",
+        "undici": "^7.24.0",
         "v8-inspect-profiler": "^0.1.1",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "^9.3.2",
+        "ws": "^8.19.0",
         "yauzl": "^3.0.0",
         "yazl": "^2.4.3"
       },
@@ -77,17 +80,17 @@
         "@types/sinon-test": "^2.4.2",
         "@types/trusted-types": "^2.0.7",
         "@types/vscode-notebook-renderer": "^1.72.0",
-        "@types/webpack": "^5.28.5",
         "@types/wicg-file-system-access": "^2023.10.7",
         "@types/windows-foreground-love": "^0.3.0",
         "@types/winreg": "^1.2.30",
+        "@types/ws": "^8.18.1",
         "@types/yauzl": "^2.10.0",
         "@types/yazl": "^2.4.2",
         "@typescript-eslint/utils": "^8.45.0",
         "@typescript/native-preview": "^7.0.0-dev.20260306",
-        "@vscode/component-explorer": "^0.1.1-22",
-        "@vscode/component-explorer-cli": "^0.1.1-18",
-        "@vscode/gulp-electron": "1.40.1",
+        "@vscode/component-explorer": "^0.1.1-24",
+        "@vscode/component-explorer-cli": "^0.1.1-20",
+        "@vscode/gulp-electron": "1.41.0",
         "@vscode/l10n-dev": "0.0.35",
         "@vscode/telemetry-extractor": "^1.20.2",
         "@vscode/test-cli": "^0.0.6",
@@ -101,18 +104,15 @@
         "asar": "^3.0.3",
         "chromium-pickle-js": "^0.2.0",
         "cookie": "^0.7.2",
-        "copy-webpack-plugin": "^11.0.0",
-        "css-loader": "^6.9.1",
         "debounce": "^1.0.0",
         "deemon": "^1.13.6",
-        "electron": "39.8.0",
+        "electron": "39.8.3",
         "eslint": "^9.36.0",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-jsdoc": "^50.3.1",
         "event-stream": "3.3.4",
         "fancy-log": "^1.3.3",
-        "file-loader": "^6.2.0",
         "glob": "^5.0.13",
         "gulp": "^4.0.0",
         "gulp-azure-storage": "^0.12.1",
@@ -153,17 +153,12 @@
         "sinon-test": "^3.1.3",
         "source-map": "0.6.1",
         "source-map-support": "^0.3.2",
-        "style-loader": "^3.3.2",
         "tar": "^7.5.9",
-        "ts-loader": "^9.5.1",
         "tsec": "0.2.7",
         "tslib": "^2.6.3",
         "typescript": "^6.0.0-dev.20260306",
         "typescript-eslint": "^8.45.0",
         "util": "^0.12.4",
-        "webpack": "^5.105.0",
-        "webpack-cli": "^5.1.4",
-        "webpack-stream": "^7.0.0",
         "xml2js": "^0.5.0",
         "yaserver": "^0.4.0"
       },
@@ -424,15 +419,15 @@
       }
     },
     "node_modules/@anthropic-ai/sandbox-runtime": {
-      "version": "0.0.23",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sandbox-runtime/-/sandbox-runtime-0.0.23.tgz",
-      "integrity": "sha512-Np0VRH6D71cGoJZvd8hCz1LMfwg9ERJovrOJSCz5aSQSQJPWPNIFPV1wfc8oAhJpStOuYkot+EmXOkRRxuGMCQ==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sandbox-runtime/-/sandbox-runtime-0.0.42.tgz",
+      "integrity": "sha512-kJpuhU4hHMumeygIkKvNhscEsTtQK1sat1kZwhb6HLYBznwjMGOdnuBI/RM9HeFwxArn71/ciD2WJbxttXBMHw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@pondwader/socks5-server": "^1.0.10",
         "@types/lodash-es": "^4.17.12",
         "commander": "^12.1.0",
-        "lodash-es": "^4.17.21",
+        "lodash-es": "^4.17.23",
         "shell-quote": "^1.8.3",
         "zod": "^3.24.1"
       },
@@ -1189,15 +1184,6 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/@electron/get": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
@@ -1411,6 +1397,142 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@github/copilot": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.11.tgz",
+      "integrity": "sha512-cptVopko/tNKEXyBP174yBjHQBEwg6CqaKN2S0M3J+5LEB8u31bLL75ioOPd+5vubqBrA0liyTdcHeZ8UTRbmg==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "bin": {
+        "copilot": "npm-loader.js"
+      },
+      "optionalDependencies": {
+        "@github/copilot-darwin-arm64": "1.0.11",
+        "@github/copilot-darwin-x64": "1.0.11",
+        "@github/copilot-linux-arm64": "1.0.11",
+        "@github/copilot-linux-x64": "1.0.11",
+        "@github/copilot-win32-arm64": "1.0.11",
+        "@github/copilot-win32-x64": "1.0.11"
+      }
+    },
+    "node_modules/@github/copilot-darwin-arm64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.11.tgz",
+      "integrity": "sha512-wdKimjtbsVeXqMqQSnGpGBPFEYHljxXNuWeH8EIJTNRgFpAsimcivsFgql3Twq4YOp0AxfsH36icG4IEen30mA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "bin": {
+        "copilot-darwin-arm64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-darwin-x64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.11.tgz",
+      "integrity": "sha512-VeuPv8rzBVGBB8uDwMEhcHBpldoKaq26yZ5YQm+G9Ka5QIF+1DMah8ZNRMVsTeNKkb1ji9G8vcuCsaPbnG3fKg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "bin": {
+        "copilot-darwin-x64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-linux-arm64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.11.tgz",
+      "integrity": "sha512-/d8p6RlFYKj1Va2hekFIcYNMHWagcEkaxgcllUNXSyQLnmEtXUkaWtz62VKGWE+n/UMkEwCB6vI2xEwPTlUNBQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "copilot-linux-arm64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-linux-x64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.11.tgz",
+      "integrity": "sha512-UujTRO3xkPFC1CybchBbCnaTEAG6JrH0etIst07JvfekMWgvRxbiCHQPpDPSzBCPiBcGu0gba0/IT+vUCORuIw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "copilot-linux-x64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-sdk": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@github/copilot-sdk/-/copilot-sdk-0.2.0.tgz",
+      "integrity": "sha512-fCEpD9W9xqcaCAJmatyNQ1PkET9P9liK2P4Vk0raDFoMXcvpIdqewa5JQeKtWCBUsN/HCz7ExkkFP8peQuo+DA==",
+      "license": "MIT",
+      "dependencies": {
+        "@github/copilot": "^1.0.10",
+        "vscode-jsonrpc": "^8.2.1",
+        "zod": "^4.3.6"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@github/copilot-sdk/node_modules/zod": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/@github/copilot-win32-arm64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.11.tgz",
+      "integrity": "sha512-EOW8HUM+EmnHEZEa+iUMl4pP1+2eZUk2XCbynYiMehwX9sidc4BxEHp2RuxADSzFPTieQEWzgjQmHWrtet8pQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "bin": {
+        "copilot-win32-arm64": "copilot.exe"
+      }
+    },
+    "node_modules/@github/copilot-win32-x64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.11.tgz",
+      "integrity": "sha512-fKGkSNamzs3h9AbmswNvPYJBORCb2Y8CbusijU3C7fT3ohvqnHJwKo5iHhJXLOKZNOpFZgq9YKha410u9sIs6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "bin": {
+        "copilot-win32-x64": "copilot.exe"
+      }
+    },
     "node_modules/@gulp-sourcemaps/identity-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
@@ -1439,29 +1561,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/@gulp-sourcemaps/identity-map/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
     "node_modules/@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
@@ -1956,9 +2055,9 @@
       }
     },
     "node_modules/@hono/node-server": {
-      "version": "1.19.9",
-      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.9.tgz",
-      "integrity": "sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw==",
+      "version": "1.19.11",
+      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz",
+      "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2198,28 +2297,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
-      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
-      }
-    },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
@@ -2237,6 +2314,13 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@koa/cors": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-5.0.0.tgz",
@@ -3199,9 +3283,10 @@
       }
     },
     "node_modules/@tootallnate/once": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
-      "integrity": "sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.1.tgz",
+      "integrity": "sha512-VyMVKRrpHTT8PnotUeV8L/mDaMwD5DaAKCFLP73zAqAtvF0FCqky+Ki7BYbFCYQmqFyTe9316Ed5zS70QUR9eg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -3213,15 +3298,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/@ts-morph/common": {
       "version": "0.26.1",
       "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.26.1.tgz",
@@ -3303,17 +3379,6 @@
         "@types/json-schema": "*"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -3554,17 +3619,6 @@
       "integrity": "sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==",
       "dev": true
     },
-    "node_modules/@types/webpack": {
-      "version": "5.28.5",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.5.tgz",
-      "integrity": "sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
-      }
-    },
     "node_modules/@types/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
@@ -4148,15 +4202,15 @@
       ]
     },
     "node_modules/@vscode/codicons": {
-      "version": "0.0.45-14",
-      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.45-14.tgz",
-      "integrity": "sha512-EdrK2NnxNGluUm9ZlU1C5VTLfG1cpO4C0CCXloS+8bDuTbidE1qtwaF5lHPcoDE102WBqBzWA09nVKFoN8RSOA==",
+      "version": "0.0.46-1",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.46-1.tgz",
+      "integrity": "sha512-BMOj3V0zXCGsBHQN18NyorO4wk+qdpmS4MLSyqZEDsixgKODA5570RspntWtIZOhmEkcOwlrTRtuZu+yiukBQQ==",
       "license": "CC-BY-4.0"
     },
     "node_modules/@vscode/component-explorer": {
-      "version": "0.1.1-22",
-      "resolved": "https://registry.npmjs.org/@vscode/component-explorer/-/component-explorer-0.1.1-22.tgz",
-      "integrity": "sha512-T3L8WMHIP7BRNq5E8SHbQ1FINiVpgoWW6tAk95G5vc3yPnAHFoOEHC5kM9eUFJPzbuWO+nYl7gf+7787UBFT4w==",
+      "version": "0.1.1-27",
+      "resolved": "https://registry.npmjs.org/@vscode/component-explorer/-/component-explorer-0.1.1-27.tgz",
+      "integrity": "sha512-FAxC9WlYOaRx6XfU3/ceI2bCOPQp45CpQehUyhG3AbDxLuM8Kv2VyJYJiSsQ0Z2a8cah/3CB729oIiINO19mdw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4166,9 +4220,9 @@
       }
     },
     "node_modules/@vscode/component-explorer-cli": {
-      "version": "0.1.1-18",
-      "resolved": "https://registry.npmjs.org/@vscode/component-explorer-cli/-/component-explorer-cli-0.1.1-18.tgz",
-      "integrity": "sha512-kInOiRaXOVaoI3bxa5yFiT9iYKVkxsufIQR4V7ll2D472nZYssbSWIfMrZtdTlG0SdXRHeufyFVVRTa7jLIHIw==",
+      "version": "0.1.1-23",
+      "resolved": "https://registry.npmjs.org/@vscode/component-explorer-cli/-/component-explorer-cli-0.1.1-23.tgz",
+      "integrity": "sha512-3Xx57+3Qcj4bPgGoZBiUHzwrq5fMrEtKbGcKCKGFOYY9h04FUn4o3H8ic3uTG0Xe8utRxeLTh9er/+Jo/DOBbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4208,9 +4262,9 @@
       }
     },
     "node_modules/@vscode/gulp-electron": {
-      "version": "1.40.1",
-      "resolved": "https://registry.npmjs.org/@vscode/gulp-electron/-/gulp-electron-1.40.1.tgz",
-      "integrity": "sha512-ERN3Mly+bxicuhSGrF4ksSwr7UNCBcYOcVVClivTzkkEL4gy477V4H8YAURak/W1VPmdmDWn+VZknptRySDWew==",
+      "version": "1.41.0",
+      "resolved": "https://registry.npmjs.org/@vscode/gulp-electron/-/gulp-electron-1.41.0.tgz",
+      "integrity": "sha512-eWieEKuR8yYSIBOkR0UBTnzIfp3tJn8iyaw3dgz4cTJAsMjeDmKsl9atVVa773ua6NOzUMhqy2PuVuw24vvU5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4269,9 +4323,9 @@
       }
     },
     "node_modules/@vscode/gulp-electron/node_modules/@sindresorhus/is": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.0.2.tgz",
-      "integrity": "sha512-d9xRovfKNz1SKieM0qJdO+PQonjnnIfSNWfHYnBSJ9hkjm0ZPw6HlxscDXYstp3z+7V2GOFHc+J0CYrYTjqCJw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.2.0.tgz",
+      "integrity": "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4281,19 +4335,6 @@
         "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/@vscode/gulp-electron/node_modules/@szmarczak/http-timer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
-      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "defer-to-connect": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=14.16"
-      }
-    },
     "node_modules/@vscode/gulp-electron/node_modules/cacheable-lookup": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
@@ -4305,24 +4346,40 @@
       }
     },
     "node_modules/@vscode/gulp-electron/node_modules/cacheable-request": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-12.0.1.tgz",
-      "integrity": "sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg==",
+      "version": "13.0.18",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-13.0.18.tgz",
+      "integrity": "sha512-rFWadDRKJs3s2eYdXlGggnBZKG7MTblkFBB0YllFds+UYnfogDp2wcR6JN97FhRkHTvq59n2vhNoHNZn29dh/Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/http-cache-semantics": "^4.0.4",
         "get-stream": "^9.0.1",
-        "http-cache-semantics": "^4.1.1",
-        "keyv": "^4.5.4",
+        "http-cache-semantics": "^4.2.0",
+        "keyv": "^5.5.5",
         "mimic-response": "^4.0.0",
-        "normalize-url": "^8.0.1",
-        "responselike": "^3.0.0"
+        "normalize-url": "^8.1.1",
+        "responselike": "^4.0.2"
       },
       "engines": {
         "node": ">=18"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/decompress-response": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-10.0.0.tgz",
+      "integrity": "sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@vscode/gulp-electron/node_modules/env-paths": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
@@ -4354,22 +4411,23 @@
       }
     },
     "node_modules/@vscode/gulp-electron/node_modules/got": {
-      "version": "14.4.7",
-      "resolved": "https://registry.npmjs.org/got/-/got-14.4.7.tgz",
-      "integrity": "sha512-DI8zV1231tqiGzOiOzQWDhsBmncFW7oQDH6Zgy6pDPrqJuVZMtoSgPLLsBZQj8Jg4JFfwoOsDA8NGtLQLnIx2g==",
+      "version": "14.6.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-14.6.6.tgz",
+      "integrity": "sha512-QLV1qeYSo5l13mQzWgP/y0LbMr5Plr5fJilgAIwgnwseproEbtNym8xpLsDzeZ6MWXgNE6kdWGBjdh3zT/Qerg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sindresorhus/is": "^7.0.1",
-        "@szmarczak/http-timer": "^5.0.1",
+        "byte-counter": "^0.1.0",
         "cacheable-lookup": "^7.0.0",
-        "cacheable-request": "^12.0.1",
-        "decompress-response": "^6.0.0",
+        "cacheable-request": "^13.0.12",
+        "decompress-response": "^10.0.0",
         "form-data-encoder": "^4.0.2",
         "http2-wrapper": "^2.2.1",
+        "keyv": "^5.5.3",
         "lowercase-keys": "^3.0.0",
         "p-cancelable": "^4.0.1",
-        "responselike": "^3.0.0",
+        "responselike": "^4.0.2",
         "type-fest": "^4.26.1"
       },
       "engines": {
@@ -4406,6 +4464,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
     "node_modules/@vscode/gulp-electron/node_modules/lowercase-keys": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
@@ -4445,9 +4513,9 @@
       }
     },
     "node_modules/@vscode/gulp-electron/node_modules/normalize-url": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.2.tgz",
-      "integrity": "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.1.tgz",
+      "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4481,16 +4549,16 @@
       }
     },
     "node_modules/@vscode/gulp-electron/node_modules/responselike": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
-      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-4.0.2.tgz",
+      "integrity": "sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "lowercase-keys": "^3.0.0"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -4598,9 +4666,9 @@
       }
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.38.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.38.0.tgz",
-      "integrity": "sha512-f8fOGbYhCVG9FUbtVcL/90yjCyo6ZuuKQpA7hs7iIEMD8kesnoo04TUI3/29vifCZ2DCiyUN12CFgA+ktc2RTw==",
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.40.0.tgz",
+      "integrity": "sha512-G2OUy5b2vxYXoRWo38BwxBKW1GCjwno9tivcshJNBWkeHjwcidLkL6KFaVRgIDDxJjojPkoxy9AivTDU/ksJ6g==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
@@ -5119,167 +5187,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
     "node_modules/@webgpu/types": {
       "version": "0.1.66",
       "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.66.tgz",
@@ -5287,50 +5194,6 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
-      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
-      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
-      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.11",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
@@ -5342,30 +5205,30 @@
       }
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.3.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.180.tgz",
-      "integrity": "sha512-8vJ2BN8tot7Qqgl1p0ALXIy/SOvF7nQmh3DEZph6ZARNuV3JUrpF8xdK+lmd25/fm7NFgnGdntLe9k/g2qbAgw==",
+      "version": "0.3.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.191.tgz",
+      "integrity": "sha512-u+0smTVylu9IAntE2OPfD1ZqZ5TNIcSWM1fA/tu1tryGIscax9cn6V2U7T4kkTEFf3A4a3PKgCrKufBclXebjQ==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.180.tgz",
-      "integrity": "sha512-CGZxW47ZllCqS6n4vVD0lVCz2sq9FqP6czQoCJBStFJho05ioVLy0wQr8XCDJO87wuYvPjJaU3BlsyCDL2xVzQ==",
+      "version": "0.10.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.191.tgz",
+      "integrity": "sha512-gX2WEQV2N7A9fx5VpzXK9GIqazUJKBreqEOuUcQPnY2ECJqVsC0uaoK9A/rhm2JuSkHRcqBt/pRVlT4Ki5KsZg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.11.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.180.tgz",
-      "integrity": "sha512-YiCxw7P1rj5TVs25BJT9OiZ9QghNtboBhpYB7KZUOB2aqlCPsyIknf9GMbCrZegDfMMa22FWPyXF4oeZDBmpFg==",
+      "version": "0.11.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.191.tgz",
+      "integrity": "sha512-LFAPEUna5o7nZSJrlV8rrhU6WIC30btdqPf4PNAo5pxWjCWPBqlD1XkTmeYWGpsxk2OaXec/MGjG03k6Rg2z2w==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -5375,7 +5238,7 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-ligatures/node_modules/lru-cache": {
@@ -5397,82 +5260,68 @@
       "license": "ISC"
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.3.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.180.tgz",
-      "integrity": "sha512-73vv8C6Fg8CBhZZUNyX286kaNNd3iwjimSqctPZhN1wPUO4wE9mOp52hP6vCi2Vq8aZvbREmVcAvAIzNx0iNNg==",
+      "version": "0.3.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.191.tgz",
+      "integrity": "sha512-aImBOklbz37LqF4JsXe6cSTyFIpV5hxU4G/DS1IaFqbYPPMwWGdOUIB3L+TWwcMJh9hv1iwx5PbxNNi0KaylVw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.180.tgz",
-      "integrity": "sha512-w6dwnHeA9xxmTon2JF6SK1NwfNcmq8LzGPjyzPTwRKleFayHOH88MyIz/HCfgey+AbZRh8gsiA+lvS89/YMcQw==",
+      "version": "0.17.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.191.tgz",
+      "integrity": "sha512-fv+TQkhDXYxAeJ31Mi4C4BPFLcffFOHl/vDceMlzaqHB+XHTBo6BDRcXAWBAgA0rvChZrYYTQ/JCPq9R506JSw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.15.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.180.tgz",
-      "integrity": "sha512-+lmgiIXKWMdQvxBM5MfEX4QQ6f4F1jz4VhxnIcfuxUodq5gE+aQHC7gA7zT/LE1R7UJKT0t2byNqFb96lVu0QQ==",
+      "version": "0.15.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.191.tgz",
+      "integrity": "sha512-Kzj/J52MEH8B1p84CZ0XEY3/engNDO1sJKmpZDLr0WP+EKvh5uwZe0bD5X5tNLNM5ZEFpMWailwTrGF9tSAd2g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.180.tgz",
-      "integrity": "sha512-lStuJCp27ftt7BC7V1poSbPM4J2rluNUybeMn9/D9Kj0bNQYEqMX+cxjYPgVCbgnQIluQAsay8fS2pGiRM4PZA==",
+      "version": "0.10.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.191.tgz",
+      "integrity": "sha512-6FR4CjI0te0bLWF7jr7ujpjVOW1kGFl+rKWbblFRNhENuN6gT1phIm4V1L4N9Rr6seTku272YRnO0nAHWZNe6g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.20.0-beta.179",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.179.tgz",
-      "integrity": "sha512-mYWo305LkZjK+wUt+27+GHXs8NTV5YCzxRY6l9vWaqd+/5V/JdzyZTTR4gA3Vc4CEQETUrhwAVex5arzjWE/IA==",
+      "version": "0.20.0-beta.190",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.190.tgz",
+      "integrity": "sha512-9ABzdVhovpseQuD7v5sDz/4UZXvX7y8CH+EaF+LiP/HK6JwdWzVo9OftyWGNdHrOqo43PO7RTeC3eUQq9qqQGw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "6.1.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.180.tgz",
-      "integrity": "sha512-ls1zAXWBWmBGclvhduQoNO66ZNFqaWZY+SqlKl76p/02EKoPMVdPQ0VSc+w7G+Il3OZdL+HMyq6of7b/V2nZ8Q==",
+      "version": "6.1.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.191.tgz",
+      "integrity": "sha512-2dXTApeat9zr/clkEydw/uoBi3WEoXDGZZIW1aLthpj2pOqHfxlOdWIpPHeVhR07TAYble2OZJ0ydjfXWntNgA==",
       "license": "MIT",
       "workspaces": [
         "addons/*"
       ]
     },
     "node_modules/@xterm/xterm": {
-      "version": "6.1.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.180.tgz",
-      "integrity": "sha512-EBF41C3OWwmy5XyWbxiWvgjnb1mXvzwLfFlOvRZPnHA/esXjvwF30aJRvpfI8tPxkNlT05zsx908hLv4XwDuRg==",
+      "version": "6.1.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.191.tgz",
+      "integrity": "sha512-c50KmCnftJRZa3cXVBxcixTyeq4Brs603DHxYGZ0z0a58LkhKdfzOfKwYKxHfiZlsOlX58Xk21BJ4d1UrCuCAA==",
       "license": "MIT",
       "workspaces": [
         "addons/*"
       ]
     },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
     "node_modules/@zip.js/zip.js": {
       "version": "2.8.21",
       "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.8.21.tgz",
@@ -5531,19 +5380,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-phases": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.3.tgz",
-      "integrity": "sha512-jtKLnfoOzm28PazuQ4dVBcE9Jeo6ha1GAJvq3N0LlNOszmTfx+wSycBehn+FN0RnyeR77IBxN/qVYMw0Rlj0Xw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "acorn": "^8.14.0"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -5610,55 +5446,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
@@ -6609,15 +6396,6 @@
       "dev": true,
       "license": "Apache-2.0"
     },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -6836,6 +6614,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/byte-counter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz",
+      "integrity": "sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -7091,16 +6882,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/cheerio/node_modules/undici": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.22.0.tgz",
-      "integrity": "sha512-RqslV2Us5BrllB+JeiZnK4peryVTndy9Dnqq62S3yYRRTj0tFQCwEniUy2167skdGOy3vqRzEvl1Dm4sV2ReDg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=20.18.1"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -7174,24 +6955,6 @@
         }
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/chrome-trace-event/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/chromium-pickle-js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
@@ -7390,41 +7153,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-deep/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clone-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@@ -7536,12 +7264,6 @@
         "color-support": "bin.js"
       }
     },
-    "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -7852,73 +7574,6 @@
         "is-plain-object": "^5.0.0"
       }
     },
-    "node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -8131,32 +7786,6 @@
         "source-map-resolve": "^0.6.0"
       }
     },
-    "node_modules/css-loader": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.9.1.tgz",
-      "integrity": "sha512-OzABOh0+26JKFdMzlK6PY1u5Zx8+Ck7CVRlcGNZoY9qwJjdfu2VWFuprTIpPW+Av5TZTVViYWcFQaEEQURLknQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.4",
-        "postcss-modules-scope": "^3.1.1",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
     "node_modules/css-select": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
@@ -8211,18 +7840,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/csso": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
@@ -8633,18 +8250,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -8922,9 +8527,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "39.8.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.0.tgz",
-      "integrity": "sha512-K+f3YelSyh9Q4LgUXuIhLB4kq73LJrqnIbe8ih9vpWi+iSdPebj0w7FRYwILCMDoyBQMFC9LicYHuIPmZzdKlg==",
+      "version": "39.8.3",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.3.tgz",
+      "integrity": "sha512-ZhetvWz2qbI2WbBHdK/utR8I5bi1pYWJdit9tP0sGzs42CpsAFyu/FirXE88NWSh+3U8X6Wuf9jjDEYvAyrxNw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -8953,15 +8558,6 @@
       "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
       "dev": true
     },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/encodeurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -9066,30 +8662,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -9958,13 +9530,13 @@
       }
     },
     "node_modules/express-rate-limit": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.2.1.tgz",
-      "integrity": "sha512-PCZEIEIxqwhzw4KF0n7QF4QqruVTcF73O5kFKUnGOyjbCCgizBBiFaYpd/fnBLUMPw/BWw9OsiN7GgrNYr7j6g==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.1.tgz",
+      "integrity": "sha512-D1dKN+cmyPWuvB+G2SREQDzPY1agpBIcTa9sJxOPMCNeH3gwzhqJRDWCXW3gg0y//+LQ/8j52JbMROWyrKdMdw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ip-address": "10.0.1"
+        "ip-address": "10.1.0"
       },
       "engines": {
         "node": ">= 16"
@@ -9977,9 +9549,9 @@
       }
     },
     "node_modules/express-rate-limit/node_modules/ip-address": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
-      "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10253,22 +9825,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
-      "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/fast-xml-parser": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.2.tgz",
-      "integrity": "sha512-pw/6pIl4k0CSpElPEJhDppLzaixDEuWui2CUQQBH/ECDf7+y6YwA4Gf7Tyb0Rfe4DIMuZipYj4AEL0nACKglvQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
+      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
       "dev": true,
       "funding": [
         {
@@ -10278,19 +9837,30 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.0.0",
-        "strnum": "^2.1.2"
+        "path-expression-matcher": "^1.1.3"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.5.8",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.8.tgz",
+      "integrity": "sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.1.4",
+        "path-expression-matcher": "^1.2.0",
+        "strnum": "^2.2.0"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
       }
     },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
-    },
     "node_modules/fastq": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
@@ -10338,44 +9908,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -10669,10 +10201,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/flush-write-stream": {
       "version": "1.1.1",
@@ -11178,13 +10711,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/glob-watcher": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
@@ -13092,9 +12618,9 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.3",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.3.tgz",
-      "integrity": "sha512-SFsVSjp8sj5UumXOOFlkZOG6XS9SJDKw0TbwFeV+AJ8xlST8kxK5Z/5EYa111UY8732lK2S/xB653ceuaoGwpg==",
+      "version": "4.12.7",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.7.tgz",
+      "integrity": "sha512-jq9l1DM0zVIvsm3lv9Nw9nlJnMNPOcAtsbsgiUhWcFzPE99Gvo6yRTlszSLLYacMeQ6quHD6hMfId8crVHvexw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13205,10 +12731,11 @@
       }
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/http-errors": {
       "version": "2.0.1",
@@ -13372,18 +12899,6 @@
         "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -13435,22 +12950,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/import-meta-resolve": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
@@ -14093,37 +13592,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
     "node_modules/jiti": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
@@ -14261,12 +13729,6 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -14722,34 +14184,6 @@
         "uc.micro": "^2.0.0"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
-      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/locate-app": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.5.0.tgz",
@@ -14820,12 +14254,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.clone": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==",
-      "dev": true
-    },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -14851,12 +14279,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.some": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
-      "dev": true
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -15305,34 +14727,6 @@
         "timers-ext": "^0.1.7"
       }
     },
-    "node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/memory-fs/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -15367,13 +14761,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -15842,25 +15229,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -15927,12 +15295,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
     "node_modules/netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
@@ -16047,9 +15409,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.2.0-beta.10",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.10.tgz",
-      "integrity": "sha512-vONwSCtAiOVNxeaP/lzDdRw733Q6uB/ELOCFM8DUfKMw6rTFovwFCuvqr9usya7JXV2pfaers3EwuzZfv0QtwA==",
+      "version": "1.2.0-beta.12",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.12.tgz",
+      "integrity": "sha512-uExTCG/4VmSJa4+TjxFwPXv8BfacmfFEBL6JpxCMDghcwqzvD0yTcGmZ1fKOK6HY33tp0CelLblqTECJizc+Yw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -17156,6 +16518,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-expression-matcher": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz",
+      "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -17237,15 +16615,6 @@
         "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
@@ -17346,70 +16715,6 @@
         "node": ">=16.20.0"
       }
     },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/playwright": {
       "version": "1.56.1",
       "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
@@ -17506,112 +16811,29 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.11",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
-      "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
-      "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+    "node_modules/postcss/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/prebuild-install": {
       "version": "7.1.2",
@@ -17776,12 +16998,6 @@
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY= sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-      "dev": true
-    },
     "node_modules/pseudo-localization": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/pseudo-localization/-/pseudo-localization-2.4.0.tgz",
@@ -18415,27 +17631,6 @@
       "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
       "dev": true
     },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
@@ -18783,10 +17978,14 @@
       "license": "MIT"
     },
     "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
+      "integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=11.0.0"
+      }
     },
     "node_modules/scheduler": {
       "version": "0.23.2",
@@ -18798,61 +17997,6 @@
         "loose-envify": "^1.1.0"
       }
     },
-    "node_modules/schema-utils": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
-      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/schema-utils/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
     "node_modules/semver": {
       "version": "7.7.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
@@ -19090,27 +18234,6 @@
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shallow-clone/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -19603,16 +18726,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/source-map-resolve": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
@@ -20136,22 +19249,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/style-loader": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.2.tgz",
-      "integrity": "sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
     "node_modules/sumchecker": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
@@ -20199,17 +19296,18 @@
       }
     },
     "node_modules/svgo": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.2.tgz",
+      "integrity": "sha512-TyzE4NVGLUFy+H/Uy4N6c3G0HEeprsVfge6Lmq+0FdQQ/zqoVYB62IsBZORsiL+o96s6ff/V6/3UQo/C0cgCAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@trysound/sax": "0.2.0",
         "commander": "^7.2.0",
         "css-select": "^4.1.3",
         "css-tree": "^1.1.3",
         "csso": "^4.2.0",
         "picocolors": "^1.0.0",
+        "sax": "^1.5.0",
         "stable": "^0.1.8"
       },
       "bin": {
@@ -20402,9 +19500,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz",
-      "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==",
+      "version": "7.5.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
+      "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
@@ -20509,78 +19607,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/terser": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
-      "integrity": "sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.15.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
-      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/terser/node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -20915,35 +19941,6 @@
         "typescript": ">=4.8.4"
       }
     },
-    "node_modules/ts-loader": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
-      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.0.0",
-        "micromatch": "^4.0.0",
-        "semver": "^7.3.4",
-        "source-map": "^0.7.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "*",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/ts-morph": {
       "version": "25.0.1",
       "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-25.0.1.tgz",
@@ -21253,9 +20250,9 @@
       "dev": true
     },
     "node_modules/undici": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.18.2.tgz",
-      "integrity": "sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==",
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz",
+      "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
@@ -21733,6 +20730,15 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/vscode-jsonrpc": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.1.tgz",
+      "integrity": "sha512-kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/vscode-oniguruma": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
@@ -21780,20 +20786,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/watchpack": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
-      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/web-tree-sitter": {
       "version": "0.20.8",
       "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
@@ -21834,9 +20826,9 @@
       }
     },
     "node_modules/webdriver/node_modules/undici": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
-      "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.1.tgz",
+      "integrity": "sha512-sC+b0tB1whOCzbtlx20fx3WgCXwkW627p4EA9uM+/tNNPkSS+eSEld6pAs9nDv7WbY1UUljBMYPtu9BCOrCWKA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -21933,245 +20925,6 @@
       "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "dev": true
     },
-    "node_modules/webpack": {
-      "version": "5.105.3",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.3.tgz",
-      "integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.8",
-        "@types/json-schema": "^7.0.15",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.16.0",
-        "acorn-import-phases": "^1.0.3",
-        "browserslist": "^4.28.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.19.0",
-        "es-module-lexer": "^2.0.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.3.1",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.3",
-        "tapable": "^2.3.0",
-        "terser-webpack-plugin": "^5.3.16",
-        "watchpack": "^2.5.1",
-        "webpack-sources": "^3.3.4"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
-      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.1.1",
-        "@webpack-cli/info": "^2.0.2",
-        "@webpack-cli/serve": "^2.0.5",
-        "colorette": "^2.0.14",
-        "commander": "^10.0.1",
-        "cross-spawn": "^7.0.3",
-        "envinfo": "^7.7.3",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^3.1.1",
-        "rechoir": "^0.8.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/interpret": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/rechoir": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.20.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",
-      "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-stream": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-7.0.0.tgz",
-      "integrity": "sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==",
-      "dev": true,
-      "dependencies": {
-        "fancy-log": "^1.3.3",
-        "lodash.clone": "^4.3.2",
-        "lodash.some": "^4.2.2",
-        "memory-fs": "^0.5.0",
-        "plugin-error": "^1.0.1",
-        "supports-color": "^8.1.1",
-        "through": "^2.3.8",
-        "vinyl": "^2.2.1"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.21.2"
-      }
-    },
-    "node_modules/webpack-stream/node_modules/replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/webpack-stream/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/webpack-stream/node_modules/vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/webpack/node_modules/es-module-lexer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
-      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/webpack/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/whatwg-encoding": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
@@ -22259,12 +21012,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
     "node_modules/windows-foreground-love": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/windows-foreground-love/-/windows-foreground-love-0.6.1.tgz",
@@ -22392,7 +21139,6 @@
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
       "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
diff --git a/package.json b/package.json
index fbf5859cdfc..19a4cc90f04 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.112.0",
-  "distro": "af92bdba4fde517633b51b6706479a636c8d541a",
+  "version": "1.114.0",
+  "distro": "a305f48172def2b6e043c61177258d2d1abe7c0b",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -80,17 +80,19 @@
     "install-latest-component-explorer": "npm install @vscode/component-explorer@next @vscode/component-explorer-cli@next && cd build/vite && npm install @vscode/component-explorer-vite-plugin@next && npm install @vscode/component-explorer@next"
   },
   "dependencies": {
-    "@anthropic-ai/sandbox-runtime": "0.0.23",
+    "@anthropic-ai/sandbox-runtime": "0.0.42",
+    "@github/copilot": "^1.0.11",
+    "@github/copilot-sdk": "^0.2.0",
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "^2.5.6",
     "@types/semver": "^7.5.8",
-    "@vscode/codicons": "^0.0.45-14",
+    "@vscode/codicons": "^0.0.46-1",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/native-watchdog": "^1.4.6",
     "@vscode/policy-watcher": "^1.3.2",
-    "@vscode/proxy-agent": "^0.38.0",
+    "@vscode/proxy-agent": "^0.40.0",
     "@vscode/ripgrep": "^1.17.1",
     "@vscode/spdlog": "^0.15.7",
     "@vscode/sqlite3": "5.1.12-vscode",
@@ -100,16 +102,16 @@
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.2.0",
-    "@xterm/addon-clipboard": "^0.3.0-beta.180",
-    "@xterm/addon-image": "^0.10.0-beta.180",
-    "@xterm/addon-ligatures": "^0.11.0-beta.180",
-    "@xterm/addon-progress": "^0.3.0-beta.180",
-    "@xterm/addon-search": "^0.17.0-beta.180",
-    "@xterm/addon-serialize": "^0.15.0-beta.180",
-    "@xterm/addon-unicode11": "^0.10.0-beta.180",
-    "@xterm/addon-webgl": "^0.20.0-beta.179",
-    "@xterm/headless": "^6.1.0-beta.180",
-    "@xterm/xterm": "^6.1.0-beta.180",
+    "@xterm/addon-clipboard": "^0.3.0-beta.191",
+    "@xterm/addon-image": "^0.10.0-beta.191",
+    "@xterm/addon-ligatures": "^0.11.0-beta.191",
+    "@xterm/addon-progress": "^0.3.0-beta.191",
+    "@xterm/addon-search": "^0.17.0-beta.191",
+    "@xterm/addon-serialize": "^0.15.0-beta.191",
+    "@xterm/addon-unicode11": "^0.10.0-beta.191",
+    "@xterm/addon-webgl": "^0.20.0-beta.190",
+    "@xterm/headless": "^6.1.0-beta.191",
+    "@xterm/xterm": "^6.1.0-beta.191",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.4",
@@ -118,15 +120,16 @@
     "minimist": "^1.2.8",
     "native-is-elevated": "0.9.0",
     "native-keymap": "^3.3.5",
-    "node-pty": "^1.2.0-beta.10",
+    "node-pty": "^1.2.0-beta.12",
     "open": "^10.1.2",
     "playwright-core": "1.59.0-alpha-2026-02-20",
     "tas-client": "0.3.1",
-    "undici": "^7.18.2",
+    "undici": "^7.24.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "^9.3.2",
+    "ws": "^8.19.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
@@ -147,17 +150,17 @@
     "@types/sinon-test": "^2.4.2",
     "@types/trusted-types": "^2.0.7",
     "@types/vscode-notebook-renderer": "^1.72.0",
-    "@types/webpack": "^5.28.5",
     "@types/wicg-file-system-access": "^2023.10.7",
     "@types/windows-foreground-love": "^0.3.0",
     "@types/winreg": "^1.2.30",
+    "@types/ws": "^8.18.1",
     "@types/yauzl": "^2.10.0",
     "@types/yazl": "^2.4.2",
     "@typescript-eslint/utils": "^8.45.0",
     "@typescript/native-preview": "^7.0.0-dev.20260306",
-    "@vscode/component-explorer": "^0.1.1-22",
-    "@vscode/component-explorer-cli": "^0.1.1-18",
-    "@vscode/gulp-electron": "1.40.1",
+    "@vscode/component-explorer": "^0.1.1-24",
+    "@vscode/component-explorer-cli": "^0.1.1-20",
+    "@vscode/gulp-electron": "1.41.0",
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.20.2",
     "@vscode/test-cli": "^0.0.6",
@@ -171,18 +174,15 @@
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
     "cookie": "^0.7.2",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.9.1",
     "debounce": "^1.0.0",
     "deemon": "^1.13.6",
-    "electron": "39.8.0",
+    "electron": "39.8.3",
     "eslint": "^9.36.0",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^50.3.1",
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
-    "file-loader": "^6.2.0",
     "glob": "^5.0.13",
     "gulp": "^4.0.0",
     "gulp-azure-storage": "^0.12.1",
@@ -223,17 +223,12 @@
     "sinon-test": "^3.1.3",
     "source-map": "0.6.1",
     "source-map-support": "^0.3.2",
-    "style-loader": "^3.3.2",
     "tar": "^7.5.9",
-    "ts-loader": "^9.5.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
     "typescript": "^6.0.0-dev.20260306",
     "typescript-eslint": "^8.45.0",
     "util": "^0.12.4",
-    "webpack": "^5.105.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-stream": "^7.0.0",
     "xml2js": "^0.5.0",
     "yaserver": "^0.4.0"
   },
diff --git a/product.json b/product.json
index cbd7903d0b4..48804f15226 100644
--- a/product.json
+++ b/product.json
@@ -52,8 +52,8 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.110.0",
-			"sha256": "ad3f7d935b64f4ee123853c464b47b3cba13e5018edef831770ae9c3eb218f5b",
+			"version": "1.112.0",
+			"sha256": "c24322931434940938f8cf76ebc3dac1e95a5539b9625b165b6672d7f7eafea8",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
diff --git a/remote/.npmrc b/remote/.npmrc
index 666ce9aaa8c..4d73fb2193c 100644
--- a/remote/.npmrc
+++ b/remote/.npmrc
@@ -1,7 +1,8 @@
 disturl="https://nodejs.org/dist"
-target="22.22.0"
-ms_build_id="406245"
+target="22.22.1"
+ms_build_id="424223"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 583b3a9667c..f26bcf8e833 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -8,30 +8,32 @@
       "name": "vscode-reh",
       "version": "0.0.0",
       "dependencies": {
-        "@anthropic-ai/sandbox-runtime": "0.0.23",
+        "@anthropic-ai/sandbox-runtime": "0.0.42",
+        "@github/copilot": "^1.0.11",
+        "@github/copilot-sdk": "^0.2.0",
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "^2.5.6",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/native-watchdog": "^1.4.6",
-        "@vscode/proxy-agent": "^0.38.0",
+        "@vscode/proxy-agent": "^0.40.0",
         "@vscode/ripgrep": "^1.17.1",
         "@vscode/spdlog": "^0.15.7",
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.23",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.2.0",
-        "@xterm/addon-clipboard": "^0.3.0-beta.180",
-        "@xterm/addon-image": "^0.10.0-beta.180",
-        "@xterm/addon-ligatures": "^0.11.0-beta.180",
-        "@xterm/addon-progress": "^0.3.0-beta.180",
-        "@xterm/addon-search": "^0.17.0-beta.180",
-        "@xterm/addon-serialize": "^0.15.0-beta.180",
-        "@xterm/addon-unicode11": "^0.10.0-beta.180",
-        "@xterm/addon-webgl": "^0.20.0-beta.179",
-        "@xterm/headless": "^6.1.0-beta.180",
-        "@xterm/xterm": "^6.1.0-beta.180",
+        "@xterm/addon-clipboard": "^0.3.0-beta.191",
+        "@xterm/addon-image": "^0.10.0-beta.191",
+        "@xterm/addon-ligatures": "^0.11.0-beta.191",
+        "@xterm/addon-progress": "^0.3.0-beta.191",
+        "@xterm/addon-search": "^0.17.0-beta.191",
+        "@xterm/addon-serialize": "^0.15.0-beta.191",
+        "@xterm/addon-unicode11": "^0.10.0-beta.191",
+        "@xterm/addon-webgl": "^0.20.0-beta.190",
+        "@xterm/headless": "^6.1.0-beta.191",
+        "@xterm/xterm": "^6.1.0-beta.191",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
@@ -39,25 +41,26 @@
         "katex": "^0.16.22",
         "kerberos": "2.1.1",
         "minimist": "^1.2.8",
-        "node-pty": "^1.2.0-beta.10",
+        "node-pty": "^1.2.0-beta.12",
         "tas-client": "0.3.1",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "^9.3.2",
+        "ws": "^8.19.0",
         "yauzl": "^3.0.0",
         "yazl": "^2.4.3"
       }
     },
     "node_modules/@anthropic-ai/sandbox-runtime": {
-      "version": "0.0.23",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sandbox-runtime/-/sandbox-runtime-0.0.23.tgz",
-      "integrity": "sha512-Np0VRH6D71cGoJZvd8hCz1LMfwg9ERJovrOJSCz5aSQSQJPWPNIFPV1wfc8oAhJpStOuYkot+EmXOkRRxuGMCQ==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sandbox-runtime/-/sandbox-runtime-0.0.42.tgz",
+      "integrity": "sha512-kJpuhU4hHMumeygIkKvNhscEsTtQK1sat1kZwhb6HLYBznwjMGOdnuBI/RM9HeFwxArn71/ciD2WJbxttXBMHw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@pondwader/socks5-server": "^1.0.10",
         "@types/lodash-es": "^4.17.12",
         "commander": "^12.1.0",
-        "lodash-es": "^4.17.21",
+        "lodash-es": "^4.17.23",
         "shell-quote": "^1.8.3",
         "zod": "^3.24.1"
       },
@@ -77,6 +80,142 @@
         "node": ">=18"
       }
     },
+    "node_modules/@github/copilot": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot/-/copilot-1.0.11.tgz",
+      "integrity": "sha512-cptVopko/tNKEXyBP174yBjHQBEwg6CqaKN2S0M3J+5LEB8u31bLL75ioOPd+5vubqBrA0liyTdcHeZ8UTRbmg==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "bin": {
+        "copilot": "npm-loader.js"
+      },
+      "optionalDependencies": {
+        "@github/copilot-darwin-arm64": "1.0.11",
+        "@github/copilot-darwin-x64": "1.0.11",
+        "@github/copilot-linux-arm64": "1.0.11",
+        "@github/copilot-linux-x64": "1.0.11",
+        "@github/copilot-win32-arm64": "1.0.11",
+        "@github/copilot-win32-x64": "1.0.11"
+      }
+    },
+    "node_modules/@github/copilot-darwin-arm64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-arm64/-/copilot-darwin-arm64-1.0.11.tgz",
+      "integrity": "sha512-wdKimjtbsVeXqMqQSnGpGBPFEYHljxXNuWeH8EIJTNRgFpAsimcivsFgql3Twq4YOp0AxfsH36icG4IEen30mA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "bin": {
+        "copilot-darwin-arm64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-darwin-x64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-darwin-x64/-/copilot-darwin-x64-1.0.11.tgz",
+      "integrity": "sha512-VeuPv8rzBVGBB8uDwMEhcHBpldoKaq26yZ5YQm+G9Ka5QIF+1DMah8ZNRMVsTeNKkb1ji9G8vcuCsaPbnG3fKg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "bin": {
+        "copilot-darwin-x64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-linux-arm64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-arm64/-/copilot-linux-arm64-1.0.11.tgz",
+      "integrity": "sha512-/d8p6RlFYKj1Va2hekFIcYNMHWagcEkaxgcllUNXSyQLnmEtXUkaWtz62VKGWE+n/UMkEwCB6vI2xEwPTlUNBQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "copilot-linux-arm64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-linux-x64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-linux-x64/-/copilot-linux-x64-1.0.11.tgz",
+      "integrity": "sha512-UujTRO3xkPFC1CybchBbCnaTEAG6JrH0etIst07JvfekMWgvRxbiCHQPpDPSzBCPiBcGu0gba0/IT+vUCORuIw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "bin": {
+        "copilot-linux-x64": "copilot"
+      }
+    },
+    "node_modules/@github/copilot-sdk": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@github/copilot-sdk/-/copilot-sdk-0.2.0.tgz",
+      "integrity": "sha512-fCEpD9W9xqcaCAJmatyNQ1PkET9P9liK2P4Vk0raDFoMXcvpIdqewa5JQeKtWCBUsN/HCz7ExkkFP8peQuo+DA==",
+      "license": "MIT",
+      "dependencies": {
+        "@github/copilot": "^1.0.10",
+        "vscode-jsonrpc": "^8.2.1",
+        "zod": "^4.3.6"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@github/copilot-sdk/node_modules/zod": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/@github/copilot-win32-arm64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-arm64/-/copilot-win32-arm64-1.0.11.tgz",
+      "integrity": "sha512-EOW8HUM+EmnHEZEa+iUMl4pP1+2eZUk2XCbynYiMehwX9sidc4BxEHp2RuxADSzFPTieQEWzgjQmHWrtet8pQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "bin": {
+        "copilot-win32-arm64": "copilot.exe"
+      }
+    },
+    "node_modules/@github/copilot-win32-x64": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@github/copilot-win32-x64/-/copilot-win32-x64-1.0.11.tgz",
+      "integrity": "sha512-fKGkSNamzs3h9AbmswNvPYJBORCb2Y8CbusijU3C7fT3ohvqnHJwKo5iHhJXLOKZNOpFZgq9YKha410u9sIs6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "SEE LICENSE IN LICENSE.md",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "bin": {
+        "copilot-win32-x64": "copilot.exe"
+      }
+    },
     "node_modules/@microsoft/1ds-core-js": {
       "version": "3.2.13",
       "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.13.tgz",
@@ -469,9 +608,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.38.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.38.0.tgz",
-      "integrity": "sha512-f8fOGbYhCVG9FUbtVcL/90yjCyo6ZuuKQpA7hs7iIEMD8kesnoo04TUI3/29vifCZ2DCiyUN12CFgA+ktc2RTw==",
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.40.0.tgz",
+      "integrity": "sha512-G2OUy5b2vxYXoRWo38BwxBKW1GCjwno9tivcshJNBWkeHjwcidLkL6KFaVRgIDDxJjojPkoxy9AivTDU/ksJ6g==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
@@ -579,30 +718,30 @@
       "license": "MIT"
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.3.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.180.tgz",
-      "integrity": "sha512-8vJ2BN8tot7Qqgl1p0ALXIy/SOvF7nQmh3DEZph6ZARNuV3JUrpF8xdK+lmd25/fm7NFgnGdntLe9k/g2qbAgw==",
+      "version": "0.3.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.191.tgz",
+      "integrity": "sha512-u+0smTVylu9IAntE2OPfD1ZqZ5TNIcSWM1fA/tu1tryGIscax9cn6V2U7T4kkTEFf3A4a3PKgCrKufBclXebjQ==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.180.tgz",
-      "integrity": "sha512-CGZxW47ZllCqS6n4vVD0lVCz2sq9FqP6czQoCJBStFJho05ioVLy0wQr8XCDJO87wuYvPjJaU3BlsyCDL2xVzQ==",
+      "version": "0.10.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.191.tgz",
+      "integrity": "sha512-gX2WEQV2N7A9fx5VpzXK9GIqazUJKBreqEOuUcQPnY2ECJqVsC0uaoK9A/rhm2JuSkHRcqBt/pRVlT4Ki5KsZg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.11.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.180.tgz",
-      "integrity": "sha512-YiCxw7P1rj5TVs25BJT9OiZ9QghNtboBhpYB7KZUOB2aqlCPsyIknf9GMbCrZegDfMMa22FWPyXF4oeZDBmpFg==",
+      "version": "0.11.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.191.tgz",
+      "integrity": "sha512-LFAPEUna5o7nZSJrlV8rrhU6WIC30btdqPf4PNAo5pxWjCWPBqlD1XkTmeYWGpsxk2OaXec/MGjG03k6Rg2z2w==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -612,67 +751,67 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.3.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.180.tgz",
-      "integrity": "sha512-73vv8C6Fg8CBhZZUNyX286kaNNd3iwjimSqctPZhN1wPUO4wE9mOp52hP6vCi2Vq8aZvbREmVcAvAIzNx0iNNg==",
+      "version": "0.3.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.191.tgz",
+      "integrity": "sha512-aImBOklbz37LqF4JsXe6cSTyFIpV5hxU4G/DS1IaFqbYPPMwWGdOUIB3L+TWwcMJh9hv1iwx5PbxNNi0KaylVw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.180.tgz",
-      "integrity": "sha512-w6dwnHeA9xxmTon2JF6SK1NwfNcmq8LzGPjyzPTwRKleFayHOH88MyIz/HCfgey+AbZRh8gsiA+lvS89/YMcQw==",
+      "version": "0.17.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.191.tgz",
+      "integrity": "sha512-fv+TQkhDXYxAeJ31Mi4C4BPFLcffFOHl/vDceMlzaqHB+XHTBo6BDRcXAWBAgA0rvChZrYYTQ/JCPq9R506JSw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.15.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.180.tgz",
-      "integrity": "sha512-+lmgiIXKWMdQvxBM5MfEX4QQ6f4F1jz4VhxnIcfuxUodq5gE+aQHC7gA7zT/LE1R7UJKT0t2byNqFb96lVu0QQ==",
+      "version": "0.15.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.191.tgz",
+      "integrity": "sha512-Kzj/J52MEH8B1p84CZ0XEY3/engNDO1sJKmpZDLr0WP+EKvh5uwZe0bD5X5tNLNM5ZEFpMWailwTrGF9tSAd2g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.180.tgz",
-      "integrity": "sha512-lStuJCp27ftt7BC7V1poSbPM4J2rluNUybeMn9/D9Kj0bNQYEqMX+cxjYPgVCbgnQIluQAsay8fS2pGiRM4PZA==",
+      "version": "0.10.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.191.tgz",
+      "integrity": "sha512-6FR4CjI0te0bLWF7jr7ujpjVOW1kGFl+rKWbblFRNhENuN6gT1phIm4V1L4N9Rr6seTku272YRnO0nAHWZNe6g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.20.0-beta.179",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.179.tgz",
-      "integrity": "sha512-mYWo305LkZjK+wUt+27+GHXs8NTV5YCzxRY6l9vWaqd+/5V/JdzyZTTR4gA3Vc4CEQETUrhwAVex5arzjWE/IA==",
+      "version": "0.20.0-beta.190",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.190.tgz",
+      "integrity": "sha512-9ABzdVhovpseQuD7v5sDz/4UZXvX7y8CH+EaF+LiP/HK6JwdWzVo9OftyWGNdHrOqo43PO7RTeC3eUQq9qqQGw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "6.1.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.180.tgz",
-      "integrity": "sha512-ls1zAXWBWmBGclvhduQoNO66ZNFqaWZY+SqlKl76p/02EKoPMVdPQ0VSc+w7G+Il3OZdL+HMyq6of7b/V2nZ8Q==",
+      "version": "6.1.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.191.tgz",
+      "integrity": "sha512-2dXTApeat9zr/clkEydw/uoBi3WEoXDGZZIW1aLthpj2pOqHfxlOdWIpPHeVhR07TAYble2OZJ0ydjfXWntNgA==",
       "license": "MIT",
       "workspaces": [
         "addons/*"
       ]
     },
     "node_modules/@xterm/xterm": {
-      "version": "6.1.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.180.tgz",
-      "integrity": "sha512-EBF41C3OWwmy5XyWbxiWvgjnb1mXvzwLfFlOvRZPnHA/esXjvwF30aJRvpfI8tPxkNlT05zsx908hLv4XwDuRg==",
+      "version": "6.1.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.191.tgz",
+      "integrity": "sha512-c50KmCnftJRZa3cXVBxcixTyeq4Brs603DHxYGZ0z0a58LkhKdfzOfKwYKxHfiZlsOlX58Xk21BJ4d1UrCuCAA==",
       "license": "MIT",
       "workspaces": [
         "addons/*"
@@ -1112,9 +1251,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.2.0-beta.10",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.10.tgz",
-      "integrity": "sha512-vONwSCtAiOVNxeaP/lzDdRw733Q6uB/ELOCFM8DUfKMw6rTFovwFCuvqr9usya7JXV2pfaers3EwuzZfv0QtwA==",
+      "version": "1.2.0-beta.12",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.12.tgz",
+      "integrity": "sha512-uExTCG/4VmSJa4+TjxFwPXv8BfacmfFEBL6JpxCMDghcwqzvD0yTcGmZ1fKOK6HY33tp0CelLblqTECJizc+Yw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -1422,9 +1561,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz",
-      "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==",
+      "version": "7.24.4",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz",
+      "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
@@ -1455,6 +1594,15 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/vscode-jsonrpc": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.1.tgz",
+      "integrity": "sha512-kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/vscode-oniguruma": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
@@ -1482,6 +1630,27 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "node_modules/ws": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
diff --git a/remote/package.json b/remote/package.json
index fe01053f1de..effdb58b0c5 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -3,30 +3,32 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@anthropic-ai/sandbox-runtime": "0.0.23",
+    "@anthropic-ai/sandbox-runtime": "0.0.42",
+    "@github/copilot": "^1.0.11",
+    "@github/copilot-sdk": "^0.2.0",
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "^2.5.6",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/native-watchdog": "^1.4.6",
-    "@vscode/proxy-agent": "^0.38.0",
+    "@vscode/proxy-agent": "^0.40.0",
     "@vscode/ripgrep": "^1.17.1",
     "@vscode/spdlog": "^0.15.7",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.2.0",
-    "@xterm/addon-clipboard": "^0.3.0-beta.180",
-    "@xterm/addon-image": "^0.10.0-beta.180",
-    "@xterm/addon-ligatures": "^0.11.0-beta.180",
-    "@xterm/addon-progress": "^0.3.0-beta.180",
-    "@xterm/addon-search": "^0.17.0-beta.180",
-    "@xterm/addon-serialize": "^0.15.0-beta.180",
-    "@xterm/addon-unicode11": "^0.10.0-beta.180",
-    "@xterm/addon-webgl": "^0.20.0-beta.179",
-    "@xterm/headless": "^6.1.0-beta.180",
-    "@xterm/xterm": "^6.1.0-beta.180",
+    "@xterm/addon-clipboard": "^0.3.0-beta.191",
+    "@xterm/addon-image": "^0.10.0-beta.191",
+    "@xterm/addon-ligatures": "^0.11.0-beta.191",
+    "@xterm/addon-progress": "^0.3.0-beta.191",
+    "@xterm/addon-search": "^0.17.0-beta.191",
+    "@xterm/addon-serialize": "^0.15.0-beta.191",
+    "@xterm/addon-unicode11": "^0.10.0-beta.191",
+    "@xterm/addon-webgl": "^0.20.0-beta.190",
+    "@xterm/headless": "^6.1.0-beta.191",
+    "@xterm/xterm": "^6.1.0-beta.191",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -34,11 +36,12 @@
     "katex": "^0.16.22",
     "kerberos": "2.1.1",
     "minimist": "^1.2.8",
-    "node-pty": "^1.2.0-beta.10",
+    "node-pty": "^1.2.0-beta.12",
     "tas-client": "0.3.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "^9.3.2",
+    "ws": "^8.19.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
diff --git a/remote/web/.npmrc b/remote/web/.npmrc
index a9c57709666..efe233421c4 100644
--- a/remote/web/.npmrc
+++ b/remote/web/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 33bd3f8e13b..6c311d20a52 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -10,19 +10,19 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@vscode/codicons": "^0.0.45-14",
+        "@vscode/codicons": "^0.0.46-1",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.23",
-        "@xterm/addon-clipboard": "^0.3.0-beta.180",
-        "@xterm/addon-image": "^0.10.0-beta.180",
-        "@xterm/addon-ligatures": "^0.11.0-beta.180",
-        "@xterm/addon-progress": "^0.3.0-beta.180",
-        "@xterm/addon-search": "^0.17.0-beta.180",
-        "@xterm/addon-serialize": "^0.15.0-beta.180",
-        "@xterm/addon-unicode11": "^0.10.0-beta.180",
-        "@xterm/addon-webgl": "^0.20.0-beta.179",
-        "@xterm/xterm": "^6.1.0-beta.180",
+        "@xterm/addon-clipboard": "^0.3.0-beta.191",
+        "@xterm/addon-image": "^0.10.0-beta.191",
+        "@xterm/addon-ligatures": "^0.11.0-beta.191",
+        "@xterm/addon-progress": "^0.3.0-beta.191",
+        "@xterm/addon-search": "^0.17.0-beta.191",
+        "@xterm/addon-serialize": "^0.15.0-beta.191",
+        "@xterm/addon-unicode11": "^0.10.0-beta.191",
+        "@xterm/addon-webgl": "^0.20.0-beta.190",
+        "@xterm/xterm": "^6.1.0-beta.191",
         "jschardet": "3.1.4",
         "katex": "^0.16.22",
         "tas-client": "0.3.1",
@@ -73,9 +73,9 @@
       "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
     },
     "node_modules/@vscode/codicons": {
-      "version": "0.0.45-14",
-      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.45-14.tgz",
-      "integrity": "sha512-EdrK2NnxNGluUm9ZlU1C5VTLfG1cpO4C0CCXloS+8bDuTbidE1qtwaF5lHPcoDE102WBqBzWA09nVKFoN8RSOA==",
+      "version": "0.0.46-1",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.46-1.tgz",
+      "integrity": "sha512-BMOj3V0zXCGsBHQN18NyorO4wk+qdpmS4MLSyqZEDsixgKODA5570RspntWtIZOhmEkcOwlrTRtuZu+yiukBQQ==",
       "license": "CC-BY-4.0"
     },
     "node_modules/@vscode/iconv-lite-umd": {
@@ -100,30 +100,30 @@
       }
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.3.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.180.tgz",
-      "integrity": "sha512-8vJ2BN8tot7Qqgl1p0ALXIy/SOvF7nQmh3DEZph6ZARNuV3JUrpF8xdK+lmd25/fm7NFgnGdntLe9k/g2qbAgw==",
+      "version": "0.3.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.191.tgz",
+      "integrity": "sha512-u+0smTVylu9IAntE2OPfD1ZqZ5TNIcSWM1fA/tu1tryGIscax9cn6V2U7T4kkTEFf3A4a3PKgCrKufBclXebjQ==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.180.tgz",
-      "integrity": "sha512-CGZxW47ZllCqS6n4vVD0lVCz2sq9FqP6czQoCJBStFJho05ioVLy0wQr8XCDJO87wuYvPjJaU3BlsyCDL2xVzQ==",
+      "version": "0.10.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.191.tgz",
+      "integrity": "sha512-gX2WEQV2N7A9fx5VpzXK9GIqazUJKBreqEOuUcQPnY2ECJqVsC0uaoK9A/rhm2JuSkHRcqBt/pRVlT4Ki5KsZg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.11.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.180.tgz",
-      "integrity": "sha512-YiCxw7P1rj5TVs25BJT9OiZ9QghNtboBhpYB7KZUOB2aqlCPsyIknf9GMbCrZegDfMMa22FWPyXF4oeZDBmpFg==",
+      "version": "0.11.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.191.tgz",
+      "integrity": "sha512-LFAPEUna5o7nZSJrlV8rrhU6WIC30btdqPf4PNAo5pxWjCWPBqlD1XkTmeYWGpsxk2OaXec/MGjG03k6Rg2z2w==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -133,58 +133,58 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.3.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.180.tgz",
-      "integrity": "sha512-73vv8C6Fg8CBhZZUNyX286kaNNd3iwjimSqctPZhN1wPUO4wE9mOp52hP6vCi2Vq8aZvbREmVcAvAIzNx0iNNg==",
+      "version": "0.3.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.191.tgz",
+      "integrity": "sha512-aImBOklbz37LqF4JsXe6cSTyFIpV5hxU4G/DS1IaFqbYPPMwWGdOUIB3L+TWwcMJh9hv1iwx5PbxNNi0KaylVw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.180.tgz",
-      "integrity": "sha512-w6dwnHeA9xxmTon2JF6SK1NwfNcmq8LzGPjyzPTwRKleFayHOH88MyIz/HCfgey+AbZRh8gsiA+lvS89/YMcQw==",
+      "version": "0.17.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.191.tgz",
+      "integrity": "sha512-fv+TQkhDXYxAeJ31Mi4C4BPFLcffFOHl/vDceMlzaqHB+XHTBo6BDRcXAWBAgA0rvChZrYYTQ/JCPq9R506JSw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.15.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.180.tgz",
-      "integrity": "sha512-+lmgiIXKWMdQvxBM5MfEX4QQ6f4F1jz4VhxnIcfuxUodq5gE+aQHC7gA7zT/LE1R7UJKT0t2byNqFb96lVu0QQ==",
+      "version": "0.15.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.191.tgz",
+      "integrity": "sha512-Kzj/J52MEH8B1p84CZ0XEY3/engNDO1sJKmpZDLr0WP+EKvh5uwZe0bD5X5tNLNM5ZEFpMWailwTrGF9tSAd2g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.180.tgz",
-      "integrity": "sha512-lStuJCp27ftt7BC7V1poSbPM4J2rluNUybeMn9/D9Kj0bNQYEqMX+cxjYPgVCbgnQIluQAsay8fS2pGiRM4PZA==",
+      "version": "0.10.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.191.tgz",
+      "integrity": "sha512-6FR4CjI0te0bLWF7jr7ujpjVOW1kGFl+rKWbblFRNhENuN6gT1phIm4V1L4N9Rr6seTku272YRnO0nAHWZNe6g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.20.0-beta.179",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.179.tgz",
-      "integrity": "sha512-mYWo305LkZjK+wUt+27+GHXs8NTV5YCzxRY6l9vWaqd+/5V/JdzyZTTR4gA3Vc4CEQETUrhwAVex5arzjWE/IA==",
+      "version": "0.20.0-beta.190",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.190.tgz",
+      "integrity": "sha512-9ABzdVhovpseQuD7v5sDz/4UZXvX7y8CH+EaF+LiP/HK6JwdWzVo9OftyWGNdHrOqo43PO7RTeC3eUQq9qqQGw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.180"
+        "@xterm/xterm": "^6.1.0-beta.191"
       }
     },
     "node_modules/@xterm/xterm": {
-      "version": "6.1.0-beta.180",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.180.tgz",
-      "integrity": "sha512-EBF41C3OWwmy5XyWbxiWvgjnb1mXvzwLfFlOvRZPnHA/esXjvwF30aJRvpfI8tPxkNlT05zsx908hLv4XwDuRg==",
+      "version": "6.1.0-beta.191",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.191.tgz",
+      "integrity": "sha512-c50KmCnftJRZa3cXVBxcixTyeq4Brs603DHxYGZ0z0a58LkhKdfzOfKwYKxHfiZlsOlX58Xk21BJ4d1UrCuCAA==",
       "license": "MIT",
       "workspaces": [
         "addons/*"
diff --git a/remote/web/package.json b/remote/web/package.json
index b71c4b2a597..e0487531ed3 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -5,19 +5,19 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@vscode/codicons": "^0.0.45-14",
+    "@vscode/codicons": "^0.0.46-1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.23",
-    "@xterm/addon-clipboard": "^0.3.0-beta.180",
-    "@xterm/addon-image": "^0.10.0-beta.180",
-    "@xterm/addon-ligatures": "^0.11.0-beta.180",
-    "@xterm/addon-progress": "^0.3.0-beta.180",
-    "@xterm/addon-search": "^0.17.0-beta.180",
-    "@xterm/addon-serialize": "^0.15.0-beta.180",
-    "@xterm/addon-unicode11": "^0.10.0-beta.180",
-    "@xterm/addon-webgl": "^0.20.0-beta.179",
-    "@xterm/xterm": "^6.1.0-beta.180",
+    "@xterm/addon-clipboard": "^0.3.0-beta.191",
+    "@xterm/addon-image": "^0.10.0-beta.191",
+    "@xterm/addon-ligatures": "^0.11.0-beta.191",
+    "@xterm/addon-progress": "^0.3.0-beta.191",
+    "@xterm/addon-search": "^0.17.0-beta.191",
+    "@xterm/addon-serialize": "^0.15.0-beta.191",
+    "@xterm/addon-unicode11": "^0.10.0-beta.191",
+    "@xterm/addon-webgl": "^0.20.0-beta.190",
+    "@xterm/xterm": "^6.1.0-beta.191",
     "jschardet": "3.1.4",
     "katex": "^0.16.22",
     "tas-client": "0.3.1",
diff --git a/scripts/code-agent-host.js b/scripts/code-agent-host.js
new file mode 100644
index 00000000000..ecd162a0a24
--- /dev/null
+++ b/scripts/code-agent-host.js
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+
+const cp = require('child_process');
+const path = require('path');
+const minimist = require('minimist');
+
+async function main() {
+	const args = minimist(process.argv.slice(2), {
+		boolean: ['help', 'enable-mock-agent', 'quiet', 'without-connection-token'],
+		string: ['port', 'log', 'connection-token', 'connection-token-file'],
+	});
+
+	if (args.help) {
+		console.log(
+			'Usage: ./scripts/code-agent-host.sh [options]\n' +
+			'\n' +
+			'Options:\n' +
+			'  --port <number>                Port to listen on (default: 8081, or VSCODE_AGENT_HOST_PORT env)\n' +
+			'  --connection-token <token>      A secret that must be included with all requests\n' +
+			'  --connection-token-file <path>  Path to a file containing the connection token\n' +
+			'  --without-connection-token      Run without a connection token\n' +
+			'  --enable-mock-agent            Enable the mock agent for testing\n' +
+			'  --quiet                        Suppress logging output\n' +
+			'  --log <level>                  Log level to use (trace, debug, info, warning, error, off)\n' +
+			'  --help                         Show this help message',
+		);
+		return;
+	}
+
+	const port = args.port || process.env['VSCODE_AGENT_HOST_PORT'] || '8081';
+
+	/** @type {string[]} */
+	const serverArgs = ['--port', String(port)];
+	if (args['enable-mock-agent']) {
+		serverArgs.push('--enable-mock-agent');
+	}
+	if (args.quiet) {
+		serverArgs.push('--quiet');
+	}
+	if (args.log) {
+		serverArgs.push('--log', String(args.log));
+	}
+	if (args['connection-token']) {
+		serverArgs.push('--connection-token', String(args['connection-token']));
+	}
+	if (args['connection-token-file']) {
+		serverArgs.push('--connection-token-file', String(args['connection-token-file']));
+	}
+	if (args['without-connection-token']) {
+		serverArgs.push('--without-connection-token');
+	}
+
+	const addr = await startServer(serverArgs);
+	console.log(`Agent Host server listening on ${addr}`);
+}
+
+function startServer(programArgs) {
+	return new Promise((resolve, reject) => {
+		const env = { ...process.env };
+		const entryPoint = path.join(
+			__dirname,
+			'..',
+			'out',
+			'vs',
+			'platform',
+			'agentHost',
+			'node',
+			'agentHostServerMain.js',
+		);
+
+		console.log(
+			`Starting agent host server: ${entryPoint} ${programArgs.join(' ')}`,
+		);
+		const proc = cp.spawn(process.execPath, [entryPoint, ...programArgs], {
+			env,
+			stdio: [process.stdin, null, process.stderr],
+		});
+		proc.stdout.on('data', (data) => {
+			const text = data.toString();
+			process.stdout.write(text);
+			const m = text.match(/READY:(\d+)/);
+			if (m) {
+				resolve(`ws://127.0.0.1:${m[1]}`);
+			}
+		});
+
+		proc.on('exit', (code) => process.exit(code));
+
+		process.on('exit', () => proc.kill());
+		process.on('SIGINT', () => {
+			proc.kill();
+			process.exit(128 + 2);
+		});
+		process.on('SIGTERM', () => {
+			proc.kill();
+			process.exit(128 + 15);
+		});
+	});
+}
+
+main();
diff --git a/scripts/code-agent-host.sh b/scripts/code-agent-host.sh
new file mode 100755
index 00000000000..663f938ea1c
--- /dev/null
+++ b/scripts/code-agent-host.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+	ROOT=$(dirname $(dirname $(readlink -f $0)))
+fi
+
+function code() {
+	pushd $ROOT
+
+	# Get electron, compile, built-in extensions
+	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
+		node build/lib/preLaunch.ts
+	fi
+
+	NODE=$(node build/lib/node.ts)
+	if [ ! -e $NODE ];then
+		# Load remote node
+		npm run gulp node
+	fi
+
+	popd
+
+	NODE_ENV=development \
+	VSCODE_DEV=1 \
+	exec "$NODE" "$ROOT/scripts/code-agent-host.js" "$@"
+}
+
+code "$@"
diff --git a/scripts/sync-agent-host-protocol.ts b/scripts/sync-agent-host-protocol.ts
new file mode 100644
index 00000000000..02469d17051
--- /dev/null
+++ b/scripts/sync-agent-host-protocol.ts
@@ -0,0 +1,229 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Copies type definitions from the sibling `agent-host-protocol` repo into
+// `src/vs/platform/agentHost/common/state/protocol/`. Run via:
+//
+//   npx tsx scripts/sync-agent-host-protocol.ts
+//
+// Transformations applied:
+//   1. Converts 2-space indentation to tabs.
+//   2. Merges duplicate imports from the same module.
+//   3. Formats with the project's tsfmt.json settings.
+//   4. Adds Microsoft copyright header.
+//
+// URI stays as `string` (the protocol's canonical representation). VS Code code
+// should call `URI.parse()` at point-of-use where a URI class is needed.
+
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as ts from 'typescript';
+
+const ROOT = path.resolve(__dirname, '..');
+const PROTOCOL_REPO = path.resolve(ROOT, '../agent-host-protocol');
+const TYPES_DIR = path.join(PROTOCOL_REPO, 'types');
+const DEST_DIR = path.join(ROOT, 'src/vs/platform/agentHost/common/state/protocol');
+
+// Load tsfmt.json formatting options once
+const TSFMT_PATH = path.join(ROOT, 'tsfmt.json');
+const FORMAT_OPTIONS: ts.FormatCodeSettings = JSON.parse(fs.readFileSync(TSFMT_PATH, 'utf-8'));
+
+/**
+ * Formats a TypeScript source string using the TypeScript language service
+ * formatter with the project's tsfmt.json settings.
+ */
+function formatTypeScript(content: string, fileName: string): string {
+	const host: ts.LanguageServiceHost = {
+		getCompilationSettings: () => ({}),
+		getScriptFileNames: () => [fileName],
+		getScriptVersion: () => '1',
+		getScriptSnapshot: (name: string) => name === fileName ? ts.ScriptSnapshot.fromString(content) : undefined,
+		getCurrentDirectory: () => ROOT,
+		getDefaultLibFileName: () => '',
+		fileExists: () => false,
+		readFile: () => undefined,
+	};
+	const ls = ts.createLanguageService(host);
+	const edits = ls.getFormattingEditsForDocument(fileName, FORMAT_OPTIONS);
+	// Apply edits in reverse order to preserve offsets
+	for (let i = edits.length - 1; i >= 0; i--) {
+		const edit = edits[i];
+		content = content.substring(0, edit.span.start) + edit.newText + content.substring(edit.span.start + edit.span.length);
+	}
+	ls.dispose();
+	return content;
+}
+
+const COPYRIGHT = `/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/`;
+
+const BANNER = '// allow-any-unicode-comment-file\n// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts';
+
+// Files to copy. All go into protocol/.
+const FILES: { src: string; dest: string }[] = [
+	{ src: 'state.ts', dest: 'state.ts' },
+	{ src: 'actions.ts', dest: 'actions.ts' },
+	{ src: 'action-origin.generated.ts', dest: 'action-origin.generated.ts' },
+	{ src: 'reducers.ts', dest: 'reducers.ts' },
+	{ src: 'commands.ts', dest: 'commands.ts' },
+	{ src: 'errors.ts', dest: 'errors.ts' },
+	{ src: 'notifications.ts', dest: 'notifications.ts' },
+	{ src: 'messages.ts', dest: 'messages.ts' },
+	{ src: 'version/registry.ts', dest: 'version/registry.ts' },
+];
+
+function getSourceCommitHash(): string {
+	try {
+		return execSync('git rev-parse --short HEAD', { cwd: PROTOCOL_REPO, encoding: 'utf-8' }).trim();
+	} catch {
+		return 'unknown';
+	}
+}
+
+function stripExistingHeader(content: string): string {
+	return content.replace(/^\/\*\*?[\s\S]*?\*\/\s*/, '');
+}
+
+function convertIndentation(content: string): string {
+	const lines = content.split('\n');
+	return lines.map(line => {
+		const match = line.match(/^( +)/);
+		if (!match) {
+			return line;
+		}
+		const spaces = match[1].length;
+		const tabs = Math.floor(spaces / 2);
+		const remainder = spaces % 2;
+		return '\t'.repeat(tabs) + ' '.repeat(remainder) + line.slice(spaces);
+	}).join('\n');
+}
+
+/**
+ * Merges duplicate imports from the same module.
+ * Combines `import type { A }` and `import { B }` from the same module into
+ * `import { B, type A }` to satisfy the no-duplicate-imports lint rule.
+ */
+function mergeDuplicateImports(content: string): string {
+	// Collapse multi-line imports into single lines first
+	content = content.replace(/import\s+(type\s+)?\{([^}]+)\}\s+from\s+'([^']+)';/g, (_match, typeKeyword, names, mod) => {
+		const collapsed = names.replace(/\s+/g, ' ').trim();
+		return typeKeyword ? `import type { ${collapsed} } from '${mod}';` : `import { ${collapsed} } from '${mod}';`;
+	});
+
+	const importsByModule = new Map<string, { typeNames: string[]; valueNames: string[] }>();
+	const otherLines: string[] = [];
+	const seenModules = new Set<string>();
+
+	for (const line of content.split('\n')) {
+		const typeMatch = line.match(/^import type \{([^}]+)\} from '([^']+)';$/);
+		const valueMatch = line.match(/^import \{([^}]+)\} from '([^']+)';$/);
+
+		if (typeMatch) {
+			const [, names, mod] = typeMatch;
+			if (!importsByModule.has(mod)) {
+				importsByModule.set(mod, { typeNames: [], valueNames: [] });
+			}
+			importsByModule.get(mod)!.typeNames.push(...names.split(',').map(s => s.trim()).filter(s => s.length > 0));
+			if (!seenModules.has(mod)) {
+				seenModules.add(mod);
+				otherLines.push(`__IMPORT_PLACEHOLDER__${mod}`);
+			}
+		} else if (valueMatch) {
+			const [, names, mod] = valueMatch;
+			if (!importsByModule.has(mod)) {
+				importsByModule.set(mod, { typeNames: [], valueNames: [] });
+			}
+			importsByModule.get(mod)!.valueNames.push(...names.split(',').map(s => s.trim()).filter(s => s.length > 0));
+			if (!seenModules.has(mod)) {
+				seenModules.add(mod);
+				otherLines.push(`__IMPORT_PLACEHOLDER__${mod}`);
+			}
+		} else {
+			otherLines.push(line);
+		}
+	}
+
+	return otherLines.map(line => {
+		if (line.startsWith('__IMPORT_PLACEHOLDER__')) {
+			const mod = line.substring('__IMPORT_PLACEHOLDER__'.length);
+			const entry = importsByModule.get(mod)!;
+			const uniqueTypes = [...new Set(entry.typeNames)];
+			const uniqueValues = [...new Set(entry.valueNames)];
+
+			if (uniqueValues.length > 0 && uniqueTypes.length > 0) {
+				const allNames = [...uniqueValues, ...uniqueTypes.map(n => `type ${n}`)];
+				return `import { ${allNames.join(', ')} } from '${mod}';`;
+			} else if (uniqueValues.length > 0) {
+				return `import { ${uniqueValues.join(', ')} } from '${mod}';`;
+			} else {
+				return `import type { ${uniqueTypes.join(', ')} } from '${mod}';`;
+			}
+		}
+		return line;
+	}).join('\n');
+}
+
+
+
+
+
+function processFile(src: string, dest: string, commitHash: string): void {
+	let content = fs.readFileSync(src, 'utf-8');
+	content = stripExistingHeader(content);
+
+	// Merge duplicate imports from the same module
+	content = mergeDuplicateImports(content);
+
+	content = convertIndentation(content);
+	content = content.split('\n').map(line => line.trimEnd()).join('\n');
+
+	const header = `${COPYRIGHT}\n\n${BANNER}\n// Synced from agent-host-protocol @ ${commitHash}\n`;
+	content = header + '\n' + content;
+
+	if (!content.endsWith('\n')) {
+		content += '\n';
+	}
+
+	const destPath = path.join(DEST_DIR, dest);
+	fs.mkdirSync(path.dirname(destPath), { recursive: true });
+	content = formatTypeScript(content, dest);
+	fs.writeFileSync(destPath, content, 'utf-8');
+	console.log(`  ${dest}`);
+}
+
+// ---- Main -------------------------------------------------------------------
+
+function main() {
+	if (!fs.existsSync(TYPES_DIR)) {
+		console.error(`ERROR: Cannot find ${TYPES_DIR}`);
+		console.error('Clone agent-host-protocol as a sibling of the VS Code repo:');
+		console.error('  git clone git@github.com:microsoft/agent-host-protocol.git ../agent-host-protocol');
+		process.exit(1);
+	}
+
+	const commitHash = getSourceCommitHash();
+	console.log(`Syncing from agent-host-protocol @ ${commitHash}`);
+	console.log(`  Source: ${TYPES_DIR}`);
+	console.log(`  Dest:   ${DEST_DIR}`);
+	console.log();
+
+	// Copy protocol files
+	for (const file of FILES) {
+		const srcPath = path.join(TYPES_DIR, file.src);
+		if (!fs.existsSync(srcPath)) {
+			console.error(`  SKIP (not found): ${file.src}`);
+			continue;
+		}
+		processFile(srcPath, file.dest, commitHash);
+	}
+
+	console.log();
+	console.log('Done.');
+}
+
+main();
diff --git a/src/bootstrap-import.ts b/src/bootstrap-import.ts
index 3bd5c73a0af..8ccabe764d1 100644
--- a/src/bootstrap-import.ts
+++ b/src/bootstrap-import.ts
@@ -17,6 +17,7 @@ import { join } from 'node:path';
 // SEE https://nodejs.org/docs/latest/api/module.html#initialize
 
 const _specifierToUrl: Record<string, string> = {};
+const _specifierToFormat: Record<string, string> = {};
 
 export async function initialize(injectPath: string): Promise<void> {
 	// populate mappings
@@ -27,16 +28,52 @@ export async function initialize(injectPath: string): Promise<void> {
 	for (const [name] of Object.entries(packageJSON.dependencies)) {
 		try {
 			const path = join(injectPackageJSONPath, `../node_modules/${name}/package.json`);
-			let { main } = JSON.parse(String(await promises.readFile(path)));
+			const pkgJson = JSON.parse(String(await promises.readFile(path)));
+
+			// Determine the entry point: prefer exports["."].import for ESM, then main.
+			// Handle conditional export targets where exports["."].import/default
+			// can be a string or an object with a string `default` field.
+			// (Added for copilot-sdk)
+			let main: string | undefined;
+			if (pkgJson.exports?.['.']) {
+				const dotExport = pkgJson.exports['.'];
+				if (typeof dotExport === 'string') {
+					main = dotExport;
+				} else if (typeof dotExport === 'object' && dotExport !== null) {
+					const resolveCondition = (v: unknown): string | undefined => {
+						if (typeof v === 'string') {
+							return v;
+						}
+						if (typeof v === 'object' && v !== null) {
+							const d = (v as { default?: unknown }).default;
+							if (typeof d === 'string') {
+								return d;
+							}
+						}
+						return undefined;
+					};
+					main = resolveCondition(dotExport.import) ?? resolveCondition(dotExport.default);
+				}
+			}
+			if (typeof main !== 'string') {
+				main = typeof pkgJson.main === 'string' ? pkgJson.main : undefined;
+			}
 
 			if (!main) {
 				main = 'index.js';
 			}
-			if (!main.endsWith('.js')) {
+			if (!main.endsWith('.js') && !main.endsWith('.mjs') && !main.endsWith('.cjs')) {
 				main += '.js';
 			}
 			const mainPath = join(injectPackageJSONPath, `../node_modules/${name}/${main}`);
 			_specifierToUrl[name] = pathToFileURL(mainPath).href;
+			// Determine module format: .mjs is always ESM, .cjs always CJS, otherwise check type field
+			const isModule = main.endsWith('.mjs')
+				? true
+				: main.endsWith('.cjs')
+					? false
+					: pkgJson.type === 'module';
+			_specifierToFormat[name] = isModule ? 'module' : 'commonjs';
 
 		} catch (err) {
 			console.error(name);
@@ -52,7 +89,7 @@ export async function resolve(specifier: string | number, context: unknown, next
 	const newSpecifier = _specifierToUrl[specifier];
 	if (newSpecifier !== undefined) {
 		return {
-			format: 'commonjs',
+			format: _specifierToFormat[specifier] ?? 'commonjs',
 			shortCircuit: true,
 			url: newSpecifier
 		};
diff --git a/src/server-main.ts b/src/server-main.ts
index a589510cfc8..f5af9e32e6a 100644
--- a/src/server-main.ts
+++ b/src/server-main.ts
@@ -25,7 +25,7 @@ perf.mark('code/server/start');
 // Do a quick parse to determine if a server or the cli needs to be started
 const parsedArgs = minimist(process.argv.slice(2), {
 	boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'],
-	string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility'],
+	string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility', 'agent-host-port', 'agent-host-path'],
 	alias: { help: 'h', version: 'v' }
 });
 ['host', 'port', 'accept-server-license-terms'].forEach(e => {
diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css
index 8496f1b2284..0ec4cbb4712 100644
--- a/src/vs/base/browser/ui/button/button.css
+++ b/src/vs/base/browser/ui/button/button.css
@@ -110,6 +110,7 @@
 	border: 1px solid var(--vscode-button-border, transparent);
 	border-left-width: 0 !important;
 	border-radius: 0 4px 4px 0;
+	padding: 0 4px;
 	display: flex;
 	align-items: center;
 }
diff --git a/src/vs/base/browser/ui/hover/hoverWidget.css b/src/vs/base/browser/ui/hover/hoverWidget.css
index 85379221cf2..c2837659d5f 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.css
+++ b/src/vs/base/browser/ui/hover/hoverWidget.css
@@ -139,6 +139,7 @@
 .monaco-hover .hover-row.status-bar .actions .action-container .action .icon {
 	padding-right: 4px;
 	vertical-align: middle;
+	font-size: inherit;
 }
 
 .monaco-hover .hover-row.status-bar .actions .action-container a {
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index 468667aabc0..034c650442a 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -9,7 +9,7 @@ import * as css from '../../cssValue.js';
 import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js';
 import { IHoverDelegate } from '../hover/hoverDelegate.js';
 import { IMatch } from '../../../common/filters.js';
-import { Disposable, IDisposable } from '../../../common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../common/lifecycle.js';
 import { equals } from '../../../common/objects.js';
 import { Range } from '../../../common/range.js';
 import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
@@ -340,6 +340,7 @@ class LabelWithHighlights extends Disposable {
 	private label: string | string[] | undefined = undefined;
 	private singleLabel: HighlightedLabel | undefined = undefined;
 	private options: IIconLabelValueOptions | undefined;
+	private readonly _labelDisposables = this._register(new DisposableStore());
 
 	constructor(private container: HTMLElement, private supportIcons: boolean) {
 		super();
@@ -358,13 +359,15 @@ class LabelWithHighlights extends Disposable {
 
 		if (typeof label === 'string') {
 			if (!this.singleLabel) {
+				this._labelDisposables.clear();
 				this.container.textContent = '';
 				this.container.classList.remove('multiple');
-				this.singleLabel = this._register(new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId }))));
+				this.singleLabel = this._labelDisposables.add(new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId }))));
 			}
 
 			this.singleLabel.set(label, options?.matches, undefined, options?.labelEscapeNewLines, supportIcons);
 		} else {
+			this._labelDisposables.clear();
 			this.container.textContent = '';
 			this.container.classList.add('multiple');
 			this.singleLabel = undefined;
@@ -378,7 +381,7 @@ class LabelWithHighlights extends Disposable {
 				const id = options?.domId && `${options?.domId}_${i}`;
 
 				const name = dom.$('a.label-name', { id, 'data-icon-label-count': label.length, 'data-icon-label-index': i, 'role': 'treeitem' });
-				const highlightedLabel = this._register(new HighlightedLabel(dom.append(this.container, name)));
+				const highlightedLabel = this._labelDisposables.add(new HighlightedLabel(dom.append(this.container, name)));
 				highlightedLabel.set(l, m, undefined, options?.labelEscapeNewLines, supportIcons);
 
 				if (i < label.length - 1) {
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index 500b0614ade..bbadbf1d73b 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -1017,10 +1017,12 @@ export function formatRule(c: ThemeIcon) {
 }
 
 export function getMenuWidgetCSS(style: IMenuStyles, isForShadowDom: boolean): string {
+	const borderColor = style.borderColor ?? 'var(--vscode-menu-border)';
 	let result = /* css */`
 .monaco-menu {
 	font-size: 13px;
 	border-radius: var(--vscode-cornerRadius-large);
+	border: 1px solid ${borderColor};
 	min-width: 160px;
 }
 
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 21696911bd1..73e90474f66 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IContextMenuProvider } from '../../contextmenu.js';
+import * as DOM from '../../dom.js';
 import { ActionBar, ActionsOrientation, IActionViewItemProvider } from '../actionbar/actionbar.js';
 import { AnchorAlignment } from '../contextview/contextview.js';
 import { DropdownMenuActionViewItem } from '../dropdown/dropdownActionViewItem.js';
@@ -23,6 +24,14 @@ const ACTION_PADDING = 4; /* 4px padding */
 
 const ACTION_MIN_WIDTH_VAR = '--vscode-toolbar-action-min-width';
 
+export interface IToolBarResponsiveBehaviorOptions {
+	readonly enabled: boolean;
+	readonly kind: 'last' | 'all';
+	readonly minItems?: number;
+	readonly actionMinWidth?: number;
+	readonly getActionMinWidth?: (action: IAction) => number | undefined;
+}
+
 export interface IToolBarOptions {
 	orientation?: ActionsOrientation;
 	actionViewItemProvider?: IActionViewItemProvider;
@@ -59,8 +68,9 @@ export interface IToolBarOptions {
 	 * - `kind`: The kind of responsive behavior to apply. Can be either `last` to only shrink the last item, or `all` to shrink all items equally.
 	 * - `minItems`: The minimum number of items that should always be visible.
 	 * - `actionMinWidth`: The minimum width of each action item. Defaults to `ACTION_MIN_WIDTH` (24px).
+	 * - `getActionMinWidth`: Optional per-action minimum width override in pixels.
 	 */
-	responsiveBehavior?: { enabled: boolean; kind: 'last' | 'all'; minItems?: number; actionMinWidth?: number };
+	responsiveBehavior?: IToolBarResponsiveBehaviorOptions;
 }
 
 /**
@@ -81,7 +91,6 @@ export class ToolBar extends Disposable {
 	private originalSecondaryActions: ReadonlyArray<IAction> = [];
 	private hiddenActions: { action: IAction; size: number }[] = [];
 	private readonly disposables = this._register(new DisposableStore());
-	private readonly actionMinWidth: number;
 
 	constructor(private readonly container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
 		super();
@@ -161,15 +170,12 @@ export class ToolBar extends Disposable {
 			}
 		}));
 
-		// Store effective action min width
-		this.actionMinWidth = (options.responsiveBehavior?.actionMinWidth ?? ACTION_MIN_WIDTH) + ACTION_PADDING;
-
 		// Responsive support
 		if (this.options.responsiveBehavior?.enabled) {
 			this.element.classList.toggle('responsive', true);
 			this.element.classList.toggle('responsive-all', this.options.responsiveBehavior.kind === 'all');
 			this.element.classList.toggle('responsive-last', this.options.responsiveBehavior.kind === 'last');
-			this.element.style.setProperty(ACTION_MIN_WIDTH_VAR, `${this.actionMinWidth - ACTION_PADDING}px`);
+			this.element.style.setProperty(ACTION_MIN_WIDTH_VAR, `${this.getConfiguredActionMinWidth()}px`);
 
 			const observer = new ResizeObserver(() => {
 				this.updateActions(this.element.getBoundingClientRect().width);
@@ -227,6 +233,18 @@ export class ToolBar extends Disposable {
 		this.actionBar.setAriaLabel(label);
 	}
 
+	/**
+	 * Force the responsive overflow logic to re-evaluate item visibility.
+	 * Call this after action view items change their rendered size externally
+	 * (e.g. label text changes) without the toolbar being notified.
+	 */
+	relayout(): void {
+		if (this.options.responsiveBehavior?.enabled) {
+			const width = this.element.getBoundingClientRect().width;
+			this.updateActions(width);
+		}
+	}
+
 	setActions(primaryActions: ReadonlyArray<IAction>, secondaryActions?: ReadonlyArray<IAction>): void {
 		this.clear();
 
@@ -251,7 +269,8 @@ export class ToolBar extends Disposable {
 			this.actionBar.push(action, { icon: this.options.icon ?? true, label: this.options.label ?? false, keybinding: this.getKeybindingLabel(action) });
 		});
 
-		this.actionBar.domNode.classList.toggle('has-overflow', this.actionBar.hasAction(this.toggleMenuAction));
+		this.updateOverflowClassName();
+		this.applyResponsiveActionMinWidths();
 
 		if (this.options.responsiveBehavior?.enabled) {
 			// Reset hidden actions
@@ -260,6 +279,9 @@ export class ToolBar extends Disposable {
 			// Set the minimum width
 			if (this.options.responsiveBehavior?.minItems !== undefined) {
 				const itemCount = this.options.responsiveBehavior.minItems;
+				const primaryActionsMinWidth = this.originalPrimaryActions
+					.slice(0, itemCount)
+					.reduce((total, action) => total + this.getActionMinWidth(action), 0);
 
 				// Account for overflow menu
 				let overflowWidth = 0;
@@ -270,11 +292,12 @@ export class ToolBar extends Disposable {
 					overflowWidth = ACTION_MIN_WIDTH + ACTION_PADDING;
 				}
 
-				this.container.style.minWidth = `${itemCount * this.actionMinWidth + overflowWidth}px`;
-				this.element.style.minWidth = `${itemCount * this.actionMinWidth + overflowWidth}px`;
+				this.container.style.minWidth = `${primaryActionsMinWidth + overflowWidth}px`;
+				this.element.style.minWidth = `${primaryActionsMinWidth + overflowWidth}px`;
 			} else {
-				this.container.style.minWidth = `${ACTION_MIN_WIDTH + ACTION_PADDING}px`;
-				this.element.style.minWidth = `${ACTION_MIN_WIDTH + ACTION_PADDING}px`;
+				const minimumActionWidth = this.originalPrimaryActions.length > 0 ? this.getActionMinWidth(this.originalPrimaryActions[0]) : ACTION_MIN_WIDTH + ACTION_PADDING;
+				this.container.style.minWidth = `${minimumActionWidth}px`;
+				this.element.style.minWidth = `${minimumActionWidth}px`;
 			}
 
 			// Update toolbar actions to fit with container width
@@ -292,15 +315,67 @@ export class ToolBar extends Disposable {
 		return key?.getLabel() ?? undefined;
 	}
 
+	private getConfiguredActionMinWidth(action?: IAction): number {
+		if (action?.id === ToggleMenuAction.ID) {
+			return ACTION_MIN_WIDTH;
+		}
+
+		return this.options.responsiveBehavior?.getActionMinWidth?.(action ?? this.toggleMenuAction)
+			?? this.options.responsiveBehavior?.actionMinWidth
+			?? ACTION_MIN_WIDTH;
+	}
+
+	private getActionMinWidth(action?: IAction): number {
+		return this.getConfiguredActionMinWidth(action) + ACTION_PADDING;
+	}
+
+	private applyResponsiveActionMinWidths(): void {
+		if (!this.options.responsiveBehavior?.enabled) {
+			return;
+		}
+
+		if (this.options.responsiveBehavior.kind === 'last') {
+			const hasToggleMenuAction = this.actionBar.hasAction(this.toggleMenuAction);
+			const shrinkableIndex = hasToggleMenuAction ? this.actionBar.length() - 2 : this.actionBar.length() - 1;
+			const shrinkableAction = shrinkableIndex >= 0 ? this.actionBar.getAction(shrinkableIndex) : undefined;
+			const minWidth = `${this.getConfiguredActionMinWidth(shrinkableAction)}px`;
+			if (this.element.style.getPropertyValue(ACTION_MIN_WIDTH_VAR) !== minWidth) {
+				this.element.style.setProperty(ACTION_MIN_WIDTH_VAR, minWidth);
+			}
+			return;
+		}
+
+		const actionsContainer = this.actionBar.getContainer().firstElementChild;
+		if (!DOM.isHTMLElement(actionsContainer)) {
+			return;
+		}
+
+		for (let i = 0; i < actionsContainer.children.length; i++) {
+			const actionItem = actionsContainer.children.item(i);
+			if (!DOM.isHTMLElement(actionItem)) {
+				continue;
+			}
+
+			const action = this.actionBar.getAction(i);
+			const minWidth = `${this.getConfiguredActionMinWidth(action)}px`;
+			if (actionItem.style.minWidth !== minWidth) {
+				actionItem.style.minWidth = minWidth;
+			}
+		}
+	}
+
 	private updateActions(containerWidth: number) {
 		// Actions bar is empty
 		if (this.actionBar.isEmpty()) {
 			return;
 		}
 
+		this.applyResponsiveActionMinWidths();
+
 		// Ensure that the container width respects the minimum width of the
 		// element which is set based on the `responsiveBehavior.minItems` option
-		containerWidth = Math.max(containerWidth, parseInt(this.element.style.minWidth));
+		const parsedMinWidth = parseInt(this.element.style.minWidth);
+		containerWidth = Math.max(containerWidth, Number.isNaN(parsedMinWidth) ? 0 : parsedMinWidth);
 
 		// Each action is assumed to have a minimum width so that actions with a label
 		// can shrink to the action's minimum width. We do this so that action visibility
@@ -311,27 +386,37 @@ export class ToolBar extends Disposable {
 				const primaryActionsCount = hasToggleMenuAction
 					? this.actionBar.length() - 1
 					: this.actionBar.length();
+				if (primaryActionsCount === 0) {
+					return hasToggleMenuAction ? ACTION_MIN_WIDTH + ACTION_PADDING : 0;
+				}
 
 				let itemsWidth = 0;
 				for (let i = 0; i < primaryActionsCount - 1; i++) {
 					itemsWidth += this.actionBar.getWidth(i) + ACTION_PADDING;
 				}
 
-				itemsWidth += actualWidth ? this.actionBar.getWidth(primaryActionsCount - 1) : this.actionMinWidth; // item to shrink
+				const action = this.actionBar.getAction(primaryActionsCount - 1);
+				itemsWidth += actualWidth ? this.actionBar.getWidth(primaryActionsCount - 1) : this.getActionMinWidth(action); // item to shrink
 				itemsWidth += hasToggleMenuAction ? ACTION_MIN_WIDTH + ACTION_PADDING : 0; // toggle menu action
 
 				return itemsWidth;
 			} else {
-				return this.actionBar.length() * this.actionMinWidth;
+				let itemsWidth = 0;
+				for (let i = 0; i < this.actionBar.length(); i++) {
+					itemsWidth += actualWidth ? this.actionBar.getWidth(i) : this.getActionMinWidth(this.actionBar.getAction(i));
+				}
+				return itemsWidth;
 			}
 		};
 
+		const minimumWidth = actionBarWidth(false);
+
 		// Action bar fits and there are no hidden actions to show
-		if (actionBarWidth(false) <= containerWidth && this.hiddenActions.length === 0) {
+		if (minimumWidth <= containerWidth && this.hiddenActions.length === 0) {
 			return;
 		}
 
-		if (actionBarWidth(false) > containerWidth) {
+		if (minimumWidth > containerWidth) {
 			// Check for max items limit
 			if (this.options.responsiveBehavior?.minItems !== undefined) {
 				const primaryActionsCount = this.actionBar.hasAction(this.toggleMenuAction)
@@ -344,15 +429,15 @@ export class ToolBar extends Disposable {
 			}
 
 			// Hide actions from the right
-			while (actionBarWidth(true) > containerWidth && this.actionBar.length() > 0) {
+			while (actionBarWidth(false) > containerWidth && this.actionBar.length() > 0) {
 				const index = this.originalPrimaryActions.length - this.hiddenActions.length - 1;
 				if (index < 0) {
 					break;
 				}
 
 				// Store the action and its size
-				const size = Math.min(this.actionMinWidth, this.getItemWidth(index));
 				const action = this.originalPrimaryActions[index];
+				const size = Math.min(this.getActionMinWidth(action), this.getItemWidth(index));
 				this.hiddenActions.unshift({ action, size });
 
 				// Remove the action
@@ -367,7 +452,10 @@ export class ToolBar extends Disposable {
 						label: this.options.label ?? false,
 						keybinding: this.getKeybindingLabel(this.toggleMenuAction),
 					});
+					this.updateOverflowClassName();
 				}
+
+				this.applyResponsiveActionMinWidths();
 			}
 		} else {
 			// Show actions from the top of the toggle menu
@@ -392,7 +480,10 @@ export class ToolBar extends Disposable {
 				if (this.originalSecondaryActions.length === 0 && this.hiddenActions.length === 0) {
 					this.toggleMenuAction.menuActions = [];
 					this.actionBar.pull(this.actionBar.length() - 1);
+					this.updateOverflowClassName();
 				}
+
+				this.applyResponsiveActionMinWidths();
 			}
 		}
 
@@ -403,6 +494,11 @@ export class ToolBar extends Disposable {
 			this.toggleMenuAction.menuActions = Separator.join(hiddenActions, secondaryActions);
 		}
 
+		this.updateOverflowClassName();
+		this.applyResponsiveActionMinWidths();
+	}
+
+	private updateOverflowClassName(): void {
 		this.actionBar.domNode.classList.toggle('has-overflow', this.actionBar.hasAction(this.toggleMenuAction));
 	}
 
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 9a06fa89094..8ed1bed2158 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -2729,7 +2729,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 			renderer.updateOptions(optionsUpdate);
 		}
 
-		this.view.updateOptions(this._options);
+		this.view.updateOptions(optionsUpdate);
 		this.findController?.updateOptions(optionsUpdate);
 		this.updateStickyScroll(optionsUpdate);
 
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index 6c604269ac5..9d6d200f68f 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDragAndDropData } from '../../dnd.js';
-import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListTouchEvent, IListVirtualDelegate } from '../list/list.js';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListTouchEvent, IListVirtualDelegate, NotSelectableGroupIdType } from '../list/list.js';
 import { ElementsDragAndDropData, ListViewTargetSector } from '../list/listView.js';
 import { IListStyles } from '../list/listWidget.js';
 import { ComposedTreeDelegate, TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType, AbstractTreePart, LabelFuzzyScore, FindFilter, FindController, ITreeFindToggleChangeEvent, IFindControllerOptions, IStickyScrollDelegate, AbstractTree } from './abstractTree.js';
@@ -1309,7 +1309,10 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 			diffIdentityProvider: options.diffIdentityProvider && {
 				getId(node: IAsyncDataTreeNode<TInput, T>): { toString(): string } {
 					return options.diffIdentityProvider!.getId(node.element as T);
-				}
+				},
+				getGroupId: options.diffIdentityProvider!.getGroupId ? (node: IAsyncDataTreeNode<TInput, T>): number | NotSelectableGroupIdType => {
+					return options.diffIdentityProvider!.getGroupId!(node.element as T);
+				} : undefined
 			}
 		};
 
diff --git a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
index e4adc832676..0bcaa01c426 100644
--- a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IIdentityProvider } from '../list/list.js';
+import { IIdentityProvider, NotSelectableGroupIdType } from '../list/list.js';
 import { getVisibleState, IIndexTreeModelSpliceOptions, isFilterResult } from './indexTreeModel.js';
 import { IObjectTreeModel, IObjectTreeModelOptions, IObjectTreeModelSetChildrenOptions, ObjectTreeModel } from './objectTreeModel.js';
 import { ICollapseStateChangeEvent, IObjectTreeElement, ITreeListSpliceData, ITreeModel, ITreeModelSpliceEvent, ITreeNode, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from './tree.js';
@@ -113,7 +113,10 @@ interface ICompressedObjectTreeModelOptions<T, TFilterData> extends IObjectTreeM
 const wrapIdentityProvider = <T>(base: IIdentityProvider<T>): IIdentityProvider<ICompressedTreeNode<T>> => ({
 	getId(node) {
 		return node.elements.map(e => base.getId(e).toString()).join('\0');
-	}
+	},
+	getGroupId: base.getGroupId ? (node: ICompressedTreeNode<T>): number | NotSelectableGroupIdType => {
+		return base.getGroupId!(node.elements[node.elements.length - 1]);
+	} : undefined
 });
 
 // Exported only for test reasons, do not use directly
@@ -380,7 +383,10 @@ function mapOptions<T, TFilterData>(compressedNodeUnwrapper: CompressedNodeUnwra
 		identityProvider: options.identityProvider && {
 			getId(node: ICompressedTreeNode<T>): { toString(): string } {
 				return options.identityProvider!.getId(compressedNodeUnwrapper(node));
-			}
+			},
+			getGroupId: options.identityProvider!.getGroupId ? (node: ICompressedTreeNode<T>): number | NotSelectableGroupIdType => {
+				return options.identityProvider!.getGroupId!(compressedNodeUnwrapper(node));
+			} : undefined
 		},
 		sorter: options.sorter && {
 			compare(node: ICompressedTreeNode<T>, otherNode: ICompressedTreeNode<T>): number {
diff --git a/src/vs/base/common/codiconsLibrary.ts b/src/vs/base/common/codiconsLibrary.ts
index 1a2d78bcd70..65b43437870 100644
--- a/src/vs/base/common/codiconsLibrary.ts
+++ b/src/vs/base/common/codiconsLibrary.ts
@@ -656,4 +656,5 @@ export const codiconsLibrary = {
 	claude: register('claude', 0xec82),
 	openInWindow: register('open-in-window', 0xec83),
 	newSession: register('new-session', 0xec84),
+	terminalSecure: register('terminal-secure', 0xec85),
 } as const;
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index a9d495ab6b0..929ed2f9e03 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -1029,7 +1029,8 @@ class LeakageMonitor {
 			console.warn(message);
 			console.warn(topStack);
 
-			const error = new ListenerLeakError(message, topStack);
+			const kind = topCount / listenerCount > 0.3 ? 'dominated' : 'popular';
+			const error = new ListenerLeakError(kind, message, topStack);
 			this._errorHandler(error);
 		}
 
@@ -1071,9 +1072,16 @@ class Stacktrace {
 
 // error that is logged when going over the configured listener threshold
 export class ListenerLeakError extends Error {
-	constructor(message: string, stack: string) {
-		super(message);
+	/**
+	 * The detailed message including listener count and most frequent stack.
+	 * Available locally for debugging but intentionally not used as the error
+	 * `message` so that all leak errors group under the same title in telemetry.
+	 */
+	readonly details: string;
+	constructor(kind: 'dominated' | 'popular', details: string, stack: string) {
+		super(`potential listener LEAK detected, ${kind}`);
 		this.name = 'ListenerLeakError';
+		this.details = details;
 		this.stack = stack;
 	}
 }
@@ -1081,9 +1089,16 @@ export class ListenerLeakError extends Error {
 // SEVERE error that is logged when having gone way over the configured listener
 // threshold so that the emitter refuses to accept more listeners
 export class ListenerRefusalError extends Error {
-	constructor(message: string, stack: string) {
-		super(message);
+	/**
+	 * The detailed message including listener count and most frequent stack.
+	 * Available locally for debugging but intentionally not used as the error
+	 * `message` so that all leak errors group under the same title in telemetry.
+	 */
+	readonly details: string;
+	constructor(kind: 'dominated' | 'popular', details: string, stack: string) {
+		super(`potential listener LEAK detected, ${kind} (REFUSED to add)`);
 		this.name = 'ListenerRefusalError';
+		this.details = details;
 		this.stack = stack;
 	}
 }
@@ -1221,7 +1236,8 @@ export class Emitter<T> {
 				console.warn(message);
 
 				const tuple = this._leakageMon.getMostFrequentStack() ?? ['UNKNOWN stack', -1];
-				const error = new ListenerRefusalError(`${message}. HINT: Stack shows most frequent listener (${tuple[1]}-times)`, tuple[0]);
+				const kind = tuple[1] / this._size > 0.3 ? 'dominated' : 'popular';
+				const error = new ListenerRefusalError(kind, `${message}. HINT: Stack shows most frequent listener (${tuple[1]}-times)`, tuple[0]);
 				const errorHandler = this._options?.onListenerError || onUnexpectedError;
 				errorHandler(error);
 
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index 74cb106fd3c..c2efd167054 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -75,6 +75,9 @@ export namespace Schemas {
 
 	export const vscodeTerminal = 'vscode-terminal';
 
+	/** Scheme used for the image carousel editor. */
+	export const vscodeImageCarousel = 'vscode-image-carousel';
+
 	/** Scheme used for code blocks in chat. */
 	export const vscodeChatCodeBlock = 'vscode-chat-code-block';
 
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 8325d6789f0..126b180fa35 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -79,6 +79,7 @@ export interface IProductConfiguration {
 	readonly win32VersionedUpdate?: boolean;
 	readonly applicationName: string;
 	readonly embedderIdentifier?: string;
+	readonly telemetryAppName?: string;
 
 	readonly urlProtocol: string;
 	readonly dataFolderName: string; // location for extensions (e.g. ~/.vscode-insiders)
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
index 3b8370c160b..a064a287736 100644
--- a/src/vs/base/common/resources.ts
+++ b/src/vs/base/common/resources.ts
@@ -190,8 +190,8 @@ export class ExtUri implements IExtUri {
 		return basename(resource) || resource.authority;
 	}
 
-	basename(resource: URI): string {
-		return paths.posix.basename(resource.path);
+	basename(resource: URI, suffix?: string): string {
+		return paths.posix.basename(resource.path, suffix);
 	}
 
 	extname(resource: URI): string {
diff --git a/src/vs/base/node/crypto.ts b/src/vs/base/node/crypto.ts
index f1637f4057f..dee5f05fb3f 100644
--- a/src/vs/base/node/crypto.ts
+++ b/src/vs/base/node/crypto.ts
@@ -16,6 +16,7 @@ export async function checksum(path: string, sha256hash: string | undefined): Pr
 		const done = createSingleCallFunction((err?: Error, result?: string) => {
 			input.removeAllListeners();
 			hash.removeAllListeners();
+			input.destroy();
 
 			if (err) {
 				reject(err);
diff --git a/src/vs/base/parts/request/common/request.ts b/src/vs/base/parts/request/common/request.ts
index 1e2a8ead2fd..b649cff368f 100644
--- a/src/vs/base/parts/request/common/request.ts
+++ b/src/vs/base/parts/request/common/request.ts
@@ -50,6 +50,11 @@ export interface IRequestOptions {
 	 * be supported in all implementations.
 	 */
 	disableCache?: boolean;
+	/**
+	 * Identifies the call site making this request, used for telemetry.
+	 * Use "NO_FETCH_TELEMETRY" to opt out of request telemetry.
+	 */
+	callSite: string;
 }
 
 export interface IRequestContext {
diff --git a/src/vs/base/parts/request/test/electron-main/request.test.ts b/src/vs/base/parts/request/test/electron-main/request.test.ts
index 895b5dc6899..1b51cbf4289 100644
--- a/src/vs/base/parts/request/test/electron-main/request.test.ts
+++ b/src/vs/base/parts/request/test/electron-main/request.test.ts
@@ -58,7 +58,8 @@ suite('Request', () => {
 			url: `http://127.0.0.1:${port}`,
 			headers: {
 				'echo-header': 'echo-value'
-			}
+			},
+			callSite: 'request.test.GET'
 		}, CancellationToken.None);
 		assert.strictEqual(context.res.statusCode, 200);
 		assert.strictEqual(context.res.headers['content-type'], 'application/json');
@@ -74,6 +75,7 @@ suite('Request', () => {
 			type: 'POST',
 			url: `http://127.0.0.1:${port}/postpath`,
 			data: 'Some data',
+			callSite: 'request.test.POST'
 		}, CancellationToken.None);
 		assert.strictEqual(context.res.statusCode, 200);
 		assert.strictEqual(context.res.headers['content-type'], 'application/json');
@@ -91,6 +93,7 @@ suite('Request', () => {
 					type: 'GET',
 					url: `http://127.0.0.1:${port}/noreply`,
 					timeout: 123,
+					callSite: 'request.test.timeout'
 				}, CancellationToken.None);
 				assert.fail('Should fail with timeout');
 			} catch (err) {
@@ -106,6 +109,7 @@ suite('Request', () => {
 				const res = request({
 					type: 'GET',
 					url: `http://127.0.0.1:${port}/noreply`,
+					callSite: 'request.test.cancel'
 				}, source.token);
 				await new Promise(resolve => setTimeout(resolve, 100));
 				source.cancel();
diff --git a/src/vs/base/test/browser/ui/toolbar/toolbar.test.ts b/src/vs/base/test/browser/ui/toolbar/toolbar.test.ts
new file mode 100644
index 00000000000..43fcc7a1795
--- /dev/null
+++ b/src/vs/base/test/browser/ui/toolbar/toolbar.test.ts
@@ -0,0 +1,203 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { IContextMenuProvider } from '../../../../browser/contextmenu.js';
+import { ActionBar } from '../../../../browser/ui/actionbar/actionbar.js';
+import { BaseActionViewItem } from '../../../../browser/ui/actionbar/actionViewItems.js';
+import { ToggleMenuAction, ToolBar } from '../../../../browser/ui/toolbar/toolbar.js';
+import { Action, IAction } from '../../../../common/actions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+
+class FixedWidthActionViewItem extends BaseActionViewItem {
+
+	constructor(action: IAction, private readonly width: number) {
+		super(undefined, action);
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		container.style.width = `${this.width}px`;
+		container.style.boxSizing = 'border-box';
+		container.style.overflow = 'hidden';
+		container.style.whiteSpace = 'nowrap';
+		container.textContent = this.action.label;
+	}
+}
+
+class TestToolBar extends ToolBar {
+	get actionBarForTest(): Pick<ActionBar, 'getWidth' | 'getAction'> {
+		return this.actionBar;
+	}
+}
+
+const contextMenuProvider: IContextMenuProvider = {
+	showContextMenu: () => { }
+};
+
+suite('ToolBar', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let container: HTMLElement;
+
+	setup(() => {
+		container = document.createElement('div');
+		container.style.width = '273px';
+		document.body.appendChild(container);
+	});
+
+	teardown(() => {
+		container.remove();
+	});
+
+	test('keeps the last primary action shrinkable when overflow is inserted', () => {
+		const widths = new Map<string, number>([
+			['workbench.action.chat.attachContext', 22],
+			['workbench.action.chat.openModePicker', 75],
+			['workbench.action.chat.openModelPicker', 271],
+			['workbench.action.chat.configureTools', 22],
+			[ToggleMenuAction.ID, 22],
+		]);
+
+		const toolbar = store.add(new TestToolBar(container, contextMenuProvider, {
+			responsiveBehavior: {
+				enabled: true,
+				kind: 'last',
+				minItems: 1,
+				actionMinWidth: 22,
+			},
+			actionViewItemProvider: action => {
+				const width = widths.get(action.id);
+				return typeof width === 'number' ? new FixedWidthActionViewItem(action, width) : undefined;
+			}
+		}));
+		const actionBar = toolbar.actionBarForTest;
+		const originalGetWidth = actionBar.getWidth.bind(actionBar);
+		actionBar.getWidth = (index: number) => {
+			const action = actionBar.getAction(index);
+			return action ? (widths.get(action.id) ?? originalGetWidth(index)) : originalGetWidth(index);
+		};
+
+		const originalGetBoundingClientRect = toolbar.getElement().getBoundingClientRect.bind(toolbar.getElement());
+		(toolbar.getElement() as HTMLElement & { getBoundingClientRect(): DOMRect }).getBoundingClientRect = () => ({
+			...originalGetBoundingClientRect(),
+			width: 273,
+			right: 273,
+			left: 0,
+			x: 0,
+			y: 0,
+			top: 0,
+			bottom: 0,
+			height: 0,
+			toJSON() {
+				return {};
+			}
+		});
+
+		const actions = [
+			store.add(new Action('workbench.action.chat.attachContext', 'Add Context...')),
+			store.add(new Action('workbench.action.chat.openModePicker', 'Open Agent Picker')),
+			store.add(new Action('workbench.action.chat.openModelPicker', 'Open Model Picker')),
+			store.add(new Action('workbench.action.chat.configureTools', 'Configure Tools...')),
+		];
+
+		toolbar.setActions(actions);
+
+		assert.strictEqual(toolbar.getItemsLength(), 4);
+		assert.strictEqual(toolbar.getItemAction(0)?.id, 'workbench.action.chat.attachContext');
+		assert.strictEqual(toolbar.getItemAction(1)?.id, 'workbench.action.chat.openModePicker');
+		assert.strictEqual(toolbar.getItemAction(2)?.id, 'workbench.action.chat.openModelPicker');
+		assert.strictEqual(toolbar.getItemAction(3)?.id, ToggleMenuAction.ID);
+		assert.strictEqual(toolbar.getElement().querySelector('.monaco-action-bar')?.classList.contains('has-overflow'), true);
+	});
+
+	test('applies per-action responsive min widths', () => {
+		const toolbar = store.add(new ToolBar(container, contextMenuProvider, {
+			responsiveBehavior: {
+				enabled: true,
+				kind: 'last',
+				minItems: 1,
+				actionMinWidth: 22,
+				getActionMinWidth: action => action.id === 'workbench.action.chat.openModelPicker' ? 28 : undefined,
+			},
+			actionViewItemProvider: action => new FixedWidthActionViewItem(action, 22)
+		}));
+
+		const actions = [
+			store.add(new Action('workbench.action.chat.attachContext', 'Add Context...')),
+			store.add(new Action('workbench.action.chat.openModePicker', 'Open Agent Picker')),
+			store.add(new Action('workbench.action.chat.openModelPicker', 'Open Model Picker')),
+		];
+
+		toolbar.setActions(actions);
+
+		assert.strictEqual(toolbar.getElement().style.getPropertyValue('--vscode-toolbar-action-min-width'), '28px');
+	});
+
+	test('relayout re-evaluates responsive overflow after action width changes', () => {
+		const widths = new Map<string, number>([
+			['workbench.action.chat.attachContext', 22],
+			['workbench.action.chat.openModePicker', 22],
+			['workbench.action.chat.openModelPicker', 50],
+			[ToggleMenuAction.ID, 22],
+		]);
+
+		const toolbar = store.add(new TestToolBar(container, contextMenuProvider, {
+			responsiveBehavior: {
+				enabled: true,
+				kind: 'last',
+				minItems: 1,
+				actionMinWidth: 22,
+			},
+			actionViewItemProvider: action => {
+				const width = widths.get(action.id);
+				return typeof width === 'number' ? new FixedWidthActionViewItem(action, width) : undefined;
+			}
+		}));
+		const actionBar = toolbar.actionBarForTest;
+		const originalGetWidth = actionBar.getWidth.bind(actionBar);
+		actionBar.getWidth = (index: number) => {
+			const action = actionBar.getAction(index);
+			return action ? (widths.get(action.id) ?? originalGetWidth(index)) : originalGetWidth(index);
+		};
+
+		const originalGetBoundingClientRect = toolbar.getElement().getBoundingClientRect.bind(toolbar.getElement());
+		(toolbar.getElement() as HTMLElement & { getBoundingClientRect(): DOMRect }).getBoundingClientRect = () => ({
+			...originalGetBoundingClientRect(),
+			width: 110,
+			right: 110,
+			left: 0,
+			x: 0,
+			y: 0,
+			top: 0,
+			bottom: 0,
+			height: 0,
+			toJSON() {
+				return {};
+			}
+		});
+
+		const actions = [
+			store.add(new Action('workbench.action.chat.attachContext', 'Add Context...')),
+			store.add(new Action('workbench.action.chat.openModePicker', 'Open Mode Picker')),
+			store.add(new Action('workbench.action.chat.openModelPicker', 'Open Model Picker')),
+		];
+
+		toolbar.setActions(actions);
+
+		assert.strictEqual(toolbar.getItemsLength(), 3);
+		assert.strictEqual(toolbar.getItemAction(2)?.id, 'workbench.action.chat.openModelPicker');
+		assert.strictEqual(toolbar.getElement().querySelector('.monaco-action-bar')?.classList.contains('has-overflow'), false);
+
+		widths.set('workbench.action.chat.openModePicker', 80);
+		toolbar.relayout();
+
+		assert.strictEqual(toolbar.getItemsLength(), 3);
+		assert.strictEqual(toolbar.getItemAction(0)?.id, 'workbench.action.chat.attachContext');
+		assert.strictEqual(toolbar.getItemAction(1)?.id, 'workbench.action.chat.openModePicker');
+		assert.strictEqual(toolbar.getItemAction(2)?.id, ToggleMenuAction.ID);
+		assert.strictEqual(toolbar.getElement().querySelector('.monaco-action-bar')?.classList.contains('has-overflow'), true);
+	});
+});
diff --git a/src/vs/base/test/browser/ui/tree/objectTree.test.ts b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
index aa11fbe6036..8902791afce 100644
--- a/src/vs/base/test/browser/ui/tree/objectTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
@@ -8,6 +8,7 @@ import { IIdentityProvider, IListVirtualDelegate } from '../../../../browser/ui/
 import { ICompressedTreeNode } from '../../../../browser/ui/tree/compressedObjectTreeModel.js';
 import { CompressibleObjectTree, ICompressibleTreeRenderer, ObjectTree } from '../../../../browser/ui/tree/objectTree.js';
 import { ITreeNode, ITreeRenderer } from '../../../../browser/ui/tree/tree.js';
+import { runWithFakedTimers } from '../../../common/timeTravelScheduler.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
 
 function getRowsTextContent(container: HTMLElement): string[] {
@@ -16,6 +17,17 @@ function getRowsTextContent(container: HTMLElement): string[] {
 	return rows.map(row => row.querySelector('.monaco-tl-contents')!.textContent!);
 }
 
+function clickElement(element: HTMLElement, ctrlKey = false): void {
+	element.dispatchEvent(new MouseEvent('mousedown', { bubbles: true, ctrlKey, button: 0 }));
+	element.dispatchEvent(new MouseEvent('click', { bubbles: true, ctrlKey, button: 0 }));
+}
+
+function dispatchKeydown(element: HTMLElement, key: string, code: string, keyCode: number): void {
+	const keyboardEvent = new KeyboardEvent('keydown', { bubbles: true, key, code });
+	Object.defineProperty(keyboardEvent, 'keyCode', { get: () => keyCode });
+	element.dispatchEvent(keyboardEvent);
+}
+
 suite('ObjectTree', function () {
 
 	suite('TreeNavigator', function () {
@@ -231,6 +243,84 @@ suite('ObjectTree', function () {
 		tree.setChildren(null, [{ element: 100 }, { element: 101 }, { element: 102 }, { element: 103 }]);
 		assert.deepStrictEqual(tree.getFocus(), [101]);
 	});
+
+	test('updateOptions preserves wrapped identity provider in view options', function () {
+		const container = document.createElement('div');
+		container.style.width = '200px';
+		container.style.height = '200px';
+
+		const delegate = new Delegate();
+		const renderer = new Renderer();
+		const identityProvider = {
+			getId(element: number): { toString(): string } {
+				return `${element}`;
+			},
+			getGroupId(element: number): number {
+				return element % 2;
+			}
+		};
+
+		const tree = new ObjectTree<number>('test', container, delegate, [renderer], { identityProvider });
+
+		try {
+			tree.layout(200);
+			tree.setChildren(null, [{ element: 0 }, { element: 1 }, { element: 2 }, { element: 3 }]);
+
+			const firstRow = container.querySelector('.monaco-list-row[data-index="0"]') as HTMLElement;
+			const secondRow = container.querySelector('.monaco-list-row[data-index="1"]') as HTMLElement;
+			clickElement(firstRow);
+			assert.deepStrictEqual(tree.getSelection(), [0]);
+
+			tree.updateOptions({ indent: 12 });
+
+			clickElement(secondRow, true);
+
+			assert.deepStrictEqual(tree.getSelection(), [1]);
+		} finally {
+			tree.dispose();
+		}
+	});
+
+	test('updateOptions preserves wrapped accessibility provider for type navigation re-announce', async function () {
+		const container = document.createElement('div');
+		container.style.width = '200px';
+		container.style.height = '200px';
+
+		const delegate = new Delegate();
+		const renderer = new Renderer();
+		const accessibilityProvider = {
+			getAriaLabel(element: number): string {
+				assert.strictEqual(typeof element, 'number');
+				return `aria ${element}`;
+			},
+			getWidgetAriaLabel(): string {
+				return 'tree';
+			}
+		};
+
+		const tree = new ObjectTree<number>('test', container, delegate, [renderer], {
+			accessibilityProvider,
+			keyboardNavigationLabelProvider: {
+				getKeyboardNavigationLabel: () => 'a'
+			}
+		});
+
+		try {
+			await runWithFakedTimers({ useFakeTimers: true }, async () => {
+				tree.layout(200);
+				tree.setChildren(null, [{ element: 0 }]);
+				tree.setFocus([0]);
+				tree.domFocus();
+
+				tree.updateOptions({ indent: 12 });
+
+				dispatchKeydown(tree.getHTMLElement(), 'a', 'KeyA', 65);
+				await Promise.resolve();
+			});
+		} finally {
+			tree.dispose();
+		}
+	});
 });
 
 suite('CompressibleObjectTree', function () {
diff --git a/src/vs/base/test/common/fuzzyScorer.test.ts b/src/vs/base/test/common/fuzzyScorer.test.ts
index f120298e22b..d7aade68c1d 100644
--- a/src/vs/base/test/common/fuzzyScorer.test.ts
+++ b/src/vs/base/test/common/fuzzyScorer.test.ts
@@ -1239,7 +1239,7 @@ suite('Fuzzy Scorer', () => {
 		let [multiScore, multiMatches] = _doScore2(target, 'HelLo World');
 
 		function assertScore() {
-			assert.ok(multiScore ?? 0 >= ((firstSingleScore ?? 0) + (secondSingleScore ?? 0)));
+			assert.ok((multiScore ?? 0) >= ((firstSingleScore ?? 0) + (secondSingleScore ?? 0)));
 			for (let i = 0; multiMatches && i < multiMatches.length; i++) {
 				const multiMatch = multiMatches[i];
 				const firstAndSecondSingleMatch = firstAndSecondSingleMatches[i];
diff --git a/src/vs/base/test/common/sinonUtils.ts b/src/vs/base/test/common/sinonUtils.ts
new file mode 100644
index 00000000000..ef256b115a0
--- /dev/null
+++ b/src/vs/base/test/common/sinonUtils.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as sinon from 'sinon';
+
+export function asSinonMethodStub<T extends (...args: never[]) => unknown>(method: T): sinon.SinonStubbedMember<T> {
+	return method as unknown as sinon.SinonStubbedMember<T>;
+}
diff --git a/src/vs/base/test/node/crypto.test.ts b/src/vs/base/test/node/crypto.test.ts
index ed66c2c4b0d..37204dc6317 100644
--- a/src/vs/base/test/node/crypto.test.ts
+++ b/src/vs/base/test/node/crypto.test.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as assert from 'assert';
 import * as fs from 'fs';
 import { tmpdir } from 'os';
 import { join } from '../../common/path.js';
@@ -33,4 +34,14 @@ flakySuite('Crypto', () => {
 
 		await checksum(testFile, 'a591a6d40bf420404a011733cfb7b190d62c65bf0bcda32b57b277d9ad9f146e');
 	});
+
+	test('checksum mismatch rejects', async () => {
+		const testFile = join(testDir, 'checksum-mismatch.txt');
+		await Promises.writeFile(testFile, 'Hello World');
+
+		await assert.rejects(
+			() => checksum(testFile, 'wrong-hash'),
+			/Hash mismatch/
+		);
+	});
 });
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 33ec9f60f2d..b10eb6aeedc 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -13,7 +13,7 @@ import { toErrorMessage } from '../../base/common/errorMessage.js';
 import { Event } from '../../base/common/event.js';
 import { parse } from '../../base/common/jsonc.js';
 import { getPathLabel } from '../../base/common/labels.js';
-import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../base/common/lifecycle.js';
 import { Schemas, VSCODE_AUTHORITY } from '../../base/common/network.js';
 import { join, posix } from '../../base/common/path.js';
 import { INodeProcess, IProcessEnvironment, isLinux, isLinuxSnap, isMacintosh, isWindows, OS } from '../../base/common/platform.js';
@@ -121,6 +121,9 @@ import { ipcUtilityProcessWorkerChannelName } from '../../platform/utilityProces
 import { ILocalPtyService, LocalReconnectConstants, TerminalIpcChannels, TerminalSettingId } from '../../platform/terminal/common/terminal.js';
 import { ElectronPtyHostStarter } from '../../platform/terminal/electron-main/electronPtyHostStarter.js';
 import { PtyHostService } from '../../platform/terminal/node/ptyHostService.js';
+import { ElectronAgentHostStarter } from '../../platform/agentHost/electron-main/electronAgentHostStarter.js';
+import { AgentHostProcessManager } from '../../platform/agentHost/node/agentHostService.js';
+import { AgentHostEnabledSettingId } from '../../platform/agentHost/common/agentService.js';
 import { NODE_REMOTE_RESOURCE_CHANNEL_NAME, NODE_REMOTE_RESOURCE_IPC_METHOD_NAME, NodeRemoteResourceResponse, NodeRemoteResourceRouter } from '../../platform/remote/common/electronRemoteResources.js';
 import { Lazy } from '../../base/common/lazy.js';
 import { IAuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/electron-main/auxiliaryWindows.js';
@@ -740,6 +743,7 @@ export class CodeApplication extends Disposable {
 
 		const openables: IWindowOpenable[] = [];
 		const urls: IProtocolUrl[] = [];
+
 		for (const protocolUrl of protocolUrls) {
 			if (!protocolUrl) {
 				continue; // invalid
@@ -747,6 +751,12 @@ export class CodeApplication extends Disposable {
 
 			const windowOpenable = this.getWindowOpenableFromProtocolUrl(protocolUrl.uri);
 			if (windowOpenable) {
+				// Sessions app: skip all window openables (file/folder/workspace)
+				if ((process as INodeProcess).isEmbeddedApp) {
+					this.logService.trace('app#resolveInitialProtocolUrls() sessions app skipping window openable:', protocolUrl.uri.toString(true));
+					continue;
+				}
+
 				if (await this.shouldBlockOpenable(windowOpenable, windowsMainService, dialogMainService)) {
 					this.logService.trace('app#resolveInitialProtocolUrls() protocol url was blocked:', protocolUrl.uri.toString(true));
 
@@ -892,10 +902,31 @@ export class CodeApplication extends Disposable {
 	private async handleProtocolUrl(windowsMainService: IWindowsMainService, dialogMainService: IDialogMainService, urlService: IURLService, uri: URI, options?: IOpenURLOptions): Promise<boolean> {
 		this.logService.trace('app#handleProtocolUrl():', uri.toString(true), options);
 
+		// Sessions app: ensure the sessions window is open, then let other handlers process the URL.
+		if ((process as INodeProcess).isEmbeddedApp) {
+			this.logService.trace('app#handleProtocolUrl() sessions app handling protocol URL:', uri.toString(true));
+
+			// Skip window openables (file/folder/workspace) for security
+			const windowOpenable = this.getWindowOpenableFromProtocolUrl(uri);
+			if (windowOpenable) {
+				this.logService.trace('app#handleProtocolUrl() sessions app skipping window openable:', uri.toString(true));
+				return true;
+			}
+
+			// Ensure sessions window is open to receive the URL
+			const windows = await windowsMainService.openSessionsWindow({ context: OpenContext.LINK, contextWindowId: undefined });
+			const window = windows.at(0);
+			window?.focus();
+			await window?.ready();
+
+			// Return false to let subsequent handlers (e.g., URLHandlerChannelClient) forward the URL
+			return false;
+		}
+
 		// Support 'workspace' URLs (https://github.com/microsoft/vscode/issues/124263)
 		if (uri.scheme === this.productService.urlProtocol && uri.path === 'workspace') {
 			uri = uri.with({
-				authority: 'file',
+				authority: Schemas.file,
 				path: URI.parse(uri.query).path,
 				query: ''
 			});
@@ -1105,6 +1136,12 @@ export class CodeApplication extends Disposable {
 		);
 		services.set(ILocalPtyService, ptyHostService);
 
+		// Agent Host
+		if (this.configurationService.getValue(AgentHostEnabledSettingId)) {
+			const agentHostStarter = new ElectronAgentHostStarter(this.environmentMainService, this.lifecycleMainService, this.logService);
+			this._register(new AgentHostProcessManager(agentHostStarter, this.logService, this.loggerService));
+		}
+
 		// External terminal
 		if (isWindows) {
 			services.set(IExternalTerminalMainService, new SyncDescriptor(WindowsExternalTerminalService));
@@ -1132,7 +1169,7 @@ export class CodeApplication extends Disposable {
 			const isInternal = isInternalTelemetry(this.productService, this.configurationService);
 			const channel = getDelayedChannel(sharedProcessReady.then(client => client.getChannel('telemetryAppender')));
 			const appender = new TelemetryAppenderClient(channel);
-			const commonProperties = resolveCommonProperties(release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, sqmId, devDeviceId, isInternal, this.productService.date);
+			const commonProperties = resolveCommonProperties(release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, sqmId, devDeviceId, isInternal, this.productService.date, this.productService.telemetryAppName);
 			const piiPaths = getPiiPathsFromEnvironment(this.environmentMainService);
 			const config: ITelemetryServiceConfig = { appenders: [appender], commonProperties, piiPaths, sendErrorTelemetry: true };
 
@@ -1510,42 +1547,102 @@ export class CodeApplication extends Disposable {
 				const initialGpuFeatureStatus = app.getGPUFeatureStatus() as GPUFeatureStatusWithSkiaGraphite;
 				const skiaGraphiteEnabled: string = initialGpuFeatureStatus['skia_graphite'];
 				if (skiaGraphiteEnabled === 'enabled') {
+					const gpuInfoUpdate = Event.fromNodeEventEmitter(app, 'gpu-info-update');
+					const pendingGpuInfoListener = this._register(new MutableDisposable());
 					this._register(Event.fromNodeEventEmitter<{ details: Details }>(app, 'child-process-gone', (event, details) => ({ event, details }))(({ details }) => {
 						if (details.type === 'GPU' && details.reason === 'crashed') {
-							const currentGpuFeatureStatus = app.getGPUFeatureStatus();
-							const currentRasterizationStatus: string = currentGpuFeatureStatus['rasterization'];
-							if (currentRasterizationStatus !== 'enabled') {
-								// Get last 10 GPU log messages (only the message field)
-								let gpuLogMessages: string[] = [];
-								type AppWithGPULogMethod = typeof app & {
-									getGPULogMessages(): IGPULogMessage[];
-								};
-								const customApp = app as AppWithGPULogMethod;
-								if (typeof customApp.getGPULogMessages === 'function') {
-									gpuLogMessages = customApp.getGPULogMessages().slice(-10).map(log => log.message);
+							// Wait for gpu-info-update which fires after the GPU process
+							// restarts and the feature status is refreshed. At the time
+							// child-process-gone fires, getGPUFeatureStatus() still
+							// returns the pre-crash status.
+							pendingGpuInfoListener.value = Event.once(gpuInfoUpdate)(() => {
+								const currentGpuFeatureStatus = app.getGPUFeatureStatus();
+								const currentRasterizationStatus: string = currentGpuFeatureStatus['rasterization'];
+								if (currentRasterizationStatus !== 'enabled') {
+									// Get last 10 GPU log messages (only the message field)
+									let gpuLogMessages: string[] = [];
+									type AppWithGPULogMethod = typeof app & {
+										getGPULogMessages(): IGPULogMessage[];
+									};
+									const customApp = app as AppWithGPULogMethod;
+									if (typeof customApp.getGPULogMessages === 'function') {
+										gpuLogMessages = customApp.getGPULogMessages().slice(-10).map(log => log.message);
+									}
+
+									type GpuCrashEvent = {
+										readonly gpuFeatureStatus: string;
+										readonly gpuLogMessages: string;
+									};
+									type GpuCrashClassification = {
+										gpuFeatureStatus: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Current GPU feature status.' };
+										gpuLogMessages: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Last 10 GPU log messages collected after the crash and GPU process restart.' };
+										owner: 'deepak1556';
+										comment: 'Tracks GPU process crashes that would result in fallback mode.';
+									};
+
+									telemetryService.publicLog2<GpuCrashEvent, GpuCrashClassification>('gpu.crash.fallback', {
+										gpuFeatureStatus: JSON.stringify(currentGpuFeatureStatus),
+										gpuLogMessages: JSON.stringify(gpuLogMessages)
+									});
 								}
-
-								type GpuCrashEvent = {
-									readonly gpuFeatureStatus: string;
-									readonly gpuLogMessages: string;
-								};
-								type GpuCrashClassification = {
-									gpuFeatureStatus: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Current GPU feature status.' };
-									gpuLogMessages: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Last 10 GPU log messages before crash.' };
-									owner: 'deepak1556';
-									comment: 'Tracks GPU process crashes that would result in fallback mode.';
-								};
-
-								telemetryService.publicLog2<GpuCrashEvent, GpuCrashClassification>('gpu.crash.fallback', {
-									gpuFeatureStatus: JSON.stringify(currentGpuFeatureStatus),
-									gpuLogMessages: JSON.stringify(gpuLogMessages)
-								});
-							}
+							});
 						}
 					}));
 				}
 			});
 		}
+
+		{
+			interface NetworkProcessLaunchedDetails {
+				readonly pid: number;
+			}
+			interface NetworkProcessGoneDetails {
+				readonly pid: number;
+				readonly exitCode: number;
+				readonly crashed: boolean;
+				readonly crashedPreIPC: boolean;
+			}
+
+			type AppWithNetworkProcessEvents = typeof app & {
+				on(event: 'network-process-launched', listener: (event: Electron.Event, details: NetworkProcessLaunchedDetails) => void): typeof app;
+				on(event: 'network-process-gone', listener: (event: Electron.Event, details: NetworkProcessGoneDetails) => void): typeof app;
+			};
+
+			const customApp = app as AppWithNetworkProcessEvents;
+
+			instantiationService.invokeFunction(accessor => {
+				const telemetryService = accessor.get(ITelemetryService);
+
+				type NetworkProcessLaunchedClassification = {
+					owner: 'deepak1556';
+					comment: 'Tracks network process launch events.';
+				};
+
+				type NetworkProcessGoneClassification = {
+					exitCode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'The exit code of the network process.' };
+					crashed: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the network process crashed.' };
+					crashedPreIPC: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the network process crashed before IPC was established.' };
+					owner: 'deepak1556';
+					comment: 'Tracks network process gone events for reliability insights.';
+				};
+
+				this._register(Event.fromNodeEventEmitter<NetworkProcessLaunchedDetails>(customApp, 'network-process-launched', (_event, details) => details)(details => {
+					this.logService.info(`[network process] launched with pid ${details.pid}`);
+
+					telemetryService.publicLog2<{}, NetworkProcessLaunchedClassification>('networkProcess.launched', {});
+				}));
+
+				this._register(Event.fromNodeEventEmitter<NetworkProcessGoneDetails>(customApp, 'network-process-gone', (_event, details) => details)(details => {
+					this.logService.info(`[network process] gone - pid: ${details.pid}, exitCode: ${details.exitCode}, crashed: ${details.crashed}, crashedPreIPC: ${details.crashedPreIPC}`);
+
+					telemetryService.publicLog2<{ exitCode: number; crashed: boolean; crashedPreIPC: boolean }, NetworkProcessGoneClassification>('networkProcess.gone', {
+						exitCode: details.exitCode,
+						crashed: details.crashed,
+						crashedPreIPC: details.crashedPreIPC
+					});
+				}));
+			});
+		}
 	}
 
 	private async installMutex(): Promise<void> {
diff --git a/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
index 7f5cd7c26e9..23253ba21ea 100644
--- a/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
@@ -325,7 +325,7 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 
 			telemetryService = new TelemetryService({
 				appenders,
-				commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, this.configuration.machineId, this.configuration.sqmId, this.configuration.devDeviceId, internalTelemetry, productService.date),
+				commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, this.configuration.machineId, this.configuration.sqmId, this.configuration.devDeviceId, internalTelemetry, productService.date, productService.telemetryAppName),
 				sendErrorTelemetry: true,
 				piiPaths: getPiiPathsFromEnvironment(environmentService),
 				meteredConnectionService,
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 41d94cc492f..d0eaeb1cf16 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -257,7 +257,7 @@ class CliMain extends Disposable {
 			const config: ITelemetryServiceConfig = {
 				appenders,
 				sendErrorTelemetry: false,
-				commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, machineId, sqmId, devDeviceId, isInternal, productService.date),
+				commonProperties: resolveCommonProperties(release(), hostname(), process.arch, productService.commit, productService.version, machineId, sqmId, devDeviceId, isInternal, productService.date, productService.telemetryAppName),
 				piiPaths: getPiiPathsFromEnvironment(environmentService)
 			};
 
diff --git a/src/vs/editor/browser/view/domLineBreaksComputer.ts b/src/vs/editor/browser/view/domLineBreaksComputer.ts
index 881275f34af..1c88653206f 100644
--- a/src/vs/editor/browser/view/domLineBreaksComputer.ts
+++ b/src/vs/editor/browser/view/domLineBreaksComputer.ts
@@ -9,11 +9,11 @@ import * as strings from '../../../base/common/strings.js';
 import { assertReturnsDefined } from '../../../base/common/types.js';
 import { applyFontInfo } from '../config/domFontInfo.js';
 import { WrappingIndent } from '../../common/config/editorOptions.js';
-import { FontInfo } from '../../common/config/fontInfo.js';
 import { StringBuilder } from '../../common/core/stringBuilder.js';
 import { InjectedTextOptions } from '../../common/model.js';
-import { ILineBreaksComputer, ILineBreaksComputerFactory, ModelLineProjectionData } from '../../common/modelLineProjectionData.js';
+import { ILineBreaksComputer, ILineBreaksComputerContext, ILineBreaksComputerFactory, ModelLineProjectionData } from '../../common/modelLineProjectionData.js';
 import { LineInjectedText } from '../../common/textModelEvents.js';
+import { FontInfo } from '../../common/config/fontInfo.js';
 
 const ttPolicy = createTrustedTypesPolicy('domLineBreaksComputer', { createHTML: value => value });
 
@@ -26,26 +26,25 @@ export class DOMLineBreaksComputerFactory implements ILineBreaksComputerFactory
 	constructor(private targetWindow: WeakRef<Window>) {
 	}
 
-	public createLineBreaksComputer(fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer {
-		const requests: string[] = [];
-		const injectedTexts: (LineInjectedText[] | null)[] = [];
+	public createLineBreaksComputer(context: ILineBreaksComputerContext, fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer {
+		const lineNumbers: number[] = [];
 		return {
-			addRequest: (lineText: string, injectedText: LineInjectedText[] | null, previousLineBreakData: ModelLineProjectionData | null) => {
-				requests.push(lineText);
-				injectedTexts.push(injectedText);
+			addRequest: (lineNumber: number, previousLineBreakData: ModelLineProjectionData | null) => {
+				lineNumbers.push(lineNumber);
 			},
 			finalize: () => {
-				return createLineBreaks(assertReturnsDefined(this.targetWindow.deref()), requests, fontInfo, tabSize, wrappingColumn, wrappingIndent, wordBreak, injectedTexts);
+				return createLineBreaks(assertReturnsDefined(this.targetWindow.deref()), context, lineNumbers, fontInfo, tabSize, wrappingColumn, wrappingIndent, wordBreak);
 			}
 		};
 	}
 }
 
-function createLineBreaks(targetWindow: Window, requests: string[], fontInfo: FontInfo, tabSize: number, firstLineBreakColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', injectedTextsPerLine: (LineInjectedText[] | null)[]): (ModelLineProjectionData | null)[] {
-	function createEmptyLineBreakWithPossiblyInjectedText(requestIdx: number): ModelLineProjectionData | null {
-		const injectedTexts = injectedTextsPerLine[requestIdx];
+function createLineBreaks(targetWindow: Window, context: ILineBreaksComputerContext, lineNumbers: number[], fontInfo: FontInfo, tabSize: number, firstLineBreakColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll'): (ModelLineProjectionData | null)[] {
+	function createEmptyLineBreakWithPossiblyInjectedText(lineNumber: number): ModelLineProjectionData | null {
+		const injectedTexts = context.getLineInjectedText(lineNumber);
 		if (injectedTexts) {
-			const lineText = LineInjectedText.applyInjectedText(requests[requestIdx], injectedTexts);
+			const lineContent = context.getLineContent(lineNumber);
+			const lineText = LineInjectedText.applyInjectedText(lineContent, injectedTexts);
 
 			const injectionOptions = injectedTexts.map(t => t.options);
 			const injectionOffsets = injectedTexts.map(text => text.column - 1);
@@ -60,8 +59,8 @@ function createLineBreaks(targetWindow: Window, requests: string[], fontInfo: Fo
 
 	if (firstLineBreakColumn === -1) {
 		const result: (ModelLineProjectionData | null)[] = [];
-		for (let i = 0, len = requests.length; i < len; i++) {
-			result[i] = createEmptyLineBreakWithPossiblyInjectedText(i);
+		for (let i = 0, len = lineNumbers.length; i < len; i++) {
+			result[i] = createEmptyLineBreakWithPossiblyInjectedText(lineNumbers[i]);
 		}
 		return result;
 	}
@@ -80,8 +79,9 @@ function createLineBreaks(targetWindow: Window, requests: string[], fontInfo: Fo
 	const renderLineContents: string[] = [];
 	const allCharOffsets: number[][] = [];
 	const allVisibleColumns: number[][] = [];
-	for (let i = 0; i < requests.length; i++) {
-		const lineContent = LineInjectedText.applyInjectedText(requests[i], injectedTextsPerLine[i]);
+	for (let i = 0; i < lineNumbers.length; i++) {
+		const lineNumber = lineNumbers[i];
+		const lineContent = LineInjectedText.applyInjectedText(context.getLineContent(lineNumber), context.getLineInjectedText(lineNumber));
 
 		let firstNonWhitespaceIndex = 0;
 		let wrappedTextIndentLength = 0;
@@ -146,11 +146,12 @@ function createLineBreaks(targetWindow: Window, requests: string[], fontInfo: Fo
 	const lineDomNodes = Array.prototype.slice.call(containerDomNode.children, 0);
 
 	const result: (ModelLineProjectionData | null)[] = [];
-	for (let i = 0; i < requests.length; i++) {
+	for (let i = 0; i < lineNumbers.length; i++) {
+		const lineNumber = lineNumbers[i];
 		const lineDomNode = lineDomNodes[i];
 		const breakOffsets: number[] | null = readLineBreaks(range, lineDomNode, renderLineContents[i], allCharOffsets[i]);
 		if (breakOffsets === null) {
-			result[i] = createEmptyLineBreakWithPossiblyInjectedText(i);
+			result[i] = createEmptyLineBreakWithPossiblyInjectedText(lineNumber);
 			continue;
 		}
 
@@ -172,7 +173,7 @@ function createLineBreaks(targetWindow: Window, requests: string[], fontInfo: Fo
 
 		let injectionOptions: InjectedTextOptions[] | null;
 		let injectionOffsets: number[] | null;
-		const curInjectedTexts = injectedTextsPerLine[i];
+		const curInjectedTexts = context.getLineInjectedText(lineNumber);
 		if (curInjectedTexts) {
 			injectionOptions = curInjectedTexts.map(t => t.options);
 			injectionOffsets = curInjectedTexts.map(text => text.column - 1);
@@ -306,7 +307,7 @@ function readLineBreaks(range: Range, lineDomNode: HTMLDivElement, lineContent:
 	try {
 		discoverBreaks(range, spans, charOffsets, 0, null, lineContent.length - 1, null, breakOffsets);
 	} catch (err) {
-		console.log(err);
+		console.error(err);
 		return null;
 	}
 
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
index 62bf7ece01a..56d3850c945 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
@@ -31,6 +31,7 @@ import { IContextMenuService } from '../../../../../../platform/contextview/brow
 import { DiffEditorOptions } from '../../diffEditorOptions.js';
 import { Range } from '../../../../../common/core/range.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel/inlineDecorations.js';
+import { ILineBreaksComputerContext } from '../../../../../common/modelLineProjectionData.js';
 
 /**
  * Ensures both editors have the same height by aligning unchanged lines.
@@ -163,8 +164,15 @@ export class DiffEditorViewZones extends Disposable {
 			}
 
 			const renderSideBySide = this._options.renderSideBySide.read(reader);
-
-			const deletedCodeLineBreaksComputer = !renderSideBySide ? this._editors.modified._getViewModel()?.createLineBreaksComputer() : undefined;
+			const context: ILineBreaksComputerContext = {
+				getLineContent: (lineNumber: number): string => {
+					return this._editors.original.getModel()!.getLineContent(lineNumber);
+				},
+				getLineInjectedText: (lineNumber: number) => {
+					return null;
+				}
+			};
+			const deletedCodeLineBreaksComputer = !renderSideBySide ? this._editors.modified._getViewModel()?.createLineBreaksComputer(context) : undefined;
 			if (deletedCodeLineBreaksComputer) {
 				const originalModel = this._editors.original.getModel()!;
 				for (const a of alignmentsVal) {
@@ -176,7 +184,7 @@ export class DiffEditorViewZones extends Disposable {
 							if (i > originalModel.getLineCount()) {
 								return { orig: origViewZones, mod: modViewZones };
 							}
-							deletedCodeLineBreaksComputer?.addRequest(originalModel.getLineContent(i), null, null);
+							deletedCodeLineBreaksComputer?.addRequest(i, null);
 						}
 					}
 				}
diff --git a/src/vs/editor/common/core/ranges/offsetRange.ts b/src/vs/editor/common/core/ranges/offsetRange.ts
index e279b382078..72d116282e2 100644
--- a/src/vs/editor/common/core/ranges/offsetRange.ts
+++ b/src/vs/editor/common/core/ranges/offsetRange.ts
@@ -257,7 +257,7 @@ export class OffsetRangeSet {
 	}
 
 	/**
-	 * Returns of there is a value that is contained in this instance and the given range.
+	 * Returns if there is a value that is contained in this instance and the given range.
 	 */
 	public intersectsStrict(other: OffsetRange): boolean {
 		// TODO use binary search
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 5195e0b6353..2fc027b34a2 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -19,7 +19,7 @@ import { IWordAtPosition } from './core/wordHelper.js';
 import { FormattingOptions } from './languages.js';
 import { ILanguageSelection } from './languages/language.js';
 import { IBracketPairsTextModelPart } from './textModelBracketPairs.js';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, ModelFontChangedEvent, ModelLineHeightChangedEvent } from './textModelEvents.js';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, LineInjectedText, ModelFontChangedEvent, ModelLineHeightChangedEvent } from './textModelEvents.js';
 import { IModelContentChange } from './model/mirrorTextModel.js';
 import { IGuidesTextModelPart } from './textModelGuides.js';
 import { ITokenizationTextModelPart } from './tokenizationTextModelPart.js';
@@ -856,6 +856,12 @@ export interface ITextModel {
 	 */
 	getLineContent(lineNumber: number): string;
 
+	/**
+	 * Get the line injected text for a certain line.
+	 * @internal
+	 */
+	getLineInjectedText(lineNumber: number, ownerId?: number): LineInjectedText[];
+
 	/**
 	 * Get the text length for a certain line.
 	 */
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 8a276a599e4..6d7e5a6be55 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ArrayQueue, pushMany } from '../../../base/common/arrays.js';
+import { pushMany } from '../../../base/common/arrays.js';
 import { VSBuffer, VSBufferReadableStream } from '../../../base/common/buffer.js';
 import { CharCode } from '../../../base/common/charCode.js';
 import { SetWithKey } from '../../../base/common/collections.js';
@@ -1539,33 +1539,15 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 				const changeLineCountDelta = (insertingLinesCnt - deletingLinesCnt);
 
 				const currentEditStartLineNumber = newLineCount - lineCount - changeLineCountDelta + startLineNumber;
-				const firstEditLineNumber = currentEditStartLineNumber;
-				const lastInsertedLineNumber = currentEditStartLineNumber + insertingLinesCnt;
-
-				const decorationsWithInjectedTextInEditedRange = this._decorationsTree.getInjectedTextInInterval(
-					this,
-					this.getOffsetAt(new Position(firstEditLineNumber, 1)),
-					this.getOffsetAt(new Position(lastInsertedLineNumber, this.getLineMaxColumn(lastInsertedLineNumber))),
-					0
-				);
-
-
-				const injectedTextInEditedRange = LineInjectedText.fromDecorations(decorationsWithInjectedTextInEditedRange);
-				const injectedTextInEditedRangeQueue = new ArrayQueue(injectedTextInEditedRange);
 
 				for (let j = editingLinesCnt; j >= 0; j--) {
 					const editLineNumber = startLineNumber + j;
 					const currentEditLineNumber = currentEditStartLineNumber + j;
 
-					injectedTextInEditedRangeQueue.takeFromEndWhile(r => r.lineNumber > currentEditLineNumber);
-					const decorationsInCurrentLine = injectedTextInEditedRangeQueue.takeFromEndWhile(r => r.lineNumber === currentEditLineNumber);
-
 					rawContentChanges.push(
 						new ModelRawLineChanged(
 							editLineNumber,
-							currentEditLineNumber,
-							this.getLineContent(currentEditLineNumber),
-							decorationsInCurrentLine
+							currentEditLineNumber
 						));
 				}
 
@@ -1578,28 +1560,15 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 				}
 
 				if (editingLinesCnt < insertingLinesCnt) {
-					const injectedTextInEditedRangeQueue = new ArrayQueue(injectedTextInEditedRange);
 					// Must insert some lines
 					const spliceLineNumber = startLineNumber + editingLinesCnt;
 					const cnt = insertingLinesCnt - editingLinesCnt;
 					const fromLineNumber = newLineCount - lineCount - cnt + spliceLineNumber + 1;
-					const injectedTexts: (LineInjectedText[] | null)[] = [];
-					const newLines: string[] = [];
-					for (let i = 0; i < cnt; i++) {
-						const lineNumber = fromLineNumber + i;
-						newLines[i] = this.getLineContent(lineNumber);
-
-						injectedTextInEditedRangeQueue.takeWhile(r => r.lineNumber < lineNumber);
-						injectedTexts[i] = injectedTextInEditedRangeQueue.takeWhile(r => r.lineNumber === lineNumber);
-					}
-
 					rawContentChanges.push(
 						new ModelRawLinesInserted(
 							spliceLineNumber + 1,
 							fromLineNumber,
-							cnt,
-							newLines,
-							injectedTexts
+							cnt
 						)
 					);
 				}
@@ -1657,7 +1626,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 
 		if (affectedInjectedTextLines && affectedInjectedTextLines.size > 0) {
 			const affectedLines = Array.from(affectedInjectedTextLines);
-			const lineChangeEvents = affectedLines.map(lineNumber => new ModelRawLineChanged(lineNumber, lineNumber, this.getLineContent(lineNumber), this._getInjectedTextInLine(lineNumber)));
+			const lineChangeEvents = affectedLines.map(lineNumber => new ModelRawLineChanged(lineNumber, lineNumber));
 			this._onDidChangeContentOrInjectedText(new ModelInjectedTextChangedEvent(lineChangeEvents));
 		}
 		this._fireOnDidChangeLineHeight(affectedLineHeights);
@@ -1883,11 +1852,11 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		return decs;
 	}
 
-	private _getInjectedTextInLine(lineNumber: number): LineInjectedText[] {
+	public getLineInjectedText(lineNumber: number, ownerId: number = 0): LineInjectedText[] {
 		const startOffset = this._buffer.getOffsetAt(lineNumber, 1);
 		const endOffset = startOffset + this._buffer.getLineLength(lineNumber);
 
-		const result = this._decorationsTree.getInjectedTextInInterval(this, startOffset, endOffset, 0);
+		const result = this._decorationsTree.getInjectedTextInInterval(this, startOffset, endOffset, ownerId);
 		return LineInjectedText.fromDecorations(result).filter(t => t.lineNumber === lineNumber);
 	}
 
diff --git a/src/vs/editor/common/modelLineProjectionData.ts b/src/vs/editor/common/modelLineProjectionData.ts
index aac6ae4642d..948214355ef 100644
--- a/src/vs/editor/common/modelLineProjectionData.ts
+++ b/src/vs/editor/common/modelLineProjectionData.ts
@@ -328,14 +328,19 @@ export class OutputPosition {
 	}
 }
 
+export interface ILineBreaksComputerContext {
+	getLineContent(lineNumber: number): string;
+	getLineInjectedText(lineNumber: number): LineInjectedText[] | null;
+}
+
 export interface ILineBreaksComputerFactory {
-	createLineBreaksComputer(fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer;
+	createLineBreaksComputer(context: ILineBreaksComputerContext, fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer;
 }
 
 export interface ILineBreaksComputer {
 	/**
 	 * Pass in `previousLineBreakData` if the only difference is in breaking columns!!!
 	 */
-	addRequest(lineText: string, injectedText: LineInjectedText[] | null, previousLineBreakData: ModelLineProjectionData | null): void;
+	addRequest(lineNumber: number, previousLineBreakData: ModelLineProjectionData | null): void;
 	finalize(): (ModelLineProjectionData | null)[];
 }
diff --git a/src/vs/editor/common/textModelEvents.ts b/src/vs/editor/common/textModelEvents.ts
index ebbba093183..1f504db5852 100644
--- a/src/vs/editor/common/textModelEvents.ts
+++ b/src/vs/editor/common/textModelEvents.ts
@@ -315,20 +315,10 @@ export class ModelRawLineChanged {
 	 * The new line number the old one is mapped to (after the change was applied).
 	 */
 	public readonly lineNumberPostEdit: number;
-	/**
-	 * The new value of the line.
-	 */
-	public readonly detail: string;
-	/**
-	 * The injected text on the line.
-	 */
-	public readonly injectedText: LineInjectedText[] | null;
 
-	constructor(lineNumber: number, lineNumberPostEdit: number, detail: string, injectedText: LineInjectedText[] | null) {
+	constructor(lineNumber: number, lineNumberPostEdit: number) {
 		this.lineNumber = lineNumber;
 		this.lineNumberPostEdit = lineNumberPostEdit;
-		this.detail = detail;
-		this.injectedText = injectedText;
 	}
 }
 
@@ -439,21 +429,11 @@ export class ModelRawLinesInserted {
 	public get toLineNumberPostEdit(): number {
 		return this.fromLineNumberPostEdit + this.count - 1;
 	}
-	/**
-	 * The text that was inserted
-	 */
-	public readonly detail: string[];
-	/**
-	 * The injected texts for every inserted line.
-	 */
-	public readonly injectedTexts: (LineInjectedText[] | null)[];
 
-	constructor(fromLineNumber: number, fromLineNumberPostEdit: number, count: number, detail: string[], injectedTexts: (LineInjectedText[] | null)[]) {
-		this.injectedTexts = injectedTexts;
+	constructor(fromLineNumber: number, fromLineNumberPostEdit: number, count: number) {
 		this.fromLineNumber = fromLineNumber;
 		this.fromLineNumberPostEdit = fromLineNumberPostEdit;
 		this.count = count;
-		this.detail = detail;
 	}
 }
 
diff --git a/src/vs/editor/common/viewModel.ts b/src/vs/editor/common/viewModel.ts
index 37ccca993c4..94d4488ec9b 100644
--- a/src/vs/editor/common/viewModel.ts
+++ b/src/vs/editor/common/viewModel.ts
@@ -15,7 +15,7 @@ import { CursorChangeReason } from './cursorEvents.js';
 import { INewScrollPosition, ScrollType } from './editorCommon.js';
 import { EditorTheme } from './editorTheme.js';
 import { EndOfLinePreference, IGlyphMarginLanesModel, IModelDecorationOptions, ITextModel, TextDirection } from './model.js';
-import { ILineBreaksComputer, InjectedText } from './modelLineProjectionData.js';
+import { ILineBreaksComputer, ILineBreaksComputerContext, InjectedText } from './modelLineProjectionData.js';
 import { InternalModelContentChangeEvent, ModelInjectedTextChangedEvent } from './textModelEvents.js';
 import { BracketGuideOptions, IActiveIndentGuideInfo, IndentGuide } from './textModelGuides.js';
 import { IViewLineTokens } from './tokens/lineTokens.js';
@@ -89,7 +89,7 @@ export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
 	onDidChangeContentOrInjectedText(e: InternalModelContentChangeEvent | ModelInjectedTextChangedEvent): void;
 	emitContentChangeEvent(e: InternalModelContentChangeEvent | ModelInjectedTextChangedEvent): void;
 
-	createLineBreaksComputer(): ILineBreaksComputer;
+	createLineBreaksComputer(context?: ILineBreaksComputerContext): ILineBreaksComputer;
 
 	//#region cursor
 	getPrimaryCursorState(): CursorState;
diff --git a/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts b/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
index 37fba226625..678c350916d 100644
--- a/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
+++ b/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
@@ -10,7 +10,7 @@ import { CharacterClassifier } from '../core/characterClassifier.js';
 import { FontInfo } from '../config/fontInfo.js';
 import { LineInjectedText } from '../textModelEvents.js';
 import { InjectedTextOptions } from '../model.js';
-import { ILineBreaksComputerFactory, ILineBreaksComputer, ModelLineProjectionData } from '../modelLineProjectionData.js';
+import { ILineBreaksComputerFactory, ILineBreaksComputer, ModelLineProjectionData, ILineBreaksComputerContext } from '../modelLineProjectionData.js';
 
 export class MonospaceLineBreaksComputerFactory implements ILineBreaksComputerFactory {
 	public static create(options: IComputedEditorOptions): MonospaceLineBreaksComputerFactory {
@@ -26,23 +26,22 @@ export class MonospaceLineBreaksComputerFactory implements ILineBreaksComputerFa
 		this.classifier = new WrappingCharacterClassifier(breakBeforeChars, breakAfterChars);
 	}
 
-	public createLineBreaksComputer(fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer {
-		const requests: string[] = [];
-		const injectedTexts: (LineInjectedText[] | null)[] = [];
+	public createLineBreaksComputer(context: ILineBreaksComputerContext, fontInfo: FontInfo, tabSize: number, wrappingColumn: number, wrappingIndent: WrappingIndent, wordBreak: 'normal' | 'keepAll', wrapOnEscapedLineFeeds: boolean): ILineBreaksComputer {
+		const lineNumbers: number[] = [];
 		const previousBreakingData: (ModelLineProjectionData | null)[] = [];
 		return {
-			addRequest: (lineText: string, injectedText: LineInjectedText[] | null, previousLineBreakData: ModelLineProjectionData | null) => {
-				requests.push(lineText);
-				injectedTexts.push(injectedText);
+			addRequest: (lineNumber: number, previousLineBreakData: ModelLineProjectionData | null) => {
+				lineNumbers.push(lineNumber);
 				previousBreakingData.push(previousLineBreakData);
 			},
 			finalize: () => {
 				const columnsForFullWidthChar = fontInfo.typicalFullwidthCharacterWidth / fontInfo.typicalHalfwidthCharacterWidth;
 				const result: (ModelLineProjectionData | null)[] = [];
-				for (let i = 0, len = requests.length; i < len; i++) {
-					const injectedText = injectedTexts[i];
+				for (let i = 0, len = lineNumbers.length; i < len; i++) {
+					const lineNumber = lineNumbers[i];
+					const injectedText = context.getLineInjectedText(lineNumber);
+					const lineText = context.getLineContent(lineNumber);
 					const previousLineBreakData = previousBreakingData[i];
-					const lineText = requests[i];
 					const isLineFeedWrappingEnabled = wrapOnEscapedLineFeeds && lineText.includes('"') && lineText.includes('\\n');
 					if (previousLineBreakData && !previousLineBreakData.injectionOptions && !injectedText && !isLineFeedWrappingEnabled) {
 						result[i] = createLineBreaksFromPreviousLineBreaks(this.classifier, previousLineBreakData, lineText, tabSize, wrappingColumn, columnsForFullWidthChar, wrappingIndent, wordBreak);
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index f632d695033..abbd44aa396 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -33,7 +33,7 @@ import { EditorTheme } from '../editorTheme.js';
 import * as viewEvents from '../viewEvents.js';
 import { ViewLayout } from '../viewLayout/viewLayout.js';
 import { MinimapTokensColorTracker } from './minimapTokensColorTracker.js';
-import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from '../modelLineProjectionData.js';
+import { ILineBreaksComputer, ILineBreaksComputerContext, ILineBreaksComputerFactory, InjectedText } from '../modelLineProjectionData.js';
 import { ViewEventHandler } from '../viewEventHandler.js';
 import { ILineHeightChangeAccessor, IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from '../viewModel.js';
 import { ViewModelDecorations } from './viewModelDecorations.js';
@@ -184,8 +184,8 @@ export class ViewModel extends Disposable implements IViewModel {
 		return this._configuration.options.get(id);
 	}
 
-	public createLineBreaksComputer(): ILineBreaksComputer {
-		return this._lines.createLineBreaksComputer();
+	public createLineBreaksComputer(context?: ILineBreaksComputerContext): ILineBreaksComputer {
+		return this._lines.createLineBreaksComputer(context);
 	}
 
 	public addViewEventHandler(eventHandler: ViewEventHandler): void {
@@ -332,22 +332,13 @@ export class ViewModel extends Disposable implements IViewModel {
 			for (const change of changes) {
 				switch (change.changeType) {
 					case textModelEvents.RawContentChangedType.LinesInserted: {
-						for (let lineIdx = 0; lineIdx < change.detail.length; lineIdx++) {
-							const line = change.detail[lineIdx];
-							let injectedText = change.injectedTexts[lineIdx];
-							if (injectedText) {
-								injectedText = injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
-							}
-							lineBreaksComputer.addRequest(line, injectedText, null);
+						for (let i = 0; i < change.count; i++) {
+							lineBreaksComputer.addRequest(change.fromLineNumberPostEdit + i, null);
 						}
 						break;
 					}
 					case textModelEvents.RawContentChangedType.LineChanged: {
-						let injectedText: textModelEvents.LineInjectedText[] | null = null;
-						if (change.injectedText) {
-							injectedText = change.injectedText.filter(element => (!element.ownerId || element.ownerId === this._editorId));
-						}
-						lineBreaksComputer.addRequest(change.detail, injectedText, null);
+						lineBreaksComputer.addRequest(change.lineNumberPostEdit, null);
 						break;
 					}
 				}
@@ -381,7 +372,7 @@ export class ViewModel extends Disposable implements IViewModel {
 						break;
 					}
 					case textModelEvents.RawContentChangedType.LinesInserted: {
-						const insertedLineBreaks = lineBreakQueue.takeCount(change.detail.length);
+						const insertedLineBreaks = lineBreakQueue.takeCount(change.count);
 						const linesInsertedEvent = this._lines.onModelLinesInserted(versionId, change.fromLineNumber, change.toLineNumber, insertedLineBreaks);
 						if (linesInsertedEvent !== null) {
 							eventsCollector.emitViewEvent(linesInsertedEvent);
diff --git a/src/vs/editor/common/viewModel/viewModelLines.ts b/src/vs/editor/common/viewModel/viewModelLines.ts
index b3721760c9d..199e787f882 100644
--- a/src/vs/editor/common/viewModel/viewModelLines.ts
+++ b/src/vs/editor/common/viewModel/viewModelLines.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as arrays from '../../../base/common/arrays.js';
 import { IDisposable } from '../../../base/common/lifecycle.js';
 import { WrappingIndent } from '../config/editorOptions.js';
 import { FontInfo } from '../config/fontInfo.js';
@@ -12,13 +11,13 @@ import { Range } from '../core/range.js';
 import { IModelDecoration, IModelDeltaDecoration, ITextModel, PositionAffinity } from '../model.js';
 import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide, IndentGuideHorizontalLine } from '../textModelGuides.js';
 import { ModelDecorationOptions } from '../model/textModel.js';
-import { LineInjectedText } from '../textModelEvents.js';
 import * as viewEvents from '../viewEvents.js';
 import { createModelLineProjection, IModelLineProjection } from './modelLineProjection.js';
-import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory } from '../modelLineProjectionData.js';
+import { ILineBreaksComputer, ModelLineProjectionData, InjectedText, ILineBreaksComputerFactory, ILineBreaksComputerContext } from '../modelLineProjectionData.js';
 import { ConstantTimePrefixSumComputer } from '../model/prefixSumComputer.js';
 import { ViewLineData } from '../viewModel.js';
 import { ICoordinatesConverter, IdentityCoordinatesConverter } from '../coordinatesConverter.js';
+import { LineInjectedText } from '../textModelEvents.js';
 
 export interface IViewModelLines extends IDisposable {
 	createCoordinatesConverter(): ICoordinatesConverter;
@@ -28,7 +27,7 @@ export interface IViewModelLines extends IDisposable {
 	getHiddenAreas(): Range[];
 	setHiddenAreas(_ranges: readonly Range[]): boolean;
 
-	createLineBreaksComputer(): ILineBreaksComputer;
+	createLineBreaksComputer(context?: ILineBreaksComputerContext): ILineBreaksComputer;
 	onModelFlushed(): void;
 	onModelLinesDeleted(versionId: number | null, fromLineNumber: number, toLineNumber: number): viewEvents.ViewLinesDeletedEvent | null;
 	onModelLinesInserted(versionId: number | null, fromLineNumber: number, toLineNumber: number, lineBreaks: (ModelLineProjectionData | null)[]): viewEvents.ViewLinesInsertedEvent | null;
@@ -128,14 +127,11 @@ export class ViewModelLinesFromProjectedModel implements IViewModelLines {
 		}
 
 		const linesContent = this.model.getLinesContent();
-		const injectedTextDecorations = this.model.getInjectedTextDecorations(this._editorId);
 		const lineCount = linesContent.length;
 		const lineBreaksComputer = this.createLineBreaksComputer();
 
-		const injectedTextQueue = new arrays.ArrayQueue(LineInjectedText.fromDecorations(injectedTextDecorations));
 		for (let i = 0; i < lineCount; i++) {
-			const lineInjectedText = injectedTextQueue.takeWhile(t => t.lineNumber === i + 1);
-			lineBreaksComputer.addRequest(linesContent[i], lineInjectedText, previousLineBreaks ? previousLineBreaks[i] : null);
+			lineBreaksComputer.addRequest(i + 1, previousLineBreaks ? previousLineBreaks[i] : null);
 		}
 		const linesBreaks = lineBreaksComputer.finalize();
 
@@ -309,13 +305,21 @@ export class ViewModelLinesFromProjectedModel implements IViewModelLines {
 		return true;
 	}
 
-	public createLineBreaksComputer(): ILineBreaksComputer {
+	public createLineBreaksComputer(_context?: ILineBreaksComputerContext): ILineBreaksComputer {
 		const lineBreaksComputerFactory = (
 			this.wrappingStrategy === 'advanced'
 				? this._domLineBreaksComputerFactory
 				: this._monospaceLineBreaksComputerFactory
 		);
-		return lineBreaksComputerFactory.createLineBreaksComputer(this.fontInfo, this.tabSize, this.wrappingColumn, this.wrappingIndent, this.wordBreak, this.wrapOnEscapedLineFeeds);
+		const context: ILineBreaksComputerContext = _context ?? {
+			getLineContent: (lineNumber: number): string => {
+				return this.model.getLineContent(lineNumber);
+			},
+			getLineInjectedText: (lineNumber: number): LineInjectedText[] => {
+				return this.model.getLineInjectedText(lineNumber, this._editorId);
+			}
+		};
+		return lineBreaksComputerFactory.createLineBreaksComputer(context, this.fontInfo, this.tabSize, this.wrappingColumn, this.wrappingIndent, this.wordBreak, this.wrapOnEscapedLineFeeds);
 	}
 
 	public onModelFlushed(): void {
@@ -1153,7 +1157,7 @@ export class ViewModelLinesFromModelAsIs implements IViewModelLines {
 	public createLineBreaksComputer(): ILineBreaksComputer {
 		const result: null[] = [];
 		return {
-			addRequest: (lineText: string, injectedText: LineInjectedText[] | null, previousLineBreakData: ModelLineProjectionData | null) => {
+			addRequest: (lineNumber: number, previousLineBreakData: ModelLineProjectionData | null) => {
 				result.push(null);
 			},
 			finalize: () => {
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
index 79e5132ede9..f02d8efdb8c 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -657,7 +657,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		if ('only' in preference) {
 			return provider.providedPasteEditKinds.some(providedKind => preference.only.contains(providedKind));
 		} else if ('preferences' in preference) {
-			return preference.preferences.some(providedKind => preference.preferences.some(preferredKind => preferredKind.contains(providedKind)));
+			return provider.providedPasteEditKinds.some(providedKind => preference.preferences.some(preferredKind => preferredKind.contains(providedKind)));
 		} else {
 			return provider.id === preference.providerId;
 		}
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index 3260daed640..c504148633d 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { alert as alertFn } from '../../../../base/browser/ui/aria/aria.js';
 import { Delayer } from '../../../../base/common/async.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -18,7 +19,7 @@ import { OverviewRulerLane } from '../../../common/model.js';
 import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_REPLACE_INPUT_FOCUSED, FindModelBoundToEditorModel, FIND_IDS, ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleSearchScopeKeybinding, ToggleWholeWordKeybinding } from './findModel.js';
 import { FindOptionsWidget } from './findOptionsWidget.js';
 import { FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState } from './findState.js';
-import { FindWidget, IFindController } from './findWidget.js';
+import { FindWidget, IFindController, NLS_NO_RESULTS } from './findWidget.js';
 import * as nls from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
@@ -763,7 +764,13 @@ async function matchFindAction(editor: ICodeEditor, next: boolean): Promise<void
 			updateSearchScope: false,
 			loop: editor.getOption(EditorOption.find).loop
 		});
-		runMatch();
+		if (!runMatch()) {
+			// Re-announce "no results" for screen readers on explicit navigation (#301126)
+			const state = controller.getState();
+			if (wasFindWidgetVisible && state.matchesCount === 0 && state.searchString) {
+				alertFn(nls.localize('ariaSearchNoResult', "{0} found for '{1}'", NLS_NO_RESULTS, state.searchString));
+			}
+		}
 	}
 }
 
diff --git a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
index c9f7c4479de..4964af49280 100644
--- a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
@@ -22,6 +22,8 @@ import { CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSour
 import { MarkerController, NextMarkerAction } from '../../gotoError/browser/gotoError.js';
 import { HoverAnchor, HoverAnchorType, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
 import * as nls from '../../../../nls.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { IMarker, IMarkerData, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
@@ -65,6 +67,8 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 		@IMarkerDecorationsService private readonly _markerDecorationsService: IMarkerDecorationsService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@IMenuService private readonly _menuService: IMenuService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 	) { }
 
 	public computeSync(anchor: HoverAnchor, lineDecorations: IModelDecoration[]): MarkerHover[] {
@@ -206,12 +210,38 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 			}
 		}
 
+		// Menu-contributed actions (e.g. fix with inline chat)
+		const menuActions: MenuItemAction[] = [];
+		for (const [, actions] of this._menuService.getMenuActions(MenuId.MarkerHoverStatusBar, this._contextKeyService)) {
+			for (const action of actions) {
+				if (action instanceof MenuItemAction && action.enabled) {
+					menuActions.push(action);
+				}
+			}
+		}
+		const renderMenuActions = () => {
+			for (const action of menuActions) {
+				context.statusBar.addAction({
+					label: action.label,
+					commandId: action.id,
+					iconClass: action.class,
+					run: () => {
+						context.hide();
+						this._editor.setSelection(Range.lift(markerHover.range));
+						action.run();
+					}
+				});
+			}
+		};
+
 		if (!this._editor.getOption(EditorOption.readOnly)) {
 			const quickfixPlaceholderElement = context.statusBar.append($('div'));
 			if (this.recentMarkerCodeActionsInfo) {
 				if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
 					if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-						quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
+						if (menuActions.length === 0) {
+							quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
+						}
 					}
 				} else {
 					this.recentMarkerCodeActionsInfo = undefined;
@@ -230,7 +260,12 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 
 				if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
 					actions.dispose();
-					quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
+					if (menuActions.length === 0) {
+						quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
+					} else {
+						quickfixPlaceholderElement.style.display = 'none';
+					}
+					renderMenuActions();
 					return;
 				}
 				quickfixPlaceholderElement.style.display = 'none';
@@ -274,13 +309,18 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 					});
 				}
 
+				renderMenuActions();
+
 				// Notify that the contents have changed given we added
 				// actions to the hover
 				// https://github.com/microsoft/vscode/issues/250424
 				context.onContentsChanged();
 
 			}, onUnexpectedError);
+		} else {
+			renderMenuActions();
 		}
+
 		return disposables;
 	}
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts
index 27a5b2edaea..cbb2d7c612e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts
@@ -391,7 +391,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 
 			let widthUntilLineNumberEnd;
 			if (layout.lineNumbersWidth === 0) {
-				widthUntilLineNumberEnd = Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconAreaWidth);
+				widthUntilLineNumberEnd = Math.max(0, Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconAreaWidth));
 			} else {
 				widthUntilLineNumberEnd = Math.max(layout.lineNumbersLeft + layout.lineNumbersWidth - gutterViewPortWithStickyScroll.left, 0);
 			}
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
index d613456e162..31dcb1d38a9 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css
@@ -78,6 +78,9 @@
 .monaco-editor .parameter-hints-widget .docs {
 	padding: 0 10px 0 5px;
 	white-space: pre-wrap;
+	overflow-wrap: break-word;
+	word-break: break-word;
+	min-width: 0;
 }
 
 .monaco-editor .parameter-hints-widget .docs.empty {
@@ -95,6 +98,9 @@
 
 .monaco-editor .parameter-hints-widget .docs .markdown-docs {
 	white-space: initial;
+	overflow-wrap: break-word;
+	word-break: break-word;
+	max-width: 100%;
 }
 
 .monaco-editor .parameter-hints-widget .docs code {
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
index b4f95f7158e..a73ba222367 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
@@ -18,7 +18,7 @@ import { DocumentSymbol, SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymb
 import { IOutlineModelService } from '../../documentSymbols/browser/outlineModel.js';
 import { AbstractEditorNavigationQuickAccessProvider, IEditorNavigationQuickAccessOptions, IQuickAccessTextEditorContext } from './editorNavigationQuickAccess.js';
 import { localize } from '../../../../nls.js';
-import { IQuickInputButton, IQuickPick, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IKeyMods, IQuickInputButton, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { Position } from '../../../common/core/position.js';
 import { findLast } from '../../../../base/common/arraysFind.js';
@@ -32,6 +32,7 @@ export interface IGotoSymbolQuickPickItem extends IQuickPickItem {
 	uri?: URI;
 	symbolName?: string;
 	range?: { decoration: IRange; selection: IRange };
+	attach?(keyMods: IKeyMods, event: IQuickPickDidAcceptEvent): void;
 }
 
 export interface IGotoSymbolQuickAccessProviderOptions extends IEditorNavigationQuickAccessOptions {
@@ -145,6 +146,13 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		disposables.add(picker.onDidAccept(event => {
 			const [item] = picker.selectedItems;
 			if (item && item.range) {
+				// When shift is held and attach is available, delegate to attach
+				// (e.g. to add to chat context) instead of navigating
+				if (picker.keyMods.shift && item.attach) {
+					item.attach(picker.keyMods, event);
+					return;
+				}
+
 				this.gotoLocation(context, { range: item.range.selection, keyMods: picker.keyMods, preserveFocus: event.inBackground });
 
 				runOptions?.handleAccept?.(item, event.inBackground);
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
index 1cd84683e70..ecc59245dec 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
@@ -7,7 +7,7 @@
 	overflow: hidden;
 	border-bottom: 1px solid var(--vscode-editorStickyScroll-border);
 	width: 100%;
-	box-shadow: var(--vscode-shadow-md);
+	box-shadow: var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;
 	z-index: 4;
 	right: initial !important;
 	margin-left: '0px';
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index c518ee86152..953e761c408 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -130,7 +130,7 @@ suite('Editor Model - Model', () => {
 		});
 		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
-				new ModelRawLineChanged(1, 1, 'foo My First Line', null)
+				new ModelRawLineChanged(1, 1)
 			],
 			2,
 			false,
@@ -144,8 +144,8 @@ suite('Editor Model - Model', () => {
 		});
 		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
-				new ModelRawLineChanged(1, 1, 'My new line', null),
-				new ModelRawLinesInserted(2, 2, 1, ['No longer First Line'], [null]),
+				new ModelRawLineChanged(1, 1),
+				new ModelRawLinesInserted(2, 2, 1),
 			],
 			2,
 			false,
@@ -216,7 +216,7 @@ suite('Editor Model - Model', () => {
 		});
 		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
-				new ModelRawLineChanged(1, 1, 'y First Line', null),
+				new ModelRawLineChanged(1, 1),
 			],
 			2,
 			false,
@@ -230,7 +230,7 @@ suite('Editor Model - Model', () => {
 		});
 		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
-				new ModelRawLineChanged(1, 1, '', null),
+				new ModelRawLineChanged(1, 1),
 			],
 			2,
 			false,
@@ -244,7 +244,7 @@ suite('Editor Model - Model', () => {
 		});
 		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
-				new ModelRawLineChanged(1, 1, 'My Second Line', null),
+				new ModelRawLineChanged(1, 1),
 				new ModelRawLinesDeleted(2, 2, 1),
 			],
 			2,
@@ -259,7 +259,7 @@ suite('Editor Model - Model', () => {
 		});
 		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
-				new ModelRawLineChanged(1, 1, 'My Third Line', null),
+				new ModelRawLineChanged(1, 1),
 				new ModelRawLinesDeleted(2, 3, 1),
 			],
 			2,
diff --git a/src/vs/editor/test/common/model/modelInjectedText.test.ts b/src/vs/editor/test/common/model/modelInjectedText.test.ts
index d01509f6421..f67efe5677f 100644
--- a/src/vs/editor/test/common/model/modelInjectedText.test.ts
+++ b/src/vs/editor/test/common/model/modelInjectedText.test.ts
@@ -8,7 +8,7 @@ import { mock } from '../../../../base/test/common/mock.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Range } from '../../../common/core/range.js';
-import { InternalModelContentChangeEvent, LineInjectedText, ModelInjectedTextChangedEvent, ModelRawChange, RawContentChangedType } from '../../../common/textModelEvents.js';
+import { InternalModelContentChangeEvent, ModelInjectedTextChangedEvent, ModelRawChange, RawContentChangedType } from '../../../common/textModelEvents.js';
 import { IViewModel } from '../../../common/viewModel.js';
 import { createTextModel } from '../testTextModel.js';
 
@@ -43,8 +43,8 @@ suite('Editor Model - Injected Text Events', () => {
 		assert.deepStrictEqual(recordedChanges.splice(0), [
 			{
 				kind: 'lineChanged',
-				line: '[injected1]First Line',
 				lineNumber: 1,
+				lineNumberPostEdit: 1,
 			}
 		]);
 
@@ -67,13 +67,13 @@ suite('Editor Model - Injected Text Events', () => {
 		assert.deepStrictEqual(recordedChanges.splice(0), [
 			{
 				kind: 'lineChanged',
-				line: 'First Line',
 				lineNumber: 1,
+				lineNumberPostEdit: 1,
 			},
 			{
 				kind: 'lineChanged',
-				line: '[injected1]S[injected2]econd Line',
 				lineNumber: 2,
+				lineNumberPostEdit: 2,
 			}
 		]);
 
@@ -82,8 +82,8 @@ suite('Editor Model - Injected Text Events', () => {
 		assert.deepStrictEqual(recordedChanges.splice(0), [
 			{
 				kind: 'lineChanged',
-				line: '[injected1]SHello[injected2]econd Line',
 				lineNumber: 2,
+				lineNumberPostEdit: 2,
 			}
 		]);
 
@@ -100,17 +100,13 @@ suite('Editor Model - Injected Text Events', () => {
 		assert.deepStrictEqual(recordedChanges.splice(0), [
 			{
 				kind: 'lineChanged',
-				line: '[injected1]S',
 				lineNumber: 2,
+				lineNumberPostEdit: 2,
 			},
 			{
-				fromLineNumber: 3,
 				kind: 'linesInserted',
-				lines: [
-					'',
-					'',
-					'Hello[injected2]econd Line',
-				]
+				fromLineNumber: 3,
+				count: 3,
 			}
 		]);
 
@@ -119,36 +115,24 @@ suite('Editor Model - Injected Text Events', () => {
 		thisModel.pushEditOperations(null, [EditOperation.replace(new Range(3, 1, 5, 1), '\n\n\n\n\n\n\n\n\n\n\n\n\n')], null);
 		assert.deepStrictEqual(recordedChanges.splice(0), [
 			{
-				'kind': 'lineChanged',
-				'line': '',
-				'lineNumber': 5,
+				kind: 'lineChanged',
+				lineNumber: 5,
+				lineNumberPostEdit: 5,
 			},
 			{
-				'kind': 'lineChanged',
-				'line': '',
-				'lineNumber': 4,
+				kind: 'lineChanged',
+				lineNumber: 4,
+				lineNumberPostEdit: 4,
 			},
 			{
-				'kind': 'lineChanged',
-				'line': '',
-				'lineNumber': 3,
+				kind: 'lineChanged',
+				lineNumber: 3,
+				lineNumberPostEdit: 3,
 			},
 			{
-				'fromLineNumber': 6,
-				'kind': 'linesInserted',
-				'lines': [
-					'',
-					'',
-					'',
-					'',
-					'',
-					'',
-					'',
-					'',
-					'',
-					'',
-					'Hello[injected2]econd Line',
-				]
+				kind: 'linesInserted',
+				fromLineNumber: 6,
+				count: 11,
 			}
 		]);
 
@@ -157,8 +141,8 @@ suite('Editor Model - Injected Text Events', () => {
 		assert.deepStrictEqual(recordedChanges.splice(0), [
 			{
 				kind: 'lineChanged',
-				line: '[injected1]SHello[injected2]econd Line',
 				lineNumber: 2,
+				lineNumberPostEdit: 2,
 			},
 			{
 				kind: 'linesDeleted',
@@ -171,20 +155,16 @@ suite('Editor Model - Injected Text Events', () => {
 
 function mapChange(change: ModelRawChange): unknown {
 	if (change.changeType === RawContentChangedType.LineChanged) {
-		(change.injectedText || []).every(e => {
-			assert.deepStrictEqual(e.lineNumber, change.lineNumber);
-		});
-
 		return {
 			kind: 'lineChanged',
-			line: getDetail(change.detail, change.injectedText),
 			lineNumber: change.lineNumber,
+			lineNumberPostEdit: change.lineNumberPostEdit,
 		};
 	} else if (change.changeType === RawContentChangedType.LinesInserted) {
 		return {
 			kind: 'linesInserted',
-			lines: change.detail.map((e, idx) => getDetail(e, change.injectedTexts[idx])),
-			fromLineNumber: change.fromLineNumber
+			fromLineNumber: change.fromLineNumber,
+			count: change.count,
 		};
 	} else if (change.changeType === RawContentChangedType.LinesDeleted) {
 		return {
@@ -201,7 +181,3 @@ function mapChange(change: ModelRawChange): unknown {
 	}
 	return { kind: 'unknown' };
 }
-
-function getDetail(line: string, injectedTexts: LineInjectedText[] | null): string {
-	return LineInjectedText.applyInjectedText(line, (injectedTexts || []).map(t => t.withText(`[${t.options.content}]`)));
-}
diff --git a/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts b/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
index bed861e44a1..70d687d30e4 100644
--- a/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
+++ b/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
@@ -6,7 +6,7 @@ import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { EditorOptions, WrappingIndent } from '../../../common/config/editorOptions.js';
 import { FontInfo } from '../../../common/config/fontInfo.js';
-import { ILineBreaksComputerFactory, ModelLineProjectionData } from '../../../common/modelLineProjectionData.js';
+import { ILineBreaksComputerContext, ILineBreaksComputerFactory, ModelLineProjectionData } from '../../../common/modelLineProjectionData.js';
 import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
 
 function parseAnnotatedText(annotatedText: string): { text: string; indices: number[] } {
@@ -63,9 +63,17 @@ function getLineBreakData(factory: ILineBreaksComputerFactory, tabSize: number,
 		wsmiddotWidth: 7,
 		maxDigitWidth: 7
 	}, false);
-	const lineBreaksComputer = factory.createLineBreaksComputer(fontInfo, tabSize, breakAfter, wrappingIndent, wordBreak, wrapOnEscapedLineFeeds);
+	const context: ILineBreaksComputerContext = {
+		getLineContent(lineNumber: number) {
+			return text;
+		},
+		getLineInjectedText(lineNumber) {
+			return null;
+		}
+	};
+	const lineBreaksComputer = factory.createLineBreaksComputer(context, fontInfo, tabSize, breakAfter, wrappingIndent, wordBreak, wrapOnEscapedLineFeeds);
 	const previousLineBreakDataClone = previousLineBreakData ? new ModelLineProjectionData(null, null, previousLineBreakData.breakOffsets.slice(0), previousLineBreakData.breakOffsetsVisibleColumn.slice(0), previousLineBreakData.wrappedTextIndentLength) : null;
-	lineBreaksComputer.addRequest(text, null, previousLineBreakDataClone);
+	lineBreaksComputer.addRequest(1, previousLineBreakDataClone);
 	return lineBreaksComputer.finalize()[0];
 }
 
diff --git a/src/vs/platform/actionWidget/browser/actionList.ts b/src/vs/platform/actionWidget/browser/actionList.ts
index 5a6cf722ccc..2ffd94bf18d 100644
--- a/src/vs/platform/actionWidget/browser/actionList.ts
+++ b/src/vs/platform/actionWidget/browser/actionList.ts
@@ -10,13 +10,14 @@ import { getAnchorRect, IAnchor } from '../../../base/browser/ui/contextview/con
 import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
 import { IListAccessibilityProvider, List } from '../../../base/browser/ui/list/listWidget.js';
-import { IAction, toAction } from '../../../base/common/actions.js';
+import { IAction, SubmenuAction, toAction } from '../../../base/common/actions.js';
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Codicon } from '../../../base/common/codicons.js';
+import { Emitter } from '../../../base/common/event.js';
 import { IMarkdownString, MarkdownString } from '../../../base/common/htmlContent.js';
 import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
 import { AnchorPosition } from '../../../base/common/layout.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { OS } from '../../../base/common/platform.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { URI } from '../../../base/common/uri.js';
@@ -28,6 +29,7 @@ import { IOpenerService } from '../../opener/common/opener.js';
 import { defaultListStyles } from '../../theme/browser/defaultStyles.js';
 import { asCssVariable } from '../../theme/common/colorRegistry.js';
 import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { IHoverService } from '../../hover/browser/hover.js';
 import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
 import { IHoverPositionOptions, IHoverWidget } from '../../../base/browser/ui/hover/hover.js';
@@ -65,6 +67,12 @@ export interface IActionListItem<T> {
 	 * Optional hover configuration shown when focusing/hovering over the item.
 	 */
 	readonly hover?: IActionListItemHover;
+	/**
+	 * Optional actions shown in a nested submenu panel, triggered by a chevron
+	 * indicator on the right side of the item. When set, hovering or clicking
+	 * the chevron opens an inline submenu with these actions.
+	 */
+	readonly submenuActions?: IAction[];
 	readonly keybinding?: ResolvedKeybinding;
 	canPreview?: boolean | undefined;
 	readonly hideIcon?: boolean;
@@ -111,6 +119,7 @@ interface IActionMenuTemplateData {
 	readonly description?: HTMLElement;
 	readonly keybinding: KeybindingLabel;
 	readonly toolbar: HTMLElement;
+	readonly submenuIndicator: HTMLElement;
 	readonly elementDisposables: DisposableStore;
 	previousClassName?: string;
 }
@@ -182,6 +191,9 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 	constructor(
 		private readonly _supportsPreview: boolean,
 		private readonly _onRemoveItem: ((item: IActionListItem<T>) => void) | undefined,
+		private readonly _onShowSubmenu: ((item: IActionListItem<T>) => void) | undefined,
+		private readonly _hasAnySubmenuActions: boolean,
+		private readonly _linkHandler: ((uri: URI, item: IActionListItem<T>) => void) | undefined,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 	) { }
@@ -211,9 +223,13 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 		toolbar.className = 'action-list-item-toolbar';
 		container.append(toolbar);
 
+		const submenuIndicator = document.createElement('div');
+		submenuIndicator.className = 'action-list-submenu-indicator';
+		container.append(submenuIndicator);
+
 		const elementDisposables = new DisposableStore();
 
-		return { container, icon, text, badge, description, keybinding, toolbar, elementDisposables };
+		return { container, icon, text, badge, description, keybinding, toolbar, submenuIndicator, elementDisposables };
 	}
 
 	renderElement(element: IActionListItem<T>, _index: number, data: IActionMenuTemplateData): void {
@@ -269,7 +285,12 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 			} else {
 				const rendered = renderMarkdown(element.description, {
 					actionHandler: (content: string) => {
-						this._openerService.open(URI.parse(content), { allowCommands: true });
+						const uri = URI.parse(content);
+						if (this._linkHandler) {
+							this._linkHandler(uri, element);
+						} else {
+							void this._openerService.open(uri, { allowCommands: true });
+						}
 					}
 				});
 				data.elementDisposables.add(rendered);
@@ -321,6 +342,25 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 			data.elementDisposables.add(actionBar);
 			actionBar.push(toolbarActions, { icon: true, label: false });
 		}
+
+		// Show submenu indicator only for items with submenu actions
+		if (element.submenuActions?.length) {
+			data.submenuIndicator.className = 'action-list-submenu-indicator has-submenu ' + ThemeIcon.asClassName(Codicon.chevronRight);
+			data.submenuIndicator.style.display = '';
+			data.submenuIndicator.style.visibility = '';
+			data.elementDisposables.add(dom.addDisposableListener(data.submenuIndicator, dom.EventType.CLICK, (e) => {
+				e.stopPropagation();
+				this._onShowSubmenu?.(element);
+			}));
+		} else if (this._hasAnySubmenuActions) {
+			// Reserve space for alignment when other items have submenus
+			data.submenuIndicator.className = 'action-list-submenu-indicator';
+			data.submenuIndicator.style.display = '';
+			data.submenuIndicator.style.visibility = 'hidden';
+		} else {
+			data.submenuIndicator.className = 'action-list-submenu-indicator';
+			data.submenuIndicator.style.display = 'none';
+		}
 	}
 
 	disposeTemplate(templateData: IActionMenuTemplateData): void {
@@ -374,6 +414,17 @@ export interface IActionListOptions {
 	 */
 	readonly minWidth?: number;
 
+	/**
+	 * Optional handler for markdown links activated in item descriptions or hovers.
+	 * When unset, links open via the opener service with command links allowed.
+	 */
+	readonly linkHandler?: (uri: URI, item: IActionListItem<unknown>) => void;
+
+	/**
+	 * Optional callback fired when a section's collapsed state changes.
+	 */
+	readonly onDidToggleSection?: (section: string, collapsed: boolean) => void;
+
 	/**
 	 * When true, descriptions are rendered as subtext below the title
 	 * instead of inline to the right.
@@ -386,58 +437,68 @@ export interface IActionListOptions {
 	 * When true and filtering is enabled, focuses the filter input when the list opens.
 	 */
 	readonly focusFilterOnOpen?: boolean;
+
+	/**
+	 * When false, non-submenu items do not reserve space for the submenu chevron.
+	 * Defaults to true for alignment consistency.
+	 */
+	readonly reserveSubmenuSpace?: boolean;
 }
 
-export class ActionList<T> extends Disposable {
+/**
+ * A standalone action list widget that handles core list rendering, filtering,
+ * hover, submenu, and section management without depending on IContextViewService
+ * or anchor-based positioning. Suitable for embedding directly in any container.
+ */
+export class ActionListWidget<T> extends Disposable {
 
 	public readonly domNode: HTMLElement;
 
 	private readonly _list: List<IActionListItem<T>>;
 
-	private readonly _actionLineHeight: number;
-	private readonly _headerLineHeight = 24;
-	private readonly _separatorLineHeight = 8;
+	protected readonly _actionLineHeight: number;
+	private readonly _baseLineHeight = 24;
+	protected readonly _headerLineHeight = 24;
+	protected readonly _separatorLineHeight = 8;
 
-	private _allMenuItems: IActionListItem<T>[];
+	protected _allMenuItems: IActionListItem<T>[];
 
 	private readonly cts = this._register(new CancellationTokenSource());
 
 	private _hover = this._register(new MutableDisposable<IHoverWidget>());
 
+	private readonly _submenuDisposables = this._register(new DisposableStore());
+	private readonly _submenuContainer: HTMLElement;
+	private _submenuHideTimeout: ReturnType<typeof setTimeout> | undefined;
+	private _submenuShowTimeout: ReturnType<typeof setTimeout> | undefined;
+	private _currentSubmenuWidget: ActionListWidget<IAction> | undefined;
+	private _currentSubmenuElement: IActionListItem<T> | undefined;
+
 	private readonly _collapsedSections = new Set<string>();
 	private _filterText = '';
 	private _suppressHover = false;
 	private readonly _filterInput: HTMLInputElement | undefined;
 	private readonly _filterContainer: HTMLElement | undefined;
-	private _lastMinWidth = 0;
-	private _cachedMaxWidth: number | undefined;
-	private _hasLaidOut = false;
-	private _showAbove: boolean | undefined;
+
+	private readonly _onDidRequestLayout = this._register(new Emitter<void>());
 
 	/**
-	 * Returns the resolved anchor position after the first layout.
-	 * Used by the context view delegate to lock the dropdown direction.
+	 * Fired when the widget's visible item set changes and the parent should
+	 * re-layout (e.g. after filtering or collapsing a section).
 	 */
-	get anchorPosition(): AnchorPosition | undefined {
-		if (this._showAbove === undefined) {
-			return undefined;
-		}
-		return this._showAbove ? AnchorPosition.ABOVE : AnchorPosition.BELOW;
-	}
+	readonly onDidRequestLayout = this._onDidRequestLayout.event;
 
 	constructor(
 		user: string,
 		preview: boolean,
 		items: readonly IActionListItem<T>[],
-		private readonly _delegate: IActionListDelegate<T>,
+		protected readonly _delegate: IActionListDelegate<T>,
 		accessibilityProvider: Partial<IListAccessibilityProvider<IActionListItem<T>>> | undefined,
-		private readonly _options: IActionListOptions | undefined,
-		private readonly _anchor: HTMLElement | StandardMouseEvent | IAnchor,
-		@IContextViewService private readonly _contextViewService: IContextViewService,
+		protected readonly _options: IActionListOptions | undefined,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@ILayoutService private readonly _layoutService: ILayoutService,
 		@IHoverService private readonly _hoverService: IHoverService,
 		@IOpenerService private readonly _openerService: IOpenerService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
 		this.domNode = document.createElement('div');
@@ -447,6 +508,23 @@ export class ActionList<T> extends Disposable {
 		}
 		this._actionLineHeight = this._options?.descriptionBelow ? 48 : 24;
 
+		// Create submenu container appended to domNode
+		this._submenuContainer = document.createElement('div');
+		this._submenuContainer.className = 'action-list-submenu-panel action-widget';
+		this._submenuContainer.style.display = 'none';
+		this.domNode.append(this._submenuContainer);
+
+		this._register(dom.addDisposableListener(this._submenuContainer, 'mouseenter', () => {
+			this._cancelSubmenuHide();
+		}));
+		this._register(dom.addDisposableListener(this._submenuContainer, 'mouseleave', () => {
+			this._scheduleSubmenuHide();
+		}));
+		this._register(toDisposable(() => {
+			this._cancelSubmenuHide();
+			this._cancelSubmenuShow();
+		}));
+
 		// Initialize collapsed sections
 		if (this._options?.collapsedByDefault) {
 			for (const section of this._options.collapsedByDefault) {
@@ -456,21 +534,17 @@ export class ActionList<T> extends Disposable {
 
 		const virtualDelegate: IListVirtualDelegate<IActionListItem<T>> = {
 			getHeight: element => {
-				switch (element.kind) {
-					case ActionListItemKind.Header:
-						return this._headerLineHeight;
-					case ActionListItemKind.Separator:
-						return this._separatorLineHeight;
-					default:
-						return this._actionLineHeight;
-				}
+				return this._getItemHeight(element);
 			},
 			getTemplateId: element => element.kind
 		};
 
 
+		const reserveSubmenuSpace = this._options?.reserveSubmenuSpace ?? true;
+		const hasAnySubmenuActions = reserveSubmenuSpace && items.some(item => !!item.submenuActions?.length);
+
 		this._list = this._register(new List(user, this.domNode, virtualDelegate, [
-			new ActionItemRenderer<T>(preview, (item) => this._removeItem(item), this._keybindingService, this._openerService),
+			new ActionItemRenderer<T>(preview, (item) => this._removeItem(item), (item) => this._showSubmenuForItem(item), hasAnySubmenuActions, this._options?.linkHandler, this._keybindingService, this._openerService),
 			new HeaderRenderer(),
 			new SeparatorRenderer(),
 		], {
@@ -549,6 +623,24 @@ export class ActionList<T> extends Disposable {
 			this._focusCheckedOrFirst();
 		}
 
+		// ArrowRight opens submenu for the focused item and moves focus into it
+		this._register(dom.addDisposableListener(this.domNode, 'keydown', (e: KeyboardEvent) => {
+			if (e.key === 'ArrowRight') {
+				const focused = this._list.getFocus();
+				if (focused.length > 0) {
+					const element = this._list.element(focused[0]);
+					if (element?.submenuActions?.length) {
+						dom.EventHelper.stop(e, true);
+						const rowElement = this._getRowElement(focused[0]);
+						if (rowElement) {
+							this._showSubmenuForElement(element, rowElement);
+							this._currentSubmenuWidget?.focus();
+						}
+					}
+				}
+			}
+		}));
+
 		// When the list has focus and user types a printable character,
 		// forward it to the filter input so search begins automatically.
 		if (this._filterInput) {
@@ -572,6 +664,7 @@ export class ActionList<T> extends Disposable {
 		} else {
 			this._collapsedSections.add(section);
 		}
+		this._options?.onDidToggleSection?.(section, this._collapsedSections.has(section));
 		this._applyFilter();
 	}
 
@@ -650,35 +743,32 @@ export class ActionList<T> extends Disposable {
 
 		this._list.splice(0, this._list.length, visible);
 
-		// Re-layout to adjust height after items changed
-		if (this._hasLaidOut) {
-			this.layout(this._lastMinWidth);
-			// Restore focus after splice destroyed DOM elements,
-			// otherwise the blur handler in ActionWidgetService closes the widget.
-			// Keep focus on the filter input if the user is typing a filter.
-			if (filterInputHasFocus) {
-				this._filterInput?.focus();
-				// Keep a highlighted item in the list so Enter works without pressing DownArrow first
-				this._focusCheckedOrFirst();
-			} else {
-				this._list.domFocus();
-				// Restore focus to the previously focused item
-				if (focusedItem) {
-					const focusedItemId = (focusedItem.item as { id?: string })?.id;
-					if (focusedItemId) {
-						for (let i = 0; i < this._list.length; i++) {
-							const el = this._list.element(i);
-							if ((el.item as { id?: string })?.id === focusedItemId) {
-								this._list.setFocus([i]);
-								this._list.reveal(i);
-								break;
-							}
+		// Notify the parent that a re-layout is needed
+		this._onDidRequestLayout.fire();
+
+		// Restore focus after splice destroyed DOM elements,
+		// otherwise the blur handler in ActionWidgetService closes the widget.
+		// Keep focus on the filter input if the user is typing a filter.
+		if (filterInputHasFocus) {
+			this._filterInput?.focus();
+			// Keep a highlighted item in the list so Enter works without pressing DownArrow first
+			this._focusCheckedOrFirst();
+		} else {
+			this._list.domFocus();
+			// Restore focus to the previously focused item
+			if (focusedItem) {
+				const focusedItemId = (focusedItem.item as { id?: string })?.id;
+				if (focusedItemId) {
+					for (let i = 0; i < this._list.length; i++) {
+						const el = this._list.element(i);
+						if ((el.item as { id?: string })?.id === focusedItemId) {
+							this._list.setFocus([i]);
+							this._list.reveal(i);
+							break;
 						}
 					}
 				}
 			}
-			// Reposition the context view so the widget grows in the correct direction
-			this._contextViewService.layout();
 		}
 	}
 
@@ -690,8 +780,6 @@ export class ActionList<T> extends Disposable {
 		return this._filterContainer;
 	}
 
-
-
 	get filterInput(): HTMLInputElement | undefined {
 		return this._filterInput;
 	}
@@ -711,6 +799,14 @@ export class ActionList<T> extends Disposable {
 		this._focusCheckedOrFirst();
 	}
 
+	getFocusedElement(): IActionListItem<T> | undefined {
+		const focused = this._list.getFocus();
+		if (focused.length > 0) {
+			return this._list.element(focused[0]);
+		}
+		return undefined;
+	}
+
 	private _focusCheckedOrFirst(): void {
 		this._suppressHover = true;
 		try {
@@ -738,7 +834,7 @@ export class ActionList<T> extends Disposable {
 		this._delegate.onHide(didCancel);
 		this.cts.cancel();
 		this._hover.clear();
-		this._contextViewService.hideContextView();
+		this._hideSubmenu();
 	}
 
 	clearFilter(): boolean {
@@ -751,72 +847,79 @@ export class ActionList<T> extends Disposable {
 		return false;
 	}
 
-	private hasDynamicHeight(): boolean {
+	/**
+	 * Whether this widget uses dynamic height (has filter or collapsible sections).
+	 */
+	get hasDynamicHeight(): boolean {
 		if (this._options?.showFilter) {
 			return true;
 		}
 		return this._allMenuItems.some(item => item.isSectionToggle);
 	}
 
-	private computeHeight(): number {
-		// Compute height based on currently visible items in the list
+	/**
+	 * The height of a single action row in pixels.
+	 */
+	get lineHeight(): number {
+		return this._actionLineHeight;
+	}
+
+	/**
+	 * Returns the height for an action item, using the base line height
+	 * for items without a description when `descriptionBelow` is enabled.
+	 */
+	protected _getItemHeight(item: IActionListItem<T>): number {
+		switch (item.kind) {
+			case ActionListItemKind.Header:
+				return this._headerLineHeight;
+			case ActionListItemKind.Separator:
+				return this._separatorLineHeight;
+			default:
+				if (this._options?.descriptionBelow && !item.description) {
+					return this._baseLineHeight;
+				}
+				return this._actionLineHeight;
+		}
+	}
+
+	/**
+	 * Computes the total height of all items (including collapsed/filtered items).
+	 */
+	computeFullHeight(): number {
+		let fullHeight = 0;
+		for (const item of this._allMenuItems) {
+			fullHeight += this._getItemHeight(item);
+		}
+		return fullHeight;
+	}
+
+	/**
+	 * Computes the total height of visible items in the list.
+	 */
+	computeListHeight(): number {
 		const visibleCount = this._list.length;
 		let listHeight = 0;
 		for (let i = 0; i < visibleCount; i++) {
 			const element = this._list.element(i);
-			switch (element.kind) {
-				case ActionListItemKind.Header:
-					listHeight += this._headerLineHeight;
-					break;
-				case ActionListItemKind.Separator:
-					listHeight += this._separatorLineHeight;
-					break;
-				default:
-					listHeight += this._actionLineHeight;
-					break;
-			}
+			listHeight += this._getItemHeight(element);
 		}
-
-		const filterHeight = this._filterContainer ? 36 : 0;
-		const padding = 10;
-		const targetWindow = dom.getWindow(this.domNode);
-		let availableHeight;
-
-		if (this.hasDynamicHeight()) {
-			const viewportHeight = targetWindow.innerHeight;
-			const anchorRect = getAnchorRect(this._anchor);
-			const anchorTopInViewport = anchorRect.top - targetWindow.pageYOffset;
-			const spaceBelow = viewportHeight - anchorTopInViewport - anchorRect.height - padding;
-			const spaceAbove = anchorTopInViewport - padding;
-
-			// Lock the direction on first layout based on whether the full
-			// unconstrained list fits below. Once decided, the dropdown stays
-			// in the same position even when the visible item count changes.
-			if (this._showAbove === undefined) {
-				let fullHeight = filterHeight;
-				for (const item of this._allMenuItems) {
-					switch (item.kind) {
-						case ActionListItemKind.Header: fullHeight += this._headerLineHeight; break;
-						case ActionListItemKind.Separator: fullHeight += this._separatorLineHeight; break;
-						default: fullHeight += this._actionLineHeight; break;
-					}
-				}
-				this._showAbove = fullHeight > spaceBelow && spaceAbove > spaceBelow;
-			}
-			availableHeight = this._showAbove ? spaceAbove : spaceBelow;
-		} else {
-			const windowHeight = this._layoutService.getContainer(targetWindow).clientHeight;
-			const widgetTop = this.domNode.getBoundingClientRect().top;
-			availableHeight = widgetTop > 0 ? windowHeight - widgetTop - padding : windowHeight * 0.7;
-		}
-
-		const viewportMaxHeight = Math.floor(targetWindow.innerHeight * 0.6);
-		const maxHeight = Math.min(Math.max(availableHeight, this._actionLineHeight * 3 + filterHeight), viewportMaxHeight);
-		const height = Math.min(listHeight + filterHeight, maxHeight);
-		return height - filterHeight;
+		return listHeight;
 	}
 
-	private computeMaxWidth(minWidth: number): number {
+	/**
+	 * Lays out the list widget with the given explicit dimensions.
+	 */
+	layout(height: number, width?: number): void {
+		this._list.layout(height, width);
+		this.domNode.style.height = `${height}px`;
+
+		// Place filter container on the preferred side.
+		if (this._filterContainer && this._filterContainer.parentElement) {
+			this._filterContainer.parentElement.insertBefore(this._filterContainer, this.domNode);
+		}
+	}
+
+	computeMaxWidth(minWidth: number): number {
 		const visibleCount = this._list.length;
 		const effectiveMinWidth = Math.max(minWidth, this._options?.minWidth ?? 0);
 		let maxWidth = effectiveMinWidth;
@@ -826,10 +929,6 @@ export class ActionList<T> extends Disposable {
 			return Math.max(380, effectiveMinWidth);
 		}
 
-		if (this._cachedMaxWidth !== undefined) {
-			return this._cachedMaxWidth;
-		}
-
 		if (totalItemCount > visibleCount) {
 			// Temporarily splice in all items to measure widths,
 			// preventing width jumps when expanding/collapsing sections.
@@ -842,11 +941,7 @@ export class ActionList<T> extends Disposable {
 			this._list.splice(0, visibleCount, allItems);
 			let allItemsHeight = 0;
 			for (const item of allItems) {
-				switch (item.kind) {
-					case ActionListItemKind.Header: allItemsHeight += this._headerLineHeight; break;
-					case ActionListItemKind.Separator: allItemsHeight += this._separatorLineHeight; break;
-					default: allItemsHeight += this._actionLineHeight; break;
-				}
+				allItemsHeight += this._getItemHeight(item);
 			}
 			this._list.layout(allItemsHeight);
 
@@ -882,25 +977,6 @@ export class ActionList<T> extends Disposable {
 		return Math.max(...itemWidths, effectiveMinWidth);
 	}
 
-	layout(minWidth: number): number {
-		this._hasLaidOut = true;
-		this._lastMinWidth = minWidth;
-
-		const listHeight = this.computeHeight();
-		this._list.layout(listHeight);
-
-		this._cachedMaxWidth = this.computeMaxWidth(minWidth);
-		this._list.layout(listHeight, this._cachedMaxWidth);
-		this.domNode.style.height = `${listHeight}px`;
-
-		// Place filter container on the preferred side.
-		if (this._filterContainer && this._filterContainer.parentElement) {
-			this._filterContainer.parentElement.insertBefore(this._filterContainer, this.domNode);
-		}
-
-		return this._cachedMaxWidth;
-	}
-
 	focusPrevious() {
 		if (this._filterInput && dom.isActiveElement(this._filterInput)) {
 			this._list.domFocus();
@@ -1037,6 +1113,14 @@ export class ActionList<T> extends Disposable {
 			this._list.setSelection([]);
 			return;
 		}
+		// Don't select when clicking the toolbar or submenu indicator
+		if (dom.isMouseEvent(e.browserEvent)) {
+			const target = e.browserEvent.target;
+			if (dom.isHTMLElement(target) && (target.closest('.action-list-item-toolbar') || target.closest('.action-list-submenu-indicator'))) {
+				this._list.setSelection([]);
+				return;
+			}
+		}
 		if (element.item && this.focusCondition(element)) {
 			this._delegate.onSelect(element.item, e.browserEvent instanceof PreviewSelectedEvent);
 		} else {
@@ -1086,32 +1170,223 @@ export class ActionList<T> extends Disposable {
 	}
 
 	private _showHoverForElement(element: IActionListItem<T>, index: number): void {
-		let newHover: IHoverWidget | undefined;
+		if (this._currentSubmenuElement === element || element.submenuActions?.length) {
+			return;
+		}
+		this._submenuDisposables.clear();
 
-		// Show hover if the element has hover content
-		if (element.hover?.content) {
-			// The List widget separates data models from DOM elements, so we need to
-			// look up the actual DOM node to use as the hover target.
+		const rowElement = this._getRowElement(index);
+		if (!rowElement) {
+			this._hover.clear();
+			return;
+		}
+
+		const hasHoverContent = !!element.hover?.content;
+
+		if (!hasHoverContent) {
+			this._hover.clear();
+			return;
+		}
+
+		const markdown = typeof element.hover!.content === 'string' ? new MarkdownString(element.hover!.content) : element.hover!.content;
+		const linkHandler = this._options?.linkHandler;
+		this._hover.value = this._hoverService.showDelayedHover({
+			content: markdown ?? '',
+			target: rowElement,
+			additionalClasses: ['action-widget-hover'],
+			linkHandler: linkHandler ? (url: string) => {
+				linkHandler(URI.parse(url), element);
+			} : undefined,
+			position: {
+				hoverPosition: HoverPosition.LEFT,
+				forcePosition: false,
+				...element.hover!.position,
+			},
+			appearance: {
+				showPointer: true,
+			},
+		}, { groupId: `actionListHover` });
+	}
+
+	private _showSubmenuForItem(item: IActionListItem<T>): void {
+		const index = this._list.indexOf(item);
+		if (index >= 0) {
 			const rowElement = this._getRowElement(index);
 			if (rowElement) {
-				const markdown = typeof element.hover.content === 'string' ? new MarkdownString(element.hover.content) : element.hover.content;
-				newHover = this._hoverService.showDelayedHover({
-					content: markdown ?? '',
-					target: rowElement,
-					additionalClasses: ['action-widget-hover'],
-					position: {
-						hoverPosition: HoverPosition.LEFT,
-						forcePosition: false,
-						...element.hover.position,
-					},
-					appearance: {
-						showPointer: true,
-					},
-				}, { groupId: `actionListHover` });
+				this._showSubmenuForElement(item, rowElement);
+			}
+		}
+	}
+
+	private _showSubmenuForElement(element: IActionListItem<T>, anchor: HTMLElement): void {
+		this._submenuDisposables.clear();
+		this._hover.clear();
+		this._currentSubmenuElement = element;
+		dom.clearNode(this._submenuContainer);
+
+		// Convert submenu actions into ActionListWidget items
+		const submenuItems: IActionListItem<IAction>[] = [];
+		const submenuGroups = element.submenuActions!.filter((a): a is SubmenuAction => a instanceof SubmenuAction);
+		const groupsWithActions = submenuGroups.filter(g => g.actions.length > 0);
+		for (let gi = 0; gi < groupsWithActions.length; gi++) {
+			const group = groupsWithActions[gi];
+			for (let ci = 0; ci < group.actions.length; ci++) {
+				const child = group.actions[ci];
+				submenuItems.push({
+					item: child,
+					kind: ActionListItemKind.Action,
+					label: child.label,
+					description: ci === 0 && group.label ? group.label : (child.tooltip || undefined),
+					group: { title: '', icon: ThemeIcon.fromId(child.checked ? Codicon.check.id : Codicon.blank.id) },
+					hideIcon: false,
+					hover: {},
+				});
+			}
+			if (gi < groupsWithActions.length - 1) {
+				submenuItems.push({ kind: ActionListItemKind.Separator, label: '' });
+			}
+		}
+		// Also include non-SubmenuAction items directly
+		for (const action of element.submenuActions!) {
+			if (!(action instanceof SubmenuAction)) {
+				submenuItems.push({
+					item: action,
+					kind: ActionListItemKind.Action,
+					label: action.label,
+					description: action.tooltip || undefined,
+					group: { title: '' },
+					hideIcon: false,
+					hover: {},
+				});
 			}
 		}
 
-		this._hover.value = newHover;
+		const submenuDelegate: IActionListDelegate<IAction> = {
+			onHide: () => { },
+			onSelect: (action) => {
+				action.run();
+				// Also select the parent item in the main list
+				const parentItem = this._currentSubmenuElement?.item;
+				this._hideSubmenu();
+				if (parentItem) {
+					this._delegate.onSelect(parentItem);
+				}
+				this.hide();
+			},
+		};
+
+		// Show container before creating widget so List can measure during construction
+		this._submenuContainer.style.display = '';
+		this._submenuContainer.style.position = 'absolute';
+
+		// Position: prefer right side, fall back to left if not enough space
+		const anchorRect = anchor.getBoundingClientRect();
+		const parentRect = this.domNode.getBoundingClientRect();
+
+		const submenuWidget = this._submenuDisposables.add(this._instantiationService.createInstance(
+			ActionListWidget<IAction>,
+			'submenu',
+			false,
+			submenuItems,
+			submenuDelegate,
+			undefined,
+			undefined,
+		));
+		this._submenuContainer.appendChild(submenuWidget.domNode);
+		this._currentSubmenuWidget = submenuWidget;
+
+		// Layout: first pass renders items, second pass measures true width
+		const totalHeight = submenuWidget.computeListHeight();
+		submenuWidget.layout(totalHeight);
+		const maxWidth = submenuWidget.computeMaxWidth(0);
+		submenuWidget.layout(totalHeight, maxWidth);
+		submenuWidget.domNode.style.width = `${maxWidth}px`;
+
+		// Position: prefer right side, fall back to left if not enough space
+		const targetWindow = dom.getWindow(this.domNode);
+		const viewportWidth = targetWindow.innerWidth;
+		const spaceRight = viewportWidth - anchorRect.right;
+		const spaceLeft = parentRect.left;
+		const submenuWidth = maxWidth + 10; // account for border/padding
+
+		const gap = 4;
+		if (spaceRight >= submenuWidth || spaceRight >= spaceLeft) {
+			// Show on the right, offset past the parent's right edge
+			this._submenuContainer.style.left = `${parentRect.right - parentRect.left + gap}px`;
+		} else {
+			// Show on the left
+			this._submenuContainer.style.left = `${-submenuWidth - gap}px`;
+		}
+		this._submenuContainer.style.top = `${anchorRect.top - parentRect.top - 4}px`;
+
+		// Keyboard navigation in submenu
+		this._submenuDisposables.add(dom.addDisposableListener(submenuWidget.domNode, 'keydown', (e: KeyboardEvent) => {
+			if (e.key === 'ArrowLeft' || e.key === 'Escape') {
+				dom.EventHelper.stop(e, true);
+				this._hideSubmenu();
+				this._list.domFocus();
+			} else if (e.key === 'Enter') {
+				dom.EventHelper.stop(e, true);
+				const focused = submenuWidget.getFocusedElement();
+				if (focused?.item) {
+					focused.item.run();
+					const parentItem = this._currentSubmenuElement?.item;
+					this._hideSubmenu();
+					if (parentItem) {
+						this._delegate.onSelect(parentItem);
+					}
+					this.hide();
+				}
+			} else if (e.key === 'ArrowDown') {
+				dom.EventHelper.stop(e, true);
+				submenuWidget.focusNext();
+			} else if (e.key === 'ArrowUp') {
+				dom.EventHelper.stop(e, true);
+				submenuWidget.focusPrevious();
+			}
+		}));
+	}
+
+	private _hideSubmenu(): void {
+		this._cancelSubmenuHide();
+		this._cancelSubmenuShow();
+		this._submenuDisposables.clear();
+		this._currentSubmenuWidget = undefined;
+		this._currentSubmenuElement = undefined;
+		dom.clearNode(this._submenuContainer);
+		this._submenuContainer.style.display = 'none';
+	}
+
+	private _scheduleSubmenuHide(): void {
+		this._cancelSubmenuHide();
+		this._submenuHideTimeout = setTimeout(() => {
+			this._hideSubmenu();
+		}, 300);
+	}
+
+	private _cancelSubmenuHide(): void {
+		if (this._submenuHideTimeout !== undefined) {
+			clearTimeout(this._submenuHideTimeout);
+			this._submenuHideTimeout = undefined;
+		}
+	}
+
+	private _scheduleSubmenuShow(element: IActionListItem<T>, index: number | undefined): void {
+		this._cancelSubmenuShow();
+		this._submenuShowTimeout = setTimeout(() => {
+			this._submenuShowTimeout = undefined;
+			const rowElement = typeof index === 'number' ? this._getRowElement(index) : null;
+			if (rowElement) {
+				this._showSubmenuForElement(element, rowElement);
+			}
+		}, 300);
+	}
+
+	private _cancelSubmenuShow(): void {
+		if (this._submenuShowTimeout !== undefined) {
+			clearTimeout(this._submenuShowTimeout);
+			this._submenuShowTimeout = undefined;
+		}
 	}
 
 	private async onListHover(e: IListMouseEvent<IActionListItem<T>>) {
@@ -1119,9 +1394,13 @@ export class ActionList<T> extends Disposable {
 
 		if (element && element.item && this.focusCondition(element)) {
 			// Check if the hover target is inside a toolbar - if so, skip the splice
-			// to avoid re-rendering which would destroy the toolbar mid-hover
+			// to avoid re-rendering which would destroy the element mid-hover.
+			// But still maintain submenu state for items with submenu actions.
 			const isHoveringToolbar = dom.isHTMLElement(e.browserEvent.target) && e.browserEvent.target.closest('.action-list-item-toolbar') !== null;
 			if (isHoveringToolbar) {
+				if (!element.submenuActions?.length) {
+					this._cancelSubmenuShow();
+				}
 				this._list.setFocus([]);
 				return;
 			}
@@ -1129,7 +1408,25 @@ export class ActionList<T> extends Disposable {
 			// Set focus immediately for responsive hover feedback
 			this._list.setFocus(typeof e.index === 'number' ? [e.index] : []);
 
-			if (this._delegate.onHover && !element.disabled && element.kind === ActionListItemKind.Action) {
+			// Show submenu on row hover for items with submenu actions
+			if (element.submenuActions?.length) {
+				if (this._currentSubmenuElement === element) {
+					this._cancelSubmenuHide();
+					this._cancelSubmenuShow();
+				} else {
+					this._scheduleSubmenuShow(element, e.index);
+				}
+				return;
+			}
+
+			if (this._currentSubmenuElement === element) {
+				this._cancelSubmenuHide();
+			} else {
+				this._cancelSubmenuShow();
+				this._hideSubmenu();
+			}
+
+			if (this._delegate.onHover && !element.disabled && element.kind === ActionListItemKind.Action && this._currentSubmenuElement !== element) {
 				const result = await this._delegate.onHover(element.item, this.cts.token);
 				const canPreview = result ? result.canPreview : undefined;
 				if (canPreview !== element.canPreview) {
@@ -1158,6 +1455,167 @@ export class ActionList<T> extends Disposable {
 	}
 }
 
+/**
+ * An action list that wraps {@link ActionListWidget} with context-view positioning
+ * and anchor-based height computation.
+ */
+export class ActionList<T> extends Disposable {
+
+	private readonly _widget: ActionListWidget<T>;
+
+	private readonly _anchor: HTMLElement | StandardMouseEvent | IAnchor;
+	private _lastMinWidth = 0;
+	private _cachedMaxWidth: number | undefined;
+	private _hasLaidOut = false;
+	private _showAbove: boolean | undefined;
+
+	get domNode(): HTMLElement {
+		return this._widget.domNode;
+	}
+
+	get filterContainer(): HTMLElement | undefined {
+		return this._widget.filterContainer;
+	}
+
+	get filterInput(): HTMLInputElement | undefined {
+		return this._widget.filterInput;
+	}
+
+	/**
+	 * Returns the resolved anchor position after the first layout.
+	 * Used by the context view delegate to lock the dropdown direction.
+	 */
+	get anchorPosition(): AnchorPosition | undefined {
+		if (this._showAbove === undefined) {
+			return undefined;
+		}
+		return this._showAbove ? AnchorPosition.ABOVE : AnchorPosition.BELOW;
+	}
+
+	constructor(
+		user: string,
+		preview: boolean,
+		items: readonly IActionListItem<T>[],
+		_delegate: IActionListDelegate<T>,
+		accessibilityProvider: Partial<IListAccessibilityProvider<IActionListItem<T>>> | undefined,
+		options: IActionListOptions | undefined,
+		anchor: HTMLElement | StandardMouseEvent | IAnchor,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@ILayoutService private readonly _layoutService: ILayoutService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		this._anchor = anchor;
+
+		this._widget = this._register(instantiationService.createInstance(
+			ActionListWidget<T>,
+			user,
+			preview,
+			items,
+			_delegate,
+			accessibilityProvider,
+			options,
+		));
+
+		this._register(this._widget.onDidRequestLayout(() => {
+			if (this._hasLaidOut) {
+				this.layout(this._lastMinWidth);
+				this._contextViewService.layout();
+			}
+		}));
+	}
+
+	focus(): void {
+		this._widget.focus();
+	}
+
+	hide(didCancel?: boolean): void {
+		this._widget.hide(didCancel);
+		this._contextViewService.hideContextView();
+	}
+
+	clearFilter(): boolean {
+		return this._widget.clearFilter();
+	}
+
+	focusPrevious(): void {
+		this._widget.focusPrevious();
+	}
+
+	focusNext(): void {
+		this._widget.focusNext();
+	}
+
+	collapseFocusedSection(): void {
+		this._widget.collapseFocusedSection();
+	}
+
+	expandFocusedSection(): void {
+		this._widget.expandFocusedSection();
+	}
+
+	toggleFocusedSection(): boolean {
+		return this._widget.toggleFocusedSection();
+	}
+
+	acceptSelected(preview?: boolean): void {
+		this._widget.acceptSelected(preview);
+	}
+
+	private hasDynamicHeight(): boolean {
+		return this._widget.hasDynamicHeight;
+	}
+
+	private computeHeight(): number {
+		const listHeight = this._widget.computeListHeight();
+
+		const filterHeight = this._widget.filterContainer ? 36 : 0;
+		const padding = 10;
+		const targetWindow = dom.getWindow(this.domNode);
+		let availableHeight;
+
+		if (this.hasDynamicHeight()) {
+			const viewportHeight = targetWindow.innerHeight;
+			const anchorRect = getAnchorRect(this._anchor);
+			const anchorTopInViewport = anchorRect.top - targetWindow.pageYOffset;
+			const spaceBelow = viewportHeight - anchorTopInViewport - anchorRect.height - padding;
+			const spaceAbove = anchorTopInViewport - padding;
+
+			// Lock the direction on first layout based on whether the full
+			// unconstrained list fits below. Once decided, the dropdown stays
+			// in the same position even when the visible item count changes.
+			if (this._showAbove === undefined) {
+				const fullHeight = filterHeight + this._widget.computeFullHeight();
+				this._showAbove = fullHeight > spaceBelow && spaceAbove > spaceBelow;
+			}
+			availableHeight = this._showAbove ? spaceAbove : spaceBelow;
+		} else {
+			const windowHeight = this._layoutService.getContainer(targetWindow).clientHeight;
+			const widgetTop = this.domNode.getBoundingClientRect().top;
+			availableHeight = widgetTop > 0 ? windowHeight - widgetTop - padding : windowHeight * 0.7;
+		}
+
+		const viewportMaxHeight = Math.floor(targetWindow.innerHeight * 0.6);
+		const actionLineHeight = this._widget.lineHeight;
+		const maxHeight = Math.min(Math.max(availableHeight, actionLineHeight * 3 + filterHeight), viewportMaxHeight);
+		const height = Math.min(listHeight + filterHeight, maxHeight);
+		return height - filterHeight;
+	}
+
+	layout(minWidth: number): number {
+		this._hasLaidOut = true;
+		this._lastMinWidth = minWidth;
+
+		const listHeight = this.computeHeight();
+		this._widget.layout(listHeight);
+
+		this._cachedMaxWidth = this._widget.computeMaxWidth(minWidth);
+		this._widget.layout(listHeight, this._cachedMaxWidth);
+
+		return this._cachedMaxWidth;
+	}
+}
+
 function stripNewlines(str: string): string {
 	return str.replace(/\r\n|\r|\n/g, ' ');
 }
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.css b/src/vs/platform/actionWidget/browser/actionWidget.css
index 8957a85b01f..f6e19c33c6c 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.css
+++ b/src/vs/platform/actionWidget/browser/actionWidget.css
@@ -55,7 +55,7 @@
 
 /** Styles for each row in the list element **/
 .action-widget .monaco-list .monaco-list-row {
-	padding: 0 4px 0 8px;
+	padding: 0 12px 0 8px;
 	white-space: nowrap;
 	cursor: pointer;
 	touch-action: none;
@@ -119,7 +119,7 @@
 
 .action-widget .monaco-list-row.action {
 	display: flex;
-	gap: 8px;
+	gap: 6px;
 	align-items: center;
 }
 
@@ -160,14 +160,14 @@
 }
 
 .action-widget .monaco-list-row.action .monaco-keybinding > .monaco-keybinding-key {
-		background-color: var(--vscode-keybindingLabel-background);
-		color: var(--vscode-keybindingLabel-foreground);
-		border-style: solid;
-		border-width: 1px;
-		border-radius: 3px;
-		border-color: var(--vscode-keybindingLabel-border);
-		border-bottom-color: var(--vscode-keybindingLabel-bottomBorder);
-		box-shadow: inset 0 -1px 0 var(--vscode-widget-shadow);
+	background-color: var(--vscode-keybindingLabel-background);
+	color: var(--vscode-keybindingLabel-foreground);
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-color: var(--vscode-keybindingLabel-border);
+	border-bottom-color: var(--vscode-keybindingLabel-bottomBorder);
+	box-shadow: inset 0 -1px 0 var(--vscode-widget-shadow);
 }
 
 /* Action bar */
@@ -221,15 +221,18 @@
 .action-widget .description-below .monaco-list .monaco-list-row.action {
 	flex-wrap: wrap;
 	align-content: center;
-	padding-top: 6px;
 	padding-right: 2px;
 
+	&:has(.description:not([style*="display: none"])) {
+		padding-top: 6px;
+	}
+
 	.title {
 		line-height: 14px;
 	}
 
 	.description {
-		display: block !important;
+		display: block;
 		width: 100%;
 		margin-left: 0;
 		padding-left: 20px;
@@ -252,7 +255,7 @@
 	display: flex;
 }
 
-.action-widget .monaco-list-row .action-list-item-toolbar .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover{
+.action-widget .monaco-list-row .action-list-item-toolbar .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover {
 	background-color: var(--vscode-toolbar-hoverBackground);
 }
 
@@ -272,6 +275,7 @@
 	display: flex;
 	align-items: center;
 	gap: 4px;
+	padding-right: 10px;
 }
 
 .action-widget .action-list-filter:first-child {
@@ -310,3 +314,37 @@
 .action-widget .action-list-filter-actions .action-label:hover {
 	background-color: var(--vscode-toolbar-hoverBackground);
 }
+
+/* Anchor for the absolutely-positioned submenu panel */
+.action-widget .actionList {
+	position: relative;
+}
+
+.action-widget .action-list-submenu-indicator {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 20px;
+	height: 20px;
+	flex-shrink: 0;
+	border-radius: 4px;
+}
+
+.action-widget .action-list-submenu-indicator.has-submenu {
+	opacity: 0.6;
+}
+
+.action-widget .monaco-list-row.action .action-list-submenu-indicator.codicon {
+	display: flex;
+	font-size: 16px;
+}
+
+.action-list-submenu-panel {
+	background-color: var(--vscode-menu-background);
+	color: var(--vscode-menu-foreground);
+	border: 1px solid var(--vscode-menu-border, var(--vscode-editorHoverWidget-border));
+	border-radius: 5px;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	z-index: 50;
+	width: fit-content;
+}
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.ts b/src/vs/platform/actionWidget/browser/actionWidget.ts
index 58792a384ff..32af92b7733 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.ts
+++ b/src/vs/platform/actionWidget/browser/actionWidget.ts
@@ -174,9 +174,9 @@ class ActionWidgetService extends Disposable implements IActionWidgetService {
 
 		const focusTracker = renderDisposables.add(dom.trackFocus(element));
 		renderDisposables.add(focusTracker.onDidBlur(() => {
-			// Don't hide if focus moved to a hover that belongs to this action widget
+			// Don't hide if focus moved to a hover or submenu that belongs to this action widget
 			const activeElement = dom.getActiveElement();
-			if (activeElement?.closest('.action-widget-hover')) {
+			if (activeElement?.closest('.action-widget-hover') || activeElement?.closest('.action-list-submenu-panel')) {
 				return;
 			}
 			this.hide(true);
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 5c1cf404a4c..b835d1cdd08 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -170,6 +170,7 @@ export class MenuId {
 	static readonly TestCoverageFilterItem = new MenuId('TestCoverageFilterItem');
 	static readonly TouchBarContext = new MenuId('TouchBarContext');
 	static readonly TitleBar = new MenuId('TitleBar');
+	static readonly TitleBarAdjacentCenter = new MenuId('TitleBarAdjacentCenter');
 	static readonly TitleBarContext = new MenuId('TitleBarContext');
 	static readonly TitleBarTitleContext = new MenuId('TitleBarTitleContext');
 	static readonly TunnelContext = new MenuId('TunnelContext');
@@ -262,6 +263,8 @@ export class MenuId {
 	static readonly ChatEditingWidgetToolbar = new MenuId('ChatEditingWidgetToolbar');
 	static readonly ChatEditingSessionChangesToolbar = new MenuId('ChatEditingSessionChangesToolbar');
 	static readonly ChatEditingSessionApplySubmenu = new MenuId('ChatEditingSessionApplySubmenu');
+	static readonly ChatEditingSessionTitleToolbar = new MenuId('ChatEditingSessionTitleToolbar');
+	static readonly ChatEditingSessionChangeToolbar = new MenuId('ChatEditingSessionChangeToolbar');
 	static readonly ChatEditingSessionChangesVersionsSubmenu = new MenuId('ChatEditingSessionChangesVersionsSubmenu');
 	static readonly ChatEditingEditorContent = new MenuId('ChatEditingEditorContent');
 	static readonly ChatEditingEditorHunk = new MenuId('ChatEditingEditorHunk');
@@ -308,6 +311,7 @@ export class MenuId {
 	static readonly ChatViewSessionTitleNavigationToolbar = new MenuId('ChatViewSessionTitleNavigationToolbar');
 	static readonly ChatViewSessionTitleToolbar = new MenuId('ChatViewSessionTitleToolbar');
 	static readonly ChatContextUsageActions = new MenuId('ChatContextUsageActions');
+	static readonly MarkerHoverStatusBar = new MenuId('MarkerHoverParticipant.StatusBar');
 
 	/**
 	 * Create or reuse a `MenuId` with the given identifier
diff --git a/src/vs/platform/agentHost/common/agent.ts b/src/vs/platform/agentHost/common/agent.ts
new file mode 100644
index 00000000000..c649a047d99
--- /dev/null
+++ b/src/vs/platform/agentHost/common/agent.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IChannelClient } from '../../../base/parts/ipc/common/ipc.js';
+
+// Agent host process starter and connection abstractions.
+// Used by the main process to spawn and connect to the agent host utility process.
+
+export interface IAgentHostConnection {
+	readonly client: IChannelClient;
+	readonly store: DisposableStore;
+	readonly onDidProcessExit: Event<{ code: number; signal: string }>;
+}
+
+export interface IAgentHostStarter extends IDisposable {
+	readonly onRequestConnection?: Event<void>;
+	readonly onWillShutdown?: Event<void>;
+
+	/**
+	 * Creates the agent host utility process and connects to it.
+	 */
+	start(): IAgentHostConnection;
+}
diff --git a/src/vs/platform/agentHost/common/agentHostFileSystemProvider.ts b/src/vs/platform/agentHost/common/agentHostFileSystemProvider.ts
new file mode 100644
index 00000000000..54eba157fb3
--- /dev/null
+++ b/src/vs/platform/agentHost/common/agentHostFileSystemProvider.ts
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { basename, dirname } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { createFileSystemProviderError, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProvider, IFileWriteOptions, IStat } from '../../files/common/files.js';
+import { type IAgentConnection } from './agentService.js';
+import { fromAgentHostUri, toAgentHostUri } from './agentHostUri.js';
+import { IDirectoryEntry } from './state/protocol/commands.js';
+
+
+/**
+ * Build a {@link AGENT_HOST_SCHEME} URI for a given connection authority
+ * and remote path. Assumes the remote path is a `file://` resource.
+ */
+export function agentHostUri(authority: string, path: string): URI {
+	return toAgentHostUri(URI.file(path), authority);
+}
+
+/**
+ * Extract the remote filesystem path from a {@link AGENT_HOST_SCHEME} URI.
+ */
+export function agentHostRemotePath(uri: URI): string {
+	return fromAgentHostUri(uri).path;
+}
+
+/**
+ * Read-only {@link IFileSystemProvider} that proxies filesystem operations
+ * through the agent host protocol.
+ *
+ * Registered under the {@link AGENT_HOST_SCHEME} scheme. URIs encode the
+ * original scheme and authority in the path so any remote resource can be
+ * represented (not just `file://`):
+ *
+ * ```
+ * vscode-agent-host://[connectionAuthority]/[originalScheme]/[originalAuthority]/[originalPath]
+ * ```
+ *
+ * Individual connections are identified by the URI's authority component,
+ * which is the sanitized remote address.
+ */
+export class AgentHostFileSystemProvider extends Disposable implements IFileSystemProvider {
+
+	readonly capabilities =
+		FileSystemProviderCapabilities.Readonly |
+		FileSystemProviderCapabilities.PathCaseSensitive |
+		FileSystemProviderCapabilities.FileReadWrite; // required for the file service to resolve directory contents
+
+	private readonly _onDidChangeCapabilities = this._register(new Emitter<void>());
+	readonly onDidChangeCapabilities = this._onDidChangeCapabilities.event;
+
+	private readonly _onDidChangeFile = this._register(new Emitter<readonly IFileChange[]>());
+	readonly onDidChangeFile = this._onDidChangeFile.event;
+
+	private readonly _authorityToConnection = new Map<string, IAgentConnection>();
+
+	/**
+	 * Register a mapping from a URI authority to an agent connection.
+	 * Returns a disposable that unregisters the mapping.
+	 */
+	registerAuthority(authority: string, connection: IAgentConnection): IDisposable {
+		this._authorityToConnection.set(authority, connection);
+		return toDisposable(() => this._authorityToConnection.delete(authority));
+	}
+
+	watch(): IDisposable {
+		return Disposable.None;
+	}
+
+	async stat(resource: URI): Promise<IStat> {
+		const path = resource.path;
+
+		// Root directory - either the bare scheme root or the root of the
+		// decoded remote filesystem (e.g. `/file/-/` decodes to `file:///`).
+		if (path === '/' || path === '') {
+			return { type: FileType.Directory, mtime: 0, ctime: 0, size: 0, permissions: FilePermission.Readonly };
+		}
+		const decodedPath = fromAgentHostUri(resource).path;
+		if (decodedPath === '/' || decodedPath === '') {
+			return { type: FileType.Directory, mtime: 0, ctime: 0, size: 0, permissions: FilePermission.Readonly };
+		}
+
+		// Use URI dirname/basename to find the parent and entry name
+		const parentUri = dirname(resource);
+		const name = basename(resource);
+
+		const entries = await this._listDirectory(resource.authority, parentUri);
+		const entry = entries.find(e => e.name === name);
+		if (!entry) {
+			throw createFileSystemProviderError(`File not found: ${path}`, FileSystemProviderErrorCode.FileNotFound);
+		}
+
+		return {
+			type: entry.type === 'directory' ? FileType.Directory : FileType.File,
+			mtime: 0,
+			ctime: 0,
+			size: 0,
+			permissions: FilePermission.Readonly,
+		};
+	}
+
+	async readdir(resource: URI): Promise<[string, FileType][]> {
+		const entries = await this._listDirectory(resource.authority, resource);
+		return entries.map(e => [e.name, e.type === 'directory' ? FileType.Directory : FileType.File]);
+	}
+
+	// ---- Read-only stubs (required by interface) ----------------------------
+
+	async readFile(resource: URI): Promise<Uint8Array> {
+		const connection = this._getConnection(resource.authority);
+		try {
+			const originalUri = fromAgentHostUri(resource);
+			const result = await connection.fetchContent(originalUri);
+			return VSBuffer.fromString(result.data).buffer;
+		} catch (err) {
+			throw createFileSystemProviderError(
+				err instanceof Error ? err.message : String(err),
+				FileSystemProviderErrorCode.FileNotFound,
+			);
+		}
+	}
+
+	async writeFile(_resource: URI, _content: Uint8Array, _opts: IFileWriteOptions): Promise<void> {
+		throw createFileSystemProviderError('writeFile not supported on remote agent host filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	async mkdir(): Promise<void> {
+		throw createFileSystemProviderError('mkdir not supported on remote agent host filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	async delete(_resource: URI, _opts: IFileDeleteOptions): Promise<void> {
+		throw createFileSystemProviderError('delete not supported on remote agent host filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	async rename(_from: URI, _to: URI, _opts: IFileOverwriteOptions): Promise<void> {
+		throw createFileSystemProviderError('rename not supported on remote agent host filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	// ---- Internals ----------------------------------------------------------
+
+	private _getConnection(authority: string) {
+		const connection = this._authorityToConnection.get(authority);
+		if (!connection) {
+			throw createFileSystemProviderError(`No connection for authority: ${authority}`, FileSystemProviderErrorCode.Unavailable);
+		}
+		return connection;
+	}
+
+	private async _listDirectory(authority: string, resource: URI): Promise<readonly IDirectoryEntry[]> {
+		const connection = this._getConnection(authority);
+		try {
+			const originalUri = fromAgentHostUri(resource);
+			const result = await connection.browseDirectory(originalUri);
+			return result.entries;
+		} catch (err) {
+			throw createFileSystemProviderError(
+				err instanceof Error ? err.message : String(err),
+				FileSystemProviderErrorCode.Unavailable,
+			);
+		}
+	}
+}
diff --git a/src/vs/platform/agentHost/common/agentHostUri.ts b/src/vs/platform/agentHost/common/agentHostUri.ts
new file mode 100644
index 00000000000..773bce4e676
--- /dev/null
+++ b/src/vs/platform/agentHost/common/agentHostUri.ts
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { encodeBase64, VSBuffer } from '../../../base/common/buffer.js';
+import { URI } from '../../../base/common/uri.js';
+import type { ResourceLabelFormatter } from '../../label/common/label.js';
+
+/**
+ * The URI scheme for accessing files on a remote agent host.
+ *
+ * URIs encode the original scheme, authority, and path so that any
+ * remote resource can be represented without assuming `file://`:
+ *
+ * ```
+ * vscode-agent-host://[connectionAuthority]/[originalScheme]/[originalAuthority]/[originalPath]
+ * ```
+ *
+ * For example, `file:///home/user/foo.ts` on remote `my-server` becomes:
+ * ```
+ * vscode-agent-host://my-server/file//home/user/foo.ts
+ * ```
+ */
+export const AGENT_HOST_SCHEME = 'vscode-agent-host';
+
+/**
+ * Wraps a remote URI into a {@link AGENT_HOST_SCHEME} URI that can be
+ * resolved through the agent host filesystem provider.
+ *
+ * @param originalUri The URI on the remote (e.g. `file:///path` or
+ *   `agenthost-content:///sessionId/...`)
+ * @param connectionAuthority The sanitized connection identifier used as
+ *   the URI authority (from {@link agentHostAuthority}).
+ */
+export function toAgentHostUri(originalUri: URI, connectionAuthority: string): URI {
+	if (connectionAuthority === 'local') {
+		return originalUri;
+	}
+
+	// Path format: /[originalScheme]/[originalAuthority]/[originalPath]
+	const originalAuthority = originalUri.authority || '';
+	return URI.from({
+		scheme: AGENT_HOST_SCHEME,
+		authority: connectionAuthority,
+		path: `/${originalUri.scheme}/${originalAuthority || '-'}${originalUri.path}`,
+	});
+}
+
+/**
+ * Extracts the original URI from a {@link AGENT_HOST_SCHEME} URI.
+ *
+ * The inverse of {@link toAgentHostUri}.
+ */
+export function fromAgentHostUri(agentHostUri: URI): URI {
+	// Path: /[originalScheme]/[originalAuthority]/[rest of original path]
+	const path = agentHostUri.path;
+
+	// Find first segment boundary after leading /
+	const schemeEnd = path.indexOf('/', 1);
+	if (schemeEnd === -1) {
+		// Malformed — treat whole path as file scheme
+		return URI.from({ scheme: 'file', path });
+	}
+
+	const originalScheme = path.substring(1, schemeEnd);
+
+	// Find second segment boundary (authority/path split)
+	const authorityEnd = path.indexOf('/', schemeEnd + 1);
+	if (authorityEnd === -1) {
+		// No path after authority
+		const originalAuthority = path.substring(schemeEnd + 1);
+		return URI.from({ scheme: originalScheme, authority: originalAuthority, path: '/' });
+	}
+
+	let originalAuthority = path.substring(schemeEnd + 1, authorityEnd);
+	if (originalAuthority === '-') {
+		originalAuthority = '';
+	}
+
+	const originalPath = path.substring(authorityEnd);
+
+	return URI.from({
+		scheme: originalScheme,
+		authority: originalAuthority || undefined,
+		path: originalPath,
+	});
+}
+
+/**
+ * Strips the redundant `ws://` scheme from an address. The transport layer
+ * already defaults to `ws://`, so only `wss://` needs to be preserved.
+ */
+export function normalizeRemoteAgentHostAddress(address: string): string {
+	if (address.startsWith('ws://')) {
+		return address.slice('ws://'.length);
+	}
+	return address;
+}
+
+/**
+ * Encode a remote address into an identifier that is safe for use in
+ * both URI schemes and URI authorities, and is collision-free.
+ *
+ * Three tiers:
+ * 1. Purely alphanumeric addresses are returned as-is.
+ * 2. "Normal" addresses containing only `[a-zA-Z0-9.:-]` get colons
+ *    replaced with `__` (double underscore) for human readability.
+ *    Addresses containing `_` skip this tier to keep the encoding
+ *    collision-free (`__` can only appear from colon replacement).
+ * 3. Everything else is url-safe base64-encoded with a `b64-` prefix.
+ */
+export function agentHostAuthority(address: string): string {
+	const normalized = normalizeRemoteAgentHostAddress(address);
+	if (/^[a-zA-Z0-9]+$/.test(normalized)) {
+		return normalized;
+	}
+	if (/^[a-zA-Z0-9.:\-]+$/.test(normalized)) {
+		return normalized.replaceAll(':', '__');
+	}
+	return 'b64-' + encodeBase64(VSBuffer.fromString(normalized), false, true);
+}
+
+/**
+ * Label formatter for {@link AGENT_HOST_SCHEME} URIs. Strips the two
+ * leading path segments (`/scheme/authority`) to display the original
+ * file path.
+ */
+export const AGENT_HOST_LABEL_FORMATTER: ResourceLabelFormatter = {
+	scheme: AGENT_HOST_SCHEME,
+	formatting: {
+		label: '${path}',
+		separator: '/',
+		stripPathSegments: 2,
+	},
+};
diff --git a/src/vs/platform/agentHost/common/agentService.ts b/src/vs/platform/agentHost/common/agentService.ts
new file mode 100644
index 00000000000..0c99ed3addc
--- /dev/null
+++ b/src/vs/platform/agentHost/common/agentService.ts
@@ -0,0 +1,481 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../base/common/event.js';
+import { IAuthorizationProtectedResourceMetadata } from '../../../base/common/oauth.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import type { IActionEnvelope, INotification, ISessionAction } from './state/sessionActions.js';
+import type { IBrowseDirectoryResult, IFetchContentResult, IStateSnapshot } from './state/sessionProtocol.js';
+import { AttachmentType, type IPendingMessage, type IToolCallResult, type PolicyState, type StringOrMarkdown } from './state/sessionState.js';
+
+// IPC contract between the renderer and the agent host utility process.
+// Defines all serializable event types, the IAgent provider interface,
+// and the IAgentService / IAgentHostService service decorators.
+
+export const enum AgentHostIpcChannels {
+	/** Channel for the agent host service on the main-process side */
+	AgentHost = 'agentHost',
+	/** Channel for log forwarding from the agent host process */
+	Logger = 'agentHostLogger',
+	/** Channel for WebSocket client connection count (server process management only) */
+	ConnectionTracker = 'agentHostConnectionTracker',
+}
+
+/** Configuration key that controls whether the agent host process is spawned. */
+export const AgentHostEnabledSettingId = 'chat.agentHost.enabled';
+
+/** Configuration key that controls whether per-host IPC traffic output channels are created. */
+export const AgentHostIpcLoggingSettingId = 'chat.agentHost.ipcLoggingEnabled';
+
+// ---- IPC data types (serializable across MessagePort) -----------------------
+
+export interface IAgentSessionMetadata {
+	readonly session: URI;
+	readonly startTime: number;
+	readonly modifiedTime: number;
+	readonly summary?: string;
+	readonly workingDirectory?: string;
+}
+
+export type AgentProvider = string;
+
+/** Metadata describing an agent backend, discovered over IPC. */
+export interface IAgentDescriptor {
+	readonly provider: AgentProvider;
+	readonly displayName: string;
+	readonly description: string;
+	/**
+	 * Whether the renderer should push a GitHub auth token for this agent.
+	 * @deprecated Use {@link IResourceMetadata.resources} from {@link IAgentService.getResourceMetadata} instead.
+	 */
+	readonly requiresAuth: boolean;
+}
+
+// ---- Auth types (RFC 9728 / RFC 6750 inspired) -----------------------------
+
+/**
+ * Describes the agent host as an OAuth 2.0 protected resource.
+ * Uses {@link IAuthorizationProtectedResourceMetadata} from RFC 9728
+ * to describe auth requirements, enabling clients to resolve tokens
+ * using the standard VS Code authentication service.
+ *
+ * Returned from the server via {@link IAgentService.getResourceMetadata}.
+ */
+export interface IResourceMetadata {
+	/**
+	 * Protected resources the agent host requires authentication for.
+	 * Each entry uses the standard RFC 9728 shape so clients can resolve
+	 * tokens via {@link IAuthenticationService.getOrActivateProviderIdForServer}.
+	 */
+	readonly resources: readonly IAuthorizationProtectedResourceMetadata[];
+}
+
+/**
+ * Parameters for the `authenticate` command.
+ * Analogous to sending `Authorization: Bearer <token>` (RFC 6750 section 2.1).
+ */
+export interface IAuthenticateParams {
+	/**
+	 * The `resource` identifier from the server's
+	 * {@link IAuthorizationProtectedResourceMetadata} that this token targets.
+	 */
+	readonly resource: string;
+
+	/** The bearer token value (RFC 6750). */
+	readonly token: string;
+}
+
+/**
+ * Result of the `authenticate` command.
+ */
+export interface IAuthenticateResult {
+	/** Whether the token was accepted. */
+	readonly authenticated: boolean;
+}
+
+export interface IAgentCreateSessionConfig {
+	readonly provider?: AgentProvider;
+	readonly model?: string;
+	readonly session?: URI;
+	readonly workingDirectory?: string;
+}
+
+/** Serializable attachment passed alongside a message to the agent host. */
+export interface IAgentAttachment {
+	readonly type: AttachmentType;
+	readonly path: string;
+	readonly displayName?: string;
+	/** For selections: the selected text. */
+	readonly text?: string;
+	/** For selections: line/character range. */
+	readonly selection?: {
+		readonly start: { readonly line: number; readonly character: number };
+		readonly end: { readonly line: number; readonly character: number };
+	};
+}
+
+/** Serializable model information from the agent host. */
+export interface IAgentModelInfo {
+	readonly provider: AgentProvider;
+	readonly id: string;
+	readonly name: string;
+	readonly maxContextWindow: number;
+	readonly supportsVision: boolean;
+	readonly supportsReasoningEffort: boolean;
+	readonly supportedReasoningEfforts?: readonly string[];
+	readonly defaultReasoningEffort?: string;
+	readonly policyState?: PolicyState;
+	readonly billingMultiplier?: number;
+}
+
+// ---- Progress events (discriminated union by `type`) ------------------------
+
+interface IAgentProgressEventBase {
+	readonly session: URI;
+}
+
+/** Streaming text delta from the assistant (`assistant.message_delta`). */
+export interface IAgentDeltaEvent extends IAgentProgressEventBase {
+	readonly type: 'delta';
+	readonly messageId: string;
+	readonly content: string;
+	readonly parentToolCallId?: string;
+}
+
+/** A complete assistant message (`assistant.message`), used for history reconstruction. */
+export interface IAgentMessageEvent extends IAgentProgressEventBase {
+	readonly type: 'message';
+	readonly role: 'user' | 'assistant';
+	readonly messageId: string;
+	readonly content: string;
+	readonly toolRequests?: readonly {
+		readonly toolCallId: string;
+		readonly name: string;
+		/** Serialized JSON of arguments, if available. */
+		readonly arguments?: string;
+		readonly type?: 'function' | 'custom';
+	}[];
+	readonly reasoningOpaque?: string;
+	readonly reasoningText?: string;
+	readonly encryptedContent?: string;
+	readonly parentToolCallId?: string;
+}
+
+/** The session has finished processing and is waiting for input (`session.idle`). */
+export interface IAgentIdleEvent extends IAgentProgressEventBase {
+	readonly type: 'idle';
+}
+
+/** A tool has started executing (`tool.execution_start`). */
+export interface IAgentToolStartEvent extends IAgentProgressEventBase {
+	readonly type: 'tool_start';
+	readonly toolCallId: string;
+	readonly toolName: string;
+	/** Human-readable display name for this tool. */
+	readonly displayName: string;
+	/** Message describing the tool invocation in progress (e.g., "Running `echo hello`"). */
+	readonly invocationMessage: string;
+	/** A representative input string for display in the UI (e.g., the shell command). */
+	readonly toolInput?: string;
+	/** Hint for the renderer about how to display this tool (e.g., 'terminal' for shell commands). */
+	readonly toolKind?: 'terminal';
+	/** Language identifier for syntax highlighting (e.g., 'shellscript', 'powershell'). Used with toolKind 'terminal'. */
+	readonly language?: string;
+	/** Serialized JSON of the tool arguments, if available. */
+	readonly toolArguments?: string;
+	readonly mcpServerName?: string;
+	readonly mcpToolName?: string;
+	readonly parentToolCallId?: string;
+}
+
+/** A tool has finished executing (`tool.execution_complete`). */
+export interface IAgentToolCompleteEvent extends IAgentProgressEventBase {
+	readonly type: 'tool_complete';
+	readonly toolCallId: string;
+	/** Tool execution result, matching the protocol {@link IToolCallResult} shape. */
+	readonly result: IToolCallResult;
+	readonly isUserRequested?: boolean;
+	/** Serialized JSON of tool-specific telemetry data. */
+	readonly toolTelemetry?: string;
+	readonly parentToolCallId?: string;
+}
+
+/** The session title has been updated. */
+export interface IAgentTitleChangedEvent extends IAgentProgressEventBase {
+	readonly type: 'title_changed';
+	readonly title: string;
+}
+
+/** An error occurred during session processing. */
+export interface IAgentErrorEvent extends IAgentProgressEventBase {
+	readonly type: 'error';
+	readonly errorType: string;
+	readonly message: string;
+	readonly stack?: string;
+}
+
+/** Token usage information for a request. */
+export interface IAgentUsageEvent extends IAgentProgressEventBase {
+	readonly type: 'usage';
+	readonly inputTokens?: number;
+	readonly outputTokens?: number;
+	readonly model?: string;
+	readonly cacheReadTokens?: number;
+}
+
+/**
+ * A running tool requires re-confirmation (e.g. a mid-execution permission check).
+ * Maps to `SessionToolCallReady` without `confirmed` to transition Running → PendingConfirmation.
+ */
+export interface IAgentToolReadyEvent extends IAgentProgressEventBase {
+	readonly type: 'tool_ready';
+	readonly toolCallId: string;
+	/** Message describing what confirmation is needed. */
+	readonly invocationMessage: StringOrMarkdown;
+	/** Raw tool input to display. */
+	readonly toolInput?: string;
+	/** Short title for the confirmation prompt. */
+	readonly confirmationTitle?: StringOrMarkdown;
+}
+
+/** Streaming reasoning/thinking content from the assistant. */
+export interface IAgentReasoningEvent extends IAgentProgressEventBase {
+	readonly type: 'reasoning';
+	readonly content: string;
+}
+
+export type IAgentProgressEvent =
+	| IAgentDeltaEvent
+	| IAgentMessageEvent
+	| IAgentIdleEvent
+	| IAgentToolStartEvent
+	| IAgentToolReadyEvent
+	| IAgentToolCompleteEvent
+	| IAgentTitleChangedEvent
+	| IAgentErrorEvent
+	| IAgentUsageEvent
+	| IAgentReasoningEvent;
+
+// ---- Session URI helpers ----------------------------------------------------
+
+export namespace AgentSession {
+
+	/**
+	 * Creates a session URI from a provider name and raw session ID.
+	 * The URI scheme is the provider name (e.g., `copilot:/<rawId>`).
+	 */
+	export function uri(provider: AgentProvider, rawSessionId: string): URI {
+		return URI.from({ scheme: provider, path: `/${rawSessionId}` });
+	}
+
+	/**
+	 * Extracts the raw session ID from a session URI (the path without leading slash).
+	 * Accepts both a URI object and a URI string.
+	 */
+	export function id(session: URI | string): string {
+		const parsed = typeof session === 'string' ? URI.parse(session) : session;
+		return parsed.path.substring(1);
+	}
+
+	/**
+	 * Extracts the provider name from a session URI scheme.
+	 * Accepts both a URI object and a URI string.
+	 */
+	export function provider(session: URI | string): AgentProvider | undefined {
+		const parsed = typeof session === 'string' ? URI.parse(session) : session;
+		return parsed.scheme || undefined;
+	}
+}
+
+// ---- Agent provider interface -----------------------------------------------
+
+/**
+ * Implemented by each agent backend (e.g. Copilot SDK).
+ * The {@link IAgentService} dispatches to the appropriate agent based on
+ * the agent id.
+ */
+export interface IAgent {
+	/** Unique identifier for this provider (e.g. `'copilot'`). */
+	readonly id: AgentProvider;
+
+	/** Fires when the provider streams progress for a session. */
+	readonly onDidSessionProgress: Event<IAgentProgressEvent>;
+
+	/** Create a new session. Returns the session URI. */
+	createSession(config?: IAgentCreateSessionConfig): Promise<URI>;
+
+	/** Send a user message into an existing session. */
+	sendMessage(session: URI, prompt: string, attachments?: IAgentAttachment[]): Promise<void>;
+
+	/**
+	 * Called when the session's pending (steering) message changes.
+	 * The agent harness decides how to react — e.g. inject steering
+	 * mid-turn via `mode: 'immediate'`.
+	 *
+	 * Queued messages are consumed on the server side and are not
+	 * forwarded to the agent; `queuedMessages` will always be empty.
+	 */
+	setPendingMessages?(session: URI, steeringMessage: IPendingMessage | undefined, queuedMessages: readonly IPendingMessage[]): void;
+
+	/** Retrieve all session events/messages for reconstruction. */
+	getSessionMessages(session: URI): Promise<(IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[]>;
+
+	/** Dispose a session, freeing resources. */
+	disposeSession(session: URI): Promise<void>;
+
+	/** Abort the current turn, stopping any in-flight processing. */
+	abortSession(session: URI): Promise<void>;
+
+	/** Change the model for an existing session. */
+	changeModel(session: URI, model: string): Promise<void>;
+
+	/** Respond to a pending permission request from the SDK. */
+	respondToPermissionRequest(requestId: string, approved: boolean): void;
+
+	/** Return the descriptor for this agent. */
+	getDescriptor(): IAgentDescriptor;
+
+	/** List available models from this provider. */
+	listModels(): Promise<IAgentModelInfo[]>;
+
+	/** List persisted sessions from this provider. */
+	listSessions(): Promise<IAgentSessionMetadata[]>;
+
+	/** Declare protected resources this agent requires auth for (RFC 9728). */
+	getProtectedResources(): IAuthorizationProtectedResourceMetadata[];
+
+	/**
+	 * Authenticate for a specific resource. Returns true if accepted.
+	 * The `resource` matches {@link IAuthorizationProtectedResourceMetadata.resource}.
+	 */
+	authenticate(resource: string, token: string): Promise<boolean>;
+
+	/** Gracefully shut down all sessions. */
+	shutdown(): Promise<void>;
+
+	/** Dispose this provider and all its resources. */
+	dispose(): void;
+}
+
+// ---- Service interfaces -----------------------------------------------------
+
+export const IAgentService = createDecorator<IAgentService>('agentService');
+
+/**
+ * Service contract for communicating with the agent host process. Methods here
+ * are proxied across MessagePort via `ProxyChannel`.
+ *
+ * State is synchronized via the subscribe/unsubscribe/dispatchAction protocol.
+ * Clients observe root state (agents, models) and session state via subscriptions,
+ * and mutate state by dispatching actions (e.g. session/turnStarted, session/turnCancelled).
+ */
+export interface IAgentService {
+	readonly _serviceBrand: undefined;
+
+	/** Discover available agent backends from the agent host. */
+	listAgents(): Promise<IAgentDescriptor[]>;
+
+	/**
+	 * Retrieve the resource metadata describing auth requirements.
+	 * Modeled on RFC 9728 (OAuth 2.0 Protected Resource Metadata).
+	 */
+	getResourceMetadata(): Promise<IResourceMetadata>;
+
+	/**
+	 * Authenticate for a protected resource on the server.
+	 * The {@link IAuthenticateParams.resource} must match a resource from
+	 * {@link getResourceMetadata}. Analogous to RFC 6750 bearer token delivery.
+	 */
+	authenticate(params: IAuthenticateParams): Promise<IAuthenticateResult>;
+
+	/**
+	 * Refresh the model list from all providers, publishing updated
+	 * agents (with models) to root state via `root/agentsChanged`.
+	 */
+	refreshModels(): Promise<void>;
+
+	/** List all available sessions from the Copilot CLI. */
+	listSessions(): Promise<IAgentSessionMetadata[]>;
+
+	/** Create a new session. Returns the session URI. */
+	createSession(config?: IAgentCreateSessionConfig): Promise<URI>;
+
+	/** Dispose a session in the agent host, freeing SDK resources. */
+	disposeSession(session: URI): Promise<void>;
+
+	/** Gracefully shut down all sessions and the underlying client. */
+	shutdown(): Promise<void>;
+
+	// ---- Protocol methods (sessions process protocol) ----------------------
+
+	/**
+	 * Subscribe to state at the given URI. Returns a snapshot of the current
+	 * state and the serverSeq at snapshot time. Subsequent actions for this
+	 * resource arrive via {@link onDidAction}.
+	 */
+	subscribe(resource: URI): Promise<IStateSnapshot>;
+
+	/** Unsubscribe from state updates for the given URI. */
+	unsubscribe(resource: URI): void;
+
+	/**
+	 * Fires when the server applies an action to subscribable state.
+	 * Clients use this alongside {@link subscribe} to keep their local
+	 * state in sync.
+	 */
+	readonly onDidAction: Event<IActionEnvelope>;
+
+	/**
+	 * Fires when the server broadcasts an ephemeral notification
+	 * (e.g. sessionAdded, sessionRemoved).
+	 */
+	readonly onDidNotification: Event<INotification>;
+
+	/**
+	 * Dispatch a client-originated action to the server. The server applies
+	 * it to state, triggers side effects, and echoes it back via
+	 * {@link onDidAction} with the client's origin for reconciliation.
+	 */
+	dispatchAction(action: ISessionAction, clientId: string, clientSeq: number): void;
+
+	/**
+	 * List the contents of a directory on the agent host's filesystem.
+	 * Used by the client to drive a remote folder picker before session creation.
+	 */
+	browseDirectory(uri: URI): Promise<IBrowseDirectoryResult>;
+
+	/**
+	 * Fetch stored content by URI from the agent host (e.g. file edit snapshots,
+	 * or reading files from the remote filesystem).
+	 */
+	fetchContent(uri: URI): Promise<IFetchContentResult>;
+}
+
+/**
+ * A concrete connection to an agent host - local utility process or remote
+ * WebSocket. Extends the core protocol surface with a `clientId` used for
+ * write-ahead reconciliation. Both {@link IAgentHostService} (local) and
+ * per-connection objects from {@link IRemoteAgentHostService} (remote)
+ * satisfy this contract.
+ */
+export interface IAgentConnection extends IAgentService {
+	/** Unique identifier for this client connection, used as the origin in action envelopes. */
+	readonly clientId: string;
+}
+
+export const IAgentHostService = createDecorator<IAgentHostService>('agentHostService');
+
+/**
+ * The local wrapper around the agent host process (manages lifecycle, restart,
+ * exposes the proxied service). Consumed by the main process and workbench.
+ */
+export interface IAgentHostService extends IAgentConnection {
+
+	readonly onAgentHostExit: Event<number>;
+	readonly onAgentHostStart: Event<void>;
+
+	restartAgentHost(): Promise<void>;
+}
diff --git a/src/vs/platform/agentHost/common/remoteAgentHostService.ts b/src/vs/platform/agentHost/common/remoteAgentHostService.ts
new file mode 100644
index 00000000000..33a7f544e8a
--- /dev/null
+++ b/src/vs/platform/agentHost/common/remoteAgentHostService.ts
@@ -0,0 +1,169 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../base/common/event.js';
+import { connectionTokenQueryName } from '../../../base/common/network.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import type { IAgentConnection } from './agentService.js';
+
+/** Configuration key for the list of remote agent host addresses. */
+export const RemoteAgentHostsSettingId = 'chat.remoteAgentHosts';
+
+/** Configuration key to enable remote agent host connections. */
+export const RemoteAgentHostsEnabledSettingId = 'chat.remoteAgentHostsEnabled';
+
+/** An entry in the {@link RemoteAgentHostsSettingId} setting. */
+export interface IRemoteAgentHostEntry {
+	readonly address: string;
+	readonly name: string;
+	readonly connectionToken?: string;
+}
+
+export const enum RemoteAgentHostInputValidationError {
+	Empty = 'empty',
+	Invalid = 'invalid',
+}
+
+export interface IParsedRemoteAgentHostInput {
+	readonly address: string;
+	readonly connectionToken?: string;
+	readonly suggestedName: string;
+}
+
+export type RemoteAgentHostInputParseResult =
+	| { readonly parsed: IParsedRemoteAgentHostInput; readonly error?: undefined }
+	| { readonly parsed?: undefined; readonly error: RemoteAgentHostInputValidationError };
+
+export const IRemoteAgentHostService = createDecorator<IRemoteAgentHostService>('remoteAgentHostService');
+
+/**
+ * Manages connections to one or more remote agent host processes over
+ * WebSocket. Each connection is identified by its address string and
+ * exposed as an {@link IAgentConnection}, the same interface used for
+ * the local agent host.
+ */
+export interface IRemoteAgentHostService {
+	readonly _serviceBrand: undefined;
+
+	/** Fires when a remote connection is established or lost. */
+	readonly onDidChangeConnections: Event<void>;
+
+	/** Currently connected remote addresses with metadata. */
+	readonly connections: readonly IRemoteAgentHostConnectionInfo[];
+
+	/** All configured remote agent host entries from settings, regardless of connection status. */
+	readonly configuredEntries: readonly IRemoteAgentHostEntry[];
+
+	/**
+	 * Get a per-connection {@link IAgentConnection} for subscribing to
+	 * state, dispatching actions, creating sessions, etc.
+	 *
+	 * Returns `undefined` if no active connection exists for the address.
+	 */
+	getConnection(address: string): IAgentConnection | undefined;
+
+	/**
+	 * Adds or updates a configured remote host and resolves once a connection
+	 * to that host is available.
+	 */
+	addRemoteAgentHost(entry: IRemoteAgentHostEntry): Promise<IRemoteAgentHostConnectionInfo>;
+
+	/**
+	 * Removes a configured remote host entry by address.
+	 * Disconnects any active connection and removes the entry from settings.
+	 */
+	removeRemoteAgentHost(address: string): Promise<void>;
+}
+
+/** Metadata about a single remote connection. */
+export interface IRemoteAgentHostConnectionInfo {
+	readonly address: string;
+	readonly name: string;
+	readonly clientId: string;
+	readonly defaultDirectory?: string;
+}
+
+export class NullRemoteAgentHostService implements IRemoteAgentHostService {
+	declare readonly _serviceBrand: undefined;
+	readonly onDidChangeConnections = Event.None;
+	readonly connections: readonly IRemoteAgentHostConnectionInfo[] = [];
+	readonly configuredEntries: readonly IRemoteAgentHostEntry[] = [];
+	getConnection(): IAgentConnection | undefined { return undefined; }
+	async addRemoteAgentHost(): Promise<IRemoteAgentHostConnectionInfo> {
+		throw new Error('Remote agent host connections are not supported in this environment.');
+	}
+	async removeRemoteAgentHost(_address: string): Promise<void> { }
+}
+
+export function parseRemoteAgentHostInput(input: string): RemoteAgentHostInputParseResult {
+	const trimmedInput = input.trim();
+	if (!trimmedInput) {
+		return { error: RemoteAgentHostInputValidationError.Empty };
+	}
+
+	const candidate = extractRemoteAgentHostCandidate(trimmedInput);
+	if (!candidate) {
+		return { error: RemoteAgentHostInputValidationError.Invalid };
+	}
+
+	const hasExplicitScheme = /^[a-zA-Z][a-zA-Z\d+.-]*:\/\//.test(candidate);
+	try {
+		const url = new URL(hasExplicitScheme ? candidate : `ws://${candidate}`);
+		const normalizedProtocol = normalizeRemoteAgentHostProtocol(url.protocol);
+		if (!normalizedProtocol || !url.host) {
+			return { error: RemoteAgentHostInputValidationError.Invalid };
+		}
+
+		const connectionToken = url.searchParams.get(connectionTokenQueryName) ?? undefined;
+		url.searchParams.delete(connectionTokenQueryName);
+
+		// Only preserve wss: in the address - the transport defaults to ws:
+		const address = formatRemoteAgentHostAddress(url, normalizedProtocol === 'wss:' ? normalizedProtocol : undefined);
+		if (!address) {
+			return { error: RemoteAgentHostInputValidationError.Invalid };
+		}
+
+		return {
+			parsed: {
+				address,
+				connectionToken,
+				suggestedName: url.host,
+			},
+		};
+	} catch {
+		return { error: RemoteAgentHostInputValidationError.Invalid };
+	}
+}
+
+function extractRemoteAgentHostCandidate(input: string): string | undefined {
+	const urlMatch = input.match(/(?<url>(?:https?|wss?):\/\/\S+)/i);
+	const candidate = urlMatch?.groups?.url ?? input;
+	const trimmedCandidate = candidate.trim().replace(/[),.;\]]+$/, '');
+	return trimmedCandidate || undefined;
+}
+
+function normalizeRemoteAgentHostProtocol(protocol: string): 'ws:' | 'wss:' | undefined {
+	switch (protocol.toLowerCase()) {
+		case 'ws:':
+		case 'http:':
+			return 'ws:';
+		case 'wss:':
+		case 'https:':
+			return 'wss:';
+		default:
+			return undefined;
+	}
+}
+
+function formatRemoteAgentHostAddress(url: URL, protocol: 'ws:' | 'wss:' | undefined): string | undefined {
+	if (!url.host) {
+		return undefined;
+	}
+
+	const path = url.pathname !== '/' ? url.pathname : '';
+	const query = url.search;
+	const base = protocol ? `${protocol}//${url.host}` : url.host;
+	return `${base}${path}${query}`;
+}
diff --git a/src/vs/platform/agentHost/common/sessionDataService.ts b/src/vs/platform/agentHost/common/sessionDataService.ts
new file mode 100644
index 00000000000..dcc52fde556
--- /dev/null
+++ b/src/vs/platform/agentHost/common/sessionDataService.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+export const ISessionDataService = createDecorator<ISessionDataService>('sessionDataService');
+
+/**
+ * Provides persistent, per-session data directories on disk.
+ *
+ * Each session gets a directory under `{userDataPath}/agentSessionData/{sessionId}/`
+ * where internal agent-host code can store arbitrary files (e.g. file snapshots).
+ *
+ * Directories are created lazily — callers should use {@link IFileService.createFolder}
+ * before writing files. Cleanup happens eagerly on session removal and via startup
+ * garbage collection for orphaned directories.
+ */
+export interface ISessionDataService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Returns the root data directory URI for a session.
+	 * Does **not** create the directory on disk; callers use
+	 * `IFileService.createFolder()` as needed.
+	 */
+	getSessionDataDir(session: URI): URI;
+
+	/**
+	 * Returns the root data directory URI for a session given its raw ID.
+	 * Equivalent to {@link getSessionDataDir} but without requiring a full URI.
+	 */
+	getSessionDataDirById(sessionId: string): URI;
+
+	/**
+	 * Recursively deletes the data directory for a session, if it exists.
+	 */
+	deleteSessionData(session: URI): Promise<void>;
+
+	/**
+	 * Deletes data directories that do not correspond to any known session.
+	 * Called at startup; safe to call multiple times.
+	 */
+	cleanupOrphanedData(knownSessionIds: Set<string>): Promise<void>;
+}
diff --git a/src/vs/platform/agentHost/common/state/AGENTS.md b/src/vs/platform/agentHost/common/state/AGENTS.md
new file mode 100644
index 00000000000..25db0bd998f
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/AGENTS.md
@@ -0,0 +1,81 @@
+# Protocol versioning instructions
+
+This directory contains the protocol version system. Read this before modifying any protocol types.
+
+## Overview
+
+The protocol has **living types** (in `sessionState.ts`, `sessionActions.ts`) and **version type snapshots** (in `versions/v1.ts`, etc.). The `versions/versionRegistry.ts` file contains compile-time checks that enforce backwards compatibility between them, plus a runtime map that tracks which action types belong to which version.
+
+The latest version file is the **tip** — it can be edited. Older version files are frozen.
+
+## Adding optional fields to existing types
+
+This is the most common change. No version bump needed.
+
+1. Add the optional field to the living type in `sessionState.ts` or `sessionActions.ts`:
+   ```typescript
+   export interface IToolCallState {
+       // ...existing fields...
+       readonly mcpServerName?: string; // new optional field
+   }
+   ```
+2. Add the same optional field to the corresponding type in the **tip** version file (currently `versions/v1.ts`):
+   ```typescript
+   export interface IV1_ToolCallState {
+       // ...existing fields...
+       readonly mcpServerName?: string;
+   }
+   ```
+3. Compile. If it passes, you're done. If it fails, you tried to do something incompatible.
+
+You can also skip step 2 — the tip is allowed to be a subset of the living type. But adding it to the tip documents that the field exists at this version.
+
+## Adding new action types
+
+Adding a new action type is backwards-compatible and does **not** require a version bump. Old clients at the same version ignore unknown action types (reducers return state unchanged). Old servers at the same version simply never produce the action.
+
+1. **Add the new action interface** to `sessionActions.ts` and include it in the `ISessionAction` or `IRootAction` union.
+2. **Add the action to `ACTION_INTRODUCED_IN`** in `versions/versionRegistry.ts` with the **current** version number. The compiler will force you to do this — if you add a type to the union without a map entry, it won't compile.
+3. **Add the type to the tip version file** (currently `versions/v1.ts`) and add an `AssertCompatible` check in `versions/versionRegistry.ts`.
+4. **Add a reducer case** in `sessionReducers.ts` to handle the new action.
+5. **Update `../../../protocol.md`** to document the new action.
+
+### When to bump the version
+
+Bump `PROTOCOL_VERSION` when you need a **capability boundary** — i.e., a client needs to check "does this server support feature X?" before sending commands or rendering UI. Examples:
+
+- A new **client-sendable** action that requires server-side support (the client must know the server can handle it before sending)
+- A group of related actions that form a new feature area (subagents, model selection, etc.)
+
+When bumping:
+1. **Bump `PROTOCOL_VERSION`** in `versions/versionRegistry.ts`.
+2. **Create the new tip version file** `versions/v{N}.ts`. Copy the previous tip and add your new types. The previous tip is now frozen — do not edit it.
+3. **Add `AssertCompatible` checks** in `versions/versionRegistry.ts` for the new version's types.
+4. **Add `ProtocolCapabilities` fields** in `sessionCapabilities.ts` for the new feature area.
+5. Assign your new action types version N in `ACTION_INTRODUCED_IN`.
+6. **Update `../../../protocol.md`** version history.
+
+## Adding new notification types
+
+Same process as new action types, but use `NOTIFICATION_INTRODUCED_IN` instead of `ACTION_INTRODUCED_IN`.
+
+## Raising the minimum protocol version
+
+This drops support for old clients and lets you delete compatibility cruft.
+
+1. **Raise `MIN_PROTOCOL_VERSION`** in `versions/versionRegistry.ts` from N to N+1.
+2. **Delete `versions/v{N}.ts`**.
+3. **Remove the v{N} `AssertCompatible` checks** and version-grouped type aliases from `versions/versionRegistry.ts`.
+4. **Compile.** The compiler will surface any code that referenced the deleted version types — clean it up.
+5. **Update `../../../protocol.md`** version history.
+
+## What the compiler catches
+
+| Mistake | Compile error |
+|---|---|
+| Remove a field from a living type | `Current extends Frozen` fails in `AssertCompatible` |
+| Change a field's type | `Current extends Frozen` fails in `AssertCompatible` |
+| Add a required field to a living type | `Frozen extends Current` fails in `AssertCompatible` |
+| Add action to union, forget `ACTION_INTRODUCED_IN` entry | Mapped type index is incomplete |
+| Add notification to union, forget `NOTIFICATION_INTRODUCED_IN` entry | Mapped type index is incomplete |
+| Remove action type that a version still references | Version-grouped union no longer extends living union |
diff --git a/src/vs/platform/agentHost/common/state/protocol/action-origin.generated.ts b/src/vs/platform/agentHost/common/state/protocol/action-origin.generated.ts
new file mode 100644
index 00000000000..c65d536c7d3
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/action-origin.generated.ts
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+// Generated from types/actions.ts — do not edit
+// Run `npm run generate` to regenerate.
+
+import { ActionType, type IStateAction, type IRootAgentsChangedAction, type IRootActiveSessionsChangedAction, type ISessionReadyAction, type ISessionCreationFailedAction, type ISessionTurnStartedAction, type ISessionDeltaAction, type ISessionResponsePartAction, type ISessionToolCallStartAction, type ISessionToolCallDeltaAction, type ISessionToolCallReadyAction, type ISessionToolCallConfirmedAction, type ISessionToolCallCompleteAction, type ISessionToolCallResultConfirmedAction, type ISessionTurnCompleteAction, type ISessionTurnCancelledAction, type ISessionErrorAction, type ISessionTitleChangedAction, type ISessionUsageAction, type ISessionReasoningAction, type ISessionModelChangedAction, type ISessionServerToolsChangedAction, type ISessionActiveClientChangedAction, type ISessionActiveClientToolsChangedAction, type ISessionPendingMessageSetAction, type ISessionPendingMessageRemovedAction, type ISessionQueuedMessagesReorderedAction, type ISessionCustomizationsChangedAction, type ISessionCustomizationToggledAction } from './actions.js';
+
+
+// ─── Root vs Session Action Unions ───────────────────────────────────────────
+
+/** Union of all root-scoped actions. */
+export type IRootAction =
+	| IRootAgentsChangedAction
+	| IRootActiveSessionsChangedAction
+	;
+
+/** Union of all session-scoped actions. */
+export type ISessionAction =
+	| ISessionReadyAction
+	| ISessionCreationFailedAction
+	| ISessionTurnStartedAction
+	| ISessionDeltaAction
+	| ISessionResponsePartAction
+	| ISessionToolCallStartAction
+	| ISessionToolCallDeltaAction
+	| ISessionToolCallReadyAction
+	| ISessionToolCallConfirmedAction
+	| ISessionToolCallCompleteAction
+	| ISessionToolCallResultConfirmedAction
+	| ISessionTurnCompleteAction
+	| ISessionTurnCancelledAction
+	| ISessionErrorAction
+	| ISessionTitleChangedAction
+	| ISessionUsageAction
+	| ISessionReasoningAction
+	| ISessionModelChangedAction
+	| ISessionServerToolsChangedAction
+	| ISessionActiveClientChangedAction
+	| ISessionActiveClientToolsChangedAction
+	| ISessionPendingMessageSetAction
+	| ISessionPendingMessageRemovedAction
+	| ISessionQueuedMessagesReorderedAction
+	| ISessionCustomizationsChangedAction
+	| ISessionCustomizationToggledAction
+	;
+
+/** Union of session actions that clients may dispatch. */
+export type IClientSessionAction =
+	| ISessionTurnStartedAction
+	| ISessionToolCallConfirmedAction
+	| ISessionToolCallCompleteAction
+	| ISessionToolCallResultConfirmedAction
+	| ISessionTurnCancelledAction
+	| ISessionModelChangedAction
+	| ISessionActiveClientChangedAction
+	| ISessionActiveClientToolsChangedAction
+	| ISessionPendingMessageSetAction
+	| ISessionPendingMessageRemovedAction
+	| ISessionQueuedMessagesReorderedAction
+	| ISessionCustomizationToggledAction
+	;
+
+/** Union of session actions that only the server may produce. */
+export type IServerSessionAction =
+	| ISessionReadyAction
+	| ISessionCreationFailedAction
+	| ISessionDeltaAction
+	| ISessionResponsePartAction
+	| ISessionToolCallStartAction
+	| ISessionToolCallDeltaAction
+	| ISessionToolCallReadyAction
+	| ISessionTurnCompleteAction
+	| ISessionErrorAction
+	| ISessionTitleChangedAction
+	| ISessionUsageAction
+	| ISessionReasoningAction
+	| ISessionServerToolsChangedAction
+	| ISessionCustomizationsChangedAction
+	;
+
+// ─── Client-Dispatchable Map ─────────────────────────────────────────────────
+
+/**
+ * Exhaustive map indicating which action types may be dispatched by clients.
+ * Adding a new action to IStateAction without adding it here is a compile error.
+ */
+export const IS_CLIENT_DISPATCHABLE: { readonly [K in IStateAction['type']]: boolean } = {
+	[ActionType.RootAgentsChanged]: false,
+	[ActionType.RootActiveSessionsChanged]: false,
+	[ActionType.SessionReady]: false,
+	[ActionType.SessionCreationFailed]: false,
+	[ActionType.SessionTurnStarted]: true,
+	[ActionType.SessionDelta]: false,
+	[ActionType.SessionResponsePart]: false,
+	[ActionType.SessionToolCallStart]: false,
+	[ActionType.SessionToolCallDelta]: false,
+	[ActionType.SessionToolCallReady]: false,
+	[ActionType.SessionToolCallConfirmed]: true,
+	[ActionType.SessionToolCallComplete]: true,
+	[ActionType.SessionToolCallResultConfirmed]: true,
+	[ActionType.SessionTurnComplete]: false,
+	[ActionType.SessionTurnCancelled]: true,
+	[ActionType.SessionError]: false,
+	[ActionType.SessionTitleChanged]: false,
+	[ActionType.SessionUsage]: false,
+	[ActionType.SessionReasoning]: false,
+	[ActionType.SessionModelChanged]: true,
+	[ActionType.SessionServerToolsChanged]: false,
+	[ActionType.SessionActiveClientChanged]: true,
+	[ActionType.SessionActiveClientToolsChanged]: true,
+	[ActionType.SessionPendingMessageSet]: true,
+	[ActionType.SessionPendingMessageRemoved]: true,
+	[ActionType.SessionQueuedMessagesReordered]: true,
+	[ActionType.SessionCustomizationsChanged]: false,
+	[ActionType.SessionCustomizationToggled]: true,
+};
diff --git a/src/vs/platform/agentHost/common/state/protocol/actions.ts b/src/vs/platform/agentHost/common/state/protocol/actions.ts
new file mode 100644
index 00000000000..ee22225be03
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/actions.ts
@@ -0,0 +1,666 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+import { ToolCallConfirmationReason, ToolCallCancellationReason, PendingMessageKind, type URI, type StringOrMarkdown, type IAgentInfo, type IErrorInfo, type IUserMessage, type IResponsePart, type IToolCallResult, type IToolDefinition, type ISessionActiveClient, type IUsageInfo, type ISessionCustomization } from './state.js';
+
+
+// ─── Action Type Enum ────────────────────────────────────────────────────────
+
+/**
+ * Discriminant values for all state actions.
+ *
+ * @category Actions
+ */
+export const enum ActionType {
+	RootAgentsChanged = 'root/agentsChanged',
+	RootActiveSessionsChanged = 'root/activeSessionsChanged',
+	SessionReady = 'session/ready',
+	SessionCreationFailed = 'session/creationFailed',
+	SessionTurnStarted = 'session/turnStarted',
+	SessionDelta = 'session/delta',
+	SessionResponsePart = 'session/responsePart',
+	SessionToolCallStart = 'session/toolCallStart',
+	SessionToolCallDelta = 'session/toolCallDelta',
+	SessionToolCallReady = 'session/toolCallReady',
+	SessionToolCallConfirmed = 'session/toolCallConfirmed',
+	SessionToolCallComplete = 'session/toolCallComplete',
+	SessionToolCallResultConfirmed = 'session/toolCallResultConfirmed',
+	SessionTurnComplete = 'session/turnComplete',
+	SessionTurnCancelled = 'session/turnCancelled',
+	SessionError = 'session/error',
+	SessionTitleChanged = 'session/titleChanged',
+	SessionUsage = 'session/usage',
+	SessionReasoning = 'session/reasoning',
+	SessionModelChanged = 'session/modelChanged',
+	SessionServerToolsChanged = 'session/serverToolsChanged',
+	SessionActiveClientChanged = 'session/activeClientChanged',
+	SessionActiveClientToolsChanged = 'session/activeClientToolsChanged',
+	SessionPendingMessageSet = 'session/pendingMessageSet',
+	SessionPendingMessageRemoved = 'session/pendingMessageRemoved',
+	SessionQueuedMessagesReordered = 'session/queuedMessagesReordered',
+	SessionCustomizationsChanged = 'session/customizationsChanged',
+	SessionCustomizationToggled = 'session/customizationToggled',
+}
+
+// ─── Action Envelope ─────────────────────────────────────────────────────────
+
+/**
+ * Identifies the client that originally dispatched an action.
+ */
+export interface IActionOrigin {
+	clientId: string;
+	clientSeq: number;
+}
+
+/**
+ * Every action is wrapped in an `ActionEnvelope`.
+ */
+export interface IActionEnvelope {
+	readonly action: IStateAction;
+	readonly serverSeq: number;
+	readonly origin: IActionOrigin | undefined;
+	readonly rejectionReason?: string;
+}
+
+// ─── Root Actions ────────────────────────────────────────────────────────────
+
+/**
+ * Base interface for all tool-call-scoped actions, carrying the common
+ * session, turn, and tool call identifiers.
+ *
+ * @category Session Actions
+ */
+interface IToolCallActionBase {
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** Tool call identifier */
+	toolCallId: string;
+	/**
+	 * Additional provider-specific metadata for this tool call.
+	 *
+	 * Clients MAY look for well-known keys here to provide enhanced UI.
+	 * For example, a `ptyTerminal` key with `{ input: string; output: string }`
+	 * indicates the tool operated on a terminal (both `input` and `output` may
+	 * contain escape sequences).
+	 */
+	_meta?: Record<string, unknown>;
+}
+
+/**
+ * Fired when available agent backends or their models change.
+ *
+ * @category Root Actions
+ * @version 1
+ */
+export interface IRootAgentsChangedAction {
+	type: ActionType.RootAgentsChanged;
+	/** Updated agent list */
+	agents: IAgentInfo[];
+}
+
+/**
+ * Fired when the number of active sessions changes.
+ *
+ * @category Root Actions
+ * @version 1
+ */
+export interface IRootActiveSessionsChangedAction {
+	type: ActionType.RootActiveSessionsChanged;
+	/** Current count of active sessions */
+	activeSessions: number;
+}
+
+// ─── Session Actions ─────────────────────────────────────────────────────────
+
+/**
+ * Session backend initialized successfully.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionReadyAction {
+	type: ActionType.SessionReady;
+	/** Session URI */
+	session: URI;
+}
+
+/**
+ * Session backend failed to initialize.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionCreationFailedAction {
+	type: ActionType.SessionCreationFailed;
+	/** Session URI */
+	session: URI;
+	/** Error details */
+	error: IErrorInfo;
+}
+
+/**
+ * User sent a message; server starts agent processing.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionTurnStartedAction {
+	type: ActionType.SessionTurnStarted;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** User's message */
+	userMessage: IUserMessage;
+	/** If this turn was auto-started from a queued message, the ID of that message */
+	queuedMessageId?: string;
+}
+
+/**
+ * Streaming text chunk from the assistant, appended to a specific response part.
+ *
+ * The server MUST first emit a `session/responsePart` to create the target
+ * part (markdown or reasoning), then use this action to append text to it.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionDeltaAction {
+	type: ActionType.SessionDelta;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** Identifier of the response part to append to */
+	partId: string;
+	/** Text chunk */
+	content: string;
+}
+
+/**
+ * Structured content appended to the response.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionResponsePartAction {
+	type: ActionType.SessionResponsePart;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** Response part (markdown or content ref) */
+	part: IResponsePart;
+}
+
+/**
+ * A tool call begins — parameters are streaming from the LM.
+ *
+ * For client-provided tools, the server sets `toolClientId` to identify the
+ * owning client. That client is responsible for executing the tool once it
+ * reaches the `running` state and dispatching `session/toolCallComplete`.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionToolCallStartAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallStart;
+	/** Internal tool name (for debugging/logging) */
+	toolName: string;
+	/** Human-readable tool name */
+	displayName: string;
+	/**
+	 * If this tool is provided by a client, the `clientId` of the owning client.
+	 * Absent for server-side tools.
+	 */
+	toolClientId?: string;
+}
+
+/**
+ * Streaming partial parameters for a tool call.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionToolCallDeltaAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallDelta;
+	/** Partial parameter content to append */
+	content: string;
+	/** Updated progress message */
+	invocationMessage?: StringOrMarkdown;
+}
+
+/**
+ * Tool call parameters are complete, or a running tool requires re-confirmation.
+ *
+ * When dispatched for a `streaming` tool call, transitions to `pending-confirmation`
+ * or directly to `running` if `confirmed` is set.
+ *
+ * When dispatched for a `running` tool call (e.g. mid-execution permission needed),
+ * transitions back to `pending-confirmation`. The `invocationMessage` and `_meta`
+ * SHOULD be updated to describe the specific confirmation needed. Clients use the
+ * standard `session/toolCallConfirmed` flow to approve or deny.
+ *
+ * For client-provided tools, the server typically sets `confirmed` to
+ * `'not-needed'` so the tool transitions directly to `running`, where the
+ * owning client can begin execution immediately.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionToolCallReadyAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallReady;
+	/** Message describing what the tool will do or what confirmation is needed */
+	invocationMessage: StringOrMarkdown;
+	/** Raw tool input */
+	toolInput?: string;
+	/** Short title for the confirmation prompt (e.g. `"Run in terminal"`, `"Write file"`) */
+	confirmationTitle?: StringOrMarkdown;
+	/** If set, the tool was auto-confirmed and transitions directly to `running` */
+	confirmed?: ToolCallConfirmationReason;
+}
+
+/**
+ * Client approves a pending tool call. The tool transitions to `running`.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionToolCallApprovedAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallConfirmed;
+	/** The tool call was approved */
+	approved: true;
+	/** How the tool was confirmed */
+	confirmed: ToolCallConfirmationReason;
+}
+
+/**
+ * Client denies a pending tool call. The tool transitions to `cancelled`.
+ *
+ * For client-provided tools, the owning client MUST dispatch this if it does
+ * not recognize the tool or cannot execute it.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionToolCallDeniedAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallConfirmed;
+	/** The tool call was denied */
+	approved: false;
+	/** Why the tool was cancelled */
+	reason: ToolCallCancellationReason.Denied | ToolCallCancellationReason.Skipped;
+	/** What the user suggested doing instead */
+	userSuggestion?: IUserMessage;
+	/** Optional explanation for the denial */
+	reasonMessage?: StringOrMarkdown;
+}
+
+/**
+ * Client confirms or denies a pending tool call.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export type ISessionToolCallConfirmedAction =
+	| ISessionToolCallApprovedAction
+	| ISessionToolCallDeniedAction;
+
+/**
+ * Tool execution finished. Transitions to `completed` or `pending-result-confirmation`
+ * if `requiresResultConfirmation` is `true`.
+ *
+ * For client-provided tools (where `toolClientId` is set on the tool call state),
+ * the owning client dispatches this action with the execution result. The server
+ * SHOULD reject this action if the dispatching client does not match `toolClientId`.
+ *
+ * Servers waiting on a client tool call MAY time out after a reasonable duration
+ * if the implementing client disconnects or becomes unresponsive, and dispatch
+ * this action with `result.success = false` and an appropriate error.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionToolCallCompleteAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallComplete;
+	/** Execution result */
+	result: IToolCallResult;
+	/** If true, the result requires client approval before finalizing */
+	requiresResultConfirmation?: boolean;
+}
+
+/**
+ * Client approves or denies a tool's result.
+ *
+ * If `approved` is `false`, the tool transitions to `cancelled` with reason `result-denied`.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionToolCallResultConfirmedAction extends IToolCallActionBase {
+	type: ActionType.SessionToolCallResultConfirmed;
+	/** Whether the result was approved */
+	approved: boolean;
+}
+
+/**
+ * Turn finished — the assistant is idle.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionTurnCompleteAction {
+	type: ActionType.SessionTurnComplete;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+}
+
+/**
+ * Turn was aborted; server stops processing.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionTurnCancelledAction {
+	type: ActionType.SessionTurnCancelled;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+}
+
+/**
+ * Error during turn processing.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionErrorAction {
+	type: ActionType.SessionError;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** Error details */
+	error: IErrorInfo;
+}
+
+/**
+ * Session title updated (typically auto-generated from conversation).
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionTitleChangedAction {
+	type: ActionType.SessionTitleChanged;
+	/** Session URI */
+	session: URI;
+	/** New title */
+	title: string;
+}
+
+/**
+ * Token usage report for a turn.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionUsageAction {
+	type: ActionType.SessionUsage;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** Token usage data */
+	usage: IUsageInfo;
+}
+
+/**
+ * Reasoning/thinking text from the model, appended to a specific reasoning response part.
+ *
+ * The server MUST first emit a `session/responsePart` to create the target
+ * reasoning part, then use this action to append text to it.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionReasoningAction {
+	type: ActionType.SessionReasoning;
+	/** Session URI */
+	session: URI;
+	/** Turn identifier */
+	turnId: string;
+	/** Identifier of the reasoning response part to append to */
+	partId: string;
+	/** Reasoning text chunk */
+	content: string;
+}
+
+/**
+ * Model changed for this session.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionModelChangedAction {
+	type: ActionType.SessionModelChanged;
+	/** Session URI */
+	session: URI;
+	/** New model ID */
+	model: string;
+}
+
+/**
+ * Server tools for this session have changed.
+ *
+ * Full-replacement semantics: the `tools` array replaces the previous `serverTools` entirely.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionServerToolsChangedAction {
+	type: ActionType.SessionServerToolsChanged;
+	/** Session URI */
+	session: URI;
+	/** Updated server tools list (full replacement) */
+	tools: IToolDefinition[];
+}
+
+/**
+ * The active client for this session has changed.
+ *
+ * A client dispatches this action with its own `ISessionActiveClient` to claim
+ * the active role, or with `null` to release it. The server SHOULD reject if
+ * another client is already active. The server SHOULD automatically dispatch
+ * this action with `activeClient: null` when the active client disconnects.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionActiveClientChangedAction {
+	type: ActionType.SessionActiveClientChanged;
+	/** Session URI */
+	session: URI;
+	/** The new active client, or `null` to unset */
+	activeClient: ISessionActiveClient | null;
+}
+
+/**
+ * The active client's tool list has changed.
+ *
+ * Full-replacement semantics: the `tools` array replaces the active client's
+ * previous tools entirely. The server SHOULD reject if the dispatching client
+ * is not the current active client.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionActiveClientToolsChangedAction {
+	type: ActionType.SessionActiveClientToolsChanged;
+	/** Session URI */
+	session: URI;
+	/** Updated client tools list (full replacement) */
+	tools: IToolDefinition[];
+}
+
+// ─── Customization Actions ───────────────────────────────────────────────────
+
+/**
+ * The session's customizations have changed.
+ *
+ * Full-replacement semantics: the `customizations` array replaces the
+ * previous `customizations` entirely.
+ *
+ * @category Session Actions
+ * @version 1
+ */
+export interface ISessionCustomizationsChangedAction {
+	type: ActionType.SessionCustomizationsChanged;
+	/** Session URI */
+	session: URI;
+	/** Updated customization list (full replacement) */
+	customizations: ISessionCustomization[];
+}
+
+/**
+ * A client toggled a customization on or off.
+ *
+ * The server locates the customization by `uri` in the session's
+ * customization list and sets its `enabled` flag.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionCustomizationToggledAction {
+	type: ActionType.SessionCustomizationToggled;
+	/** Session URI */
+	session: URI;
+	/** The URI of the customization to toggle */
+	uri: URI;
+	/** Whether to enable or disable the customization */
+	enabled: boolean;
+}
+
+// ─── Pending Message Actions ─────────────────────────────────────────────────
+
+/**
+ * A pending message was set (upsert semantics: creates or replaces).
+ *
+ * For steering messages, this always replaces the single steering message.
+ * For queued messages, if a message with the given `id` already exists it is
+ * updated in place; otherwise it is appended to the queue. If the session is
+ * idle when a queued message is set, the server SHOULD immediately consume it
+ * and start a new turn.
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionPendingMessageSetAction {
+	type: ActionType.SessionPendingMessageSet;
+	/** Session URI */
+	session: URI;
+	/** Whether this is a steering or queued message */
+	kind: PendingMessageKind;
+	/** Unique identifier for this pending message */
+	id: string;
+	/** The message content */
+	userMessage: IUserMessage;
+}
+
+/**
+ * A pending message was removed (steering or queued).
+ *
+ * Dispatched by clients to cancel a pending message, or by the server when
+ * it consumes a message (e.g. starting a turn from a queued message or
+ * injecting a steering message into the current turn).
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionPendingMessageRemovedAction {
+	type: ActionType.SessionPendingMessageRemoved;
+	/** Session URI */
+	session: URI;
+	/** Whether this is a steering or queued message */
+	kind: PendingMessageKind;
+	/** Identifier of the pending message to remove */
+	id: string;
+}
+
+/**
+ * Reorder the queued messages.
+ *
+ * The `order` array contains the IDs of queued messages in their new
+ * desired order. IDs not present in the current queue are ignored.
+ * Queued messages whose IDs are absent from `order` are appended at
+ * the end in their original relative order (so a client with a stale
+ * view of the queue never silently drops messages).
+ *
+ * @category Session Actions
+ * @version 1
+ * @clientDispatchable
+ */
+export interface ISessionQueuedMessagesReorderedAction {
+	type: ActionType.SessionQueuedMessagesReordered;
+	/** Session URI */
+	session: URI;
+	/** Queued message IDs in the desired order */
+	order: string[];
+}
+
+// ─── Discriminated Union ─────────────────────────────────────────────────────
+
+/**
+ * Discriminated union of all state actions.
+ */
+export type IStateAction =
+	| IRootAgentsChangedAction
+	| IRootActiveSessionsChangedAction
+	| ISessionReadyAction
+	| ISessionCreationFailedAction
+	| ISessionTurnStartedAction
+	| ISessionDeltaAction
+	| ISessionResponsePartAction
+	| ISessionToolCallStartAction
+	| ISessionToolCallDeltaAction
+	| ISessionToolCallReadyAction
+	| ISessionToolCallConfirmedAction
+	| ISessionToolCallCompleteAction
+	| ISessionToolCallResultConfirmedAction
+	| ISessionTurnCompleteAction
+	| ISessionTurnCancelledAction
+	| ISessionErrorAction
+	| ISessionTitleChangedAction
+	| ISessionUsageAction
+	| ISessionReasoningAction
+	| ISessionModelChangedAction
+	| ISessionServerToolsChangedAction
+	| ISessionActiveClientChangedAction
+	| ISessionActiveClientToolsChangedAction
+	| ISessionPendingMessageSetAction
+	| ISessionPendingMessageRemovedAction
+	| ISessionQueuedMessagesReorderedAction
+	| ISessionCustomizationsChangedAction
+	| ISessionCustomizationToggledAction;
diff --git a/src/vs/platform/agentHost/common/state/protocol/commands.ts b/src/vs/platform/agentHost/common/state/protocol/commands.ts
new file mode 100644
index 00000000000..1793016f86b
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/commands.ts
@@ -0,0 +1,490 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+import type { URI, ISnapshot, ISessionSummary, ITurn } from './state.js';
+import type { IActionEnvelope, IStateAction } from './actions.js';
+
+// ─── initialize ──────────────────────────────────────────────────────────────
+
+/**
+ * Establishes a new connection and negotiates the protocol version.
+ * This MUST be the first message sent by the client.
+ *
+ * @category Commands
+ * @method initialize
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @see {@link /specification/lifecycle | Lifecycle} for the full handshake flow.
+ */
+export interface IInitializeParams {
+	/** Protocol version the client speaks */
+	protocolVersion: number;
+	/** Unique client identifier */
+	clientId: string;
+	/** URIs to subscribe to during handshake */
+	initialSubscriptions?: URI[];
+}
+
+/**
+ * Result of the `initialize` command.
+ *
+ * If the server does not support the client's protocol version, it MUST return
+ * error code `-32005` (`UnsupportedProtocolVersion`).
+ */
+export interface IInitializeResult {
+	/** Protocol version the server speaks */
+	protocolVersion: number;
+	/** Current server sequence number */
+	serverSeq: number;
+	/** Snapshots for each `initialSubscriptions` URI */
+	snapshots: ISnapshot[];
+	/** Suggested default directory for remote filesystem browsing */
+	defaultDirectory?: URI;
+}
+
+// ─── reconnect ───────────────────────────────────────────────────────────────
+
+/**
+ * Discriminant for reconnect result types.
+ *
+ * @category Commands
+ */
+export const enum ReconnectResultType {
+	Replay = 'replay',
+	Snapshot = 'snapshot',
+}
+
+/**
+ * Re-establishes a dropped connection. The server replays missed actions or
+ * provides fresh snapshots.
+ *
+ * @category Commands
+ * @method reconnect
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @see {@link /specification/lifecycle | Lifecycle} for details.
+ */
+export interface IReconnectParams {
+	/** Client identifier from the original connection */
+	clientId: string;
+	/** Last `serverSeq` the client received */
+	lastSeenServerSeq: number;
+	/** URIs the client was subscribed to */
+	subscriptions: URI[];
+}
+
+/**
+ * Reconnect result when the server can replay from the requested sequence.
+ *
+ * The server MUST include all replayed data in the response.
+ */
+export interface IReconnectReplayResult {
+	/** Discriminant */
+	type: ReconnectResultType.Replay;
+	/** Missed action envelopes since `lastSeenServerSeq` */
+	actions: IActionEnvelope[];
+}
+
+/**
+ * Reconnect result when the gap exceeds the replay buffer.
+ */
+export interface IReconnectSnapshotResult {
+	/** Discriminant */
+	type: ReconnectResultType.Snapshot;
+	/** Fresh snapshots for each subscription */
+	snapshots: ISnapshot[];
+}
+
+/** Result of the `reconnect` command. */
+export type IReconnectResult = IReconnectReplayResult | IReconnectSnapshotResult;
+
+// ─── subscribe ───────────────────────────────────────────────────────────────
+
+/**
+ * Subscribe to a URI-identified state resource.
+ *
+ * @category Commands
+ * @method subscribe
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @see {@link /specification/subscriptions | Subscriptions}
+ */
+export interface ISubscribeParams {
+	/** URI to subscribe to */
+	resource: URI;
+}
+
+/**
+ * Result of the `subscribe` command.
+ */
+export interface ISubscribeResult {
+	/** Snapshot of the subscribed resource */
+	snapshot: ISnapshot;
+}
+
+// ─── createSession ───────────────────────────────────────────────────────────
+
+/**
+ * Creates a new session with the specified agent provider.
+ *
+ * If the session URI already exists, the server MUST return an error with code
+ * `-32003` (`SessionAlreadyExists`).
+ *
+ * After creation, the client should subscribe to the session URI to receive state
+ * updates. The server also broadcasts a `notify/sessionAdded` notification to all
+ * clients.
+ *
+ * @category Commands
+ * @method createSession
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @example
+ * ```jsonc
+ * // Client → Server
+ * { "jsonrpc": "2.0", "id": 2, "method": "createSession",
+ *   "params": { "session": "copilot:/<uuid>", "provider": "copilot", "model": "gpt-4o" } }
+ *
+ * // Server → Client (success)
+ * { "jsonrpc": "2.0", "id": 2, "result": null }
+ *
+ * // Server → Client (failure — provider not found)
+ * { "jsonrpc": "2.0", "id": 2, "error": { "code": -32002, "message": "No agent for provider" } }
+ *
+ * // Server → Client (failure — session already exists)
+ * { "jsonrpc": "2.0", "id": 2, "error": { "code": -32003, "message": "Session already exists" } }
+ * ```
+ */
+export interface ICreateSessionParams {
+	/** Session URI (client-chosen, e.g. `copilot:/<uuid>`) */
+	session: URI;
+	/** Agent provider ID */
+	provider?: string;
+	/** Model ID to use */
+	model?: string;
+	/** Working directory for the session */
+	workingDirectory?: URI;
+}
+
+// ─── disposeSession ──────────────────────────────────────────────────────────
+
+/**
+ * Disposes a session and cleans up server-side resources.
+ *
+ * The server broadcasts a `notify/sessionRemoved` notification to all clients.
+ *
+ * @category Commands
+ * @method disposeSession
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ */
+export interface IDisposeSessionParams {
+	/** Session URI to dispose */
+	session: URI;
+}
+
+// ─── listSessions ────────────────────────────────────────────────────────────
+
+/**
+ * Returns a list of session summaries. Used to populate session lists and sidebars.
+ *
+ * The session list is **not** part of the state tree because it can be arbitrarily
+ * large. Clients fetch it imperatively and maintain a local cache updated by
+ * `notify/sessionAdded` and `notify/sessionRemoved` notifications.
+ *
+ * @category Commands
+ * @method listSessions
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ */
+export interface IListSessionsParams {
+	/** Optional filter criteria */
+	filter?: object;
+}
+
+/** Result of the `listSessions` command. */
+export interface IListSessionsResult {
+	/** The list of session summaries. */
+	items: ISessionSummary[];
+}
+
+// ─── fetchContent ────────────────────────────────────────────────────────────
+
+/**
+ * Encoding of fetched content data.
+ *
+ * @category Commands
+ */
+export const enum ContentEncoding {
+	Base64 = 'base64',
+	Utf8 = 'utf-8',
+}
+
+/**
+ * Fetches large content referenced by a `ContentRef` in the state tree.
+ *
+ * Content references keep the state tree small by storing large data (images,
+ * long tool outputs) by reference rather than inline.
+ *
+ * Binary content (images, etc.) MUST use `base64` encoding. Text content MAY
+ * use `utf-8` encoding.
+ *
+ * @category Commands
+ * @method fetchContent
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @throws `NotFound` (`-32008`) if the URI does not exist.
+ * @throws `PermissionDenied` (`-32009`) if the client is not permitted to read the URI.
+ * @example
+ * ```jsonc
+ * // Client → Server
+ * { "jsonrpc": "2.0", "id": 10, "method": "fetchContent",
+ *   "params": { "uri": "copilot:/<uuid>/content/img-1" } }
+ *
+ * // Server → Client
+ * { "jsonrpc": "2.0", "id": 10, "result": {
+ *   "data": "iVBORw0KGgo...",
+ *   "encoding": "base64",
+ *   "contentType": "image/png"
+ * }}
+ * ```
+ */
+export interface IFetchContentParams {
+	/** Content URI from a `ContentRef` */
+	uri: string;
+	/** Preferred encoding for the returned data (default: server-chosen) */
+	encoding?: ContentEncoding;
+}
+
+/**
+ * Result of the `fetchContent` command.
+ *
+ * The server SHOULD honor the `encoding` requested in the params. If the
+ * server cannot provide the requested encoding, it MUST fall back to either
+ * `base64` or `utf-8`.
+ */
+export interface IFetchContentResult {
+	/** Content encoded as a string */
+	data: string;
+	/** How `data` is encoded */
+	encoding: ContentEncoding;
+	/** Content type (e.g. `"image/png"`, `"text/plain"`) */
+	contentType?: string;
+}
+
+// ─── browseDirectory ────────────────────────────────────────────────────────
+
+/**
+ * Lists directory entries at a file URI on the server's filesystem.
+ *
+ * This is intended for remote folder pickers and similar UI that needs to let
+ * users navigate the server's local filesystem.
+ *
+ * The server MUST return success only if the target exists and is a directory.
+ * If the target does not exist, is not a directory, or cannot be accessed, the
+ * server MUST return a JSON-RPC error.
+ *
+ * @category Commands
+ * @method browseDirectory
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @throws `NotFound` (`-32008`) if the directory does not exist.
+ * @throws `PermissionDenied` (`-32009`) if the client is not permitted to browse the directory.
+ */
+export interface IBrowseDirectoryParams {
+	/** Directory URI on the server filesystem */
+	uri: URI;
+}
+
+/**
+ * Directory entry returned by `browseDirectory`.
+ */
+export interface IDirectoryEntry {
+	/** Base name of the entry */
+	name: string;
+	/** Whether the entry is a file or directory */
+	type: 'file' | 'directory';
+}
+
+/**
+ * Result of the `browseDirectory` command.
+ */
+export interface IBrowseDirectoryResult {
+	/** Entries directly contained in the requested directory */
+	entries: IDirectoryEntry[];
+}
+
+// ─── fetchTurns ──────────────────────────────────────────────────────────────
+
+/**
+ * Fetches historical turns for a session. Used for lazy loading of conversation
+ * history.
+ *
+ * @category Commands
+ * @method fetchTurns
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @example
+ * ```jsonc
+ * // Client → Server (fetch the 20 most recent turns)
+ * { "jsonrpc": "2.0", "id": 8, "method": "fetchTurns",
+ *   "params": { "session": "copilot:/<uuid>", "limit": 20 } }
+ *
+ * // Server → Client
+ * { "jsonrpc": "2.0", "id": 8, "result": {
+ *   "turns": [ { "id": "t1", ... }, { "id": "t2", ... } ],
+ *   "hasMore": true
+ * }}
+ *
+ * // Client → Server (fetch 20 turns before t1)
+ * { "jsonrpc": "2.0", "id": 9, "method": "fetchTurns",
+ *   "params": { "session": "copilot:/<uuid>", "before": "t1", "limit": 20 } }
+ * ```
+ */
+export interface IFetchTurnsParams {
+	/** Session URI */
+	session: URI;
+	/** Turn ID to fetch before (exclusive). Omit to fetch from the most recent turn. */
+	before?: string;
+	/** Maximum number of turns to return. Server MAY impose its own upper bound. */
+	limit?: number;
+}
+
+/**
+ * Result of the `fetchTurns` command.
+ */
+export interface IFetchTurnsResult {
+	/** The requested turns, ordered oldest-first */
+	turns: ITurn[];
+	/** Whether more turns exist before the returned range */
+	hasMore: boolean;
+}
+
+// ─── unsubscribe ─────────────────────────────────────────────────────────────
+
+/**
+ * Stop receiving updates for a URI.
+ *
+ * @category Commands
+ * @method unsubscribe
+ * @direction Client → Server
+ * @messageType Notification
+ * @version 1
+ * @see {@link /specification/subscriptions | Subscriptions}
+ */
+export interface IUnsubscribeParams {
+	/** URI to unsubscribe from */
+	resource: URI;
+}
+
+// ─── dispatchAction ──────────────────────────────────────────────────────────
+
+/**
+ * Fire-and-forget action dispatch (write-ahead). The client applies actions
+ * optimistically to local state.
+ *
+ * @category Commands
+ * @method dispatchAction
+ * @direction Client → Server
+ * @messageType Notification
+ * @version 1
+ * @see {@link /guide/actions | Actions} for the full list of client-dispatchable actions.
+ */
+export interface IDispatchActionParams {
+	/** Client sequence number */
+	clientSeq: number;
+	/** The action to dispatch */
+	action: IStateAction;
+}
+
+// ─── browseDirectory ────────────────────────────────────────────────────
+
+/**
+ * Lists the contents of a directory on the server. Used by clients to
+ * present directory pickers or file browsers.
+ *
+ * @category Commands
+ * @method browseDirectory
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ */
+export interface IBrowseDirectoryParams {
+	/** Directory path to browse. Omit to list the default/root directory. */
+	directory?: string;
+}
+
+/**
+ * A single entry in a directory listing.
+ */
+export interface IBrowseDirectoryEntry {
+	/** Entry name (not a full path) */
+	name: string;
+	/** Whether this entry is a directory */
+	isDirectory: boolean;
+}
+
+// ─── authenticate ────────────────────────────────────────────────────────────
+
+/**
+ * Pushes a Bearer token for a protected resource. The `resource` field MUST
+ * match an `IProtectedResourceMetadata.resource` value declared by an agent
+ * in `IAgentInfo.protectedResources`.
+ *
+ * Tokens are delivered using [RFC 6750](https://datatracker.ietf.org/doc/html/rfc6750)
+ * (Bearer Token Usage) semantics. The client obtains the token from the
+ * authorization server(s) listed in the resource's metadata and pushes it
+ * to the server via this command.
+ *
+ * @category Commands
+ * @method authenticate
+ * @direction Client → Server
+ * @messageType Request
+ * @version 1
+ * @see {@link /specification/authentication | Authentication}
+ * @example
+ * ```jsonc
+ * // Client → Server
+ * { "jsonrpc": "2.0", "id": 3, "method": "authenticate",
+ *   "params": { "resource": "https://api.github.com", "token": "gho_xxxx" } }
+ *
+ * // Server → Client (success)
+ * { "jsonrpc": "2.0", "id": 3, "result": {} }
+ *
+ * // Server → Client (failure — invalid token)
+ * { "jsonrpc": "2.0", "id": 3, "error": { "code": -32007, "message": "Invalid token" } }
+ * ```
+ */
+export interface IAuthenticateParams {
+	/**
+	 * The protected resource identifier. MUST match a `resource` value from
+	 * `IProtectedResourceMetadata` declared in `IAgentInfo.protectedResources`.
+	 */
+	resource: string;
+	/** Bearer token obtained from the resource's authorization server */
+	token: string;
+}
+
+/**
+ * Result of the `authenticate` command.
+ *
+ * An empty object on success. If the token is invalid or the resource is
+ * unrecognized, the server MUST return a JSON-RPC error (e.g. `AuthRequired`
+ * `-32007` or `InvalidParams` `-32602`).
+ */
+export interface IAuthenticateResult {
+}
diff --git a/src/vs/platform/agentHost/common/state/protocol/errors.ts b/src/vs/platform/agentHost/common/state/protocol/errors.ts
new file mode 100644
index 00000000000..cfa1291eaab
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/errors.ts
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+// ─── Standard JSON-RPC Codes ─────────────────────────────────────────────────
+
+/**
+ * Standard JSON-RPC 2.0 error codes.
+ *
+ * @category Standard JSON-RPC Codes
+ */
+export const JsonRpcErrorCodes = {
+	/** Invalid JSON */
+	ParseError: -32700,
+	/** Not a valid JSON-RPC request */
+	InvalidRequest: -32600,
+	/** Unknown method name */
+	MethodNotFound: -32601,
+	/** Invalid method parameters */
+	InvalidParams: -32602,
+	/** Unspecified server error */
+	InternalError: -32603,
+} as const;
+
+// ─── AHP Application Codes ──────────────────────────────────────────────────
+
+/**
+ * AHP application-specific error codes.
+ *
+ * @category AHP Application Codes
+ * @version 1
+ */
+export const AhpErrorCodes = {
+	/** The referenced session URI does not exist */
+	SessionNotFound: -32001,
+	/** The requested agent provider is not registered */
+	ProviderNotFound: -32002,
+	/** A session with the given URI already exists */
+	SessionAlreadyExists: -32003,
+	/** The operation requires no active turn, but one is in progress */
+	TurnInProgress: -32004,
+	/** The client's protocol version is not supported by the server */
+	UnsupportedProtocolVersion: -32005,
+	/** The requested content URI does not exist */
+	ContentNotFound: -32006,
+	/**
+	 * A command failed because the client has not authenticated for a required
+	 * protected resource. The `data` field of the JSON-RPC error SHOULD contain
+	 * an `IProtectedResourceMetadata[]` array describing the resources that
+	 * require authentication.
+	 *
+	 * @see {@link /specification/authentication | Authentication}
+	 */
+	AuthRequired: -32007,
+	/** The requested file, folder, or URI does not exist */
+	NotFound: -32008,
+	/**
+	 * The client is not permitted to access the requested resource.
+	 *
+	 * Servers SHOULD return this when a client attempts to read or browse
+	 * a path outside the allowed set (e.g. outside the session's working
+	 * directory or workspace roots).
+	 */
+	PermissionDenied: -32009,
+} as const;
+
+/** Union type of all AHP application error codes. */
+export type AhpErrorCode = (typeof AhpErrorCodes)[keyof typeof AhpErrorCodes];
+
+/** Union type of all JSON-RPC error codes. */
+export type JsonRpcErrorCode = (typeof JsonRpcErrorCodes)[keyof typeof JsonRpcErrorCodes];
diff --git a/src/vs/platform/agentHost/common/state/protocol/messages.ts b/src/vs/platform/agentHost/common/state/protocol/messages.ts
new file mode 100644
index 00000000000..e3cd6567b10
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/messages.ts
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+import type { IInitializeParams, IInitializeResult, IReconnectParams, IReconnectResult, ISubscribeParams, ISubscribeResult, ICreateSessionParams, IDisposeSessionParams, IListSessionsParams, IListSessionsResult, IFetchContentParams, IFetchContentResult, IBrowseDirectoryParams, IBrowseDirectoryResult, IFetchTurnsParams, IFetchTurnsResult, IUnsubscribeParams, IDispatchActionParams, IAuthenticateParams, IAuthenticateResult } from './commands.js';
+
+import type { IActionEnvelope } from './actions.js';
+import type { IProtocolNotification } from './notifications.js';
+
+// ─── JSON-RPC Base Types ─────────────────────────────────────────────────────
+
+/** A JSON-RPC request: has both `method` and `id`. */
+export interface IJsonRpcRequest {
+	readonly jsonrpc: '2.0';
+	readonly id: number;
+	readonly method: string;
+	readonly params?: unknown;
+}
+
+/** A JSON-RPC success response. */
+export interface IJsonRpcSuccessResponse {
+	readonly jsonrpc: '2.0';
+	readonly id: number;
+	readonly result: unknown;
+}
+
+/** A JSON-RPC error response. */
+export interface IJsonRpcErrorResponse {
+	readonly jsonrpc: '2.0';
+	readonly id: number;
+	readonly error: {
+		readonly code: number;
+		readonly message: string;
+		readonly data?: unknown;
+	};
+}
+
+/** A JSON-RPC response (success or error). */
+export type IJsonRpcResponse = IJsonRpcSuccessResponse | IJsonRpcErrorResponse;
+
+/** A JSON-RPC notification: has `method` but no `id`. */
+export interface IJsonRpcNotification {
+	readonly jsonrpc: '2.0';
+	readonly method: string;
+	readonly params?: unknown;
+}
+
+// ─── Command Map ─────────────────────────────────────────────────────────────
+
+/**
+ * Registry mapping each command method name to its params and result types.
+ *
+ * @category Commands
+ */
+export interface ICommandMap {
+	'initialize': { params: IInitializeParams; result: IInitializeResult };
+	'reconnect': { params: IReconnectParams; result: IReconnectResult };
+	'subscribe': { params: ISubscribeParams; result: ISubscribeResult };
+	'createSession': { params: ICreateSessionParams; result: null };
+	'disposeSession': { params: IDisposeSessionParams; result: null };
+	'listSessions': { params: IListSessionsParams; result: IListSessionsResult };
+	'fetchContent': { params: IFetchContentParams; result: IFetchContentResult };
+	'browseDirectory': { params: IBrowseDirectoryParams; result: IBrowseDirectoryResult };
+	'fetchTurns': { params: IFetchTurnsParams; result: IFetchTurnsResult };
+	'authenticate': { params: IAuthenticateParams; result: IAuthenticateResult };
+}
+
+// ─── Notification Maps ───────────────────────────────────────────────────────
+
+/** Params for the server → client `notification` method. */
+export interface INotificationMethodParams {
+	notification: IProtocolNotification;
+}
+
+/**
+ * Registry mapping each client → server notification method to its params type.
+ *
+ * @category Notifications
+ */
+export interface IClientNotificationMap {
+	'unsubscribe': { params: IUnsubscribeParams };
+	'dispatchAction': { params: IDispatchActionParams };
+}
+
+/**
+ * Registry mapping each server → client notification method to its params type.
+ *
+ * @category Notifications
+ */
+export interface IServerNotificationMap {
+	'action': { params: IActionEnvelope };
+	'notification': { params: INotificationMethodParams };
+}
+
+/** Combined notification map for all directions. */
+export type INotificationMap = IClientNotificationMap & IServerNotificationMap;
+
+// ─── Typed Requests ──────────────────────────────────────────────────────────
+
+/**
+ * A fully typed JSON-RPC request for a specific AHP command.
+ *
+ * When used as a union (default generic), narrowing on `method` gives typed `params`:
+ *
+ * ```ts
+ * function handle(req: IAhpRequest) {
+ *   if (req.method === 'fetchTurns') {
+ *     req.params.session; // typed as URI
+ *   }
+ * }
+ * ```
+ */
+export type IAhpRequest<M extends keyof ICommandMap = keyof ICommandMap> =
+	M extends unknown ? {
+		readonly jsonrpc: '2.0';
+		readonly id: number;
+		readonly method: M;
+		readonly params: ICommandMap[M]['params'];
+	} : never;
+
+// ─── Typed Responses ─────────────────────────────────────────────────────────
+
+/**
+ * A fully typed JSON-RPC success response for a specific AHP command.
+ *
+ * Since JSON-RPC responses do not carry `method`, use this with an explicit
+ * generic parameter when you know the method from the associated request:
+ *
+ * ```ts
+ * const result: IAhpSuccessResponse<'fetchTurns'> = ...;
+ * result.result.turns; // typed as ITurn[]
+ * ```
+ */
+export type IAhpSuccessResponse<M extends keyof ICommandMap = keyof ICommandMap> =
+	M extends unknown ? {
+		readonly jsonrpc: '2.0';
+		readonly id: number;
+		readonly result: ICommandMap[M]['result'];
+	} : never;
+
+/** Typed JSON-RPC response (success with known result type, or error). */
+export type IAhpResponse<M extends keyof ICommandMap = keyof ICommandMap> =
+	| IAhpSuccessResponse<M>
+	| IJsonRpcErrorResponse;
+
+// ─── Typed Notifications ─────────────────────────────────────────────────────
+
+/**
+ * A fully typed JSON-RPC notification for a specific AHP notification method.
+ *
+ * When used as a union (default generic), narrowing on `method` gives typed `params`:
+ *
+ * ```ts
+ * function handle(notif: IAhpNotification) {
+ *   if (notif.method === 'action') {
+ *     notif.params.serverSeq; // typed as number
+ *   }
+ * }
+ * ```
+ */
+export type IAhpNotification<M extends keyof INotificationMap = keyof INotificationMap> =
+	M extends unknown ? {
+		readonly jsonrpc: '2.0';
+		readonly method: M;
+		readonly params: INotificationMap[M]['params'];
+	} : never;
+
+/** A client → server notification. */
+export type IAhpClientNotification<M extends keyof IClientNotificationMap = keyof IClientNotificationMap> =
+	M extends unknown ? {
+		readonly jsonrpc: '2.0';
+		readonly method: M;
+		readonly params: IClientNotificationMap[M]['params'];
+	} : never;
+
+/** A server → client notification. */
+export type IAhpServerNotification<M extends keyof IServerNotificationMap = keyof IServerNotificationMap> =
+	M extends unknown ? {
+		readonly jsonrpc: '2.0';
+		readonly method: M;
+		readonly params: IServerNotificationMap[M]['params'];
+	} : never;
+
+// ─── Protocol Message Union ──────────────────────────────────────────────────
+
+/**
+ * Discriminated union of all AHP protocol messages.
+ *
+ * Narrow using standard JSON-RPC structure:
+ * - Has `method` + `id` → request ({@link IAhpRequest})
+ * - Has `method`, no `id` → notification ({@link IAhpNotification})
+ * - Has `result` or `error` + `id` → response ({@link IAhpResponse})
+ *
+ * Then narrow on `method` for fully typed params:
+ *
+ * ```ts
+ * function dispatch(msg: IProtocolMessage) {
+ *   if ('method' in msg && 'id' in msg) {
+ *     // msg is IAhpRequest
+ *     if (msg.method === 'fetchTurns') {
+ *       msg.params.session; // URI
+ *     }
+ *   }
+ * }
+ * ```
+ */
+export type IProtocolMessage =
+	| IAhpRequest
+	| IAhpSuccessResponse
+	| IJsonRpcErrorResponse
+	| IAhpNotification;
diff --git a/src/vs/platform/agentHost/common/state/protocol/notifications.ts b/src/vs/platform/agentHost/common/state/protocol/notifications.ts
new file mode 100644
index 00000000000..7e255adac8f
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/notifications.ts
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+import type { URI, ISessionSummary } from './state.js';
+
+/**
+ * Reason why authentication is required.
+ *
+ * @category Protocol Notifications
+ */
+export const enum AuthRequiredReason {
+	/** The client has not yet authenticated for the resource */
+	Required = 'required',
+	/** A previously valid token has expired or been revoked */
+	Expired = 'expired',
+}
+
+// ─── Protocol Notifications ──────────────────────────────────────────────────
+
+/**
+ * Discriminant values for all protocol notifications.
+ *
+ * @category Protocol Notifications
+ */
+export const enum NotificationType {
+	SessionAdded = 'notify/sessionAdded',
+	SessionRemoved = 'notify/sessionRemoved',
+	AuthRequired = 'notify/authRequired',
+}
+
+/**
+ * Broadcast to all connected clients when a new session is created.
+ *
+ * @category Protocol Notifications
+ * @version 1
+ * @example
+ * ```json
+ * {
+ *   "jsonrpc": "2.0",
+ *   "method": "notification",
+ *   "params": {
+ *     "notification": {
+ *       "type": "notify/sessionAdded",
+ *       "summary": {
+ *         "resource": "copilot:/<uuid>",
+ *         "provider": "copilot",
+ *         "title": "New Session",
+ *         "status": "idle",
+ *         "createdAt": 1710000000000,
+ *         "modifiedAt": 1710000000000
+ *       }
+ *     }
+ *   }
+ * }
+ * ```
+ */
+export interface ISessionAddedNotification {
+	type: NotificationType.SessionAdded;
+	/** Summary of the new session */
+	summary: ISessionSummary;
+}
+
+/**
+ * Broadcast to all connected clients when a session is disposed.
+ *
+ * @category Protocol Notifications
+ * @version 1
+ * @example
+ * ```json
+ * {
+ *   "jsonrpc": "2.0",
+ *   "method": "notification",
+ *   "params": {
+ *     "notification": {
+ *       "type": "notify/sessionRemoved",
+ *       "session": "copilot:/<uuid>"
+ *     }
+ *   }
+ * }
+ * ```
+ */
+export interface ISessionRemovedNotification {
+	type: NotificationType.SessionRemoved;
+	/** URI of the removed session */
+	session: URI;
+}
+
+/**
+ * Sent by the server when a protected resource requires (re-)authentication.
+ *
+ * This notification is sent when a previously valid token expires or is
+ * revoked, or when the server discovers a new authentication requirement.
+ * Clients should obtain a fresh token and push it via the `authenticate`
+ * command.
+ *
+ * @category Protocol Notifications
+ * @version 1
+ * @see {@link /specification/authentication | Authentication}
+ * @example
+ * ```json
+ * {
+ *   "jsonrpc": "2.0",
+ *   "method": "notification",
+ *   "params": {
+ *     "notification": {
+ *       "type": "notify/authRequired",
+ *       "resource": "https://api.github.com",
+ *       "reason": "expired"
+ *     }
+ *   }
+ * }
+ * ```
+ */
+export interface IAuthRequiredNotification {
+	type: NotificationType.AuthRequired;
+	/** The protected resource identifier that requires authentication */
+	resource: string;
+	/** Why authentication is required */
+	reason?: AuthRequiredReason;
+}
+
+/**
+ * Discriminated union of all protocol notifications.
+ */
+export type IProtocolNotification =
+	| ISessionAddedNotification
+	| ISessionRemovedNotification
+	| IAuthRequiredNotification;
diff --git a/src/vs/platform/agentHost/common/state/protocol/reducers.ts b/src/vs/platform/agentHost/common/state/protocol/reducers.ts
new file mode 100644
index 00000000000..39a6aec57e5
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/reducers.ts
@@ -0,0 +1,564 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+import { ActionType } from './actions.js';
+import { SessionLifecycle, SessionStatus, TurnState, ToolCallStatus, ToolCallConfirmationReason, ToolCallCancellationReason, ResponsePartKind, PendingMessageKind, type IRootState, type ISessionState, type IToolCallState, type IResponsePart, type IToolCallResponsePart, type ITurn, type IPendingMessage } from './state.js';
+import { IS_CLIENT_DISPATCHABLE, type IRootAction, type ISessionAction, type IClientSessionAction } from './action-origin.generated.js';
+
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+
+/**
+ * Soft assertion for exhaustiveness checking. Place in the `default` branch of
+ * a switch on a discriminated union so the compiler errors when a new variant
+ * is added but not handled.
+ *
+ * At runtime, logs a warning instead of throwing so that forward-compatible
+ * clients receiving unknown actions from a newer server degrade gracefully.
+ */
+export function softAssertNever(value: never, log?: (msg: string) => void): void {
+	const msg = `Unhandled action type: ${JSON.stringify(value)}`;
+	(log ?? console.warn)(msg);
+}
+
+/** Extracts the common base fields shared by all tool call lifecycle states. */
+function tcBase(tc: IToolCallState) {
+	return {
+		toolCallId: tc.toolCallId,
+		toolName: tc.toolName,
+		displayName: tc.displayName,
+		toolClientId: tc.toolClientId,
+		_meta: tc._meta,
+	};
+}
+
+/**
+ * Ends the active turn, finalizing it into a completed turn record.
+ *
+ * Tool call parts with non-terminal states are forced to cancelled.
+ * Pending permissions are stripped from tool call parts.
+ */
+function endTurn(
+	state: ISessionState,
+	turnId: string,
+	turnState: TurnState,
+	summaryStatus: SessionStatus,
+	error?: { errorType: string; message: string; stack?: string },
+): ISessionState {
+	if (!state.activeTurn || state.activeTurn.id !== turnId) {
+		return state;
+	}
+	const active = state.activeTurn;
+
+	const responseParts: IResponsePart[] = active.responseParts.map(part => {
+		if (part.kind !== ResponsePartKind.ToolCall) {
+			return part;
+		}
+		const tc = part.toolCall;
+		if (tc.status === ToolCallStatus.Completed || tc.status === ToolCallStatus.Cancelled) {
+			return part;
+		}
+		// Force non-terminal tool calls into cancelled state
+		return {
+			kind: ResponsePartKind.ToolCall,
+			toolCall: {
+				status: ToolCallStatus.Cancelled as const,
+				...tcBase(tc),
+				invocationMessage: tc.status === ToolCallStatus.Streaming ? (tc.invocationMessage ?? '') : tc.invocationMessage,
+				toolInput: tc.status === ToolCallStatus.Streaming ? undefined : tc.toolInput,
+				reason: ToolCallCancellationReason.Skipped,
+			},
+		};
+	});
+
+	const turn: ITurn = {
+		id: active.id,
+		userMessage: active.userMessage,
+		responseParts,
+		usage: active.usage,
+		state: turnState,
+		error,
+	};
+
+	return {
+		...state,
+		turns: [...state.turns, turn],
+		activeTurn: undefined,
+		summary: { ...state.summary, status: summaryStatus, modifiedAt: Date.now() },
+	};
+}
+
+/**
+ * Immutably updates the tool call inside a `ToolCall` response part in the
+ * active turn's `responseParts` array. Returns `state` unchanged if the
+ * active turn or tool call doesn't match.
+ */
+function updateToolCallInParts(
+	state: ISessionState,
+	turnId: string,
+	toolCallId: string,
+	updater: (tc: IToolCallState) => IToolCallState,
+): ISessionState {
+	const activeTurn = state.activeTurn;
+	if (!activeTurn || activeTurn.id !== turnId) {
+		return state;
+	}
+
+	let found = false;
+	const responseParts = activeTurn.responseParts.map(part => {
+		if (part.kind === ResponsePartKind.ToolCall && part.toolCall.toolCallId === toolCallId) {
+			const updated = updater(part.toolCall);
+			if (updated === part.toolCall) {
+				return part;
+			}
+			found = true;
+			return { ...part, toolCall: updated };
+		}
+		return part;
+	});
+
+	if (!found) {
+		return state;
+	}
+
+	return {
+		...state,
+		activeTurn: { ...activeTurn, responseParts },
+	};
+}
+
+/**
+ * Immutably updates a response part by `partId` in the active turn.
+ * For markdown/reasoning parts, matches on `id`. For tool call parts,
+ * matches on `toolCall.toolCallId`.
+ */
+function updateResponsePart(
+	state: ISessionState,
+	turnId: string,
+	partId: string,
+	updater: (part: IResponsePart) => IResponsePart,
+): ISessionState {
+	const activeTurn = state.activeTurn;
+	if (!activeTurn || activeTurn.id !== turnId) {
+		return state;
+	}
+
+	let found = false;
+	const responseParts = activeTurn.responseParts.map(part => {
+		if (!found) {
+			const id = part.kind === ResponsePartKind.ToolCall
+				? part.toolCall.toolCallId
+				: 'id' in part ? part.id : undefined;
+			if (id === partId) {
+				found = true;
+				return updater(part);
+			}
+		}
+		return part;
+	});
+
+	if (!found) {
+		return state;
+	}
+
+	return {
+		...state,
+		activeTurn: { ...activeTurn, responseParts },
+	};
+}
+
+// ─── Root Reducer ────────────────────────────────────────────────────────────
+
+/**
+ * Pure reducer for root state. Handles all {@link IRootAction} variants.
+ */
+export function rootReducer(state: IRootState, action: IRootAction, log?: (msg: string) => void): IRootState {
+	switch (action.type) {
+		case ActionType.RootAgentsChanged:
+			return { ...state, agents: action.agents };
+
+		case ActionType.RootActiveSessionsChanged:
+			return { ...state, activeSessions: action.activeSessions };
+
+		default:
+			softAssertNever(action, log);
+			return state;
+	}
+}
+
+// ─── Session Reducer ─────────────────────────────────────────────────────────
+
+/**
+ * Pure reducer for session state. Handles all {@link ISessionAction} variants.
+ */
+export function sessionReducer(state: ISessionState, action: ISessionAction, log?: (msg: string) => void): ISessionState {
+	switch (action.type) {
+		// ── Lifecycle ──────────────────────────────────────────────────────────
+
+		case ActionType.SessionReady:
+			return {
+				...state,
+				lifecycle: SessionLifecycle.Ready,
+				summary: { ...state.summary, status: SessionStatus.Idle },
+			};
+
+		case ActionType.SessionCreationFailed:
+			return {
+				...state,
+				lifecycle: SessionLifecycle.CreationFailed,
+				creationError: action.error,
+			};
+
+		// ── Turn Lifecycle ────────────────────────────────────────────────────
+
+		case ActionType.SessionTurnStarted: {
+			let next: ISessionState = {
+				...state,
+				summary: { ...state.summary, status: SessionStatus.InProgress, modifiedAt: Date.now() },
+				activeTurn: {
+					id: action.turnId,
+					userMessage: action.userMessage,
+					responseParts: [],
+					usage: undefined,
+				},
+			};
+
+			// If this turn was auto-started from a pending message, remove it
+			if (action.queuedMessageId) {
+				if (next.steeringMessage?.id === action.queuedMessageId) {
+					next = { ...next, steeringMessage: undefined };
+				}
+				if (next.queuedMessages) {
+					const filtered = next.queuedMessages.filter(m => m.id !== action.queuedMessageId);
+					next = { ...next, queuedMessages: filtered.length > 0 ? filtered : undefined };
+				}
+			}
+
+			return next;
+		}
+
+		case ActionType.SessionDelta:
+			return updateResponsePart(state, action.turnId, action.partId, part => {
+				if (part.kind === ResponsePartKind.Markdown) {
+					return { ...part, content: part.content + action.content };
+				}
+				return part;
+			});
+
+		case ActionType.SessionResponsePart:
+			if (!state.activeTurn || state.activeTurn.id !== action.turnId) {
+				return state;
+			}
+			return {
+				...state,
+				activeTurn: {
+					...state.activeTurn,
+					responseParts: [...state.activeTurn.responseParts, action.part],
+				},
+			};
+
+		case ActionType.SessionTurnComplete:
+			return endTurn(state, action.turnId, TurnState.Complete, SessionStatus.Idle);
+
+		case ActionType.SessionTurnCancelled:
+			return endTurn(state, action.turnId, TurnState.Cancelled, SessionStatus.Idle);
+
+		case ActionType.SessionError:
+			return endTurn(state, action.turnId, TurnState.Error, SessionStatus.Error, action.error);
+
+		// ── Tool Call State Machine ───────────────────────────────────────────
+
+		case ActionType.SessionToolCallStart:
+			if (!state.activeTurn || state.activeTurn.id !== action.turnId) {
+				return state;
+			}
+			return {
+				...state,
+				activeTurn: {
+					...state.activeTurn,
+					responseParts: [
+						...state.activeTurn.responseParts,
+						{
+							kind: ResponsePartKind.ToolCall,
+							toolCall: {
+								toolCallId: action.toolCallId,
+								toolName: action.toolName,
+								displayName: action.displayName,
+								toolClientId: action.toolClientId,
+								_meta: action._meta,
+								status: ToolCallStatus.Streaming,
+							},
+						} satisfies IToolCallResponsePart,
+					],
+				},
+			};
+
+		case ActionType.SessionToolCallDelta:
+			return updateToolCallInParts(state, action.turnId, action.toolCallId, tc => {
+				if (tc.status !== ToolCallStatus.Streaming) {
+					return tc;
+				}
+				return {
+					...tc,
+					partialInput: (tc.partialInput ?? '') + action.content,
+					invocationMessage: action.invocationMessage ?? tc.invocationMessage,
+				};
+			});
+
+		case ActionType.SessionToolCallReady:
+			return updateToolCallInParts(state, action.turnId, action.toolCallId, tc => {
+				if (tc.status !== ToolCallStatus.Streaming && tc.status !== ToolCallStatus.Running) {
+					return tc;
+				}
+				const base = tcBase(tc);
+				if (action.confirmed) {
+					return {
+						status: ToolCallStatus.Running,
+						...base,
+						invocationMessage: action.invocationMessage,
+						toolInput: action.toolInput,
+						confirmed: action.confirmed,
+					};
+				}
+				return {
+					status: ToolCallStatus.PendingConfirmation,
+					...base,
+					invocationMessage: action.invocationMessage,
+					toolInput: action.toolInput,
+					confirmationTitle: action.confirmationTitle,
+				};
+			});
+
+		case ActionType.SessionToolCallConfirmed:
+			return updateToolCallInParts(state, action.turnId, action.toolCallId, tc => {
+				if (tc.status !== ToolCallStatus.PendingConfirmation) {
+					return tc;
+				}
+				const base = tcBase(tc);
+				if (action.approved) {
+					return {
+						status: ToolCallStatus.Running,
+						...base,
+						invocationMessage: tc.invocationMessage,
+						toolInput: tc.toolInput,
+						confirmed: action.confirmed,
+					};
+				}
+				return {
+					status: ToolCallStatus.Cancelled,
+					...base,
+					invocationMessage: tc.invocationMessage,
+					toolInput: tc.toolInput,
+					reason: action.reason,
+					reasonMessage: action.reasonMessage,
+					userSuggestion: action.userSuggestion,
+				};
+			});
+
+		case ActionType.SessionToolCallComplete:
+			return updateToolCallInParts(state, action.turnId, action.toolCallId, tc => {
+				if (tc.status !== ToolCallStatus.Running && tc.status !== ToolCallStatus.PendingConfirmation) {
+					return tc;
+				}
+				const base = tcBase(tc);
+				const confirmed = tc.status === ToolCallStatus.Running
+					? tc.confirmed
+					: ToolCallConfirmationReason.NotNeeded;
+				if (action.requiresResultConfirmation) {
+					return {
+						status: ToolCallStatus.PendingResultConfirmation,
+						...base,
+						invocationMessage: tc.invocationMessage,
+						toolInput: tc.toolInput,
+						confirmed,
+						...action.result,
+					};
+				}
+				return {
+					status: ToolCallStatus.Completed,
+					...base,
+					invocationMessage: tc.invocationMessage,
+					toolInput: tc.toolInput,
+					confirmed,
+					...action.result,
+				};
+			});
+
+		case ActionType.SessionToolCallResultConfirmed:
+			return updateToolCallInParts(state, action.turnId, action.toolCallId, tc => {
+				if (tc.status !== ToolCallStatus.PendingResultConfirmation) {
+					return tc;
+				}
+				const base = tcBase(tc);
+				if (action.approved) {
+					return {
+						status: ToolCallStatus.Completed,
+						...base,
+						invocationMessage: tc.invocationMessage,
+						toolInput: tc.toolInput,
+						confirmed: tc.confirmed,
+						success: tc.success,
+						pastTenseMessage: tc.pastTenseMessage,
+						content: tc.content,
+						structuredContent: tc.structuredContent,
+						error: tc.error,
+					};
+				}
+				return {
+					status: ToolCallStatus.Cancelled,
+					...base,
+					invocationMessage: tc.invocationMessage,
+					toolInput: tc.toolInput,
+					reason: ToolCallCancellationReason.ResultDenied,
+				};
+			});
+
+		// ── Metadata ──────────────────────────────────────────────────────────
+
+		case ActionType.SessionTitleChanged:
+			return {
+				...state,
+				summary: { ...state.summary, title: action.title, modifiedAt: Date.now() },
+			};
+
+		case ActionType.SessionUsage:
+			if (!state.activeTurn || state.activeTurn.id !== action.turnId) {
+				return state;
+			}
+			return {
+				...state,
+				activeTurn: { ...state.activeTurn, usage: action.usage },
+			};
+
+		case ActionType.SessionReasoning:
+			return updateResponsePart(state, action.turnId, action.partId, part => {
+				if (part.kind === ResponsePartKind.Reasoning) {
+					return { ...part, content: part.content + action.content };
+				}
+				return part;
+			});
+
+		case ActionType.SessionModelChanged:
+			return {
+				...state,
+				summary: { ...state.summary, model: action.model, modifiedAt: Date.now() },
+			};
+
+		case ActionType.SessionServerToolsChanged:
+			return { ...state, serverTools: action.tools };
+
+		case ActionType.SessionActiveClientChanged:
+			return {
+				...state,
+				activeClient: action.activeClient ?? undefined,
+			};
+
+		case ActionType.SessionActiveClientToolsChanged:
+			if (!state.activeClient) {
+				return state;
+			}
+			return {
+				...state,
+				activeClient: { ...state.activeClient, tools: action.tools },
+			};
+
+		// ── Customizations ──────────────────────────────────────────────────
+
+		case ActionType.SessionCustomizationsChanged:
+			return { ...state, customizations: action.customizations };
+
+		case ActionType.SessionCustomizationToggled: {
+			const list = state.customizations;
+			if (!list) {
+				return state;
+			}
+			const idx = list.findIndex(c => c.customization.uri === action.uri);
+			if (idx < 0) {
+				return state;
+			}
+			const updated = [...list];
+			updated[idx] = { ...list[idx], enabled: action.enabled };
+			return { ...state, customizations: updated };
+		}
+
+		// ── Pending Messages ──────────────────────────────────────────────────
+
+		case ActionType.SessionPendingMessageSet: {
+			const entry: IPendingMessage = { id: action.id, userMessage: action.userMessage };
+			if (action.kind === PendingMessageKind.Steering) {
+				return { ...state, steeringMessage: entry };
+			}
+			const existing = state.queuedMessages ?? [];
+			const idx = existing.findIndex(m => m.id === action.id);
+			if (idx >= 0) {
+				const updated = [...existing];
+				updated[idx] = entry;
+				return { ...state, queuedMessages: updated };
+			}
+			return { ...state, queuedMessages: [...existing, entry] };
+		}
+
+		case ActionType.SessionPendingMessageRemoved: {
+			if (action.kind === PendingMessageKind.Steering) {
+				if (!state.steeringMessage || state.steeringMessage.id !== action.id) {
+					return state;
+				}
+				return { ...state, steeringMessage: undefined };
+			}
+			const existing = state.queuedMessages;
+			if (!existing) {
+				return state;
+			}
+			const filtered = existing.filter(m => m.id !== action.id);
+			return filtered.length === existing.length
+				? state
+				: { ...state, queuedMessages: filtered.length > 0 ? filtered : undefined };
+		}
+
+		case ActionType.SessionQueuedMessagesReordered: {
+			const existing = state.queuedMessages;
+			if (!existing) {
+				return state;
+			}
+			const byId = new Map(existing.map(m => [m.id, m]));
+			const ordered = new Set<string>();
+			const reordered = action.order
+				.filter(id => {
+					if (byId.has(id) && !ordered.has(id)) {
+						ordered.add(id);
+						return true;
+					}
+					return false;
+				})
+				.map(id => byId.get(id)!);
+			// Append any messages not mentioned in order, preserving original order
+			for (const m of existing) {
+				if (!ordered.has(m.id)) {
+					reordered.push(m);
+				}
+			}
+			return { ...state, queuedMessages: reordered };
+		}
+
+		default:
+			softAssertNever(action, log);
+			return state;
+	}
+}
+
+// ─── Dispatch Validation ─────────────────────────────────────────────────────
+
+/**
+ * Type guard that checks whether an action may be dispatched by a client.
+ *
+ * Servers SHOULD call this to validate incoming `dispatchAction` requests
+ * and reject any action the client is not allowed to originate.
+ */
+export function isClientDispatchable(action: ISessionAction): action is IClientSessionAction {
+	return IS_CLIENT_DISPATCHABLE[action.type];
+}
diff --git a/src/vs/platform/agentHost/common/state/protocol/state.ts b/src/vs/platform/agentHost/common/state/protocol/state.ts
new file mode 100644
index 00000000000..42a5f0138f5
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/state.ts
@@ -0,0 +1,958 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+// ─── Type Aliases ────────────────────────────────────────────────────────────
+
+/** A URI string (e.g. `agenthost:/root` or `copilot:/<uuid>`). */
+export type URI = string;
+
+/**
+ * A string that may optionally be rendered as Markdown.
+ *
+ * - A plain `string` is rendered as-is (no Markdown processing).
+ * - An object with `{ markdown: string }` is rendered with Markdown formatting.
+ */
+export type StringOrMarkdown = string | { markdown: string };
+
+// ─── Icon ────────────────────────────────────────────────────────────────────
+
+/**
+ * An optionally-sized icon that can be displayed in a user interface.
+ *
+ * @category Common Types
+ */
+export interface Icon {
+	/**
+	 * A standard URI pointing to an icon resource. May be an HTTP/HTTPS URL or a
+	 * `data:` URI with Base64-encoded image data.
+	 *
+	 * Consumers SHOULD take steps to ensure URLs serving icons are from the
+	 * same domain as the client/server or a trusted domain.
+	 *
+	 * Consumers SHOULD take appropriate precautions when consuming SVGs as they can contain
+	 * executable JavaScript.
+	 */
+	src: URI;
+
+	/**
+	 * Optional MIME type override if the source MIME type is missing or generic.
+	 * For example: `"image/png"`, `"image/jpeg"`, or `"image/svg+xml"`.
+	 */
+	contentType?: string;
+
+	/**
+	 * Optional array of strings that specify sizes at which the icon can be used.
+	 * Each string should be in WxH format (e.g., `"48x48"`, `"96x96"`) or `"any"` for scalable formats like SVG.
+	 *
+	 * If not provided, the client should assume that the icon can be used at any size.
+	 */
+	sizes?: string[];
+
+	/**
+	 * Optional specifier for the theme this icon is designed for. `"light"` indicates
+	 * the icon is designed to be used with a light background, and `"dark"` indicates
+	 * the icon is designed to be used with a dark background.
+	 *
+	 * If not provided, the client should assume the icon can be used with any theme.
+	 */
+	theme?: 'light' | 'dark';
+}
+
+// ─── Protected Resource Metadata (RFC 9728) ─────────────────────────────────
+
+/**
+ * Describes a protected resource's authentication requirements using
+ * [RFC 9728](https://datatracker.ietf.org/doc/html/rfc9728) (OAuth 2.0
+ * Protected Resource Metadata) semantics.
+ *
+ * Field names use snake_case to match the RFC 9728 JSON format.
+ *
+ * @category Authentication
+ * @see {@link https://datatracker.ietf.org/doc/html/rfc9728 | RFC 9728}
+ */
+export interface IProtectedResourceMetadata {
+	/**
+	 * REQUIRED. The protected resource's resource identifier, a URL using the
+	 * `https` scheme with no fragment component (e.g. `"https://api.github.com"`).
+	 */
+	resource: string;
+
+	/** OPTIONAL. Human-readable name of the protected resource. */
+	resource_name?: string;
+
+	/** OPTIONAL. JSON array of OAuth authorization server identifier URLs. */
+	authorization_servers?: string[];
+
+	/** OPTIONAL. URL of the protected resource's JWK Set document. */
+	jwks_uri?: string;
+
+	/** RECOMMENDED. JSON array of OAuth 2.0 scope values used in authorization requests. */
+	scopes_supported?: string[];
+
+	/** OPTIONAL. JSON array of Bearer Token presentation methods supported. */
+	bearer_methods_supported?: string[];
+
+	/** OPTIONAL. JSON array of JWS signing algorithms supported. */
+	resource_signing_alg_values_supported?: string[];
+
+	/** OPTIONAL. JSON array of JWE encryption algorithms (alg) supported. */
+	resource_encryption_alg_values_supported?: string[];
+
+	/** OPTIONAL. JSON array of JWE encryption algorithms (enc) supported. */
+	resource_encryption_enc_values_supported?: string[];
+
+	/** OPTIONAL. URL of human-readable documentation for the resource. */
+	resource_documentation?: string;
+
+	/** OPTIONAL. URL of the resource's data-usage policy. */
+	resource_policy_uri?: string;
+
+	/** OPTIONAL. URL of the resource's terms of service. */
+	resource_tos_uri?: string;
+
+	/**
+	 * AHP extension. Whether authentication is required for this resource.
+	 *
+	 * - `true` (default) — the agent cannot be used without a valid token.
+	 *   The server SHOULD return `AuthRequired` (`-32007`) if the client
+	 *   attempts to use the agent without authenticating.
+	 * - `false` — the agent works without authentication but MAY offer
+	 *   enhanced capabilities when a token is provided.
+	 *
+	 * Clients SHOULD treat an absent field the same as `true`.
+	 */
+	required?: boolean;
+}
+
+// ─── Root State ──────────────────────────────────────────────────────────────
+
+/**
+ * Policy configuration state for a model.
+ *
+ * @category Root State
+ */
+export const enum PolicyState {
+	Enabled = 'enabled',
+	Disabled = 'disabled',
+	Unconfigured = 'unconfigured',
+}
+
+/**
+ * Global state shared with every client subscribed to `agenthost:/root`.
+ *
+ * @category Root State
+ */
+export interface IRootState {
+	/** Available agent backends and their models */
+	agents: IAgentInfo[];
+	/** Number of active (non-disposed) sessions on the server */
+	activeSessions?: number;
+}
+
+/**
+ * @category Root State
+ */
+export interface IAgentInfo {
+	/** Agent provider ID (e.g. `'copilot'`) */
+	provider: string;
+	/** Human-readable name */
+	displayName: string;
+	/** Description string */
+	description: string;
+	/** Available models for this agent */
+	models: ISessionModelInfo[];
+	/**
+	 * Protected resources this agent requires authentication for.
+	 *
+	 * Each entry describes an OAuth 2.0 protected resource using
+	 * [RFC 9728](https://datatracker.ietf.org/doc/html/rfc9728) semantics.
+	 * Clients should obtain tokens from the declared `authorization_servers`
+	 * and push them via the `authenticate` command before creating sessions
+	 * with this agent.
+	 *
+	 * @see {@link /specification/authentication | Authentication}
+	 */
+	protectedResources?: IProtectedResourceMetadata[];
+	/**
+	 * Customizations (Open Plugins) associated with this agent.
+	 *
+	 * Each entry is a reference to an [Open Plugins](https://open-plugins.com/)
+	 * plugin that the agent host can activate for sessions using this agent.
+	 */
+	customizations?: ICustomizationRef[];
+}
+
+/**
+ * @category Root State
+ */
+export interface ISessionModelInfo {
+	/** Model identifier */
+	id: string;
+	/** Provider this model belongs to */
+	provider: string;
+	/** Human-readable model name */
+	name: string;
+	/** Maximum context window size */
+	maxContextWindow?: number;
+	/** Whether the model supports vision */
+	supportsVision?: boolean;
+	/** Policy configuration state */
+	policyState?: PolicyState;
+}
+
+// ─── Pending Message Types ───────────────────────────────────────────────────
+
+/**
+ * Discriminant for pending message kinds.
+ *
+ * @category Pending Message Types
+ */
+export const enum PendingMessageKind {
+	/** Injected into the current turn at a convenient point */
+	Steering = 'steering',
+	/** Sent automatically as a new turn after the current turn finishes */
+	Queued = 'queued',
+}
+
+/**
+ * A message queued for future delivery to the agent.
+ *
+ * Steering messages are injected into the current turn mid-flight.
+ * Queued messages are automatically started as new turns after the
+ * current turn naturally finishes.
+ *
+ * @category Pending Message Types
+ */
+export interface IPendingMessage {
+	/** Unique identifier for this pending message */
+	id: string;
+	/** The message content */
+	userMessage: IUserMessage;
+}
+
+// ─── Session State ───────────────────────────────────────────────────────────
+
+/**
+ * Session initialization state.
+ *
+ * @category Session State
+ */
+export const enum SessionLifecycle {
+	Creating = 'creating',
+	Ready = 'ready',
+	CreationFailed = 'creationFailed',
+}
+
+/**
+ * Current session status.
+ *
+ * @category Session State
+ */
+export const enum SessionStatus {
+	Idle = 'idle',
+	InProgress = 'in-progress',
+	Error = 'error',
+}
+
+/**
+ * Full state for a single session, loaded when a client subscribes to the session's URI.
+ *
+ * @category Session State
+ */
+export interface ISessionState {
+	/** Lightweight session metadata */
+	summary: ISessionSummary;
+	/** Session initialization state */
+	lifecycle: SessionLifecycle;
+	/** Error details if creation failed */
+	creationError?: IErrorInfo;
+	/** Tools provided by the server (agent host) for this session */
+	serverTools?: IToolDefinition[];
+	/** The client currently providing tools and interactive capabilities to this session */
+	activeClient?: ISessionActiveClient;
+	/** The working directory URI for this session */
+	workingDirectory?: URI;
+	/** Completed turns */
+	turns: ITurn[];
+	/** Currently in-progress turn */
+	activeTurn?: IActiveTurn;
+	/** Message to inject into the current turn at a convenient point */
+	steeringMessage?: IPendingMessage;
+	/** Messages to send automatically as new turns after the current turn finishes */
+	queuedMessages?: IPendingMessage[];
+	/**
+	 * Server-provided customizations active in this session.
+	 *
+	 * Client-provided customizations are available on
+	 * {@link ISessionActiveClient.customizations | activeClient.customizations}.
+	 */
+	customizations?: ISessionCustomization[];
+}
+
+/**
+ * The client currently providing tools and interactive capabilities to a session.
+ *
+ * Only one client may be active per session at a time. The server SHOULD
+ * automatically unset the active client if that client disconnects.
+ *
+ * @category Session State
+ */
+export interface ISessionActiveClient {
+	/** Client identifier (matches `clientId` from `initialize`) */
+	clientId: string;
+	/** Human-readable client name (e.g. `"VS Code"`) */
+	displayName?: string;
+	/** Tools this client provides to the session */
+	tools: IToolDefinition[];
+	/** Customizations this client contributes to the session */
+	customizations?: ICustomizationRef[];
+}
+
+/**
+ * @category Session State
+ */
+export interface ISessionSummary {
+	/** Session URI */
+	resource: URI;
+	/** Agent provider ID */
+	provider: string;
+	/** Session title */
+	title: string;
+	/** Current session status */
+	status: SessionStatus;
+	/** Creation timestamp */
+	createdAt: number;
+	/** Last modification timestamp */
+	modifiedAt: number;
+	/** Currently selected model */
+	model?: string;
+	/** The working directory URI for this session */
+	workingDirectory?: URI;
+}
+
+// ─── Turn Types ──────────────────────────────────────────────────────────────
+
+/**
+ * How a turn ended.
+ *
+ * @category Turn Types
+ */
+export const enum TurnState {
+	Complete = 'complete',
+	Cancelled = 'cancelled',
+	Error = 'error',
+}
+
+/**
+ * Type of a message attachment.
+ *
+ * @category Turn Types
+ */
+export const enum AttachmentType {
+	File = 'file',
+	Directory = 'directory',
+	Selection = 'selection',
+}
+
+/**
+ * A completed request/response cycle.
+ *
+ * @category Turn Types
+ */
+export interface ITurn {
+	/** Turn identifier */
+	id: string;
+	/** The user's input */
+	userMessage: IUserMessage;
+	/**
+	 * All response content in stream order: text, tool calls, reasoning, and content refs.
+	 *
+	 * Consumers should derive display text by concatenating markdown parts,
+	 * and find tool calls by filtering for `ToolCall` parts.
+	 */
+	responseParts: IResponsePart[];
+	/** Token usage info */
+	usage: IUsageInfo | undefined;
+	/** How the turn ended */
+	state: TurnState;
+	/** Error details if state is `'error'` */
+	error?: IErrorInfo;
+}
+
+/**
+ * An in-progress turn — the assistant is actively streaming.
+ *
+ * @category Turn Types
+ */
+export interface IActiveTurn {
+	/** Turn identifier */
+	id: string;
+	/** The user's input */
+	userMessage: IUserMessage;
+	/**
+	 * All response content in stream order: text, tool calls, reasoning, and content refs.
+	 *
+	 * Tool call parts include `pendingPermissions` when permissions are awaiting user approval.
+	 */
+	responseParts: IResponsePart[];
+	/** Token usage info */
+	usage: IUsageInfo | undefined;
+}
+
+/**
+ * @category Turn Types
+ */
+export interface IUserMessage {
+	/** Message text */
+	text: string;
+	/** File/selection attachments */
+	attachments?: IMessageAttachment[];
+}
+
+/**
+ * @category Turn Types
+ */
+export interface IMessageAttachment {
+	/** Attachment type */
+	type: AttachmentType;
+	/** File/directory path */
+	path: string;
+	/** Display name */
+	displayName?: string;
+}
+
+// ─── Response Parts ──────────────────────────────────────────────────────────
+
+/**
+ * Discriminant for response part types.
+ *
+ * @category Response Parts
+ */
+export const enum ResponsePartKind {
+	Markdown = 'markdown',
+	ContentRef = 'contentRef',
+	ToolCall = 'toolCall',
+	Reasoning = 'reasoning',
+}
+
+/**
+ * @category Response Parts
+ */
+export interface IMarkdownResponsePart {
+	/** Discriminant */
+	kind: ResponsePartKind.Markdown;
+	/** Part identifier, used by `session/delta` to target this part for content appends */
+	id: string;
+	/** Markdown content */
+	content: string;
+}
+
+/**
+ * A reference to large content stored outside the state tree.
+ *
+ * @category Response Parts
+ */
+export interface IContentRef {
+	/** Discriminant */
+	kind: ResponsePartKind.ContentRef;
+	/** Content URI */
+	uri: string;
+	/** Approximate size in bytes */
+	sizeHint?: number;
+	/** Content MIME type */
+	contentType?: string;
+}
+
+/**
+ * A tool call represented as a response part.
+ *
+ * Tool calls are part of the response stream, interleaved with text and
+ * reasoning. The `toolCall.toolCallId` serves as the part identifier for
+ * actions that target this part.
+ *
+ * @category Response Parts
+ */
+export interface IToolCallResponsePart {
+	/** Discriminant */
+	kind: ResponsePartKind.ToolCall;
+	/** Full tool call lifecycle state */
+	toolCall: IToolCallState;
+}
+
+/**
+ * Reasoning/thinking content from the model.
+ *
+ * @category Response Parts
+ */
+export interface IReasoningResponsePart {
+	/** Discriminant */
+	kind: ResponsePartKind.Reasoning;
+	/** Part identifier, used by `session/reasoning` to target this part for content appends */
+	id: string;
+	/** Accumulated reasoning text */
+	content: string;
+}
+
+/**
+ * @category Response Parts
+ */
+export type IResponsePart = IMarkdownResponsePart | IContentRef | IToolCallResponsePart | IReasoningResponsePart;
+
+// ─── Tool Call Types ─────────────────────────────────────────────────────────
+
+/**
+ * Status of a tool call in the lifecycle state machine.
+ *
+ * @category Tool Call Types
+ */
+export const enum ToolCallStatus {
+	Streaming = 'streaming',
+	PendingConfirmation = 'pending-confirmation',
+	Running = 'running',
+	PendingResultConfirmation = 'pending-result-confirmation',
+	Completed = 'completed',
+	Cancelled = 'cancelled',
+}
+
+/**
+ * How a tool call was confirmed for execution.
+ *
+ * - `NotNeeded` — No confirmation required (auto-approved)
+ * - `UserAction` — User explicitly approved
+ * - `Setting` — Approved by a persistent user setting
+ *
+ * @category Tool Call Types
+ */
+export const enum ToolCallConfirmationReason {
+	NotNeeded = 'not-needed',
+	UserAction = 'user-action',
+	Setting = 'setting',
+}
+
+/**
+ * Why a tool call was cancelled.
+ *
+ * @category Tool Call Types
+ */
+export const enum ToolCallCancellationReason {
+	Denied = 'denied',
+	Skipped = 'skipped',
+	ResultDenied = 'result-denied',
+}
+
+/**
+ * Metadata common to all tool call states.
+ *
+ * @category Tool Call Types
+ * @remarks
+ * Fields like `toolName` carry agent-specific identifiers on the wire despite the
+ * agent-agnostic design principle. These exist for debugging and logging purposes.
+ * A future version may move these to a separate diagnostic channel or namespace them
+ * more clearly.
+ */
+interface IToolCallBase {
+	/** Unique tool call identifier */
+	toolCallId: string;
+	/** Internal tool name (for debugging/logging) */
+	toolName: string;
+	/** Human-readable tool name */
+	displayName: string;
+	/**
+	 * If this tool is provided by a client, the `clientId` of the owning client.
+	 * Absent for server-side tools.
+	 *
+	 * When set, the identified client is responsible for executing the tool and
+	 * dispatching `session/toolCallComplete` with the result.
+	 */
+	toolClientId?: string;
+	/**
+	 * Additional provider-specific metadata for this tool call.
+	 *
+	 * Clients MAY look for well-known keys here to provide enhanced UI.
+	 * For example, a `ptyTerminal` key with `{ input: string; output: string }`
+	 * indicates the tool operated on a terminal (both `input` and `output` may
+	 * contain escape sequences).
+	 */
+	_meta?: Record<string, unknown>;
+}
+
+/**
+ * Properties available once tool call parameters are fully received.
+ *
+ * @category Tool Call Types
+ */
+interface IToolCallParameterFields {
+	/** Message describing what the tool will do */
+	invocationMessage: StringOrMarkdown;
+	/** Raw tool input */
+	toolInput?: string;
+}
+
+/**
+ * Tool execution result details, available after execution completes.
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallResult {
+	/** Whether the tool succeeded */
+	success: boolean;
+	/** Past-tense description of what the tool did */
+	pastTenseMessage: StringOrMarkdown;
+	/**
+	 * Unstructured result content blocks.
+	 *
+	 * This mirrors the `content` field of MCP `CallToolResult`.
+	 */
+	content?: IToolResultContent[];
+	/**
+	 * Optional structured result object.
+	 *
+	 * This mirrors the `structuredContent` field of MCP `CallToolResult`.
+	 */
+	structuredContent?: Record<string, unknown>;
+	/** Error details if the tool failed */
+	error?: { message: string; code?: string };
+}
+
+/**
+ * LM is streaming the tool call parameters.
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallStreamingState extends IToolCallBase {
+	status: ToolCallStatus.Streaming;
+	/** Partial parameters accumulated so far */
+	partialInput?: string;
+	/** Progress message shown while parameters are streaming */
+	invocationMessage?: StringOrMarkdown;
+}
+
+/**
+ * Parameters are complete, or a running tool requires re-confirmation
+ * (e.g. a mid-execution permission check).
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallPendingConfirmationState extends IToolCallBase, IToolCallParameterFields {
+	status: ToolCallStatus.PendingConfirmation;
+	/** Short title for the confirmation prompt (e.g. `"Run in terminal"`, `"Write file"`) */
+	confirmationTitle?: StringOrMarkdown;
+}
+
+/**
+ * Tool is actively executing.
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallRunningState extends IToolCallBase, IToolCallParameterFields {
+	status: ToolCallStatus.Running;
+	/** How the tool was confirmed for execution */
+	confirmed: ToolCallConfirmationReason;
+}
+
+/**
+ * Tool finished executing, waiting for client to approve the result.
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallPendingResultConfirmationState extends IToolCallBase, IToolCallParameterFields, IToolCallResult {
+	status: ToolCallStatus.PendingResultConfirmation;
+	/** How the tool was confirmed for execution */
+	confirmed: ToolCallConfirmationReason;
+}
+
+/**
+ * Tool completed successfully or with an error.
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallCompletedState extends IToolCallBase, IToolCallParameterFields, IToolCallResult {
+	status: ToolCallStatus.Completed;
+	/** How the tool was confirmed for execution */
+	confirmed: ToolCallConfirmationReason;
+}
+
+/**
+ * Tool call was cancelled before execution.
+ *
+ * @category Tool Call Types
+ */
+export interface IToolCallCancelledState extends IToolCallBase, IToolCallParameterFields {
+	status: ToolCallStatus.Cancelled;
+	/** Why the tool was cancelled */
+	reason: ToolCallCancellationReason;
+	/** Optional message explaining the cancellation */
+	reasonMessage?: StringOrMarkdown;
+	/** What the user suggested doing instead */
+	userSuggestion?: IUserMessage;
+}
+
+/**
+ * Discriminated union of all tool call lifecycle states.
+ *
+ * See the [state model guide](/guide/state-model.html#tool-call-lifecycle)
+ * for the full state machine diagram.
+ *
+ * @category Tool Call Types
+ */
+export type IToolCallState =
+	| IToolCallStreamingState
+	| IToolCallPendingConfirmationState
+	| IToolCallRunningState
+	| IToolCallPendingResultConfirmationState
+	| IToolCallCompletedState
+	| IToolCallCancelledState;
+
+// ─── Tool Definition Types ───────────────────────────────────────────────────
+
+/**
+ * Describes a tool available in a session, provided by either the server or the active client.
+ *
+ * This type mirrors the MCP `Tool` type from the Model Context Protocol specification
+ * (2025-11-25 draft) and will continue to track it.
+ *
+ * @category Tool Definition Types
+ */
+export interface IToolDefinition {
+	/** Unique tool identifier */
+	name: string;
+	/** Human-readable display name */
+	title?: string;
+	/** Description of what the tool does */
+	description?: string;
+	/**
+	 * JSON Schema defining the expected input parameters.
+	 *
+	 * Optional because client-provided tools may not have formal schemas.
+	 * Mirrors MCP `Tool.inputSchema`.
+	 */
+	inputSchema?: {
+		type: 'object';
+		properties?: Record<string, object>;
+		required?: string[];
+	};
+	/**
+	 * JSON Schema defining the structure of the tool's output.
+	 *
+	 * Mirrors MCP `Tool.outputSchema`.
+	 */
+	outputSchema?: {
+		type: 'object';
+		properties?: Record<string, object>;
+		required?: string[];
+	};
+	/** Behavioral hints about the tool. All properties are advisory. */
+	annotations?: IToolAnnotations;
+	/**
+	 * Additional provider-specific metadata.
+	 *
+	 * Mirrors the MCP `_meta` convention.
+	 */
+	_meta?: Record<string, unknown>;
+}
+
+/**
+ * Behavioral hints about a tool. All properties are advisory and not
+ * guaranteed to faithfully describe tool behavior.
+ *
+ * Mirrors MCP `ToolAnnotations` from the Model Context Protocol specification.
+ *
+ * @category Tool Definition Types
+ */
+export interface IToolAnnotations {
+	/** Alternate human-readable title */
+	title?: string;
+	/** Tool does not modify its environment (default: false) */
+	readOnlyHint?: boolean;
+	/** Tool may perform destructive updates (default: true) */
+	destructiveHint?: boolean;
+	/** Repeated calls with the same arguments have no additional effect (default: false) */
+	idempotentHint?: boolean;
+	/** Tool may interact with external entities (default: true) */
+	openWorldHint?: boolean;
+}
+
+// ─── Tool Result Content ─────────────────────────────────────────────────────
+
+/**
+ * Discriminant for tool result content types.
+ *
+ * @category Tool Result Content
+ */
+export const enum ToolResultContentType {
+	Text = 'text',
+	Binary = 'binary',
+	FileEdit = 'fileEdit',
+}
+
+/**
+ * Text content in a tool result.
+ *
+ * Mirrors MCP `TextContent`.
+ *
+ * @category Tool Result Content
+ */
+export interface IToolResultTextContent {
+	type: ToolResultContentType.Text;
+	/** The text content */
+	text: string;
+}
+
+/**
+ * Base64-encoded binary content in a tool result.
+ *
+ * Mirrors MCP `ImageContent` but generalized to any binary content type.
+ *
+ * @category Tool Result Content
+ */
+export interface IToolResultBinaryContent {
+	type: ToolResultContentType.Binary;
+	/** Base64-encoded data */
+	data: string;
+	/** Content type (e.g. `"image/png"`, `"application/pdf"`) */
+	contentType: string;
+}
+
+/**
+ * Describes a file modification performed by a tool.
+ *
+ * Clients can use the `beforeURI`/`afterURI` pair to render a diff view.
+ *
+ * @category Tool Result Content
+ */
+export interface IToolResultFileEditContent {
+	type: ToolResultContentType.FileEdit;
+	/** URI of the file content before the edit */
+	beforeURI: URI;
+	/** URI of the file content after the edit */
+	afterURI: URI;
+	/** Optional diff display metadata */
+	diff?: {
+		/** Number of items added (e.g., lines for text files, cells for notebooks) */
+		added?: number;
+		/** Number of items removed (e.g., lines for text files, cells for notebooks) */
+		removed?: number;
+	};
+}
+
+/**
+ * Content block in a tool result.
+ *
+ * Mirrors the content blocks in MCP `CallToolResult.content`, plus
+ * `IContentRef` for lazy-loading large results and `IToolResultFileEditContent`
+ * for file edit diffs (AHP extensions).
+ *
+ * @category Tool Result Content
+ */
+export type IToolResultContent =
+	| IToolResultTextContent
+	| IToolResultBinaryContent
+	| IToolResultFileEditContent
+	| IContentRef;
+
+// ─── Customization Types ─────────────────────────────────────────────────────
+
+/**
+ * A reference to an [Open Plugins](https://open-plugins.com/) plugin.
+ *
+ * This is intentionally thin — AHP specifies plugin identity and metadata
+ * but not implementation details, which are defined by the Open Plugins spec.
+ *
+ * @category Customization Types
+ */
+export interface ICustomizationRef {
+	/** Plugin URI (e.g. an HTTPS URL or marketplace identifier) */
+	uri: URI;
+	/** Human-readable name */
+	displayName: string;
+	/** Description of what the plugin provides */
+	description?: string;
+	/** Icons for the plugin */
+	icons?: Icon[];
+}
+
+/**
+ * Loading status for a server-managed customization.
+ *
+ * @category Customization Types
+ */
+export const enum CustomizationStatus {
+	/** Plugin is being loaded */
+	Loading = 'loading',
+	/** Plugin is fully operational */
+	Loaded = 'loaded',
+	/** Plugin partially loaded but has warnings */
+	Degraded = 'degraded',
+	/** Plugin was unable to load */
+	Error = 'error',
+}
+
+/**
+ * A customization active in a session.
+ *
+ * Entries without a `clientId` are server-provided; entries with a `clientId`
+ * originate from that client.
+ *
+ * @category Customization Types
+ */
+export interface ISessionCustomization {
+	/** The plugin this customization refers to */
+	customization: ICustomizationRef;
+	/** Whether this customization is currently enabled */
+	enabled: boolean;
+	/** Server-reported loading status */
+	status?: CustomizationStatus;
+	/**
+	 * Human-readable status detail (e.g. error message or degradation warning).
+	 */
+	statusMessage?: string;
+}
+
+// ─── Common Types ────────────────────────────────────────────────────────────
+
+/**
+ * @category Common Types
+ */
+export interface IUsageInfo {
+	/** Input tokens consumed */
+	inputTokens?: number;
+	/** Output tokens generated */
+	outputTokens?: number;
+	/** Model used */
+	model?: string;
+	/** Tokens read from cache */
+	cacheReadTokens?: number;
+}
+
+/**
+ * @category Common Types
+ */
+export interface IErrorInfo {
+	/** Error type identifier */
+	errorType: string;
+	/** Human-readable error message */
+	message: string;
+	/** Stack trace */
+	stack?: string;
+}
+
+/**
+ * A point-in-time snapshot of a subscribed resource's state, returned by
+ * `initialize`, `reconnect`, and `subscribe`.
+ *
+ * @category Common Types
+ */
+export interface ISnapshot {
+	/** The subscribed resource URI (e.g. `agenthost:/root` or `copilot:/<uuid>`) */
+	resource: URI;
+	/** The current state of the resource */
+	state: IRootState | ISessionState;
+	/** The `serverSeq` at which this snapshot was taken. Subsequent actions will have `serverSeq > fromSeq`. */
+	fromSeq: number;
+}
diff --git a/src/vs/platform/agentHost/common/state/protocol/version/registry.ts b/src/vs/platform/agentHost/common/state/protocol/version/registry.ts
new file mode 100644
index 00000000000..14833d6e340
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/protocol/version/registry.ts
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// allow-any-unicode-comment-file
+// DO NOT EDIT -- auto-generated by scripts/sync-agent-host-protocol.ts
+// Synced from agent-host-protocol @ 32572fc
+
+import { ActionType, type IStateAction } from '../actions.js';
+import { NotificationType, type IProtocolNotification } from '../notifications.js';
+
+// ─── Protocol Version Constants ──────────────────────────────────────────────
+
+/** The current protocol version that new code speaks. */
+export const PROTOCOL_VERSION = 1;
+
+/** The oldest protocol version the implementation maintains compatibility with. */
+export const MIN_PROTOCOL_VERSION = 1;
+
+// ─── Exhaustive Action → Version Map ─────────────────────────────────────────
+
+/**
+ * Maps every action type to the protocol version that introduced it.
+ * Adding a new action to `IStateAction` without adding it here is a compile error.
+ */
+export const ACTION_INTRODUCED_IN: { readonly [K in IStateAction['type']]: number } = {
+	[ActionType.RootAgentsChanged]: 1,
+	[ActionType.RootActiveSessionsChanged]: 1,
+	[ActionType.SessionReady]: 1,
+	[ActionType.SessionCreationFailed]: 1,
+	[ActionType.SessionTurnStarted]: 1,
+	[ActionType.SessionDelta]: 1,
+	[ActionType.SessionResponsePart]: 1,
+	[ActionType.SessionToolCallStart]: 1,
+	[ActionType.SessionToolCallDelta]: 1,
+	[ActionType.SessionToolCallReady]: 1,
+	[ActionType.SessionToolCallConfirmed]: 1,
+	[ActionType.SessionToolCallComplete]: 1,
+	[ActionType.SessionToolCallResultConfirmed]: 1,
+	[ActionType.SessionTurnComplete]: 1,
+	[ActionType.SessionTurnCancelled]: 1,
+	[ActionType.SessionError]: 1,
+	[ActionType.SessionTitleChanged]: 1,
+	[ActionType.SessionUsage]: 1,
+	[ActionType.SessionReasoning]: 1,
+	[ActionType.SessionModelChanged]: 1,
+	[ActionType.SessionServerToolsChanged]: 1,
+	[ActionType.SessionActiveClientChanged]: 1,
+	[ActionType.SessionActiveClientToolsChanged]: 1,
+	[ActionType.SessionPendingMessageSet]: 1,
+	[ActionType.SessionPendingMessageRemoved]: 1,
+	[ActionType.SessionQueuedMessagesReordered]: 1,
+	[ActionType.SessionCustomizationsChanged]: 1,
+	[ActionType.SessionCustomizationToggled]: 1,
+};
+
+/**
+ * Returns whether the given action type is known to the specified protocol version.
+ */
+export function isActionKnownToVersion(action: IStateAction, clientVersion: number): boolean {
+	return ACTION_INTRODUCED_IN[action.type] <= clientVersion;
+}
+
+// ─── Exhaustive Notification → Version Map ─────────────────────────────────
+
+/**
+ * Maps every notification type to the protocol version that introduced it.
+ * Adding a new notification to `IProtocolNotification` without adding it here
+ * is a compile error.
+ */
+export const NOTIFICATION_INTRODUCED_IN: { readonly [K in IProtocolNotification['type']]: number } = {
+	[NotificationType.SessionAdded]: 1,
+	[NotificationType.SessionRemoved]: 1,
+	[NotificationType.AuthRequired]: 1,
+};
+
+/**
+ * Returns whether the given notification type is known to the specified protocol version.
+ */
+export function isNotificationKnownToVersion(notification: IProtocolNotification, clientVersion: number): boolean {
+	return NOTIFICATION_INTRODUCED_IN[notification.type] <= clientVersion;
+}
+
+// ─── Capabilities ────────────────────────────────────────────────────────────
+
+/**
+ * Feature capabilities gated by protocol version.
+ */
+export interface ProtocolCapabilities {
+	/** v1 — always present */
+	readonly sessions: true;
+	/** v1 — always present */
+	readonly tools: true;
+	/** v1 — always present */
+	readonly permissions: true;
+}
+
+/**
+ * Derives capabilities from a protocol version number.
+ */
+export function capabilitiesForVersion(_version: number): ProtocolCapabilities {
+	return {
+		sessions: true,
+		tools: true,
+		permissions: true,
+	};
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionActions.ts b/src/vs/platform/agentHost/common/state/sessionActions.ts
new file mode 100644
index 00000000000..42f872196df
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionActions.ts
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Action and notification types for the sessions process protocol.
+// Re-exports from the auto-generated protocol layer with local aliases.
+//
+// VS Code-specific additions:
+//   - IToolCallStartAction extends protocol with `toolKind` and `language`
+//   - isRootAction / isSessionAction type guards
+//   - INotification alias for IProtocolNotification
+
+// ---- Re-exports from protocol -----------------------------------------------
+
+export {
+	ActionType,
+	type IActionEnvelope,
+	type IActionOrigin,
+	type IRootAgentsChangedAction,
+	type IRootActiveSessionsChangedAction,
+	type ISessionCreationFailedAction,
+	type ISessionDeltaAction,
+	type ISessionErrorAction,
+	type ISessionModelChangedAction,
+	type ISessionReadyAction,
+	type ISessionReasoningAction,
+	type ISessionResponsePartAction,
+	type ISessionToolCallCompleteAction,
+	type ISessionToolCallConfirmedAction,
+	type ISessionToolCallApprovedAction,
+	type ISessionToolCallDeniedAction,
+	type ISessionToolCallDeltaAction,
+	type ISessionToolCallReadyAction,
+	type ISessionToolCallResultConfirmedAction,
+	type ISessionToolCallStartAction,
+	type ISessionTitleChangedAction,
+	type ISessionTurnCancelledAction,
+	type ISessionTurnCompleteAction,
+	type ISessionTurnStartedAction,
+	type ISessionUsageAction,
+	type ISessionServerToolsChangedAction,
+	type ISessionActiveClientChangedAction,
+	type ISessionActiveClientToolsChangedAction,
+	type ISessionPendingMessageSetAction,
+	type ISessionPendingMessageRemovedAction,
+	type ISessionQueuedMessagesReorderedAction,
+	type IStateAction,
+} from './protocol/actions.js';
+
+export {
+	NotificationType,
+	AuthRequiredReason,
+	type ISessionAddedNotification,
+	type ISessionRemovedNotification,
+	type IAuthRequiredNotification,
+} from './protocol/notifications.js';
+
+// ---- Local aliases for short names ------------------------------------------
+// Consumers use these shorter names; they're type-only aliases.
+
+import type {
+	IRootAgentsChangedAction,
+	IRootActiveSessionsChangedAction,
+	ISessionDeltaAction,
+	ISessionModelChangedAction,
+	ISessionReasoningAction,
+	ISessionResponsePartAction,
+	ISessionToolCallCompleteAction,
+	ISessionToolCallConfirmedAction,
+	ISessionToolCallDeltaAction,
+	ISessionToolCallReadyAction,
+	ISessionToolCallResultConfirmedAction,
+	ISessionToolCallStartAction,
+	ISessionTitleChangedAction,
+	ISessionTurnCancelledAction,
+	ISessionTurnCompleteAction,
+	ISessionTurnStartedAction,
+	ISessionUsageAction,
+	IStateAction,
+	ISessionPendingMessageSetAction,
+	ISessionPendingMessageRemovedAction,
+	ISessionQueuedMessagesReorderedAction,
+} from './protocol/actions.js';
+
+import type { IProtocolNotification } from './protocol/notifications.js';
+import type { IRootAction as IRootAction_, ISessionAction as ISessionAction_, IClientSessionAction as IClientSessionAction_, IServerSessionAction as IServerSessionAction_ } from './protocol/action-origin.generated.js';
+
+export type IRootAction = IRootAction_;
+export type ISessionAction = ISessionAction_;
+export type IClientSessionAction = IClientSessionAction_;
+export type IServerSessionAction = IServerSessionAction_;
+
+// Root actions
+export type IAgentsChangedAction = IRootAgentsChangedAction;
+export type IActiveSessionsChangedAction = IRootActiveSessionsChangedAction;
+
+// Session actions — short aliases
+export type ITurnStartedAction = ISessionTurnStartedAction;
+export type IDeltaAction = ISessionDeltaAction;
+export type IResponsePartAction = ISessionResponsePartAction;
+export type IToolCallStartAction = ISessionToolCallStartAction;
+export type IToolCallDeltaAction = ISessionToolCallDeltaAction;
+export type IToolCallReadyAction = ISessionToolCallReadyAction;
+export type IToolCallApprovedAction = import('./protocol/actions.js').ISessionToolCallApprovedAction;
+export type IToolCallDeniedAction = import('./protocol/actions.js').ISessionToolCallDeniedAction;
+export type IToolCallConfirmedAction = ISessionToolCallConfirmedAction;
+export type IToolCallCompleteAction = ISessionToolCallCompleteAction;
+export type IToolCallResultConfirmedAction = ISessionToolCallResultConfirmedAction;
+export type ITurnCompleteAction = ISessionTurnCompleteAction;
+export type ITurnCancelledAction = ISessionTurnCancelledAction;
+export type ITitleChangedAction = ISessionTitleChangedAction;
+export type IUsageAction = ISessionUsageAction;
+export type IReasoningAction = ISessionReasoningAction;
+export type IModelChangedAction = ISessionModelChangedAction;
+
+export type IPendingMessageSetAction = ISessionPendingMessageSetAction;
+export type IPendingMessageRemovedAction = ISessionPendingMessageRemovedAction;
+export type IQueuedMessagesReorderedAction = ISessionQueuedMessagesReorderedAction;
+
+// Notifications
+export type INotification = IProtocolNotification;
+
+// ---- Type guards ------------------------------------------------------------
+
+export function isRootAction(action: IStateAction): action is IRootAction {
+	return action.type.startsWith('root/');
+}
+
+export function isSessionAction(action: IStateAction): action is ISessionAction {
+	return action.type.startsWith('session/');
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionCapabilities.ts b/src/vs/platform/agentHost/common/state/sessionCapabilities.ts
new file mode 100644
index 00000000000..dad2824e77d
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionCapabilities.ts
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Protocol version constants and capability derivation.
+// See protocol.md -> Versioning for the full design.
+//
+// The authoritative version numbers and action-filtering logic live in
+// versions/versionRegistry.ts. This file re-exports them and provides the
+// capability-object API that client code uses to gate features.
+
+export const PROTOCOL_VERSION = 1;
+export const MIN_PROTOCOL_VERSION = 1;
+
+/**
+ * Capabilities derived from a protocol version.
+ * Core features (v1) are always-present literal `true`.
+ * Features from later versions are optional `true | undefined`.
+ */
+export interface ProtocolCapabilities {
+	// v1 — always present
+	readonly sessions: true;
+	readonly tools: true;
+	readonly permissions: true;
+}
+
+/**
+ * Derives the set of capabilities available at a given protocol version.
+ * Newer clients use this to determine which features the server supports.
+ */
+export function capabilitiesForVersion(version: number): ProtocolCapabilities {
+	if (version < 1) {
+		throw new Error(`Unsupported protocol version: ${version}`);
+	}
+
+	return {
+		sessions: true,
+		tools: true,
+		permissions: true,
+		// Future versions add fields here:
+		// ...(version >= 2 ? { reasoning: true as const } : {}),
+	};
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionClientState.ts b/src/vs/platform/agentHost/common/state/sessionClientState.ts
new file mode 100644
index 00000000000..f40695bcf05
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionClientState.ts
@@ -0,0 +1,279 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Client-side state manager for the sessions process protocol.
+// See protocol.md -> Write-ahead reconciliation for the full design.
+//
+// Manages confirmed state (last server-acknowledged), pending actions queue
+// (optimistically applied), and reconciliation when the server echoes back
+// or sends concurrent actions from other sources.
+//
+// This operates on two kinds of subscribable state:
+//   - Root state (agents + their models) — server-only mutations, no write-ahead.
+//   - Session state — mixed: some actions client-sendable (write-ahead),
+//     others server-only.
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IActionEnvelope, INotification, ISessionAction, isRootAction, isSessionAction, IStateAction } from './sessionActions.js';
+import { rootReducer, sessionReducer } from './sessionReducers.js';
+import { IRootState, ISessionState, ROOT_STATE_URI } from './sessionState.js';
+import { ILogService } from '../../../log/common/log.js';
+
+// ---- Pending action tracking ------------------------------------------------
+
+interface IPendingAction {
+	readonly clientSeq: number;
+	readonly action: IStateAction;
+}
+
+// ---- Client state manager ---------------------------------------------------
+
+/**
+ * Manages the client's local view of the state tree with write-ahead
+ * reconciliation. The client can optimistically apply its own session
+ * actions and reconcile when the server echoes them back (possibly
+ * interleaved with actions from other clients or the server).
+ *
+ * Usage:
+ * 1. Call `handleSnapshot(resource, state, fromSeq)` for each snapshot
+ *    from the handshake or a subscribe response.
+ * 2. Call `applyOptimistic(action)` when the user does something
+ *    (returns a clientSeq for the command).
+ * 3. Call `receiveEnvelope(envelope)` for each action from the server.
+ * 4. Call `receiveNotification(notification)` for each notification.
+ * 5. Read `rootState` / `getSessionState(uri)` for the current view.
+ */
+export class SessionClientState extends Disposable {
+
+	private readonly _clientId: string;
+	private readonly _log: (msg: string) => void;
+	private _nextClientSeq = 1;
+	private _lastSeenServerSeq = 0;
+
+	// Confirmed state — reflects only what the server has acknowledged
+	private _confirmedRootState: IRootState | undefined;
+	private readonly _confirmedSessionStates = new Map<string, ISessionState>();
+
+	// Pending session actions (root actions are server-only, never pending)
+	private readonly _pendingActions: IPendingAction[] = [];
+
+	// Cached optimistic state — recomputed when confirmed or pending changes
+	private _optimisticRootState: IRootState | undefined;
+	private readonly _optimisticSessionStates = new Map<string, ISessionState>();
+
+	private readonly _onDidChangeRootState = this._register(new Emitter<IRootState>());
+	readonly onDidChangeRootState: Event<IRootState> = this._onDidChangeRootState.event;
+
+	private readonly _onDidChangeSessionState = this._register(new Emitter<{ session: string; state: ISessionState }>());
+	readonly onDidChangeSessionState: Event<{ session: string; state: ISessionState }> = this._onDidChangeSessionState.event;
+
+	private readonly _onDidReceiveNotification = this._register(new Emitter<INotification>());
+	readonly onDidReceiveNotification: Event<INotification> = this._onDidReceiveNotification.event;
+
+	constructor(clientId: string, logService: ILogService) {
+		super();
+		this._clientId = clientId;
+		this._log = msg => logService.warn(`[SessionClientState] ${msg}`);
+	}
+
+	get clientId(): string {
+		return this._clientId;
+	}
+
+	get lastSeenServerSeq(): number {
+		return this._lastSeenServerSeq;
+	}
+
+	/** Current root state, or undefined if not yet subscribed. */
+	get rootState(): IRootState | undefined {
+		return this._optimisticRootState;
+	}
+
+	/** Current optimistic session state, or undefined if not subscribed. */
+	getSessionState(session: string): ISessionState | undefined {
+		return this._optimisticSessionStates.get(session);
+	}
+
+	/** URIs of sessions the client is currently subscribed to. */
+	get subscribedSessions(): readonly URI[] {
+		return [...this._confirmedSessionStates.keys()].map(k => URI.parse(k));
+	}
+
+	// ---- Snapshot handling ---------------------------------------------------
+
+	/**
+	 * Apply a state snapshot received from the server (from handshake,
+	 * subscribe response, or reconnection).
+	 */
+	handleSnapshot(resource: string, state: IRootState | ISessionState, fromSeq: number): void {
+		this._lastSeenServerSeq = Math.max(this._lastSeenServerSeq, fromSeq);
+
+		if (resource === ROOT_STATE_URI) {
+			const rootState = state as IRootState;
+			this._confirmedRootState = rootState;
+			this._optimisticRootState = rootState;
+			this._onDidChangeRootState.fire(rootState);
+		} else {
+			const sessionState = state as ISessionState;
+			this._confirmedSessionStates.set(resource, sessionState);
+			this._optimisticSessionStates.set(resource, sessionState);
+			// Re-apply any pending session actions for this session
+			this._recomputeOptimisticSession(resource);
+			this._onDidChangeSessionState.fire({
+				session: resource,
+				state: this._optimisticSessionStates.get(resource)!,
+			});
+		}
+	}
+
+	/**
+	 * Unsubscribe from a resource, dropping its local state.
+	 */
+	unsubscribe(resource: string): void {
+		if (resource === ROOT_STATE_URI) {
+			this._confirmedRootState = undefined;
+			this._optimisticRootState = undefined;
+		} else {
+			this._confirmedSessionStates.delete(resource);
+			this._optimisticSessionStates.delete(resource);
+			// Remove pending actions for this session
+			for (let i = this._pendingActions.length - 1; i >= 0; i--) {
+				const action = this._pendingActions[i].action;
+				if (isSessionAction(action) && action.session === resource) {
+					this._pendingActions.splice(i, 1);
+				}
+			}
+		}
+	}
+
+	// ---- Write-ahead --------------------------------------------------------
+
+	/**
+	 * Optimistically apply a session action locally. Returns the clientSeq
+	 * that should be sent to the server with the corresponding command so
+	 * the server can echo it back for reconciliation.
+	 *
+	 * Only session actions can be write-ahead (root actions are server-only).
+	 */
+	applyOptimistic(action: ISessionAction): number {
+		const clientSeq = this._nextClientSeq++;
+		this._pendingActions.push({ clientSeq, action });
+		this._applySessionToOptimistic(action);
+		return clientSeq;
+	}
+
+	// ---- Receiving server messages ------------------------------------------
+
+	/**
+	 * Process an action envelope received from the server.
+	 * This is the core reconciliation algorithm.
+	 */
+	receiveEnvelope(envelope: IActionEnvelope): void {
+		this._lastSeenServerSeq = Math.max(this._lastSeenServerSeq, envelope.serverSeq);
+
+		const origin = envelope.origin;
+		const isOwnAction = origin !== undefined && origin.clientId === this._clientId;
+
+		if (isOwnAction) {
+			const headIdx = this._pendingActions.findIndex(p => p.clientSeq === origin.clientSeq);
+
+			if (headIdx !== -1) {
+				if (envelope.rejectionReason) {
+					this._pendingActions.splice(headIdx, 1);
+				} else {
+					this._applyToConfirmed(envelope.action);
+					this._pendingActions.splice(headIdx, 1);
+				}
+			} else {
+				this._applyToConfirmed(envelope.action);
+			}
+		} else {
+			this._applyToConfirmed(envelope.action);
+		}
+
+		// Recompute optimistic state from confirmed + remaining pending
+		this._recomputeOptimistic(envelope.action);
+	}
+
+	/**
+	 * Process an ephemeral notification from the server.
+	 * Not stored in state — just forwarded to listeners.
+	 */
+	receiveNotification(notification: INotification): void {
+		this._onDidReceiveNotification.fire(notification);
+	}
+
+	// ---- Internal state management ------------------------------------------
+
+	private _applyToConfirmed(action: IStateAction): void {
+		if (isRootAction(action) && this._confirmedRootState) {
+			this._confirmedRootState = rootReducer(this._confirmedRootState, action, this._log);
+		}
+		if (isSessionAction(action)) {
+			const key = action.session.toString();
+			const state = this._confirmedSessionStates.get(key);
+			if (state) {
+				this._confirmedSessionStates.set(key, sessionReducer(state, action, this._log));
+			}
+		}
+	}
+
+	private _applySessionToOptimistic(action: ISessionAction): void {
+		const key = action.session.toString();
+		const state = this._optimisticSessionStates.get(key);
+		if (state) {
+			const newState = sessionReducer(state, action, this._log);
+			this._optimisticSessionStates.set(key, newState);
+			this._onDidChangeSessionState.fire({ session: action.session, state: newState });
+		}
+	}
+
+	/**
+	 * After applying a server action to confirmed state, recompute optimistic
+	 * state by replaying pending actions on top of confirmed.
+	 */
+	private _recomputeOptimistic(triggerAction: IStateAction): void {
+		// Root state: no pending actions (server-only), so optimistic = confirmed
+		if (isRootAction(triggerAction) && this._confirmedRootState) {
+			this._optimisticRootState = this._confirmedRootState;
+			this._onDidChangeRootState.fire(this._confirmedRootState);
+		}
+
+		// Session states: recompute only affected sessions
+		if (isSessionAction(triggerAction)) {
+			this._recomputeOptimisticSession(triggerAction.session);
+		}
+
+		// Also recompute any sessions that have pending actions
+		const affectedKeys = new Set<string>();
+		for (const pending of this._pendingActions) {
+			if (isSessionAction(pending.action)) {
+				affectedKeys.add(pending.action.session.toString());
+			}
+		}
+		for (const key of affectedKeys) {
+			this._recomputeOptimisticSession(key);
+		}
+	}
+
+	private _recomputeOptimisticSession(session: string): void {
+		const confirmed = this._confirmedSessionStates.get(session);
+		if (!confirmed) {
+			return;
+		}
+
+		let state = confirmed;
+		for (const pending of this._pendingActions) {
+			if (isSessionAction(pending.action) && pending.action.session === session) {
+				state = sessionReducer(state, pending.action, this._log);
+			}
+		}
+
+		this._optimisticSessionStates.set(session, state);
+		this._onDidChangeSessionState.fire({ session, state });
+	}
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionProtocol.ts b/src/vs/platform/agentHost/common/state/sessionProtocol.ts
new file mode 100644
index 00000000000..deca30524f4
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionProtocol.ts
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Protocol messages using JSON-RPC 2.0 framing for the sessions process.
+// See protocol.md for the full design.
+//
+// Most types are re-exported from the auto-generated protocol layer.
+// This file adds VS Code-specific additions (ISetAuthTokenParams, ProtocolError)
+// and backward-compatible aliases.
+
+// ---- Re-exports from protocol -----------------------------------------------
+
+// JSON-RPC base types
+export type {
+	IJsonRpcErrorResponse,
+	IJsonRpcNotification,
+	IJsonRpcRequest,
+	IJsonRpcResponse,
+	IJsonRpcSuccessResponse,
+} from './protocol/messages.js';
+
+// Typed message unions
+export type {
+	IAhpClientNotification,
+	IAhpNotification,
+	IAhpRequest,
+	IAhpResponse,
+	IAhpServerNotification,
+	IAhpSuccessResponse,
+	ICommandMap,
+	IClientNotificationMap,
+	INotificationMap,
+	INotificationMethodParams,
+	IProtocolMessage,
+	IServerNotificationMap,
+} from './protocol/messages.js';
+
+// Command params and results
+export type {
+	IBrowseDirectoryParams,
+	IBrowseDirectoryResult,
+	ICreateSessionParams,
+	IDirectoryEntry,
+	IDispatchActionParams,
+	IDisposeSessionParams,
+	IFetchContentParams,
+	IFetchContentResult,
+	IFetchTurnsParams,
+	IFetchTurnsResult,
+	IInitializeParams,
+	IInitializeResult,
+	IListSessionsParams,
+	IListSessionsResult,
+	IReconnectParams,
+	IReconnectReplayResult,
+	IReconnectResult,
+	IReconnectSnapshotResult,
+	ISubscribeParams,
+	IUnsubscribeParams,
+} from './protocol/commands.js';
+
+export { ContentEncoding, ReconnectResultType } from './protocol/commands.js';
+
+// Error codes
+export { AhpErrorCodes, JsonRpcErrorCodes } from './protocol/errors.js';
+export type { AhpErrorCode, JsonRpcErrorCode } from './protocol/errors.js';
+
+// Snapshot type (re-exported from state)
+export type { ISnapshot as IStateSnapshot } from './protocol/state.js';
+
+// ---- Backward-compatible error code aliases ---------------------------------
+
+export const JSON_RPC_PARSE_ERROR = -32700 as const;
+export const JSON_RPC_INTERNAL_ERROR = -32603 as const;
+export const AHP_SESSION_NOT_FOUND = -32001 as const;
+export const AHP_PROVIDER_NOT_FOUND = -32002 as const;
+export const AHP_SESSION_ALREADY_EXISTS = -32003 as const;
+export const AHP_TURN_IN_PROGRESS = -32004 as const;
+export const AHP_UNSUPPORTED_PROTOCOL_VERSION = -32005 as const;
+export const AHP_CONTENT_NOT_FOUND = -32006 as const;
+export const AHP_AUTH_REQUIRED = -32007 as const;
+
+// ---- Type guards -----------------------------------------------------------
+
+import type { IAhpRequest, IAhpNotification, IAhpSuccessResponse, IProtocolMessage, IJsonRpcErrorResponse } from './protocol/messages.js';
+
+export function isJsonRpcRequest(msg: IProtocolMessage): msg is IAhpRequest {
+	return 'method' in msg && 'id' in msg;
+}
+
+export function isJsonRpcNotification(msg: IProtocolMessage): msg is IAhpNotification {
+	return 'method' in msg && !('id' in msg);
+}
+
+export function isJsonRpcResponse(msg: IProtocolMessage): msg is IAhpSuccessResponse | IJsonRpcErrorResponse {
+	return 'id' in msg && !('method' in msg);
+}
+
+// ---- VS Code-specific types ------------------------------------------------
+
+/**
+ * Error with a JSON-RPC error code for protocol-level failures.
+ * Optionally carries a `data` payload for structured error details.
+ */
+export class ProtocolError extends Error {
+	constructor(readonly code: number, message: string, readonly data?: unknown) {
+		super(message);
+	}
+}
+
+/**
+ * VS Code-specific extension: set the auth token on the server.
+ * Not yet part of the official protocol.
+ */
+export interface ISetAuthTokenParams {
+	readonly token: string;
+}
+
+// ---- Server → Client notification param aliases (backward compat) -----------
+
+import type { INotification } from './sessionActions.js';
+
+export interface INotificationBroadcastParams {
+	readonly notification: INotification;
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionReducers.ts b/src/vs/platform/agentHost/common/state/sessionReducers.ts
new file mode 100644
index 00000000000..3b02a189e5d
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionReducers.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Re-exports the protocol reducers and adds VS Code-specific helpers.
+// The actual reducer logic lives in the auto-generated protocol layer.
+
+import type { IToolCallState, ICompletedToolCall } from './sessionState.js';
+
+// Re-export reducers from the protocol layer
+export { rootReducer, sessionReducer, softAssertNever, isClientDispatchable } from './protocol/reducers.js';
+
+// ---- Tool call metadata helpers (VS Code extensions via _meta) --------------
+
+/**
+ * Extracts the VS Code-specific `toolKind` rendering hint from a tool call's `_meta`.
+ */
+export function getToolKind(tc: IToolCallState | ICompletedToolCall): 'terminal' | undefined {
+	return tc._meta?.toolKind as 'terminal' | undefined;
+}
+
+/**
+ * Extracts the VS Code-specific `language` hint from a tool call's `_meta`.
+ */
+export function getToolLanguage(tc: IToolCallState | ICompletedToolCall): string | undefined {
+	return tc._meta?.language as string | undefined;
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionState.ts b/src/vs/platform/agentHost/common/state/sessionState.ts
new file mode 100644
index 00000000000..37a1080211a
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionState.ts
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Immutable state types for the sessions process protocol.
+// See protocol.md for the full design rationale.
+//
+// Most types are imported from the auto-generated protocol layer
+// (synced from the agent-host-protocol repo). This file adds VS Code-specific
+// helpers and re-exports.
+
+import { hasKey } from '../../../../base/common/types.js';
+import {
+	SessionLifecycle,
+	ToolResultContentType,
+	IToolResultFileEditContent,
+	type IActiveTurn,
+	type IRootState,
+	type ISessionState,
+	type ISessionSummary,
+	type IToolCallCancelledState,
+	type IToolCallCompletedState,
+	type IToolCallResult,
+	type IToolCallState,
+	type IToolResultTextContent,
+	type IUserMessage,
+} from './protocol/state.js';
+
+// Re-export everything from the protocol state module
+export {
+	type IActiveTurn,
+	type IAgentInfo,
+	type IContentRef,
+	type IErrorInfo,
+	type IMarkdownResponsePart,
+	type IMessageAttachment,
+	type IReasoningResponsePart,
+	type IResponsePart,
+	type IRootState,
+	type ISessionActiveClient,
+	type ISessionModelInfo,
+	type ISessionState,
+	type ISessionSummary,
+	type ISnapshot,
+	type IToolAnnotations,
+	type IToolCallCancelledState,
+	type IToolCallCompletedState,
+	type IToolCallPendingConfirmationState,
+	type IToolCallPendingResultConfirmationState,
+	type IToolCallResponsePart,
+	type IToolCallResult,
+	type IToolCallRunningState,
+	type IToolCallState,
+	type IToolCallStreamingState,
+	type IToolDefinition,
+	type IToolResultBinaryContent,
+	type IToolResultContent,
+	type IToolResultFileEditContent,
+	type IToolResultTextContent,
+	type ITurn,
+	type IUsageInfo,
+	type IUserMessage,
+	type IPendingMessage,
+	type StringOrMarkdown,
+	type URI,
+	AttachmentType,
+	PendingMessageKind,
+	PolicyState,
+	ResponsePartKind,
+	SessionLifecycle,
+	SessionStatus,
+	ToolCallConfirmationReason,
+	ToolCallCancellationReason,
+	ToolCallStatus,
+	ToolResultContentType,
+	TurnState,
+} from './protocol/state.js';
+
+// ---- Well-known URIs --------------------------------------------------------
+
+/** URI for the root state subscription. */
+export const ROOT_STATE_URI = 'agenthost:/root';
+
+// ---- VS Code-specific derived types -----------------------------------------
+
+/**
+ * A tool call in a terminal state, stored in completed turns.
+ */
+export type ICompletedToolCall = IToolCallCompletedState | IToolCallCancelledState;
+
+/**
+ * Derived status type for the tool call lifecycle.
+ */
+export type ToolCallStatusString = IToolCallState['status'];
+
+// ---- Tool output helper -----------------------------------------------------
+
+/**
+ * Extracts a plain-text tool output string from a tool call result's `content`
+ * array. Joins all text-type content parts into a single string.
+ *
+ * Returns `undefined` if there are no text content parts.
+ */
+export function getToolOutputText(result: IToolCallResult): string | undefined {
+	if (!result.content || result.content.length === 0) {
+		return undefined;
+	}
+	const textParts: IToolResultTextContent[] = [];
+	for (const c of result.content) {
+		if (hasKey(c, { type: true }) && c.type === ToolResultContentType.Text) {
+			textParts.push(c);
+		}
+	}
+	if (textParts.length === 0) {
+		return undefined;
+	}
+	return textParts.map(p => p.text).join('\n');
+}
+
+/**
+ * Extracts file edit content entries from a tool call result's `content` array.
+ * Returns an empty array if there are no file edit content parts.
+ */
+export function getToolFileEdits(result: IToolCallResult): IToolResultFileEditContent[] {
+	if (!result.content || result.content.length === 0) {
+		return [];
+	}
+	const edits: IToolResultFileEditContent[] = [];
+	for (const c of result.content) {
+		if (hasKey(c, { type: true }) && c.type === ToolResultContentType.FileEdit) {
+			edits.push(c);
+		}
+	}
+	return edits;
+}
+
+// ---- Factory helpers --------------------------------------------------------
+
+export function createRootState(): IRootState {
+	return {
+		agents: [],
+		activeSessions: 0,
+	};
+}
+
+export function createSessionState(summary: ISessionSummary): ISessionState {
+	return {
+		summary,
+		lifecycle: SessionLifecycle.Creating,
+		turns: [],
+		activeTurn: undefined,
+	};
+}
+
+export function createActiveTurn(id: string, userMessage: IUserMessage): IActiveTurn {
+	return {
+		id,
+		userMessage,
+		responseParts: [],
+		usage: undefined,
+	};
+}
diff --git a/src/vs/platform/agentHost/common/state/sessionTransport.ts b/src/vs/platform/agentHost/common/state/sessionTransport.ts
new file mode 100644
index 00000000000..20ce4184693
--- /dev/null
+++ b/src/vs/platform/agentHost/common/state/sessionTransport.ts
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Transport abstraction for the sessions process protocol.
+// See protocol.md -> Client-server protocol for the full design.
+//
+// The transport is pluggable — the same protocol runs over MessagePort
+// (ProxyChannel), WebSocket, or stdio. This module defines the contract;
+// concrete implementations live in platform-specific folders.
+
+import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import type { IProtocolMessage, IAhpServerNotification, IJsonRpcResponse } from './sessionProtocol.js';
+
+/**
+ * A bidirectional transport for protocol messages. Implementations handle
+ * serialization, framing, and connection management.
+ */
+export interface IProtocolTransport extends IDisposable {
+	/** Fires when a message is received from the remote end. */
+	readonly onMessage: Event<IProtocolMessage>;
+
+	/** Fires when the transport connection closes. */
+	readonly onClose: Event<void>;
+
+	/**
+	 * Send a message to the remote end.
+	 *
+	 * Accepts:
+	 * - `IProtocolMessage` — fully-typed client↔server messages.
+	 * - `IAhpServerNotification` — server→client notifications.
+	 * - `IJsonRpcResponse` — dynamically-constructed success/error responses.
+	 */
+	send(message: IProtocolMessage | IAhpServerNotification | IJsonRpcResponse): void;
+}
+
+/**
+ * Server-side transport that accepts multiple client connections.
+ * Each connected client gets its own {@link IProtocolTransport}.
+ */
+export interface IProtocolServer extends IDisposable {
+	/** Fires when a new client connects. */
+	readonly onConnection: Event<IProtocolTransport>;
+
+	/** The port or address the server is listening on. */
+	readonly address: string | undefined;
+}
diff --git a/src/vs/platform/agentHost/design.md b/src/vs/platform/agentHost/design.md
new file mode 100644
index 00000000000..9834fe8e44e
--- /dev/null
+++ b/src/vs/platform/agentHost/design.md
@@ -0,0 +1,86 @@
+# Agent host design decisions
+
+> **Keep this document in sync with the code.** Any change to the agent-host protocol, tool rendering approach, or architectural boundaries must be reflected here. If you add a new `toolKind`, change how tool-specific data is populated, or modify the separation between agent-specific and generic code, update this document as part of the same change.
+
+Design decisions and principles for the agent-host feature. For process architecture and IPC details, see [architecture.md](architecture.md). For the client-server state protocol, see [protocol.md](protocol.md).
+
+## Agent-agnostic protocol
+
+**The protocol between the agent-host process and clients must remain agent-agnostic.** This is a hard rule.
+
+There are two protocol layers:
+
+1. **`IAgent` interface** (`common/agentService.ts`) - the internal interface that each agent backend (CopilotAgent, MockAgent) implements. It fires `IAgentProgressEvent`s (raw SDK events: `delta`, `tool_start`, `tool_complete`, etc.). This layer is agent-specific.
+
+2. **Sessions state protocol** (`common/state/`) - the client-facing protocol. The server maps raw `IAgentProgressEvent`s into state actions (`session/delta`, `session/toolStart`, etc.) via `agentEventMapper.ts`. Clients receive immutable state snapshots and action streams via JSON-RPC over WebSocket or MessagePort. **This layer is agent-agnostic.**
+
+All agent-specific logic -- translating tool names like `bash`/`view`/`grep` into display strings, extracting command lines from tool parameters, determining rendering hints like `toolKind: 'terminal'` -- lives in `copilotToolDisplay.ts` inside the agent-host process. These display-ready fields are carried on `IAgentToolStartEvent`/`IAgentToolCompleteEvent`, which `agentEventMapper.ts` then maps into `session/toolStart` and `session/toolComplete` state actions.
+
+Clients (renderers) never see agent-specific tool names. They consume `IToolCallState` and `ICompletedToolCall` from the session state tree, which carry generic display-ready fields (`displayName`, `invocationMessage`, `toolKind`, etc.).
+
+## Provider-agnostic renderer contributions
+
+The renderer contributions (`AgentHostSessionHandler`, `AgentHostSessionListController`, `AgentHostLanguageModelProvider`) are **completely generic**. They receive all provider-specific details via `IAgentHostSessionHandlerConfig`:
+
+```typescript
+interface IAgentHostSessionHandlerConfig {
+    readonly provider: AgentProvider;    // 'copilot'
+    readonly agentId: string;            // e.g. 'agent-host'
+    readonly sessionType: string;        // e.g. 'agent-host'
+    readonly fullName: string;           // e.g. 'Agent Host - Copilot'
+    readonly description: string;
+}
+```
+
+A single `AgentHostContribution` discovers agents via `listAgents()` and dynamically registers each one. Adding a new provider means adding a new `IAgent` implementation in the server process. No changes needed to the handler, list controller, or model provider.
+
+## State-based rendering
+
+The renderer subscribes to session state via `SessionClientState` (write-ahead reconciliation) and converts immutable state changes to `IChatProgress[]` via `stateToProgressAdapter.ts`. This adapter is the only place that inspects protocol state fields like `toolKind`:
+
+- **Shell commands** (`toolKind: 'terminal'`): Converted to `IChatTerminalToolInvocationData` with the command in a syntax-highlighted code block, output displayed below, and exit code for success/failure styling.
+- **Everything else**: Converted to `ChatToolInvocation` using `invocationMessage` (while running) and `pastTenseMessage` (when complete).
+
+The adapter never checks tool names - it operates purely on the generic state fields.
+
+## Copilot SDK tool name mapping
+
+The Copilot CLI uses built-in tools. Tool names and parameter shapes are not typed in the SDK (`toolName` is `string`) - they come from the CLI server. The interfaces in `copilotToolDisplay.ts` are derived from observing actual CLI events.
+
+| SDK tool name | Display name | Rendering |
+|---|---|---|
+| `bash` | Bash | Terminal (`toolKind: 'terminal'`, language `shellscript`) |
+| `powershell` | PowerShell | Terminal (`toolKind: 'terminal'`, language `powershell`) |
+| `view` | View File | Progress message |
+| `edit` | Edit File | Progress message |
+| `write` | Write File | Progress message |
+| `grep` | Search | Progress message |
+| `glob` | Find Files | Progress message |
+| `web_search` | Web Search | Progress message |
+
+This mapping lives in `copilotToolDisplay.ts` and is the only place that knows about Copilot-specific tool names.
+
+## Model ownership
+
+The SDK makes its own LM requests using the GitHub token. VS Code does not make direct LM calls for agent-host sessions.
+
+Each agent's models are published to root state via the `root/agentsChanged` action. The renderer's `AgentHostLanguageModelProvider` exposes these in the model picker. The selected model ID is passed to `createSession({ model })`. The `sendChatRequest` method throws - agent-host models aren't usable for direct LM calls, only for the agent loop.
+
+## Setting gate
+
+The entire feature is controlled by `chat.agentHost.enabled` (default `false`), defined as `AgentHostEnabledSettingId` in `agentService.ts`. When disabled:
+- The main process does not spawn the agent host utility process
+- The renderer does not connect via MessagePort
+- No agents, sessions, or model providers are registered
+- No agent-host entries appear in the UI
+
+## Multi-client state synchronization
+
+The sessions process uses a redux-like state model where all mutations flow through a discriminated union of actions processed by pure reducer functions. This design supports multiple connected clients seeing a synchronized view:
+
+- **Server-authoritative state**: The server holds the canonical state tree. Clients receive snapshots and incremental actions.
+- **Write-ahead with reconciliation**: Clients optimistically apply their own actions locally (e.g., approving a permission, sending a message) and reconcile when the server echoes them back. Actions carry `(clientId, clientSeq)` tags for echo matching.
+- **Lazy loading**: Clients connect with lightweight session metadata (enough for a sidebar list) and subscribe to full session state on demand. Large content (images, tool outputs) uses `ContentRef` placeholders fetched separately.
+- **Forward-compatible versioning**: A single protocol version number maps to a `ProtocolCapabilities` object. Newer clients check capabilities before using features unavailable on older servers.
+
+Details and type definitions are in [protocol.md](protocol.md) and `common/state/`.
diff --git a/src/vs/platform/agentHost/electron-browser/agentHostService.ts b/src/vs/platform/agentHost/electron-browser/agentHostService.ts
new file mode 100644
index 00000000000..b414308ebe8
--- /dev/null
+++ b/src/vs/platform/agentHost/electron-browser/agentHostService.ts
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DeferredPromise } from '../../../base/common/async.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { getDelayedChannel, ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { Client as MessagePortClient } from '../../../base/parts/ipc/common/ipc.mp.js';
+import { acquirePort } from '../../../base/parts/ipc/electron-browser/ipc.mp.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ILogService } from '../../log/common/log.js';
+import { AgentHostEnabledSettingId, AgentHostIpcChannels, IAgentCreateSessionConfig, IAgentDescriptor, IAgentHostService, IAgentService, IAgentSessionMetadata, IAuthenticateParams, IAuthenticateResult, IResourceMetadata } from '../common/agentService.js';
+import type { IActionEnvelope, INotification, ISessionAction } from '../common/state/sessionActions.js';
+import type { IBrowseDirectoryResult, IFetchContentResult, IStateSnapshot } from '../common/state/sessionProtocol.js';
+import { revive } from '../../../base/common/marshalling.js';
+import { URI } from '../../../base/common/uri.js';
+
+/**
+ * Renderer-side implementation of {@link IAgentHostService} that connects
+ * directly to the agent host utility process via MessagePort, bypassing
+ * the main process relay. Uses the same `getDelayedChannel` pattern as
+ * the pty host so the proxy is usable immediately while the port is acquired.
+ */
+class AgentHostServiceClient extends Disposable implements IAgentHostService {
+	declare readonly _serviceBrand: undefined;
+
+	/** Unique identifier for this window, used in action envelope origin tracking. */
+	readonly clientId = generateUuid();
+
+	private readonly _clientEventually = new DeferredPromise<MessagePortClient>();
+	private readonly _proxy: IAgentService;
+
+	private readonly _onAgentHostExit = this._register(new Emitter<number>());
+	readonly onAgentHostExit = this._onAgentHostExit.event;
+	private readonly _onAgentHostStart = this._register(new Emitter<void>());
+	readonly onAgentHostStart = this._onAgentHostStart.event;
+
+	private readonly _onDidAction = this._register(new Emitter<IActionEnvelope>());
+	readonly onDidAction = this._onDidAction.event;
+
+	private readonly _onDidNotification = this._register(new Emitter<INotification>());
+	readonly onDidNotification = this._onDidNotification.event;
+
+	constructor(
+		@ILogService private readonly _logService: ILogService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super();
+
+		// Create a proxy backed by a delayed channel - usable immediately,
+		// calls queue until the MessagePort connection is established.
+		this._proxy = ProxyChannel.toService<IAgentService>(
+			getDelayedChannel(this._clientEventually.p.then(client => client.getChannel(AgentHostIpcChannels.AgentHost)))
+		);
+
+		if (configurationService.getValue<boolean>(AgentHostEnabledSettingId)) {
+			this._connect();
+		}
+	}
+
+	private async _connect(): Promise<void> {
+		this._logService.info('[AgentHost:renderer] Acquiring MessagePort to agent host...');
+		const port = await acquirePort('vscode:createAgentHostMessageChannel', 'vscode:createAgentHostMessageChannelResult');
+		this._logService.info('[AgentHost:renderer] MessagePort acquired, creating client...');
+
+		const store = this._register(new DisposableStore());
+		const client = store.add(new MessagePortClient(port, `agentHost:window`));
+		this._clientEventually.complete(client);
+
+		store.add(this._proxy.onDidAction(e => {
+			this._onDidAction.fire(revive(e));
+		}));
+		store.add(this._proxy.onDidNotification(e => {
+			this._onDidNotification.fire(revive(e));
+		}));
+		this._logService.info('[AgentHost:renderer] Direct MessagePort connection established');
+		this._onAgentHostStart.fire();
+	}
+
+	// ---- IAgentService forwarding (no await needed, delayed channel handles queuing) ----
+
+	getResourceMetadata(): Promise<IResourceMetadata> {
+		return this._proxy.getResourceMetadata();
+	}
+	authenticate(params: IAuthenticateParams): Promise<IAuthenticateResult> {
+		return this._proxy.authenticate(params);
+	}
+	listAgents(): Promise<IAgentDescriptor[]> {
+		return this._proxy.listAgents();
+	}
+	refreshModels(): Promise<void> {
+		return this._proxy.refreshModels();
+	}
+	listSessions(): Promise<IAgentSessionMetadata[]> {
+		return this._proxy.listSessions();
+	}
+	createSession(config?: IAgentCreateSessionConfig): Promise<URI> {
+		return this._proxy.createSession(config);
+	}
+	disposeSession(session: URI): Promise<void> {
+		return this._proxy.disposeSession(session);
+	}
+	shutdown(): Promise<void> {
+		return this._proxy.shutdown();
+	}
+	subscribe(resource: URI): Promise<IStateSnapshot> {
+		return this._proxy.subscribe(resource);
+	}
+	unsubscribe(resource: URI): void {
+		this._proxy.unsubscribe(resource);
+	}
+	dispatchAction(action: ISessionAction, clientId: string, clientSeq: number): void {
+		this._proxy.dispatchAction(action, clientId, clientSeq);
+	}
+	browseDirectory(uri: URI): Promise<IBrowseDirectoryResult> {
+		return this._proxy.browseDirectory(uri);
+	}
+	fetchContent(uri: URI): Promise<IFetchContentResult> {
+		return this._proxy.fetchContent(uri);
+	}
+	async restartAgentHost(): Promise<void> {
+		// Restart is handled by the main process side
+	}
+}
+
+registerSingleton(IAgentHostService, AgentHostServiceClient, InstantiationType.Delayed);
diff --git a/src/vs/platform/agentHost/electron-browser/remoteAgentHostProtocolClient.ts b/src/vs/platform/agentHost/electron-browser/remoteAgentHostProtocolClient.ts
new file mode 100644
index 00000000000..de400d71531
--- /dev/null
+++ b/src/vs/platform/agentHost/electron-browser/remoteAgentHostProtocolClient.ts
@@ -0,0 +1,283 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Protocol client for communicating with a remote agent host process.
+// Wraps WebSocketClientTransport and SessionClientState to provide a
+// higher-level API matching IAgentService.
+
+import { DeferredPromise } from '../../../base/common/async.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { hasKey } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { ILogService } from '../../log/common/log.js';
+import { AgentSession, IAgentConnection, IAgentCreateSessionConfig, IAgentDescriptor, IAgentSessionMetadata, IAuthenticateParams, IAuthenticateResult, IResourceMetadata } from '../common/agentService.js';
+import type { IClientNotificationMap, ICommandMap } from '../common/state/protocol/messages.js';
+import type { IActionEnvelope, INotification, ISessionAction } from '../common/state/sessionActions.js';
+import { PROTOCOL_VERSION } from '../common/state/sessionCapabilities.js';
+import { isJsonRpcNotification, isJsonRpcResponse, type IJsonRpcResponse, type IProtocolMessage, type IStateSnapshot } from '../common/state/sessionProtocol.js';
+import type { ISessionSummary } from '../common/state/sessionState.js';
+import { WebSocketClientTransport } from './webSocketClientTransport.js';
+
+/**
+ * A protocol-level client for a single remote agent host connection.
+ * Manages the WebSocket transport, handshake, subscriptions, action dispatch,
+ * and command/response correlation.
+ *
+ * Implements {@link IAgentConnection} so consumers can program against
+ * a single interface regardless of whether the agent host is local or remote.
+ */
+export class RemoteAgentHostProtocolClient extends Disposable implements IAgentConnection {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _clientId = generateUuid();
+	private readonly _transport: WebSocketClientTransport;
+	private _serverSeq = 0;
+	private _nextClientSeq = 1;
+	private _defaultDirectory: string | undefined;
+
+	private readonly _onDidAction = this._register(new Emitter<IActionEnvelope>());
+	readonly onDidAction = this._onDidAction.event;
+
+	private readonly _onDidNotification = this._register(new Emitter<INotification>());
+	readonly onDidNotification = this._onDidNotification.event;
+
+	private readonly _onDidClose = this._register(new Emitter<void>());
+	readonly onDidClose = this._onDidClose.event;
+
+	/** Pending JSON-RPC requests keyed by request id. */
+	private readonly _pendingRequests = new Map<number, DeferredPromise<unknown>>();
+	private _nextRequestId = 1;
+
+	get clientId(): string {
+		return this._clientId;
+	}
+
+	get address(): string {
+		return this._transport['_address'];
+	}
+
+	get defaultDirectory(): string | undefined {
+		return this._defaultDirectory;
+	}
+
+	constructor(
+		address: string,
+		connectionToken: string | undefined,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+		this._transport = this._register(new WebSocketClientTransport(address, connectionToken));
+		this._register(this._transport.onMessage(msg => this._handleMessage(msg)));
+		this._register(this._transport.onClose(() => this._onDidClose.fire()));
+	}
+
+	/**
+	 * Connect to the remote agent host and perform the protocol handshake.
+	 */
+	async connect(): Promise<void> {
+		await this._transport.connect();
+
+		const result = await this._sendRequest('initialize', {
+			protocolVersion: PROTOCOL_VERSION,
+			clientId: this._clientId,
+		});
+		this._serverSeq = result.serverSeq;
+		// defaultDirectory arrives from the protocol as either a URI string
+		// (e.g. "file:///Users/roblou") or a serialized URI object
+		// ({ scheme, path, ... }). Extract just the filesystem path.
+		if (result.defaultDirectory) {
+			const dir = result.defaultDirectory;
+			if (typeof dir === 'string') {
+				this._defaultDirectory = URI.parse(dir).path;
+			} else {
+				this._defaultDirectory = URI.revive(dir).path;
+			}
+		}
+	}
+
+	/**
+	 * Subscribe to state at a URI. Returns the current state snapshot.
+	 */
+	async subscribe(resource: URI): Promise<IStateSnapshot> {
+		const result = await this._sendRequest('subscribe', { resource: resource.toString() });
+		return result.snapshot;
+	}
+
+	/**
+	 * Unsubscribe from state at a URI.
+	 */
+	unsubscribe(resource: URI): void {
+		this._sendNotification('unsubscribe', { resource: resource.toString() });
+	}
+
+	/**
+	 * Dispatch a client action to the server. Returns the clientSeq used.
+	 */
+	dispatchAction(action: ISessionAction, _clientId: string, clientSeq: number): void {
+		this._sendNotification('dispatchAction', { clientSeq, action });
+	}
+
+	/**
+	 * Create a new session on the remote agent host.
+	 */
+	async createSession(config?: IAgentCreateSessionConfig): Promise<URI> {
+		const provider = config?.provider ?? 'copilot';
+		const session = AgentSession.uri(provider, generateUuid());
+		await this._sendRequest('createSession', {
+			session: session.toString(),
+			provider,
+			model: config?.model,
+			workingDirectory: config?.workingDirectory,
+		});
+		return session;
+	}
+
+	/**
+	 * Retrieve the server's resource metadata describing auth requirements.
+	 */
+	async getResourceMetadata(): Promise<IResourceMetadata> {
+		return await this._sendExtensionRequest('getResourceMetadata') as IResourceMetadata;
+	}
+
+	/**
+	 * Authenticate with the remote agent host using a specific scheme.
+	 */
+	async authenticate(params: IAuthenticateParams): Promise<IAuthenticateResult> {
+		return await this._sendExtensionRequest('authenticate', params) as IAuthenticateResult;
+	}
+
+	/**
+	 * Refresh the model list from all providers on the remote host.
+	 */
+	async refreshModels(): Promise<void> {
+		await this._sendExtensionRequest('refreshModels');
+	}
+
+	/**
+	 * Discover available agent backends from the remote host.
+	 */
+	async listAgents(): Promise<IAgentDescriptor[]> {
+		return await this._sendExtensionRequest('listAgents') as IAgentDescriptor[];
+	}
+
+	/**
+	 * Gracefully shut down all sessions on the remote host.
+	 */
+	async shutdown(): Promise<void> {
+		await this._sendExtensionRequest('shutdown');
+	}
+
+	/**
+	 * Dispose a session on the remote agent host.
+	 */
+	async disposeSession(session: URI): Promise<void> {
+		await this._sendRequest('disposeSession', { session: session.toString() });
+	}
+
+	/**
+	 * List all sessions from the remote agent host.
+	 */
+	async listSessions(): Promise<IAgentSessionMetadata[]> {
+		const result = await this._sendRequest('listSessions', {});
+		return result.items.map((s: ISessionSummary) => ({
+			session: URI.parse(s.resource),
+			startTime: s.createdAt,
+			modifiedTime: s.modifiedAt,
+			summary: s.title,
+			workingDirectory: typeof s.workingDirectory === 'string' ? s.workingDirectory : undefined,
+		}));
+	}
+
+	/**
+	 * List the contents of a directory on the remote host's filesystem.
+	 */
+	async browseDirectory(uri: URI): Promise<ICommandMap['browseDirectory']['result']> {
+		return await this._sendRequest('browseDirectory', { uri: uri.toString() });
+	}
+
+	/**
+	 * Fetch the content of a file on the remote host's filesystem.
+	 */
+	async fetchContent(uri: URI): Promise<ICommandMap['fetchContent']['result']> {
+		return this._sendRequest('fetchContent', { uri: uri.toString() });
+	}
+
+	private _handleMessage(msg: IProtocolMessage): void {
+		if (isJsonRpcResponse(msg)) {
+			const pending = this._pendingRequests.get(msg.id);
+			if (pending) {
+				this._pendingRequests.delete(msg.id);
+				if (hasKey(msg, { error: true })) {
+					this._logService.warn(`[RemoteAgentHostProtocol] Request ${msg.id} failed:`, msg.error);
+					pending.error(new Error(msg.error.message));
+				} else {
+					pending.complete(msg.result);
+				}
+			} else {
+				this._logService.warn(`[RemoteAgentHostProtocol] Received response for unknown request id ${msg.id}`);
+			}
+		} else if (isJsonRpcNotification(msg)) {
+			switch (msg.method) {
+				case 'action': {
+					// Protocol envelope → VS Code envelope (superset of action types)
+					const envelope = msg.params as unknown as IActionEnvelope;
+					this._serverSeq = Math.max(this._serverSeq, envelope.serverSeq);
+					this._onDidAction.fire(envelope);
+					break;
+				}
+				case 'notification': {
+					const notification = msg.params.notification as unknown as INotification;
+					this._logService.trace(`[RemoteAgentHostProtocol] Notification: ${notification.type}`);
+					this._onDidNotification.fire(notification);
+					break;
+				}
+				default:
+					this._logService.trace(`[RemoteAgentHostProtocol] Unhandled method: ${msg.method}`);
+					break;
+			}
+		} else {
+			this._logService.warn(`[RemoteAgentHostProtocol] Unrecognized message:`, JSON.stringify(msg));
+		}
+	}
+
+	/** Send a typed JSON-RPC notification for a protocol-defined method. */
+	private _sendNotification<M extends keyof IClientNotificationMap>(method: M, params: IClientNotificationMap[M]['params']): void {
+		// Generic M can't satisfy the distributive IAhpNotification union directly
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
+		this._transport.send({ jsonrpc: '2.0' as const, method, params } as IProtocolMessage);
+	}
+
+	/** Send a typed JSON-RPC request for a protocol-defined method. */
+	private _sendRequest<M extends keyof ICommandMap>(method: M, params: ICommandMap[M]['params']): Promise<ICommandMap[M]['result']> {
+		const id = this._nextRequestId++;
+		const deferred = new DeferredPromise<unknown>();
+		this._pendingRequests.set(id, deferred);
+		// Generic M can't satisfy the distributive IAhpRequest union directly
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
+		this._transport.send({ jsonrpc: '2.0' as const, id, method, params } as IProtocolMessage);
+		return deferred.p as Promise<ICommandMap[M]['result']>;
+	}
+
+	/** Send a JSON-RPC request for a VS Code extension method (not in the protocol spec). */
+	private _sendExtensionRequest(method: string, params?: unknown): Promise<unknown> {
+		const id = this._nextRequestId++;
+		const deferred = new DeferredPromise<unknown>();
+		this._pendingRequests.set(id, deferred);
+		// Cast: extension methods aren't in the typed protocol maps yet
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
+		this._transport.send({ jsonrpc: '2.0', id, method, params } as unknown as IJsonRpcResponse);
+		return deferred.p;
+	}
+
+	/**
+	 * Get the next client sequence number for optimistic dispatch.
+	 */
+	nextClientSeq(): number {
+		return this._nextClientSeq++;
+	}
+}
diff --git a/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts b/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts
new file mode 100644
index 00000000000..38714cb1d9d
--- /dev/null
+++ b/src/vs/platform/agentHost/electron-browser/remoteAgentHostService.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IRemoteAgentHostService } from '../common/remoteAgentHostService.js';
+import { RemoteAgentHostService } from './remoteAgentHostServiceImpl.js';
+
+registerSingleton(IRemoteAgentHostService, RemoteAgentHostService, InstantiationType.Delayed);
diff --git a/src/vs/platform/agentHost/electron-browser/remoteAgentHostServiceImpl.ts b/src/vs/platform/agentHost/electron-browser/remoteAgentHostServiceImpl.ts
new file mode 100644
index 00000000000..773f0dfbe1c
--- /dev/null
+++ b/src/vs/platform/agentHost/electron-browser/remoteAgentHostServiceImpl.ts
@@ -0,0 +1,336 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Service implementation that manages WebSocket connections to remote agent
+// host processes. Reads addresses from the `chat.remoteAgentHosts` setting
+// and maintains connections, reconnecting as the setting changes.
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { DeferredPromise, raceTimeout } from '../../../base/common/async.js';
+import { ConfigurationTarget, IConfigurationService } from '../../configuration/common/configuration.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.js';
+
+import type { IAgentConnection } from '../common/agentService.js';
+import {
+	IRemoteAgentHostService,
+	RemoteAgentHostsEnabledSettingId,
+	RemoteAgentHostsSettingId,
+	type IRemoteAgentHostConnectionInfo,
+	type IRemoteAgentHostEntry,
+} from '../common/remoteAgentHostService.js';
+import { RemoteAgentHostProtocolClient } from './remoteAgentHostProtocolClient.js';
+import { normalizeRemoteAgentHostAddress } from '../common/agentHostUri.js';
+
+/** Tracks a single remote connection through its lifecycle. */
+interface IConnectionEntry {
+	readonly store: DisposableStore;
+	readonly client: RemoteAgentHostProtocolClient;
+	connected: boolean;
+}
+
+export class RemoteAgentHostService extends Disposable implements IRemoteAgentHostService {
+	private static readonly ConnectionWaitTimeout = 10000;
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeConnections = this._register(new Emitter<void>());
+	readonly onDidChangeConnections = this._onDidChangeConnections.event;
+
+	private readonly _entries = new Map<string, IConnectionEntry>();
+	private readonly _names = new Map<string, string>();
+	private readonly _pendingConnectionWaits = new Map<string, DeferredPromise<IRemoteAgentHostConnectionInfo>>();
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		// React to setting changes
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(RemoteAgentHostsSettingId) || e.affectsConfiguration(RemoteAgentHostsEnabledSettingId)) {
+				this._reconcileConnections();
+			}
+		}));
+
+		// Initial connection
+		this._reconcileConnections();
+	}
+
+	get connections(): readonly IRemoteAgentHostConnectionInfo[] {
+		const result: IRemoteAgentHostConnectionInfo[] = [];
+		for (const [address, entry] of this._entries) {
+			if (entry.connected) {
+				result.push({
+					address,
+					name: this._names.get(address) ?? address,
+					clientId: entry.client.clientId,
+					defaultDirectory: entry.client.defaultDirectory,
+				});
+			}
+		}
+		return result;
+	}
+
+	get configuredEntries(): readonly IRemoteAgentHostEntry[] {
+		return this._getConfiguredEntries().map(e => ({ ...e, address: normalizeRemoteAgentHostAddress(e.address) }));
+	}
+
+	getConnection(address: string): IAgentConnection | undefined {
+		const normalized = normalizeRemoteAgentHostAddress(address);
+		const entry = this._entries.get(normalized);
+		return entry?.connected ? entry.client : undefined;
+	}
+
+	async addRemoteAgentHost(input: IRemoteAgentHostEntry): Promise<IRemoteAgentHostConnectionInfo> {
+		if (!this._configurationService.getValue<boolean>(RemoteAgentHostsEnabledSettingId)) {
+			throw new Error('Remote agent host connections are not enabled.');
+		}
+
+		const entry: IRemoteAgentHostEntry = { ...input, address: normalizeRemoteAgentHostAddress(input.address) };
+		const existingConnection = this._getConnectionInfo(entry.address);
+		await this._storeConfiguredEntries(this._upsertConfiguredEntry(entry));
+
+		if (existingConnection) {
+			return {
+				...existingConnection,
+				name: entry.name,
+			};
+		}
+
+		const connectedConnection = this._getConnectionInfo(entry.address);
+		if (connectedConnection) {
+			return connectedConnection;
+		}
+
+		const wait = this._getOrCreateConnectionWait(entry.address);
+		const connection = await raceTimeout(wait.p, RemoteAgentHostService.ConnectionWaitTimeout, () => {
+			this._pendingConnectionWaits.delete(entry.address);
+		});
+		if (!connection) {
+			throw new Error(`Timed out connecting to ${entry.address}`);
+		}
+
+		return connection;
+	}
+
+	async removeRemoteAgentHost(address: string): Promise<void> {
+		const normalized = normalizeRemoteAgentHostAddress(address);
+		// This setting is only used in the sessions app (user scope), so we
+		// don't need to inspect per-scope values like _upsertConfiguredEntry does.
+		const entries = this._getConfiguredEntries().filter(
+			e => normalizeRemoteAgentHostAddress(e.address) !== normalized
+		);
+		await this._storeConfiguredEntries(entries);
+
+		// Eagerly clear in-memory state so the UI updates immediately
+		// (the config change listener will reconcile, but this is instant).
+		this._names.delete(normalized);
+		this._removeConnection(normalized);
+	}
+
+	private _removeConnection(address: string): void {
+		const entry = this._entries.get(address);
+		if (entry) {
+			this._entries.delete(address);
+			entry.store.dispose();
+			this._rejectPendingConnectionWait(address, new Error(`Connection closed: ${address}`));
+			this._onDidChangeConnections.fire();
+		}
+	}
+
+	private _reconcileConnections(): void {
+		if (!this._configurationService.getValue<boolean>(RemoteAgentHostsEnabledSettingId)) {
+			// Disconnect all when disabled
+			for (const address of [...this._entries.keys()]) {
+				this._removeConnection(address);
+			}
+			this._names.clear();
+			return;
+		}
+
+		const rawEntries: IRemoteAgentHostEntry[] = this._configurationService.getValue<IRemoteAgentHostEntry[]>(RemoteAgentHostsSettingId) ?? [];
+		const entries = rawEntries.map(e => ({ ...e, address: normalizeRemoteAgentHostAddress(e.address) }));
+		const desired = new Set(entries.map(e => e.address));
+
+		this._logService.info(`[RemoteAgentHost] Reconciling: desired=[${[...desired].join(', ')}], current=[${[...this._entries.keys()].map(a => `${a}(${this._entries.get(a)!.connected ? 'connected' : 'pending'})`).join(', ')}]`);
+
+		// Update name map and detect name changes for existing connections
+		let namesChanged = false;
+		const oldNames = new Map(this._names);
+		this._names.clear();
+		for (const entry of entries) {
+			this._names.set(entry.address, entry.name);
+			if (this._entries.has(entry.address) && oldNames.get(entry.address) !== entry.name) {
+				namesChanged = true;
+			}
+		}
+
+		// Remove connections no longer in the setting
+		for (const address of [...this._entries.keys()]) {
+			if (!desired.has(address)) {
+				this._logService.info(`[RemoteAgentHost] Disconnecting from ${address}`);
+				this._removeConnection(address);
+			}
+		}
+
+		// Add new connections
+		for (const entry of entries) {
+			if (!this._entries.has(entry.address)) {
+				this._connectTo(entry.address, entry.connectionToken);
+			}
+		}
+
+		// If only names changed (no add/remove), notify so the UI updates
+		if (namesChanged) {
+			this._onDidChangeConnections.fire();
+		}
+	}
+
+	private _connectTo(address: string, connectionToken?: string): void {
+		const store = new DisposableStore();
+		const client = store.add(this._instantiationService.createInstance(RemoteAgentHostProtocolClient, address, connectionToken));
+		const entry: IConnectionEntry = { store, client, connected: false };
+		this._entries.set(address, entry);
+
+		// Guard removal against stale callbacks: only remove if the
+		// current entry for this address is still the one we created.
+		const guardedRemove = () => {
+			if (this._entries.get(address) === entry) {
+				this._removeConnection(address);
+			}
+		};
+
+		store.add(client.onDidClose(() => {
+			this._logService.warn(`[RemoteAgentHost] Connection closed: ${address}`);
+			guardedRemove();
+		}));
+
+		this._logService.info(`[RemoteAgentHost] Connecting to ${address}`);
+		client.connect().then(() => {
+			if (store.isDisposed) {
+				return; // removed before connect resolved
+			}
+			this._logService.info(`[RemoteAgentHost] Connected to ${address}`);
+			entry.connected = true;
+			this._resolvePendingConnectionWait(address);
+			this._onDidChangeConnections.fire();
+		}).catch(err => {
+			this._logService.error(`[RemoteAgentHost] Failed to connect to ${address}`, err);
+			this._rejectPendingConnectionWait(address, err);
+			guardedRemove();
+		});
+	}
+
+	private _getConnectionInfo(address: string): IRemoteAgentHostConnectionInfo | undefined {
+		return this.connections.find(connection => connection.address === address);
+	}
+
+	private _getConfiguredEntries(): IRemoteAgentHostEntry[] {
+		return this._configurationService.getValue<IRemoteAgentHostEntry[]>(RemoteAgentHostsSettingId) ?? [];
+	}
+
+	private _upsertConfiguredEntry(entry: IRemoteAgentHostEntry): IRemoteAgentHostEntry[] {
+		// Read from the same scope we'll write to, so we don't accidentally
+		// merge entries from an overriding scope (e.g. workspace) into the
+		// user scope and then lose them on the next read.
+		const target = this._getConfigurationTarget();
+		const inspected = this._configurationService.inspect<IRemoteAgentHostEntry[]>(RemoteAgentHostsSettingId);
+		let configuredEntries: readonly IRemoteAgentHostEntry[];
+		switch (target) {
+			case ConfigurationTarget.USER_LOCAL:
+				configuredEntries = inspected.userLocalValue ?? [];
+				break;
+			case ConfigurationTarget.USER_REMOTE:
+				configuredEntries = inspected.userRemoteValue ?? [];
+				break;
+			default:
+				configuredEntries = inspected.userValue ?? [];
+				break;
+		}
+
+		const normalizedAddress = normalizeRemoteAgentHostAddress(entry.address);
+		const existingIndex = configuredEntries.findIndex(configuredEntry => normalizeRemoteAgentHostAddress(configuredEntry.address) === normalizedAddress);
+		if (existingIndex === -1) {
+			return [...configuredEntries, entry];
+		}
+
+		return configuredEntries.map((configuredEntry, index) => index === existingIndex ? entry : configuredEntry);
+	}
+
+	private _getConfigurationTarget(): ConfigurationTarget {
+		const inspected = this._configurationService.inspect<IRemoteAgentHostEntry[]>(RemoteAgentHostsSettingId);
+		if (inspected.userLocalValue !== undefined) {
+			return ConfigurationTarget.USER_LOCAL;
+		}
+		if (inspected.userRemoteValue !== undefined) {
+			return ConfigurationTarget.USER_REMOTE;
+		}
+		if (inspected.userValue !== undefined) {
+			return ConfigurationTarget.USER;
+		}
+		return ConfigurationTarget.USER;
+	}
+
+	private async _storeConfiguredEntries(entries: IRemoteAgentHostEntry[]): Promise<void> {
+		await this._configurationService.updateValue(RemoteAgentHostsSettingId, entries, this._getConfigurationTarget());
+	}
+
+	private _getOrCreateConnectionWait(address: string): DeferredPromise<IRemoteAgentHostConnectionInfo> {
+		let wait = this._pendingConnectionWaits.get(address);
+		if (wait) {
+			return wait;
+		}
+
+		// If the connection is already available (fast connect resolved before
+		// the caller called us), return an immediately-completed wait.
+		const existingConnection = this._getConnectionInfo(address);
+		if (existingConnection) {
+			const immediateWait = new DeferredPromise<IRemoteAgentHostConnectionInfo>();
+			immediateWait.complete(existingConnection);
+			return immediateWait;
+		}
+
+		wait = new DeferredPromise<IRemoteAgentHostConnectionInfo>();
+		this._pendingConnectionWaits.set(address, wait);
+		return wait;
+	}
+
+	private _resolvePendingConnectionWait(address: string): void {
+		const wait = this._pendingConnectionWaits.get(address);
+		const connection = this._getConnectionInfo(address);
+		if (!wait || !connection) {
+			return;
+		}
+
+		this._pendingConnectionWaits.delete(address);
+		void wait.complete(connection);
+	}
+
+	private _rejectPendingConnectionWait(address: string, err: unknown): void {
+		const wait = this._pendingConnectionWaits.get(address);
+		if (!wait) {
+			return;
+		}
+
+		this._pendingConnectionWaits.delete(address);
+		void wait.error(err);
+	}
+
+	override dispose(): void {
+		for (const [address, wait] of this._pendingConnectionWaits) {
+			void wait.error(new Error(`Remote agent host service disposed before connecting to ${address}`));
+		}
+		this._pendingConnectionWaits.clear();
+		for (const entry of this._entries.values()) {
+			entry.store.dispose();
+		}
+		this._entries.clear();
+		super.dispose();
+	}
+}
diff --git a/src/vs/platform/agentHost/electron-browser/webSocketClientTransport.ts b/src/vs/platform/agentHost/electron-browser/webSocketClientTransport.ts
new file mode 100644
index 00000000000..2a8ce7370a2
--- /dev/null
+++ b/src/vs/platform/agentHost/electron-browser/webSocketClientTransport.ts
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// WebSocket client transport for connecting to remote agent host processes.
+// Uses plain JSON serialization — URIs are string-typed in the protocol.
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { connectionTokenQueryName } from '../../../base/common/network.js';
+import type { IAhpServerNotification, IJsonRpcResponse, IProtocolMessage } from '../common/state/sessionProtocol.js';
+import type { IProtocolTransport } from '../common/state/sessionTransport.js';
+
+// ---- Client transport -------------------------------------------------------
+
+/**
+ * A WebSocket client transport that connects to a remote agent host server.
+ * Uses the native browser WebSocket API (available in Electron renderer).
+ * Implements {@link IProtocolTransport} with JSON serialization and URI revival.
+ */
+export class WebSocketClientTransport extends Disposable implements IProtocolTransport {
+
+	private readonly _onMessage = this._register(new Emitter<IProtocolMessage>());
+	readonly onMessage = this._onMessage.event;
+
+	private readonly _onClose = this._register(new Emitter<void>());
+	readonly onClose = this._onClose.event;
+
+	private readonly _onOpen = this._register(new Emitter<void>());
+	readonly onOpen = this._onOpen.event;
+
+	private _ws: WebSocket | undefined;
+
+	get isOpen(): boolean {
+		return this._ws?.readyState === WebSocket.OPEN;
+	}
+
+	constructor(
+		private readonly _address: string,
+		private readonly _connectionToken?: string,
+	) {
+		super();
+	}
+
+	/**
+	 * Initiate the WebSocket connection. Resolves when the connection
+	 * is open, or rejects on error/timeout.
+	 */
+	connect(): Promise<void> {
+		return new Promise<void>((resolve, reject) => {
+			if (this._store.isDisposed) {
+				reject(new Error('Transport is disposed'));
+				return;
+			}
+
+			let url = this._address.startsWith('ws://') || this._address.startsWith('wss://')
+				? this._address
+				: `ws://${this._address}`;
+
+			if (this._connectionToken) {
+				const separator = url.includes('?') ? '&' : '?';
+				url += `${separator}${connectionTokenQueryName}=${encodeURIComponent(this._connectionToken)}`;
+			}
+
+			const ws = new WebSocket(url);
+			this._ws = ws;
+
+			const onOpen = () => {
+				cleanup();
+				this._onOpen.fire();
+				resolve();
+			};
+
+			const onError = () => {
+				cleanup();
+				reject(new Error(`WebSocket connection failed: ${this._address}`));
+			};
+
+			const onClose = () => {
+				cleanup();
+				reject(new Error(`WebSocket closed before connection was established: ${this._address}`));
+			};
+
+			const cleanup = () => {
+				ws.removeEventListener('open', onOpen);
+				ws.removeEventListener('error', onError);
+				ws.removeEventListener('close', onClose);
+			};
+
+			ws.addEventListener('open', onOpen);
+			ws.addEventListener('error', onError);
+			ws.addEventListener('close', onClose);
+
+			// Wire up long-lived listeners after connection
+			ws.addEventListener('message', (event: MessageEvent) => {
+				try {
+					const text = typeof event.data === 'string' ? event.data : '';
+					const message = JSON.parse(text) as IProtocolMessage;
+					this._onMessage.fire(message);
+				} catch {
+					// Malformed message - drop.
+				}
+			});
+
+			ws.addEventListener('close', () => {
+				this._onClose.fire();
+			});
+
+			ws.addEventListener('error', () => {
+				// Error always precedes close - closing is handled in the close handler.
+				this._onClose.fire();
+			});
+		});
+	}
+
+	send(message: IProtocolMessage | IAhpServerNotification | IJsonRpcResponse): void {
+		if (this._ws?.readyState === WebSocket.OPEN) {
+			this._ws.send(JSON.stringify(message));
+		}
+	}
+
+	override dispose(): void {
+		this._ws?.close();
+		super.dispose();
+	}
+}
diff --git a/src/vs/platform/agentHost/electron-main/electronAgentHostStarter.ts b/src/vs/platform/agentHost/electron-main/electronAgentHostStarter.ts
new file mode 100644
index 00000000000..5abe4cd03aa
--- /dev/null
+++ b/src/vs/platform/agentHost/electron-main/electronAgentHostStarter.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { Emitter } from '../../../base/common/event.js';
+import { deepClone } from '../../../base/common/objects.js';
+import { IpcMainEvent } from 'electron';
+import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.js';
+import { Client as MessagePortClient } from '../../../base/parts/ipc/electron-main/ipc.mp.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { parseAgentHostDebugPort } from '../../environment/node/environmentService.js';
+import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
+import { ILogService } from '../../log/common/log.js';
+import { Schemas } from '../../../base/common/network.js';
+import { NullTelemetryService } from '../../telemetry/common/telemetryUtils.js';
+import { UtilityProcess } from '../../utilityProcess/electron-main/utilityProcess.js';
+import { IAgentHostConnection, IAgentHostStarter } from '../common/agent.js';
+
+export class ElectronAgentHostStarter extends Disposable implements IAgentHostStarter {
+
+	private utilityProcess: UtilityProcess | undefined = undefined;
+
+	private readonly _onRequestConnection = this._register(new Emitter<void>());
+	readonly onRequestConnection = this._onRequestConnection.event;
+	private readonly _onWillShutdown = this._register(new Emitter<void>());
+	readonly onWillShutdown = this._onWillShutdown.event;
+
+	constructor(
+		@IEnvironmentMainService private readonly _environmentMainService: IEnvironmentMainService,
+		@ILifecycleMainService private readonly _lifecycleMainService: ILifecycleMainService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		this._register(this._lifecycleMainService.onWillShutdown(() => this._onWillShutdown.fire()));
+
+		// Listen for new windows to establish a direct MessagePort connection to the agent host
+		const onWindowConnection = (e: IpcMainEvent, nonce: string) => this._onWindowConnection(e, nonce);
+		validatedIpcMain.on('vscode:createAgentHostMessageChannel', onWindowConnection);
+		this._register(toDisposable(() => {
+			validatedIpcMain.removeListener('vscode:createAgentHostMessageChannel', onWindowConnection);
+		}));
+	}
+
+	start(): IAgentHostConnection {
+		this.utilityProcess = new UtilityProcess(this._logService, NullTelemetryService, this._lifecycleMainService);
+
+		const inspectParams = parseAgentHostDebugPort(this._environmentMainService.args, this._environmentMainService.isBuilt);
+		const execArgv = inspectParams.port ? [
+			'--nolazy',
+			`--inspect${inspectParams.break ? '-brk' : ''}=${inspectParams.port}`
+		] : undefined;
+
+		this.utilityProcess.start({
+			type: 'agentHost',
+			name: 'agent-host',
+			entryPoint: 'vs/platform/agentHost/node/agentHostMain',
+			execArgv,
+			args: ['--logsPath', this._environmentMainService.logsHome.with({ scheme: Schemas.file }).fsPath],
+			env: {
+				...deepClone(process.env),
+				VSCODE_ESM_ENTRYPOINT: 'vs/platform/agentHost/node/agentHostMain',
+				VSCODE_PIPE_LOGGING: 'true',
+				VSCODE_VERBOSE_LOGGING: 'true',
+			}
+		});
+
+		const port = this.utilityProcess.connect();
+		const client = new MessagePortClient(port, 'agentHost');
+
+		const store = new DisposableStore();
+		store.add(client);
+		store.add(this.utilityProcess.onStderr(data => {
+			if (this._isExpectedStderr(data)) {
+				return;
+			}
+			this._logService.error(`[AgentHost:stderr] ${data}`);
+		}));
+		store.add(toDisposable(() => {
+			this.utilityProcess?.kill();
+			this.utilityProcess?.dispose();
+			this.utilityProcess = undefined;
+		}));
+
+		return {
+			client,
+			store,
+			onDidProcessExit: this.utilityProcess.onExit,
+		};
+	}
+
+	private _onWindowConnection(e: IpcMainEvent, nonce: string): void {
+		this._onRequestConnection.fire();
+
+		if (!this.utilityProcess) {
+			this._logService.error('AgentHostStarter: cannot create window connection, agent host process is not running');
+			return;
+		}
+
+		const port = this.utilityProcess.connect();
+
+		if (e.sender.isDestroyed()) {
+			port.close();
+			return;
+		}
+
+		e.sender.postMessage('vscode:createAgentHostMessageChannelResult', nonce, [port]);
+	}
+
+	private static readonly _expectedStderrPatterns = [
+		'Most NODE_OPTIONs are not supported in packaged apps',
+		'Debugger listening on ws://',
+		'For help, see: https://nodejs.org/en/docs/inspector',
+		'ExperimentalWarning: SQLite is an experimental feature',
+	];
+
+	private _isExpectedStderr(data: string): boolean {
+		return ElectronAgentHostStarter._expectedStderrPatterns.some(pattern => data.includes(pattern));
+	}
+}
diff --git a/src/vs/platform/agentHost/node/agentEventMapper.ts b/src/vs/platform/agentHost/node/agentEventMapper.ts
new file mode 100644
index 00000000000..91241632d09
--- /dev/null
+++ b/src/vs/platform/agentHost/node/agentEventMapper.ts
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { generateUuid } from '../../../base/common/uuid.js';
+import type {
+	IAgentDeltaEvent,
+	IAgentErrorEvent,
+	IAgentProgressEvent,
+	IAgentReasoningEvent,
+	IAgentTitleChangedEvent,
+	IAgentToolCompleteEvent,
+	IAgentToolStartEvent,
+	IAgentUsageEvent
+} from '../common/agentService.js';
+import {
+	ActionType,
+	type ISessionAction,
+	type ISessionErrorAction,
+	type ITitleChangedAction,
+	type IToolCallCompleteAction,
+	type IToolCallReadyAction,
+	type IToolCallStartAction,
+	type ITurnCompleteAction,
+	type IUsageAction
+} from '../common/state/sessionActions.js';
+import { ResponsePartKind, ToolCallConfirmationReason, type URI } from '../common/state/sessionState.js';
+
+/**
+ * Stateful mapper that tracks the "current" markdown and reasoning response
+ * parts per session/turn so that streaming deltas can be routed to the correct
+ * part via `partId`.
+ *
+ * Call {@link reset} when a new turn starts to clear tracked part IDs.
+ */
+export class AgentEventMapper {
+	/** Current markdown part ID per session. Reset on each new turn. */
+	private readonly _currentMarkdownPartId = new Map<string, string>();
+	/** Current reasoning part ID per session. Reset on each new turn. */
+	private readonly _currentReasoningPartId = new Map<string, string>();
+
+	/**
+	 * Resets tracked part IDs for a session (call when a new turn starts).
+	 */
+	reset(session: string): void {
+		this._currentMarkdownPartId.delete(session);
+		this._currentReasoningPartId.delete(session);
+	}
+
+	/**
+	 * Maps a flat {@link IAgentProgressEvent} from the agent host into
+	 * protocol {@link ISessionAction}(s) suitable for dispatch to the reducer.
+	 *
+	 * Returns `undefined` for events that have no corresponding action.
+	 * May return an array when a single SDK event maps to multiple protocol actions.
+	 */
+	mapProgressEventToActions(event: IAgentProgressEvent, session: URI, turnId: string): ISessionAction | ISessionAction[] | undefined {
+		switch (event.type) {
+			case 'delta': {
+				const e = event as IAgentDeltaEvent;
+				const existingPartId = this._currentMarkdownPartId.get(session);
+				if (!existingPartId) {
+					// Create a new markdown part with the content directly
+					const partId = generateUuid();
+					this._currentMarkdownPartId.set(session, partId);
+					return {
+						type: ActionType.SessionResponsePart,
+						session,
+						turnId,
+						part: { kind: ResponsePartKind.Markdown, id: partId, content: e.content },
+					};
+				}
+				return {
+					type: ActionType.SessionDelta,
+					session,
+					turnId,
+					partId: existingPartId,
+					content: e.content,
+				};
+			}
+
+			case 'tool_start': {
+				// A new tool call invalidates the current markdown part so the
+				// next text delta creates a fresh part after the tool call.
+				this._currentMarkdownPartId.delete(session);
+
+				// The Copilot SDK provides full parameters at tool_start time.
+				// We emit both toolCallStart (streaming → created) and toolCallReady
+				// (params complete → running with auto-confirm) as a pair.
+				const e = event as IAgentToolStartEvent;
+				const startAction: IToolCallStartAction = {
+					type: ActionType.SessionToolCallStart,
+					session,
+					turnId,
+					toolCallId: e.toolCallId,
+					toolName: e.toolName,
+					displayName: e.displayName,
+					_meta: { toolKind: e.toolKind, language: e.language },
+				};
+				const readyAction: IToolCallReadyAction = {
+					type: ActionType.SessionToolCallReady,
+					session,
+					turnId,
+					toolCallId: e.toolCallId,
+					invocationMessage: e.invocationMessage,
+					toolInput: e.toolInput,
+					confirmed: ToolCallConfirmationReason.NotNeeded,
+				};
+				return [startAction, readyAction];
+			}
+
+			case 'tool_ready': {
+				// A running tool requires re-confirmation (e.g. mid-execution permission).
+				// Emit toolCallReady WITHOUT confirmed, which transitions
+				// Running → PendingConfirmation in the reducer.
+				const e = event;
+				return {
+					type: ActionType.SessionToolCallReady,
+					session,
+					turnId,
+					toolCallId: e.toolCallId,
+					invocationMessage: e.invocationMessage,
+					toolInput: e.toolInput,
+					confirmationTitle: e.confirmationTitle,
+				} satisfies IToolCallReadyAction;
+			}
+
+			case 'tool_complete': {
+				const e = event as IAgentToolCompleteEvent;
+				return {
+					type: ActionType.SessionToolCallComplete,
+					session,
+					turnId,
+					toolCallId: e.toolCallId,
+					result: e.result,
+				} satisfies IToolCallCompleteAction;
+			}
+
+			case 'idle':
+				return {
+					type: ActionType.SessionTurnComplete,
+					session,
+					turnId,
+				} satisfies ITurnCompleteAction;
+
+			case 'error': {
+				const e = event as IAgentErrorEvent;
+				return {
+					type: ActionType.SessionError,
+					session,
+					turnId,
+					error: {
+						errorType: e.errorType,
+						message: e.message,
+						stack: e.stack,
+					},
+				} satisfies ISessionErrorAction;
+			}
+
+			case 'usage': {
+				const e = event as IAgentUsageEvent;
+				return {
+					type: ActionType.SessionUsage,
+					session,
+					turnId,
+					usage: {
+						inputTokens: e.inputTokens,
+						outputTokens: e.outputTokens,
+						model: e.model,
+						cacheReadTokens: e.cacheReadTokens,
+					},
+				} satisfies IUsageAction;
+			}
+
+			case 'title_changed':
+				return {
+					type: ActionType.SessionTitleChanged,
+					session,
+					title: (event as IAgentTitleChangedEvent).title,
+				} satisfies ITitleChangedAction;
+
+			case 'reasoning': {
+				const e = event as IAgentReasoningEvent;
+				const existingPartId = this._currentReasoningPartId.get(session);
+				if (!existingPartId) {
+					// Create a new reasoning part with the content directly
+					const partId = generateUuid();
+					this._currentReasoningPartId.set(session, partId);
+					return {
+						type: ActionType.SessionResponsePart,
+						session,
+						turnId,
+						part: { kind: ResponsePartKind.Reasoning, id: partId, content: e.content },
+					};
+				}
+				return {
+					type: ActionType.SessionReasoning,
+					session,
+					turnId,
+					partId: existingPartId,
+					content: e.content,
+				};
+			}
+
+			case 'message':
+				return undefined;
+
+			default:
+				return undefined;
+		}
+	}
+}
diff --git a/src/vs/platform/agentHost/node/agentHostMain.ts b/src/vs/platform/agentHost/node/agentHostMain.ts
new file mode 100644
index 00000000000..7df7461682c
--- /dev/null
+++ b/src/vs/platform/agentHost/node/agentHostMain.ts
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { Server as ChildProcessServer } from '../../../base/parts/ipc/node/ipc.cp.js';
+import { Server as UtilityProcessServer } from '../../../base/parts/ipc/node/ipc.mp.js';
+import { isUtilityProcess } from '../../../base/parts/sandbox/node/electronTypes.js';
+import { Emitter } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import * as os from 'os';
+import { AgentHostIpcChannels, AgentSession } from '../common/agentService.js';
+import { SessionStatus } from '../common/state/sessionState.js';
+import { AgentService } from './agentService.js';
+import { CopilotAgent } from './copilot/copilotAgent.js';
+import { ProtocolServerHandler, type IProtocolSideEffectHandler } from './protocolServerHandler.js';
+import { WebSocketProtocolServer } from './webSocketTransport.js';
+import { NativeEnvironmentService } from '../../environment/node/environmentService.js';
+import { parseArgs, OPTIONS } from '../../environment/node/argv.js';
+import { getLogLevel, ILogService } from '../../log/common/log.js';
+import { LogService } from '../../log/common/logService.js';
+import { LoggerService } from '../../log/node/loggerService.js';
+import { LoggerChannel } from '../../log/common/logIpc.js';
+import { DefaultURITransformer } from '../../../base/common/uriIpc.js';
+import product from '../../product/common/product.js';
+import { IProductService } from '../../product/common/productService.js';
+import { localize } from '../../../nls.js';
+import { FileService } from '../../files/common/fileService.js';
+import { DiskFileSystemProvider } from '../../files/node/diskFileSystemProvider.js';
+import { Schemas } from '../../../base/common/network.js';
+import { SessionDataService } from './sessionDataService.js';
+
+// Entry point for the agent host utility process.
+// Sets up IPC, logging, and registers agent providers (Copilot).
+// When VSCODE_AGENT_HOST_PORT or VSCODE_AGENT_HOST_SOCKET_PATH env vars
+// are set, also starts a WebSocket server for external clients.
+
+startAgentHost();
+
+function startAgentHost(): void {
+	// Setup RPC - supports both Electron utility process and Node child process
+	let server: ChildProcessServer<string> | UtilityProcessServer;
+	if (isUtilityProcess(process)) {
+		server = new UtilityProcessServer();
+	} else {
+		server = new ChildProcessServer(AgentHostIpcChannels.AgentHost);
+	}
+
+	const disposables = new DisposableStore();
+
+	// Services
+	const productService: IProductService = { _serviceBrand: undefined, ...product };
+	const environmentService = new NativeEnvironmentService(parseArgs(process.argv, OPTIONS), productService);
+	const loggerService = new LoggerService(getLogLevel(environmentService), environmentService.logsHome);
+	server.registerChannel(AgentHostIpcChannels.Logger, new LoggerChannel(loggerService, () => DefaultURITransformer));
+	const logger = loggerService.createLogger('agenthost', { name: localize('agentHost', "Agent Host") });
+	const logService = new LogService(logger);
+	logService.info('Agent Host process started successfully');
+
+	// File service
+	const fileService = disposables.add(new FileService(logService));
+	disposables.add(fileService.registerProvider(Schemas.file, disposables.add(new DiskFileSystemProvider(logService))));
+
+	// Session data service
+	const sessionDataService = new SessionDataService(URI.file(environmentService.userDataPath), fileService, logService);
+
+	// Create the real service implementation that lives in this process
+	let agentService: AgentService;
+	try {
+		agentService = new AgentService(logService, fileService, sessionDataService);
+		agentService.registerProvider(new CopilotAgent(logService, fileService, sessionDataService));
+	} catch (err) {
+		logService.error('Failed to create AgentService', err);
+		throw err;
+	}
+	const agentChannel = ProxyChannel.fromService(agentService, disposables);
+	server.registerChannel(AgentHostIpcChannels.AgentHost, agentChannel);
+
+	// Expose the WebSocket client connection count to the parent process via IPC.
+	// This is NOT part of the agent host protocol -- it is only used by the
+	// server process to manage the agent host process lifetime.
+	const connectionCountEmitter = disposables.add(new Emitter<number>());
+	const connectionTrackerChannel = ProxyChannel.fromService(
+		{ onDidChangeConnectionCount: connectionCountEmitter.event },
+		disposables,
+	);
+	server.registerChannel(AgentHostIpcChannels.ConnectionTracker, connectionTrackerChannel);
+
+	// Start WebSocket server for external clients if configured
+	startWebSocketServer(agentService, logService, disposables, count => connectionCountEmitter.fire(count)).catch(err => {
+		logService.error('Failed to start WebSocket server', err);
+	});
+
+	process.once('exit', () => {
+		agentService.dispose();
+		logService.dispose();
+		disposables.dispose();
+	});
+}
+
+/**
+ * When the parent process passes WebSocket configuration via environment
+ * variables, start a protocol server that external clients can connect to.
+ * This reuses the same {@link AgentService} and {@link SessionStateManager}
+ * that the IPC channel uses, so both IPC and WebSocket clients share state.
+ */
+async function startWebSocketServer(agentService: AgentService, logService: ILogService, disposables: DisposableStore, onConnectionCountChanged: (count: number) => void): Promise<void> {
+	const port = process.env['VSCODE_AGENT_HOST_PORT'];
+	const socketPath = process.env['VSCODE_AGENT_HOST_SOCKET_PATH'];
+
+	if (!port && !socketPath) {
+		return;
+	}
+
+	const connectionToken = process.env['VSCODE_AGENT_HOST_CONNECTION_TOKEN'];
+	const host = process.env['VSCODE_AGENT_HOST_HOST'] || 'localhost';
+
+	const wsServer = disposables.add(await WebSocketProtocolServer.create(
+		socketPath
+			? {
+				socketPath,
+				connectionTokenValidate: connectionToken
+					? (token) => token === connectionToken
+					: undefined,
+			}
+			: {
+				port: parseInt(port!, 10),
+				host,
+				connectionTokenValidate: connectionToken
+					? (token) => token === connectionToken
+					: undefined,
+			},
+		logService,
+	));
+
+	// Create a side-effect handler that delegates to AgentService
+	const sideEffects: IProtocolSideEffectHandler = {
+		handleAction(action) {
+			agentService.dispatchAction(action, 'ws-server', 0);
+		},
+		async handleCreateSession(command) {
+			await agentService.createSession({
+				provider: command.provider,
+				model: command.model,
+				workingDirectory: command.workingDirectory,
+				session: URI.parse(command.session),
+			});
+		},
+		handleDisposeSession(session) {
+			agentService.disposeSession(URI.parse(session));
+		},
+		async handleListSessions() {
+			const sessions = await agentService.listSessions();
+			return sessions.map(s => ({
+				resource: s.session.toString(),
+				provider: AgentSession.provider(s.session) ?? 'copilot',
+				title: s.summary ?? 'Session',
+				status: SessionStatus.Idle,
+				createdAt: s.startTime,
+				modifiedAt: s.modifiedTime,
+				workingDirectory: s.workingDirectory,
+			}));
+		},
+
+		handleGetResourceMetadata() {
+			return agentService.getResourceMetadataSync();
+		},
+		async handleAuthenticate(params) {
+			return agentService.authenticate(params);
+		},
+		handleBrowseDirectory(uri) {
+			return agentService.browseDirectory(URI.parse(uri));
+		},
+		async handleRestoreSession(session) {
+			return agentService.restoreSession(URI.parse(session));
+		},
+		handleFetchContent(uri) {
+			return agentService.fetchContent(URI.parse(uri));
+		},
+		getDefaultDirectory() {
+			return URI.file(os.homedir()).toString();
+		},
+	};
+
+	const protocolHandler = disposables.add(new ProtocolServerHandler(agentService.stateManager, wsServer, sideEffects, logService));
+	disposables.add(protocolHandler.onDidChangeConnectionCount(onConnectionCountChanged));
+
+	const listenTarget = socketPath ?? `${host}:${port}`;
+	logService.info(`[AgentHost] WebSocket server listening on ${listenTarget}`);
+	// Do not change this line. The CLI looks for this in the output.
+	console.log(`Agent host server listening on ${listenTarget}`);
+}
diff --git a/src/vs/platform/agentHost/node/agentHostServerMain.ts b/src/vs/platform/agentHost/node/agentHostServerMain.ts
new file mode 100644
index 00000000000..8622b1c244b
--- /dev/null
+++ b/src/vs/platform/agentHost/node/agentHostServerMain.ts
@@ -0,0 +1,251 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Standalone agent host server with WebSocket protocol transport.
+// Start with: node out/vs/platform/agentHost/node/agentHostServerMain.js [--port <port>] [--connection-token <token>] [--connection-token-file <path>] [--without-connection-token] [--enable-mock-agent] [--quiet] [--log <level>]
+
+import { fileURLToPath } from 'url';
+
+// This standalone process isn't bootstrapped via bootstrap-esm.ts, so we must
+// set _VSCODE_FILE_ROOT ourselves so that FileAccess can resolve module paths.
+// This file lives at out/vs/platform/agentHost/node/ - the root is `out/`.
+globalThis._VSCODE_FILE_ROOT = fileURLToPath(new URL('../../../..', import.meta.url));
+
+import * as fs from 'fs';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { observableValue } from '../../../base/common/observable.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { localize } from '../../../nls.js';
+import { NativeEnvironmentService } from '../../environment/node/environmentService.js';
+import { INativeEnvironmentService } from '../../environment/common/environment.js';
+import { parseArgs, OPTIONS } from '../../environment/node/argv.js';
+import { getLogLevel, ILogService, NullLogService } from '../../log/common/log.js';
+import { LogService } from '../../log/common/logService.js';
+import { LoggerService } from '../../log/node/loggerService.js';
+import product from '../../product/common/product.js';
+import { IProductService } from '../../product/common/productService.js';
+import { InstantiationService } from '../../instantiation/common/instantiationService.js';
+import { ServiceCollection } from '../../instantiation/common/serviceCollection.js';
+import { CopilotAgent } from './copilot/copilotAgent.js';
+import { AgentSession, type AgentProvider, type IAgent } from '../common/agentService.js';
+import { AgentSideEffects } from './agentSideEffects.js';
+import { SessionStateManager } from './sessionStateManager.js';
+import { WebSocketProtocolServer } from './webSocketTransport.js';
+import { ProtocolServerHandler } from './protocolServerHandler.js';
+import { FileService } from '../../files/common/fileService.js';
+import { IFileService } from '../../files/common/files.js';
+import { DiskFileSystemProvider } from '../../files/node/diskFileSystemProvider.js';
+import { Schemas } from '../../../base/common/network.js';
+import { ISessionDataService } from '../common/sessionDataService.js';
+import { SessionDataService } from './sessionDataService.js';
+
+/** Log to stderr so messages appear in the terminal alongside the process. */
+function log(msg: string): void {
+	process.stderr.write(`[AgentHostServer] ${msg}\n`);
+}
+
+// ---- Options ----------------------------------------------------------------
+
+const connectionTokenRegex = /^[0-9A-Za-z_-]+$/;
+
+interface IServerOptions {
+	readonly port: number;
+	readonly enableMockAgent: boolean;
+	readonly quiet: boolean;
+	/** Connection token string, or `undefined` when `--without-connection-token`. */
+	readonly connectionToken: string | undefined;
+}
+
+function parseServerOptions(): IServerOptions {
+	const argv = process.argv.slice(2);
+	const envPort = parseInt(process.env['VSCODE_AGENT_HOST_PORT'] ?? '8081', 10);
+	const portIdx = argv.indexOf('--port');
+	const port = portIdx >= 0 ? parseInt(argv[portIdx + 1], 10) : envPort;
+	const enableMockAgent = argv.includes('--enable-mock-agent');
+	const quiet = argv.includes('--quiet');
+
+	// Connection token
+	const withoutConnectionToken = argv.includes('--without-connection-token');
+	const connectionTokenIdx = argv.indexOf('--connection-token');
+	const connectionTokenFileIdx = argv.indexOf('--connection-token-file');
+	const rawToken = connectionTokenIdx >= 0 ? argv[connectionTokenIdx + 1] : undefined;
+	const tokenFilePath = connectionTokenFileIdx >= 0 ? argv[connectionTokenFileIdx + 1] : undefined;
+
+	let connectionToken: string | undefined;
+	if (withoutConnectionToken) {
+		if (rawToken !== undefined || tokenFilePath !== undefined) {
+			log('Error: --without-connection-token cannot be used with --connection-token or --connection-token-file');
+			process.exit(1);
+		}
+		connectionToken = undefined;
+	} else if (tokenFilePath !== undefined) {
+		if (rawToken !== undefined) {
+			log('Error: --connection-token cannot be used with --connection-token-file');
+			process.exit(1);
+		}
+		try {
+			connectionToken = fs.readFileSync(tokenFilePath).toString().replace(/\r?\n$/, '');
+		} catch {
+			log(`Error: Unable to read connection token file at '${tokenFilePath}'`);
+			process.exit(1);
+		}
+		if (!connectionTokenRegex.test(connectionToken!)) {
+			log(`Error: The connection token in '${tokenFilePath}' does not adhere to the characters 0-9, a-z, A-Z, _, or -.`);
+			process.exit(1);
+		}
+	} else if (rawToken !== undefined) {
+		if (!connectionTokenRegex.test(rawToken)) {
+			log(`Error: The connection token '${rawToken}' does not adhere to the characters 0-9, a-z, A-Z, _, or -.`);
+			process.exit(1);
+		}
+		connectionToken = rawToken;
+	} else {
+		// Default: generate a random token (secure by default)
+		connectionToken = generateUuid();
+	}
+
+	return { port, enableMockAgent, quiet, connectionToken };
+}
+
+// ---- Main -------------------------------------------------------------------
+
+async function main(): Promise<void> {
+	const options = parseServerOptions();
+	const disposables = new DisposableStore();
+
+	// Services
+	const productService: IProductService = { _serviceBrand: undefined, ...product };
+	const args = parseArgs(process.argv.slice(2), OPTIONS);
+	const environmentService = new NativeEnvironmentService(args, productService);
+
+	// Logging — production logging unless --quiet
+	let logService: ILogService;
+	let loggerService: LoggerService | undefined;
+
+	if (options.quiet) {
+		logService = new NullLogService();
+	} else {
+		const services = new ServiceCollection();
+		services.set(IProductService, productService);
+		services.set(INativeEnvironmentService, environmentService);
+		loggerService = new LoggerService(getLogLevel(environmentService), environmentService.logsHome);
+		const logger = loggerService.createLogger('agenthost-server', { name: localize('agentHostServer', "Agent Host Server") });
+		logService = disposables.add(new LogService(logger));
+		services.set(ILogService, logService);
+		log('Starting standalone agent host server');
+	}
+
+	logService.info('[AgentHostServer] Starting standalone agent host server');
+
+	// Create state manager
+	const stateManager = disposables.add(new SessionStateManager(logService));
+
+	// Agent registry — maps provider id to agent instance
+	const agents = new Map<AgentProvider, IAgent>();
+
+	// Observable agents list for root state
+	const registeredAgents = observableValue<readonly IAgent[]>('agents', []);
+
+	// File service
+	const fileService = disposables.add(new FileService(logService));
+	disposables.add(fileService.registerProvider(Schemas.file, disposables.add(new DiskFileSystemProvider(logService))));
+
+	// Session data service
+	const sessionDataService = new SessionDataService(URI.file(environmentService.userDataPath), fileService, logService);
+
+	// Shared side-effect handler
+	const sideEffects = disposables.add(new AgentSideEffects(stateManager, {
+		getAgent(session) {
+			const provider = AgentSession.provider(session);
+			return provider ? agents.get(provider) : agents.values().next().value;
+		},
+		agents: registeredAgents,
+		sessionDataService,
+	}, logService, fileService));
+
+	function registerAgent(agent: IAgent): void {
+		agents.set(agent.id, agent);
+		disposables.add(sideEffects.registerProgressListener(agent));
+		registeredAgents.set([...agents.values()], undefined);
+		logService.info(`[AgentHostServer] Registered agent: ${agent.id}`);
+	}
+
+	// Register agents
+	if (!options.quiet) {
+		// Production agents (require DI)
+		const diServices = new ServiceCollection();
+		diServices.set(IProductService, productService);
+		diServices.set(INativeEnvironmentService, environmentService);
+		diServices.set(ILogService, logService);
+		diServices.set(IFileService, fileService);
+		diServices.set(ISessionDataService, sessionDataService);
+		const instantiationService = new InstantiationService(diServices);
+		const copilotAgent = disposables.add(instantiationService.createInstance(CopilotAgent));
+		registerAgent(copilotAgent);
+		log('CopilotAgent registered');
+	}
+
+	if (options.enableMockAgent) {
+		// Dynamic import to avoid bundling test code in production
+		import('../test/node/mockAgent.js').then(({ ScriptedMockAgent }) => {
+			const mockAgent = disposables.add(new ScriptedMockAgent());
+			registerAgent(mockAgent);
+		}).catch(err => {
+			logService.error('[AgentHostServer] Failed to load mock agent', err);
+		});
+	}
+
+	// WebSocket server
+	const wsServer = disposables.add(await WebSocketProtocolServer.create({
+		port: options.port,
+		connectionTokenValidate: options.connectionToken
+			? token => token === options.connectionToken
+			: undefined,
+	}, logService));
+
+	// Wire up protocol handler
+	disposables.add(new ProtocolServerHandler(stateManager, wsServer, sideEffects, logService));
+
+	// Report ready
+	function reportReady(addr: string): void {
+		const listeningPort = addr.split(':').pop();
+		let wsUrl = `ws://${addr}`;
+		if (options.connectionToken) {
+			wsUrl += `?tkn=${options.connectionToken}`;
+		}
+		process.stdout.write(`READY:${listeningPort}\n`);
+		log(`WebSocket server listening on ${wsUrl}`);
+		logService.info(`[AgentHostServer] WebSocket server listening on ${wsUrl}`);
+	}
+
+	const address = wsServer.address;
+	if (address) {
+		reportReady(address);
+	} else {
+		const interval = setInterval(() => {
+			const addr = wsServer.address;
+			if (addr) {
+				clearInterval(interval);
+				reportReady(addr);
+			}
+		}, 10);
+	}
+
+	// Keep alive until stdin closes or signal
+	process.stdin.resume();
+	process.stdin.on('end', shutdown);
+	process.on('SIGTERM', shutdown);
+	process.on('SIGINT', shutdown);
+
+	function shutdown(): void {
+		logService.info('[AgentHostServer] Shutting down...');
+		disposables.dispose();
+		loggerService?.dispose();
+		process.exit(0);
+	}
+}
+
+main();
diff --git a/src/vs/platform/agentHost/node/agentHostService.ts b/src/vs/platform/agentHost/node/agentHostService.ts
new file mode 100644
index 00000000000..7175eb47a32
--- /dev/null
+++ b/src/vs/platform/agentHost/node/agentHostService.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ILogService, ILoggerService } from '../../log/common/log.js';
+import { RemoteLoggerChannelClient } from '../../log/common/logIpc.js';
+import { IAgentHostStarter } from '../common/agent.js';
+import { AgentHostIpcChannels } from '../common/agentService.js';
+
+enum Constants {
+	MaxRestarts = 5,
+}
+
+/**
+ * Main-process service that manages the agent host utility process lifecycle
+ * (lazy start, crash recovery, logger forwarding). The renderer communicates
+ * with the utility process directly via MessagePort - this class does not
+ * relay any agent service calls.
+ */
+export class AgentHostProcessManager extends Disposable {
+
+	private _started = false;
+	private _wasQuitRequested = false;
+	private _restartCount = 0;
+
+	constructor(
+		private readonly _starter: IAgentHostStarter,
+		@ILogService private readonly _logService: ILogService,
+		@ILoggerService private readonly _loggerService: ILoggerService,
+	) {
+		super();
+
+		this._register(this._starter);
+
+		// Start lazily when the first window asks for a connection
+		if (this._starter.onRequestConnection) {
+			this._register(Event.once(this._starter.onRequestConnection)(() => this._ensureStarted()));
+		}
+
+		if (this._starter.onWillShutdown) {
+			this._register(this._starter.onWillShutdown(() => this._wasQuitRequested = true));
+		}
+	}
+
+	private _ensureStarted(): void {
+		if (!this._started) {
+			this._start();
+		}
+	}
+
+	private _start(): void {
+		const connection = this._starter.start();
+
+		this._logService.info('AgentHostProcessManager: agent host started');
+
+		// Connect logger channel so agent host logs appear in the output channel
+		this._register(new RemoteLoggerChannelClient(this._loggerService, connection.client.getChannel(AgentHostIpcChannels.Logger)));
+
+		// Handle unexpected exit
+		this._register(connection.onDidProcessExit(e => {
+			if (!this._wasQuitRequested && !this._store.isDisposed) {
+				if (this._restartCount <= Constants.MaxRestarts) {
+					this._logService.error(`AgentHostProcessManager: agent host terminated unexpectedly with code ${e.code}`);
+					this._restartCount++;
+					this._started = false;
+					connection.store.dispose();
+					this._start();
+				} else {
+					this._logService.error(`AgentHostProcessManager: agent host terminated with code ${e.code}, giving up after ${Constants.MaxRestarts} restarts`);
+				}
+			}
+		}));
+
+		this._register(toDisposable(() => connection.store.dispose()));
+		this._started = true;
+	}
+}
diff --git a/src/vs/platform/agentHost/node/agentService.ts b/src/vs/platform/agentHost/node/agentService.ts
new file mode 100644
index 00000000000..e4d16a198b2
--- /dev/null
+++ b/src/vs/platform/agentHost/node/agentService.ts
@@ -0,0 +1,261 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { observableValue } from '../../../base/common/observable.js';
+import { URI } from '../../../base/common/uri.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { AgentProvider, AgentSession, IAgent, IAgentCreateSessionConfig, IAgentDescriptor, IAgentService, IAgentSessionMetadata, IAuthenticateParams, IAuthenticateResult, IResourceMetadata } from '../common/agentService.js';
+import { ISessionDataService } from '../common/sessionDataService.js';
+import { ActionType, IActionEnvelope, INotification, ISessionAction } from '../common/state/sessionActions.js';
+import type { IBrowseDirectoryResult, IFetchContentResult, IStateSnapshot } from '../common/state/sessionProtocol.js';
+import { SessionStatus, type ISessionSummary } from '../common/state/sessionState.js';
+import { AgentSideEffects } from './agentSideEffects.js';
+import { SessionStateManager } from './sessionStateManager.js';
+
+/**
+ * The agent service implementation that runs inside the agent-host utility
+ * process. Dispatches to registered {@link IAgent} instances based
+ * on the provider identifier in the session configuration.
+ */
+export class AgentService extends Disposable implements IAgentService {
+	declare readonly _serviceBrand: undefined;
+
+	/** Protocol: fires when state is mutated by an action. */
+	private readonly _onDidAction = this._register(new Emitter<IActionEnvelope>());
+	readonly onDidAction = this._onDidAction.event;
+
+	/** Protocol: fires for ephemeral notifications (sessionAdded/Removed). */
+	private readonly _onDidNotification = this._register(new Emitter<INotification>());
+	readonly onDidNotification = this._onDidNotification.event;
+
+	/** Authoritative state manager for the sessions process protocol. */
+	private readonly _stateManager: SessionStateManager;
+
+	/** Exposes the state manager for co-hosting a WebSocket protocol server. */
+	get stateManager(): SessionStateManager { return this._stateManager; }
+
+	/** Registered providers keyed by their {@link AgentProvider} id. */
+	private readonly _providers = new Map<AgentProvider, IAgent>();
+	/** Maps each active session URI (toString) to its owning provider. */
+	private readonly _sessionToProvider = new Map<string, AgentProvider>();
+	/** Subscriptions to provider progress events; cleared when providers change. */
+	private readonly _providerSubscriptions = this._register(new DisposableStore());
+	/** Default provider used when no explicit provider is specified. */
+	private _defaultProvider: AgentProvider | undefined;
+	/** Observable registered agents, drives `root/agentsChanged` via {@link AgentSideEffects}. */
+	private readonly _agents = observableValue<readonly IAgent[]>('agents', []);
+	/** Shared side-effect handler for action dispatch and session lifecycle. */
+	private readonly _sideEffects: AgentSideEffects;
+
+	constructor(
+		private readonly _logService: ILogService,
+		private readonly _fileService: IFileService,
+		private readonly _sessionDataService: ISessionDataService,
+	) {
+		super();
+		this._logService.info('AgentService initialized');
+		this._stateManager = this._register(new SessionStateManager(_logService));
+		this._register(this._stateManager.onDidEmitEnvelope(e => this._onDidAction.fire(e)));
+		this._register(this._stateManager.onDidEmitNotification(e => this._onDidNotification.fire(e)));
+		this._sideEffects = this._register(new AgentSideEffects(this._stateManager, {
+			getAgent: session => this._findProviderForSession(session),
+			sessionDataService: this._sessionDataService,
+			agents: this._agents,
+		}, this._logService, this._fileService));
+	}
+
+	// ---- provider registration ----------------------------------------------
+
+	registerProvider(provider: IAgent): void {
+		if (this._providers.has(provider.id)) {
+			throw new Error(`Agent provider already registered: ${provider.id}`);
+		}
+		this._logService.info(`Registering agent provider: ${provider.id}`);
+		this._providers.set(provider.id, provider);
+		this._providerSubscriptions.add(this._sideEffects.registerProgressListener(provider));
+		if (!this._defaultProvider) {
+			this._defaultProvider = provider.id;
+		}
+
+		// Update root state with current agents list
+		this._updateAgents();
+	}
+
+	// ---- auth ---------------------------------------------------------------
+
+	async listAgents(): Promise<IAgentDescriptor[]> {
+		return [...this._providers.values()].map(p => p.getDescriptor());
+	}
+
+	async getResourceMetadata(): Promise<IResourceMetadata> {
+		const resources = [...this._providers.values()].flatMap(p => p.getProtectedResources());
+		return { resources };
+	}
+
+	getResourceMetadataSync(): IResourceMetadata {
+		const resources = [...this._providers.values()].flatMap(p => p.getProtectedResources());
+		return { resources };
+	}
+
+	async authenticate(params: IAuthenticateParams): Promise<IAuthenticateResult> {
+		this._logService.trace(`[AgentService] authenticate called: resource=${params.resource}`);
+		for (const provider of this._providers.values()) {
+			const resources = provider.getProtectedResources();
+			if (resources.some(r => r.resource === params.resource)) {
+				const accepted = await provider.authenticate(params.resource, params.token);
+				if (accepted) {
+					return { authenticated: true };
+				}
+			}
+		}
+		return { authenticated: false };
+	}
+
+	// ---- session management -------------------------------------------------
+
+	async listSessions(): Promise<IAgentSessionMetadata[]> {
+		this._logService.trace('[AgentService] listSessions called');
+		const results = await Promise.all(
+			[...this._providers.values()].map(p => p.listSessions())
+		);
+		const flat = results.flat();
+		this._logService.trace(`[AgentService] listSessions returned ${flat.length} sessions`);
+		return flat;
+	}
+
+	/**
+	 * Refreshes the model list from all providers and publishes the updated
+	 * agents (with their models) to root state via `root/agentsChanged`.
+	 */
+	async refreshModels(): Promise<void> {
+		this._logService.trace('[AgentService] refreshModels called');
+		this._updateAgents();
+	}
+
+	async createSession(config?: IAgentCreateSessionConfig): Promise<URI> {
+		const providerId = config?.provider ?? this._defaultProvider;
+		const provider = providerId ? this._providers.get(providerId) : undefined;
+		if (!provider) {
+			throw new Error(`No agent provider registered for: ${providerId ?? '(none)'}`);
+		}
+		this._logService.trace(`[AgentService] createSession: provider=${provider.id} model=${config?.model ?? '(default)'}`);
+		const session = await provider.createSession(config);
+		this._sessionToProvider.set(session.toString(), provider.id);
+		this._logService.trace(`[AgentService] createSession returned: ${session.toString()}`);
+
+		// Create state in the state manager
+		const summary: ISessionSummary = {
+			resource: session.toString(),
+			provider: provider.id,
+			title: 'New Session',
+			status: SessionStatus.Idle,
+			createdAt: Date.now(),
+			modifiedAt: Date.now(),
+			workingDirectory: config?.workingDirectory,
+		};
+		this._stateManager.createSession(summary);
+		this._stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: session.toString() });
+
+		return session;
+	}
+
+	async disposeSession(session: URI): Promise<void> {
+		this._logService.trace(`[AgentService] disposeSession: ${session.toString()}`);
+		const provider = this._findProviderForSession(session);
+		if (provider) {
+			await provider.disposeSession(session);
+			this._sessionToProvider.delete(session.toString());
+		}
+		this._stateManager.removeSession(session.toString());
+		this._sessionDataService.deleteSessionData(session);
+	}
+
+	// ---- Protocol methods ---------------------------------------------------
+
+	async subscribe(resource: URI): Promise<IStateSnapshot> {
+		this._logService.trace(`[AgentService] subscribe: ${resource.toString()}`);
+		const snapshot = this._stateManager.getSnapshot(resource.toString());
+		if (!snapshot) {
+			throw new Error(`Cannot subscribe to unknown resource: ${resource.toString()}`);
+		}
+		return snapshot;
+	}
+
+	unsubscribe(resource: URI): void {
+		this._logService.trace(`[AgentService] unsubscribe: ${resource.toString()}`);
+		// Server-side tracking of per-client subscriptions will be added
+		// in Phase 4 (multi-client). For now this is a no-op.
+	}
+
+	dispatchAction(action: ISessionAction, clientId: string, clientSeq: number): void {
+		this._logService.trace(`[AgentService] dispatchAction: type=${action.type}, clientId=${clientId}, clientSeq=${clientSeq}`, action);
+
+		const origin = { clientId, clientSeq };
+		const state = this._stateManager.dispatchClientAction(action, origin);
+		this._logService.trace(`[AgentService] resulting state:`, state);
+
+		this._sideEffects.handleAction(action);
+	}
+
+	async browseDirectory(uri: URI): Promise<IBrowseDirectoryResult> {
+		return this._sideEffects.handleBrowseDirectory(uri.toString());
+	}
+
+	async restoreSession(session: URI): Promise<void> {
+		return this._sideEffects.handleRestoreSession(session.toString());
+	}
+
+	async fetchContent(uri: URI): Promise<IFetchContentResult> {
+		return this._sideEffects.handleFetchContent(uri.toString());
+	}
+
+	async shutdown(): Promise<void> {
+		this._logService.info('AgentService: shutting down all providers...');
+		const promises: Promise<void>[] = [];
+		for (const provider of this._providers.values()) {
+			promises.push(provider.shutdown());
+		}
+		await Promise.all(promises);
+		this._sessionToProvider.clear();
+	}
+
+	// ---- helpers ------------------------------------------------------------
+
+	private _findProviderForSession(session: URI | string): IAgent | undefined {
+		const key = typeof session === 'string' ? session : session.toString();
+		const providerId = this._sessionToProvider.get(key);
+		if (providerId) {
+			return this._providers.get(providerId);
+		}
+		const schemeProvider = AgentSession.provider(session);
+		if (schemeProvider) {
+			return this._providers.get(schemeProvider);
+		}
+		// Fallback: try the default provider (handles resumed sessions not yet tracked)
+		if (this._defaultProvider) {
+			return this._providers.get(this._defaultProvider);
+		}
+		return undefined;
+	}
+
+	/**
+	 * Sets the agents observable to trigger model re-fetch and
+	 * `root/agentsChanged` via the autorun in {@link AgentSideEffects}.
+	 */
+	private _updateAgents(): void {
+		this._agents.set([...this._providers.values()], undefined);
+	}
+
+	override dispose(): void {
+		for (const provider of this._providers.values()) {
+			provider.dispose();
+		}
+		this._providers.clear();
+		super.dispose();
+	}
+}
diff --git a/src/vs/platform/agentHost/node/agentSideEffects.ts b/src/vs/platform/agentHost/node/agentSideEffects.ts
new file mode 100644
index 00000000000..b7592c59f47
--- /dev/null
+++ b/src/vs/platform/agentHost/node/agentSideEffects.ts
@@ -0,0 +1,586 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as os from 'os';
+import { Disposable, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { autorun, IObservable } from '../../../base/common/observable.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { IAgent, IAgentAttachment, IAgentMessageEvent, IAgentToolCompleteEvent, IAgentToolStartEvent, IAuthenticateParams, IAuthenticateResult, IResourceMetadata } from '../common/agentService.js';
+import { ISessionDataService } from '../common/sessionDataService.js';
+import { ActionType, ISessionAction } from '../common/state/sessionActions.js';
+import { AhpErrorCodes, AHP_PROVIDER_NOT_FOUND, AHP_SESSION_NOT_FOUND, ContentEncoding, IBrowseDirectoryResult, ICreateSessionParams, IDirectoryEntry, IFetchContentResult, JSON_RPC_INTERNAL_ERROR, ProtocolError } from '../common/state/sessionProtocol.js';
+import {
+	PendingMessageKind,
+	ResponsePartKind,
+	SessionStatus,
+	ToolCallConfirmationReason,
+	ToolCallStatus,
+	TurnState,
+	type IResponsePart,
+	type ISessionModelInfo,
+	type ISessionSummary,
+	type IToolCallCompletedState,
+	type ITurn,
+	type URI as ProtocolURI,
+} from '../common/state/sessionState.js';
+import { AgentEventMapper } from './agentEventMapper.js';
+import type { IProtocolSideEffectHandler } from './protocolServerHandler.js';
+import { SessionStateManager } from './sessionStateManager.js';
+
+/**
+ * Options for constructing an {@link AgentSideEffects} instance.
+ */
+export interface IAgentSideEffectsOptions {
+	/** Resolve the agent responsible for a given session URI. */
+	readonly getAgent: (session: ProtocolURI) => IAgent | undefined;
+	/** Observable set of registered agents. Triggers `root/agentsChanged` when it changes. */
+	readonly agents: IObservable<readonly IAgent[]>;
+	/** Session data service for cleaning up per-session data on disposal. */
+	readonly sessionDataService: ISessionDataService;
+}
+
+/**
+ * Shared implementation of agent side-effect handling.
+ *
+ * Routes client-dispatched actions to the correct agent backend, handles
+ * session create/dispose/list operations, tracks pending permission requests,
+ * and wires up agent progress events to the state manager.
+ *
+ * Used by both the Electron utility-process path ({@link AgentService}) and
+ * the standalone WebSocket server (`agentHostServerMain`).
+ */
+export class AgentSideEffects extends Disposable implements IProtocolSideEffectHandler {
+
+	/** Maps tool call IDs to the agent that owns them, for routing confirmations. */
+	private readonly _toolCallAgents = new Map<string, string>();
+	/** Per-agent event mapper instances (stateful for partId tracking). */
+	private readonly _eventMappers = new Map<string, AgentEventMapper>();
+
+	constructor(
+		private readonly _stateManager: SessionStateManager,
+		private readonly _options: IAgentSideEffectsOptions,
+		private readonly _logService: ILogService,
+		private readonly _fileService: IFileService,
+	) {
+		super();
+
+		// Whenever the agents observable changes, publish to root state.
+		this._register(autorun(reader => {
+			const agents = this._options.agents.read(reader);
+			this._publishAgentInfos(agents);
+		}));
+	}
+
+	/**
+	 * Fetches models from all agents and dispatches `root/agentsChanged`.
+	 */
+	private async _publishAgentInfos(agents: readonly IAgent[]): Promise<void> {
+		const infos = await Promise.all(agents.map(async a => {
+			const d = a.getDescriptor();
+			let models: ISessionModelInfo[];
+			try {
+				const rawModels = await a.listModels();
+				models = rawModels.map(m => ({
+					id: m.id, provider: m.provider, name: m.name,
+					maxContextWindow: m.maxContextWindow, supportsVision: m.supportsVision,
+					policyState: m.policyState,
+				}));
+			} catch {
+				models = [];
+			}
+			return { provider: d.provider, displayName: d.displayName, description: d.description, models };
+		}));
+		this._stateManager.dispatchServerAction({ type: ActionType.RootAgentsChanged, agents: infos });
+	}
+
+	// ---- Agent registration -------------------------------------------------
+
+	/**
+	 * Registers a progress-event listener on the given agent so that
+	 * `IAgentProgressEvent`s are mapped to protocol actions and dispatched
+	 * through the state manager. Returns a disposable that removes the
+	 * listener.
+	 */
+	registerProgressListener(agent: IAgent): IDisposable {
+		const disposables = new DisposableStore();
+		let mapper = this._eventMappers.get(agent.id);
+		if (!mapper) {
+			mapper = new AgentEventMapper();
+			this._eventMappers.set(agent.id, mapper);
+		}
+		const agentMapper = mapper;
+		disposables.add(agent.onDidSessionProgress(e => {
+			// Track tool calls so handleAction can route confirmations
+			if (e.type === 'tool_start') {
+				this._toolCallAgents.set(`${e.session.toString()}:${e.toolCallId}`, agent.id);
+			}
+
+			const sessionKey = e.session.toString();
+			const turnId = this._stateManager.getActiveTurnId(sessionKey);
+			if (turnId) {
+				const actions = agentMapper.mapProgressEventToActions(e, sessionKey, turnId);
+				if (actions) {
+					if (Array.isArray(actions)) {
+						for (const action of actions) {
+							this._stateManager.dispatchServerAction(action);
+						}
+					} else {
+						this._stateManager.dispatchServerAction(actions);
+					}
+				}
+			}
+
+			// After a turn completes (idle event), try to consume the next queued message
+			if (e.type === 'idle') {
+				this._tryConsumeNextQueuedMessage(sessionKey);
+			}
+		}));
+		return disposables;
+	}
+
+	// ---- IProtocolSideEffectHandler -----------------------------------------
+
+	handleAction(action: ISessionAction): void {
+		switch (action.type) {
+			case ActionType.SessionTurnStarted: {
+				// Reset the event mapper's part tracking for the new turn
+				for (const mapper of this._eventMappers.values()) {
+					mapper.reset(action.session);
+				}
+				const agent = this._options.getAgent(action.session);
+				if (!agent) {
+					this._stateManager.dispatchServerAction({
+						type: ActionType.SessionError,
+						session: action.session,
+						turnId: action.turnId,
+						error: { errorType: 'noAgent', message: 'No agent found for session' },
+					});
+					return;
+				}
+				const attachments = action.userMessage.attachments?.map((a): IAgentAttachment => ({
+					type: a.type,
+					path: a.path,
+					displayName: a.displayName,
+				}));
+				agent.sendMessage(URI.parse(action.session), action.userMessage.text, attachments).catch(err => {
+					this._logService.error('[AgentSideEffects] sendMessage failed', err);
+					this._stateManager.dispatchServerAction({
+						type: ActionType.SessionError,
+						session: action.session,
+						turnId: action.turnId,
+						error: { errorType: 'sendFailed', message: String(err) },
+					});
+				});
+				break;
+			}
+			case ActionType.SessionToolCallConfirmed: {
+				const toolCallKey = `${action.session}:${action.toolCallId}`;
+				const agentId = this._toolCallAgents.get(toolCallKey);
+				if (agentId) {
+					this._toolCallAgents.delete(toolCallKey);
+					const agent = this._options.agents.get().find(a => a.id === agentId);
+					agent?.respondToPermissionRequest(action.toolCallId, action.approved);
+				} else {
+					this._logService.warn(`[AgentSideEffects] No agent for tool call confirmation: ${action.toolCallId}`);
+				}
+				break;
+			}
+			case ActionType.SessionTurnCancelled: {
+				const agent = this._options.getAgent(action.session);
+				agent?.abortSession(URI.parse(action.session)).catch(err => {
+					this._logService.error('[AgentSideEffects] abortSession failed', err);
+				});
+				break;
+			}
+			case ActionType.SessionModelChanged: {
+				const agent = this._options.getAgent(action.session);
+				agent?.changeModel?.(URI.parse(action.session), action.model).catch(err => {
+					this._logService.error('[AgentSideEffects] changeModel failed', err);
+				});
+				break;
+			}
+			case ActionType.SessionPendingMessageSet:
+			case ActionType.SessionPendingMessageRemoved:
+			case ActionType.SessionQueuedMessagesReordered: {
+				this._syncPendingMessages(action.session);
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Pushes the current pending message state from the session to the agent.
+	 * The server controls queued message consumption; only steering messages
+	 * are forwarded to the agent for mid-turn injection.
+	 */
+	private _syncPendingMessages(session: ProtocolURI): void {
+		const state = this._stateManager.getSessionState(session);
+		if (!state) {
+			return;
+		}
+		const agent = this._options.getAgent(session);
+		agent?.setPendingMessages?.(
+			URI.parse(session),
+			state.steeringMessage,
+			[],
+		);
+
+		// Steering messages are consumed immediately by the agent;
+		// remove from protocol state so clients see the consumption.
+		if (state.steeringMessage) {
+			this._stateManager.dispatchServerAction({
+				type: ActionType.SessionPendingMessageRemoved,
+				session,
+				kind: PendingMessageKind.Steering,
+				id: state.steeringMessage.id,
+			});
+		}
+
+		// If the session is idle, try to consume the next queued message
+		this._tryConsumeNextQueuedMessage(session);
+	}
+
+	/**
+	 * Consumes the next queued message by dispatching a server-initiated
+	 * `SessionTurnStarted` action with `queuedMessageId` set. The reducer
+	 * atomically creates the active turn and removes the message from the
+	 * queue. Only consumes one message at a time; subsequent messages are
+	 * consumed when the next `idle` event fires.
+	 */
+	private _tryConsumeNextQueuedMessage(session: ProtocolURI): void {
+		// Bail if there's already an active turn
+		if (this._stateManager.getActiveTurnId(session)) {
+			return;
+		}
+		const state = this._stateManager.getSessionState(session);
+		if (!state?.queuedMessages?.length) {
+			return;
+		}
+
+		const msg = state.queuedMessages[0];
+		const turnId = generateUuid();
+
+		// Reset event mappers for the new turn (same as handleAction does for SessionTurnStarted)
+		for (const mapper of this._eventMappers.values()) {
+			mapper.reset(session);
+		}
+
+		// Dispatch server-initiated turn start; the reducer removes the queued message atomically
+		this._stateManager.dispatchServerAction({
+			type: ActionType.SessionTurnStarted,
+			session,
+			turnId,
+			userMessage: msg.userMessage,
+			queuedMessageId: msg.id,
+		});
+
+		// Send the message to the agent backend
+		const agent = this._options.getAgent(session);
+		if (!agent) {
+			this._stateManager.dispatchServerAction({
+				type: ActionType.SessionError,
+				session,
+				turnId,
+				error: { errorType: 'noAgent', message: 'No agent found for session' },
+			});
+			return;
+		}
+		const attachments = msg.userMessage.attachments?.map((a): IAgentAttachment => ({
+			type: a.type,
+			path: a.path,
+			displayName: a.displayName,
+		}));
+		agent.sendMessage(URI.parse(session), msg.userMessage.text, attachments).catch(err => {
+			this._logService.error('[AgentSideEffects] sendMessage failed (queued)', err);
+			this._stateManager.dispatchServerAction({
+				type: ActionType.SessionError,
+				session,
+				turnId,
+				error: { errorType: 'sendFailed', message: String(err) },
+			});
+		});
+	}
+
+	async handleCreateSession(command: ICreateSessionParams): Promise<void> {
+		const provider = command.provider;
+		if (!provider) {
+			throw new ProtocolError(AHP_PROVIDER_NOT_FOUND, 'No provider specified for session creation');
+		}
+		const agent = this._options.agents.get().find(a => a.id === provider);
+		if (!agent) {
+			throw new ProtocolError(AHP_PROVIDER_NOT_FOUND, `No agent registered for provider: ${provider}`);
+		}
+		// Use the client-provided session URI per the protocol spec
+		const session = command.session;
+		await agent.createSession({
+			provider,
+			model: command.model,
+			workingDirectory: command.workingDirectory,
+			session: URI.parse(session),
+		});
+		const summary: ISessionSummary = {
+			resource: session,
+			provider,
+			title: 'Session',
+			status: SessionStatus.Idle,
+			createdAt: Date.now(),
+			modifiedAt: Date.now(),
+			workingDirectory: command.workingDirectory,
+		};
+		this._stateManager.createSession(summary);
+		this._stateManager.dispatchServerAction({ type: ActionType.SessionReady, session });
+	}
+
+	handleDisposeSession(session: ProtocolURI): void {
+		const agent = this._options.getAgent(session);
+		agent?.disposeSession(URI.parse(session)).catch(() => { });
+		this._stateManager.removeSession(session);
+		this._options.sessionDataService.deleteSessionData(URI.parse(session));
+	}
+
+	async handleListSessions(): Promise<ISessionSummary[]> {
+		const allSessions: ISessionSummary[] = [];
+		for (const agent of this._options.agents.get()) {
+			const sessions = await agent.listSessions();
+			const provider = agent.id;
+			for (const s of sessions) {
+				allSessions.push({
+					resource: s.session.toString(),
+					provider,
+					title: s.summary ?? 'Session',
+					status: SessionStatus.Idle,
+					createdAt: s.startTime,
+					modifiedAt: s.modifiedTime,
+				});
+			}
+		}
+		return allSessions;
+	}
+
+	/**
+	 * Restores a session from a previous server lifetime into the state
+	 * manager. Fetches the session's message history from the agent backend,
+	 * reconstructs `ITurn[]`, and creates the session in the state manager.
+	 *
+	 * @throws {ProtocolError} if the session URI doesn't match any agent or
+	 * the agent cannot retrieve the session messages.
+	 */
+	async handleRestoreSession(session: ProtocolURI): Promise<void> {
+		// Already in state manager - nothing to do.
+		if (this._stateManager.getSessionState(session)) {
+			return;
+		}
+
+		const agent = this._options.getAgent(session);
+		if (!agent) {
+			throw new ProtocolError(AHP_SESSION_NOT_FOUND, `No agent for session: ${session}`);
+		}
+
+		// Verify the session actually exists on the backend to avoid
+		// creating phantom sessions for made-up URIs.
+		let allSessions;
+		try {
+			allSessions = await agent.listSessions();
+		} catch (err) {
+			if (err instanceof ProtocolError) {
+				throw err;
+			}
+			const message = err instanceof Error ? err.message : String(err);
+			throw new ProtocolError(JSON_RPC_INTERNAL_ERROR, `Failed to list sessions for ${session}: ${message}`);
+		}
+		const meta = allSessions.find(s => s.session.toString() === session);
+		if (!meta) {
+			throw new ProtocolError(AHP_SESSION_NOT_FOUND, `Session not found on backend: ${session}`);
+		}
+
+		const sessionUri = URI.parse(session);
+		let messages;
+		try {
+			messages = await agent.getSessionMessages(sessionUri);
+		} catch (err) {
+			if (err instanceof ProtocolError) {
+				throw err;
+			}
+			const message = err instanceof Error ? err.message : String(err);
+			throw new ProtocolError(JSON_RPC_INTERNAL_ERROR, `Failed to restore session ${session}: ${message}`);
+		}
+		const turns = this._buildTurnsFromMessages(messages);
+
+		const summary: ISessionSummary = {
+			resource: session,
+			provider: agent.id,
+			title: meta.summary ?? 'Session',
+			status: SessionStatus.Idle,
+			createdAt: meta.startTime,
+			modifiedAt: meta.modifiedTime,
+			workingDirectory: meta.workingDirectory,
+		};
+
+		this._stateManager.restoreSession(summary, turns);
+		this._logService.info(`[AgentSideEffects] Restored session ${session} with ${turns.length} turns`);
+	}
+
+	/**
+	 * Reconstructs completed `ITurn[]` from a sequence of agent session
+	 * messages (user messages, assistant messages, tool starts, tool
+	 * completions). Each user-message starts a new turn; the assistant
+	 * message closes it.
+	 */
+	private _buildTurnsFromMessages(
+		messages: readonly (IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[],
+	): ITurn[] {
+		const turns: ITurn[] = [];
+		let currentTurn: {
+			id: string;
+			userMessage: { text: string };
+			responseParts: IResponsePart[];
+			pendingTools: Map<string, IAgentToolStartEvent>;
+		} | undefined;
+
+		let turnCounter = 0;
+
+		const finalizeTurn = (turn: NonNullable<typeof currentTurn>, state: TurnState): void => {
+			turns.push({
+				id: turn.id,
+				userMessage: turn.userMessage,
+				responseParts: turn.responseParts,
+				usage: undefined,
+				state,
+			});
+		};
+
+		const startTurn = (text: string): NonNullable<typeof currentTurn> => ({
+			id: `restored-${turnCounter++}`,
+			userMessage: { text },
+			responseParts: [],
+			pendingTools: new Map(),
+		});
+
+		for (const msg of messages) {
+			if (msg.type === 'message' && msg.role === 'user') {
+				// Flush any in-progress turn (e.g. interrupted/cancelled
+				// turn that never got a closing assistant message).
+				if (currentTurn) {
+					finalizeTurn(currentTurn, TurnState.Cancelled);
+				}
+				currentTurn = startTurn(msg.content);
+			} else if (msg.type === 'message' && msg.role === 'assistant') {
+				if (!currentTurn) {
+					currentTurn = startTurn('');
+				}
+
+				if (msg.content) {
+					currentTurn.responseParts.push({
+						kind: ResponsePartKind.Markdown,
+						id: generateUuid(),
+						content: msg.content,
+					});
+				}
+
+				if (!msg.toolRequests || msg.toolRequests.length === 0) {
+					finalizeTurn(currentTurn, TurnState.Complete);
+					currentTurn = undefined;
+				}
+			} else if (msg.type === 'tool_start') {
+				currentTurn?.pendingTools.set(msg.toolCallId, msg);
+			} else if (msg.type === 'tool_complete') {
+				if (currentTurn) {
+					const start = currentTurn.pendingTools.get(msg.toolCallId);
+					currentTurn.pendingTools.delete(msg.toolCallId);
+
+					const tc: IToolCallCompletedState = {
+						status: ToolCallStatus.Completed,
+						toolCallId: msg.toolCallId,
+						toolName: start?.toolName ?? 'unknown',
+						displayName: start?.displayName ?? 'Unknown Tool',
+						invocationMessage: start?.invocationMessage ?? '',
+						toolInput: start?.toolInput,
+						success: msg.result.success,
+						pastTenseMessage: msg.result.pastTenseMessage,
+						content: msg.result.content,
+						error: msg.result.error,
+						confirmed: ToolCallConfirmationReason.NotNeeded,
+						_meta: start ? {
+							toolKind: start.toolKind,
+							language: start.language,
+						} : undefined,
+					};
+					currentTurn.responseParts.push({
+						kind: ResponsePartKind.ToolCall,
+						toolCall: tc,
+					});
+				}
+			}
+		}
+
+		if (currentTurn) {
+			finalizeTurn(currentTurn, TurnState.Cancelled);
+		}
+
+		return turns;
+	}
+
+	handleGetResourceMetadata(): IResourceMetadata {
+		const resources = this._options.agents.get().flatMap(a => a.getProtectedResources());
+		return { resources };
+	}
+
+	async handleAuthenticate(params: IAuthenticateParams): Promise<IAuthenticateResult> {
+		for (const agent of this._options.agents.get()) {
+			const resources = agent.getProtectedResources();
+			if (resources.some(r => r.resource === params.resource)) {
+				const accepted = await agent.authenticate(params.resource, params.token);
+				if (accepted) {
+					return { authenticated: true };
+				}
+			}
+		}
+		return { authenticated: false };
+	}
+
+	async handleBrowseDirectory(uri: ProtocolURI): Promise<IBrowseDirectoryResult> {
+		let stat;
+		try {
+			stat = await this._fileService.resolve(URI.parse(uri));
+		} catch {
+			throw new ProtocolError(AhpErrorCodes.NotFound, `Directory not found: ${uri.toString()}`);
+		}
+
+		if (!stat.isDirectory) {
+			throw new ProtocolError(AhpErrorCodes.NotFound, `Not a directory: ${uri.toString()}`);
+		}
+
+		const entries: IDirectoryEntry[] = (stat.children ?? []).map(child => ({
+			name: child.name,
+			type: child.isDirectory ? 'directory' : 'file',
+		}));
+		return { entries };
+	}
+
+	getDefaultDirectory(): ProtocolURI {
+		return URI.file(os.homedir()).toString();
+	}
+
+	async handleFetchContent(uri: ProtocolURI): Promise<IFetchContentResult> {
+		try {
+			const content = await this._fileService.readFile(URI.parse(uri));
+			return {
+				data: content.value.toString(),
+				encoding: ContentEncoding.Utf8,
+				contentType: 'text/plain',
+			};
+		} catch (_e) {
+			throw new ProtocolError(AhpErrorCodes.NotFound, `Content not found: ${uri}`);
+		}
+	}
+
+	override dispose(): void {
+		this._toolCallAgents.clear();
+		super.dispose();
+	}
+}
diff --git a/src/vs/platform/agentHost/node/copilot/copilotAgent.ts b/src/vs/platform/agentHost/node/copilot/copilotAgent.ts
new file mode 100644
index 00000000000..31a4fad42e9
--- /dev/null
+++ b/src/vs/platform/agentHost/node/copilot/copilotAgent.ts
@@ -0,0 +1,868 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CopilotClient, CopilotSession, type SessionEvent, type SessionEventPayload } from '@github/copilot-sdk';
+import { rgPath } from '@vscode/ripgrep';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import type { IAuthorizationProtectedResourceMetadata } from '../../../../base/common/oauth.js';
+import { delimiter, dirname } from '../../../../base/common/path.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../files/common/files.js';
+import { ILogService } from '../../../log/common/log.js';
+import { localize } from '../../../../nls.js';
+import { AgentSession, IAgent, IAgentAttachment, IAgentCreateSessionConfig, IAgentDescriptor, IAgentMessageEvent, IAgentModelInfo, IAgentProgressEvent, IAgentSessionMetadata, IAgentToolCompleteEvent, IAgentToolStartEvent } from '../../common/agentService.js';
+import { ISessionDataService } from '../../common/sessionDataService.js';
+import { ToolResultContentType, type IPendingMessage, type IToolResultContent, type PolicyState } from '../../common/state/sessionState.js';
+import { CopilotSessionWrapper } from './copilotSessionWrapper.js';
+import { getEditFilePath, getInvocationMessage, getPastTenseMessage, getShellLanguage, getToolDisplayName, getToolInputString, getToolKind, isEditTool, isHiddenTool } from './copilotToolDisplay.js';
+import { FileEditTracker } from './fileEditTracker.js';
+
+function tryStringify(value: unknown): string | undefined {
+	try {
+		return JSON.stringify(value);
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Agent provider backed by the Copilot SDK {@link CopilotClient}.
+ */
+export class CopilotAgent extends Disposable implements IAgent {
+	readonly id = 'copilot' as const;
+
+	private readonly _onDidSessionProgress = this._register(new Emitter<IAgentProgressEvent>());
+	readonly onDidSessionProgress = this._onDidSessionProgress.event;
+
+	private _client: CopilotClient | undefined;
+	private _clientStarting: Promise<CopilotClient> | undefined;
+	private _githubToken: string | undefined;
+	private readonly _sessions = this._register(new DisposableMap<string, CopilotSessionWrapper>());
+	/** Tracks active tool invocations so we can produce past-tense messages on completion. Keyed by `sessionId:toolCallId`. */
+	private readonly _activeToolCalls = new Map<string, { toolName: string; displayName: string; parameters: Record<string, unknown> | undefined }>();
+	/** Pending permission requests awaiting a renderer-side decision. Keyed by requestId. */
+	private readonly _pendingPermissions = new Map<string, { sessionId: string; deferred: DeferredPromise<boolean> }>();
+	/** Working directory per session, used when resuming. */
+	private readonly _sessionWorkingDirs = new Map<string, string>();
+	/** File edit trackers per session, keyed by raw session ID. */
+	private readonly _editTrackers = new Map<string, FileEditTracker>();
+
+	constructor(
+		@ILogService private readonly _logService: ILogService,
+		@IFileService private readonly _fileService: IFileService,
+		@ISessionDataService private readonly _sessionDataService: ISessionDataService,
+	) {
+		super();
+	}
+
+	// ---- auth ---------------------------------------------------------------
+
+	getDescriptor(): IAgentDescriptor {
+		return {
+			provider: 'copilot',
+			displayName: 'Agent Host - Copilot',
+			description: 'Copilot SDK agent running in a dedicated process',
+			requiresAuth: true,
+		};
+	}
+
+	getProtectedResources(): IAuthorizationProtectedResourceMetadata[] {
+		return [{
+			resource: 'https://api.github.com',
+			resource_name: 'GitHub Copilot',
+			authorization_servers: ['https://github.com/login/oauth'],
+			scopes_supported: ['read:user', 'user:email'],
+		}];
+	}
+
+	async authenticate(resource: string, token: string): Promise<boolean> {
+		if (resource !== 'https://api.github.com') {
+			return false;
+		}
+		const tokenChanged = this._githubToken !== token;
+		this._githubToken = token;
+		this._logService.info(`[Copilot] Auth token ${tokenChanged ? 'updated' : 'unchanged'}`);
+		if (tokenChanged && this._client && this._sessions.size === 0) {
+			this._logService.info('[Copilot] Restarting CopilotClient with new token');
+			const client = this._client;
+			this._client = undefined;
+			this._clientStarting = undefined;
+			await client.stop();
+		}
+		return true;
+	}
+
+	// ---- client lifecycle ---------------------------------------------------
+
+	private async _ensureClient(): Promise<CopilotClient> {
+		if (this._client) {
+			return this._client;
+		}
+		if (this._clientStarting) {
+			return this._clientStarting;
+		}
+		this._clientStarting = (async () => {
+			this._logService.info(`[Copilot] Starting CopilotClient... ${this._githubToken ? '(with token)' : '(no token)'}`);
+
+			// Build a clean env for the CLI subprocess, stripping Electron/VS Code vars
+			// that can interfere with the Node.js process the SDK spawns.
+			const env: Record<string, string | undefined> = Object.assign({}, process.env, { ELECTRON_RUN_AS_NODE: '1' });
+			delete env['NODE_OPTIONS'];
+			delete env['VSCODE_INSPECTOR_OPTIONS'];
+			delete env['VSCODE_ESM_ENTRYPOINT'];
+			delete env['VSCODE_HANDLES_UNCAUGHT_ERRORS'];
+			for (const key of Object.keys(env)) {
+				if (key === 'ELECTRON_RUN_AS_NODE') {
+					continue;
+				}
+				if (key.startsWith('VSCODE_') || key.startsWith('ELECTRON_')) {
+					delete env[key];
+				}
+			}
+			env['COPILOT_CLI_RUN_AS_NODE'] = '1';
+			env['USE_BUILTIN_RIPGREP'] = '0';
+
+			// Resolve the CLI entry point from node_modules. We can't use require.resolve()
+			// because @github/copilot's exports map blocks direct subpath access.
+			// FileAccess.asFileUri('') points to the `out/` directory; node_modules is one level up.
+			const cliPath = URI.joinPath(FileAccess.asFileUri(''), '..', 'node_modules', '@github', 'copilot', 'index.js').fsPath;
+
+			// Add VS Code's built-in ripgrep to PATH so the CLI subprocess can find it.
+			// If @vscode/ripgrep is in an .asar file, the binary is unpacked.
+			const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
+			const rgDir = dirname(rgDiskPath);
+			// On Windows the env key is typically "Path" (not "PATH"). Since we copied
+			// process.env into a plain (case-sensitive) object, we must find the actual key.
+			const pathKey = Object.keys(env).find(k => k.toUpperCase() === 'PATH') ?? 'PATH';
+			const currentPath = env[pathKey];
+			env[pathKey] = currentPath ? `${currentPath}${delimiter}${rgDir}` : rgDir;
+			this._logService.info(`[Copilot] Resolved CLI path: ${cliPath}`);
+
+			const client = new CopilotClient({
+				githubToken: this._githubToken,
+				useLoggedInUser: !this._githubToken,
+				useStdio: true,
+				autoStart: true,
+				env,
+				cliPath,
+			});
+			await client.start();
+			this._logService.info('[Copilot] CopilotClient started successfully');
+			this._client = client;
+			this._clientStarting = undefined;
+			return client;
+		})();
+		return this._clientStarting;
+	}
+
+	// ---- session management -------------------------------------------------
+
+	async listSessions(): Promise<IAgentSessionMetadata[]> {
+		this._logService.info('[Copilot] Listing sessions...');
+		const client = await this._ensureClient();
+		const sessions = await client.listSessions();
+		const result: IAgentSessionMetadata[] = sessions.map(s => ({
+			session: AgentSession.uri(this.id, s.sessionId),
+			startTime: s.startTime.getTime(),
+			modifiedTime: s.modifiedTime.getTime(),
+			summary: s.summary,
+			workingDirectory: typeof s.context?.cwd === 'string' ? s.context.cwd : undefined,
+		}));
+		this._logService.info(`[Copilot] Found ${result.length} sessions`);
+		return result;
+	}
+
+	async listModels(): Promise<IAgentModelInfo[]> {
+		this._logService.info('[Copilot] Listing models...');
+		const client = await this._ensureClient();
+		const models = await client.listModels();
+		const result = models.map(m => ({
+			provider: this.id,
+			id: m.id,
+			name: m.name,
+			maxContextWindow: m.capabilities.limits.max_context_window_tokens,
+			supportsVision: m.capabilities.supports.vision,
+			supportsReasoningEffort: m.capabilities.supports.reasoningEffort,
+			supportedReasoningEfforts: m.supportedReasoningEfforts,
+			defaultReasoningEffort: m.defaultReasoningEffort,
+			policyState: m.policy?.state as PolicyState | undefined,
+			billingMultiplier: m.billing?.multiplier,
+		}));
+		this._logService.info(`[Copilot] Found ${result.length} models`);
+		return result;
+	}
+
+	async createSession(config?: IAgentCreateSessionConfig): Promise<URI> {
+		this._logService.info(`[Copilot] Creating session... ${config?.model ? `model=${config.model}` : ''}`);
+		const client = await this._ensureClient();
+		const raw = await client.createSession({
+			model: config?.model,
+			sessionId: config?.session ? AgentSession.id(config.session) : undefined,
+			streaming: true,
+			workingDirectory: config?.workingDirectory,
+			onPermissionRequest: (request, invocation) => this._handlePermissionRequest(request, invocation),
+			hooks: this._createSessionHooks(),
+		});
+
+		const wrapper = this._trackSession(raw);
+		const session = AgentSession.uri(this.id, wrapper.sessionId);
+		if (config?.workingDirectory) {
+			this._sessionWorkingDirs.set(wrapper.sessionId, config.workingDirectory);
+		}
+		this._logService.info(`[Copilot] Session created: ${session.toString()}`);
+		return session;
+	}
+
+	async sendMessage(session: URI, prompt: string, attachments?: IAgentAttachment[]): Promise<void> {
+		const sessionId = AgentSession.id(session);
+		this._logService.info(`[Copilot:${sessionId}] sendMessage called: "${prompt.substring(0, 100)}${prompt.length > 100 ? '...' : ''}" (${attachments?.length ?? 0} attachments)`);
+		const entry = this._sessions.get(sessionId) ?? await this._resumeSession(sessionId);
+		this._logService.info(`[Copilot:${sessionId}] Found session wrapper, calling session.send()...`);
+
+		const sdkAttachments = attachments?.map(a => {
+			if (a.type === 'selection') {
+				return { type: 'selection' as const, filePath: a.path, displayName: a.displayName ?? a.path, text: a.text, selection: a.selection };
+			}
+			return { type: a.type, path: a.path, displayName: a.displayName };
+		});
+		if (sdkAttachments?.length) {
+			this._logService.trace(`[Copilot:${sessionId}] Attachments: ${JSON.stringify(sdkAttachments.map(a => ({ type: a.type, path: a.type === 'selection' ? a.filePath : a.path })))}`);
+		}
+
+		await entry.session.send({ prompt, attachments: sdkAttachments });
+		this._logService.info(`[Copilot:${sessionId}] session.send() returned`);
+	}
+
+	setPendingMessages(session: URI, steeringMessage: IPendingMessage | undefined, queuedMessages: readonly IPendingMessage[]): void {
+		const sessionId = AgentSession.id(session);
+		const entry = this._sessions.get(sessionId);
+		if (!entry) {
+			this._logService.warn(`[Copilot:${sessionId}] setPendingMessages: session not found`);
+			return;
+		}
+
+		// Steering: send with mode 'immediate' so the SDK injects it mid-turn
+		if (steeringMessage) {
+			this._logService.info(`[Copilot:${sessionId}] Sending steering message: "${steeringMessage.userMessage.text.substring(0, 100)}"`);
+			entry.session.send({
+				prompt: steeringMessage.userMessage.text,
+				mode: 'immediate',
+			}).catch(err => {
+				this._logService.error(`[Copilot:${sessionId}] Steering message failed`, err);
+			});
+		}
+
+		// Queued messages are consumed by the server (AgentSideEffects)
+		// which dispatches SessionTurnStarted and calls sendMessage directly.
+		// No SDK-level enqueue is needed.
+	}
+
+	async getSessionMessages(session: URI): Promise<(IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[]> {
+		const sessionId = AgentSession.id(session);
+		const entry = this._sessions.get(sessionId) ?? await this._resumeSession(sessionId).catch(() => undefined);
+		if (!entry) {
+			return [];
+		}
+
+		const events = await entry.session.getMessages();
+		return this._mapSessionEvents(session, events);
+	}
+
+	async disposeSession(session: URI): Promise<void> {
+		const sessionId = AgentSession.id(session);
+		this._sessions.deleteAndDispose(sessionId);
+		this._clearToolCallsForSession(sessionId);
+		this._sessionWorkingDirs.delete(sessionId);
+		this._denyPendingPermissionsForSession(sessionId);
+	}
+
+	async abortSession(session: URI): Promise<void> {
+		const sessionId = AgentSession.id(session);
+		const entry = this._sessions.get(sessionId);
+		if (entry) {
+			this._logService.info(`[Copilot:${sessionId}] Aborting session...`);
+			this._denyPendingPermissionsForSession(sessionId);
+			await entry.session.abort();
+		}
+	}
+
+	async changeModel(session: URI, model: string): Promise<void> {
+		const sessionId = AgentSession.id(session);
+		const entry = this._sessions.get(sessionId);
+		if (entry) {
+			this._logService.info(`[Copilot:${sessionId}] Changing model to: ${model}`);
+			await entry.session.setModel(model);
+		}
+	}
+
+	async shutdown(): Promise<void> {
+		this._logService.info('[Copilot] Shutting down...');
+		this._sessions.clearAndDisposeAll();
+		this._activeToolCalls.clear();
+		this._sessionWorkingDirs.clear();
+		this._denyPendingPermissions();
+		await this._client?.stop();
+		this._client = undefined;
+	}
+
+	respondToPermissionRequest(requestId: string, approved: boolean): void {
+		const entry = this._pendingPermissions.get(requestId);
+		if (entry) {
+			this._pendingPermissions.delete(requestId);
+			entry.deferred.complete(approved);
+		}
+	}
+
+	/**
+	 * Returns true if this provider owns the given session ID.
+	 */
+	hasSession(session: URI): boolean {
+		return this._sessions.has(AgentSession.id(session));
+	}
+
+	// ---- helpers ------------------------------------------------------------
+
+	/**
+	 * Handles a permission request from the SDK by firing a `tool_ready` event
+	 * (which transitions the tool to PendingConfirmation) and waiting for the
+	 * side-effects layer to respond via respondToPermissionRequest.
+	 */
+	private async _handlePermissionRequest(
+		request: { kind: string; toolCallId?: string;[key: string]: unknown },
+		invocation: { sessionId: string },
+	): Promise<{ kind: 'approved' | 'denied-interactively-by-user' }> {
+		const session = AgentSession.uri(this.id, invocation.sessionId);
+
+		this._logService.info(`[Copilot:${invocation.sessionId}] Permission request: kind=${request.kind}`);
+
+		// Auto-approve reads inside the working directory
+		if (request.kind === 'read') {
+			const requestPath = typeof request.path === 'string' ? request.path : undefined;
+			const workingDir = this._sessionWorkingDirs.get(invocation.sessionId);
+			if (requestPath && workingDir && requestPath.startsWith(workingDir)) {
+				this._logService.trace(`[Copilot:${invocation.sessionId}] Auto-approving read inside working directory: ${requestPath}`);
+				return { kind: 'approved' };
+			}
+		}
+
+		const toolCallId = request.toolCallId;
+		if (!toolCallId) {
+			// TODO: handle permission requests without a toolCallId by creating a synthetic tool call
+			this._logService.warn(`[Copilot:${invocation.sessionId}] Permission request without toolCallId, auto-denying: kind=${request.kind}`);
+			return { kind: 'denied-interactively-by-user' };
+		}
+
+		this._logService.info(`[Copilot:${invocation.sessionId}] Requesting confirmation for tool call: ${toolCallId}`);
+
+		const deferred = new DeferredPromise<boolean>();
+		this._pendingPermissions.set(toolCallId, { sessionId: invocation.sessionId, deferred });
+
+		// Derive display information from the permission request kind
+		const { confirmationTitle, invocationMessage, toolInput } = this._getPermissionDisplay(request);
+
+		// Fire a tool_ready event to transition the tool to PendingConfirmation
+		this._onDidSessionProgress.fire({
+			session,
+			type: 'tool_ready',
+			toolCallId,
+			invocationMessage,
+			toolInput,
+			confirmationTitle,
+		});
+
+		const approved = await deferred.p;
+		this._logService.info(`[Copilot:${invocation.sessionId}] Permission response: toolCallId=${toolCallId}, approved=${approved}`);
+		return { kind: approved ? 'approved' : 'denied-interactively-by-user' };
+	}
+
+	/**
+	 * Derives display fields from a permission request for the tool confirmation UI.
+	 */
+	private _getPermissionDisplay(request: { kind: string;[key: string]: unknown }): {
+		confirmationTitle: string;
+		invocationMessage: string;
+		toolInput?: string;
+	} {
+		const path = typeof request.path === 'string' ? request.path : (typeof request.fileName === 'string' ? request.fileName : undefined);
+		const fullCommandText = typeof request.fullCommandText === 'string' ? request.fullCommandText : undefined;
+		const intention = typeof request.intention === 'string' ? request.intention : undefined;
+		const serverName = typeof request.serverName === 'string' ? request.serverName : undefined;
+		const toolName = typeof request.toolName === 'string' ? request.toolName : undefined;
+
+		switch (request.kind) {
+			case 'shell':
+				return {
+					confirmationTitle: localize('copilot.permission.shell.title', "Run in terminal"),
+					invocationMessage: intention ?? localize('copilot.permission.shell.message', "Run command"),
+					toolInput: fullCommandText,
+				};
+			case 'write':
+				return {
+					confirmationTitle: localize('copilot.permission.write.title', "Write file"),
+					invocationMessage: path ? localize('copilot.permission.write.message', "Edit {0}", path) : localize('copilot.permission.write.messageGeneric', "Edit file"),
+					toolInput: tryStringify(path ? { path } : request) ?? undefined,
+				};
+			case 'mcp': {
+				const title = toolName ?? localize('copilot.permission.mcp.defaultTool', "MCP Tool");
+				return {
+					confirmationTitle: serverName ? `${serverName}: ${title}` : title,
+					invocationMessage: serverName ? `${serverName}: ${title}` : title,
+					toolInput: tryStringify({ serverName, toolName }) ?? undefined,
+				};
+			}
+			case 'read':
+				return {
+					confirmationTitle: localize('copilot.permission.read.title', "Read file"),
+					invocationMessage: intention ?? localize('copilot.permission.read.message', "Read file"),
+					toolInput: tryStringify(path ? { path, intention } : request) ?? undefined,
+				};
+			default:
+				return {
+					confirmationTitle: localize('copilot.permission.default.title', "Permission request"),
+					invocationMessage: localize('copilot.permission.default.message', "Permission request"),
+					toolInput: tryStringify(request) ?? undefined,
+				};
+		}
+	}
+
+	private _clearToolCallsForSession(sessionId: string): void {
+		const prefix = `${sessionId}:`;
+		for (const key of this._activeToolCalls.keys()) {
+			if (key.startsWith(prefix)) {
+				this._activeToolCalls.delete(key);
+			}
+		}
+	}
+
+	private _getOrCreateEditTracker(rawSessionId: string): FileEditTracker {
+		let tracker = this._editTrackers.get(rawSessionId);
+		if (!tracker) {
+			tracker = new FileEditTracker(rawSessionId, this._sessionDataService, this._fileService, this._logService);
+			this._editTrackers.set(rawSessionId, tracker);
+		}
+		return tracker;
+	}
+
+	/**
+	 * Creates SDK session hooks for pre/post tool use. The `onPreToolUse`
+	 * hook snapshots files before edit tools run. The `onPostToolUse` hook
+	 * snapshots the after-content so that it's ready synchronously when
+	 * `onToolComplete` fires.
+	 */
+	private _createSessionHooks() {
+		return {
+			onPreToolUse: async (input: { toolName: string; toolArgs: unknown }, invocation: { sessionId: string }) => {
+				if (isEditTool(input.toolName)) {
+					const filePath = getEditFilePath(input.toolArgs);
+					if (filePath) {
+						const tracker = this._getOrCreateEditTracker(invocation.sessionId);
+						await tracker.trackEditStart(filePath);
+					}
+				}
+			},
+			onPostToolUse: async (input: { toolName: string; toolArgs: unknown }, invocation: { sessionId: string }) => {
+				if (isEditTool(input.toolName)) {
+					const filePath = getEditFilePath(input.toolArgs);
+					if (filePath) {
+						const tracker = this._editTrackers.get(invocation.sessionId);
+						await tracker?.completeEdit(filePath);
+					}
+				}
+			},
+		};
+	}
+
+	private _trackSession(raw: CopilotSession, sessionIdOverride?: string): CopilotSessionWrapper {
+		const wrapper = new CopilotSessionWrapper(raw);
+		const rawId = sessionIdOverride ?? wrapper.sessionId;
+		const session = AgentSession.uri(this.id, rawId);
+
+		wrapper.onMessageDelta(e => {
+			this._logService.trace(`[Copilot:${rawId}] delta: ${e.data.deltaContent}`);
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'delta',
+				messageId: e.data.messageId,
+				content: e.data.deltaContent,
+				parentToolCallId: e.data.parentToolCallId,
+			});
+		});
+
+		wrapper.onMessage(e => {
+			this._logService.info(`[Copilot:${rawId}] Full message received: ${e.data.content.length} chars`);
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'message',
+				role: 'assistant',
+				messageId: e.data.messageId,
+				content: e.data.content,
+				toolRequests: e.data.toolRequests?.map(tr => ({
+					toolCallId: tr.toolCallId,
+					name: tr.name,
+					arguments: tr.arguments !== undefined ? tryStringify(tr.arguments) : undefined,
+					type: tr.type,
+				})),
+				reasoningOpaque: e.data.reasoningOpaque,
+				reasoningText: e.data.reasoningText,
+				encryptedContent: e.data.encryptedContent,
+				parentToolCallId: e.data.parentToolCallId,
+			});
+		});
+
+		wrapper.onToolStart(e => {
+			if (isHiddenTool(e.data.toolName)) {
+				this._logService.trace(`[Copilot:${rawId}] Tool started (hidden): ${e.data.toolName}`);
+				return;
+			}
+			this._logService.info(`[Copilot:${rawId}] Tool started: ${e.data.toolName}`);
+			const toolArgs = e.data.arguments !== undefined ? tryStringify(e.data.arguments) : undefined;
+			let parameters: Record<string, unknown> | undefined;
+			if (toolArgs) {
+				try { parameters = JSON.parse(toolArgs) as Record<string, unknown>; } catch { /* ignore */ }
+			}
+			const displayName = getToolDisplayName(e.data.toolName);
+			const trackingKey = `${rawId}:${e.data.toolCallId}`;
+			this._activeToolCalls.set(trackingKey, { toolName: e.data.toolName, displayName, parameters });
+			const toolKind = getToolKind(e.data.toolName);
+
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'tool_start',
+				toolCallId: e.data.toolCallId,
+				toolName: e.data.toolName,
+				displayName,
+				invocationMessage: getInvocationMessage(e.data.toolName, displayName, parameters),
+				toolInput: getToolInputString(e.data.toolName, parameters, toolArgs),
+				toolKind,
+				language: toolKind === 'terminal' ? getShellLanguage(e.data.toolName) : undefined,
+				toolArguments: toolArgs,
+				mcpServerName: e.data.mcpServerName,
+				mcpToolName: e.data.mcpToolName,
+				parentToolCallId: e.data.parentToolCallId,
+			});
+		});
+
+		wrapper.onToolComplete(e => {
+			const trackingKey = `${rawId}:${e.data.toolCallId}`;
+			const tracked = this._activeToolCalls.get(trackingKey);
+			if (!tracked) {
+				return;
+			}
+			this._logService.info(`[Copilot:${rawId}] Tool completed: ${e.data.toolCallId}`);
+			this._activeToolCalls.delete(trackingKey);
+			const displayName = tracked.displayName;
+			const toolOutput = e.data.error?.message ?? e.data.result?.content;
+
+			const content: IToolResultContent[] = [];
+			if (toolOutput !== undefined) {
+				content.push({ type: ToolResultContentType.Text, text: toolOutput });
+			}
+
+			// File edit data was already prepared by the onPostToolUse hook
+			const tracker = this._editTrackers.get(rawId);
+			const filePath = isEditTool(tracked.toolName) ? getEditFilePath(tracked.parameters) : undefined;
+			if (tracker && filePath) {
+				const fileEdit = tracker.takeCompletedEdit(filePath);
+				if (fileEdit) {
+					content.push(fileEdit);
+				}
+			}
+
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'tool_complete',
+				toolCallId: e.data.toolCallId,
+				result: {
+					success: e.data.success,
+					pastTenseMessage: getPastTenseMessage(tracked.toolName, displayName, tracked.parameters, e.data.success),
+					content: content.length > 0 ? content : undefined,
+					error: e.data.error,
+				},
+				isUserRequested: e.data.isUserRequested,
+				toolTelemetry: e.data.toolTelemetry !== undefined ? tryStringify(e.data.toolTelemetry) : undefined,
+				parentToolCallId: e.data.parentToolCallId,
+			});
+		});
+
+		wrapper.onIdle(() => {
+			this._logService.info(`[Copilot:${rawId}] Session idle`);
+			this._onDidSessionProgress.fire({ session, type: 'idle' });
+		});
+
+		wrapper.onSessionError(e => {
+			this._logService.error(`[Copilot:${rawId}] Session error: ${e.data.errorType} - ${e.data.message}`);
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'error',
+				errorType: e.data.errorType,
+				message: e.data.message,
+				stack: e.data.stack,
+			});
+		});
+
+		wrapper.onUsage(e => {
+			this._logService.trace(`[Copilot:${rawId}] Usage: model=${e.data.model}, in=${e.data.inputTokens ?? '?'}, out=${e.data.outputTokens ?? '?'}, cacheRead=${e.data.cacheReadTokens ?? '?'}`);
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'usage',
+				inputTokens: e.data.inputTokens,
+				outputTokens: e.data.outputTokens,
+				model: e.data.model,
+				cacheReadTokens: e.data.cacheReadTokens,
+			});
+		});
+
+		wrapper.onReasoningDelta(e => {
+			this._logService.trace(`[Copilot:${rawId}] Reasoning delta: ${e.data.deltaContent.length} chars`);
+			this._onDidSessionProgress.fire({
+				session,
+				type: 'reasoning',
+				content: e.data.deltaContent,
+			});
+		});
+
+		this._subscribeForLogging(wrapper, rawId);
+
+		this._sessions.set(rawId, wrapper);
+		return wrapper;
+	}
+
+	private _subscribeForLogging(wrapper: CopilotSessionWrapper, sessionId: string): void {
+		wrapper.onSessionStart(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Session started: model=${e.data.selectedModel ?? 'default'}, producer=${e.data.producer}`);
+		});
+
+		wrapper.onSessionResume(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Session resumed: eventCount=${e.data.eventCount}`);
+		});
+
+		wrapper.onSessionInfo(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Session info [${e.data.infoType}]: ${e.data.message}`);
+		});
+
+		wrapper.onSessionModelChange(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Model changed: ${e.data.previousModel ?? '(none)'} -> ${e.data.newModel}`);
+		});
+
+		wrapper.onSessionHandoff(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Session handoff: sourceType=${e.data.sourceType}, remoteSessionId=${e.data.remoteSessionId ?? '(none)'}`);
+		});
+
+		wrapper.onSessionTruncation(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Session truncation: removed ${e.data.tokensRemovedDuringTruncation} tokens, ${e.data.messagesRemovedDuringTruncation} messages`);
+		});
+
+		wrapper.onSessionSnapshotRewind(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Snapshot rewind: upTo=${e.data.upToEventId}, eventsRemoved=${e.data.eventsRemoved}`);
+		});
+
+		wrapper.onSessionShutdown(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Session shutdown: type=${e.data.shutdownType}, premiumRequests=${e.data.totalPremiumRequests}, apiDuration=${e.data.totalApiDurationMs}ms`);
+		});
+
+		wrapper.onSessionUsageInfo(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Usage info: ${e.data.currentTokens}/${e.data.tokenLimit} tokens, ${e.data.messagesLength} messages`);
+		});
+
+		wrapper.onSessionCompactionStart(() => {
+			this._logService.trace(`[Copilot:${sessionId}] Compaction started`);
+		});
+
+		wrapper.onSessionCompactionComplete(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Compaction complete: success=${e.data.success}, tokensRemoved=${e.data.tokensRemoved ?? '?'}`);
+		});
+
+		wrapper.onUserMessage(e => {
+			this._logService.trace(`[Copilot:${sessionId}] User message: ${e.data.content.length} chars, ${e.data.attachments?.length ?? 0} attachments`);
+		});
+
+		wrapper.onPendingMessagesModified(() => {
+			this._logService.trace(`[Copilot:${sessionId}] Pending messages modified`);
+		});
+
+		wrapper.onTurnStart(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Turn started: ${e.data.turnId}`);
+		});
+
+		wrapper.onIntent(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Intent: ${e.data.intent}`);
+		});
+
+		wrapper.onReasoning(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Reasoning: ${e.data.content.length} chars`);
+		});
+
+		wrapper.onTurnEnd(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Turn ended: ${e.data.turnId}`);
+		});
+
+		wrapper.onAbort(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Aborted: ${e.data.reason}`);
+		});
+
+		wrapper.onToolUserRequested(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Tool user-requested: ${e.data.toolName} (${e.data.toolCallId})`);
+		});
+
+		wrapper.onToolPartialResult(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Tool partial result: ${e.data.toolCallId} (${e.data.partialOutput.length} chars)`);
+		});
+
+		wrapper.onToolProgress(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Tool progress: ${e.data.toolCallId} - ${e.data.progressMessage}`);
+		});
+
+		wrapper.onSkillInvoked(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Skill invoked: ${e.data.name} (${e.data.path})`);
+		});
+
+		wrapper.onSubagentStarted(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Subagent started: ${e.data.agentName} (${e.data.agentDisplayName})`);
+		});
+
+		wrapper.onSubagentCompleted(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Subagent completed: ${e.data.agentName}`);
+		});
+
+		wrapper.onSubagentFailed(e => {
+			this._logService.error(`[Copilot:${sessionId}] Subagent failed: ${e.data.agentName} - ${e.data.error}`);
+		});
+
+		wrapper.onSubagentSelected(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Subagent selected: ${e.data.agentName}`);
+		});
+
+		wrapper.onHookStart(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Hook started: ${e.data.hookType} (${e.data.hookInvocationId})`);
+		});
+
+		wrapper.onHookEnd(e => {
+			this._logService.trace(`[Copilot:${sessionId}] Hook ended: ${e.data.hookType} (${e.data.hookInvocationId}), success=${e.data.success}`);
+		});
+
+		wrapper.onSystemMessage(e => {
+			this._logService.trace(`[Copilot:${sessionId}] System message [${e.data.role}]: ${e.data.content.length} chars`);
+		});
+	}
+
+	private async _resumeSession(sessionId: string): Promise<CopilotSessionWrapper> {
+		this._logService.info(`[Copilot:${sessionId}] Session not in memory, resuming...`);
+		const client = await this._ensureClient();
+		const raw = await client.resumeSession(sessionId, {
+			onPermissionRequest: (request, invocation) => this._handlePermissionRequest(request, invocation),
+			workingDirectory: this._sessionWorkingDirs.get(sessionId),
+			hooks: this._createSessionHooks(),
+		});
+		return this._trackSession(raw, sessionId);
+	}
+
+	private _mapSessionEvents(session: URI, events: readonly SessionEvent[]): (IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[] {
+		const result: (IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[] = [];
+		const toolInfoByCallId = new Map<string, { toolName: string; parameters: Record<string, unknown> | undefined }>();
+
+		for (const e of events) {
+			if (e.type === 'assistant.message' || e.type === 'user.message') {
+				const d = (e as SessionEventPayload<'assistant.message'>).data;
+				result.push({
+					session,
+					type: 'message',
+					role: e.type === 'user.message' ? 'user' : 'assistant',
+					messageId: d?.messageId ?? '',
+					content: d?.content ?? '',
+					toolRequests: d?.toolRequests?.map((tr: { toolCallId: string; name: string; arguments?: unknown; type?: 'function' | 'custom' }) => ({
+						toolCallId: tr.toolCallId,
+						name: tr.name,
+						arguments: tr.arguments !== undefined ? tryStringify(tr.arguments) : undefined,
+						type: tr.type,
+					})),
+					reasoningOpaque: d?.reasoningOpaque,
+					reasoningText: d?.reasoningText,
+					encryptedContent: d?.encryptedContent,
+					parentToolCallId: d?.parentToolCallId,
+				});
+			} else if (e.type === 'tool.execution_start') {
+				const d = (e as SessionEventPayload<'tool.execution_start'>).data;
+				if (isHiddenTool(d.toolName)) {
+					continue;
+				}
+				const toolArgs = d.arguments !== undefined ? tryStringify(d.arguments) : undefined;
+				let parameters: Record<string, unknown> | undefined;
+				if (toolArgs) {
+					try { parameters = JSON.parse(toolArgs) as Record<string, unknown>; } catch { /* ignore */ }
+				}
+				toolInfoByCallId.set(d.toolCallId, { toolName: d.toolName, parameters });
+				const displayName = getToolDisplayName(d.toolName);
+				const toolKind = getToolKind(d.toolName);
+				result.push({
+					session,
+					type: 'tool_start',
+					toolCallId: d.toolCallId,
+					toolName: d.toolName,
+					displayName,
+					invocationMessage: getInvocationMessage(d.toolName, displayName, parameters),
+					toolInput: getToolInputString(d.toolName, parameters, toolArgs),
+					toolKind,
+					language: toolKind === 'terminal' ? getShellLanguage(d.toolName) : undefined,
+					toolArguments: toolArgs,
+					mcpServerName: d.mcpServerName,
+					mcpToolName: d.mcpToolName,
+					parentToolCallId: d.parentToolCallId,
+				});
+			} else if (e.type === 'tool.execution_complete') {
+				const d = (e as SessionEventPayload<'tool.execution_complete'>).data;
+				const info = toolInfoByCallId.get(d.toolCallId);
+				if (!info) {
+					continue;
+				}
+				toolInfoByCallId.delete(d.toolCallId);
+				const displayName = getToolDisplayName(info.toolName);
+				const toolOutput = d.error?.message ?? d.result?.content;
+				const content: IToolResultContent[] = [];
+				if (toolOutput !== undefined) {
+					content.push({ type: ToolResultContentType.Text, text: toolOutput });
+				}
+				result.push({
+					session,
+					type: 'tool_complete',
+					toolCallId: d.toolCallId,
+					result: {
+						success: d.success,
+						pastTenseMessage: getPastTenseMessage(info.toolName, displayName, info.parameters, d.success),
+						content: content.length > 0 ? content : undefined,
+						error: d.error,
+					},
+					isUserRequested: d.isUserRequested,
+					toolTelemetry: d.toolTelemetry !== undefined ? tryStringify(d.toolTelemetry) : undefined,
+				});
+			}
+		}
+		return result;
+	}
+
+	override dispose(): void {
+		this._denyPendingPermissions();
+		this._client?.stop().catch(() => { /* best-effort */ });
+		super.dispose();
+	}
+
+	private _denyPendingPermissions(): void {
+		for (const [, entry] of this._pendingPermissions) {
+			entry.deferred.complete(false);
+		}
+		this._pendingPermissions.clear();
+	}
+
+	private _denyPendingPermissionsForSession(sessionId: string): void {
+		for (const [requestId, entry] of this._pendingPermissions) {
+			if (entry.sessionId === sessionId) {
+				entry.deferred.complete(false);
+				this._pendingPermissions.delete(requestId);
+			}
+		}
+	}
+}
diff --git a/src/vs/platform/agentHost/node/copilot/copilotSessionWrapper.ts b/src/vs/platform/agentHost/node/copilot/copilotSessionWrapper.ts
new file mode 100644
index 00000000000..36ad526d416
--- /dev/null
+++ b/src/vs/platform/agentHost/node/copilot/copilotSessionWrapper.ts
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CopilotSession, SessionEventPayload, SessionEventType } from '@github/copilot-sdk';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+
+/**
+ * Thin wrapper around {@link CopilotSession} that exposes each SDK event as a
+ * proper VS Code `Event<T>`. All subscriptions and the underlying SDK session
+ * are cleaned up on dispose.
+ */
+export class CopilotSessionWrapper extends Disposable {
+
+	constructor(readonly session: CopilotSession) {
+		super();
+		this._register(toDisposable(() => {
+			session.destroy().catch(() => { /* best-effort */ });
+		}));
+	}
+
+	get sessionId(): string { return this.session.sessionId; }
+
+	private _onMessageDelta: Event<SessionEventPayload<'assistant.message_delta'>> | undefined;
+	get onMessageDelta(): Event<SessionEventPayload<'assistant.message_delta'>> {
+		return this._onMessageDelta ??= this._sdkEvent('assistant.message_delta');
+	}
+
+	private _onMessage: Event<SessionEventPayload<'assistant.message'>> | undefined;
+	get onMessage(): Event<SessionEventPayload<'assistant.message'>> {
+		return this._onMessage ??= this._sdkEvent('assistant.message');
+	}
+
+	private _onToolStart: Event<SessionEventPayload<'tool.execution_start'>> | undefined;
+	get onToolStart(): Event<SessionEventPayload<'tool.execution_start'>> {
+		return this._onToolStart ??= this._sdkEvent('tool.execution_start');
+	}
+
+	private _onToolComplete: Event<SessionEventPayload<'tool.execution_complete'>> | undefined;
+	get onToolComplete(): Event<SessionEventPayload<'tool.execution_complete'>> {
+		return this._onToolComplete ??= this._sdkEvent('tool.execution_complete');
+	}
+
+	private _onIdle: Event<SessionEventPayload<'session.idle'>> | undefined;
+	get onIdle(): Event<SessionEventPayload<'session.idle'>> {
+		return this._onIdle ??= this._sdkEvent('session.idle');
+	}
+
+	private _onSessionStart: Event<SessionEventPayload<'session.start'>> | undefined;
+	get onSessionStart(): Event<SessionEventPayload<'session.start'>> {
+		return this._onSessionStart ??= this._sdkEvent('session.start');
+	}
+
+	private _onSessionResume: Event<SessionEventPayload<'session.resume'>> | undefined;
+	get onSessionResume(): Event<SessionEventPayload<'session.resume'>> {
+		return this._onSessionResume ??= this._sdkEvent('session.resume');
+	}
+
+	private _onSessionError: Event<SessionEventPayload<'session.error'>> | undefined;
+	get onSessionError(): Event<SessionEventPayload<'session.error'>> {
+		return this._onSessionError ??= this._sdkEvent('session.error');
+	}
+
+	private _onSessionInfo: Event<SessionEventPayload<'session.info'>> | undefined;
+	get onSessionInfo(): Event<SessionEventPayload<'session.info'>> {
+		return this._onSessionInfo ??= this._sdkEvent('session.info');
+	}
+
+	private _onSessionModelChange: Event<SessionEventPayload<'session.model_change'>> | undefined;
+	get onSessionModelChange(): Event<SessionEventPayload<'session.model_change'>> {
+		return this._onSessionModelChange ??= this._sdkEvent('session.model_change');
+	}
+
+	private _onSessionHandoff: Event<SessionEventPayload<'session.handoff'>> | undefined;
+	get onSessionHandoff(): Event<SessionEventPayload<'session.handoff'>> {
+		return this._onSessionHandoff ??= this._sdkEvent('session.handoff');
+	}
+
+	private _onSessionTruncation: Event<SessionEventPayload<'session.truncation'>> | undefined;
+	get onSessionTruncation(): Event<SessionEventPayload<'session.truncation'>> {
+		return this._onSessionTruncation ??= this._sdkEvent('session.truncation');
+	}
+
+	private _onSessionSnapshotRewind: Event<SessionEventPayload<'session.snapshot_rewind'>> | undefined;
+	get onSessionSnapshotRewind(): Event<SessionEventPayload<'session.snapshot_rewind'>> {
+		return this._onSessionSnapshotRewind ??= this._sdkEvent('session.snapshot_rewind');
+	}
+
+	private _onSessionShutdown: Event<SessionEventPayload<'session.shutdown'>> | undefined;
+	get onSessionShutdown(): Event<SessionEventPayload<'session.shutdown'>> {
+		return this._onSessionShutdown ??= this._sdkEvent('session.shutdown');
+	}
+
+	private _onSessionUsageInfo: Event<SessionEventPayload<'session.usage_info'>> | undefined;
+	get onSessionUsageInfo(): Event<SessionEventPayload<'session.usage_info'>> {
+		return this._onSessionUsageInfo ??= this._sdkEvent('session.usage_info');
+	}
+
+	private _onSessionCompactionStart: Event<SessionEventPayload<'session.compaction_start'>> | undefined;
+	get onSessionCompactionStart(): Event<SessionEventPayload<'session.compaction_start'>> {
+		return this._onSessionCompactionStart ??= this._sdkEvent('session.compaction_start');
+	}
+
+	private _onSessionCompactionComplete: Event<SessionEventPayload<'session.compaction_complete'>> | undefined;
+	get onSessionCompactionComplete(): Event<SessionEventPayload<'session.compaction_complete'>> {
+		return this._onSessionCompactionComplete ??= this._sdkEvent('session.compaction_complete');
+	}
+
+	private _onUserMessage: Event<SessionEventPayload<'user.message'>> | undefined;
+	get onUserMessage(): Event<SessionEventPayload<'user.message'>> {
+		return this._onUserMessage ??= this._sdkEvent('user.message');
+	}
+
+	private _onPendingMessagesModified: Event<SessionEventPayload<'pending_messages.modified'>> | undefined;
+	get onPendingMessagesModified(): Event<SessionEventPayload<'pending_messages.modified'>> {
+		return this._onPendingMessagesModified ??= this._sdkEvent('pending_messages.modified');
+	}
+
+	private _onTurnStart: Event<SessionEventPayload<'assistant.turn_start'>> | undefined;
+	get onTurnStart(): Event<SessionEventPayload<'assistant.turn_start'>> {
+		return this._onTurnStart ??= this._sdkEvent('assistant.turn_start');
+	}
+
+	private _onIntent: Event<SessionEventPayload<'assistant.intent'>> | undefined;
+	get onIntent(): Event<SessionEventPayload<'assistant.intent'>> {
+		return this._onIntent ??= this._sdkEvent('assistant.intent');
+	}
+
+	private _onReasoning: Event<SessionEventPayload<'assistant.reasoning'>> | undefined;
+	get onReasoning(): Event<SessionEventPayload<'assistant.reasoning'>> {
+		return this._onReasoning ??= this._sdkEvent('assistant.reasoning');
+	}
+
+	private _onReasoningDelta: Event<SessionEventPayload<'assistant.reasoning_delta'>> | undefined;
+	get onReasoningDelta(): Event<SessionEventPayload<'assistant.reasoning_delta'>> {
+		return this._onReasoningDelta ??= this._sdkEvent('assistant.reasoning_delta');
+	}
+
+	private _onTurnEnd: Event<SessionEventPayload<'assistant.turn_end'>> | undefined;
+	get onTurnEnd(): Event<SessionEventPayload<'assistant.turn_end'>> {
+		return this._onTurnEnd ??= this._sdkEvent('assistant.turn_end');
+	}
+
+	private _onUsage: Event<SessionEventPayload<'assistant.usage'>> | undefined;
+	get onUsage(): Event<SessionEventPayload<'assistant.usage'>> {
+		return this._onUsage ??= this._sdkEvent('assistant.usage');
+	}
+
+	private _onAbort: Event<SessionEventPayload<'abort'>> | undefined;
+	get onAbort(): Event<SessionEventPayload<'abort'>> {
+		return this._onAbort ??= this._sdkEvent('abort');
+	}
+
+	private _onToolUserRequested: Event<SessionEventPayload<'tool.user_requested'>> | undefined;
+	get onToolUserRequested(): Event<SessionEventPayload<'tool.user_requested'>> {
+		return this._onToolUserRequested ??= this._sdkEvent('tool.user_requested');
+	}
+
+	private _onToolPartialResult: Event<SessionEventPayload<'tool.execution_partial_result'>> | undefined;
+	get onToolPartialResult(): Event<SessionEventPayload<'tool.execution_partial_result'>> {
+		return this._onToolPartialResult ??= this._sdkEvent('tool.execution_partial_result');
+	}
+
+	private _onToolProgress: Event<SessionEventPayload<'tool.execution_progress'>> | undefined;
+	get onToolProgress(): Event<SessionEventPayload<'tool.execution_progress'>> {
+		return this._onToolProgress ??= this._sdkEvent('tool.execution_progress');
+	}
+
+	private _onSkillInvoked: Event<SessionEventPayload<'skill.invoked'>> | undefined;
+	get onSkillInvoked(): Event<SessionEventPayload<'skill.invoked'>> {
+		return this._onSkillInvoked ??= this._sdkEvent('skill.invoked');
+	}
+
+	private _onSubagentStarted: Event<SessionEventPayload<'subagent.started'>> | undefined;
+	get onSubagentStarted(): Event<SessionEventPayload<'subagent.started'>> {
+		return this._onSubagentStarted ??= this._sdkEvent('subagent.started');
+	}
+
+	private _onSubagentCompleted: Event<SessionEventPayload<'subagent.completed'>> | undefined;
+	get onSubagentCompleted(): Event<SessionEventPayload<'subagent.completed'>> {
+		return this._onSubagentCompleted ??= this._sdkEvent('subagent.completed');
+	}
+
+	private _onSubagentFailed: Event<SessionEventPayload<'subagent.failed'>> | undefined;
+	get onSubagentFailed(): Event<SessionEventPayload<'subagent.failed'>> {
+		return this._onSubagentFailed ??= this._sdkEvent('subagent.failed');
+	}
+
+	private _onSubagentSelected: Event<SessionEventPayload<'subagent.selected'>> | undefined;
+	get onSubagentSelected(): Event<SessionEventPayload<'subagent.selected'>> {
+		return this._onSubagentSelected ??= this._sdkEvent('subagent.selected');
+	}
+
+	private _onHookStart: Event<SessionEventPayload<'hook.start'>> | undefined;
+	get onHookStart(): Event<SessionEventPayload<'hook.start'>> {
+		return this._onHookStart ??= this._sdkEvent('hook.start');
+	}
+
+	private _onHookEnd: Event<SessionEventPayload<'hook.end'>> | undefined;
+	get onHookEnd(): Event<SessionEventPayload<'hook.end'>> {
+		return this._onHookEnd ??= this._sdkEvent('hook.end');
+	}
+
+	private _onSystemMessage: Event<SessionEventPayload<'system.message'>> | undefined;
+	get onSystemMessage(): Event<SessionEventPayload<'system.message'>> {
+		return this._onSystemMessage ??= this._sdkEvent('system.message');
+	}
+
+	private _sdkEvent<K extends SessionEventType>(eventType: K): Event<SessionEventPayload<K>> {
+		const emitter = this._register(new Emitter<SessionEventPayload<K>>());
+		const unsubscribe = this.session.on(eventType, (data: SessionEventPayload<K>) => emitter.fire(data));
+		this._register(toDisposable(unsubscribe));
+		return emitter.event;
+	}
+}
diff --git a/src/vs/platform/agentHost/node/copilot/copilotToolDisplay.ts b/src/vs/platform/agentHost/node/copilot/copilotToolDisplay.ts
new file mode 100644
index 00000000000..397c4b0fb71
--- /dev/null
+++ b/src/vs/platform/agentHost/node/copilot/copilotToolDisplay.ts
@@ -0,0 +1,316 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from '../../../../nls.js';
+
+// =============================================================================
+// Copilot CLI built-in tool interfaces
+//
+// The Copilot CLI (via @github/copilot) exposes these built-in tools. Tool names
+// and parameter shapes are not typed in the SDK -- they come from the CLI server
+// as plain strings. These interfaces are derived from observing the CLI's actual
+// tool events and the ShellConfig class in @github/copilot.
+//
+// Shell tool names follow a pattern per ShellConfig:
+//   shellToolName, readShellToolName, writeShellToolName,
+//   stopShellToolName, listShellsToolName
+// For bash: bash, read_bash, write_bash, bash_shutdown, list_bash
+// For powershell: powershell, read_powershell, write_powershell, list_powershell
+// =============================================================================
+
+/**
+ * Known Copilot CLI tool names. These are the `toolName` values that appear
+ * in `tool.execution_start` events from the SDK.
+ */
+const enum CopilotToolName {
+	Bash = 'bash',
+	ReadBash = 'read_bash',
+	WriteBash = 'write_bash',
+	BashShutdown = 'bash_shutdown',
+	ListBash = 'list_bash',
+
+	PowerShell = 'powershell',
+	ReadPowerShell = 'read_powershell',
+	WritePowerShell = 'write_powershell',
+	ListPowerShell = 'list_powershell',
+
+	View = 'view',
+	Edit = 'edit',
+	Write = 'write',
+	Grep = 'grep',
+	Glob = 'glob',
+	Patch = 'patch',
+	WebSearch = 'web_search',
+	AskUser = 'ask_user',
+	ReportIntent = 'report_intent',
+}
+
+/** Parameters for the `bash` / `powershell` shell tools. */
+interface ICopilotShellToolArgs {
+	command: string;
+	timeout?: number;
+}
+
+/** Parameters for file tools (`view`, `edit`, `write`). */
+interface ICopilotFileToolArgs {
+	path: string;
+}
+
+/** Parameters for the `grep` tool. */
+interface ICopilotGrepToolArgs {
+	pattern: string;
+	path?: string;
+	include?: string;
+}
+
+/** Parameters for the `glob` tool. */
+interface ICopilotGlobToolArgs {
+	pattern: string;
+	path?: string;
+}
+
+/** Set of tool names that perform file edits. */
+const EDIT_TOOL_NAMES: ReadonlySet<string> = new Set([
+	CopilotToolName.Edit,
+	CopilotToolName.Write,
+	CopilotToolName.Patch,
+]);
+
+/**
+ * Returns true if the tool modifies files on disk.
+ */
+export function isEditTool(toolName: string): boolean {
+	return EDIT_TOOL_NAMES.has(toolName);
+}
+
+/**
+ * Extracts the target file path from an edit tool's parameters, if available.
+ */
+export function getEditFilePath(parameters: unknown): string | undefined {
+	if (typeof parameters === 'string') {
+		try {
+			parameters = JSON.parse(parameters);
+		} catch {
+			return undefined;
+		}
+	}
+
+	const args = parameters as ICopilotFileToolArgs | undefined;
+	return args?.path;
+}
+
+/** Set of tool names that execute shell commands (bash or powershell). */
+const SHELL_TOOL_NAMES: ReadonlySet<string> = new Set([
+	CopilotToolName.Bash,
+	CopilotToolName.PowerShell,
+]);
+
+/**
+ * Tools that should not be shown to the user. These are internal tools
+ * used by the CLI for its own purposes (e.g., reporting intent to the model).
+ */
+const HIDDEN_TOOL_NAMES: ReadonlySet<string> = new Set([
+	CopilotToolName.ReportIntent,
+]);
+
+/**
+ * Returns true if the tool should be hidden from the UI.
+ */
+export function isHiddenTool(toolName: string): boolean {
+	return HIDDEN_TOOL_NAMES.has(toolName);
+}
+
+// =============================================================================
+// Display helpers
+//
+// These functions translate Copilot CLI tool names and arguments into
+// human-readable display strings. This logic lives here -- in the agent-host
+// process -- so the IPC protocol stays agent-agnostic; the renderer never needs
+// to know about specific tool names.
+// =============================================================================
+
+function truncate(text: string, maxLength: number): string {
+	return text.length > maxLength ? text.substring(0, maxLength - 3) + '...' : text;
+}
+
+export function getToolDisplayName(toolName: string): string {
+	switch (toolName) {
+		case CopilotToolName.Bash: return localize('toolName.bash', "Bash");
+		case CopilotToolName.PowerShell: return localize('toolName.powershell', "PowerShell");
+		case CopilotToolName.ReadBash:
+		case CopilotToolName.ReadPowerShell: return localize('toolName.readShell', "Read Shell Output");
+		case CopilotToolName.WriteBash:
+		case CopilotToolName.WritePowerShell: return localize('toolName.writeShell', "Write Shell Input");
+		case CopilotToolName.BashShutdown: return localize('toolName.bashShutdown', "Stop Shell");
+		case CopilotToolName.ListBash:
+		case CopilotToolName.ListPowerShell: return localize('toolName.listShells', "List Shells");
+		case CopilotToolName.View: return localize('toolName.view', "View File");
+		case CopilotToolName.Edit: return localize('toolName.edit', "Edit File");
+		case CopilotToolName.Write: return localize('toolName.write', "Write File");
+		case CopilotToolName.Grep: return localize('toolName.grep', "Search");
+		case CopilotToolName.Glob: return localize('toolName.glob', "Find Files");
+		case CopilotToolName.Patch: return localize('toolName.patch', "Patch");
+		case CopilotToolName.WebSearch: return localize('toolName.webSearch', "Web Search");
+		case CopilotToolName.AskUser: return localize('toolName.askUser', "Ask User");
+		default: return toolName;
+	}
+}
+
+export function getInvocationMessage(toolName: string, displayName: string, parameters: Record<string, unknown> | undefined): string {
+	if (SHELL_TOOL_NAMES.has(toolName)) {
+		const args = parameters as ICopilotShellToolArgs | undefined;
+		if (args?.command) {
+			const firstLine = args.command.split('\n')[0];
+			return localize('toolInvoke.shellCmd', "Running `{0}`", truncate(firstLine, 80));
+		}
+		return localize('toolInvoke.shell', "Running {0} command", displayName);
+	}
+
+	switch (toolName) {
+		case CopilotToolName.View: {
+			const args = parameters as ICopilotFileToolArgs | undefined;
+			if (args?.path) {
+				return localize('toolInvoke.viewFile', "Reading {0}", args.path);
+			}
+			return localize('toolInvoke.view', "Reading file");
+		}
+		case CopilotToolName.Edit: {
+			const args = parameters as ICopilotFileToolArgs | undefined;
+			if (args?.path) {
+				return localize('toolInvoke.editFile', "Editing {0}", args.path);
+			}
+			return localize('toolInvoke.edit', "Editing file");
+		}
+		case CopilotToolName.Write: {
+			const args = parameters as ICopilotFileToolArgs | undefined;
+			if (args?.path) {
+				return localize('toolInvoke.writeFile', "Writing to {0}", args.path);
+			}
+			return localize('toolInvoke.write', "Writing file");
+		}
+		case CopilotToolName.Grep: {
+			const args = parameters as ICopilotGrepToolArgs | undefined;
+			if (args?.pattern) {
+				return localize('toolInvoke.grepPattern', "Searching for `{0}`", truncate(args.pattern, 80));
+			}
+			return localize('toolInvoke.grep', "Searching files");
+		}
+		case CopilotToolName.Glob: {
+			const args = parameters as ICopilotGlobToolArgs | undefined;
+			if (args?.pattern) {
+				return localize('toolInvoke.globPattern', "Finding files matching `{0}`", truncate(args.pattern, 80));
+			}
+			return localize('toolInvoke.glob', "Finding files");
+		}
+		default:
+			return localize('toolInvoke.generic', "Using \"{0}\"", displayName);
+	}
+}
+
+export function getPastTenseMessage(toolName: string, displayName: string, parameters: Record<string, unknown> | undefined, success: boolean): string {
+	if (!success) {
+		return localize('toolComplete.failed', "\"{0}\" failed", displayName);
+	}
+
+	if (SHELL_TOOL_NAMES.has(toolName)) {
+		const args = parameters as ICopilotShellToolArgs | undefined;
+		if (args?.command) {
+			const firstLine = args.command.split('\n')[0];
+			return localize('toolComplete.shellCmd', "Ran `{0}`", truncate(firstLine, 80));
+		}
+		return localize('toolComplete.shell', "Ran {0} command", displayName);
+	}
+
+	switch (toolName) {
+		case CopilotToolName.View: {
+			const args = parameters as ICopilotFileToolArgs | undefined;
+			if (args?.path) {
+				return localize('toolComplete.viewFile', "Read {0}", args.path);
+			}
+			return localize('toolComplete.view', "Read file");
+		}
+		case CopilotToolName.Edit: {
+			const args = parameters as ICopilotFileToolArgs | undefined;
+			if (args?.path) {
+				return localize('toolComplete.editFile', "Edited {0}", args.path);
+			}
+			return localize('toolComplete.edit', "Edited file");
+		}
+		case CopilotToolName.Write: {
+			const args = parameters as ICopilotFileToolArgs | undefined;
+			if (args?.path) {
+				return localize('toolComplete.writeFile', "Wrote to {0}", args.path);
+			}
+			return localize('toolComplete.write', "Wrote file");
+		}
+		case CopilotToolName.Grep: {
+			const args = parameters as ICopilotGrepToolArgs | undefined;
+			if (args?.pattern) {
+				return localize('toolComplete.grepPattern', "Searched for `{0}`", truncate(args.pattern, 80));
+			}
+			return localize('toolComplete.grep', "Searched files");
+		}
+		case CopilotToolName.Glob: {
+			const args = parameters as ICopilotGlobToolArgs | undefined;
+			if (args?.pattern) {
+				return localize('toolComplete.globPattern', "Found files matching `{0}`", truncate(args.pattern, 80));
+			}
+			return localize('toolComplete.glob', "Found files");
+		}
+		default:
+			return localize('toolComplete.generic', "Used \"{0}\"", displayName);
+	}
+}
+
+export function getToolInputString(toolName: string, parameters: Record<string, unknown> | undefined, rawArguments: string | undefined): string | undefined {
+	if (!parameters && !rawArguments) {
+		return undefined;
+	}
+
+	if (SHELL_TOOL_NAMES.has(toolName)) {
+		const args = parameters as ICopilotShellToolArgs | undefined;
+		return args?.command ?? rawArguments;
+	}
+
+	switch (toolName) {
+		case CopilotToolName.Grep: {
+			const args = parameters as ICopilotGrepToolArgs | undefined;
+			return args?.pattern ?? rawArguments;
+		}
+		default:
+			// For other tools, show the formatted JSON arguments
+			if (parameters) {
+				try {
+					return JSON.stringify(parameters, null, 2);
+				} catch {
+					return rawArguments;
+				}
+			}
+			return rawArguments;
+	}
+}
+
+/**
+ * Returns a rendering hint for the given tool. Currently only 'terminal' is
+ * supported, which tells the renderer to display the tool as a terminal command
+ * block.
+ */
+export function getToolKind(toolName: string): 'terminal' | undefined {
+	if (SHELL_TOOL_NAMES.has(toolName)) {
+		return 'terminal';
+	}
+	return undefined;
+}
+
+/**
+ * Returns the shell language identifier for syntax highlighting.
+ * Used when creating terminal tool-specific data for the renderer.
+ */
+export function getShellLanguage(toolName: string): string {
+	switch (toolName) {
+		case CopilotToolName.PowerShell: return 'powershell';
+		default: return 'shellscript';
+	}
+}
diff --git a/src/vs/platform/agentHost/node/copilot/fileEditTracker.ts b/src/vs/platform/agentHost/node/copilot/fileEditTracker.ts
new file mode 100644
index 00000000000..8ee6b5a0893
--- /dev/null
+++ b/src/vs/platform/agentHost/node/copilot/fileEditTracker.ts
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../files/common/files.js';
+import { ILogService } from '../../../log/common/log.js';
+import { ISessionDataService } from '../../common/sessionDataService.js';
+import { ToolResultContentType, type IToolResultFileEditContent } from '../../common/state/sessionState.js';
+
+/**
+ * Tracks file edits made by tools in a session by snapshotting file content
+ * before and after each edit tool invocation.
+ */
+export class FileEditTracker {
+
+	/**
+	 * Pending edits keyed by file path. The `onPreToolUse` hook stores
+	 * entries here; `completeEdit` pops them when the tool finishes.
+	 */
+	private readonly _pendingEdits = new Map<string, { editKey: string; beforeUri: URI; snapshotDone: Promise<void> }>();
+
+	/**
+	 * Completed edits keyed by file path. The `onPostToolUse` hook stores
+	 * entries here; `takeCompletedEdit` retrieves them synchronously from
+	 * the `onToolComplete` handler.
+	 */
+	private readonly _completedEdits = new Map<string, IToolResultFileEditContent>();
+
+	constructor(
+		private readonly _sessionId: string,
+		private readonly _sessionDataService: ISessionDataService,
+		private readonly _fileService: IFileService,
+		private readonly _logService: ILogService,
+	) { }
+
+	/**
+	 * Call from the `onPreToolUse` hook before an edit tool runs.
+	 * Snapshots the file's current content as the "before" state.
+	 * The hook blocks the SDK until this returns, ensuring the snapshot
+	 * captures pre-edit content.
+	 *
+	 * @param filePath - Absolute path of the file being edited.
+	 */
+	async trackEditStart(filePath: string): Promise<void> {
+		const editKey = generateEditKey();
+		const sessionDataDir = this._sessionDataService.getSessionDataDirById(this._sessionId);
+		const beforeUri = URI.joinPath(sessionDataDir, 'file-edits', editKey, 'before');
+
+		const snapshotDone = this._snapshotFile(filePath, beforeUri);
+		this._pendingEdits.set(filePath, { editKey, beforeUri, snapshotDone });
+		await snapshotDone;
+	}
+
+	/**
+	 * Call from the `onPostToolUse` hook after an edit tool finishes.
+	 * Stores the result for later synchronous retrieval via {@link takeCompletedEdit}.
+	 * The `beforeURI` points to the stored snapshot; the `afterURI` is
+	 * the real file path (the tool already modified it on disk).
+	 *
+	 * @param filePath - Absolute path of the file that was edited.
+	 */
+	async completeEdit(filePath: string): Promise<void> {
+		const pending = this._pendingEdits.get(filePath);
+		if (!pending) {
+			return;
+		}
+		this._pendingEdits.delete(filePath);
+		await pending.snapshotDone;
+
+		// Snapshot the after-content into session data so it remains
+		// stable even if the file is modified again later.
+		const sessionDataDir = this._sessionDataService.getSessionDataDirById(this._sessionId);
+		const afterUri = URI.joinPath(sessionDataDir, 'file-edits', pending.editKey, 'after');
+		await this._snapshotFile(filePath, afterUri);
+
+		this._completedEdits.set(filePath, {
+			type: ToolResultContentType.FileEdit,
+			beforeURI: pending.beforeUri.toString(),
+			afterURI: afterUri.toString(),
+		});
+	}
+
+	/**
+	 * Synchronously retrieves and removes a completed edit for the given
+	 * file path. Call from the `onToolComplete` handler to include the
+	 * edit in the tool result without async work.
+	 */
+	takeCompletedEdit(filePath: string): IToolResultFileEditContent | undefined {
+		const edit = this._completedEdits.get(filePath);
+		if (edit) {
+			this._completedEdits.delete(filePath);
+		}
+		return edit;
+	}
+
+	private async _snapshotFile(filePath: string, targetUri: URI): Promise<void> {
+		try {
+			const content = await this._fileService.readFile(URI.file(filePath));
+			await this._fileService.writeFile(targetUri, content.value);
+		} catch (err) {
+			this._logService.trace(`[FileEditTracker] Could not read file for snapshot: ${filePath}`, err);
+			await this._fileService.writeFile(targetUri, VSBuffer.fromString('')).catch(() => { });
+		}
+	}
+}
+
+let _editKeyCounter = 0;
+function generateEditKey(): string {
+	return `${Date.now()}-${_editKeyCounter++}`;
+}
diff --git a/src/vs/platform/agentHost/node/nodeAgentHostStarter.ts b/src/vs/platform/agentHost/node/nodeAgentHostStarter.ts
new file mode 100644
index 00000000000..fec30ea5754
--- /dev/null
+++ b/src/vs/platform/agentHost/node/nodeAgentHostStarter.ts
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { FileAccess, Schemas } from '../../../base/common/network.js';
+import { Client, IIPCOptions } from '../../../base/parts/ipc/node/ipc.cp.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../environment/common/environment.js';
+import { parseAgentHostDebugPort } from '../../environment/node/environmentService.js';
+import { IAgentHostConnection, IAgentHostStarter } from '../common/agent.js';
+
+/**
+ * Options for configuring the agent host WebSocket server in the child process.
+ * When set, the agent host exposes a WebSocket endpoint for external clients.
+ */
+export interface IAgentHostWebSocketConfig {
+	/** TCP port to listen on. Mutually exclusive with `socketPath`. */
+	readonly port?: string;
+	/** Unix domain socket / named pipe path. Takes precedence over `port`. */
+	readonly socketPath?: string;
+	/** Host/IP to bind to. */
+	readonly host?: string;
+	/** Connection token value. When set, WebSocket clients must present this token. */
+	readonly connectionToken?: string;
+}
+
+/**
+ * Spawns the agent host as a Node child process (fallback when
+ * Electron utility process is unavailable, e.g. dev/test).
+ */
+export class NodeAgentHostStarter extends Disposable implements IAgentHostStarter {
+
+	private _wsConfig: IAgentHostWebSocketConfig | undefined;
+
+	private readonly _onRequestConnection = this._register(new Emitter<void>());
+	readonly onRequestConnection = this._onRequestConnection.event;
+
+	constructor(
+		@IEnvironmentService private readonly _environmentService: INativeEnvironmentService
+	) {
+		super();
+	}
+
+	/**
+	 * Configures the child process to also start a WebSocket server.
+	 * Must be called before {@link start}. Triggers eager process start
+	 * via {@link onRequestConnection}.
+	 */
+	setWebSocketConfig(config: IAgentHostWebSocketConfig): void {
+		this._wsConfig = config;
+		// Signal the process manager to start immediately rather than
+		// waiting for a renderer window to connect.
+		this._onRequestConnection.fire();
+	}
+
+	start(): IAgentHostConnection {
+		const env: Record<string, string> = {
+			VSCODE_ESM_ENTRYPOINT: 'vs/platform/agentHost/node/agentHostMain',
+			VSCODE_PIPE_LOGGING: 'true',
+			VSCODE_VERBOSE_LOGGING: 'true',
+		};
+
+		// Forward WebSocket server configuration to the child process via env vars
+		if (this._wsConfig) {
+			if (this._wsConfig.port) {
+				env['VSCODE_AGENT_HOST_PORT'] = this._wsConfig.port;
+			}
+			if (this._wsConfig.socketPath) {
+				env['VSCODE_AGENT_HOST_SOCKET_PATH'] = this._wsConfig.socketPath;
+			}
+			if (this._wsConfig.host) {
+				env['VSCODE_AGENT_HOST_HOST'] = this._wsConfig.host;
+			}
+			if (this._wsConfig.connectionToken) {
+				env['VSCODE_AGENT_HOST_CONNECTION_TOKEN'] = this._wsConfig.connectionToken;
+			}
+		}
+
+		const opts: IIPCOptions = {
+			serverName: 'Agent Host',
+			args: ['--type=agentHost', '--logsPath', this._environmentService.logsHome.with({ scheme: Schemas.file }).fsPath],
+			env,
+		};
+
+		const agentHostDebug = parseAgentHostDebugPort(this._environmentService.args, this._environmentService.isBuilt);
+		if (agentHostDebug) {
+			if (agentHostDebug.break && agentHostDebug.port) {
+				opts.debugBrk = agentHostDebug.port;
+			} else if (!agentHostDebug.break && agentHostDebug.port) {
+				opts.debug = agentHostDebug.port;
+			}
+		}
+
+		const client = new Client(FileAccess.asFileUri('bootstrap-fork').fsPath, opts);
+
+		const store = new DisposableStore();
+		store.add(client);
+
+		return {
+			client,
+			store,
+			onDidProcessExit: client.onDidProcessExit
+		};
+	}
+}
diff --git a/src/vs/platform/agentHost/node/protocolServerHandler.ts b/src/vs/platform/agentHost/node/protocolServerHandler.ts
new file mode 100644
index 00000000000..50442444a36
--- /dev/null
+++ b/src/vs/platform/agentHost/node/protocolServerHandler.ts
@@ -0,0 +1,463 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
+import type { IAgentDescriptor, IAuthenticateParams, IAuthenticateResult, IResourceMetadata } from '../common/agentService.js';
+import type { ICommandMap } from '../common/state/protocol/messages.js';
+import { IActionEnvelope, INotification, isSessionAction, type ISessionAction } from '../common/state/sessionActions.js';
+import { MIN_PROTOCOL_VERSION, PROTOCOL_VERSION } from '../common/state/sessionCapabilities.js';
+import {
+	AHP_SESSION_NOT_FOUND,
+	AHP_UNSUPPORTED_PROTOCOL_VERSION,
+	isJsonRpcNotification,
+	isJsonRpcRequest,
+	JSON_RPC_INTERNAL_ERROR,
+	ProtocolError,
+	type IAhpServerNotification,
+	type IBrowseDirectoryResult,
+	type ICreateSessionParams,
+	type IFetchContentResult,
+	type IInitializeParams,
+	type IJsonRpcResponse,
+	type IReconnectParams,
+	type IStateSnapshot,
+} from '../common/state/sessionProtocol.js';
+import { ROOT_STATE_URI, type ISessionSummary, type URI } from '../common/state/sessionState.js';
+import type { IProtocolServer, IProtocolTransport } from '../common/state/sessionTransport.js';
+import { SessionStateManager } from './sessionStateManager.js';
+
+/** Default capacity of the server-side action replay buffer. */
+const REPLAY_BUFFER_CAPACITY = 1000;
+
+/** Build a JSON-RPC success response suitable for transport.send(). */
+function jsonRpcSuccess(id: number, result: unknown): IJsonRpcResponse {
+	return { jsonrpc: '2.0', id, result };
+}
+
+/** Build a JSON-RPC error response suitable for transport.send(). */
+function jsonRpcError(id: number, code: number, message: string, data?: unknown): IJsonRpcResponse {
+	return { jsonrpc: '2.0', id, error: { code, message, ...(data !== undefined ? { data } : {}) } };
+}
+
+/** Build a JSON-RPC error response from an unknown thrown value, preserving {@link ProtocolError} fields. */
+function jsonRpcErrorFrom(id: number, err: unknown): IJsonRpcResponse {
+	if (err instanceof ProtocolError) {
+		return jsonRpcError(id, err.code, err.message, err.data);
+	}
+	const message = err instanceof Error ? (err.stack ?? err.message) : String(err);
+	return jsonRpcError(id, JSON_RPC_INTERNAL_ERROR, message);
+}
+
+/**
+ * Methods handled by the request dispatcher. Excludes `initialize` and
+ * `reconnect` which are handled during the handshake phase.
+ */
+type RequestMethod = Exclude<keyof ICommandMap, 'initialize' | 'reconnect' | 'authenticate'>;
+
+/**
+ * Typed handler map: each key is a request method, each value is a handler
+ * that receives the correctly-typed params and must return the correctly-typed
+ * result. The compiler will error if a handler returns the wrong shape.
+ */
+type RequestHandlerMap = {
+	[M in RequestMethod]: (client: IConnectedClient, params: ICommandMap[M]['params']) => Promise<ICommandMap[M]['result']>;
+};
+
+/**
+ * Represents a connected protocol client with its subscription state.
+ */
+interface IConnectedClient {
+	readonly clientId: string;
+	readonly protocolVersion: number;
+	readonly transport: IProtocolTransport;
+	readonly subscriptions: Set<string>;
+	readonly disposables: DisposableStore;
+}
+
+/**
+ * Server-side handler that manages protocol connections, routes JSON-RPC
+ * messages to the state manager, and broadcasts actions/notifications
+ * to subscribed clients.
+ */
+export class ProtocolServerHandler extends Disposable {
+
+	private readonly _clients = new Map<string, IConnectedClient>();
+	private readonly _replayBuffer: IActionEnvelope[] = [];
+
+	private readonly _onDidChangeConnectionCount = this._register(new Emitter<number>());
+
+	/** Fires with the current client count whenever a client connects or disconnects. */
+	readonly onDidChangeConnectionCount = this._onDidChangeConnectionCount.event;
+
+	constructor(
+		private readonly _stateManager: SessionStateManager,
+		private readonly _server: IProtocolServer,
+		private readonly _sideEffectHandler: IProtocolSideEffectHandler,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		this._register(this._server.onConnection(transport => {
+			this._handleNewConnection(transport);
+		}));
+
+		this._register(this._stateManager.onDidEmitEnvelope(envelope => {
+			this._replayBuffer.push(envelope);
+			if (this._replayBuffer.length > REPLAY_BUFFER_CAPACITY) {
+				this._replayBuffer.shift();
+			}
+			this._broadcastAction(envelope);
+		}));
+
+		this._register(this._stateManager.onDidEmitNotification(notification => {
+			this._broadcastNotification(notification);
+		}));
+	}
+
+	// ---- Connection handling -------------------------------------------------
+
+	private _handleNewConnection(transport: IProtocolTransport): void {
+		const disposables = new DisposableStore();
+		let client: IConnectedClient | undefined;
+
+		disposables.add(transport.onMessage(msg => {
+			if (isJsonRpcRequest(msg)) {
+				this._logService.trace(`[ProtocolServer] request: method=${msg.method} id=${msg.id}`);
+
+				// Handle initialize/reconnect as requests that set up the client
+				if (!client && msg.method === 'initialize') {
+					try {
+						const result = this._handleInitialize(msg.params, transport, disposables);
+						client = result.client;
+						transport.send(jsonRpcSuccess(msg.id, result.response));
+					} catch (err) {
+						transport.send(jsonRpcErrorFrom(msg.id, err));
+					}
+					return;
+				}
+				if (!client && msg.method === 'reconnect') {
+					try {
+						const result = this._handleReconnect(msg.params, transport, disposables);
+						client = result.client;
+						transport.send(jsonRpcSuccess(msg.id, result.response));
+					} catch (err) {
+						transport.send(jsonRpcErrorFrom(msg.id, err));
+					}
+					return;
+				}
+
+				if (!client) {
+					return;
+				}
+				this._handleRequest(client, msg.method, msg.params, msg.id);
+			} else if (isJsonRpcNotification(msg)) {
+				this._logService.trace(`[ProtocolServer] notification: method=${msg.method}`);
+				// Notification — fire-and-forget
+				switch (msg.method) {
+					case 'unsubscribe':
+						if (client) {
+							client.subscriptions.delete(msg.params.resource);
+						}
+						break;
+					case 'dispatchAction':
+						if (client) {
+							this._logService.trace(`[ProtocolServer] dispatchAction: ${JSON.stringify(msg.params.action.type)}`);
+							const origin = { clientId: client.clientId, clientSeq: msg.params.clientSeq };
+							const action = msg.params.action as ISessionAction;
+							this._stateManager.dispatchClientAction(action, origin);
+							this._sideEffectHandler.handleAction(action);
+						}
+						break;
+				}
+			}
+			// Responses from the client (if any) are ignored on the server side.
+		}));
+
+		disposables.add(transport.onClose(() => {
+			if (client && this._clients.get(client.clientId) === client) {
+				this._logService.info(`[ProtocolServer] Client disconnected: ${client.clientId}`);
+				this._clients.delete(client.clientId);
+				this._onDidChangeConnectionCount.fire(this._clients.size);
+			}
+			disposables.dispose();
+		}));
+
+		disposables.add(transport);
+	}
+
+	// ---- Handshake handlers ----------------------------------------------------
+
+	private _handleInitialize(
+		params: IInitializeParams,
+		transport: IProtocolTransport,
+		disposables: DisposableStore,
+	): { client: IConnectedClient; response: unknown } {
+		this._logService.info(`[ProtocolServer] Initialize: clientId=${params.clientId}, version=${params.protocolVersion}`);
+
+		if (params.protocolVersion < MIN_PROTOCOL_VERSION) {
+			throw new ProtocolError(
+				AHP_UNSUPPORTED_PROTOCOL_VERSION,
+				`Client protocol version ${params.protocolVersion} is below minimum ${MIN_PROTOCOL_VERSION}`,
+			);
+		}
+
+		const client: IConnectedClient = {
+			clientId: params.clientId,
+			protocolVersion: params.protocolVersion,
+			transport,
+			subscriptions: new Set(),
+			disposables,
+		};
+		this._clients.set(params.clientId, client);
+		this._onDidChangeConnectionCount.fire(this._clients.size);
+
+		const snapshots: IStateSnapshot[] = [];
+		if (params.initialSubscriptions) {
+			for (const uri of params.initialSubscriptions) {
+				const snapshot = this._stateManager.getSnapshot(uri);
+				if (snapshot) {
+					snapshots.push(snapshot);
+					client.subscriptions.add(uri.toString());
+				}
+			}
+		}
+
+		return {
+			client,
+			response: {
+				protocolVersion: PROTOCOL_VERSION,
+				serverSeq: this._stateManager.serverSeq,
+				snapshots,
+				defaultDirectory: this._sideEffectHandler.getDefaultDirectory?.(),
+			},
+		};
+	}
+
+	private _handleReconnect(
+		params: IReconnectParams,
+		transport: IProtocolTransport,
+		disposables: DisposableStore,
+	): { client: IConnectedClient; response: unknown } {
+		this._logService.info(`[ProtocolServer] Reconnect: clientId=${params.clientId}, lastSeenSeq=${params.lastSeenServerSeq}`);
+
+		const client: IConnectedClient = {
+			clientId: params.clientId,
+			protocolVersion: PROTOCOL_VERSION,
+			transport,
+			subscriptions: new Set(),
+			disposables,
+		};
+		this._clients.set(params.clientId, client);
+		this._onDidChangeConnectionCount.fire(this._clients.size);
+
+		const oldestBuffered = this._replayBuffer.length > 0 ? this._replayBuffer[0].serverSeq : this._stateManager.serverSeq;
+		const canReplay = params.lastSeenServerSeq >= oldestBuffered;
+
+		if (canReplay) {
+			const actions: IActionEnvelope[] = [];
+			for (const sub of params.subscriptions) {
+				client.subscriptions.add(sub.toString());
+			}
+			for (const envelope of this._replayBuffer) {
+				if (envelope.serverSeq > params.lastSeenServerSeq) {
+					if (this._isRelevantToClient(client, envelope)) {
+						actions.push(envelope);
+					}
+				}
+			}
+			return { client, response: { type: 'replay', actions } };
+		} else {
+			const snapshots: IStateSnapshot[] = [];
+			for (const sub of params.subscriptions) {
+				const snapshot = this._stateManager.getSnapshot(sub);
+				if (snapshot) {
+					snapshots.push(snapshot);
+					client.subscriptions.add(sub);
+				}
+			}
+			return { client, response: { type: 'snapshot', snapshots } };
+		}
+	}
+
+	// ---- Requests (expect a response) ---------------------------------------
+
+	/**
+	 * Methods handled by the request dispatcher (excludes initialize/reconnect
+	 * which are handled during the handshake phase).
+	 */
+	private readonly _requestHandlers: RequestHandlerMap = {
+		subscribe: async (client, params) => {
+			let snapshot = this._stateManager.getSnapshot(params.resource);
+			if (!snapshot) {
+				// Session may exist on the agent backend but not in the
+				// current state manager (e.g. from a previous server
+				// lifetime). Try to restore it.
+				await this._sideEffectHandler.handleRestoreSession(params.resource);
+				snapshot = this._stateManager.getSnapshot(params.resource);
+			}
+			if (!snapshot) {
+				throw new ProtocolError(AHP_SESSION_NOT_FOUND, `Resource not found: ${params.resource}`);
+			}
+			client.subscriptions.add(params.resource);
+			return { snapshot };
+		},
+		createSession: async (_client, params) => {
+			await this._sideEffectHandler.handleCreateSession(params);
+			return null;
+		},
+		disposeSession: async (_client, params) => {
+			this._sideEffectHandler.handleDisposeSession(params.session);
+			return null;
+		},
+		listSessions: async () => {
+			const items = await this._sideEffectHandler.handleListSessions();
+			return { items };
+		},
+		fetchTurns: async (_client, params) => {
+			const state = this._stateManager.getSessionState(params.session);
+			if (!state) {
+				throw new ProtocolError(AHP_SESSION_NOT_FOUND, `Session not found: ${params.session}`);
+			}
+			const turns = state.turns;
+			const limit = Math.min(params.limit ?? 50, 100);
+
+			let endIndex = turns.length;
+			if (params.before) {
+				const idx = turns.findIndex(t => t.id === params.before);
+				if (idx !== -1) {
+					endIndex = idx;
+				}
+			}
+
+			const startIndex = Math.max(0, endIndex - limit);
+			return {
+				turns: turns.slice(startIndex, endIndex),
+				hasMore: startIndex > 0,
+			};
+		},
+		browseDirectory: async (_client, params) => {
+			return this._sideEffectHandler.handleBrowseDirectory(params.uri);
+		},
+		fetchContent: async (_client, params) => {
+			return this._sideEffectHandler.handleFetchContent(params.uri);
+		},
+	};
+
+	private _handleRequest(client: IConnectedClient, method: string, params: unknown, id: number): void {
+		const handler = this._requestHandlers.hasOwnProperty(method) ? this._requestHandlers[method as RequestMethod] : undefined;
+		if (handler) {
+			(handler as (client: IConnectedClient, params: unknown) => Promise<unknown>)(client, params).then(result => {
+				this._logService.trace(`[ProtocolServer] Request '${method}' id=${id} succeeded`);
+				client.transport.send(jsonRpcSuccess(id, result ?? null));
+			}).catch(err => {
+				this._logService.error(`[ProtocolServer] Request '${method}' failed`, err);
+				client.transport.send(jsonRpcErrorFrom(id, err));
+			});
+			return;
+		}
+
+		// VS Code extension methods (not in the typed protocol maps yet)
+		const extensionResult = this._handleExtensionRequest(method, params);
+		if (extensionResult) {
+			extensionResult.then(result => {
+				client.transport.send(jsonRpcSuccess(id, result ?? null));
+			}).catch(err => {
+				this._logService.error(`[ProtocolServer] Extension request '${method}' failed`, err);
+				client.transport.send(jsonRpcErrorFrom(id, err));
+			});
+			return;
+		}
+
+		client.transport.send(jsonRpcError(id, JSON_RPC_INTERNAL_ERROR, `Unknown method: ${method}`));
+	}
+
+	/**
+	 * Handle VS Code extension methods that are not yet part of the typed
+	 * protocol. Returns a Promise if the method was recognized, undefined
+	 * otherwise.
+	 */
+	private _handleExtensionRequest(method: string, params: unknown): Promise<unknown> | undefined {
+		switch (method) {
+			case 'getResourceMetadata':
+				return Promise.resolve(this._sideEffectHandler.handleGetResourceMetadata());
+			case 'authenticate':
+				return this._sideEffectHandler.handleAuthenticate(params as IAuthenticateParams);
+			case 'refreshModels':
+				return this._sideEffectHandler.handleRefreshModels?.() ?? Promise.resolve(null);
+			case 'listAgents':
+				return Promise.resolve(this._sideEffectHandler.handleListAgents?.() ?? []);
+			case 'shutdown':
+				return this._sideEffectHandler.handleShutdown?.() ?? Promise.resolve(null);
+			default:
+				return undefined;
+		}
+	}
+
+	// ---- Broadcasting -------------------------------------------------------
+
+	private _broadcastAction(envelope: IActionEnvelope): void {
+		this._logService.trace(`[ProtocolServer] Broadcasting action: ${envelope.action.type}`);
+		const msg: IAhpServerNotification<'action'> = { jsonrpc: '2.0', method: 'action', params: envelope };
+		for (const client of this._clients.values()) {
+			if (this._isRelevantToClient(client, envelope)) {
+				client.transport.send(msg);
+			}
+		}
+	}
+
+	private _broadcastNotification(notification: INotification): void {
+		const msg: IAhpServerNotification<'notification'> = { jsonrpc: '2.0', method: 'notification', params: { notification } };
+		for (const client of this._clients.values()) {
+			client.transport.send(msg);
+		}
+	}
+
+	private _isRelevantToClient(client: IConnectedClient, envelope: IActionEnvelope): boolean {
+		const action = envelope.action;
+		if (action.type.startsWith('root/')) {
+			return client.subscriptions.has(ROOT_STATE_URI);
+		}
+		if (isSessionAction(action)) {
+			return client.subscriptions.has(action.session);
+		}
+		return false;
+	}
+
+	override dispose(): void {
+		for (const client of this._clients.values()) {
+			client.disposables.dispose();
+		}
+		this._clients.clear();
+		this._replayBuffer.length = 0;
+		super.dispose();
+	}
+}
+
+/**
+ * Interface for side effects that the protocol server delegates to.
+ * These are operations that involve I/O, agent backends, etc.
+ */
+export interface IProtocolSideEffectHandler {
+	handleAction(action: ISessionAction): void;
+	handleCreateSession(command: ICreateSessionParams): Promise<void>;
+	handleDisposeSession(session: URI): void;
+	handleListSessions(): Promise<ISessionSummary[]>;
+	/** Restore a session from a previous server lifetime into the state manager. */
+	handleRestoreSession(session: URI): Promise<void>;
+	handleGetResourceMetadata(): IResourceMetadata;
+	handleAuthenticate(params: IAuthenticateParams): Promise<IAuthenticateResult>;
+	handleBrowseDirectory(uri: URI): Promise<IBrowseDirectoryResult>;
+	handleFetchContent(uri: URI): Promise<IFetchContentResult>;
+	/** Returns the server's default browsing directory, if available. */
+	getDefaultDirectory?(): URI;
+	/** Refresh models from all providers (VS Code extension method). */
+	handleRefreshModels?(): Promise<void>;
+	/** List agent descriptors (VS Code extension method). */
+	handleListAgents?(): IAgentDescriptor[];
+	/** Shut down all providers (VS Code extension method). */
+	handleShutdown?(): Promise<void>;
+}
diff --git a/src/vs/platform/agentHost/node/sessionDataService.ts b/src/vs/platform/agentHost/node/sessionDataService.ts
new file mode 100644
index 00000000000..5bbcb89dc07
--- /dev/null
+++ b/src/vs/platform/agentHost/node/sessionDataService.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../base/common/uri.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogService } from '../../log/common/log.js';
+import { AgentSession } from '../common/agentService.js';
+import { ISessionDataService } from '../common/sessionDataService.js';
+
+/**
+ * Implementation of {@link ISessionDataService} that stores per-session data
+ * under `{userDataPath}/agentSessionData/{sessionId}/`.
+ */
+export class SessionDataService implements ISessionDataService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _basePath: URI;
+
+	constructor(
+		userDataPath: URI,
+		@IFileService private readonly _fileService: IFileService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		this._basePath = URI.joinPath(userDataPath, 'agentSessionData');
+	}
+
+	getSessionDataDir(session: URI): URI {
+		return this.getSessionDataDirById(AgentSession.id(session));
+	}
+
+	getSessionDataDirById(sessionId: string): URI {
+		const sanitized = sessionId.replace(/[^a-zA-Z0-9_.-]/g, '-');
+		return URI.joinPath(this._basePath, sanitized);
+	}
+
+	async deleteSessionData(session: URI): Promise<void> {
+		const dir = this.getSessionDataDir(session);
+		try {
+			if (await this._fileService.exists(dir)) {
+				await this._fileService.del(dir, { recursive: true });
+				this._logService.trace(`[SessionDataService] Deleted session data: ${dir.toString()}`);
+			}
+		} catch (err) {
+			this._logService.warn(`[SessionDataService] Failed to delete session data: ${dir.toString()}`, err);
+		}
+	}
+
+	async cleanupOrphanedData(knownSessionIds: Set<string>): Promise<void> {
+		try {
+			const exists = await this._fileService.exists(this._basePath);
+			if (!exists) {
+				return;
+			}
+
+			const stat = await this._fileService.resolve(this._basePath);
+			if (!stat.children) {
+				return;
+			}
+
+			const deletions: Promise<void>[] = [];
+			for (const child of stat.children) {
+				if (!child.isDirectory) {
+					continue;
+				}
+				const name = child.name;
+				if (!knownSessionIds.has(name)) {
+					this._logService.trace(`[SessionDataService] Cleaning up orphaned session data: ${name}`);
+					deletions.push(
+						this._fileService.del(child.resource, { recursive: true }).catch(err => {
+							this._logService.warn(`[SessionDataService] Failed to clean up orphaned data: ${name}`, err);
+						})
+					);
+				}
+			}
+
+			await Promise.all(deletions);
+		} catch (err) {
+			this._logService.warn('[SessionDataService] Failed to run orphan cleanup', err);
+		}
+	}
+}
diff --git a/src/vs/platform/agentHost/node/sessionStateManager.ts b/src/vs/platform/agentHost/node/sessionStateManager.ts
new file mode 100644
index 00000000000..531c18dd6bc
--- /dev/null
+++ b/src/vs/platform/agentHost/node/sessionStateManager.ts
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { ILogService } from '../../log/common/log.js';
+import { ActionType, NotificationType, IActionEnvelope, IActionOrigin, INotification, ISessionAction, IRootAction, IStateAction, isRootAction, isSessionAction } from '../common/state/sessionActions.js';
+import type { IStateSnapshot } from '../common/state/sessionProtocol.js';
+import { rootReducer, sessionReducer } from '../common/state/sessionReducers.js';
+import { createRootState, createSessionState, SessionLifecycle, type IRootState, type ISessionState, type ISessionSummary, type ITurn, type URI, ROOT_STATE_URI } from '../common/state/sessionState.js';
+
+/**
+ * Server-side state manager for the sessions process protocol.
+ *
+ * Maintains the authoritative state tree (root + per-session), applies actions
+ * through pure reducers, assigns monotonic sequence numbers, and emits
+ * {@link IActionEnvelope}s for subscribed clients.
+ */
+export class SessionStateManager extends Disposable {
+
+	private _serverSeq = 0;
+
+	private _rootState: IRootState;
+	private readonly _sessionStates = new Map<string, ISessionState>();
+
+	/** Tracks which session URI each active turn belongs to, keyed by turnId. */
+	private readonly _activeTurnToSession = new Map<string, string>();
+
+	private readonly _onDidEmitEnvelope = this._register(new Emitter<IActionEnvelope>());
+	readonly onDidEmitEnvelope: Event<IActionEnvelope> = this._onDidEmitEnvelope.event;
+
+	private readonly _onDidEmitNotification = this._register(new Emitter<INotification>());
+	readonly onDidEmitNotification: Event<INotification> = this._onDidEmitNotification.event;
+
+	constructor(
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+		this._rootState = createRootState();
+	}
+	private readonly _log = (msg: string) => this._logService.warn(`[SessionStateManager] ${msg}`);
+
+	get hasActiveSessions(): boolean {
+		return this._activeTurnToSession.size > 0;
+	}
+
+	// ---- State accessors ----------------------------------------------------
+
+	get rootState(): IRootState {
+		return this._rootState;
+	}
+
+	getSessionState(session: URI): ISessionState | undefined {
+		return this._sessionStates.get(session);
+	}
+
+	get serverSeq(): number {
+		return this._serverSeq;
+	}
+
+	// ---- Snapshots ----------------------------------------------------------
+
+	/**
+	 * Returns a state snapshot for a given resource URI.
+	 * The `fromSeq` in the snapshot is the current serverSeq at snapshot time;
+	 * the client should process subsequent envelopes with serverSeq > fromSeq.
+	 */
+	getSnapshot(resource: URI): IStateSnapshot | undefined {
+		if (resource === ROOT_STATE_URI) {
+			return {
+				resource,
+				state: this._rootState,
+				fromSeq: this._serverSeq,
+			};
+		}
+
+		const sessionState = this._sessionStates.get(resource);
+		if (!sessionState) {
+			return undefined;
+		}
+
+		return {
+			resource,
+			state: sessionState,
+			fromSeq: this._serverSeq,
+		};
+	}
+
+	// ---- Session lifecycle --------------------------------------------------
+
+	/**
+	 * Creates a new session in state with `lifecycle: 'creating'`.
+	 * Returns the initial session state.
+	 */
+	createSession(summary: ISessionSummary): ISessionState {
+		const key = summary.resource;
+		if (this._sessionStates.has(key)) {
+			this._logService.warn(`[SessionStateManager] Session already exists: ${key}`);
+			return this._sessionStates.get(key)!;
+		}
+
+		const state = createSessionState(summary);
+		this._sessionStates.set(key, state);
+
+		this._logService.trace(`[SessionStateManager] Created session: ${key}`);
+
+		this._onDidEmitNotification.fire({
+			type: NotificationType.SessionAdded,
+			summary,
+		});
+
+		return state;
+	}
+
+	/**
+	 * Restores a session from a previous server lifetime into the state manager
+	 * with pre-populated turns. The session is created in `ready` lifecycle
+	 * state since it already exists on the backend.
+	 *
+	 * Unlike {@link createSession}, this does NOT emit a `sessionAdded`
+	 * notification because the session is already known to clients via
+	 * `listSessions`.
+	 */
+	restoreSession(summary: ISessionSummary, turns: ITurn[]): ISessionState {
+		const key = summary.resource;
+		if (this._sessionStates.has(key)) {
+			this._logService.warn(`[SessionStateManager] Session already exists (restore): ${key}`);
+			return this._sessionStates.get(key)!;
+		}
+
+		const state: ISessionState = {
+			...createSessionState(summary),
+			lifecycle: SessionLifecycle.Ready,
+			turns,
+		};
+		this._sessionStates.set(key, state);
+
+		this._logService.trace(`[SessionStateManager] Restored session: ${key} (${turns.length} turns)`);
+
+		return state;
+	}
+
+	/**
+	 * Removes a session from state and emits a sessionRemoved notification.
+	 */
+	removeSession(session: URI): void {
+		const state = this._sessionStates.get(session);
+		if (!state) {
+			return;
+		}
+
+		// Clean up active turn tracking
+		if (state.activeTurn) {
+			this._activeTurnToSession.delete(state.activeTurn.id);
+		}
+
+		this._sessionStates.delete(session);
+		this._logService.trace(`[SessionStateManager] Removed session: ${session}`);
+
+		this._onDidEmitNotification.fire({
+			type: NotificationType.SessionRemoved,
+			session,
+		});
+	}
+
+	// ---- Turn tracking ------------------------------------------------------
+
+	/**
+	 * Registers a mapping from turnId to session URI so that incoming
+	 * provider events (which carry only session URI) can be associated
+	 * with the correct active turn.
+	 */
+	getActiveTurnId(session: URI): string | undefined {
+		const state = this._sessionStates.get(session);
+		return state?.activeTurn?.id;
+	}
+
+	// ---- Action dispatch ----------------------------------------------------
+
+	/**
+	 * Dispatch a server-originated action (from the agent backend).
+	 * The action is applied to state via the reducer and emitted as an
+	 * envelope with no origin (server-produced).
+	 */
+	dispatchServerAction(action: IStateAction): void {
+		this._applyAndEmit(action, undefined);
+	}
+
+	/**
+	 * Dispatch a client-originated action (write-ahead from a renderer).
+	 * The action is applied to state and emitted with the client's origin
+	 * so the originating client can reconcile.
+	 */
+	dispatchClientAction(action: ISessionAction, origin: IActionOrigin): unknown {
+		return this._applyAndEmit(action, origin);
+	}
+
+	// ---- Internal -----------------------------------------------------------
+
+	private _applyAndEmit(action: IStateAction, origin: IActionOrigin | undefined): unknown {
+		let resultingState: unknown = undefined;
+		// Apply to state
+		if (isRootAction(action)) {
+			this._rootState = rootReducer(this._rootState, action as IRootAction, this._log);
+			resultingState = this._rootState;
+		}
+
+		if (isSessionAction(action)) {
+			const sessionAction = action as ISessionAction;
+			const key = sessionAction.session;
+			const state = this._sessionStates.get(key);
+			if (state) {
+				const newState = sessionReducer(state, sessionAction, this._log);
+				this._sessionStates.set(key, newState);
+
+				// Track active turn for turn lifecycle
+				if (sessionAction.type === ActionType.SessionTurnStarted) {
+					this._activeTurnToSession.set(sessionAction.turnId, key);
+					this.dispatchServerAction({ type: ActionType.RootActiveSessionsChanged, activeSessions: this._activeTurnToSession.size });
+				} else if (
+					sessionAction.type === ActionType.SessionTurnComplete ||
+					sessionAction.type === ActionType.SessionTurnCancelled ||
+					sessionAction.type === ActionType.SessionError
+				) {
+					this._activeTurnToSession.delete(sessionAction.turnId);
+					this.dispatchServerAction({ type: ActionType.RootActiveSessionsChanged, activeSessions: this._activeTurnToSession.size });
+				}
+
+				resultingState = newState;
+			} else {
+				this._logService.warn(`[SessionStateManager] Action for unknown session: ${key}, type=${action.type}`);
+			}
+		}
+
+		// Emit envelope
+		const envelope: IActionEnvelope = {
+			action,
+			serverSeq: ++this._serverSeq,
+			origin,
+		};
+
+		this._logService.trace(`[SessionStateManager] Emitting envelope: seq=${envelope.serverSeq}, type=${action.type}${origin ? `, origin=${origin.clientId}:${origin.clientSeq}` : ''}`);
+		this._onDidEmitEnvelope.fire(envelope);
+
+		return resultingState;
+	}
+}
diff --git a/src/vs/platform/agentHost/node/webSocketTransport.ts b/src/vs/platform/agentHost/node/webSocketTransport.ts
new file mode 100644
index 00000000000..450204d5bb8
--- /dev/null
+++ b/src/vs/platform/agentHost/node/webSocketTransport.ts
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// WebSocket transport for the sessions process protocol.
+// Uses JSON serialization with URI revival for cross-process communication.
+
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { connectionTokenQueryName } from '../../../base/common/network.js';
+import { ILogService } from '../../log/common/log.js';
+import { JSON_RPC_PARSE_ERROR, type IAhpServerNotification, type IJsonRpcResponse, type IProtocolMessage } from '../common/state/sessionProtocol.js';
+import type { IProtocolServer, IProtocolTransport } from '../common/state/sessionTransport.js';
+
+/**
+ * Options for creating a {@link WebSocketProtocolServer}.
+ * Provide either `port`+`host` or `socketPath`, not both.
+ */
+export interface IWebSocketServerOptions {
+	/** TCP port to listen on. Ignored when {@link socketPath} is set. */
+	readonly port?: number;
+	/** Host/IP to bind to. Defaults to `'127.0.0.1'`. */
+	readonly host?: string;
+	/** Unix domain socket / Windows named pipe path. Takes precedence over port. */
+	readonly socketPath?: string;
+	/**
+	 * Optional token validator. When provided, WebSocket upgrade requests
+	 * must include a valid token in the `tkn` query parameter.
+	 */
+	readonly connectionTokenValidate?: (token: unknown) => boolean;
+}
+
+// ---- Per-connection transport -----------------------------------------------
+
+/**
+ * Wraps a single WebSocket connection as an {@link IProtocolTransport}.
+ * Messages are serialized as JSON with URI revival.
+ */
+export class WebSocketProtocolTransport extends Disposable implements IProtocolTransport {
+
+	private readonly _onMessage = this._register(new Emitter<IProtocolMessage>());
+	readonly onMessage = this._onMessage.event;
+
+	private readonly _onClose = this._register(new Emitter<void>());
+	readonly onClose = this._onClose.event;
+
+	constructor(
+		private readonly _ws: import('ws').WebSocket,
+		private readonly _WebSocket: typeof import('ws').WebSocket,
+	) {
+		super();
+
+		this._ws.on('message', (data: Buffer | string) => {
+			try {
+				const text = typeof data === 'string' ? data : data.toString('utf-8');
+				const message = JSON.parse(text) as IProtocolMessage;
+				this._onMessage.fire(message);
+			} catch {
+				this.send({ jsonrpc: '2.0', id: null!, error: { code: JSON_RPC_PARSE_ERROR, message: 'Parse error' } });
+			}
+		});
+
+		this._ws.on('close', () => {
+			this._onClose.fire();
+		});
+
+		this._ws.on('error', () => {
+			// Error always precedes close — closing is handled in the close handler.
+			this._onClose.fire();
+		});
+	}
+
+	send(message: IProtocolMessage | IAhpServerNotification | IJsonRpcResponse): void {
+		if (this._ws.readyState === this._WebSocket.OPEN) {
+			this._ws.send(JSON.stringify(message));
+		}
+	}
+
+	override dispose(): void {
+		this._ws.close();
+		super.dispose();
+	}
+}
+
+// ---- Server -----------------------------------------------------------------
+
+/**
+ * WebSocket server that accepts client connections and wraps each one
+ * as an {@link IProtocolTransport}.
+ *
+ * Use the static {@link create} method to construct — it dynamically imports
+ * `ws` and `http`/`url` so the modules are only loaded when needed.
+ */
+export class WebSocketProtocolServer extends Disposable implements IProtocolServer {
+
+	private readonly _wss: import('ws').WebSocketServer;
+	private readonly _httpServer: import('http').Server | undefined;
+	private readonly _WebSocket: typeof import('ws').WebSocket;
+
+	private readonly _onConnection = this._register(new Emitter<IProtocolTransport>());
+	readonly onConnection = this._onConnection.event;
+
+	get address(): string | undefined {
+		const addr = this._wss.address();
+		if (!addr || typeof addr === 'string') {
+			return addr ?? undefined;
+		}
+		return `${addr.address}:${addr.port}`;
+	}
+
+	/**
+	 * Creates a new WebSocket protocol server. Dynamically imports `ws`,
+	 * `http`, and `url` so callers don't pay the cost when unused.
+	 */
+	static async create(
+		options: IWebSocketServerOptions | number,
+		logService: ILogService,
+	): Promise<WebSocketProtocolServer> {
+		const [ws, http, url] = await Promise.all([
+			import('ws'),
+			import('http'),
+			import('url'),
+		]);
+		return new WebSocketProtocolServer(options, logService, ws, http, url);
+	}
+
+	private constructor(
+		options: IWebSocketServerOptions | number,
+		private readonly _logService: ILogService,
+		ws: typeof import('ws'),
+		http: typeof import('http'),
+		url: typeof import('url'),
+	) {
+		super();
+
+		this._WebSocket = ws.WebSocket;
+
+		// Backwards compat: accept a plain port number
+		const opts: IWebSocketServerOptions = typeof options === 'number' ? { port: options } : options;
+		const host = opts.host ?? '127.0.0.1';
+
+		const verifyClient = opts.connectionTokenValidate
+			? (info: { req: import('http').IncomingMessage }, cb: (res: boolean, code?: number, message?: string) => void) => {
+				const parsedUrl = url.parse(info.req.url ?? '', true);
+				const token = parsedUrl.query[connectionTokenQueryName];
+				if (!opts.connectionTokenValidate!(token)) {
+					this._logService.warn('[WebSocketProtocol] Connection rejected: invalid connection token');
+					cb(false, 403, 'Forbidden');
+					return;
+				}
+				cb(true);
+			}
+			: undefined;
+
+		if (opts.socketPath) {
+			// For socket paths, create an HTTP server listening on the path
+			// and attach the WebSocket server to it.
+			this._httpServer = http.createServer();
+			this._wss = new ws.WebSocketServer({ server: this._httpServer, verifyClient });
+			this._httpServer.listen(opts.socketPath, () => {
+				this._logService.info(`[WebSocketProtocol] Server listening on socket ${opts.socketPath}`);
+			});
+		} else {
+			this._wss = new ws.WebSocketServer({ port: opts.port, host, verifyClient });
+			this._logService.info(`[WebSocketProtocol] Server listening on ${host}:${opts.port}`);
+		}
+
+		this._wss.on('connection', (wsConn) => {
+			this._logService.trace('[WebSocketProtocol] New client connection');
+			const transport = new WebSocketProtocolTransport(wsConn, this._WebSocket);
+			this._onConnection.fire(transport);
+		});
+
+		this._wss.on('error', (err) => {
+			this._logService.error('[WebSocketProtocol] Server error', err);
+		});
+	}
+
+	override dispose(): void {
+		this._wss.close();
+		this._httpServer?.close();
+		super.dispose();
+	}
+}
diff --git a/src/vs/platform/agentHost/protocol.md b/src/vs/platform/agentHost/protocol.md
new file mode 100644
index 00000000000..f089aba1bd9
--- /dev/null
+++ b/src/vs/platform/agentHost/protocol.md
@@ -0,0 +1,529 @@
+# Sessions process protocol
+
+> **Keep this document in sync with the code.** Changes to the state model, action types, protocol messages, or versioning strategy must be reflected here. Implementation lives in `common/state/`.
+
+> **Pre-production.** This protocol is under active development and is not shipped yet. Breaking changes to wire types, actions, and state shapes are fine — do not worry about backward compatibility until the protocol is in production. The versioning machinery exists for future use.
+
+For process architecture and IPC details, see [architecture.md](architecture.md). For design decisions, see [design.md](design.md).
+
+## Goal
+
+The sessions process is a portable, standalone server that multiple clients can connect to. Clients see a synchronized view of sessions and can send commands that are reflected back as state-changing actions. The protocol is designed around four requirements:
+
+1. **Synchronized multi-client state** — an immutable, redux-like state tree mutated exclusively by actions flowing through pure reducers.
+2. **Lazy loading** — clients subscribe to state by URI and load data on demand. The session list is fetched imperatively. Large content (images, long tool outputs) is stored by reference and fetched separately.
+3. **Write-ahead with reconciliation** — clients optimistically apply their own actions locally, then reconcile when the server echoes them back alongside any concurrent actions from other clients or the server itself.
+4. **Forward-compatible versioning** — newer clients can connect to older servers. A single protocol version number maps to a capabilities object; clients check capabilities before using features.
+
+## Protocol development checklist
+
+Use this checklist when adding a new action, command, state field, or notification to the protocol.
+
+### Adding a new action type
+
+1. **Write an E2E test first** in `protocolWebSocket.integrationTest.ts` that exercises the action end-to-end through the WebSocket server. The test should fail until the implementation is complete.
+2. **Add mock agent support** if the test needs a new prompt/behavior in `mockAgent.ts`.
+3. **Define the action interface** in `sessionActions.ts`. Extend `ISessionActionBase` (for session-scoped) or define a standalone root action. Add it to the `ISessionAction` or `IRootAction` union.
+4. **Add a reducer case** in `sessionReducers.ts`. The switch must remain exhaustive — the compiler will error if a case is missing.
+5. **Add a v1 wire type** in `versions/v1.ts`. Mirror the action interface shape. Add it to the `IV1_SessionAction` or `IV1_RootAction` union.
+6. **Register in `versionRegistry.ts`**:
+   - Import the new `IV1_*` type.
+   - Add an `AssertCompatible` check.
+   - Add the type to the `ISessionAction_v1` union.
+   - Add the type string to the suppress-warnings `void` expression.
+   - Add an entry to `ACTION_INTRODUCED_IN` (compiler enforces this).
+7. **Update `protocol.md`** (this file) — add the action to the Actions table.
+8. **Verify the E2E test passes.**
+
+### Adding a new command
+
+1. **Write an E2E test first** in `protocolWebSocket.integrationTest.ts`. The test should fail until the implementation is complete.
+2. **Define the request params and result interfaces** in `sessionProtocol.ts`.
+3. **Handle it in `protocolServerHandler.ts`** `_handleRequestAsync()`. The method returns the result; the caller wraps it in a JSON-RPC response or error automatically.
+4. **Add the side-effect** in `IProtocolSideEffectHandler` if the command requires I/O or agent interaction. Implement it in `agentHostServerMain.ts`.
+5. **Update `protocol.md`** — add the command to the Commands table.
+6. **Verify the E2E test passes.**
+
+### Adding a new state field
+
+1. **Add the field** to the relevant interface in `sessionState.ts` (e.g. `ISessionSummary`, `IActiveTurn`, `ITurn`).
+2. **Update the factory** (`createSessionState()`, `createActiveTurn()`) to initialize the field.
+3. **Add to the v1 wire type** in `versions/v1.ts`. Optional fields are safe; required fields break the bidirectional `AssertCompatible` check (intentionally — add as optional or bump the protocol version).
+4. **Update reducers** in `sessionReducers.ts` if the field needs to be mutated by actions.
+5. **Update `finalizeTurn()`** if the field lives on `IActiveTurn` and should transfer to `ITurn` on completion.
+
+### Adding a new notification
+
+1. **Write an E2E test first** in `protocolWebSocket.integrationTest.ts`.
+2. **Define the notification interface** in `sessionActions.ts`. Add it to the `INotification` union.
+3. **Add to `NOTIFICATION_INTRODUCED_IN`** in `versionRegistry.ts`.
+4. **Emit it** from `SessionStateManager` or the relevant server-side code.
+5. **Verify the E2E test passes.**
+
+### Adding mock agent support (for testing)
+
+1. **Add a prompt case** in `mockAgent.ts` `sendMessage()` to trigger the behavior.
+2. **Fire the corresponding `IAgentProgressEvent`** via `_fireSequence()` or manually through `_onDidSessionProgress`.
+
+
+## URI-based subscriptions
+
+All state is identified by URIs. Clients subscribe to a URI to receive its current state snapshot and subsequent action updates. This is the single universal mechanism for state synchronization:
+
+- **Root state** (`agenthost:root`) — always-present global state (agents and their models). Clients subscribe to this on connect.
+- **Session state** (`copilot:/<uuid>`, etc.) — per-session state loaded on demand. Clients subscribe when opening a session.
+
+The `subscribe(uri)` / `unsubscribe(uri)` mechanism works identically for all resource types.
+
+## State model
+
+### Root state
+
+Subscribable at `agenthost:root`. Contains global, lightweight data that all clients need. **Does not contain the session list** — that is fetched imperatively via RPC (see Commands).
+
+```
+RootState {
+    agents: AgentInfo[]
+}
+```
+
+Each `AgentInfo` includes the models available for that agent:
+
+```
+AgentInfo {
+    provider: string
+    displayName: string
+    description: string
+    models: ModelInfo[]
+}
+```
+
+### Session state
+
+Subscribable at the session's URI (e.g. `copilot:/<uuid>`). Contains the full state for a single session.
+
+```
+SessionState {
+    summary: SessionSummary
+    lifecycle: 'creating' | 'ready' | 'creationFailed'
+    creationError?: ErrorInfo
+    turns: Turn[]
+    activeTurn: ActiveTurn | undefined
+}
+```
+
+`lifecycle` tracks the asynchronous creation process. When a client creates a session, it picks a URI, sends the command, and subscribes immediately. The initial snapshot has `lifecycle: 'creating'`. The server asynchronously initializes the backend and dispatches `session/ready` or `session/creationFailed`.
+
+```
+Turn {
+    id: string
+    userMessage: UserMessage
+    responseParts: ResponsePart[]
+    toolCalls: CompletedToolCall[]
+    usage: UsageInfo | undefined
+    state: 'complete' | 'cancelled' | 'error'
+}
+
+ActiveTurn {
+    id: string
+    userMessage: UserMessage
+    streamingText: string
+    responseParts: ResponsePart[]
+    toolCalls: Record<toolCallId, ToolCallState>
+    pendingPermissions: Record<requestId, PermissionRequest>
+    reasoning: string
+    usage: UsageInfo | undefined
+}
+```
+
+### Session list
+
+The session list can be arbitrarily large and is **not** part of the state tree. Instead:
+- Clients fetch the list imperatively via `listSessions()` RPC.
+- The server sends lightweight **notifications** (`sessionAdded`, `sessionRemoved`) so connected clients can update a local cache without re-fetching.
+
+Notifications are ephemeral — not processed by reducers, not stored in state, not replayed on reconnect. On reconnect, clients re-fetch the list.
+
+### Content references
+
+Large content is **not** inlined in state. A `ContentRef` placeholder is used instead:
+
+```
+ContentRef {
+    uri: string             // scheme://sessionId/contentId
+    sizeHint?: number
+    mimeType?: string
+}
+```
+
+Clients fetch content separately via `fetchContent(uri)`. This keeps the state tree small and serializable.
+
+## Actions
+
+Actions are the sole mutation mechanism for subscribable state. They form a discriminated union keyed by `type`. Every action is wrapped in an `ActionEnvelope` for sequencing and origin tracking.
+
+### Action envelope
+
+```
+ActionEnvelope {
+    action: Action
+    serverSeq: number                                     // monotonic, assigned by server
+    origin: { clientId: string, clientSeq: number } | undefined  // undefined = server-originated
+    rejectionReason?: string                              // present when the server rejected the action
+}
+```
+
+### Root actions
+
+These mutate the root state. **All root actions are server-only** — clients observe them but cannot produce them.
+
+| Type | Payload | When |
+|---|---|---|
+| `root/agentsChanged` | `AgentInfo[]` | Available agent backends or their models changed |
+
+### Session actions
+
+All scoped to a session URI. Some are server-only (produced by the agent backend), others can be dispatched directly by clients.
+
+When a client dispatches an action, the server applies it to the state and also reacts to it as a side effect (e.g., `session/turnStarted` triggers agent processing, `session/turnCancelled` aborts it). This avoids a separate command→action translation layer for the common interactive cases.
+
+| Type | Payload | Client-dispatchable? | When |
+|---|---|---|---|
+| `session/ready` | — | No | Session backend initialized successfully |
+| `session/creationFailed` | `ErrorInfo` | No | Session backend failed to initialize |
+| `session/turnStarted` | `turnId, UserMessage` | Yes | User sent a message; server starts processing |
+| `session/delta` | `turnId, content` | No | Streaming text chunk from assistant |
+| `session/responsePart` | `turnId, ResponsePart` | No | Structured content appended |
+| `session/toolStart` | `turnId, ToolCallState` | No | Tool execution began |
+| `session/toolComplete` | `turnId, toolCallId, ToolCallResult` | No | Tool execution finished |
+| `session/permissionRequest` | `turnId, PermissionRequest` | No | Permission needed from user |
+| `session/permissionResolved` | `turnId, requestId, approved` | Yes | Permission granted or denied |
+| `session/turnComplete` | `turnId` | No | Turn finished (assistant idle) |
+| `session/turnCancelled` | `turnId` | Yes | Turn was aborted; server stops processing |
+| `session/error` | `turnId, ErrorInfo` | No | Error during turn processing |
+| `session/titleChanged` | `title` | No | Session title updated |
+| `session/usage` | `turnId, UsageInfo` | No | Token usage report |
+| `session/reasoning` | `turnId, content` | No | Reasoning/thinking text |
+| `session/modelChanged` | `model` | Yes | Model changed for this session |
+
+### Notifications
+
+Notifications are ephemeral broadcasts that are **not** part of the state tree. They are not processed by reducers and are not replayed on reconnect.
+
+| Type | Payload | When |
+|---|---|---|
+| `notify/sessionAdded` | `SessionSummary` | A new session was created |
+| `notify/sessionRemoved` | session `URI` | A session was disposed |
+
+Clients use notifications to maintain a local session list cache. On reconnect, clients should re-fetch via `listSessions()` rather than relying on replayed notifications.
+
+## Commands and client-dispatched actions
+
+Clients interact with the server in two ways:
+
+1. **Dispatching actions** — the client sends an action directly (e.g., `session/turnStarted`, `session/turnCancelled`). The server applies it to state and reacts with side effects. These are write-ahead: the client applies them optimistically.
+2. **Sending commands** — imperative RPCs for operations that don't map to a single state action (session creation, fetching data, etc.).
+
+### Client-dispatched actions
+
+| Action | Server-side effect |
+|---|---|
+| `session/turnStarted` | Begins agent processing for the new turn |
+| `session/permissionResolved` | Unblocks the pending tool execution |
+| `session/turnCancelled` | Aborts the in-progress turn |
+
+### Commands
+
+| Command | Effect |
+|---|---|
+| `createSession(uri, config)` | Server creates session, client subscribes to URI |
+| `disposeSession(session)` | Server disposes session, broadcasts `sessionRemoved` notification |
+| `listSessions(filter?)` | Returns `SessionSummary[]` |
+| `fetchContent(uri)` | Returns content bytes |
+| `fetchTurns(session, range)` | Returns historical turns |
+| `browseDirectory(uri)` | Lists directory entries at a file URI on the server's filesystem |
+
+`browseDirectory(uri)` succeeds only if the target exists and is a directory. If the target does not exist, is not a directory, or cannot be accessed, the server MUST return a JSON-RPC error.
+
+### Session creation flow
+
+1. Client picks a session URI (e.g. `copilot:/<new-uuid>`)
+2. Client sends `createSession(uri, config)` command
+3. Client sends `subscribe(uri)` (can be batched with the command)
+4. Server creates the session in state with `lifecycle: 'creating'` and sends the subscription snapshot
+5. Server asynchronously initializes the agent backend
+6. On success: server dispatches `session/ready` action
+7. On failure: server dispatches `session/creationFailed` action with error details
+8. Server broadcasts `notify/sessionAdded` to all clients
+
+## Client-server protocol
+
+The protocol uses **JSON-RPC 2.0** framing over the transport (WebSocket, MessagePort, etc.).
+
+### Message categories
+
+- **Client → Server notifications** (fire-and-forget): `unsubscribe`, `dispatchAction`
+- **Client → Server requests** (expect a correlated response): `initialize`, `reconnect`, `subscribe`, `createSession`, `disposeSession`, `listSessions`, `fetchTurns`, `fetchContent`, `browseDirectory`
+- **Server → Client notifications** (pushed): `action`, `notification`
+- **Server → Client responses** (correlated to requests by `id`): success result or JSON-RPC error
+
+### Connection handshake
+
+`initialize` is a JSON-RPC **request** — the server MUST respond with a result or error:
+
+```
+1. Client → Server:  { "jsonrpc": "2.0", "id": 1, "method": "initialize", "params": { protocolVersion, clientId, initialSubscriptions? } }
+2. Server → Client:  { "jsonrpc": "2.0", "id": 1, "result": { protocolVersion, serverSeq, snapshots[], defaultDirectory? } }
+```
+
+`initialSubscriptions` allows the client to subscribe to root state (and any previously-open sessions on reconnect) in the same round-trip as the handshake. The server returns snapshots for each in the response.
+
+### URI subscription
+
+`subscribe` is a JSON-RPC **request** — the client receives the snapshot as the response result:
+
+```
+Client → Server:  { "jsonrpc": "2.0", "id": 1, "method": "subscribe", "params": { "resource": "copilot:/session-1" } }
+Server → Client:  { "jsonrpc": "2.0", "id": 1, "result": { "resource": ..., "state": ..., "fromSeq": 5 } }
+```
+
+After subscribing, the client receives all actions scoped to that URI with `serverSeq > fromSeq`. Multiple concurrent subscriptions are supported.
+
+`unsubscribe` is a notification (no response needed):
+
+```
+Client → Server:  { "jsonrpc": "2.0", "method": "unsubscribe", "params": { "resource": "copilot:/session-1" } }
+```
+
+### Action delivery
+
+The server broadcasts action envelopes as JSON-RPC notifications:
+
+```
+Server → Client:  { "jsonrpc": "2.0", "method": "action", "params": { "envelope": { action, serverSeq, origin } } }
+```
+
+- Root actions go to all clients subscribed to root state.
+- Session actions go to all clients subscribed to that session's URI.
+
+Protocol notifications (sessionAdded/sessionRemoved) are broadcast similarly:
+
+```
+Server → Client:  { "jsonrpc": "2.0", "method": "notification", "params": { "notification": { type, ... } } }
+```
+
+### Commands as JSON-RPC requests
+
+Commands are JSON-RPC requests. The server returns a result or a JSON-RPC error:
+
+```
+Client → Server:  { "jsonrpc": "2.0", "id": 2, "method": "createSession", "params": { session, provider?, model? } }
+Server → Client:  { "jsonrpc": "2.0", "id": 2, "result": null }
+```
+
+On failure:
+
+```
+Server → Client:  { "jsonrpc": "2.0", "id": 2, "error": { "code": -32603, "message": "No agent for provider" } }
+```
+
+### Client-dispatched actions
+
+Actions are sent as notifications (fire-and-forget, write-ahead):
+
+```
+Client → Server:  { "jsonrpc": "2.0", "method": "dispatchAction", "params": { clientSeq, action } }
+```
+
+### Reconnection
+
+`reconnect` is a JSON-RPC **request**. The server MUST include all replayed data in the response:
+
+```
+Client → Server:  { "jsonrpc": "2.0", "id": 2, "method": "reconnect", "params": { clientId, lastSeenServerSeq, subscriptions } }
+```
+
+If the gap is within the replay buffer, the response contains missed action envelopes:
+```
+Server → Client:  { "jsonrpc": "2.0", "id": 2, "result": { "type": "replay", "actions": [...] } }
+```
+
+If the gap exceeds the buffer, the response contains fresh snapshots:
+```
+Server → Client:  { "jsonrpc": "2.0", "id": 2, "result": { "type": "snapshot", "snapshots": [...] } }
+```
+
+Protocol notifications are **not** replayed — the client should re-fetch the session list.
+
+## Write-ahead reconciliation
+
+### Client-side state
+
+Each client maintains per-subscription:
+- `confirmedState` — last fully server-acknowledged state
+- `pendingActions[]` — optimistically applied but not yet echoed by server
+- `optimisticState` — `confirmedState` with `pendingActions` replayed on top (computed, not stored)
+
+### Reconciliation algorithm
+
+When the client receives an `ActionEnvelope` from the server:
+
+1. **Own action echoed**: `origin.clientId === myId` and matches head of `pendingActions` → pop from pending, apply to `confirmedState`
+2. **Foreign action**: different origin → apply to `confirmedState`, rebase remaining `pendingActions`
+3. **Rejected action**: server echoed with `rejectionReason` present → remove from pending (optimistic effect reverted). The `rejectionReason` MAY be surfaced to the user.
+4. Recompute `optimisticState` from `confirmedState` + remaining `pendingActions`
+
+### Why rebasing is simple
+
+Most session actions are **append-only** (add turn, append delta, add tool call). Pending actions still apply cleanly to an updated confirmed state because they operate on independent data (the turn the client created still exists; the content it appended is additive). The rare true conflict (two clients abort the same turn) is resolved by server-wins semantics.
+
+## Versioning
+
+### Protocol version
+
+Two constants define the version window:
+- `PROTOCOL_VERSION` — the current version that new code speaks.
+- `MIN_PROTOCOL_VERSION` — the oldest version we maintain compatibility with.
+
+Bump `PROTOCOL_VERSION` when:
+- A new feature area requires capability negotiation (e.g., client must know server supports it before sending commands)
+- Behavioral semantics of existing actions change
+
+Adding **optional** fields to existing action/state types does NOT require a bump. Adding **required** fields or removing/renaming fields **is a compile error** (see below).
+
+```
+Version history:
+  1 — Initial: core session lifecycle, streaming, tools, permissions
+```
+
+### Version type snapshots
+
+Each protocol version has a type file (`versions/v1.ts`, `versions/v2.ts`, etc.) that captures the wire format shape of every state type and action type in that version.
+
+The **latest** version file is the editable "tip" — it can be modified alongside the living types in `sessionState.ts` / `sessionActions.ts`. The compiler enforces that all changes are backwards-compatible. When `PROTOCOL_VERSION` is bumped, the previous version file becomes truly frozen and a new tip is created.
+
+The version registry (`versions/versionRegistry.ts`) performs **bidirectional assignability checks** between the version types and the living types:
+
+```typescript
+// AssertCompatible requires BOTH directions:
+//   Current extends Frozen → can't remove fields or change field types
+//   Frozen extends Current → can't add required fields
+// The only allowed evolution is adding optional fields.
+type AssertCompatible<Frozen, Current extends Frozen> = Frozen extends Current ? true : never;
+
+type _check = AssertCompatible<IV1_TurnStartedAction, ITurnStartedAction>;
+```
+
+| Change to living type | Also update tip? | Compile result |
+|---|---|---|
+| Add optional field | Yes, add it to tip too | ✅ Passes |
+| Add optional field | No, only in living type | ✅ Passes (tip is a subset) |
+| Remove a field | — | ❌ `Current extends Frozen` fails |
+| Change a field's type | — | ❌ `Current extends Frozen` fails |
+| Add required field | — | ❌ `Frozen extends Current` fails |
+
+### Exhaustive action→version map
+
+The registry also maintains an exhaustive runtime map:
+
+```typescript
+export const ACTION_INTRODUCED_IN: { readonly [K in IStateAction['type']]: number } = {
+    'root/agentsChanged': 1,
+    'session/turnStarted': 1,
+    // ...every action type must have an entry
+};
+```
+
+The index signature `[K in IStateAction['type']]` means adding a new action to the `IStateAction` union without adding it to this map is a compile error. The developer is forced to pick a version number.
+
+The server uses this for one-line filtering — no if/else chains:
+
+```typescript
+function isActionKnownToVersion(action: IStateAction, clientVersion: number): boolean {
+    return ACTION_INTRODUCED_IN[action.type] <= clientVersion;
+}
+```
+
+### Capabilities
+
+The protocol version maps to a `ProtocolCapabilities` interface for higher-level feature gating:
+
+```typescript
+interface ProtocolCapabilities {
+    // v1 — always present
+    readonly sessions: true;
+    readonly tools: true;
+    readonly permissions: true;
+    // v2+
+    readonly reasoning?: true;
+}
+```
+
+### Forward compatibility
+
+A newer client connecting to an older server:
+1. During handshake, the client learns the server's protocol version from the `initialize` response.
+2. The client derives `ProtocolCapabilities` from the server version.
+3. Command factories check capabilities before dispatching; if unsupported, the client degrades gracefully.
+4. The server only sends action types known to the client's declared version (via `isActionKnownToVersion`).
+5. As a safety net, clients silently ignore actions with unrecognized `type` values.
+
+### Raising the minimum version
+
+When `MIN_PROTOCOL_VERSION` is raised from N to N+1:
+1. Delete `versions/vN.ts`.
+2. Remove the vN compatibility checks from `versions/versionRegistry.ts`.
+3. The compiler surfaces any dead code that only existed for vN compatibility.
+4. Clean up that dead code.
+
+### Backward compatibility
+
+We do not guarantee backward compatibility (older clients connecting to newer servers). Clients should update before the server.
+
+### Adding a new protocol version (cookbook)
+
+1. Bump `PROTOCOL_VERSION` in `versions/versionRegistry.ts`.
+2. Create `versions/v{N}.ts` — freeze the current types (copy from v{N-1} and add your new types).
+3. Add your new action types to the living union in `sessionActions.ts`.
+4. Add entries to `ACTION_INTRODUCED_IN` with version N (compiler forces this).
+5. Add `AssertCompatible` checks for the new types in `versionRegistry.ts`.
+6. Add reducer cases for the new actions (in new functions if desired).
+7. Add capability fields to `ProtocolCapabilities` if needed.
+
+## Reducers
+
+State is mutated by pure reducer functions that take `(state, action) → newState`. The same reducer code runs on both server and client, which is what makes write-ahead possible: the client can locally predict the result of its own action using the same logic the server will run.
+
+```
+rootReducer(state: RootState, action: RootAction): RootState
+sessionReducer(state: SessionState, action: SessionAction): SessionState
+```
+
+Reducers are pure (no side effects, no I/O). Server-side effects (e.g. forwarding a `sendMessage` command to the Copilot SDK) are handled by a separate dispatch layer, not in the reducer.
+
+## File layout
+
+```
+src/vs/platform/agent/common/state/
+├── sessionState.ts          # Immutable state types (RootState, SessionState, Turn, etc.)
+├── sessionActions.ts        # Action + notification discriminated unions, ActionEnvelope
+├── sessionReducers.ts       # Pure reducer functions (rootReducer, sessionReducer)
+├── sessionProtocol.ts       # JSON-RPC message types, request params/results, type guards
+├── sessionCapabilities.ts   # Re-exports version constants + ProtocolCapabilities
+├── sessionClientState.ts    # Client-side state manager (confirmed + pending + reconciliation)
+└── versions/
+    ├── v1.ts                # v1 wire format types (tip — editable, compiler-enforced compat)
+    └── versionRegistry.ts   # Compile-time compat checks + runtime action→version map
+```
+
+## Relationship to existing IPC contract
+
+The existing `IAgentProgressEvent` union in `agentService.ts` captures raw streaming events from the Copilot SDK. The new action types in `sessionActions.ts` are a higher-level abstraction: they represent state transitions rather than SDK events.
+
+In the server process, the mapping is:
+- `IAgentDeltaEvent` → `session/delta` action
+- `IAgentToolStartEvent` → `session/toolStart` action
+- `IAgentIdleEvent` → `session/turnComplete` action
+- etc.
+
+The existing `IAgentService` RPC interface remains unchanged. The new protocol layer sits on top: the sessions process uses `IAgentService` internally to talk to agent backends, and produces actions for connected clients.
diff --git a/src/vs/platform/agentHost/sessions.md b/src/vs/platform/agentHost/sessions.md
new file mode 100644
index 00000000000..b200662497a
--- /dev/null
+++ b/src/vs/platform/agentHost/sessions.md
@@ -0,0 +1,62 @@
+## Chat sessions / background agent architecture
+
+> **Keep this document in sync with the code.** If you change how session types are registered, modify the extension point, or update the agent-host's registration pattern, update this document as part of the same change.
+
+There are **three layers** that connect to form a chat session type (like "Background Agent" / "Copilot CLI"):
+
+### Layer 1: `chatSessions` Extension Point (package.json)
+
+In package.json, the extension contributes to the `"chatSessions"` extension point. Each entry declares a session **type** (used as a URI scheme), a **name** (used as a chat participant name like `@cli`), display metadata, capabilities, slash commands, and a `when` clause for conditional availability.
+
+### Layer 2: VS Code Platform -- Extension Point + Service
+
+On the VS Code side:
+
+- chatSessions.contribution.ts -- Registers the `chatSessions` extension point via `ExtensionsRegistry.registerExtensionPoint`. When extensions contribute to it, the `ChatSessionsService` processes each contribution: it sets up context keys, icons, welcome messages, commands, and -- if `canDelegate` is true -- also **registers a dynamic chat agent**.
+
+- chatSessionsService.ts -- The `IChatSessionsService` interface manages two kinds of providers:
+  - **`IChatSessionItemController`** -- Lists available sessions
+  - **`IChatSessionContentProvider`** -- Provides session content (history + request handler) when you open a specific session
+
+- agentSessions.ts -- The `AgentSessionProviders` enum maps well-known types to their string identifiers:
+  - `Local` = `'local'`
+  - `Background` = `'copilotcli'`
+  - `Cloud` = `'copilot-cloud-agent'`
+  - `Claude` = `'claude-code'`
+  - `Codex` = `'openai-codex'`
+  - `Growth` = `'copilot-growth'`
+  - `AgentHostCopilot` = `'agent-host-copilot'`
+
+### Layer 3: Extension Side Registration
+
+Each session type registers three things via the proposed API:
+
+1. **`vscode.chat.registerChatSessionItemProvider(type, provider)`** -- Provides the list of sessions
+2. **`vscode.chat.createChatParticipant(type, handler)`** -- Creates the chat participant
+3. **`vscode.chat.registerChatSessionContentProvider(type, contentProvider, chatParticipant)`** -- Binds content provider to participant
+
+### Agent Host: Internal (Non-Extension) Registration
+
+The agent-host session types (`agent-host-copilot`) bypass the extension point entirely. A single `AgentHostContribution` discovers available agents from the agent host process via `listAgents()` and dynamically registers each one:
+
+**For each `IAgentDescriptor` returned by `listAgents()`:**
+1. Chat session contribution via `IChatSessionsService.registerChatSessionContribution()`
+2. Session item controller via `IChatSessionsService.registerChatSessionItemController()`
+3. Session content provider via `IChatSessionsService.registerChatSessionContentProvider()`
+4. Language model provider via `ILanguageModelsService.registerLanguageModelProvider()`
+5. Auth token push (only if `descriptor.requiresAuth` is true)
+
+All use the same generic `AgentHostSessionHandler` class, configured with the descriptor's metadata.
+
+### All Entry Points
+
+| # | Entry Point | File |
+|---|-------------|------|
+| 1 | **package.json `chatSessions` contribution** | package.json -- declares type, name, capabilities |
+| 2 | **Extension point handler** | chatSessions.contribution.ts -- processes contributions |
+| 3 | **Service interface** | chatSessionsService.ts -- `IChatSessionsService` |
+| 4 | **Proposed API** | vscode.proposed.chatSessionsProvider.d.ts |
+| 5 | **Agent session provider enum** | agentSessions.ts -- `AgentSessionProviders` |
+| 6 | **Agent Host contribution** | agentHost/agentHostChatContribution.ts -- `AgentHostContribution` (discovers + registers dynamically) |
+| 7 | **Agent Host process** | src/vs/platform/agent/ -- utility process, SDK integration |
+| 8 | **Desktop registration** | electron-browser/chat.contribution.ts -- registers `AgentHostContribution` |
diff --git a/src/vs/platform/agentHost/test/auth-rework.md b/src/vs/platform/agentHost/test/auth-rework.md
new file mode 100644
index 00000000000..4533c3b4e59
--- /dev/null
+++ b/src/vs/platform/agentHost/test/auth-rework.md
@@ -0,0 +1,454 @@
+# Auth Rework: Standards-Based Authentication for the Agent Host Protocol
+
+## Problem
+
+The current authentication mechanism is imperative and VS Code-specific:
+
+1. The renderer discovers agents via `listAgents()` and checks `IAgentDescriptor.requiresAuth`.
+2. It obtains a GitHub OAuth token from VS Code's built-in authentication service.
+3. It pushes the token via `setAuthToken(token)` — a fire-and-forget JSON-RPC notification.
+4. The agent host fans the token out to all registered `IAgent` providers.
+
+This couples the agent host to VS Code internals. An external client (CLI tool, web app, another editor) connecting over WebSocket has no way to know _what_ authentication is required, _where_ to get a token, or _what scopes_ are needed. The client must have out-of-band knowledge that "this server needs a GitHub OAuth token."
+
+## Design Goals
+
+- **Self-describing**: The server declares its auth requirements so arbitrary clients can discover them without prior knowledge of the server's internals.
+- **Standards-aligned**: Use the semantics and vocabulary of RFC 6750 (Bearer Token Usage) and RFC 9728 (OAuth 2.0 Protected Resource Metadata) adapted for JSON-RPC.
+- **Challenge-on-failure**: When auth is missing or invalid, the server responds with a structured challenge (like `WWW-Authenticate`) that tells the client exactly what to do.
+- **Transport-agnostic**: Works over WebSocket JSON-RPC and MessagePort IPC alike.
+- **Multi-provider**: Supports multiple independent auth requirements (e.g. GitHub + a future enterprise IdP) each with their own scopes and authorization servers.
+- **Non-breaking migration**: Can coexist with `setAuthToken` during a transition period.
+
+## Relevant Standards
+
+### RFC 6750 — Bearer Token Usage
+
+Defines how bearer tokens are transmitted (`Authorization: Bearer <token>`) and how servers challenge clients when auth is missing or invalid:
+
+```
+WWW-Authenticate: Bearer realm="example",
+                         error="invalid_token",
+                         error_description="The access token expired"
+```
+
+Key error codes: `invalid_request`, `invalid_token`, `insufficient_scope`.
+
+### RFC 9728 — OAuth 2.0 Protected Resource Metadata
+
+Defines a metadata document that a protected resource publishes to describe itself:
+
+```json
+{
+  "resource": "https://resource.example.com",
+  "authorization_servers": ["https://as.example.com"],
+  "scopes_supported": ["profile", "email"],
+  "bearer_methods_supported": ["header"]
+}
+```
+
+Clients discover this metadata either via a well-known URL or via the `resource_metadata` parameter in a `WWW-Authenticate` challenge. This tells the client _where_ to get a token and _what scopes_ to request.
+
+## Proposed Design
+
+### Overview
+
+The authentication flow has three phases, mirroring the HTTP flow from RFC 9728 §5:
+
+```
+┌─────────┐                          ┌──────────────┐              ┌─────────────────┐
+│  Client  │                          │  Agent Host  │              │  Authorization  │
+│          │                          │   (Server)   │              │     Server      │
+└────┬─────┘                          └──────┬───────┘              └────────┬────────┘
+     │                                       │                              │
+     │  1. initialize                        │                              │
+     │ ───────────────────────────────────>   │                              │
+     │                                       │                              │
+     │  2. initialize result                 │                              │
+     │     { auth: [{ scheme, resource,      │                              │
+     │        authorization_servers,         │                              │
+     │        scopes_supported }] }          │                              │
+     │ <───────────────────────────────────  │                              │
+     │                                       │                              │
+     │  3. Obtain token from AS              │                              │
+     │ ─────────────────────────────────────────────────────────────────>   │
+     │                                       │                              │
+     │  4. Token                             │                              │
+     │ <─────────────────────────────────────────────────────────────────  │
+     │                                       │                              │
+     │  5. authenticate { scheme, token }    │                              │
+     │ ───────────────────────────────────>   │                              │
+     │                                       │                              │
+     │  6. { authenticated: true }           │                              │
+     │ <───────────────────────────────────  │                              │
+     │                                       │                              │
+     │  7. createSession / other commands    │                              │
+     │ ───────────────────────────────────>   │                              │
+```
+
+### Phase 1: Discovery (in `initialize` response)
+
+The `initialize` result is extended with a `resourceMetadata` field, modeled on RFC 9728 §2:
+
+```typescript
+interface IInitializeResult {
+	protocolVersion: number;
+	serverSeq: number;
+	snapshots: ISnapshot[];
+	defaultDirectory?: URI;
+
+	/** RFC 9728-style resource metadata describing auth requirements. */
+	resourceMetadata?: IResourceMetadata;
+}
+
+/**
+ * Describes the agent host as an OAuth 2.0 protected resource.
+ * Modeled on RFC 9728 (OAuth 2.0 Protected Resource Metadata).
+ */
+interface IResourceMetadata {
+	/**
+	 * Identifier for this resource (the agent host).
+	 * Analogous to RFC 9728 `resource`.
+	 */
+	resource: string;
+
+	/**
+	 * Independent auth requirements. Each entry describes one
+	 * authentication scheme the server accepts. A client must
+	 * satisfy at least one to use authenticated features.
+	 */
+	authSchemes: IAuthScheme[];
+}
+
+/**
+ * A single authentication scheme the server accepts.
+ */
+interface IAuthScheme {
+	/**
+	 * The auth scheme name. Initially only "bearer" (RFC 6750).
+	 * Future schemes (e.g. "dpop", "device_code") can be added.
+	 */
+	scheme: 'bearer';
+
+	/**
+	 * An opaque identifier for this auth requirement, used to
+	 * correlate `authenticate` calls and challenges. Allows the
+	 * server to require multiple independent tokens (e.g. one
+	 * per agent provider).
+	 *
+	 * Example: "github" for GitHub Copilot auth.
+	 */
+	id: string;
+
+	/**
+	 * Human-readable label for display in auth UIs.
+	 * Analogous to RFC 9728 `resource_name`.
+	 */
+	label: string;
+
+	/**
+	 * Authorization server issuer identifiers (RFC 8414).
+	 * Tells the client where to obtain tokens.
+	 * Analogous to RFC 9728 `authorization_servers`.
+	 *
+	 * Example: ["https://github.com/login/oauth"]
+	 */
+	authorizationServers: string[];
+
+	/**
+	 * OAuth scopes the server needs.
+	 * Analogous to RFC 9728 `scopes_supported`.
+	 *
+	 * Example: ["read:user", "user:email", "repo", "workflow"]
+	 */
+	scopesSupported?: string[];
+
+	/**
+	 * Whether this auth requirement is mandatory for any
+	 * functionality, or only for specific agents/features.
+	 */
+	required?: boolean;
+}
+```
+
+**Why in `initialize`?** RFC 9728 publishes metadata at a well-known URL. In our JSON-RPC world, the `initialize` handshake _is_ the well-known endpoint — it's the first thing every client calls, and it's already where we exchange capabilities. This avoids an extra round-trip and keeps the discovery atomic.
+
+### Phase 2: Token Delivery (`authenticate` command)
+
+Replace the fire-and-forget `setAuthToken` notification with a proper JSON-RPC **request** so the client gets confirmation:
+
+```typescript
+/**
+ * Client → Server request to authenticate.
+ * Analogous to sending `Authorization: Bearer <token>` (RFC 6750 §2.1).
+ */
+interface IAuthenticateParams {
+	/**
+	 * The auth scheme identifier from the server's resourceMetadata.
+	 * Correlates to IAuthScheme.id.
+	 */
+	schemeId: string;
+
+	/** The scheme type (initially always "bearer"). */
+	scheme: 'bearer';
+
+	/** The bearer token value (RFC 6750). */
+	token: string;
+}
+
+interface IAuthenticateResult {
+	/** Whether the token was accepted. */
+	authenticated: boolean;
+}
+```
+
+This is a **request** (not a notification) so:
+- The client knows immediately if the token was accepted or rejected.
+- The server can validate the token before returning success.
+- Errors use structured challenges (see Phase 3).
+
+The client can call `authenticate` multiple times (e.g. when a token is refreshed), and can authenticate for multiple scheme IDs independently.
+
+### Phase 3: Challenges on Failure
+
+When a command fails because authentication is missing or invalid, the server returns a JSON-RPC error with structured challenge data in the `data` field, modeled on RFC 6750 §3:
+
+```typescript
+/**
+ * JSON-RPC error data for authentication failures.
+ * Modeled on RFC 6750 WWW-Authenticate challenge parameters.
+ */
+interface IAuthChallenge {
+	/** The scheme ID that needs (re-)authentication. */
+	schemeId: string;
+
+	/** RFC 6750 §3.1 error code. */
+	error: 'invalid_request' | 'invalid_token' | 'insufficient_scope';
+
+	/** Human-readable error description (RFC 6750 §3 error_description). */
+	errorDescription?: string;
+
+	/** Required scopes, if the error is insufficient_scope (RFC 6750 §3 scope). */
+	scope?: string;
+}
+```
+
+This is returned as the `data` payload of a JSON-RPC error response:
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "error": {
+    "code": -32007,
+    "message": "Authentication required",
+    "data": {
+      "challenges": [
+        {
+          "schemeId": "github",
+          "error": "invalid_token",
+          "errorDescription": "The access token expired"
+        }
+      ]
+    }
+  }
+}
+```
+
+A dedicated error code (`-32007 AHP_AUTH_REQUIRED`) signals this is an auth error so clients can handle it programmatically without parsing the message string.
+
+### Phase 4: Auth State Notifications
+
+The server pushes auth state changes via notifications so clients know when auth expires or the required scopes change:
+
+```typescript
+/**
+ * Server → Client notification when auth state changes.
+ */
+interface IAuthStateNotification {
+	type: 'notify/authRequired';
+
+	/** The scheme ID whose auth state changed. */
+	schemeId: string;
+
+	/** The new state. */
+	state: 'authenticated' | 'expired' | 'revoked' | 'required';
+
+	/** Optional challenge with details (e.g. new scopes needed). */
+	challenge?: IAuthChallenge;
+}
+```
+
+This replaces the implicit "push a token whenever you see an account change" model with an explicit server-driven signal.
+
+## Concrete Example: GitHub Copilot Auth
+
+### Server-side (CopilotAgent)
+
+When the Copilot agent registers, it publishes an auth scheme:
+
+```typescript
+// In CopilotAgent.getAuthSchemes():
+[{
+	scheme: 'bearer',
+	id: 'github',
+	label: 'GitHub',
+	authorizationServers: ['https://github.com/login/oauth'],
+	scopesSupported: ['read:user', 'user:email'],
+	required: true,
+}]
+```
+
+The agent host aggregates auth schemes from all agents into `IInitializeResult.resourceMetadata`.
+
+### Client-side (VS Code renderer)
+
+```typescript
+// After initialize:
+const metadata = initResult.resourceMetadata;
+if (metadata) {
+	for (const scheme of metadata.authSchemes) {
+		if (scheme.scheme === 'bearer' && scheme.authorizationServers.some(
+			as => as.includes('github.com')
+		)) {
+			// We know how to handle GitHub auth
+			const token = await this._getGitHubToken(scheme.scopesSupported);
+			await agentHostService.authenticate({
+				schemeId: scheme.id,
+				scheme: 'bearer',
+				token,
+			});
+		}
+	}
+}
+```
+
+### Client-side (generic external client)
+
+A CLI tool connecting over WebSocket:
+
+```typescript
+const ws = new WebSocket('ws://localhost:3000');
+const initResult = await rpc.request('initialize', { protocolVersion: 1, clientId: 'cli-1' });
+
+for (const scheme of initResult.resourceMetadata?.authSchemes ?? []) {
+	if (scheme.scheme === 'bearer') {
+		console.log(`Auth required: ${scheme.label}`);
+		console.log(`Get a token from: ${scheme.authorizationServers[0]}`);
+		console.log(`Scopes: ${scheme.scopesSupported?.join(', ')}`);
+
+		// Client can use any OAuth library to get the token
+		const token = await doOAuthFlow(scheme.authorizationServers[0], scheme.scopesSupported);
+		await rpc.request('authenticate', { schemeId: scheme.id, scheme: 'bearer', token });
+	}
+}
+```
+
+## Protocol Changes Summary
+
+### New JSON-RPC request: `authenticate`
+
+| Direction | Type | Params | Result |
+|---|---|---|---|
+| Client → Server | Request | `IAuthenticateParams` | `IAuthenticateResult` |
+
+### New JSON-RPC error code
+
+| Code | Name | When |
+|---|---|---|
+| `-32007` | `AHP_AUTH_REQUIRED` | A command failed because auth is missing or invalid |
+
+### Extended: `initialize` result
+
+| Field | Type | Description |
+|---|---|---|
+| `resourceMetadata` | `IResourceMetadata` | Optional. Auth and resource information. |
+
+### New notification
+
+| Type | Direction | When |
+|---|---|---|
+| `notify/authRequired` | Server → Client | Auth state changed (expired, revoked, new requirements) |
+
+### Deprecated
+
+| Item | Replacement | Migration |
+|---|---|---|
+| `setAuthToken` notification | `authenticate` request | Keep accepting `setAuthToken` for one version, log deprecation |
+| `IAgentDescriptor.requiresAuth` | `IResourceMetadata.authSchemes` | Derive from `authSchemes` during transition |
+
+## Interface Changes in `agentService.ts`
+
+### `IAgentService`
+
+```diff
+  interface IAgentService {
+-   setAuthToken(token: string): Promise<void>;
++   authenticate(params: IAuthenticateParams): Promise<IAuthenticateResult>;
+  }
+```
+
+### `IAgent`
+
+```diff
+  interface IAgent {
+-   setAuthToken(token: string): Promise<void>;
++   /** Declare auth schemes this agent requires. */
++   getAuthSchemes(): IAuthScheme[];
++   /** Authenticate with a specific scheme. Returns true if accepted. */
++   authenticate(schemeId: string, token: string): Promise<boolean>;
+  }
+```
+
+### `IAgentDescriptor`
+
+```diff
+  interface IAgentDescriptor {
+    readonly provider: AgentProvider;
+    readonly displayName: string;
+    readonly description: string;
+-   readonly requiresAuth: boolean;
+  }
+```
+
+`requiresAuth` is removed — clients discover auth requirements from `IResourceMetadata` instead of per-agent descriptors.
+
+## Design Decisions
+
+### Why not `WWW-Authenticate` headers literally?
+
+We're not using HTTP. Embedding RFC 6750's string-encoded header format in JSON-RPC would be awkward. Instead, we use JSON-native equivalents with the same semantics: `IAuthChallenge` mirrors the `WWW-Authenticate` parameters, and `IResourceMetadata` mirrors RFC 9728's metadata document.
+
+### Why in `initialize` and not a separate `getResourceMetadata` command?
+
+Fewer round-trips. Every client calls `initialize` first — embedding auth requirements there means the client knows what auth is needed from the very first response. A separate command would add latency and complexity for zero benefit, since the metadata is small and always needed.
+
+### Why `schemeId` and not just the `scheme` name?
+
+A server might need multiple bearer tokens from different authorization servers (e.g. GitHub + an enterprise IdP). The `schemeId` lets the client and server correlate tokens to specific requirements. It also makes `authenticate` calls idempotent and unambiguous.
+
+### Why a request instead of a notification for `authenticate`?
+
+The current `setAuthToken` is fire-and-forget — the client has no idea if the token was accepted, expired, or for the wrong provider. Making `authenticate` a request with a response lets the client react immediately (retry with different scopes, prompt the user, etc.).
+
+### What about Device Code / OAuth flows that the server drives?
+
+This proposal covers the "client already has a token" case (RFC 6750 bearer). For server-driven flows (device code, authorization code with redirect), the `authorizationServers` metadata tells the client which AS to talk to. The actual OAuth flow is client-side — the server just declares requirements.
+
+A future extension could add an `IAuthScheme` with `scheme: 'device_code'` that includes a device authorization endpoint, letting the server guide the client through a device flow. This is out of scope for the initial implementation.
+
+## Migration Plan
+
+1. **Phase A**: Add `resourceMetadata` to `IInitializeResult` and the `authenticate` command. Keep `setAuthToken` working as-is.
+2. **Phase B**: Update VS Code renderer to use `authenticate` instead of `setAuthToken`. External clients can start using the new flow.
+3. **Phase C**: Remove `setAuthToken`, `requiresAuth`, and the old imperative push model. Bump protocol version.
+
+## Open Questions
+
+1. **Token validation**: Should the server validate tokens eagerly on `authenticate` (e.g. call a GitHub API endpoint), or defer validation to when a command actually needs it? Eager validation gives better error messages; deferred is simpler and avoids extra network calls.
+
+2. **Per-agent vs. global auth**: The current design has one `resourceMetadata` for the whole server. Should auth schemes be per-agent-provider instead? Per-agent gives finer control (e.g. "Copilot needs GitHub, MockAgent needs nothing") but complicates the protocol. The current proposal uses global metadata with `schemeId` correlation, which the server can internally route to the right agent.
+
+3. **Token refresh**: Should the server expose token expiry information so clients can proactively refresh, or rely on `notify/authRequired` to signal when a refresh is needed? Proactive refresh avoids interruptions but requires the server to parse tokens (which it shouldn't have to for opaque tokens).
+
+4. **Multiple tokens**: Can a client authenticate multiple scheme IDs simultaneously? (Proposed: yes.) Can multiple clients each send their own token? (Proposed: yes, last-writer-wins per schemeId, which matches current behavior.)
diff --git a/src/vs/platform/agentHost/test/common/agentHostFileSystemProvider.test.ts b/src/vs/platform/agentHost/test/common/agentHostFileSystemProvider.test.ts
new file mode 100644
index 00000000000..43c47cb2423
--- /dev/null
+++ b/src/vs/platform/agentHost/test/common/agentHostFileSystemProvider.test.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { agentHostRemotePath, agentHostUri } from '../../common/agentHostFileSystemProvider.js';
+import { AGENT_HOST_LABEL_FORMATTER, AGENT_HOST_SCHEME, agentHostAuthority, fromAgentHostUri, toAgentHostUri } from '../../common/agentHostUri.js';
+
+suite('AgentHostFileSystemProvider - URI helpers', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('agentHostUri builds correct URI', () => {
+		const uri = agentHostUri('localhost', '/home/user/project');
+		assert.strictEqual(uri.scheme, AGENT_HOST_SCHEME);
+		assert.strictEqual(uri.authority, 'localhost');
+		// path encodes file scheme: /file//home/user/project
+		assert.ok(uri.path.includes('/home/user/project'));
+	});
+
+	test('agentHostRemotePath extracts the original path', () => {
+		const uri = agentHostUri('host', '/some/path');
+		assert.strictEqual(agentHostRemotePath(uri), '/some/path');
+	});
+
+	test('agentHostRemotePath round-trips with agentHostUri', () => {
+		const original = '/home/user/project';
+		const uri = agentHostUri('host', original);
+		assert.strictEqual(agentHostRemotePath(uri), original);
+	});
+});
+
+suite('AgentHostAuthority - encoding', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('purely alphanumeric address is returned as-is', () => {
+		assert.strictEqual(agentHostAuthority('localhost'), 'localhost');
+	});
+
+	test('normal host:port address uses human-readable encoding', () => {
+		assert.strictEqual(agentHostAuthority('localhost:8081'), 'localhost__8081');
+		assert.strictEqual(agentHostAuthority('192.168.1.1:8080'), '192.168.1.1__8080');
+		assert.strictEqual(agentHostAuthority('my-host:9090'), 'my-host__9090');
+		assert.strictEqual(agentHostAuthority('host.name:80'), 'host.name__80');
+	});
+
+	test('address with underscore falls through to base64', () => {
+		const authority = agentHostAuthority('host_name:8080');
+		assert.ok(authority.startsWith('b64-'), `expected base64 for underscore address, got: ${authority}`);
+	});
+
+	test('address with exotic characters is base64-encoded', () => {
+		assert.ok(agentHostAuthority('user@host:8080').startsWith('b64-'));
+		assert.ok(agentHostAuthority('host with spaces').startsWith('b64-'));
+		assert.ok(agentHostAuthority('http://myhost:3000').startsWith('b64-'));
+	});
+
+	test('ws:// prefix is normalized so authority matches bare address', () => {
+		assert.strictEqual(agentHostAuthority('ws://127.0.0.1:8080'), agentHostAuthority('127.0.0.1:8080'));
+		assert.strictEqual(agentHostAuthority('ws://localhost:9090'), agentHostAuthority('localhost:9090'));
+	});
+
+	test('different addresses produce different authorities', () => {
+		const cases = ['localhost:8080', 'localhost:8081', '192.168.1.1:8080', 'host-name:80', 'host.name:80', 'host_name:80', 'user@host:8080'];
+		const results = cases.map(agentHostAuthority);
+		const unique = new Set(results);
+		assert.strictEqual(unique.size, cases.length, 'all authorities must be unique');
+	});
+
+	test('authority is valid in a URI authority position', () => {
+		const addresses = ['localhost', 'localhost:8081', 'user@host:8080', 'host with spaces', '192.168.1.1:9090'];
+		for (const address of addresses) {
+			const authority = agentHostAuthority(address);
+			const uri = URI.from({ scheme: AGENT_HOST_SCHEME, authority, path: '/test' });
+			assert.strictEqual(uri.authority, authority, `authority for '${address}' must round-trip through URI`);
+		}
+	});
+
+	test('authority is valid in a URI scheme position', () => {
+		const addresses = ['localhost', 'localhost:8081', 'user@host:8080', 'host with spaces'];
+		for (const address of addresses) {
+			const authority = agentHostAuthority(address);
+			const scheme = `remote-${authority}-copilot`;
+			const uri = URI.from({ scheme, path: '/test' });
+			assert.strictEqual(uri.scheme, scheme, `scheme for '${address}' must round-trip through URI`);
+		}
+	});
+});
+
+suite('toAgentHostUri / fromAgentHostUri', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('round-trips a file URI', () => {
+		const original = URI.file('/home/user/project/file.ts');
+		const wrapped = toAgentHostUri(original, 'my-server');
+		assert.strictEqual(wrapped.scheme, AGENT_HOST_SCHEME);
+		assert.strictEqual(wrapped.authority, 'my-server');
+
+		const unwrapped = fromAgentHostUri(wrapped);
+		assert.strictEqual(unwrapped.scheme, 'file');
+		assert.strictEqual(unwrapped.path, original.path);
+	});
+
+	test('round-trips a URI with authority', () => {
+		const original = URI.from({ scheme: 'agenthost-content', authority: 'session1', path: '/snap/before' });
+		const wrapped = toAgentHostUri(original, 'remote-host');
+		const unwrapped = fromAgentHostUri(wrapped);
+		assert.strictEqual(unwrapped.scheme, 'agenthost-content');
+		assert.strictEqual(unwrapped.authority, 'session1');
+		assert.strictEqual(unwrapped.path, '/snap/before');
+	});
+
+	test('local authority returns original URI unchanged', () => {
+		const original = URI.file('/workspace/test.ts');
+		const result = toAgentHostUri(original, 'local');
+		assert.strictEqual(result.toString(), original.toString());
+	});
+
+	test('agentHostUri for root path produces valid encoded URI', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const uri = agentHostUri(authority, '/');
+		assert.strictEqual(uri.scheme, AGENT_HOST_SCHEME);
+		assert.strictEqual(uri.authority, authority);
+		// The decoded path should be root
+		assert.strictEqual(fromAgentHostUri(uri).path, '/');
+	});
+
+	test('fromAgentHostUri handles malformed path gracefully', () => {
+		const uri = URI.from({ scheme: AGENT_HOST_SCHEME, authority: 'host', path: '/file' });
+		const result = fromAgentHostUri(uri);
+		// Should not throw - falls back to extracting scheme only
+		assert.strictEqual(result.scheme, 'file');
+	});
+});
+
+suite('AGENT_HOST_LABEL_FORMATTER', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	/**
+	 * Replicates the stripPathSegments logic from the label service to
+	 * verify that the formatter's configuration is consistent with the
+	 * URI encoding.
+	 */
+	function stripPath(path: string, segments: number): string {
+		let pos = 0;
+		for (let i = 0; i < segments; i++) {
+			const next = path.indexOf('/', pos + 1);
+			if (next === -1) {
+				break;
+			}
+			pos = next;
+		}
+		return path.substring(pos);
+	}
+
+	test('stripPathSegments matches URI encoding for file URIs', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const originalPath = '/Users/roblou/code/vscode';
+		const encodedUri = agentHostUri(authority, originalPath);
+
+		const stripped = stripPath(encodedUri.path, AGENT_HOST_LABEL_FORMATTER.formatting.stripPathSegments!);
+		assert.strictEqual(stripped, originalPath);
+	});
+
+	test('stripPathSegments matches URI encoding with authority', () => {
+		const originalUri = URI.from({ scheme: 'agenthost-content', authority: 'myhost', path: '/snap/before' });
+		const encodedUri = toAgentHostUri(originalUri, 'remote-host');
+
+		const stripped = stripPath(encodedUri.path, AGENT_HOST_LABEL_FORMATTER.formatting.stripPathSegments!);
+		assert.strictEqual(stripped, '/snap/before');
+	});
+});
diff --git a/src/vs/platform/agentHost/test/common/agentService.test.ts b/src/vs/platform/agentHost/test/common/agentService.test.ts
new file mode 100644
index 00000000000..95cc3c8e787
--- /dev/null
+++ b/src/vs/platform/agentHost/test/common/agentService.test.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { AgentSession } from '../../common/agentService.js';
+
+suite('AgentSession namespace', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('uri creates a URI with provider as scheme and id as path', () => {
+		const session = AgentSession.uri('copilot', 'abc-123');
+		assert.strictEqual(session.scheme, 'copilot');
+		assert.strictEqual(session.path, '/abc-123');
+	});
+
+	test('id extracts the raw session ID from a session URI', () => {
+		const session = URI.from({ scheme: 'copilot', path: '/my-session-42' });
+		assert.strictEqual(AgentSession.id(session), 'my-session-42');
+	});
+
+	test('uri and id are inverse operations', () => {
+		const rawId = 'test-session-xyz';
+		const session = AgentSession.uri('copilot', rawId);
+		assert.strictEqual(AgentSession.id(session), rawId);
+	});
+
+	test('provider extracts copilot from a copilot-scheme URI', () => {
+		const session = AgentSession.uri('copilot', 'sess-1');
+		assert.strictEqual(AgentSession.provider(session), 'copilot');
+	});
+});
diff --git a/src/vs/platform/agentHost/test/electron-browser/remoteAgentHostService.test.ts b/src/vs/platform/agentHost/test/electron-browser/remoteAgentHostService.test.ts
new file mode 100644
index 00000000000..34aab19e92f
--- /dev/null
+++ b/src/vs/platform/agentHost/test/electron-browser/remoteAgentHostService.test.ts
@@ -0,0 +1,428 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ILogService, NullLogService } from '../../../log/common/log.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { IConfigurationService, type IConfigurationChangeEvent } from '../../../configuration/common/configuration.js';
+import { IInstantiationService } from '../../../instantiation/common/instantiation.js';
+import { RemoteAgentHostService } from '../../electron-browser/remoteAgentHostServiceImpl.js';
+import { parseRemoteAgentHostInput, RemoteAgentHostsEnabledSettingId, RemoteAgentHostsSettingId, type IRemoteAgentHostEntry } from '../../common/remoteAgentHostService.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+
+// ---- Mock protocol client ---------------------------------------------------
+
+class MockProtocolClient extends Disposable {
+	private static _nextId = 1;
+	readonly clientId = `mock-client-${MockProtocolClient._nextId++}`;
+
+	private readonly _onDidClose = this._register(new Emitter<void>());
+	readonly onDidClose = this._onDidClose.event;
+	readonly onDidAction = Event.None;
+	readonly onDidNotification = Event.None;
+
+	public connectDeferred = new DeferredPromise<void>();
+
+	constructor(public readonly mockAddress: string) {
+		super();
+	}
+
+	async connect(): Promise<void> {
+		return this.connectDeferred.p;
+	}
+
+	fireClose(): void {
+		this._onDidClose.fire();
+	}
+}
+
+// ---- Test configuration service ---------------------------------------------
+
+class TestConfigurationService {
+	private readonly _onDidChangeConfiguration = new Emitter<Partial<IConfigurationChangeEvent>>();
+	readonly onDidChangeConfiguration = this._onDidChangeConfiguration.event;
+
+	private _entries: IRemoteAgentHostEntry[] = [];
+	private _enabled = true;
+
+	getValue(key?: string): unknown {
+		if (key === RemoteAgentHostsEnabledSettingId) {
+			return this._enabled;
+		}
+		return this._entries;
+	}
+
+	inspect(_key: string) {
+		return {
+			userValue: this._entries,
+		};
+	}
+
+	async updateValue(_key: string, value: unknown): Promise<void> {
+		this.setEntries((value as IRemoteAgentHostEntry[] | undefined) ?? []);
+	}
+
+	get entries(): readonly IRemoteAgentHostEntry[] {
+		return this._entries;
+	}
+
+	setEntries(entries: IRemoteAgentHostEntry[]): void {
+		this._entries = entries;
+		this._onDidChangeConfiguration.fire({
+			affectsConfiguration: (key: string) => key === RemoteAgentHostsSettingId || key === RemoteAgentHostsEnabledSettingId,
+		});
+	}
+
+	setEnabled(enabled: boolean): void {
+		this._enabled = enabled;
+		this._onDidChangeConfiguration.fire({
+			affectsConfiguration: (key: string) => key === RemoteAgentHostsEnabledSettingId,
+		});
+	}
+
+	dispose(): void {
+		this._onDidChangeConfiguration.dispose();
+	}
+}
+
+suite('RemoteAgentHostService', () => {
+
+	const disposables = new DisposableStore();
+	let configService: TestConfigurationService;
+	let createdClients: MockProtocolClient[];
+	let service: RemoteAgentHostService;
+
+	setup(() => {
+		configService = new TestConfigurationService();
+		disposables.add(toDisposable(() => configService.dispose()));
+
+		createdClients = [];
+
+		const instantiationService = disposables.add(new TestInstantiationService());
+		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(IConfigurationService, configService as Partial<IConfigurationService>);
+
+		// Mock the instantiation service to capture created protocol clients
+		const mockInstantiationService: Partial<IInstantiationService> = {
+			createInstance: (_ctor: unknown, ...args: unknown[]) => {
+				const client = new MockProtocolClient(args[0] as string);
+				disposables.add(client);
+				createdClients.push(client);
+				return client;
+			},
+		};
+		instantiationService.stub(IInstantiationService, mockInstantiationService as Partial<IInstantiationService>);
+
+		service = disposables.add(instantiationService.createInstance(RemoteAgentHostService));
+	});
+
+	teardown(() => disposables.clear());
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('starts with no connections when setting is empty', () => {
+		assert.deepStrictEqual(service.connections, []);
+	});
+
+	test('parses supported remote host inputs', () => {
+		assert.deepStrictEqual([
+			parseRemoteAgentHostInput('Listening on ws://127.0.0.1:8089'),
+			parseRemoteAgentHostInput('Agent host proxy listening on ws://127.0.0.1:8089'),
+			parseRemoteAgentHostInput('127.0.0.1:8089'),
+			parseRemoteAgentHostInput('ws://127.0.0.1:8089'),
+			parseRemoteAgentHostInput('ws://127.0.0.1:40147?tkn=c9d12867-da33-425e-8d39-0d071e851597'),
+			parseRemoteAgentHostInput('wss://secure.example.com:443'),
+		], [
+			{ parsed: { address: '127.0.0.1:8089', connectionToken: undefined, suggestedName: '127.0.0.1:8089' } },
+			{ parsed: { address: '127.0.0.1:8089', connectionToken: undefined, suggestedName: '127.0.0.1:8089' } },
+			{ parsed: { address: '127.0.0.1:8089', connectionToken: undefined, suggestedName: '127.0.0.1:8089' } },
+			{ parsed: { address: '127.0.0.1:8089', connectionToken: undefined, suggestedName: '127.0.0.1:8089' } },
+			{ parsed: { address: '127.0.0.1:40147', connectionToken: 'c9d12867-da33-425e-8d39-0d071e851597', suggestedName: '127.0.0.1:40147' } },
+			{ parsed: { address: 'wss://secure.example.com', connectionToken: undefined, suggestedName: 'secure.example.com' } },
+		]);
+	});
+
+	test('getConnection returns undefined for unknown address', () => {
+		assert.strictEqual(service.getConnection('ws://unknown:1234'), undefined);
+	});
+
+	test('creates connection when setting is updated', async () => {
+		const connectionChanged = Event.toPromise(service.onDidChangeConnections);
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Host 1' }]);
+
+		// Resolve the connect promise
+		assert.strictEqual(createdClients.length, 1);
+		createdClients[0].connectDeferred.complete();
+		await connectionChanged;
+
+		assert.strictEqual(service.connections.length, 1);
+		assert.strictEqual(service.connections[0].address, 'host1:8080');
+		assert.strictEqual(service.connections[0].name, 'Host 1');
+	});
+
+	test('getConnection returns client after successful connect', async () => {
+		const connectionChanged = Event.toPromise(service.onDidChangeConnections);
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await connectionChanged;
+
+		const connection = service.getConnection('ws://host1:8080');
+		assert.ok(connection);
+		assert.strictEqual(connection.clientId, createdClients[0].clientId);
+	});
+
+	test('removes connection when setting entry is removed', async () => {
+		// Add a connection
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+
+		// Remove it
+		const removedEvent = Event.toPromise(service.onDidChangeConnections);
+		configService.setEntries([]);
+		await removedEvent;
+
+		assert.strictEqual(service.connections.length, 0);
+		assert.strictEqual(service.getConnection('ws://host1:8080'), undefined);
+	});
+
+	test('fires onDidChangeConnections when connection closes', async () => {
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+
+		// Simulate connection close
+		const closedEvent = Event.toPromise(service.onDidChangeConnections);
+		createdClients[0].fireClose();
+		await closedEvent;
+
+		assert.strictEqual(service.connections.length, 0);
+		assert.strictEqual(service.getConnection('ws://host1:8080'), undefined);
+	});
+
+	test('removes connection on connect failure', async () => {
+		configService.setEntries([{ address: 'ws://bad:9999', name: 'Bad' }]);
+		assert.strictEqual(createdClients.length, 1);
+
+		// Fail the connection
+		createdClients[0].connectDeferred.error(new Error('Connection refused'));
+
+		// Wait for async error handling
+		await new Promise(r => setTimeout(r, 10));
+
+		assert.strictEqual(service.connections.length, 0);
+		assert.strictEqual(service.getConnection('ws://bad:9999'), undefined);
+	});
+
+	test('manages multiple connections independently', async () => {
+		configService.setEntries([
+			{ address: 'ws://host1:8080', name: 'Host 1' },
+			{ address: 'ws://host2:8080', name: 'Host 2' },
+		]);
+
+		assert.strictEqual(createdClients.length, 2);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+		createdClients[1].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+
+		assert.strictEqual(service.connections.length, 2);
+
+		const conn1 = service.getConnection('ws://host1:8080');
+		const conn2 = service.getConnection('ws://host2:8080');
+		assert.ok(conn1);
+		assert.ok(conn2);
+		assert.notStrictEqual(conn1.clientId, conn2.clientId);
+	});
+
+	test('does not re-create existing connections on setting update', async () => {
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+
+		const firstClientId = createdClients[0].clientId;
+
+		// Update setting with same address (but different name)
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Renamed' }]);
+
+		// Should NOT have created a second client
+		assert.strictEqual(createdClients.length, 1);
+
+		// Connection should still work with same client
+		const conn = service.getConnection('ws://host1:8080');
+		assert.ok(conn);
+		assert.strictEqual(conn.clientId, firstClientId);
+
+		// But name should be updated
+		assert.strictEqual(service.connections[0].name, 'Renamed');
+	});
+
+	test('addRemoteAgentHost stores the entry and waits for connection', async () => {
+		const connectionPromise = service.addRemoteAgentHost({
+			address: 'ws://host1:8080',
+			name: 'Host 1',
+			connectionToken: 'secret-token',
+		});
+
+		assert.deepStrictEqual(configService.entries, [{
+			address: 'host1:8080',
+			name: 'Host 1',
+			connectionToken: 'secret-token',
+		}]);
+		assert.strictEqual(createdClients.length, 1);
+
+		createdClients[0].connectDeferred.complete();
+		const connection = await connectionPromise;
+
+		assert.deepStrictEqual(connection, {
+			address: 'host1:8080',
+			name: 'Host 1',
+			clientId: createdClients[0].clientId,
+			defaultDirectory: undefined,
+		});
+	});
+
+	test('addRemoteAgentHost updates existing configured entries without reconnecting', async () => {
+		configService.setEntries([{ address: 'ws://host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+
+		const connection = await service.addRemoteAgentHost({
+			address: 'ws://host1:8080',
+			name: 'Updated Host',
+			connectionToken: 'new-token',
+		});
+
+		assert.strictEqual(createdClients.length, 1);
+		assert.deepStrictEqual(configService.entries, [{
+			address: 'host1:8080',
+			name: 'Updated Host',
+			connectionToken: 'new-token',
+		}]);
+		assert.deepStrictEqual(connection, {
+			address: 'host1:8080',
+			name: 'Updated Host',
+			clientId: createdClients[0].clientId,
+			defaultDirectory: undefined,
+		});
+	});
+
+	test('addRemoteAgentHost appends when adding a second host', async () => {
+		// Add first host
+		const firstPromise = service.addRemoteAgentHost({
+			address: 'host1:8080',
+			name: 'Host 1',
+		});
+		createdClients[0].connectDeferred.complete();
+		await firstPromise;
+
+		// Add second host
+		const secondPromise = service.addRemoteAgentHost({
+			address: 'host2:9090',
+			name: 'Host 2',
+		});
+		createdClients[1].connectDeferred.complete();
+		await secondPromise;
+
+		assert.strictEqual(createdClients.length, 2);
+		assert.deepStrictEqual(configService.entries, [
+			{ address: 'host1:8080', name: 'Host 1' },
+			{ address: 'host2:9090', name: 'Host 2' },
+		]);
+		assert.strictEqual(service.connections.length, 2);
+	});
+
+	test('addRemoteAgentHost resolves when connection completes before wait is created', async () => {
+		// Simulate a fast connect: the mock client resolves synchronously
+		// during the config change handler, before addRemoteAgentHost has a
+		// chance to create its DeferredPromise wait.
+		const originalSetEntries = configService.setEntries.bind(configService);
+		configService.setEntries = (entries: IRemoteAgentHostEntry[]) => {
+			originalSetEntries(entries);
+			// Complete the connection synchronously inside the config change callback
+			if (createdClients.length > 0) {
+				createdClients[createdClients.length - 1].connectDeferred.complete();
+			}
+		};
+
+		const connection = await service.addRemoteAgentHost({
+			address: 'fast-host:1234',
+			name: 'Fast Host',
+		});
+
+		assert.strictEqual(connection.address, 'fast-host:1234');
+		assert.strictEqual(connection.name, 'Fast Host');
+	});
+
+	test('disabling the enabled setting disconnects all remotes', async () => {
+		configService.setEntries([{ address: 'host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+		assert.strictEqual(service.connections.length, 1);
+
+		configService.setEnabled(false);
+
+		assert.strictEqual(service.connections.length, 0);
+	});
+
+	test('addRemoteAgentHost throws when disabled', async () => {
+		configService.setEnabled(false);
+
+		await assert.rejects(
+			() => service.addRemoteAgentHost({ address: 'host1:8080', name: 'Host 1' }),
+			/not enabled/,
+		);
+	});
+
+	test('re-enabling reconnects configured remotes', async () => {
+		configService.setEntries([{ address: 'host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+		assert.strictEqual(service.connections.length, 1);
+
+		configService.setEnabled(false);
+		assert.strictEqual(service.connections.length, 0);
+
+		configService.setEnabled(true);
+		assert.strictEqual(createdClients.length, 2); // new client created
+		createdClients[1].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+		assert.strictEqual(service.connections.length, 1);
+	});
+
+	test('removeRemoteAgentHost removes entry and disconnects', async () => {
+		configService.setEntries([
+			{ address: 'ws://host1:8080', name: 'Host 1' },
+			{ address: 'ws://host2:9090', name: 'Host 2' },
+		]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+		createdClients[1].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+		assert.strictEqual(service.connections.length, 2);
+
+		await service.removeRemoteAgentHost('ws://host1:8080');
+
+		assert.deepStrictEqual(configService.entries, [
+			{ address: 'ws://host2:9090', name: 'Host 2' },
+		]);
+		assert.strictEqual(service.connections.length, 1);
+		assert.strictEqual(service.getConnection('ws://host1:8080'), undefined);
+		assert.ok(service.getConnection('ws://host2:9090'));
+	});
+
+	test('removeRemoteAgentHost normalizes address before removing', async () => {
+		configService.setEntries([{ address: 'host1:8080', name: 'Host 1' }]);
+		createdClients[0].connectDeferred.complete();
+		await Event.toPromise(service.onDidChangeConnections);
+
+		await service.removeRemoteAgentHost('ws://host1:8080');
+
+		assert.deepStrictEqual(configService.entries, []);
+		assert.strictEqual(service.connections.length, 0);
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/agentEventMapper.test.ts b/src/vs/platform/agentHost/test/node/agentEventMapper.test.ts
new file mode 100644
index 00000000000..a415f659573
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/agentEventMapper.test.ts
@@ -0,0 +1,250 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import type {
+	IAgentDeltaEvent,
+	IAgentErrorEvent,
+	IAgentIdleEvent,
+	IAgentMessageEvent,
+	IAgentReasoningEvent,
+	IAgentTitleChangedEvent,
+	IAgentToolCompleteEvent,
+	IAgentToolStartEvent,
+	IAgentUsageEvent,
+} from '../../common/agentService.js';
+import type {
+	IDeltaAction,
+	IReasoningAction,
+	IResponsePartAction,
+	ISessionAction,
+	ISessionErrorAction,
+	ITitleChangedAction,
+	IToolCallCompleteAction,
+	IToolCallReadyAction,
+	IToolCallStartAction,
+	ITurnCompleteAction,
+	IUsageAction,
+} from '../../common/state/sessionActions.js';
+import { ToolResultContentType, type IMarkdownResponsePart, type IReasoningResponsePart } from '../../common/state/sessionState.js';
+import { AgentEventMapper } from '../../node/agentEventMapper.js';
+
+/** Helper: flatten the result of mapProgressEventToActions into an array. */
+function mapToArray(result: ISessionAction | ISessionAction[] | undefined): ISessionAction[] {
+	if (!result) {
+		return [];
+	}
+	return Array.isArray(result) ? result : [result];
+}
+
+suite('AgentEventMapper', () => {
+
+	const session = URI.from({ scheme: 'copilot', path: '/test-session' });
+	const turnId = 'turn-1';
+	let mapper: AgentEventMapper;
+
+	setup(() => {
+		mapper = new AgentEventMapper();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('first delta event creates a responsePart with content', () => {
+		const event: IAgentDeltaEvent = {
+			session,
+			type: 'delta',
+			messageId: 'msg-1',
+			content: 'hello world',
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		assert.strictEqual(actions[0].type, 'session/responsePart');
+		const part = (actions[0] as IResponsePartAction).part;
+		assert.strictEqual(part.kind, 'markdown');
+		assert.strictEqual(part.content, 'hello world');
+		assert.ok(part.id);
+	});
+
+	test('subsequent delta event maps to session/delta action', () => {
+		const first: IAgentDeltaEvent = { session, type: 'delta', messageId: 'msg-1', content: 'hello ' };
+		const second: IAgentDeltaEvent = { session, type: 'delta', messageId: 'msg-1', content: 'world' };
+
+		const firstActions = mapToArray(mapper.mapProgressEventToActions(first, session.toString(), turnId));
+		const partId = ((firstActions[0] as IResponsePartAction).part as IMarkdownResponsePart).id;
+
+		const secondActions = mapToArray(mapper.mapProgressEventToActions(second, session.toString(), turnId));
+		assert.strictEqual(secondActions.length, 1);
+		const delta = secondActions[0] as IDeltaAction;
+		assert.strictEqual(delta.type, 'session/delta');
+		assert.strictEqual(delta.content, 'world');
+		assert.strictEqual(delta.partId, partId);
+	});
+
+	test('tool_start event maps to toolCallStart + toolCallReady actions', () => {
+		const event: IAgentToolStartEvent = {
+			session,
+			type: 'tool_start',
+			toolCallId: 'tc-1',
+			toolName: 'readFile',
+			displayName: 'Read File',
+			invocationMessage: 'Reading file...',
+			toolInput: '/src/foo.ts',
+			toolKind: 'terminal',
+			language: 'shellscript',
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 2);
+
+		const startAction = actions[0] as IToolCallStartAction;
+		assert.strictEqual(startAction.type, 'session/toolCallStart');
+		assert.strictEqual(startAction.toolCallId, 'tc-1');
+		assert.strictEqual(startAction.toolName, 'readFile');
+		assert.strictEqual(startAction.displayName, 'Read File');
+		assert.strictEqual(startAction._meta?.toolKind, 'terminal');
+		assert.strictEqual(startAction._meta?.language, 'shellscript');
+
+		const readyAction = actions[1] as IToolCallReadyAction;
+		assert.strictEqual(readyAction.type, 'session/toolCallReady');
+		assert.strictEqual(readyAction.toolCallId, 'tc-1');
+		assert.strictEqual(readyAction.invocationMessage, 'Reading file...');
+		assert.strictEqual(readyAction.toolInput, '/src/foo.ts');
+		assert.strictEqual(readyAction.confirmed, 'not-needed');
+	});
+
+	test('tool_complete event maps to session/toolCallComplete action', () => {
+		const event: IAgentToolCompleteEvent = {
+			session,
+			type: 'tool_complete',
+			toolCallId: 'tc-1',
+			result: {
+				success: true,
+				pastTenseMessage: 'Read file successfully',
+				content: [{ type: ToolResultContentType.Text, text: 'file contents here' }],
+			},
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		const complete = actions[0] as IToolCallCompleteAction;
+		assert.strictEqual(complete.type, 'session/toolCallComplete');
+		assert.strictEqual(complete.toolCallId, 'tc-1');
+		assert.strictEqual(complete.result.success, true);
+		assert.strictEqual(complete.result.pastTenseMessage, 'Read file successfully');
+		assert.deepStrictEqual(complete.result.content, [{ type: 'text', text: 'file contents here' }]);
+	});
+
+	test('idle event maps to session/turnComplete action', () => {
+		const event: IAgentIdleEvent = {
+			session,
+			type: 'idle',
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		const turnComplete = actions[0] as ITurnCompleteAction;
+		assert.strictEqual(turnComplete.type, 'session/turnComplete');
+		assert.strictEqual(turnComplete.session.toString(), session.toString());
+		assert.strictEqual(turnComplete.turnId, turnId);
+	});
+
+	test('error event maps to session/error action', () => {
+		const event: IAgentErrorEvent = {
+			session,
+			type: 'error',
+			errorType: 'runtime',
+			message: 'Something went wrong',
+			stack: 'Error: Something went wrong\n    at foo.ts:1',
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		const errorAction = actions[0] as ISessionErrorAction;
+		assert.strictEqual(errorAction.type, 'session/error');
+		assert.strictEqual(errorAction.error.errorType, 'runtime');
+		assert.strictEqual(errorAction.error.message, 'Something went wrong');
+		assert.strictEqual(errorAction.error.stack, 'Error: Something went wrong\n    at foo.ts:1');
+	});
+
+	test('usage event maps to session/usage action', () => {
+		const event: IAgentUsageEvent = {
+			session,
+			type: 'usage',
+			inputTokens: 100,
+			outputTokens: 50,
+			model: 'gpt-4',
+			cacheReadTokens: 25,
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		const usageAction = actions[0] as IUsageAction;
+		assert.strictEqual(usageAction.type, 'session/usage');
+		assert.strictEqual(usageAction.usage.inputTokens, 100);
+		assert.strictEqual(usageAction.usage.outputTokens, 50);
+		assert.strictEqual(usageAction.usage.model, 'gpt-4');
+		assert.strictEqual(usageAction.usage.cacheReadTokens, 25);
+	});
+
+	test('title_changed event maps to session/titleChanged action', () => {
+		const event: IAgentTitleChangedEvent = {
+			session,
+			type: 'title_changed',
+			title: 'New Title',
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		assert.strictEqual(actions[0].type, 'session/titleChanged');
+		assert.strictEqual((actions[0] as ITitleChangedAction).title, 'New Title');
+	});
+
+	test('first reasoning event creates a responsePart with content', () => {
+		const event: IAgentReasoningEvent = {
+			session,
+			type: 'reasoning',
+			content: 'Let me think about this...',
+		};
+
+		const actions = mapToArray(mapper.mapProgressEventToActions(event, session.toString(), turnId));
+		assert.strictEqual(actions.length, 1);
+		assert.strictEqual(actions[0].type, 'session/responsePart');
+		const part = (actions[0] as IResponsePartAction).part;
+		assert.strictEqual(part.kind, 'reasoning');
+		assert.strictEqual(part.content, 'Let me think about this...');
+		assert.ok(part.id);
+	});
+
+	test('subsequent reasoning event maps to session/reasoning action', () => {
+		const first: IAgentReasoningEvent = { session, type: 'reasoning', content: 'Let me think...' };
+		const second: IAgentReasoningEvent = { session, type: 'reasoning', content: ' more thoughts' };
+
+		const firstActions = mapToArray(mapper.mapProgressEventToActions(first, session.toString(), turnId));
+		const partId = ((firstActions[0] as IResponsePartAction).part as IReasoningResponsePart).id;
+
+		const secondActions = mapToArray(mapper.mapProgressEventToActions(second, session.toString(), turnId));
+		assert.strictEqual(secondActions.length, 1);
+		const reasoning = secondActions[0] as IReasoningAction;
+		assert.strictEqual(reasoning.type, 'session/reasoning');
+		assert.strictEqual(reasoning.content, ' more thoughts');
+		assert.strictEqual(reasoning.partId, partId);
+	});
+
+	test('message event returns undefined', () => {
+		const event: IAgentMessageEvent = {
+			session,
+			type: 'message',
+			role: 'assistant',
+			messageId: 'msg-1',
+			content: 'Some full message',
+		};
+
+		const result = mapper.mapProgressEventToActions(event, session.toString(), turnId);
+		assert.strictEqual(result, undefined);
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/agentService.test.ts b/src/vs/platform/agentHost/test/node/agentService.test.ts
new file mode 100644
index 00000000000..724044d8c3a
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/agentService.test.ts
@@ -0,0 +1,228 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { AgentSession } from '../../common/agentService.js';
+import { ISessionDataService } from '../../common/sessionDataService.js';
+import { ActionType, IActionEnvelope } from '../../common/state/sessionActions.js';
+import { AgentService } from '../../node/agentService.js';
+import { MockAgent } from './mockAgent.js';
+
+suite('AgentService (node dispatcher)', () => {
+
+	const disposables = new DisposableStore();
+	let service: AgentService;
+	let copilotAgent: MockAgent;
+
+	setup(() => {
+		const nullSessionDataService: ISessionDataService = {
+			_serviceBrand: undefined,
+			getSessionDataDir: () => URI.parse('inmemory:/session-data'),
+			getSessionDataDirById: () => URI.parse('inmemory:/session-data'),
+			deleteSessionData: async () => { },
+			cleanupOrphanedData: async () => { },
+		};
+		service = disposables.add(new AgentService(new NullLogService(), disposables.add(new FileService(new NullLogService())), nullSessionDataService));
+		copilotAgent = new MockAgent('copilot');
+		disposables.add(toDisposable(() => copilotAgent.dispose()));
+	});
+
+	teardown(() => disposables.clear());
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	// ---- Provider registration ------------------------------------------
+
+	suite('registerProvider', () => {
+
+		test('registers a provider successfully', () => {
+			service.registerProvider(copilotAgent);
+			// No throw - success
+		});
+
+		test('throws on duplicate provider registration', () => {
+			service.registerProvider(copilotAgent);
+			const duplicate = new MockAgent('copilot');
+			disposables.add(toDisposable(() => duplicate.dispose()));
+			assert.throws(() => service.registerProvider(duplicate), /already registered/);
+		});
+
+		test('maps progress events to protocol actions via onDidAction', async () => {
+			service.registerProvider(copilotAgent);
+			const session = await service.createSession({ provider: 'copilot' });
+
+			// Start a turn so there's an active turn to map events to
+			service.dispatchAction(
+				{ type: ActionType.SessionTurnStarted, session: session.toString(), turnId: 'turn-1', userMessage: { text: 'hello' } },
+				'test-client', 1,
+			);
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(service.onDidAction(e => envelopes.push(e)));
+
+			copilotAgent.fireProgress({ session, type: 'delta', messageId: 'msg-1', content: 'hello' });
+			assert.ok(envelopes.some(e => e.action.type === ActionType.SessionResponsePart));
+		});
+	});
+
+	// ---- listAgents -----------------------------------------------------
+
+	suite('listAgents', () => {
+
+		test('returns descriptors from all registered providers', async () => {
+			service.registerProvider(copilotAgent);
+
+			const agents = await service.listAgents();
+			assert.strictEqual(agents.length, 1);
+			assert.ok(agents.some(a => a.provider === 'copilot'));
+		});
+
+		test('returns empty array when no providers are registered', async () => {
+			const agents = await service.listAgents();
+			assert.strictEqual(agents.length, 0);
+		});
+	});
+
+	// ---- createSession --------------------------------------------------
+
+	suite('createSession', () => {
+
+		test('creates session via specified provider', async () => {
+			service.registerProvider(copilotAgent);
+
+			const session = await service.createSession({ provider: 'copilot' });
+			assert.strictEqual(AgentSession.provider(session), 'copilot');
+		});
+
+		test('uses default provider when none specified', async () => {
+			service.registerProvider(copilotAgent);
+
+			const session = await service.createSession();
+			assert.strictEqual(AgentSession.provider(session), 'copilot');
+		});
+
+		test('throws when no providers are registered at all', async () => {
+			await assert.rejects(() => service.createSession(), /No agent provider/);
+		});
+	});
+
+	// ---- disposeSession -------------------------------------------------
+
+	suite('disposeSession', () => {
+
+		test('dispatches to the correct provider and cleans up tracking', async () => {
+			service.registerProvider(copilotAgent);
+
+			const session = await service.createSession({ provider: 'copilot' });
+			await service.disposeSession(session);
+
+			assert.strictEqual(copilotAgent.disposeSessionCalls.length, 1);
+		});
+
+		test('is a no-op for unknown sessions', async () => {
+			service.registerProvider(copilotAgent);
+			const unknownSession = URI.from({ scheme: 'unknown', path: '/nope' });
+
+			// Should not throw
+			await service.disposeSession(unknownSession);
+		});
+	});
+
+	// ---- listSessions / listModels --------------------------------------
+
+	suite('aggregation', () => {
+
+		test('listSessions aggregates sessions from all providers', async () => {
+			service.registerProvider(copilotAgent);
+
+			await service.createSession({ provider: 'copilot' });
+
+			const sessions = await service.listSessions();
+			assert.strictEqual(sessions.length, 1);
+		});
+
+		test('refreshModels publishes models in root state via agentsChanged', async () => {
+			service.registerProvider(copilotAgent);
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(service.onDidAction(e => envelopes.push(e)));
+
+			service.refreshModels();
+
+			// Model fetch is async inside AgentSideEffects — wait for it
+			await new Promise(r => setTimeout(r, 50));
+
+			const agentsChanged = envelopes.find(e => e.action.type === ActionType.RootAgentsChanged);
+			assert.ok(agentsChanged);
+		});
+	});
+
+	// ---- getResourceMetadata --------------------------------------------
+
+	suite('getResourceMetadata', () => {
+
+		test('aggregates protected resources from all providers', async () => {
+			service.registerProvider(copilotAgent);
+
+			const mockAgent = new MockAgent('other');
+			disposables.add(toDisposable(() => mockAgent.dispose()));
+			service.registerProvider(mockAgent);
+
+			const metadata = await service.getResourceMetadata();
+			// copilot agent returns one resource (https://api.github.com),
+			// generic MockAgent('other') returns empty
+			assert.deepStrictEqual(metadata, {
+				resources: [{ resource: 'https://api.github.com', authorization_servers: ['https://github.com/login/oauth'] }],
+			});
+		});
+
+		test('returns empty resources when no providers registered', async () => {
+			const metadata = await service.getResourceMetadata();
+			assert.deepStrictEqual(metadata, { resources: [] });
+		});
+	});
+
+	// ---- authenticate ---------------------------------------------------
+
+	suite('authenticate', () => {
+
+		test('routes token to provider matching the resource', async () => {
+			service.registerProvider(copilotAgent);
+
+			const result = await service.authenticate({ resource: 'https://api.github.com', token: 'ghp_test123' });
+
+			assert.deepStrictEqual(result, { authenticated: true });
+			assert.deepStrictEqual(copilotAgent.authenticateCalls, [{ resource: 'https://api.github.com', token: 'ghp_test123' }]);
+		});
+
+		test('returns not authenticated for unknown resource', async () => {
+			service.registerProvider(copilotAgent);
+
+			const result = await service.authenticate({ resource: 'https://unknown.example.com', token: 'tok' });
+
+			assert.deepStrictEqual(result, { authenticated: false });
+			assert.strictEqual(copilotAgent.authenticateCalls.length, 0);
+		});
+	});
+
+	// ---- shutdown -------------------------------------------------------
+
+	suite('shutdown', () => {
+
+		test('shuts down all providers', async () => {
+			let copilotShutdown = false;
+			copilotAgent.shutdown = async () => { copilotShutdown = true; };
+
+			service.registerProvider(copilotAgent);
+
+			await service.shutdown();
+			assert.ok(copilotShutdown);
+		});
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts b/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts
new file mode 100644
index 00000000000..3d36928963b
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/agentSideEffects.test.ts
@@ -0,0 +1,725 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { AgentSession, IAgent } from '../../common/agentService.js';
+import { ISessionDataService } from '../../common/sessionDataService.js';
+import { ActionType, IActionEnvelope, ISessionAction } from '../../common/state/sessionActions.js';
+import { PendingMessageKind, ResponsePartKind, SessionLifecycle, SessionStatus, ToolCallConfirmationReason, ToolCallStatus, ToolResultContentType, TurnState, type IMarkdownResponsePart, type IToolCallCompletedState, type IToolCallResponsePart } from '../../common/state/sessionState.js';
+import { AgentSideEffects } from '../../node/agentSideEffects.js';
+import { SessionStateManager } from '../../node/sessionStateManager.js';
+import { MockAgent } from './mockAgent.js';
+
+// ---- Tests ------------------------------------------------------------------
+
+suite('AgentSideEffects', () => {
+
+	const disposables = new DisposableStore();
+	let fileService: FileService;
+	let stateManager: SessionStateManager;
+	let agent: MockAgent;
+	let sideEffects: AgentSideEffects;
+	let agentList: ReturnType<typeof observableValue<readonly IAgent[]>>;
+
+	const sessionUri = AgentSession.uri('mock', 'session-1');
+
+	function setupSession(): void {
+		stateManager.createSession({
+			resource: sessionUri.toString(),
+			provider: 'mock',
+			title: 'Test',
+			status: SessionStatus.Idle,
+			createdAt: Date.now(),
+			modifiedAt: Date.now(),
+		});
+		stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri.toString() });
+	}
+
+	function startTurn(turnId: string): void {
+		stateManager.dispatchClientAction(
+			{ type: ActionType.SessionTurnStarted, session: sessionUri.toString(), turnId, userMessage: { text: 'hello' } },
+			{ clientId: 'test', clientSeq: 1 },
+		);
+	}
+
+	setup(async () => {
+		fileService = disposables.add(new FileService(new NullLogService()));
+		const memFs = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(Schemas.inMemory, memFs));
+
+		// Seed a file so the handleBrowseDirectory tests can distinguish files from dirs
+		const testDir = URI.from({ scheme: Schemas.inMemory, path: '/testDir' });
+		await fileService.createFolder(testDir);
+		await fileService.writeFile(URI.from({ scheme: Schemas.inMemory, path: '/testDir/file.txt' }), VSBuffer.fromString('hello'));
+
+		agent = new MockAgent();
+		disposables.add(toDisposable(() => agent.dispose()));
+		stateManager = disposables.add(new SessionStateManager(new NullLogService()));
+		agentList = observableValue<readonly IAgent[]>('agents', [agent]);
+		sideEffects = disposables.add(new AgentSideEffects(stateManager, {
+			getAgent: () => agent,
+			agents: agentList,
+			sessionDataService: {
+				_serviceBrand: undefined,
+				getSessionDataDir: () => URI.from({ scheme: Schemas.inMemory, path: '/session-data' }),
+				getSessionDataDirById: () => URI.from({ scheme: Schemas.inMemory, path: '/session-data' }),
+				deleteSessionData: async () => { },
+				cleanupOrphanedData: async () => { },
+			} satisfies ISessionDataService,
+		}, new NullLogService(), fileService));
+	});
+
+	teardown(() => {
+		disposables.clear();
+	});
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	// ---- handleAction: session/turnStarted ------------------------------
+
+	suite('handleAction — session/turnStarted', () => {
+
+		test('calls sendMessage on the agent', async () => {
+			setupSession();
+			const action: ISessionAction = {
+				type: ActionType.SessionTurnStarted,
+				session: sessionUri.toString(),
+				turnId: 'turn-1',
+				userMessage: { text: 'hello world' },
+			};
+			sideEffects.handleAction(action);
+
+			// sendMessage is async but fire-and-forget; wait a tick
+			await new Promise(r => setTimeout(r, 10));
+
+			assert.deepStrictEqual(agent.sendMessageCalls, [{ session: URI.parse(sessionUri.toString()), prompt: 'hello world' }]);
+		});
+
+		test('dispatches session/error when no agent is found', async () => {
+			setupSession();
+			const emptyAgents = observableValue<readonly IAgent[]>('agents', []);
+			const noAgentSideEffects = disposables.add(new AgentSideEffects(stateManager, {
+				getAgent: () => undefined,
+				agents: emptyAgents,
+				sessionDataService: {} as ISessionDataService,
+			}, new NullLogService(), fileService));
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+			noAgentSideEffects.handleAction({
+				type: ActionType.SessionTurnStarted,
+				session: sessionUri.toString(),
+				turnId: 'turn-1',
+				userMessage: { text: 'hello' },
+			});
+
+			const errorAction = envelopes.find(e => e.action.type === ActionType.SessionError);
+			assert.ok(errorAction, 'should dispatch session/error');
+		});
+	});
+
+	// ---- handleAction: session/turnCancelled ----------------------------
+
+	suite('handleAction — session/turnCancelled', () => {
+
+		test('calls abortSession on the agent', async () => {
+			setupSession();
+			sideEffects.handleAction({
+				type: ActionType.SessionTurnCancelled,
+				session: sessionUri.toString(),
+				turnId: 'turn-1',
+			});
+
+			await new Promise(r => setTimeout(r, 10));
+
+			assert.deepStrictEqual(agent.abortSessionCalls, [URI.parse(sessionUri.toString())]);
+		});
+	});
+
+	// ---- handleAction: session/modelChanged -----------------------------
+
+	suite('handleAction — session/modelChanged', () => {
+
+		test('calls changeModel on the agent', async () => {
+			setupSession();
+			sideEffects.handleAction({
+				type: ActionType.SessionModelChanged,
+				session: sessionUri.toString(),
+				model: 'gpt-5',
+			});
+
+			await new Promise(r => setTimeout(r, 10));
+
+			assert.deepStrictEqual(agent.changeModelCalls, [{ session: URI.parse(sessionUri.toString()), model: 'gpt-5' }]);
+		});
+	});
+
+	// ---- registerProgressListener ---------------------------------------
+
+	suite('registerProgressListener', () => {
+
+		test('maps agent progress events to state actions', () => {
+			setupSession();
+			startTurn('turn-1');
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+			disposables.add(sideEffects.registerProgressListener(agent));
+
+			agent.fireProgress({ session: sessionUri, type: 'delta', messageId: 'msg-1', content: 'hi' });
+
+			// First delta creates a response part (not a delta action)
+			assert.ok(envelopes.some(e => e.action.type === ActionType.SessionResponsePart));
+		});
+
+		test('returns a disposable that stops listening', () => {
+			setupSession();
+			startTurn('turn-1');
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+			const listener = sideEffects.registerProgressListener(agent);
+
+			agent.fireProgress({ session: sessionUri, type: 'delta', messageId: 'msg-1', content: 'before' });
+			assert.strictEqual(envelopes.filter(e => e.action.type === ActionType.SessionResponsePart).length, 1);
+
+			listener.dispose();
+			agent.fireProgress({ session: sessionUri, type: 'delta', messageId: 'msg-2', content: 'after' });
+			assert.strictEqual(envelopes.filter(e => e.action.type === ActionType.SessionResponsePart).length, 1);
+		});
+	});
+
+	// ---- handleCreateSession --------------------------------------------
+
+	suite('handleCreateSession', () => {
+
+		test('creates a session and dispatches session/ready', async () => {
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+			await sideEffects.handleCreateSession({ session: sessionUri.toString(), provider: 'mock' });
+
+			const ready = envelopes.find(e => e.action.type === ActionType.SessionReady);
+			assert.ok(ready, 'should dispatch session/ready');
+		});
+
+		test('throws when no provider is specified', async () => {
+			await assert.rejects(
+				() => sideEffects.handleCreateSession({ session: sessionUri.toString() }),
+				/No provider specified/,
+			);
+		});
+
+		test('throws when no agent matches provider', async () => {
+			const emptyAgents = observableValue<readonly IAgent[]>('agents', []);
+			const noAgentSideEffects = disposables.add(new AgentSideEffects(stateManager, {
+				getAgent: () => undefined,
+				agents: emptyAgents,
+				sessionDataService: {} as ISessionDataService,
+			}, new NullLogService(), fileService));
+
+			await assert.rejects(
+				() => noAgentSideEffects.handleCreateSession({ session: sessionUri.toString(), provider: 'nonexistent' }),
+				/No agent registered/,
+			);
+		});
+	});
+
+	// ---- handleDisposeSession -------------------------------------------
+
+	suite('handleDisposeSession', () => {
+
+		test('disposes the session on the agent and removes state', async () => {
+			setupSession();
+
+			sideEffects.handleDisposeSession(sessionUri.toString());
+
+			await new Promise(r => setTimeout(r, 10));
+
+			assert.strictEqual(agent.disposeSessionCalls.length, 1);
+			assert.strictEqual(stateManager.getSessionState(sessionUri.toString()), undefined);
+		});
+	});
+
+	// ---- handleListSessions ---------------------------------------------
+
+	suite('handleListSessions', () => {
+
+		test('aggregates sessions from all agents', async () => {
+			await agent.createSession();
+			const sessions = await sideEffects.handleListSessions();
+			assert.strictEqual(sessions.length, 1);
+			assert.strictEqual(sessions[0].provider, 'mock');
+			assert.strictEqual(sessions[0].title, 'Session');
+		});
+	});
+
+	// ---- handleRestoreSession -----------------------------------------------
+
+	suite('handleRestoreSession', () => {
+
+		test('restores a session with message history into the state manager', async () => {
+			// Create a session on the agent backend (not in the state manager)
+			const session = await agent.createSession();
+			const sessions = await agent.listSessions();
+			const sessionResource = sessions[0].session.toString();
+
+			// Set up the agent's stored messages
+			agent.sessionMessages = [
+				{ type: 'message', session, role: 'user', messageId: 'msg-1', content: 'Hello', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-2', content: 'Hi there!', toolRequests: [] },
+			];
+
+			// Before restore, state manager shouldn't have it
+			assert.strictEqual(stateManager.getSessionState(sessionResource), undefined);
+
+			await sideEffects.handleRestoreSession(sessionResource);
+
+			// After restore, state manager should have it
+			const state = stateManager.getSessionState(sessionResource);
+			assert.ok(state, 'session should be in state manager');
+			assert.strictEqual(state!.lifecycle, SessionLifecycle.Ready);
+			assert.strictEqual(state!.turns.length, 1);
+			assert.strictEqual(state!.turns[0].userMessage.text, 'Hello');
+			const mdPart = state!.turns[0].responseParts.find((p): p is IMarkdownResponsePart => p.kind === ResponsePartKind.Markdown);
+			assert.ok(mdPart, 'should have a markdown response part');
+			assert.strictEqual(mdPart.content, 'Hi there!');
+			assert.strictEqual(state!.turns[0].state, TurnState.Complete);
+		});
+
+		test('restores a session with tool calls', async () => {
+			const session = await agent.createSession();
+			const sessions = await agent.listSessions();
+			const sessionResource = sessions[0].session.toString();
+
+			agent.sessionMessages = [
+				{ type: 'message', session, role: 'user', messageId: 'msg-1', content: 'Run a command', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-2', content: 'I will run a command.', toolRequests: [{ toolCallId: 'tc-1', name: 'shell' }] },
+				{ type: 'tool_start', session, toolCallId: 'tc-1', toolName: 'shell', displayName: 'Shell', invocationMessage: 'Running command...' },
+				{ type: 'tool_complete', session, toolCallId: 'tc-1', result: { success: true, pastTenseMessage: 'Ran command', content: [{ type: ToolResultContentType.Text, text: 'output' }] } },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-3', content: 'Done!', toolRequests: [] },
+			];
+
+			await sideEffects.handleRestoreSession(sessionResource);
+
+			const state = stateManager.getSessionState(sessionResource);
+			assert.ok(state);
+			assert.strictEqual(state!.turns.length, 1);
+
+			const turn = state!.turns[0];
+			const toolCallParts = turn.responseParts.filter((p): p is IToolCallResponsePart => p.kind === ResponsePartKind.ToolCall);
+			assert.strictEqual(toolCallParts.length, 1);
+			const tc = toolCallParts[0].toolCall as IToolCallCompletedState;
+			assert.strictEqual(tc.status, ToolCallStatus.Completed);
+			assert.strictEqual(tc.toolCallId, 'tc-1');
+			assert.strictEqual(tc.toolName, 'shell');
+			assert.strictEqual(tc.displayName, 'Shell');
+			assert.strictEqual(tc.success, true);
+			assert.strictEqual(tc.confirmed, ToolCallConfirmationReason.NotNeeded);
+		});
+
+		test('restores a session with multiple turns', async () => {
+			const session = await agent.createSession();
+			const sessions = await agent.listSessions();
+			const sessionResource = sessions[0].session.toString();
+
+			agent.sessionMessages = [
+				{ type: 'message', session, role: 'user', messageId: 'msg-1', content: 'First question', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-2', content: 'First answer', toolRequests: [] },
+				{ type: 'message', session, role: 'user', messageId: 'msg-3', content: 'Second question', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-4', content: 'Second answer', toolRequests: [] },
+			];
+
+			await sideEffects.handleRestoreSession(sessionResource);
+
+			const state = stateManager.getSessionState(sessionResource);
+			assert.ok(state);
+			assert.strictEqual(state!.turns.length, 2);
+			assert.strictEqual(state!.turns[0].userMessage.text, 'First question');
+			const mdPart0 = state!.turns[0].responseParts.find((p): p is IMarkdownResponsePart => p.kind === ResponsePartKind.Markdown);
+			assert.strictEqual(mdPart0?.content, 'First answer');
+			assert.strictEqual(state!.turns[1].userMessage.text, 'Second question');
+			const mdPart1 = state!.turns[1].responseParts.find((p): p is IMarkdownResponsePart => p.kind === ResponsePartKind.Markdown);
+			assert.strictEqual(mdPart1?.content, 'Second answer');
+		});
+
+		test('flushes interrupted turns when user message arrives without closing assistant message', async () => {
+			const session = await agent.createSession();
+			const sessions = await agent.listSessions();
+			const sessionResource = sessions[0].session.toString();
+
+			agent.sessionMessages = [
+				{ type: 'message', session, role: 'user', messageId: 'msg-1', content: 'Interrupted question', toolRequests: [] },
+				// No assistant message - the turn was interrupted
+				{ type: 'message', session, role: 'user', messageId: 'msg-2', content: 'Retried question', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-3', content: 'Answer', toolRequests: [] },
+			];
+
+			await sideEffects.handleRestoreSession(sessionResource);
+
+			const state = stateManager.getSessionState(sessionResource);
+			assert.ok(state);
+			assert.strictEqual(state!.turns.length, 2);
+			assert.strictEqual(state!.turns[0].userMessage.text, 'Interrupted question');
+			const mdPart0 = state!.turns[0].responseParts.find((p): p is IMarkdownResponsePart => p.kind === ResponsePartKind.Markdown);
+			assert.ok(!mdPart0 || mdPart0.content === '', 'interrupted turn should have empty response');
+			assert.strictEqual(state!.turns[0].state, TurnState.Cancelled);
+			assert.strictEqual(state!.turns[1].userMessage.text, 'Retried question');
+			const mdPart1 = state!.turns[1].responseParts.find((p): p is IMarkdownResponsePart => p.kind === ResponsePartKind.Markdown);
+			assert.strictEqual(mdPart1?.content, 'Answer');
+			assert.strictEqual(state!.turns[1].state, TurnState.Complete);
+		});
+
+		test('is a no-op for a session already in the state manager', async () => {
+			setupSession();
+			// Should not throw or create a duplicate
+			await sideEffects.handleRestoreSession(sessionUri.toString());
+			assert.ok(stateManager.getSessionState(sessionUri.toString()));
+		});
+
+		test('throws when no agent found for session', async () => {
+			const noAgentSideEffects = disposables.add(new AgentSideEffects(stateManager, {
+				getAgent: () => undefined,
+				agents: observableValue<readonly IAgent[]>('agents', []),
+				sessionDataService: {} as ISessionDataService,
+			}, new NullLogService(), fileService));
+
+			await assert.rejects(
+				() => noAgentSideEffects.handleRestoreSession('unknown://session-1'),
+				/No agent for session/,
+			);
+		});
+
+		test('response parts include markdown segments', async () => {
+			const session = await agent.createSession();
+			const sessions = await agent.listSessions();
+			const sessionResource = sessions[0].session.toString();
+
+			agent.sessionMessages = [
+				{ type: 'message', session, role: 'user', messageId: 'msg-1', content: 'hello', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-2', content: 'response text', toolRequests: [] },
+			];
+
+			await sideEffects.handleRestoreSession(sessionResource);
+
+			const state = stateManager.getSessionState(sessionResource);
+			assert.ok(state);
+			assert.strictEqual(state!.turns[0].responseParts.length, 1);
+			assert.strictEqual(state!.turns[0].responseParts[0].kind, ResponsePartKind.Markdown);
+			assert.strictEqual(state!.turns[0].responseParts[0].content, 'response text');
+		});
+
+		test('throws when session is not found on backend', async () => {
+			// Agent exists but session is not in listSessions
+			await assert.rejects(
+				() => sideEffects.handleRestoreSession(AgentSession.uri('mock', 'nonexistent').toString()),
+				/Session not found on backend/,
+			);
+		});
+
+		test('preserves workingDirectory from agent metadata', async () => {
+			agent.sessionMetadataOverrides = { workingDirectory: '/home/user/project' };
+			const session = await agent.createSession();
+			const sessions = await agent.listSessions();
+			const sessionResource = sessions[0].session.toString();
+
+			agent.sessionMessages = [
+				{ type: 'message', session, role: 'user', messageId: 'msg-1', content: 'hi', toolRequests: [] },
+				{ type: 'message', session, role: 'assistant', messageId: 'msg-2', content: 'hello', toolRequests: [] },
+			];
+
+			await sideEffects.handleRestoreSession(sessionResource);
+
+			const state = stateManager.getSessionState(sessionResource);
+			assert.ok(state);
+			assert.strictEqual(state!.summary.workingDirectory, '/home/user/project');
+		});
+	});
+
+	// ---- handleBrowseDirectory ------------------------------------------
+
+	suite('handleBrowseDirectory', () => {
+
+		test('throws when the directory does not exist', async () => {
+			await assert.rejects(
+				() => sideEffects.handleBrowseDirectory(URI.from({ scheme: Schemas.inMemory, path: '/nonexistent' }).toString()),
+				/Directory not found/,
+			);
+		});
+
+		test('throws when the target is not a directory', async () => {
+			await assert.rejects(
+				() => sideEffects.handleBrowseDirectory(URI.from({ scheme: Schemas.inMemory, path: '/testDir/file.txt' }).toString()),
+				/Not a directory/,
+			);
+		});
+	});
+
+	// ---- agents observable --------------------------------------------------
+
+	suite('agents observable', () => {
+
+		test('dispatches root/agentsChanged when observable changes', async () => {
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+			agentList.set([agent], undefined);
+
+			// Model fetch is async — wait for it
+			await new Promise(r => setTimeout(r, 50));
+
+			const action = envelopes.find(e => e.action.type === ActionType.RootAgentsChanged);
+			assert.ok(action, 'should dispatch root/agentsChanged');
+		});
+	});
+
+	// ---- handleGetResourceMetadata / handleAuthenticate -----------------
+
+	suite('auth', () => {
+
+		test('handleGetResourceMetadata aggregates resources from agents', () => {
+			agentList.set([agent], undefined);
+
+			const metadata = sideEffects.handleGetResourceMetadata();
+			assert.strictEqual(metadata.resources.length, 0, 'mock agent has no protected resources');
+		});
+
+		test('handleGetResourceMetadata returns resources when agent declares them', () => {
+			const copilotAgent = new MockAgent('copilot');
+			disposables.add(toDisposable(() => copilotAgent.dispose()));
+			agentList.set([copilotAgent], undefined);
+
+			const metadata = sideEffects.handleGetResourceMetadata();
+			assert.strictEqual(metadata.resources.length, 1);
+			assert.strictEqual(metadata.resources[0].resource, 'https://api.github.com');
+		});
+
+		test('handleAuthenticate returns authenticated for matching resource', async () => {
+			const copilotAgent = new MockAgent('copilot');
+			disposables.add(toDisposable(() => copilotAgent.dispose()));
+			agentList.set([copilotAgent], undefined);
+
+			const result = await sideEffects.handleAuthenticate({ resource: 'https://api.github.com', token: 'test-token' });
+			assert.deepStrictEqual(result, { authenticated: true });
+			assert.deepStrictEqual(copilotAgent.authenticateCalls, [{ resource: 'https://api.github.com', token: 'test-token' }]);
+		});
+
+		test('handleAuthenticate returns not authenticated for non-matching resource', async () => {
+			agentList.set([agent], undefined);
+
+			const result = await sideEffects.handleAuthenticate({ resource: 'https://unknown.example.com', token: 'test-token' });
+			assert.deepStrictEqual(result, { authenticated: false });
+		});
+	});
+
+	// ---- Pending message sync -----------------------------------------------
+
+	suite('pending message sync', () => {
+
+		test('syncs steering message to agent on SessionPendingMessageSet', () => {
+			setupSession();
+
+			const action = {
+				type: ActionType.SessionPendingMessageSet as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Steering,
+				id: 'steer-1',
+				userMessage: { text: 'focus on tests' },
+			};
+			stateManager.dispatchClientAction(action, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(action);
+
+			assert.strictEqual(agent.setPendingMessagesCalls.length, 1);
+			assert.deepStrictEqual(agent.setPendingMessagesCalls[0].steeringMessage, { id: 'steer-1', userMessage: { text: 'focus on tests' } });
+			assert.deepStrictEqual(agent.setPendingMessagesCalls[0].queuedMessages, []);
+		});
+
+		test('syncs queued message to agent on SessionPendingMessageSet', () => {
+			setupSession();
+
+			const action = {
+				type: ActionType.SessionPendingMessageSet as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Queued,
+				id: 'q-1',
+				userMessage: { text: 'queued message' },
+			};
+			stateManager.dispatchClientAction(action, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(action);
+
+			// Queued messages are not forwarded to the agent; the server controls consumption
+			assert.strictEqual(agent.setPendingMessagesCalls.length, 1);
+			assert.strictEqual(agent.setPendingMessagesCalls[0].steeringMessage, undefined);
+			assert.deepStrictEqual(agent.setPendingMessagesCalls[0].queuedMessages, []);
+
+			// Session was idle, so the queued message is consumed immediately
+			assert.strictEqual(agent.sendMessageCalls.length, 1);
+			assert.strictEqual(agent.sendMessageCalls[0].prompt, 'queued message');
+		});
+
+		test('syncs on SessionPendingMessageRemoved', () => {
+			setupSession();
+
+			// Add a queued message
+			const setAction = {
+				type: ActionType.SessionPendingMessageSet as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Queued,
+				id: 'q-rm',
+				userMessage: { text: 'will be removed' },
+			};
+			stateManager.dispatchClientAction(setAction, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(setAction);
+
+			agent.setPendingMessagesCalls.length = 0;
+
+			// Remove
+			const removeAction = {
+				type: ActionType.SessionPendingMessageRemoved as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Queued,
+				id: 'q-rm',
+			};
+			stateManager.dispatchClientAction(removeAction, { clientId: 'test', clientSeq: 2 });
+			sideEffects.handleAction(removeAction);
+
+			assert.strictEqual(agent.setPendingMessagesCalls.length, 1);
+			assert.deepStrictEqual(agent.setPendingMessagesCalls[0].queuedMessages, []);
+		});
+
+		test('syncs on SessionQueuedMessagesReordered', () => {
+			setupSession();
+
+			// Add two queued messages
+			const setA = { type: ActionType.SessionPendingMessageSet as const, session: sessionUri.toString(), kind: PendingMessageKind.Queued, id: 'q-a', userMessage: { text: 'A' } };
+			stateManager.dispatchClientAction(setA, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(setA);
+
+			const setB = { type: ActionType.SessionPendingMessageSet as const, session: sessionUri.toString(), kind: PendingMessageKind.Queued, id: 'q-b', userMessage: { text: 'B' } };
+			stateManager.dispatchClientAction(setB, { clientId: 'test', clientSeq: 2 });
+			sideEffects.handleAction(setB);
+
+			agent.setPendingMessagesCalls.length = 0;
+
+			// Reorder
+			const reorderAction = { type: ActionType.SessionQueuedMessagesReordered as const, session: sessionUri.toString(), order: ['q-b', 'q-a'] };
+			stateManager.dispatchClientAction(reorderAction, { clientId: 'test', clientSeq: 3 });
+			sideEffects.handleAction(reorderAction);
+
+			assert.strictEqual(agent.setPendingMessagesCalls.length, 1);
+			assert.deepStrictEqual(agent.setPendingMessagesCalls[0].queuedMessages, []);
+		});
+	});
+
+	// ---- Queued message consumption -----------------------------------------
+
+	suite('queued message consumption', () => {
+
+		test('auto-starts turn from queued message on idle', () => {
+			setupSession();
+			disposables.add(sideEffects.registerProgressListener(agent));
+
+			// Queue a message while a turn is active
+			startTurn('turn-1');
+			const setAction = {
+				type: ActionType.SessionPendingMessageSet as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Queued,
+				id: 'q-auto',
+				userMessage: { text: 'auto queued' },
+			};
+			stateManager.dispatchClientAction(setAction, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(setAction);
+
+			// Message should NOT be consumed yet (turn is active)
+			assert.strictEqual(agent.sendMessageCalls.length, 0);
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+			// Fire idle → turn completes → queued message should be consumed
+			agent.fireProgress({ session: sessionUri, type: 'idle' });
+
+			const turnComplete = envelopes.find(e => e.action.type === ActionType.SessionTurnComplete);
+			assert.ok(turnComplete, 'should dispatch session/turnComplete');
+
+			const turnStarted = envelopes.find(e => e.action.type === ActionType.SessionTurnStarted);
+			assert.ok(turnStarted, 'should dispatch session/turnStarted for queued message');
+			assert.strictEqual((turnStarted!.action as { queuedMessageId?: string }).queuedMessageId, 'q-auto');
+
+			assert.strictEqual(agent.sendMessageCalls.length, 1);
+			assert.strictEqual(agent.sendMessageCalls[0].prompt, 'auto queued');
+
+			// Queued message should be removed from state
+			const state = stateManager.getSessionState(sessionUri.toString());
+			assert.strictEqual(state?.queuedMessages, undefined);
+		});
+
+		test('does not consume queued message while a turn is active', () => {
+			setupSession();
+			startTurn('turn-1');
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+			const setAction = {
+				type: ActionType.SessionPendingMessageSet as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Queued,
+				id: 'q-wait',
+				userMessage: { text: 'should wait' },
+			};
+			stateManager.dispatchClientAction(setAction, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(setAction);
+
+			// No turn started for the queued message
+			const turnStarted = envelopes.find(e => e.action.type === ActionType.SessionTurnStarted);
+			assert.strictEqual(turnStarted, undefined, 'should not start a turn while one is active');
+			assert.strictEqual(agent.sendMessageCalls.length, 0);
+
+			// Queued message still in state
+			const state = stateManager.getSessionState(sessionUri.toString());
+			assert.strictEqual(state?.queuedMessages?.length, 1);
+			assert.strictEqual(state?.queuedMessages?.[0].id, 'q-wait');
+		});
+
+		test('dispatches SessionPendingMessageRemoved for steering messages', () => {
+			setupSession();
+
+			const envelopes: IActionEnvelope[] = [];
+			disposables.add(stateManager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+			const action = {
+				type: ActionType.SessionPendingMessageSet as const,
+				session: sessionUri.toString(),
+				kind: PendingMessageKind.Steering,
+				id: 'steer-rm',
+				userMessage: { text: 'steer me' },
+			};
+			stateManager.dispatchClientAction(action, { clientId: 'test', clientSeq: 1 });
+			sideEffects.handleAction(action);
+
+			const removal = envelopes.find(e =>
+				e.action.type === ActionType.SessionPendingMessageRemoved &&
+				(e.action as { kind: PendingMessageKind }).kind === PendingMessageKind.Steering
+			);
+			assert.ok(removal, 'should dispatch SessionPendingMessageRemoved for steering');
+			assert.strictEqual((removal!.action as { id: string }).id, 'steer-rm');
+
+			// Steering message should be removed from state
+			const state = stateManager.getSessionState(sessionUri.toString());
+			assert.strictEqual(state?.steeringMessage, undefined);
+		});
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/fileEditTracker.test.ts b/src/vs/platform/agentHost/test/node/fileEditTracker.test.ts
new file mode 100644
index 00000000000..8679dab91e4
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/fileEditTracker.test.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { ISessionDataService } from '../../common/sessionDataService.js';
+import { ToolResultContentType } from '../../common/state/sessionState.js';
+import { SessionDataService } from '../../node/sessionDataService.js';
+import { FileEditTracker } from '../../node/copilot/fileEditTracker.js';
+
+suite('FileEditTracker', () => {
+
+	const disposables = new DisposableStore();
+	let fileService: FileService;
+	let sessionDataService: ISessionDataService;
+	let tracker: FileEditTracker;
+
+	const basePath = URI.from({ scheme: Schemas.inMemory, path: '/userData' });
+
+	setup(() => {
+		fileService = disposables.add(new FileService(new NullLogService()));
+		disposables.add(fileService.registerProvider(Schemas.inMemory, disposables.add(new InMemoryFileSystemProvider())));
+		sessionDataService = new SessionDataService(basePath, fileService, new NullLogService());
+		tracker = new FileEditTracker('test-session', sessionDataService, fileService, new NullLogService());
+	});
+
+	teardown(() => disposables.clear());
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('tracks edit start and complete for existing file', async () => {
+		const sourceFs = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(Schemas.file, sourceFs));
+		await fileService.writeFile(URI.file('/workspace/test.txt'), VSBuffer.fromString('original content\nline 2'));
+
+		await tracker.trackEditStart('/workspace/test.txt');
+		await fileService.writeFile(URI.file('/workspace/test.txt'), VSBuffer.fromString('modified content\nline 2\nline 3'));
+		await tracker.completeEdit('/workspace/test.txt');
+
+		const fileEdit = tracker.takeCompletedEdit('/workspace/test.txt');
+		assert.ok(fileEdit);
+		assert.strictEqual(fileEdit.type, ToolResultContentType.FileEdit);
+		// Both URIs point to snapshots in the session data directory
+		const sessionDir = sessionDataService.getSessionDataDirById('test-session');
+		assert.ok(fileEdit.beforeURI.startsWith(sessionDir.toString()));
+		assert.ok(fileEdit.afterURI.startsWith(sessionDir.toString()));
+	});
+
+	test('tracks edit for newly created file (no before content)', async () => {
+		const sourceFs = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(Schemas.file, sourceFs));
+
+		await tracker.trackEditStart('/workspace/new-file.txt');
+		await fileService.writeFile(URI.file('/workspace/new-file.txt'), VSBuffer.fromString('new file\ncontent'));
+		await tracker.completeEdit('/workspace/new-file.txt');
+
+		const fileEdit = tracker.takeCompletedEdit('/workspace/new-file.txt');
+		assert.ok(fileEdit);
+		const sessionDir = sessionDataService.getSessionDataDirById('test-session');
+		assert.ok(fileEdit.afterURI.startsWith(sessionDir.toString()));
+	});
+
+	test('takeCompletedEdit returns undefined for unknown file path', () => {
+		const result = tracker.takeCompletedEdit('/nonexistent');
+		assert.strictEqual(result, undefined);
+	});
+
+	test('before and after snapshot content can be read back', async () => {
+		const sourceFs = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(Schemas.file, sourceFs));
+		await fileService.writeFile(URI.file('/workspace/file.ts'), VSBuffer.fromString('original'));
+
+		await tracker.trackEditStart('/workspace/file.ts');
+		await fileService.writeFile(URI.file('/workspace/file.ts'), VSBuffer.fromString('modified'));
+		await tracker.completeEdit('/workspace/file.ts');
+
+		const fileEdit = tracker.takeCompletedEdit('/workspace/file.ts');
+		assert.ok(fileEdit);
+		const beforeContent = await fileService.readFile(URI.parse(fileEdit.beforeURI));
+		assert.strictEqual(beforeContent.value.toString(), 'original');
+		const afterContent = await fileService.readFile(URI.parse(fileEdit.afterURI));
+		assert.strictEqual(afterContent.value.toString(), 'modified');
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/mockAgent.ts b/src/vs/platform/agentHost/test/node/mockAgent.ts
new file mode 100644
index 00000000000..6f324ace25b
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/mockAgent.ts
@@ -0,0 +1,307 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import type { IAuthorizationProtectedResourceMetadata } from '../../../../base/common/oauth.js';
+import { AgentSession, type AgentProvider, type IAgent, type IAgentAttachment, type IAgentCreateSessionConfig, type IAgentDescriptor, type IAgentMessageEvent, type IAgentModelInfo, type IAgentProgressEvent, type IAgentSessionMetadata, type IAgentToolCompleteEvent, type IAgentToolStartEvent } from '../../common/agentService.js';
+import { ToolResultContentType, type IPendingMessage, type IToolCallResult } from '../../common/state/sessionState.js';
+
+/**
+ * General-purpose mock agent for unit tests. Tracks all method calls
+ * for assertion and exposes {@link fireProgress} to inject progress events.
+ */
+export class MockAgent implements IAgent {
+	private readonly _onDidSessionProgress = new Emitter<IAgentProgressEvent>();
+	readonly onDidSessionProgress = this._onDidSessionProgress.event;
+
+	private readonly _sessions = new Map<string, URI>();
+	private _nextId = 1;
+
+
+	readonly sendMessageCalls: { session: URI; prompt: string }[] = [];
+	readonly setPendingMessagesCalls: { session: URI; steeringMessage: IPendingMessage | undefined; queuedMessages: readonly IPendingMessage[] }[] = [];
+	readonly disposeSessionCalls: URI[] = [];
+	readonly abortSessionCalls: URI[] = [];
+	readonly respondToPermissionCalls: { requestId: string; approved: boolean }[] = [];
+	readonly changeModelCalls: { session: URI; model: string }[] = [];
+	readonly authenticateCalls: { resource: string; token: string }[] = [];
+
+	/** Configurable return value for getSessionMessages. */
+	sessionMessages: (IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[] = [];
+
+	/** Optional overrides applied to session metadata from listSessions. */
+	sessionMetadataOverrides: Partial<Omit<IAgentSessionMetadata, 'session'>> = {};
+
+	constructor(readonly id: AgentProvider = 'mock') { }
+
+	getDescriptor(): IAgentDescriptor {
+		return { provider: this.id, displayName: `Agent ${this.id}`, description: `Test ${this.id} agent`, requiresAuth: this.id === 'copilot' };
+	}
+
+	getProtectedResources(): IAuthorizationProtectedResourceMetadata[] {
+		if (this.id === 'copilot') {
+			return [{ resource: 'https://api.github.com', authorization_servers: ['https://github.com/login/oauth'] }];
+		}
+		return [];
+	}
+
+	async listModels(): Promise<IAgentModelInfo[]> {
+		return [{ provider: this.id, id: `${this.id}-model`, name: `${this.id} Model`, maxContextWindow: 128000, supportsVision: false, supportsReasoningEffort: false }];
+	}
+
+	async listSessions(): Promise<IAgentSessionMetadata[]> {
+		return [...this._sessions.values()].map(s => ({ session: s, startTime: Date.now(), modifiedTime: Date.now(), ...this.sessionMetadataOverrides }));
+	}
+
+	async createSession(_config?: IAgentCreateSessionConfig): Promise<URI> {
+		const rawId = `${this.id}-session-${this._nextId++}`;
+		const session = AgentSession.uri(this.id, rawId);
+		this._sessions.set(rawId, session);
+		return session;
+	}
+
+	async sendMessage(session: URI, prompt: string): Promise<void> {
+		this.sendMessageCalls.push({ session, prompt });
+	}
+
+	setPendingMessages(session: URI, steeringMessage: IPendingMessage | undefined, queuedMessages: readonly IPendingMessage[]): void {
+		this.setPendingMessagesCalls.push({ session, steeringMessage, queuedMessages });
+	}
+
+	async getSessionMessages(_session: URI): Promise<(IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[]> {
+		return this.sessionMessages;
+	}
+
+	async disposeSession(session: URI): Promise<void> {
+		this.disposeSessionCalls.push(session);
+		this._sessions.delete(AgentSession.id(session));
+	}
+
+	async abortSession(session: URI): Promise<void> {
+		this.abortSessionCalls.push(session);
+	}
+
+	respondToPermissionRequest(requestId: string, approved: boolean): void {
+		this.respondToPermissionCalls.push({ requestId, approved });
+	}
+
+	async changeModel(session: URI, model: string): Promise<void> {
+		this.changeModelCalls.push({ session, model });
+	}
+
+	async authenticate(resource: string, token: string): Promise<boolean> {
+		this.authenticateCalls.push({ resource, token });
+		return true;
+	}
+
+	async shutdown(): Promise<void> { }
+
+	fireProgress(event: IAgentProgressEvent): void {
+		this._onDidSessionProgress.fire(event);
+	}
+
+	dispose(): void {
+		this._onDidSessionProgress.dispose();
+	}
+}
+
+/**
+ * Well-known URI of a pre-existing session seeded in {@link ScriptedMockAgent}.
+ * This session appears in `listSessions()` and has message history via
+ * `getSessionMessages()`, but was never created through the server's
+ * `handleCreateSession`. It simulates a session from a previous server
+ * lifetime for testing the restore-on-subscribe path.
+ */
+export const PRE_EXISTING_SESSION_URI = AgentSession.uri('mock', 'pre-existing-session');
+
+export class ScriptedMockAgent implements IAgent {
+	readonly id: AgentProvider = 'mock';
+
+	private readonly _onDidSessionProgress = new Emitter<IAgentProgressEvent>();
+	readonly onDidSessionProgress = this._onDidSessionProgress.event;
+
+	private readonly _sessions = new Map<string, URI>();
+	private _nextId = 1;
+
+	/**
+	 * Message history for the pre-existing session: a single user→assistant
+	 * turn with a tool call.
+	 */
+	private readonly _preExistingMessages: (IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[] = [
+		{ type: 'message', role: 'user', session: PRE_EXISTING_SESSION_URI, messageId: 'h-msg-1', content: 'What files are here?' },
+		{ type: 'tool_start', session: PRE_EXISTING_SESSION_URI, toolCallId: 'h-tc-1', toolName: 'list_files', displayName: 'List Files', invocationMessage: 'Listing files...' },
+		{ type: 'tool_complete', session: PRE_EXISTING_SESSION_URI, toolCallId: 'h-tc-1', result: { pastTenseMessage: 'Listed files', content: [{ type: ToolResultContentType.Text, text: 'file1.ts\nfile2.ts' }], success: true } satisfies IToolCallResult },
+		{ type: 'message', role: 'assistant', session: PRE_EXISTING_SESSION_URI, messageId: 'h-msg-2', content: 'Here are the files: file1.ts and file2.ts' },
+	];
+
+	// Track pending permission requests
+	private readonly _pendingPermissions = new Map<string, (approved: boolean) => void>();
+	// Track pending abort callbacks for slow responses
+	private readonly _pendingAborts = new Map<string, () => void>();
+
+	constructor() {
+		// Seed the pre-existing session so it appears in listSessions()
+		this._sessions.set(AgentSession.id(PRE_EXISTING_SESSION_URI), PRE_EXISTING_SESSION_URI);
+	}
+
+	getDescriptor(): IAgentDescriptor {
+		return { provider: 'mock', displayName: 'Mock Agent', description: 'Scripted test agent', requiresAuth: false };
+	}
+
+	getProtectedResources(): IAuthorizationProtectedResourceMetadata[] {
+		return [];
+	}
+
+	async listModels(): Promise<IAgentModelInfo[]> {
+		return [{ provider: 'mock', id: 'mock-model', name: 'Mock Model', maxContextWindow: 128000, supportsVision: false, supportsReasoningEffort: false }];
+	}
+
+	async listSessions(): Promise<IAgentSessionMetadata[]> {
+		return [...this._sessions.values()].map(s => ({ session: s, startTime: Date.now(), modifiedTime: Date.now(), summary: s.toString() === PRE_EXISTING_SESSION_URI.toString() ? 'Pre-existing session' : undefined }));
+	}
+
+	async createSession(_config?: IAgentCreateSessionConfig): Promise<URI> {
+		const rawId = `mock-session-${this._nextId++}`;
+		const session = AgentSession.uri('mock', rawId);
+		this._sessions.set(rawId, session);
+		return session;
+	}
+
+	async sendMessage(session: URI, prompt: string, _attachments?: IAgentAttachment[]): Promise<void> {
+		switch (prompt) {
+			case 'hello':
+				this._fireSequence(session, [
+					{ type: 'delta', session, messageId: 'msg-1', content: 'Hello, world!' },
+					{ type: 'idle', session },
+				]);
+				break;
+
+			case 'use-tool':
+				this._fireSequence(session, [
+					{ type: 'tool_start', session, toolCallId: 'tc-1', toolName: 'echo_tool', displayName: 'Echo Tool', invocationMessage: 'Running echo tool...' },
+					{ type: 'tool_complete', session, toolCallId: 'tc-1', result: { pastTenseMessage: 'Ran echo tool', content: [{ type: ToolResultContentType.Text, text: 'echoed' }], success: true } },
+					{ type: 'delta', session, messageId: 'msg-1', content: 'Tool done.' },
+					{ type: 'idle', session },
+				]);
+				break;
+
+			case 'error':
+				this._fireSequence(session, [
+					{ type: 'error', session, errorType: 'test_error', message: 'Something went wrong' },
+				]);
+				break;
+
+			case 'permission': {
+				// Fire tool_start to create the tool, then tool_ready to request confirmation
+				const toolStartEvent = {
+					type: 'tool_start' as const,
+					session,
+					toolCallId: 'tc-perm-1',
+					toolName: 'shell',
+					displayName: 'Shell',
+					invocationMessage: 'Run a test command',
+				};
+				const toolReadyEvent = {
+					type: 'tool_ready' as const,
+					session,
+					toolCallId: 'tc-perm-1',
+					invocationMessage: 'Run a test command',
+					toolInput: 'echo test',
+					confirmationTitle: 'Run a test command',
+				};
+				setTimeout(() => {
+					this._onDidSessionProgress.fire(toolStartEvent);
+					setTimeout(() => this._onDidSessionProgress.fire(toolReadyEvent), 5);
+				}, 10);
+				this._pendingPermissions.set('tc-perm-1', (approved) => {
+					if (approved) {
+						this._fireSequence(session, [
+							{ type: 'delta', session, messageId: 'msg-1', content: 'Allowed.' },
+							{ type: 'idle', session },
+						]);
+					}
+				});
+				break;
+			}
+
+			case 'with-usage':
+				this._fireSequence(session, [
+					{ type: 'delta', session, messageId: 'msg-1', content: 'Usage response.' },
+					{ type: 'usage', session, inputTokens: 100, outputTokens: 50, model: 'mock-model' },
+					{ type: 'idle', session },
+				]);
+				break;
+
+			case 'slow': {
+				// Slow response for cancel testing — fires delta after a long delay
+				const timer = setTimeout(() => {
+					this._fireSequence(session, [
+						{ type: 'delta', session, messageId: 'msg-1', content: 'Slow response.' },
+						{ type: 'idle', session },
+					]);
+				}, 5000);
+				this._pendingAborts.set(session.toString(), () => clearTimeout(timer));
+				break;
+			}
+
+			default:
+				this._fireSequence(session, [
+					{ type: 'delta', session, messageId: 'msg-1', content: 'Unknown prompt: ' + prompt },
+					{ type: 'idle', session },
+				]);
+				break;
+		}
+	}
+
+	async getSessionMessages(session: URI): Promise<(IAgentMessageEvent | IAgentToolStartEvent | IAgentToolCompleteEvent)[]> {
+		if (session.toString() === PRE_EXISTING_SESSION_URI.toString()) {
+			return this._preExistingMessages;
+		}
+		return [];
+	}
+
+	async disposeSession(session: URI): Promise<void> {
+		this._sessions.delete(AgentSession.id(session));
+	}
+
+	async abortSession(session: URI): Promise<void> {
+		const callback = this._pendingAborts.get(session.toString());
+		if (callback) {
+			this._pendingAborts.delete(session.toString());
+			callback();
+		}
+	}
+
+	async changeModel(_session: URI, _model: string): Promise<void> {
+		// Mock agent doesn't track model state
+	}
+
+	respondToPermissionRequest(toolCallId: string, approved: boolean): void {
+		const callback = this._pendingPermissions.get(toolCallId);
+		if (callback) {
+			this._pendingPermissions.delete(toolCallId);
+			callback(approved);
+		}
+	}
+
+	async authenticate(_resource: string, _token: string): Promise<boolean> {
+		return true;
+	}
+
+	async shutdown(): Promise<void> { }
+
+	dispose(): void {
+		this._onDidSessionProgress.dispose();
+	}
+
+	private _fireSequence(session: URI, events: IAgentProgressEvent[]): void {
+		let delay = 0;
+		for (const event of events) {
+			delay += 10;
+			setTimeout(() => this._onDidSessionProgress.fire(event), delay);
+		}
+	}
+}
diff --git a/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts b/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts
new file mode 100644
index 00000000000..9a87a5edb02
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/protocolServerHandler.test.ts
@@ -0,0 +1,477 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { IFetchContentResult } from '../../common/state/protocol/commands.js';
+import { ActionType, type ISessionAction } from '../../common/state/sessionActions.js';
+import { PROTOCOL_VERSION } from '../../common/state/sessionCapabilities.js';
+import { isJsonRpcNotification, isJsonRpcResponse, JSON_RPC_INTERNAL_ERROR, ProtocolError, type IAhpNotification, type ICreateSessionParams, type IInitializeResult, type IProtocolMessage, type IReconnectResult, type IStateSnapshot } from '../../common/state/sessionProtocol.js';
+import { SessionStatus, type ISessionSummary } from '../../common/state/sessionState.js';
+import type { IProtocolServer, IProtocolTransport } from '../../common/state/sessionTransport.js';
+import { ProtocolServerHandler, type IProtocolSideEffectHandler } from '../../node/protocolServerHandler.js';
+import { SessionStateManager } from '../../node/sessionStateManager.js';
+
+// ---- Mock helpers -----------------------------------------------------------
+
+class MockProtocolTransport implements IProtocolTransport {
+	private readonly _onMessage = new Emitter<IProtocolMessage>();
+	readonly onMessage = this._onMessage.event;
+	private readonly _onDidSend = new Emitter<IProtocolMessage>();
+	readonly onDidSend = this._onDidSend.event;
+	private readonly _onClose = new Emitter<void>();
+	readonly onClose = this._onClose.event;
+
+	readonly sent: IProtocolMessage[] = [];
+
+	send(message: IProtocolMessage): void {
+		this.sent.push(message);
+		this._onDidSend.fire(message);
+	}
+
+	simulateMessage(msg: IProtocolMessage): void {
+		this._onMessage.fire(msg);
+	}
+
+	simulateClose(): void {
+		this._onClose.fire();
+	}
+
+	dispose(): void {
+		this._onMessage.dispose();
+		this._onDidSend.dispose();
+		this._onClose.dispose();
+	}
+}
+
+class MockProtocolServer implements IProtocolServer {
+	private readonly _onConnection = new Emitter<IProtocolTransport>();
+	readonly onConnection = this._onConnection.event;
+	readonly address = 'mock://test';
+
+	simulateConnection(transport: IProtocolTransport): void {
+		this._onConnection.fire(transport);
+	}
+
+	dispose(): void {
+		this._onConnection.dispose();
+	}
+}
+
+class MockSideEffectHandler implements IProtocolSideEffectHandler {
+	readonly handledActions: ISessionAction[] = [];
+	readonly browsedUris: URI[] = [];
+	readonly browseErrors = new Map<string, Error>();
+
+	handleAction(action: ISessionAction): void {
+		this.handledActions.push(action);
+	}
+	async handleCreateSession(_command: ICreateSessionParams): Promise<void> { /* session created via state manager */ }
+	handleDisposeSession(_session: string): void { }
+	async handleListSessions(): Promise<ISessionSummary[]> { return []; }
+	async handleRestoreSession(_session: string): Promise<void> { }
+	handleGetResourceMetadata() { return { resources: [] }; }
+	async handleAuthenticate(_params: { resource: string; token: string }) { return { authenticated: true }; }
+	async handleBrowseDirectory(uri: string): Promise<{ entries: { name: string; type: 'file' | 'directory' }[] }> {
+		this.browsedUris.push(URI.parse(uri));
+		const error = this.browseErrors.get(uri);
+		if (error) {
+			throw error;
+		}
+		return {
+			entries: [
+				{ name: 'src', type: 'directory' },
+				{ name: 'README.md', type: 'file' },
+			],
+		};
+	}
+	getDefaultDirectory(): string {
+		return URI.file('/home/testuser').toString();
+	}
+	async handleFetchContent(_uri: string): Promise<IFetchContentResult> {
+		throw new Error('Not implemented');
+	}
+}
+
+// ---- Helpers ----------------------------------------------------------------
+
+function notification(method: string, params?: unknown): IProtocolMessage {
+	return { jsonrpc: '2.0', method, params } as IProtocolMessage;
+}
+
+function request(id: number, method: string, params?: unknown): IProtocolMessage {
+	return { jsonrpc: '2.0', id, method, params } as IProtocolMessage;
+}
+
+function findNotifications(sent: IProtocolMessage[], method: string): IAhpNotification[] {
+	return sent.filter(isJsonRpcNotification) as IAhpNotification[];
+}
+
+function findResponse(sent: IProtocolMessage[], id: number): IProtocolMessage | undefined {
+	return sent.find(isJsonRpcResponse) as IProtocolMessage | undefined;
+}
+
+function waitForResponse(transport: MockProtocolTransport, id: number): Promise<IProtocolMessage> {
+	return Event.toPromise(Event.filter(transport.onDidSend, message => isJsonRpcResponse(message) && message.id === id));
+}
+
+// ---- Tests ------------------------------------------------------------------
+
+suite('ProtocolServerHandler', () => {
+
+	let disposables: DisposableStore;
+	let stateManager: SessionStateManager;
+	let server: MockProtocolServer;
+	let sideEffects: MockSideEffectHandler;
+	let handler: ProtocolServerHandler;
+
+	const sessionUri = URI.from({ scheme: 'copilot', path: '/test-session' }).toString();
+
+	function makeSessionSummary(resource?: string): ISessionSummary {
+		return {
+			resource: resource ?? sessionUri,
+			provider: 'copilot',
+			title: 'Test',
+			status: SessionStatus.Idle,
+			createdAt: Date.now(),
+			modifiedAt: Date.now(),
+		};
+	}
+
+	function connectClient(clientId: string, initialSubscriptions?: readonly string[]): MockProtocolTransport {
+		const transport = new MockProtocolTransport();
+		server.simulateConnection(transport);
+		transport.simulateMessage(request(1, 'initialize', {
+			protocolVersion: PROTOCOL_VERSION,
+			clientId,
+			initialSubscriptions,
+		}));
+		return transport;
+	}
+
+	setup(() => {
+		disposables = new DisposableStore();
+		stateManager = disposables.add(new SessionStateManager(new NullLogService()));
+		server = disposables.add(new MockProtocolServer());
+		sideEffects = new MockSideEffectHandler();
+		disposables.add(handler = new ProtocolServerHandler(
+			stateManager,
+			server,
+			sideEffects,
+			new NullLogService(),
+		));
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('handshake returns initialize response', () => {
+		const transport = connectClient('client-1');
+
+		const resp = findResponse(transport.sent, 1);
+		assert.ok(resp, 'should have sent initialize response');
+		const result = (resp as { result: IInitializeResult }).result;
+		assert.strictEqual(result.protocolVersion, PROTOCOL_VERSION);
+		assert.strictEqual(result.serverSeq, stateManager.serverSeq);
+	});
+
+	test('handshake with initialSubscriptions returns snapshots', () => {
+		stateManager.createSession(makeSessionSummary());
+
+		const transport = connectClient('client-1', [sessionUri]);
+
+		const resp = findResponse(transport.sent, 1);
+		assert.ok(resp);
+		const result = (resp as { result: IInitializeResult }).result;
+		assert.strictEqual(result.snapshots.length, 1);
+		assert.strictEqual(result.snapshots[0].resource.toString(), sessionUri.toString());
+	});
+
+	test('subscribe request returns snapshot', async () => {
+		stateManager.createSession(makeSessionSummary());
+
+		const transport = connectClient('client-1');
+		transport.sent.length = 0;
+		const responsePromise = waitForResponse(transport, 1);
+
+		transport.simulateMessage(request(1, 'subscribe', { resource: sessionUri }));
+		const resp = await responsePromise;
+
+		assert.ok(resp, 'should have sent response');
+		const result = (resp as unknown as { result: { snapshot: IStateSnapshot } }).result;
+		assert.strictEqual(result.snapshot.resource.toString(), sessionUri.toString());
+	});
+
+	test('client action is dispatched and echoed', () => {
+		stateManager.createSession(makeSessionSummary());
+		stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		const transport = connectClient('client-1', [sessionUri]);
+		transport.sent.length = 0;
+
+		transport.simulateMessage(notification('dispatchAction', {
+			clientSeq: 1,
+			action: {
+				type: ActionType.SessionTurnStarted,
+				session: sessionUri,
+				turnId: 'turn-1',
+				userMessage: { text: 'hello' },
+			},
+		}));
+
+		const actionMsgs = findNotifications(transport.sent, 'action');
+		const turnStarted = actionMsgs.find(m => {
+			const envelope = m.params as unknown as { action: { type: string } };
+			return envelope.action.type === ActionType.SessionTurnStarted;
+		});
+		assert.ok(turnStarted, 'should have echoed turnStarted');
+		const envelope = turnStarted!.params as unknown as { origin: { clientId: string; clientSeq: number } };
+		assert.strictEqual(envelope.origin.clientId, 'client-1');
+		assert.strictEqual(envelope.origin.clientSeq, 1);
+	});
+
+	test('actions are scoped to subscribed sessions', () => {
+		stateManager.createSession(makeSessionSummary());
+		stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		const transportA = connectClient('client-a', [sessionUri]);
+		const transportB = connectClient('client-b');
+
+		transportA.sent.length = 0;
+		transportB.sent.length = 0;
+
+		stateManager.dispatchServerAction({
+			type: ActionType.SessionTitleChanged,
+			session: sessionUri,
+			title: 'New Title',
+		});
+
+		assert.strictEqual(findNotifications(transportA.sent, 'action').length, 1);
+		assert.strictEqual(findNotifications(transportB.sent, 'action').length, 0);
+	});
+
+	test('notifications are broadcast to all clients', () => {
+		const transportA = connectClient('client-a');
+		const transportB = connectClient('client-b');
+
+		transportA.sent.length = 0;
+		transportB.sent.length = 0;
+
+		stateManager.createSession(makeSessionSummary());
+
+		assert.strictEqual(findNotifications(transportA.sent, 'notification').length, 1);
+		assert.strictEqual(findNotifications(transportB.sent, 'notification').length, 1);
+	});
+
+	test('reconnect replays missed actions', () => {
+		stateManager.createSession(makeSessionSummary());
+		stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		const transport1 = connectClient('client-r', [sessionUri]);
+		const resp = findResponse(transport1.sent, 1);
+		const initSeq = (resp as { result: IInitializeResult }).result.serverSeq;
+		transport1.simulateClose();
+
+		stateManager.dispatchServerAction({ type: ActionType.SessionTitleChanged, session: sessionUri, title: 'Title A' });
+		stateManager.dispatchServerAction({ type: ActionType.SessionTitleChanged, session: sessionUri, title: 'Title B' });
+
+		const transport2 = new MockProtocolTransport();
+		server.simulateConnection(transport2);
+		transport2.simulateMessage(request(1, 'reconnect', {
+			clientId: 'client-r',
+			lastSeenServerSeq: initSeq,
+			subscriptions: [sessionUri],
+		}));
+
+		const reconnectResp = findResponse(transport2.sent, 1);
+		assert.ok(reconnectResp, 'should have sent reconnect response');
+		const result = (reconnectResp as { result: IReconnectResult }).result;
+		assert.strictEqual(result.type, 'replay');
+		if (result.type === 'replay') {
+			assert.strictEqual(result.actions.length, 2);
+		}
+	});
+
+	test('reconnect sends fresh snapshots when gap too large', () => {
+		stateManager.createSession(makeSessionSummary());
+		stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		const transport1 = connectClient('client-g', [sessionUri]);
+		transport1.simulateClose();
+
+		for (let i = 0; i < 1100; i++) {
+			stateManager.dispatchServerAction({ type: ActionType.SessionTitleChanged, session: sessionUri, title: `Title ${i}` });
+		}
+
+		const transport2 = new MockProtocolTransport();
+		server.simulateConnection(transport2);
+		transport2.simulateMessage(request(1, 'reconnect', {
+			clientId: 'client-g',
+			lastSeenServerSeq: 0,
+			subscriptions: [sessionUri],
+		}));
+
+		const reconnectResp = findResponse(transport2.sent, 1);
+		assert.ok(reconnectResp, 'should have sent reconnect response');
+		const result = (reconnectResp as { result: IReconnectResult }).result;
+		assert.strictEqual(result.type, 'snapshot');
+		if (result.type === 'snapshot') {
+			assert.ok(result.snapshots.length > 0, 'should contain snapshots');
+		}
+	});
+
+	test('client disconnect cleans up', () => {
+		stateManager.createSession(makeSessionSummary());
+		stateManager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		const transport = connectClient('client-d', [sessionUri]);
+		transport.sent.length = 0;
+
+		transport.simulateClose();
+
+		stateManager.dispatchServerAction({ type: ActionType.SessionTitleChanged, session: sessionUri, title: 'After Disconnect' });
+
+		assert.strictEqual(transport.sent.length, 0);
+	});
+
+	test('handshake includes defaultDirectory from side effects', () => {
+		const transport = connectClient('client-home');
+
+		const resp = findResponse(transport.sent, 1);
+		assert.ok(resp);
+		const result = (resp as { result: IInitializeResult }).result;
+		assert.strictEqual(URI.parse(result.defaultDirectory!).path, '/home/testuser');
+	});
+
+	test('browseDirectory routes to side effect handler', async () => {
+		const transport = connectClient('client-browse');
+		transport.sent.length = 0;
+
+		const dirUri = URI.file('/home/user/project').toString();
+		const responsePromise = waitForResponse(transport, 2);
+		transport.simulateMessage(request(2, 'browseDirectory', { uri: dirUri }));
+		const resp = await responsePromise;
+
+		assert.strictEqual(sideEffects.browsedUris.length, 1);
+		assert.strictEqual(sideEffects.browsedUris[0].path, '/home/user/project');
+
+		assert.ok(resp);
+		const result = (resp as unknown as { result: { entries: { name: string; uri: unknown; type: string }[] } }).result;
+		assert.strictEqual(result.entries.length, 2);
+		assert.strictEqual(result.entries[0].name, 'src');
+		assert.strictEqual(result.entries[0].type, 'directory');
+		assert.strictEqual(result.entries[1].name, 'README.md');
+		assert.strictEqual(result.entries[1].type, 'file');
+	});
+
+	test('browseDirectory returns a JSON-RPC error when the target is invalid', async () => {
+		const transport = connectClient('client-browse-error');
+		transport.sent.length = 0;
+
+		const dirUri = URI.file('/missing').toString();
+		sideEffects.browseErrors.set(dirUri, new ProtocolError(JSON_RPC_INTERNAL_ERROR, `Directory not found: ${dirUri}`));
+		const responsePromise = waitForResponse(transport, 2);
+		transport.simulateMessage(request(2, 'browseDirectory', { uri: dirUri }));
+		const resp = await responsePromise as { error?: { code: number; message: string } };
+
+		assert.ok(resp?.error);
+		assert.strictEqual(resp.error!.code, JSON_RPC_INTERNAL_ERROR);
+		assert.match(resp.error!.message, /Directory not found/);
+	});
+
+	// ---- Extension methods: auth ----------------------------------------
+
+	test('getResourceMetadata returns resource metadata via extension request', async () => {
+		const transport = connectClient('client-metadata');
+		transport.sent.length = 0;
+
+		const responsePromise = waitForResponse(transport, 2);
+		transport.simulateMessage(request(2, 'getResourceMetadata'));
+		const resp = await responsePromise as { result?: { resources: unknown[] } };
+
+		assert.ok(resp?.result);
+		assert.ok(Array.isArray(resp.result!.resources));
+	});
+
+	test('authenticate returns result via extension request', async () => {
+		const transport = connectClient('client-auth');
+		transport.sent.length = 0;
+
+		const responsePromise = waitForResponse(transport, 2);
+		transport.simulateMessage(request(2, 'authenticate', { resource: 'https://api.github.com', token: 'test-token' }));
+		const resp = await responsePromise as { result?: { authenticated: boolean } };
+
+		assert.ok(resp?.result);
+		assert.strictEqual(resp.result!.authenticated, true);
+	});
+
+	test('extension request preserves ProtocolError code and data', async () => {
+		// Override handleAuthenticate to throw a ProtocolError with data
+		const origHandler = sideEffects.handleAuthenticate;
+		sideEffects.handleAuthenticate = async () => { throw new ProtocolError(-32007, 'Auth required', { hint: 'sign in' }); };
+
+		const transport = connectClient('client-auth-error');
+		transport.sent.length = 0;
+
+		const responsePromise = waitForResponse(transport, 2);
+		transport.simulateMessage(request(2, 'authenticate', { resource: 'test', token: 'bad' }));
+		const resp = await responsePromise as { error?: { code: number; message: string; data?: unknown } };
+
+		assert.ok(resp?.error);
+		assert.strictEqual(resp.error!.code, -32007);
+		assert.strictEqual(resp.error!.message, 'Auth required');
+		assert.deepStrictEqual(resp.error!.data, { hint: 'sign in' });
+
+		sideEffects.handleAuthenticate = origHandler;
+	});
+
+	// ---- Connection count event -----------------------------------------
+
+	test('onDidChangeConnectionCount fires on connect and disconnect', () => {
+		const counts: number[] = [];
+		disposables.add(handler.onDidChangeConnectionCount(c => counts.push(c)));
+
+		const transport = connectClient('client-count-1');
+		connectClient('client-count-2');
+		transport.simulateClose();
+
+		assert.deepStrictEqual(counts, [1, 2, 1]);
+	});
+
+	test('onDidChangeConnectionCount is not decremented by stale reconnect close', () => {
+		const counts: number[] = [];
+		disposables.add(handler.onDidChangeConnectionCount(c => counts.push(c)));
+
+		// Connect
+		const transport1 = connectClient('client-rc');
+		assert.deepStrictEqual(counts, [1]);
+
+		// Reconnect with same clientId (new transport)
+		const transport2 = new MockProtocolTransport();
+		server.simulateConnection(transport2);
+		transport2.simulateMessage(request(1, 'reconnect', {
+			clientId: 'client-rc',
+			lastSeenServerSeq: 0,
+			subscriptions: [],
+		}));
+		// Count is unchanged because same clientId was overwritten
+		assert.deepStrictEqual(counts, [1, 1]);
+
+		// Old transport closes - should NOT decrement since it's stale
+		transport1.simulateClose();
+		assert.deepStrictEqual(counts, [1, 1]);
+
+		// New transport closes - should decrement
+		transport2.simulateClose();
+		assert.deepStrictEqual(counts, [1, 1, 0]);
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/protocolWebSocket.integrationTest.ts b/src/vs/platform/agentHost/test/node/protocolWebSocket.integrationTest.ts
new file mode 100644
index 00000000000..100b8359674
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/protocolWebSocket.integrationTest.ts
@@ -0,0 +1,716 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { ChildProcess, fork } from 'child_process';
+import { fileURLToPath } from 'url';
+import { WebSocket } from 'ws';
+import { URI } from '../../../../base/common/uri.js';
+import { ISubscribeResult } from '../../common/state/protocol/commands.js';
+import type { IActionEnvelope, IResponsePartAction, ISessionAddedNotification, ISessionRemovedNotification, IUsageAction } from '../../common/state/sessionActions.js';
+import { PROTOCOL_VERSION } from '../../common/state/sessionCapabilities.js';
+import {
+	isJsonRpcNotification,
+	isJsonRpcResponse,
+	JSON_RPC_PARSE_ERROR,
+	type IAhpNotification,
+	type IFetchTurnsResult,
+	type IInitializeResult,
+	type IJsonRpcErrorResponse,
+	type IJsonRpcSuccessResponse,
+	type IListSessionsResult,
+	type INotificationBroadcastParams,
+	type IProtocolMessage,
+	type IReconnectResult
+} from '../../common/state/sessionProtocol.js';
+import { ResponsePartKind, type IMarkdownResponsePart, type ISessionState, type IToolCallResponsePart } from '../../common/state/sessionState.js';
+import { PRE_EXISTING_SESSION_URI } from './mockAgent.js';
+
+// ---- JSON-RPC test client ---------------------------------------------------
+
+interface IPendingCall {
+	resolve: (result: unknown) => void;
+	reject: (err: Error) => void;
+}
+
+class TestProtocolClient {
+	private readonly _ws: WebSocket;
+	private _nextId = 1;
+	private readonly _pendingCalls = new Map<number, IPendingCall>();
+	private readonly _notifications: IAhpNotification[] = [];
+	private readonly _notifWaiters: { predicate: (n: IAhpNotification) => boolean; resolve: (n: IAhpNotification) => void; reject: (err: Error) => void }[] = [];
+
+	constructor(port: number) {
+		this._ws = new WebSocket(`ws://127.0.0.1:${port}`);
+	}
+
+	async connect(): Promise<void> {
+		return new Promise<void>((resolve, reject) => {
+			this._ws.on('open', () => {
+				this._ws.on('message', (data: Buffer | string) => {
+					const text = typeof data === 'string' ? data : data.toString('utf-8');
+					const msg = JSON.parse(text);
+					this._handleMessage(msg);
+				});
+				resolve();
+			});
+			this._ws.on('error', reject);
+		});
+	}
+
+	private _handleMessage(msg: IProtocolMessage): void {
+		if (isJsonRpcResponse(msg)) {
+			// JSON-RPC response — resolve pending call
+			const pending = this._pendingCalls.get(msg.id);
+			if (pending) {
+				this._pendingCalls.delete(msg.id);
+				const errResp = msg as IJsonRpcErrorResponse;
+				if (errResp.error) {
+					pending.reject(new Error(errResp.error.message));
+				} else {
+					pending.resolve((msg as IJsonRpcSuccessResponse).result);
+				}
+			}
+		} else if (isJsonRpcNotification(msg)) {
+			// JSON-RPC notification from server
+			const notif = msg;
+			// Check waiters first
+			for (let i = this._notifWaiters.length - 1; i >= 0; i--) {
+				if (this._notifWaiters[i].predicate(notif)) {
+					const waiter = this._notifWaiters.splice(i, 1)[0];
+					waiter.resolve(notif);
+				}
+			}
+			this._notifications.push(notif);
+		}
+	}
+
+	/** Send a JSON-RPC notification (fire-and-forget). */
+	notify(method: string, params?: unknown): void {
+		this._ws.send(JSON.stringify({ jsonrpc: '2.0', method, params }));
+	}
+
+	/** Send a JSON-RPC request and await the response. */
+	call<T>(method: string, params?: unknown, timeoutMs = 5000): Promise<T> {
+		const id = this._nextId++;
+		this._ws.send(JSON.stringify({ jsonrpc: '2.0', id, method, params }));
+
+		return new Promise<T>((resolve, reject) => {
+			const timer = setTimeout(() => {
+				this._pendingCalls.delete(id);
+				reject(new Error(`Timeout waiting for response to ${method} (id=${id}, ${timeoutMs}ms)`));
+			}, timeoutMs);
+
+			this._pendingCalls.set(id, {
+				resolve: result => { clearTimeout(timer); resolve(result as T); },
+				reject: err => { clearTimeout(timer); reject(err); },
+			});
+		});
+	}
+
+	/** Wait for a server notification matching a predicate. */
+	waitForNotification(predicate: (n: IAhpNotification) => boolean, timeoutMs = 5000): Promise<IAhpNotification> {
+		const existing = this._notifications.find(predicate);
+		if (existing) {
+			return Promise.resolve(existing);
+		}
+
+		return new Promise<IAhpNotification>((resolve, reject) => {
+			const timer = setTimeout(() => {
+				const idx = this._notifWaiters.findIndex(w => w.resolve === resolve);
+				if (idx >= 0) {
+					this._notifWaiters.splice(idx, 1);
+				}
+				reject(new Error(`Timeout waiting for notification (${timeoutMs}ms)`));
+			}, timeoutMs);
+
+			this._notifWaiters.push({
+				predicate,
+				resolve: n => { clearTimeout(timer); resolve(n); },
+				reject,
+			});
+		});
+	}
+
+	/** Return all received notifications matching a predicate. */
+	receivedNotifications(predicate?: (n: IAhpNotification) => boolean): IAhpNotification[] {
+		return predicate ? this._notifications.filter(predicate) : [...this._notifications];
+	}
+
+	/** Send a raw string over the WebSocket without JSON serialization. */
+	sendRaw(data: string): void {
+		this._ws.send(data);
+	}
+
+	/** Wait for the next raw message from the server. */
+	waitForRawMessage(timeoutMs = 5000): Promise<unknown> {
+		return new Promise((resolve, reject) => {
+			const timer = setTimeout(() => {
+				cleanup();
+				reject(new Error(`Timeout waiting for raw message (${timeoutMs}ms)`));
+			}, timeoutMs);
+			const onMsg = (data: Buffer | string) => {
+				cleanup();
+				const text = typeof data === 'string' ? data : data.toString('utf-8');
+				resolve(JSON.parse(text));
+			};
+			const cleanup = () => {
+				clearTimeout(timer);
+				this._ws.removeListener('message', onMsg);
+			};
+			this._ws.on('message', onMsg);
+		});
+	}
+
+	close(): void {
+		for (const w of this._notifWaiters) {
+			w.reject(new Error('Client closed'));
+		}
+		this._notifWaiters.length = 0;
+		for (const [, p] of this._pendingCalls) {
+			p.reject(new Error('Client closed'));
+		}
+		this._pendingCalls.clear();
+		this._ws.close();
+	}
+
+	clearReceived(): void {
+		this._notifications.length = 0;
+	}
+}
+
+// ---- Server process lifecycle -----------------------------------------------
+
+async function startServer(): Promise<{ process: ChildProcess; port: number }> {
+	return new Promise((resolve, reject) => {
+		const serverPath = fileURLToPath(new URL('../../node/agentHostServerMain.js', import.meta.url));
+		const child = fork(serverPath, ['--enable-mock-agent', '--quiet', '--port', '0', '--without-connection-token'], {
+			stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
+		});
+
+		const timeout = setTimeout(() => {
+			child.kill();
+			reject(new Error('Server startup timed out'));
+		}, 10_000);
+
+		child.stdout!.on('data', (data: Buffer) => {
+			const text = data.toString();
+			const match = text.match(/READY:(\d+)/);
+			if (match) {
+				clearTimeout(timeout);
+				resolve({ process: child, port: parseInt(match[1], 10) });
+			}
+		});
+
+		child.stderr!.on('data', () => {
+			// Intentionally swallowed - the test runner fails if console.error is used.
+		});
+
+		child.on('error', err => {
+			clearTimeout(timeout);
+			reject(err);
+		});
+
+		child.on('exit', code => {
+			clearTimeout(timeout);
+			reject(new Error(`Server exited prematurely with code ${code}`));
+		});
+	});
+}
+
+// ---- Helpers ----------------------------------------------------------------
+
+let sessionCounter = 0;
+
+function nextSessionUri(): string {
+	return URI.from({ scheme: 'mock', path: `/test-session-${++sessionCounter}` }).toString();
+}
+
+function isActionNotification(n: IAhpNotification, actionType: string): boolean {
+	if (n.method !== 'action') {
+		return false;
+	}
+	const envelope = n.params as unknown as IActionEnvelope;
+	return envelope.action.type === actionType;
+}
+
+function getActionEnvelope(n: IAhpNotification): IActionEnvelope {
+	return n.params as unknown as IActionEnvelope;
+}
+
+/** Perform handshake, create a session, subscribe, and return its URI. */
+async function createAndSubscribeSession(c: TestProtocolClient, clientId: string): Promise<string> {
+	await c.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId });
+
+	await c.call('createSession', { session: nextSessionUri(), provider: 'mock' });
+
+	const notif = await c.waitForNotification(n =>
+		n.method === 'notification' && (n.params as INotificationBroadcastParams).notification.type === 'notify/sessionAdded'
+	);
+	const realSessionUri = ((notif.params as INotificationBroadcastParams).notification as ISessionAddedNotification).summary.resource;
+
+	await c.call<ISubscribeResult>('subscribe', { resource: realSessionUri });
+	c.clearReceived();
+
+	return realSessionUri;
+}
+
+function dispatchTurnStarted(c: TestProtocolClient, session: string, turnId: string, text: string, clientSeq: number): void {
+	c.notify('dispatchAction', {
+		clientSeq,
+		action: {
+			type: 'session/turnStarted',
+			session,
+			turnId,
+			userMessage: { text },
+		},
+	});
+}
+
+// ---- Test suite -------------------------------------------------------------
+
+suite('Protocol WebSocket E2E', function () {
+
+	let server: { process: ChildProcess; port: number };
+	let client: TestProtocolClient;
+
+	suiteSetup(async function () {
+		this.timeout(15_000);
+		server = await startServer();
+	});
+
+	suiteTeardown(function () {
+		server.process.kill();
+	});
+
+	setup(async function () {
+		this.timeout(10_000);
+		client = new TestProtocolClient(server.port);
+		await client.connect();
+	});
+
+	teardown(function () {
+		client.close();
+	});
+
+	// 1. Handshake
+	test('handshake returns initialize response with protocol version', async function () {
+		this.timeout(5_000);
+
+		const result = await client.call<IInitializeResult>('initialize', {
+			protocolVersion: PROTOCOL_VERSION,
+			clientId: 'test-handshake',
+			initialSubscriptions: [URI.from({ scheme: 'agenthost', path: '/root' }).toString()],
+		});
+
+		assert.strictEqual(result.protocolVersion, PROTOCOL_VERSION);
+		assert.ok(result.serverSeq >= 0);
+		assert.ok(result.snapshots.length >= 1, 'should have root state snapshot');
+	});
+
+	// 2. Create session
+	test('create session triggers sessionAdded notification', async function () {
+		this.timeout(10_000);
+
+		await client.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId: 'test-create-session' });
+
+		await client.call('createSession', { session: nextSessionUri(), provider: 'mock' });
+
+		const notif = await client.waitForNotification(n =>
+			n.method === 'notification' && (n.params as INotificationBroadcastParams).notification.type === 'notify/sessionAdded'
+		);
+		const notification = (notif.params as INotificationBroadcastParams).notification as ISessionAddedNotification;
+		assert.strictEqual(URI.parse(notification.summary.resource).scheme, 'mock');
+		assert.strictEqual(notification.summary.provider, 'mock');
+	});
+
+	// 3. Send message and receive response
+	test('send message and receive responsePart + turnComplete', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-send-message');
+		dispatchTurnStarted(client, sessionUri, 'turn-1', 'hello', 1);
+
+		const responsePart = await client.waitForNotification(n => isActionNotification(n, 'session/responsePart'));
+		const responsePartAction = getActionEnvelope(responsePart).action as IResponsePartAction;
+		assert.strictEqual(responsePartAction.part.kind, ResponsePartKind.Markdown);
+		assert.strictEqual((responsePartAction.part as IMarkdownResponsePart).content, 'Hello, world!');
+
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+	});
+
+	// 4. Tool invocation lifecycle
+	test('tool invocation: toolCallStart → toolCallComplete → responsePart → turnComplete', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-tool-invocation');
+		dispatchTurnStarted(client, sessionUri, 'turn-tool', 'use-tool', 1);
+
+		await client.waitForNotification(n => isActionNotification(n, 'session/toolCallStart'));
+		await client.waitForNotification(n => isActionNotification(n, 'session/toolCallReady'));
+		const toolComplete = await client.waitForNotification(n => isActionNotification(n, 'session/toolCallComplete'));
+		const tcAction = getActionEnvelope(toolComplete).action;
+		if (tcAction.type === 'session/toolCallComplete') {
+			assert.strictEqual(tcAction.result.success, true);
+		}
+		await client.waitForNotification(n => isActionNotification(n, 'session/responsePart'));
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+	});
+
+	// 5. Error handling
+	test('error prompt triggers session/error', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-error');
+		dispatchTurnStarted(client, sessionUri, 'turn-err', 'error', 1);
+
+		const errorNotif = await client.waitForNotification(n => isActionNotification(n, 'session/error'));
+		const errorAction = getActionEnvelope(errorNotif).action;
+		if (errorAction.type === 'session/error') {
+			assert.strictEqual(errorAction.error.message, 'Something went wrong');
+		}
+	});
+
+	// 6. Permission flow (via tool_ready confirmation)
+	test('permission request → resolve → response', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-permission');
+		dispatchTurnStarted(client, sessionUri, 'turn-perm', 'permission', 1);
+
+		// The mock agent now fires tool_start + tool_ready instead of permission_request
+		await client.waitForNotification(n => isActionNotification(n, 'session/toolCallStart'));
+		await client.waitForNotification(n => isActionNotification(n, 'session/toolCallReady'));
+
+		// Confirm the tool call
+		client.notify('dispatchAction', {
+			clientSeq: 2,
+			action: {
+				type: 'session/toolCallConfirmed',
+				session: sessionUri,
+				turnId: 'turn-perm',
+				toolCallId: 'tc-perm-1',
+				approved: true,
+			},
+		});
+
+		const responsePart = await client.waitForNotification(n => isActionNotification(n, 'session/responsePart'));
+		const responsePartAction = getActionEnvelope(responsePart).action as IResponsePartAction;
+		assert.strictEqual(responsePartAction.part.kind, ResponsePartKind.Markdown);
+		assert.strictEqual((responsePartAction.part as IMarkdownResponsePart).content, 'Allowed.');
+
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+	});
+
+	// 7. Session list
+	test('listSessions returns sessions', async function () {
+		this.timeout(10_000);
+
+		await client.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId: 'test-list-sessions' });
+
+		await client.call('createSession', { session: nextSessionUri(), provider: 'mock' });
+		await client.waitForNotification(n =>
+			n.method === 'notification' && (n.params as INotificationBroadcastParams).notification.type === 'notify/sessionAdded'
+		);
+
+		const result = await client.call<IListSessionsResult>('listSessions');
+		assert.ok(Array.isArray(result.items));
+		assert.ok(result.items.length >= 1, 'should have at least one session');
+	});
+
+	// 8. Reconnect
+	test('reconnect replays missed actions', async function () {
+		this.timeout(15_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-reconnect');
+		dispatchTurnStarted(client, sessionUri, 'turn-recon', 'hello', 1);
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		const allActions = client.receivedNotifications(n => n.method === 'action');
+		assert.ok(allActions.length > 0);
+		const missedFromSeq = getActionEnvelope(allActions[0]).serverSeq - 1;
+
+		client.close();
+
+		const client2 = new TestProtocolClient(server.port);
+		await client2.connect();
+		const result = await client2.call<IReconnectResult>('reconnect', {
+			clientId: 'test-reconnect',
+			lastSeenServerSeq: missedFromSeq,
+			subscriptions: [sessionUri],
+		});
+
+		assert.ok(result.type === 'replay' || result.type === 'snapshot', 'should receive replay or snapshot');
+		if (result.type === 'replay') {
+			assert.ok(result.actions.length > 0, 'should have replayed actions');
+		}
+
+		client2.close();
+	});
+
+	// ---- Gap tests: functionality bugs ----------------------------------------
+
+	test('usage info is captured on completed turn', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-usage');
+		dispatchTurnStarted(client, sessionUri, 'turn-usage', 'with-usage', 1);
+
+		const usageNotif = await client.waitForNotification(n => isActionNotification(n, 'session/usage'));
+		const usageAction = getActionEnvelope(usageNotif).action as IUsageAction;
+		assert.strictEqual(usageAction.usage.inputTokens, 100);
+		assert.strictEqual(usageAction.usage.outputTokens, 50);
+
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
+		const state = snapshot.snapshot.state as ISessionState;
+		assert.ok(state.turns.length >= 1);
+		const turn = state.turns[state.turns.length - 1];
+		assert.ok(turn.usage);
+		assert.strictEqual(turn.usage!.inputTokens, 100);
+		assert.strictEqual(turn.usage!.outputTokens, 50);
+	});
+
+	test('modifiedAt updates on turn completion', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-modifiedAt');
+
+		const initialSnapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
+		const initialModifiedAt = (initialSnapshot.snapshot.state as ISessionState).summary.modifiedAt;
+
+		await new Promise(resolve => setTimeout(resolve, 50));
+
+		dispatchTurnStarted(client, sessionUri, 'turn-mod', 'hello', 1);
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		const updatedSnapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
+		const updatedModifiedAt = (updatedSnapshot.snapshot.state as ISessionState).summary.modifiedAt;
+		assert.ok(updatedModifiedAt >= initialModifiedAt);
+	});
+
+	test('createSession with invalid provider does not crash server', async function () {
+		this.timeout(10_000);
+
+		await client.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId: 'test-invalid-create' });
+
+		// This should return a JSON-RPC error
+		let gotError = false;
+		try {
+			await client.call('createSession', { session: nextSessionUri(), provider: 'nonexistent' });
+		} catch {
+			gotError = true;
+		}
+		assert.ok(gotError, 'should have received an error for invalid provider');
+
+		// Server should still be functional
+		await client.call('createSession', { session: nextSessionUri(), provider: 'mock' });
+		const notif = await client.waitForNotification(n =>
+			n.method === 'notification' && (n.params as INotificationBroadcastParams).notification.type === 'notify/sessionAdded'
+		);
+		assert.ok(notif);
+	});
+
+	test('fetchTurns returns completed turn history', async function () {
+		this.timeout(15_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-fetchTurns');
+
+		dispatchTurnStarted(client, sessionUri, 'turn-ft-1', 'hello', 1);
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		dispatchTurnStarted(client, sessionUri, 'turn-ft-2', 'hello', 2);
+		await new Promise(resolve => setTimeout(resolve, 200));
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		const result = await client.call<IFetchTurnsResult>('fetchTurns', { session: sessionUri, limit: 10 });
+		assert.ok(result.turns.length >= 2);
+		assert.strictEqual(typeof result.hasMore, 'boolean');
+	});
+
+	// ---- Gap tests: coverage ---------------------------------------------------
+
+	test('dispose session sends sessionRemoved notification', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-dispose');
+		await client.call('disposeSession', { session: sessionUri });
+
+		const notif = await client.waitForNotification(n =>
+			n.method === 'notification' && (n.params as INotificationBroadcastParams).notification.type === 'notify/sessionRemoved'
+		);
+		const removed = (notif.params as INotificationBroadcastParams).notification as ISessionRemovedNotification;
+		assert.strictEqual(removed.session.toString(), sessionUri.toString());
+	});
+
+	test('cancel turn stops in-progress processing', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-cancel');
+		dispatchTurnStarted(client, sessionUri, 'turn-cancel', 'slow', 1);
+
+		client.notify('dispatchAction', {
+			clientSeq: 2,
+			action: { type: 'session/turnCancelled', session: sessionUri, turnId: 'turn-cancel' },
+		});
+
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnCancelled'));
+
+		const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
+		const state = snapshot.snapshot.state as ISessionState;
+		assert.ok(state.turns.length >= 1);
+		assert.strictEqual(state.turns[state.turns.length - 1].state, 'cancelled');
+	});
+
+	test('multiple sequential turns accumulate in history', async function () {
+		this.timeout(15_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-multi-turns');
+
+		dispatchTurnStarted(client, sessionUri, 'turn-m1', 'hello', 1);
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		dispatchTurnStarted(client, sessionUri, 'turn-m2', 'hello', 2);
+		await new Promise(resolve => setTimeout(resolve, 200));
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
+		const state = snapshot.snapshot.state as ISessionState;
+		assert.ok(state.turns.length >= 2, `expected >= 2 turns but got ${state.turns.length}`);
+		assert.strictEqual(state.turns[0].id, 'turn-m1');
+		assert.strictEqual(state.turns[1].id, 'turn-m2');
+	});
+
+	test('two clients on same session both see actions', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-multi-client-1');
+
+		const client2 = new TestProtocolClient(server.port);
+		await client2.connect();
+		await client2.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId: 'test-multi-client-2' });
+		await client2.call('subscribe', { resource: sessionUri });
+		client2.clearReceived();
+
+		dispatchTurnStarted(client, sessionUri, 'turn-mc', 'hello', 1);
+
+		const d1 = await client.waitForNotification(n => isActionNotification(n, 'session/responsePart'));
+		const d2 = await client2.waitForNotification(n => isActionNotification(n, 'session/responsePart'));
+		assert.ok(d1);
+		assert.ok(d2);
+
+		await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+		await client2.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		client2.close();
+	});
+
+	test('unsubscribe stops receiving session actions', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-unsubscribe');
+		client.notify('unsubscribe', { resource: sessionUri });
+		await new Promise(resolve => setTimeout(resolve, 100));
+		client.clearReceived();
+
+		const client2 = new TestProtocolClient(server.port);
+		await client2.connect();
+		await client2.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId: 'test-unsub-helper' });
+		await client2.call('subscribe', { resource: sessionUri });
+
+		dispatchTurnStarted(client2, sessionUri, 'turn-unsub', 'hello', 1);
+		await client2.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
+
+		await new Promise(resolve => setTimeout(resolve, 300));
+		const sessionActions = client.receivedNotifications(n => isActionNotification(n, 'session/'));
+		assert.strictEqual(sessionActions.length, 0, 'unsubscribed client should not receive session actions');
+
+		client2.close();
+	});
+
+	test('change model within session updates state', async function () {
+		this.timeout(10_000);
+
+		const sessionUri = await createAndSubscribeSession(client, 'test-change-model');
+
+		client.notify('dispatchAction', {
+			clientSeq: 1,
+			action: { type: 'session/modelChanged', session: sessionUri, model: 'new-mock-model' },
+		});
+
+		const modelChanged = await client.waitForNotification(n => isActionNotification(n, 'session/modelChanged'));
+		const action = getActionEnvelope(modelChanged).action;
+		assert.strictEqual(action.type, 'session/modelChanged');
+		if (action.type === 'session/modelChanged') {
+			assert.strictEqual((action as { model: string }).model, 'new-mock-model');
+		}
+
+		const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
+		const state = snapshot.snapshot.state as ISessionState;
+		assert.strictEqual(state.summary.model, 'new-mock-model');
+	});
+
+	// ---- Session restore: subscribe to a session from a previous server lifetime
+
+	test('subscribe to a pre-existing session restores turns from agent history', async function () {
+		this.timeout(10_000);
+
+		await client.call('initialize', { protocolVersion: PROTOCOL_VERSION, clientId: 'test-restore' });
+
+		// The mock agent seeds a pre-existing session that was never created
+		// through the server's handleCreateSession -- simulating a session
+		// from a previous server lifetime.
+		const preExistingUri = PRE_EXISTING_SESSION_URI.toString();
+		const list = await client.call<IListSessionsResult>('listSessions');
+		const preExisting = list.items.find(s => s.resource === preExistingUri);
+		assert.ok(preExisting, 'listSessions should include the pre-existing session');
+
+		// Clear notifications so we can verify no duplicate sessionAdded fires.
+		client.clearReceived();
+
+		// Subscribing to this session should trigger the restore path: the
+		// server fetches message history from the agent and reconstructs turns.
+		const result = await client.call<ISubscribeResult>('subscribe', { resource: preExistingUri });
+		const state = result.snapshot.state as ISessionState;
+
+		assert.strictEqual(state.lifecycle, 'ready', 'restored session should be in ready state');
+		assert.ok(state.turns.length >= 1, `expected at least 1 restored turn but got ${state.turns.length}`);
+
+		const turn = state.turns[0];
+		assert.strictEqual(turn.userMessage.text, 'What files are here?');
+		assert.strictEqual(turn.state, 'complete');
+		const toolCallParts = turn.responseParts.filter((p): p is IToolCallResponsePart => p.kind === ResponsePartKind.ToolCall);
+		assert.ok(toolCallParts.length >= 1, 'turn should have tool call response parts');
+		assert.strictEqual(toolCallParts[0].toolCall.toolName, 'list_files');
+		const mdParts = turn.responseParts.filter((p): p is IMarkdownResponsePart => p.kind === ResponsePartKind.Markdown);
+		assert.ok(mdParts.some(p => p.content.includes('file1.ts')), 'turn should have markdown part mentioning file1.ts');
+
+		// Restoring should NOT emit a duplicate sessionAdded notification
+		// (the session is already known to clients via listSessions).
+		await new Promise(resolve => setTimeout(resolve, 200));
+		const sessionAddedNotifs = client.receivedNotifications(n =>
+			n.method === 'notification' && (n.params as INotificationBroadcastParams).notification.type === 'notify/sessionAdded'
+		);
+		assert.strictEqual(sessionAddedNotifs.length, 0, 'restore should not emit sessionAdded');
+	});
+
+	test('malformed JSON message returns parse error', async function () {
+		this.timeout(10_000);
+
+		const raw = new TestProtocolClient(server.port);
+		await raw.connect();
+
+		const responsePromise = raw.waitForRawMessage();
+		raw.sendRaw('this is not valid json{{{');
+
+		const response = await responsePromise as IJsonRpcErrorResponse;
+		assert.strictEqual(response.jsonrpc, '2.0');
+		assert.strictEqual(response.id, null);
+		assert.strictEqual(response.error.code, JSON_RPC_PARSE_ERROR);
+
+		raw.close();
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/sessionDataService.test.ts b/src/vs/platform/agentHost/test/node/sessionDataService.test.ts
new file mode 100644
index 00000000000..5adefa25f08
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/sessionDataService.test.ts
@@ -0,0 +1,82 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { FileService } from '../../../files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { AgentSession } from '../../common/agentService.js';
+import { SessionDataService } from '../../node/sessionDataService.js';
+
+suite('SessionDataService', () => {
+
+	const disposables = new DisposableStore();
+	let fileService: FileService;
+	let service: SessionDataService;
+	const basePath = URI.from({ scheme: Schemas.inMemory, path: '/userData' });
+
+	setup(() => {
+		fileService = disposables.add(new FileService(new NullLogService()));
+		disposables.add(fileService.registerProvider(Schemas.inMemory, disposables.add(new InMemoryFileSystemProvider())));
+		service = new SessionDataService(basePath, fileService, new NullLogService());
+	});
+
+	teardown(() => disposables.clear());
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('getSessionDataDir returns correct URI', () => {
+		const session = AgentSession.uri('copilot', 'abc-123');
+		const dir = service.getSessionDataDir(session);
+		assert.strictEqual(dir.toString(), URI.joinPath(basePath, 'agentSessionData', 'abc-123').toString());
+	});
+
+	test('getSessionDataDir sanitizes unsafe characters', () => {
+		const session = AgentSession.uri('copilot', 'foo/bar:baz\\qux');
+		const dir = service.getSessionDataDir(session);
+		assert.strictEqual(dir.toString(), URI.joinPath(basePath, 'agentSessionData', 'foo-bar-baz-qux').toString());
+	});
+
+	test('deleteSessionData removes directory', async () => {
+		const session = AgentSession.uri('copilot', 'session-1');
+		const dir = service.getSessionDataDir(session);
+		await fileService.createFolder(dir);
+		await fileService.writeFile(URI.joinPath(dir, 'snapshot.json'), VSBuffer.fromString('{}'));
+
+		assert.ok(await fileService.exists(dir));
+		await service.deleteSessionData(session);
+		assert.ok(!(await fileService.exists(dir)));
+	});
+
+	test('deleteSessionData is a no-op when directory does not exist', async () => {
+		const session = AgentSession.uri('copilot', 'nonexistent');
+		// Should not throw
+		await service.deleteSessionData(session);
+	});
+
+	test('cleanupOrphanedData deletes orphans but keeps known sessions', async () => {
+		const baseDir = URI.joinPath(basePath, 'agentSessionData');
+		await fileService.createFolder(URI.joinPath(baseDir, 'keep-1'));
+		await fileService.createFolder(URI.joinPath(baseDir, 'keep-2'));
+		await fileService.createFolder(URI.joinPath(baseDir, 'orphan-1'));
+		await fileService.createFolder(URI.joinPath(baseDir, 'orphan-2'));
+
+		await service.cleanupOrphanedData(new Set(['keep-1', 'keep-2']));
+
+		assert.ok(await fileService.exists(URI.joinPath(baseDir, 'keep-1')));
+		assert.ok(await fileService.exists(URI.joinPath(baseDir, 'keep-2')));
+		assert.ok(!(await fileService.exists(URI.joinPath(baseDir, 'orphan-1'))));
+		assert.ok(!(await fileService.exists(URI.joinPath(baseDir, 'orphan-2'))));
+	});
+
+	test('cleanupOrphanedData is a no-op when base directory does not exist', async () => {
+		// Should not throw
+		await service.cleanupOrphanedData(new Set());
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/sessionStateManager.test.ts b/src/vs/platform/agentHost/test/node/sessionStateManager.test.ts
new file mode 100644
index 00000000000..852e8cf58fc
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/sessionStateManager.test.ts
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { ActionType, NotificationType, type IActionEnvelope, type INotification } from '../../common/state/sessionActions.js';
+import { ISessionSummary, ResponsePartKind, ROOT_STATE_URI, SessionLifecycle, SessionStatus, TurnState, type IMarkdownResponsePart, type ISessionState } from '../../common/state/sessionState.js';
+import { SessionStateManager } from '../../node/sessionStateManager.js';
+
+suite('SessionStateManager', () => {
+
+	let disposables: DisposableStore;
+	let manager: SessionStateManager;
+	const sessionUri = URI.from({ scheme: 'copilot', path: '/test-session' }).toString();
+
+	function makeSessionSummary(resource?: string): ISessionSummary {
+		return {
+			resource: resource ?? sessionUri,
+			provider: 'copilot',
+			title: 'Test',
+			status: SessionStatus.Idle,
+			createdAt: Date.now(),
+			modifiedAt: Date.now(),
+		};
+	}
+
+	setup(() => {
+		disposables = new DisposableStore();
+		manager = disposables.add(new SessionStateManager(new NullLogService()));
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('createSession creates initial state with lifecycle Creating', () => {
+		const state = manager.createSession(makeSessionSummary());
+		assert.strictEqual(state.lifecycle, SessionLifecycle.Creating);
+		assert.strictEqual(state.turns.length, 0);
+		assert.strictEqual(state.activeTurn, undefined);
+		assert.strictEqual(state.summary.resource.toString(), sessionUri.toString());
+	});
+
+	test('getSnapshot returns undefined for unknown session', () => {
+		const unknown = URI.from({ scheme: 'copilot', path: '/unknown' }).toString();
+		const snapshot = manager.getSnapshot(unknown);
+		assert.strictEqual(snapshot, undefined);
+	});
+
+	test('getSnapshot returns root snapshot', () => {
+		const snapshot = manager.getSnapshot(ROOT_STATE_URI);
+		assert.ok(snapshot);
+		assert.strictEqual(snapshot.resource.toString(), ROOT_STATE_URI.toString());
+		assert.deepStrictEqual(snapshot.state, { agents: [], activeSessions: 0 });
+	});
+
+	test('getSnapshot returns session snapshot after creation', () => {
+		manager.createSession(makeSessionSummary());
+		const snapshot = manager.getSnapshot(sessionUri);
+		assert.ok(snapshot);
+		assert.strictEqual(snapshot.resource.toString(), sessionUri.toString());
+		assert.strictEqual((snapshot.state as ISessionState).lifecycle, SessionLifecycle.Creating);
+	});
+
+	test('dispatchServerAction applies action and emits envelope', () => {
+		manager.createSession(makeSessionSummary());
+
+		const envelopes: IActionEnvelope[] = [];
+		disposables.add(manager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionReady,
+			session: sessionUri,
+		});
+
+		const state = manager.getSessionState(sessionUri);
+		assert.ok(state);
+		assert.strictEqual(state.lifecycle, SessionLifecycle.Ready);
+
+		assert.strictEqual(envelopes.length, 1);
+		assert.strictEqual(envelopes[0].action.type, ActionType.SessionReady);
+		assert.strictEqual(envelopes[0].serverSeq, 1);
+		assert.strictEqual(envelopes[0].origin, undefined);
+	});
+
+	test('serverSeq increments monotonically', () => {
+		manager.createSession(makeSessionSummary());
+
+		const envelopes: IActionEnvelope[] = [];
+		disposables.add(manager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+		manager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+		manager.dispatchServerAction({ type: ActionType.SessionTitleChanged, session: sessionUri, title: 'Updated' });
+
+		assert.strictEqual(envelopes.length, 2);
+		assert.strictEqual(envelopes[0].serverSeq, 1);
+		assert.strictEqual(envelopes[1].serverSeq, 2);
+		assert.ok(envelopes[1].serverSeq > envelopes[0].serverSeq);
+	});
+
+	test('dispatchClientAction includes origin in envelope', () => {
+		manager.createSession(makeSessionSummary());
+
+		const envelopes: IActionEnvelope[] = [];
+		disposables.add(manager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+		const origin = { clientId: 'renderer-1', clientSeq: 42 };
+		manager.dispatchClientAction(
+			{ type: ActionType.SessionReady, session: sessionUri },
+			origin,
+		);
+
+		assert.strictEqual(envelopes.length, 1);
+		assert.deepStrictEqual(envelopes[0].origin, origin);
+	});
+
+	test('removeSession clears state and emits notification', () => {
+		manager.createSession(makeSessionSummary());
+
+		const notifications: INotification[] = [];
+		disposables.add(manager.onDidEmitNotification(n => notifications.push(n)));
+
+		manager.removeSession(sessionUri);
+
+		assert.strictEqual(manager.getSessionState(sessionUri), undefined);
+		assert.strictEqual(manager.getSnapshot(sessionUri), undefined);
+		assert.strictEqual(notifications.length, 1);
+		assert.strictEqual(notifications[0].type, NotificationType.SessionRemoved);
+	});
+
+	test('createSession emits sessionAdded notification', () => {
+		const notifications: INotification[] = [];
+		disposables.add(manager.onDidEmitNotification(n => notifications.push(n)));
+
+		manager.createSession(makeSessionSummary());
+
+		assert.strictEqual(notifications.length, 1);
+		assert.strictEqual(notifications[0].type, NotificationType.SessionAdded);
+	});
+
+	test('getActiveTurnId returns active turn id after turnStarted', () => {
+		manager.createSession(makeSessionSummary());
+		manager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		assert.strictEqual(manager.getActiveTurnId(sessionUri), undefined);
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnStarted,
+			session: sessionUri,
+			turnId: 'turn-1',
+			userMessage: { text: 'hello' },
+		});
+
+		assert.strictEqual(manager.getActiveTurnId(sessionUri), 'turn-1');
+	});
+
+	test('root state starts with activeSessions: 0', () => {
+		const snapshot = manager.getSnapshot(ROOT_STATE_URI);
+		assert.ok(snapshot);
+		assert.deepStrictEqual(snapshot.state, { agents: [], activeSessions: 0 });
+	});
+
+	test('turnStarted dispatches root/activeSessionsChanged with correct count', () => {
+		manager.createSession(makeSessionSummary());
+		manager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+
+		const envelopes: IActionEnvelope[] = [];
+		disposables.add(manager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnStarted,
+			session: sessionUri,
+			turnId: 'turn-1',
+			userMessage: { text: 'hello' },
+		});
+
+		const activeChanged = envelopes.filter(e => e.action.type === ActionType.RootActiveSessionsChanged);
+		assert.strictEqual(activeChanged.length, 1);
+		assert.strictEqual((activeChanged[0].action as { activeSessions: number }).activeSessions, 1);
+		assert.strictEqual(manager.rootState.activeSessions, 1);
+	});
+
+	test('turnComplete dispatches root/activeSessionsChanged back to 0', () => {
+		manager.createSession(makeSessionSummary());
+		manager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnStarted,
+			session: sessionUri,
+			turnId: 'turn-1',
+			userMessage: { text: 'hello' },
+		});
+
+		const envelopes: IActionEnvelope[] = [];
+		disposables.add(manager.onDidEmitEnvelope(e => envelopes.push(e)));
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnComplete,
+			session: sessionUri,
+			turnId: 'turn-1',
+		});
+
+		const activeChanged = envelopes.filter(e => e.action.type === ActionType.RootActiveSessionsChanged);
+		assert.strictEqual(activeChanged.length, 1);
+		assert.strictEqual((activeChanged[0].action as { activeSessions: number }).activeSessions, 0);
+		assert.strictEqual(manager.rootState.activeSessions, 0);
+	});
+
+	test('activeSessions reflects concurrent turn count across sessions', () => {
+		const session2Uri = URI.from({ scheme: 'copilot', path: '/test-session-2' }).toString();
+		manager.createSession(makeSessionSummary(sessionUri));
+		manager.createSession(makeSessionSummary(session2Uri));
+		manager.dispatchServerAction({ type: ActionType.SessionReady, session: sessionUri });
+		manager.dispatchServerAction({ type: ActionType.SessionReady, session: session2Uri });
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnStarted,
+			session: sessionUri,
+			turnId: 'turn-1',
+			userMessage: { text: 'a' },
+		});
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnStarted,
+			session: session2Uri,
+			turnId: 'turn-2',
+			userMessage: { text: 'b' },
+		});
+		assert.strictEqual(manager.rootState.activeSessions, 2);
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnComplete,
+			session: sessionUri,
+			turnId: 'turn-1',
+		});
+		assert.strictEqual(manager.rootState.activeSessions, 1);
+
+		manager.dispatchServerAction({
+			type: ActionType.SessionTurnComplete,
+			session: session2Uri,
+			turnId: 'turn-2',
+		});
+		assert.strictEqual(manager.rootState.activeSessions, 0);
+	});
+
+	test('restoreSession creates session in Ready state with pre-populated turns', () => {
+		const turns = [
+			{
+				id: 'turn-1',
+				userMessage: { text: 'hello' },
+				responseParts: [{ kind: ResponsePartKind.Markdown, id: 'p1', content: 'world' } satisfies IMarkdownResponsePart],
+				usage: undefined,
+				state: TurnState.Complete,
+			},
+		];
+
+		const state = manager.restoreSession(makeSessionSummary(), turns);
+		assert.strictEqual(state.lifecycle, SessionLifecycle.Ready);
+		assert.strictEqual(state.turns.length, 1);
+		assert.strictEqual(state.turns[0].userMessage.text, 'hello');
+		assert.strictEqual((state.turns[0].responseParts[0] as IMarkdownResponsePart).content, 'world');
+	});
+
+	test('restoreSession returns existing state for duplicate session', () => {
+		manager.createSession(makeSessionSummary());
+		const existing = manager.getSessionState(sessionUri);
+
+		const state = manager.restoreSession(makeSessionSummary(), []);
+		assert.strictEqual(state, existing);
+	});
+
+	test('restoreSession does not emit sessionAdded notification', () => {
+		const notifications: INotification[] = [];
+		disposables.add(manager.onDidEmitNotification(n => notifications.push(n)));
+
+		manager.restoreSession(makeSessionSummary(), []);
+
+		assert.strictEqual(notifications.length, 0, 'should not emit notification for restored sessions');
+	});
+});
diff --git a/src/vs/platform/agentHost/test/node/testRemoteAgentHost.sh b/src/vs/platform/agentHost/test/node/testRemoteAgentHost.sh
new file mode 100755
index 00000000000..c56157e3540
--- /dev/null
+++ b/src/vs/platform/agentHost/test/node/testRemoteAgentHost.sh
@@ -0,0 +1,431 @@
+#!/usr/bin/env bash
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# End-to-end smoke test for the remote agent host feature.
+#
+# Launches a standalone agent host server, starts the Sessions app with
+# `chat.remoteAgentHosts` pre-configured to connect to it, validates that
+# the Sessions app discovers the remote, and sends a chat message via the
+# remote session target.
+#
+# Usage:
+#   ./testRemoteAgentHost.sh
+#   ./testRemoteAgentHost.sh "Hello, what can you do?"
+#   ./testRemoteAgentHost.sh --server-port 9090 --cdp-port 9225 "Explain this"
+#
+# Options:
+#   --server-port <N>   Agent host WebSocket port (default: 8081)
+#   --cdp-port <N>      CDP debugging port for Sessions app (default: 9224)
+#   --timeout <N>       Seconds to wait for response (default: 60)
+#   --no-kill           Don't kill processes after the test
+#   --skip-message      Only validate connection, don't send a message
+#
+# Requires: agent-browser (npm install -g agent-browser, or use npx)
+
+set -e
+
+ROOT="$(cd "$(dirname "$0")/../../../../../.." && pwd)"
+SERVER_PORT=8081
+CDP_PORT=9224
+RESPONSE_TIMEOUT=60
+KILL_AFTER=true
+SKIP_MESSAGE=false
+MESSAGE=""
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+	case "$1" in
+		--server-port)
+			SERVER_PORT="$2"
+			shift 2
+			;;
+		--cdp-port)
+			CDP_PORT="$2"
+			shift 2
+			;;
+		--timeout)
+			RESPONSE_TIMEOUT="$2"
+			shift 2
+			;;
+		--no-kill)
+			KILL_AFTER=false
+			shift
+			;;
+		--skip-message)
+			SKIP_MESSAGE=true
+			shift
+			;;
+		-*)
+			echo "Unknown option: $1" >&2
+			exit 1
+			;;
+		*)
+			MESSAGE="$1"
+			shift
+			;;
+	esac
+done
+
+if [ -z "$MESSAGE" ] && [ "$SKIP_MESSAGE" = false ]; then
+	MESSAGE="Hello, what can you do?"
+fi
+
+AB="npx agent-browser"
+SERVER_PID=""
+USERDATA_DIR=""
+
+cleanup() {
+	echo "" >&2
+	echo "=== Cleanup ===" >&2
+
+	$AB close 2>/dev/null || true
+
+	if [ "$KILL_AFTER" = true ]; then
+		# Kill Sessions app
+		local CDP_PIDS
+		CDP_PIDS=$(lsof -t -i :"$CDP_PORT" 2>/dev/null || true)
+		if [ -n "$CDP_PIDS" ]; then
+			echo "Killing Sessions app (CDP port $CDP_PORT)..." >&2
+			kill $CDP_PIDS 2>/dev/null || true
+		fi
+
+		# Kill agent host server
+		if [ -n "$SERVER_PID" ] && kill -0 "$SERVER_PID" 2>/dev/null; then
+			echo "Killing agent host server (PID $SERVER_PID)..." >&2
+			kill "$SERVER_PID" 2>/dev/null || true
+			# Give it a moment, then force-kill if still alive
+			sleep 0.5
+			if kill -0 "$SERVER_PID" 2>/dev/null; then
+				kill -9 "$SERVER_PID" 2>/dev/null || true
+			fi
+		fi
+
+		# Kill the sleep process that was keeping the server's stdin open.
+		# It was started via process substitution and is a child of this shell.
+		local SLEEP_PIDS
+		SLEEP_PIDS=$(pgrep -P $$ -f "sleep 86400" 2>/dev/null || true)
+		if [ -n "$SLEEP_PIDS" ]; then
+			kill $SLEEP_PIDS 2>/dev/null || true
+		fi
+
+		# Also kill by port in case PID tracking missed it
+		local SERVER_PIDS
+		SERVER_PIDS=$(lsof -t -i :"$SERVER_PORT" 2>/dev/null || true)
+		if [ -n "$SERVER_PIDS" ]; then
+			kill $SERVER_PIDS 2>/dev/null || true
+		fi
+	fi
+
+	# Clean up temp user data dir
+	if [ -n "$USERDATA_DIR" ] && [ -d "$USERDATA_DIR" ]; then
+		echo "Cleaning up temp user data dir: $USERDATA_DIR" >&2
+		rm -rf "$USERDATA_DIR"
+	fi
+}
+trap cleanup EXIT
+
+# ---- Step 1: Start the agent host server ------------------------------------
+
+echo "=== Step 1: Starting agent host server on port $SERVER_PORT ===" >&2
+
+# Ensure port is free
+if lsof -i :"$SERVER_PORT" >/dev/null 2>&1; then
+	echo "ERROR: Port $SERVER_PORT already in use" >&2
+	exit 1
+fi
+if lsof -i :"$CDP_PORT" >/dev/null 2>&1; then
+	echo "ERROR: CDP port $CDP_PORT already in use" >&2
+	exit 1
+fi
+
+cd "$ROOT"
+
+# Start the server directly using Node (not via code-agent-host.sh which
+# spawns a subprocess tree that's harder to manage in background mode).
+# Use system node rather than the VS Code-managed node binary which may
+# not have been downloaded yet.
+SERVER_ENTRY="$ROOT/out/vs/platform/agentHost/node/agentHostServerMain.js"
+
+if [ ! -f "$SERVER_ENTRY" ]; then
+	echo "ERROR: Server entry point not found: $SERVER_ENTRY" >&2
+	echo "       Run the build first (npm run compile or the watch task)" >&2
+	exit 1
+fi
+
+# Use a temp file for output and poll for READY.
+# The server stays alive until stdin closes (process.stdin.on('end', shutdown)),
+# so we keep stdin open using a process substitution with a long sleep.
+# This avoids FIFOs and leaked file descriptors that caused cleanup hangs.
+SERVER_READY_FILE=$(mktemp)
+
+node "$SERVER_ENTRY" --port "$SERVER_PORT" --quiet --enable-mock-agent \
+	< <(sleep 86400) > "$SERVER_READY_FILE" 2>/dev/null &
+SERVER_PID=$!
+
+echo "Server PID: $SERVER_PID" >&2
+
+# Poll the output file for the READY line
+echo "Waiting for server to start..." >&2
+SERVER_ADDR=""
+for i in $(seq 1 30); do
+	READY_MATCH=$(grep -o 'READY:[0-9]*' "$SERVER_READY_FILE" 2>/dev/null || true)
+	if [ -n "$READY_MATCH" ]; then
+		READY_PORT=$(echo "$READY_MATCH" | cut -d: -f2)
+		SERVER_ADDR="ws://127.0.0.1:${READY_PORT}"
+		break
+	fi
+	sleep 1
+done
+rm -f "$SERVER_READY_FILE"
+
+if [ -z "$SERVER_ADDR" ]; then
+	echo "ERROR: Server did not start within 30 seconds" >&2
+	exit 1
+fi
+
+echo "Agent host server ready at $SERVER_ADDR" >&2
+
+# ---- Step 2: Prepare user data with remote agent host setting ---------------
+
+echo "=== Step 2: Configuring Sessions app settings ===" >&2
+
+# We use 127.0.0.1:<PORT> as the address (strip ws:// prefix)
+REMOTE_ADDR=$(echo "$SERVER_ADDR" | sed 's|^ws://||')
+
+USERDATA_DIR=$(mktemp -d)
+SETTINGS_DIR="$USERDATA_DIR/User"
+mkdir -p "$SETTINGS_DIR"
+
+cat > "$SETTINGS_DIR/settings.json" << EOF
+{
+	"chat.remoteAgentHosts": [
+		{
+			"address": "$REMOTE_ADDR",
+			"name": "Test Remote Agent"
+		}
+	],
+	"window.titleBarStyle": "custom"
+}
+EOF
+
+echo "Settings configured: $SETTINGS_DIR/settings.json" >&2
+echo "  Remote address: $REMOTE_ADDR" >&2
+
+# ---- Step 3: Launch Sessions app --------------------------------------------
+
+echo "=== Step 3: Launching Sessions app ===" >&2
+
+cd "$ROOT"
+# Unset ELECTRON_RUN_AS_NODE to ensure the app launches as Electron, not Node.
+VSCODE_SKIP_PRELAUNCH=1 ELECTRON_RUN_AS_NODE= ./scripts/code.sh \
+	--sessions \
+	--skip-sessions-welcome \
+	--remote-debugging-port="$CDP_PORT" \
+	--user-data-dir="$USERDATA_DIR" \
+	&>/dev/null &
+
+echo "Waiting for Sessions app to start..." >&2
+for i in $(seq 1 30); do
+	if $AB connect "$CDP_PORT" 2>/dev/null; then
+		break
+	fi
+	sleep 2
+	if [ "$i" -eq 30 ]; then
+		echo "ERROR: Sessions app did not start within 60 seconds" >&2
+		exit 1
+	fi
+done
+
+echo "Connected to Sessions app via CDP" >&2
+
+# Give the app a moment to initialize fully
+sleep 3
+
+# ---- Step 4: Validate the remote connection appeared -------------------------
+
+echo "=== Step 4: Validating remote agent host connection ===" >&2
+
+# Wait for the remote to appear as a session target
+REMOTE_FOUND=false
+for i in $(seq 1 20); do
+	SNAPSHOT=$($AB snapshot -i 2>&1 || true)
+
+	# Look for the remote in the session target picker or any UI element
+	if echo "$SNAPSHOT" | grep -qi "Test Remote Agent\|remote.*agent"; then
+		REMOTE_FOUND=true
+		break
+	fi
+
+	# Also check via DOM for the session target radio containing our remote name
+	REMOTE_CHECK=$($AB eval '
+(() => {
+	const text = document.body.innerText || "";
+	if (text.includes("Test Remote Agent")) return "found";
+	// Check radio buttons in the session target picker
+	const buttons = document.querySelectorAll(".monaco-custom-radio > .monaco-button");
+	for (const btn of buttons) {
+		if (btn.textContent?.includes("Test Remote Agent")) return "found";
+	}
+	return "not found";
+})()' 2>&1 || true)
+
+	if echo "$REMOTE_CHECK" | grep -q "found"; then
+		REMOTE_FOUND=true
+		break
+	fi
+
+	sleep 2
+done
+
+if [ "$REMOTE_FOUND" = true ]; then
+	echo "SUCCESS: Remote agent host 'Test Remote Agent' is visible in the Sessions app" >&2
+else
+	echo "ERROR: Could not find remote agent host 'Test Remote Agent' in the Sessions app UI" >&2
+	echo "Snapshot excerpt:" >&2
+	echo "$SNAPSHOT" | head -30 >&2
+	exit 1
+fi
+
+# ---- Step 5: Send a message (optional) --------------------------------------
+
+if [ "$SKIP_MESSAGE" = true ]; then
+	echo "=== Skipping message send (--skip-message) ===" >&2
+	echo "Remote agent host test completed successfully." >&2
+	exit 0
+fi
+
+echo "=== Step 5: Switching to remote session target and sending message ===" >&2
+
+# Take a screenshot before interaction
+SCREENSHOT_DIR="/tmp/remote-agent-test-$(date +%Y-%m-%dT%H-%M-%S)"
+mkdir -p "$SCREENSHOT_DIR"
+$AB screenshot "$SCREENSHOT_DIR/01-before-interaction.png" 2>/dev/null || true
+
+# Click the session target radio button for the remote agent host
+CLICK_RESULT=$($AB eval '
+(() => {
+	const buttons = document.querySelectorAll(".monaco-custom-radio > .monaco-button");
+	for (const btn of buttons) {
+		if (btn.textContent?.includes("Test Remote Agent")) {
+			btn.click();
+			return "clicked";
+		}
+	}
+	return "not found";
+})()' 2>&1 || true)
+
+if echo "$CLICK_RESULT" | grep -q "not found"; then
+	echo "ERROR: Could not find 'Test Remote Agent' radio button to click" >&2
+	$AB screenshot "$SCREENSHOT_DIR/02-click-failed.png" 2>/dev/null || true
+	exit 1
+fi
+echo "Switched to remote session target" >&2
+
+sleep 1
+
+$AB screenshot "$SCREENSHOT_DIR/02-after-target-switch.png" 2>/dev/null || true
+
+# Fill in the remote folder path input (required for remote sessions)
+echo "Setting remote folder path..." >&2
+FOLDER_SET=$($AB eval '
+(() => {
+	const input = document.querySelector("input.sessions-chat-remote-folder-text");
+	if (!input) return "no input";
+	input.focus();
+	return "focused";
+})()' 2>&1 || true)
+
+if echo "$FOLDER_SET" | grep -q "no input"; then
+	echo "WARNING: Could not find remote folder input, continuing anyway..." >&2
+else
+	# Type a folder path using clipboard paste for speed
+	echo "/tmp" | pbcopy
+	$AB press Meta+a 2>/dev/null || true
+	$AB press Meta+v 2>/dev/null || true
+	sleep 0.3
+	# Press Enter to confirm the folder path
+	$AB press Enter 2>/dev/null || true
+	sleep 0.5
+	echo "Remote folder path set to /tmp" >&2
+fi
+
+$AB screenshot "$SCREENSHOT_DIR/03-after-folder.png" 2>/dev/null || true
+
+# Type the message into the chat editor using clipboard paste for speed
+echo "Typing message: $MESSAGE" >&2
+$AB eval '
+(() => {
+	// Focus the chat editor textarea
+	const textarea = document.querySelector(".new-chat-widget .monaco-editor textarea");
+	if (textarea) { textarea.focus(); return "focused editor"; }
+	return "editor not found";
+})()' 2>/dev/null || true
+
+sleep 0.3
+echo -n "$MESSAGE" | pbcopy
+$AB press Meta+v 2>/dev/null || true
+sleep 0.5
+
+$AB screenshot "$SCREENSHOT_DIR/04-after-type.png" 2>/dev/null || true
+
+# Send the message via the send button or keyboard
+$AB eval '
+(() => {
+	// Try clicking the send button directly
+	const sendBtn = document.querySelector(".new-chat-widget .codicon-send");
+	if (sendBtn) {
+		const btn = sendBtn.closest("a, button, .monaco-button");
+		if (btn) { btn.click(); return "clicked send"; }
+	}
+	return "send button not found";
+})()' 2>/dev/null || true
+
+$AB screenshot "$SCREENSHOT_DIR/05-after-send.png" 2>/dev/null || true
+
+# ---- Step 6: Wait for response ----------------------------------------------
+
+echo "Waiting for response (timeout: ${RESPONSE_TIMEOUT}s)..." >&2
+
+RESPONSE=""
+for i in $(seq 1 "$RESPONSE_TIMEOUT"); do
+	sleep 1
+
+	# Check for response content in the chat area
+	RESPONSE=$($AB eval '
+(() => {
+	// Sessions app uses the main chat area (not sidebar)
+	const items = document.querySelectorAll(".interactive-item-container");
+	if (items.length < 2) return "";
+	const lastItem = items[items.length - 1];
+	const text = lastItem.textContent || "";
+	if (text.length > 20) return text;
+	return "";
+})()' 2>&1 | sed 's/^"//;s/"$//')
+
+	if [ -n "$RESPONSE" ]; then
+		break
+	fi
+
+	# Progress indicator
+	if (( i % 10 == 0 )); then
+		echo "  Still waiting... (${i}s)" >&2
+	fi
+done
+
+$AB screenshot "$SCREENSHOT_DIR/04-response.png" 2>/dev/null || true
+
+if [ -z "$RESPONSE" ]; then
+	echo "WARNING: No response received within ${RESPONSE_TIMEOUT}s" >&2
+	echo "Screenshots saved to: $SCREENSHOT_DIR" >&2
+	exit 1
+fi
+
+echo "=== Response ===" >&2
+echo "$RESPONSE"
+
+echo "" >&2
+echo "Screenshots saved to: $SCREENSHOT_DIR" >&2
+echo "Remote agent host test completed successfully." >&2
diff --git a/src/vs/platform/browserElements/common/browserElements.ts b/src/vs/platform/browserElements/common/browserElements.ts
index 2973d9db939..7e8d1beac19 100644
--- a/src/vs/platform/browserElements/common/browserElements.ts
+++ b/src/vs/platform/browserElements/common/browserElements.ts
@@ -56,6 +56,8 @@ export interface INativeBrowserElementsService {
 
 	getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator, cancellationId?: number): Promise<IElementData | undefined>;
 
+	getFocusedElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator, cancellationId?: number): Promise<IElementData | undefined>;
+
 	startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator, cancelAndDetachId?: number): Promise<void>;
 
 	startConsoleSession(token: CancellationToken, locator: IBrowserTargetLocator, cancelAndDetachId?: number): Promise<void>;
@@ -79,3 +81,122 @@ export function getDisplayNameFromOuterHTML(outerHTML: string): string {
 	const className = classMatch ? `.${classMatch[1].replace(/\s+/g, '.')}` : '';
 	return `${tagName}${id}${className}`;
 }
+
+/**
+ * Format an array of element ancestors into a CSS-selector-like path string.
+ */
+export function formatElementPath(ancestors: readonly IElementAncestor[] | undefined): string | undefined {
+	if (!ancestors || ancestors.length === 0) {
+		return undefined;
+	}
+
+	return ancestors
+		.map(ancestor => {
+			const classes = ancestor.classNames?.length ? `.${ancestor.classNames.join('.')}` : '';
+			const id = ancestor.id ? `#${ancestor.id}` : '';
+			return `${ancestor.tagName}${id}${classes}`;
+		})
+		.join(' > ');
+}
+
+/**
+ * Collapse margin-top/right/bottom/left or padding-top/right/bottom/left
+ * into a single shorthand value, removing the individual entries from the map.
+ */
+function createBoxShorthand(entries: Map<string, string>, propertyName: 'margin' | 'padding'): string | undefined {
+	const topKey = `${propertyName}-top`;
+	const rightKey = `${propertyName}-right`;
+	const bottomKey = `${propertyName}-bottom`;
+	const leftKey = `${propertyName}-left`;
+
+	const top = entries.get(topKey);
+	const right = entries.get(rightKey);
+	const bottom = entries.get(bottomKey);
+	const left = entries.get(leftKey);
+
+	if (top === undefined || right === undefined || bottom === undefined || left === undefined) {
+		return undefined;
+	}
+
+	entries.delete(topKey);
+	entries.delete(rightKey);
+	entries.delete(bottomKey);
+	entries.delete(leftKey);
+
+	return `${top} ${right} ${bottom} ${left}`;
+}
+
+/**
+ * Format a key-value record into a markdown-style list,
+ * collapsing margin/padding into shorthand values.
+ */
+export function formatElementMap(entries: Readonly<Record<string, string>> | undefined): string | undefined {
+	if (!entries || Object.keys(entries).length === 0) {
+		return undefined;
+	}
+
+	const normalizedEntries = new Map(Object.entries(entries));
+	const lines: string[] = [];
+
+	const marginShorthand = createBoxShorthand(normalizedEntries, 'margin');
+	if (marginShorthand) {
+		lines.push(`- margin: ${marginShorthand}`);
+	}
+
+	const paddingShorthand = createBoxShorthand(normalizedEntries, 'padding');
+	if (paddingShorthand) {
+		lines.push(`- padding: ${paddingShorthand}`);
+	}
+
+	for (const [name, value] of Array.from(normalizedEntries.entries()).sort(([a], [b]) => a.localeCompare(b))) {
+		lines.push(`- ${name}: ${value}`);
+	}
+
+	return lines.join('\n');
+}
+
+/**
+ * Build a structured text representation of element data for use as chat context.
+ */
+export function createElementContextValue(elementData: IElementData, displayName: string, attachCss: boolean): string {
+	const sections: string[] = [];
+	sections.push('Attached Element Context from Integrated Browser');
+	sections.push(`Element: ${displayName}`);
+
+	const htmlPath = formatElementPath(elementData.ancestors);
+	if (htmlPath) {
+		sections.push(`HTML Path:\n${htmlPath}`);
+	}
+
+	const attributeTable = formatElementMap(elementData.attributes);
+	if (attributeTable) {
+		sections.push(`Attributes:\n${attributeTable}`);
+	}
+
+	if (attachCss) {
+		const computedStyleTable = formatElementMap(elementData.computedStyles);
+		if (computedStyleTable) {
+			sections.push(`Computed Styles:\n${computedStyleTable}`);
+		}
+	}
+
+	if (elementData.dimensions) {
+		const { top, left, width, height } = elementData.dimensions;
+		sections.push(
+			`Dimensions:\n- top: ${Math.round(top)}px\n- left: ${Math.round(left)}px\n- width: ${Math.round(width)}px\n- height: ${Math.round(height)}px`
+		);
+	}
+
+	const innerText = elementData.innerText?.trim();
+	if (innerText) {
+		sections.push(`Inner Text:\n\`\`\`text\n${innerText}\n\`\`\``);
+	}
+
+	sections.push(`Outer HTML:\n\`\`\`html\n${elementData.outerHTML}\n\`\`\``);
+
+	if (attachCss) {
+		sections.push(`Full Computed CSS:\n\`\`\`css\n${elementData.computedStyle}\n\`\`\``);
+	}
+
+	return sections.join('\n\n');
+}
diff --git a/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts b/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
index 5e018a6d718..4fab807cd8d 100644
--- a/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
+++ b/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
@@ -127,7 +127,6 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		targetWebContents.on('console-message', onConsoleMessage);
 		targetWebContents.on('destroyed', onTargetDestroyed);
 		windowWebContents.on('ipc-message', onIpcMessage);
-		token.onCancellationRequested(cleanupListeners);
 	}
 
 	/**
@@ -431,6 +430,121 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		};
 	}
 
+	async getFocusedElementData(windowId: number | undefined, rect: IRectangle, _token: CancellationToken, locator: IBrowserTargetLocator, _cancellationId?: number): Promise<IElementData | undefined> {
+		const window = this.windowById(windowId);
+		if (!window?.win) {
+			return undefined;
+		}
+
+		const allWebContents = webContents.getAllWebContents();
+		const simpleBrowserWebview = allWebContents.find(webContent => webContent.id === window.id);
+		if (!simpleBrowserWebview) {
+			return undefined;
+		}
+
+		const debuggers = simpleBrowserWebview.debugger;
+		if (!debuggers.isAttached()) {
+			debuggers.attach();
+		}
+
+		let sessionId: string | undefined;
+		try {
+			const targetId = await this.findWebviewTarget(debuggers, locator);
+			if (!targetId) {
+				return undefined;
+			}
+
+			const attach = await debuggers.sendCommand('Target.attachToTarget', { targetId, flatten: true });
+			sessionId = attach.sessionId;
+			await debuggers.sendCommand('Runtime.enable', {}, sessionId);
+
+			const { result } = await debuggers.sendCommand('Runtime.evaluate', {
+				expression: `(() => {
+					const el = document.activeElement;
+					if (!el || el.nodeType !== 1) {
+						return undefined;
+					}
+					const r = el.getBoundingClientRect();
+					const attrs = {};
+					for (let i = 0; i < el.attributes.length; i++) {
+						attrs[el.attributes[i].name] = el.attributes[i].value;
+					}
+					const ancestors = [];
+					let n = el;
+					while (n && n.nodeType === 1) {
+						const entry = { tagName: n.tagName.toLowerCase() };
+						if (n.id) {
+							entry.id = n.id;
+						}
+						if (typeof n.className === 'string' && n.className.trim().length > 0) {
+							entry.classNames = n.className.trim().split(/\\s+/).filter(Boolean);
+						}
+						ancestors.unshift(entry);
+						n = n.parentElement;
+					}
+					const css = getComputedStyle(el);
+					const computedStyles = {};
+					for (let i = 0; i < css.length; i++) {
+						const name = css[i];
+						computedStyles[name] = css.getPropertyValue(name);
+					}
+					const text = (el.innerText || '').trim();
+					return {
+						outerHTML: el.outerHTML,
+						computedStyle: '',
+						bounds: { x: r.x, y: r.y, width: r.width, height: r.height },
+						ancestors,
+						attributes: attrs,
+						computedStyles,
+						dimensions: { top: r.top, left: r.left, width: r.width, height: r.height },
+						innerText: text.length > 100 ? text.slice(0, 100) + '\\u2026' : text
+					};
+				})();`,
+				returnByValue: true
+			}, sessionId);
+
+			const focusedData = result?.value as NodeDataResponse | undefined;
+			if (!focusedData) {
+				return undefined;
+			}
+
+			const zoomFactor = simpleBrowserWebview.getZoomFactor();
+			const absoluteBounds = {
+				x: rect.x + focusedData.bounds.x,
+				y: rect.y + focusedData.bounds.y,
+				width: focusedData.bounds.width,
+				height: focusedData.bounds.height
+			};
+
+			const clippedBounds = {
+				x: Math.max(absoluteBounds.x, rect.x),
+				y: Math.max(absoluteBounds.y, rect.y),
+				width: Math.max(0, Math.min(absoluteBounds.x + absoluteBounds.width, rect.x + rect.width) - Math.max(absoluteBounds.x, rect.x)),
+				height: Math.max(0, Math.min(absoluteBounds.y + absoluteBounds.height, rect.y + rect.height) - Math.max(absoluteBounds.y, rect.y))
+			};
+
+			return {
+				outerHTML: focusedData.outerHTML,
+				computedStyle: focusedData.computedStyle,
+				bounds: {
+					x: clippedBounds.x * zoomFactor,
+					y: clippedBounds.y * zoomFactor,
+					width: clippedBounds.width * zoomFactor,
+					height: clippedBounds.height * zoomFactor
+				},
+				ancestors: focusedData.ancestors,
+				attributes: focusedData.attributes,
+				computedStyles: focusedData.computedStyles,
+				dimensions: focusedData.dimensions,
+				innerText: focusedData.innerText,
+			};
+		} finally {
+			if (debuggers.isAttached()) {
+				debuggers.detach();
+			}
+		}
+	}
+
 	async getNodeData(sessionId: string, debuggers: Electron.Debugger, window: BrowserWindow, cancellationId?: number): Promise<NodeDataResponse> {
 		return new Promise((resolve, reject) => {
 			const onMessage = async (event: Electron.Event, method: string, params: { backendNodeId: number }) => {
diff --git a/src/vs/platform/browserView/common/browserView.ts b/src/vs/platform/browserView/common/browserView.ts
index fe4f22d727d..c2f2161f6e0 100644
--- a/src/vs/platform/browserView/common/browserView.ts
+++ b/src/vs/platform/browserView/common/browserView.ts
@@ -5,25 +5,42 @@
 
 import { Event } from '../../../base/common/event.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { URI } from '../../../base/common/uri.js';
+import { UriComponents } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
 
 const commandPrefix = 'workbench.action.browser';
 export enum BrowserViewCommandId {
+	// Tab management
 	Open = `${commandPrefix}.open`,
 	NewTab = `${commandPrefix}.newTab`,
+	QuickOpen = `${commandPrefix}.quickOpen`,
+	CloseAll = `${commandPrefix}.closeAll`,
+	CloseAllInGroup = `${commandPrefix}.closeAllInGroup`,
+
+	// Navigation
 	GoBack = `${commandPrefix}.goBack`,
 	GoForward = `${commandPrefix}.goForward`,
 	Reload = `${commandPrefix}.reload`,
 	HardReload = `${commandPrefix}.hardReload`,
+
+	// Editor actions
 	FocusUrlInput = `${commandPrefix}.focusUrlInput`,
+	OpenExternal = `${commandPrefix}.openExternal`,
+	OpenSettings = `${commandPrefix}.openSettings`,
+
+	// Chat actions
 	AddElementToChat = `${commandPrefix}.addElementToChat`,
 	AddConsoleLogsToChat = `${commandPrefix}.addConsoleLogsToChat`,
+
+	// Dev Tools
 	ToggleDevTools = `${commandPrefix}.toggleDevTools`,
-	OpenExternal = `${commandPrefix}.openExternal`,
+
+	// Storage
 	ClearGlobalStorage = `${commandPrefix}.clearGlobalStorage`,
 	ClearWorkspaceStorage = `${commandPrefix}.clearWorkspaceStorage`,
 	ClearEphemeralStorage = `${commandPrefix}.clearEphemeralStorage`,
-	OpenSettings = `${commandPrefix}.openSettings`,
+
+	// Find in page
 	ShowFind = `${commandPrefix}.showFind`,
 	HideFind = `${commandPrefix}.hideFind`,
 	FindNext = `${commandPrefix}.findNext`,
@@ -57,8 +74,9 @@ export interface IBrowserViewState {
 	lastScreenshot: VSBuffer | undefined;
 	lastFavicon: string | undefined;
 	lastError: IBrowserViewLoadError | undefined;
+	certificateError: IBrowserViewCertificateError | undefined;
 	storageScope: BrowserViewStorageScope;
-	zoomFactor: number;
+	browserZoomIndex: number;
 }
 
 export interface IBrowserViewNavigationEvent {
@@ -66,6 +84,7 @@ export interface IBrowserViewNavigationEvent {
 	title: string;
 	canGoBack: boolean;
 	canGoForward: boolean;
+	certificateError: IBrowserViewCertificateError | undefined;
 }
 
 export interface IBrowserViewLoadingEvent {
@@ -77,6 +96,19 @@ export interface IBrowserViewLoadError {
 	url: string;
 	errorCode: number;
 	errorDescription: string;
+	certificateError?: IBrowserViewCertificateError;
+}
+
+export interface IBrowserViewCertificateError {
+	host: string;
+	fingerprint: string;
+	error: string;
+	url: string;
+	hasTrustedException: boolean;
+	issuerName: string;
+	subjectName: string;
+	validStart: number;
+	validExpiry: number;
 }
 
 export interface IBrowserViewFocusEvent {
@@ -116,7 +148,8 @@ export enum BrowserNewPageLocation {
 	NewWindow = 'newWindow'
 }
 export interface IBrowserViewNewPageRequest {
-	resource: URI;
+	resource: UriComponents;
+	url: string;
 	location: BrowserNewPageLocation;
 	// Only applicable if location is NewWindow
 	position?: { x?: number; y?: number; width?: number; height?: number };
@@ -143,6 +176,19 @@ export enum BrowserViewStorageScope {
 
 export const ipcBrowserViewChannelName = 'browserView';
 
+/**
+ * Discrete zoom levels matching Edge/Chrome.
+ * Note: When those browsers say "33%" and "67%" zoom, they really mean 33.33...% and 66.66...%
+ */
+export const browserZoomFactors = [0.25, 1 / 3, 0.5, 2 / 3, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5] as const;
+export const browserZoomDefaultIndex = browserZoomFactors.indexOf(1);
+export function browserZoomLabel(zoomFactor: number): string {
+	return localize('browserZoomPercent', "{0}%", Math.round(zoomFactor * 100));
+}
+export function browserZoomAccessibilityLabel(zoomFactor: number): string {
+	return localize('browserZoomAccessibilityLabel', "Page Zoom: {0}%", Math.round(zoomFactor * 100));
+}
+
 /**
  * This should match the isolated world ID defined in `preload-browserView.ts`.
  */
@@ -258,13 +304,6 @@ export interface IBrowserViewService {
 	 */
 	captureScreenshot(id: string, options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer>;
 
-	/**
-	 * Dispatch a key event to the browser view
-	 * @param id The browser view identifier
-	 * @param keyEvent The key event data
-	 */
-	dispatchKeyEvent(id: string, keyEvent: IBrowserViewKeyDownEvent): Promise<void>;
-
 	/**
 	 * Focus the browser view
 	 * @param id The browser view identifier
@@ -311,6 +350,27 @@ export interface IBrowserViewService {
 	 */
 	clearStorage(id: string): Promise<void>;
 
+	/** Set the browser zoom index (independent from VS Code zoom). */
+	setBrowserZoomIndex(id: string, zoomIndex: number): Promise<void>;
+
+	/**
+	 * Trust a certificate for a given host in the browser view's session.
+	 * The page will be automatically reloaded after trusting.
+	 * @param id The browser view identifier
+	 * @param host The hostname that presented the certificate
+	 * @param fingerprint The SHA-256 fingerprint of the certificate to trust
+	 */
+	trustCertificate(id: string, host: string, fingerprint: string): Promise<void>;
+
+	/**
+	 * Revoke trust for a previously trusted certificate.
+	 * The browser view will be automatically closed after revoking.
+	 * @param id The browser view identifier
+	 * @param host The hostname to revoke the certificate for
+	 * @param fingerprint The SHA-256 fingerprint of the certificate to revoke
+	 */
+	untrustCertificate(id: string, host: string, fingerprint: string): Promise<void>;
+
 	/**
 	 * Update the keybinding accelerators used in browser view context menus.
 	 * @param keybindings A map of command ID to accelerator label
diff --git a/src/vs/platform/browserView/common/browserViewTelemetry.ts b/src/vs/platform/browserView/common/browserViewTelemetry.ts
index 66853e50999..0f5037b877b 100644
--- a/src/vs/platform/browserView/common/browserViewTelemetry.ts
+++ b/src/vs/platform/browserView/common/browserViewTelemetry.ts
@@ -17,6 +17,10 @@ export type IntegratedBrowserOpenSource =
 	/** Opened via the "Open Integrated Browser" command with a URL argument.
 	 * This typically means another extension or component invoked the command programmatically. */
 	| 'commandWithUrl'
+	/** Opened via the quick open feature with no initial URL. */
+	| 'quickOpenWithoutUrl'
+	/** Opened via the quick open feature with an initial URL. */
+	| 'quickOpenWithUrl'
 	/** Opened via the "New Tab" command from an existing tab. */
 	| 'newTabCommand'
 	/** Opened via the localhost link opener when the `workbench.browser.openLocalhostLinks` setting
diff --git a/src/vs/platform/browserView/common/browserViewUri.ts b/src/vs/platform/browserView/common/browserViewUri.ts
index 66ec58bd5d0..aad379a49aa 100644
--- a/src/vs/platform/browserView/common/browserViewUri.ts
+++ b/src/vs/platform/browserView/common/browserViewUri.ts
@@ -5,7 +5,6 @@
 
 import { Schemas } from '../../../base/common/network.js';
 import { URI } from '../../../base/common/uri.js';
-import { generateUuid } from '../../../base/common/uuid.js';
 
 /**
  * Helper for creating and parsing browser view URIs.
@@ -15,22 +14,16 @@ export namespace BrowserViewUri {
 	export const scheme = Schemas.vscodeBrowser;
 
 	/**
-	 * Creates a resource URI for a browser view with the given URL.
-	 * Optionally accepts an ID; if not provided, a new UUID is generated.
+	 * Creates a resource URI for a browser view with the given ID.
 	 */
-	export function forUrl(url: string | undefined, id?: string): URI {
-		const viewId = id ?? generateUuid();
-		return URI.from({
-			scheme,
-			path: `/${viewId}`,
-			query: url ? `url=${encodeURIComponent(url)}` : undefined
-		});
+	export function forId(id: string): URI {
+		return URI.from({ scheme, path: `/${id}` });
 	}
 
 	/**
-	 * Parses a browser view resource URI to extract the ID and URL.
+	 * Parses a browser view resource URI to extract the ID.
 	 */
-	export function parse(resource: URI): { id: string; url: string } | undefined {
+	export function parse(resource: URI): { id: string } | undefined {
 		if (resource.scheme !== scheme) {
 			return undefined;
 		}
@@ -41,9 +34,7 @@ export namespace BrowserViewUri {
 			return undefined;
 		}
 
-		const url = resource.query ? new URLSearchParams(resource.query).get('url') ?? '' : '';
-
-		return { id, url };
+		return { id };
 	}
 
 	/**
@@ -52,11 +43,4 @@ export namespace BrowserViewUri {
 	export function getId(resource: URI): string | undefined {
 		return parse(resource)?.id;
 	}
-
-	/**
-	 * Extracts the URL from a browser view resource URI.
-	 */
-	export function getUrl(resource: URI): string | undefined {
-		return parse(resource)?.url;
-	}
 }
diff --git a/src/vs/platform/browserView/electron-browser/preload-browserView.ts b/src/vs/platform/browserView/electron-browser/preload-browserView.ts
index 29832f220ff..340de08af7d 100644
--- a/src/vs/platform/browserView/electron-browser/preload-browserView.ts
+++ b/src/vs/platform/browserView/electron-browser/preload-browserView.ts
@@ -17,7 +17,7 @@
  */
 (function () {
 
-	const { contextBridge } = require('electron');
+	const { contextBridge, ipcRenderer } = require('electron');
 
 	// #######################################################################
 	// ###                                                                 ###
@@ -26,6 +26,37 @@
 	// ###       (https://github.com/electron/electron/issues/25516)       ###
 	// ###                                                                 ###
 	// #######################################################################
+
+	// Listen for keydown events that the page did not handle and forward them for shortcut handling.
+	window.addEventListener('keydown', (event) => {
+		// Require that the event is trusted -- i.e. user-initiated.
+		// eslint-disable-next-line no-restricted-syntax
+		if (!(event instanceof KeyboardEvent) || !event.isTrusted) {
+			return;
+		}
+
+		// If the event was already handled by the page, do not forward it.
+		if (event.defaultPrevented) {
+			return;
+		}
+
+		// filter to events that either have modifiers or do not have a character representation.
+		if (!(event.ctrlKey || event.altKey || event.metaKey) && event.key.length === 1) {
+			return;
+		}
+
+		ipcRenderer.send('vscode:browserView:keydown', {
+			key: event.key,
+			keyCode: event.keyCode,
+			code: event.code,
+			ctrlKey: event.ctrlKey,
+			shiftKey: event.shiftKey,
+			altKey: event.altKey,
+			metaKey: event.metaKey,
+			repeat: event.repeat
+		});
+	});
+
 	const globals = {
 		/**
 		 * Get the currently selected text in the page.
diff --git a/src/vs/platform/browserView/electron-main/browserSession.ts b/src/vs/platform/browserView/electron-main/browserSession.ts
index 04e70143188..dc23d2ee0c0 100644
--- a/src/vs/platform/browserView/electron-main/browserSession.ts
+++ b/src/vs/platform/browserView/electron-main/browserSession.ts
@@ -4,16 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { session } from 'electron';
-import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { joinPath } from '../../../base/common/resources.js';
 import { URI } from '../../../base/common/uri.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
 import { BrowserViewStorageScope } from '../common/browserView.js';
+import { BrowserSessionTrust, IBrowserSessionTrust } from './browserSessionTrust.js';
+import { FileAccess } from '../../../base/common/network.js';
 
-// Same as webviews
+// Same as webviews, minus clipboard-read
 const allowedPermissions = new Set([
 	'pointerLock',
 	'notifications',
-	'clipboard-read',
 	'clipboard-sanitized-write'
 ]);
 
@@ -32,19 +33,37 @@ const allowedPermissions = new Set([
  * an internal registry of live sessions. Use the static methods to
  * obtain instances.
  */
-export class BrowserSession extends Disposable {
+export class BrowserSession {
 
 	// #region Static registry
 
 	/**
-	 * All live sessions keyed by their unique id.
+	 * Primary store — keyed by Electron session so entries are
+	 * automatically removed when the Electron session is GC'd.
+	 *
+	 * The goal is to ensure that BrowserSessions have the exact same lifespan as their Electron sessions.
+	 */
+	private static readonly _bySession = new WeakMap<Electron.Session, BrowserSession>();
+
+	/**
+	 * String-keyed lookup for {@link get} and {@link getBrowserContextIds}.
+	 * Values are weak references so they don't prevent GC of the
+	 * {@link BrowserSession} (and transitively the Electron session).
 	 *
 	 * ID derivation rules (one-to-one with Electron sessions):
 	 *  - Global scope         -> `"global"`
 	 *  - Workspace scope      -> `"workspace:${workspaceId}"`
 	 *  - Ephemeral scope      -> `"ephemeral:${viewId}"` or `"${type}:${viewId}"` for custom types
 	 */
-	private static readonly _sessions = new Map<string, BrowserSession>();
+	private static readonly _byId = new Map<string, WeakRef<BrowserSession>>();
+
+	/**
+	 * Cleans up stale {@link _byId} entries when the Electron session
+	 * they point to is garbage-collected.
+	 */
+	private static readonly _finalizer = new FinalizationRegistry<string>((id) => {
+		BrowserSession._byId.delete(id);
+	});
 
 	/**
 	 * Weak set mirroring the Electron sessions owned by any BrowserSession.
@@ -65,38 +84,49 @@ export class BrowserSession extends Disposable {
 	 * Return an existing session for the given id, or `undefined`.
 	 */
 	static get(id: string): BrowserSession | undefined {
-		return BrowserSession._sessions.get(id);
+		const ref = BrowserSession._byId.get(id);
+		if (!ref) {
+			return undefined;
+		}
+		const bs = ref.deref();
+		if (!bs) {
+			BrowserSession._byId.delete(id);
+		}
+		return bs;
 	}
 
 	/**
 	 * Return all live browser context IDs (i.e. all session {@link id}s).
 	 */
 	static getBrowserContextIds(): string[] {
-		return [...BrowserSession._sessions.keys()];
+		const ids: string[] = [];
+		for (const [id, ref] of BrowserSession._byId) {
+			if (ref.deref()) {
+				ids.push(id);
+			} else {
+				BrowserSession._byId.delete(id);
+			}
+		}
+		return ids;
 	}
 
 	/**
 	 * Get or create the singleton global-scope session.
 	 */
 	static getOrCreateGlobal(): BrowserSession {
-		const existing = BrowserSession._sessions.get('global');
-		if (existing) {
-			return existing;
-		}
-		return new BrowserSession('global', session.fromPartition('persist:vscode-browser'), BrowserViewStorageScope.Global);
+		const electronSession = session.fromPartition('persist:vscode-browser');
+		return BrowserSession._bySession.get(electronSession)
+			?? new BrowserSession('global', electronSession, BrowserViewStorageScope.Global);
 	}
 
 	/**
 	 * Get or create a workspace-scope session for the given workspace.
 	 */
 	static getOrCreateWorkspace(workspaceId: string, workspaceStorageHome: URI): BrowserSession {
-		const sessionId = `workspace:${workspaceId}`;
-		const existing = BrowserSession._sessions.get(sessionId);
-		if (existing) {
-			return existing;
-		}
 		const storage = joinPath(workspaceStorageHome, workspaceId, 'browserStorage');
-		return new BrowserSession(sessionId, session.fromPath(storage.fsPath), BrowserViewStorageScope.Workspace);
+		const electronSession = session.fromPath(storage.fsPath);
+		return BrowserSession._bySession.get(electronSession)
+			?? new BrowserSession(`workspace:${workspaceId}`, electronSession, BrowserViewStorageScope.Workspace);
 	}
 
 	/**
@@ -108,11 +138,9 @@ export class BrowserSession extends Disposable {
 		}
 
 		const sessionId = `${type ?? 'ephemeral'}:${viewId}`;
-		const existing = BrowserSession._sessions.get(sessionId);
-		if (existing) {
-			return existing;
-		}
-		return new BrowserSession(sessionId, session.fromPartition(`vscode-browser-${type}${viewId}`), BrowserViewStorageScope.Ephemeral);
+		const electronSession = session.fromPartition(`vscode-browser-${type}${viewId}`);
+		return BrowserSession._bySession.get(electronSession)
+			?? new BrowserSession(sessionId, electronSession, BrowserViewStorageScope.Ephemeral);
 	}
 
 	/**
@@ -153,9 +181,7 @@ export class BrowserSession extends Disposable {
 
 	// #region Instance
 
-	// Reference count how many browser views are currently using this session.
-	// When the count drops to zero, the session is removed from the registry.
-	private refs = 0;
+	private readonly _trust: BrowserSessionTrust;
 
 	private constructor(
 		/**
@@ -169,46 +195,51 @@ export class BrowserSession extends Disposable {
 		/** Resolved storage scope. */
 		readonly storageScope: BrowserViewStorageScope,
 	) {
-		super();
-
-		if (BrowserSession._sessions.has(id)) {
-			throw new Error(`BrowserSession with id '${id}' already exists`);
-		}
-
-		this.configureSession();
+		this._trust = new BrowserSessionTrust(this);
+		this.configure();
 		BrowserSession.knownSessions.add(electronSession);
-		BrowserSession._sessions.set(id, this);
+		BrowserSession._bySession.set(electronSession, this);
+		BrowserSession._byId.set(id, new WeakRef(this));
+		BrowserSession._finalizer.register(electronSession, id);
+	}
+
+	/** Public trust interface for consumers that need cert operations. */
+	get trust(): IBrowserSessionTrust {
+		return this._trust;
 	}
 
 	/**
-	 * Apply the standard permission policy to the session.
+	 * Connect application storage to this session so that preferences
+	 * (trusted certificates, permissions, etc.) are persisted across
+	 * restarts. Restores any previously-saved data on first call;
+	 * subsequent calls are no-ops.
 	 */
-	private configureSession(): void {
+	connectStorage(storage: IApplicationStorageMainService): void {
+		this._trust.connectStorage(storage);
+	}
+
+	/**
+	 * Apply the permission policy and preload scripts to the session.
+	 */
+	private configure(): void {
 		this.electronSession.setPermissionRequestHandler((_webContents, permission, callback) => {
 			return callback(allowedPermissions.has(permission));
 		});
 		this.electronSession.setPermissionCheckHandler((_webContents, permission, _origin) => {
 			return allowedPermissions.has(permission);
 		});
-	}
-
-	public acquire(): IDisposable {
-		this.refs++;
-		return toDisposable(() => {
-			this.refs--;
-			if (this.refs === 0) {
-				this.dispose();
-			}
+		this.electronSession.registerPreloadScript({
+			type: 'frame',
+			filePath: FileAccess.asFileUri('vs/platform/browserView/electron-browser/preload-browserView.js').fsPath
 		});
 	}
 
-	override dispose(): void {
-		if (this.refs > 0) {
-			throw new Error(`Cannot dispose BrowserSession because it is still in use`);
-		}
-
-		BrowserSession._sessions.delete(this.id);
-		super.dispose();
+	/**
+	 * Clear all session data including trust state and all browsing data.
+	 */
+	async clearData(): Promise<void> {
+		await this._trust.clear();
+		await this.electronSession.clearData();
 	}
 
 	// #endregion
diff --git a/src/vs/platform/browserView/electron-main/browserSessionTrust.ts b/src/vs/platform/browserView/electron-main/browserSessionTrust.ts
new file mode 100644
index 00000000000..2e915e7b2f9
--- /dev/null
+++ b/src/vs/platform/browserView/electron-main/browserSessionTrust.ts
@@ -0,0 +1,317 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IBrowserViewCertificateError } from '../common/browserView.js';
+import type { BrowserSession } from './browserSession.js';
+
+/** Key used to store trusted certificate data in the application storage. */
+const STORAGE_KEY = 'browserView.sessionTrustData';
+
+/** Trust entries expire after 1 week. */
+const TRUST_DURATION_MS = 7 * 24 * 60 * 60 * 1000;
+
+/**
+ * Shape of the JSON blob persisted under {@link STORAGE_KEY}.
+ * Top-level keys are session ids; each value holds the session's
+ * trusted certificates.
+ */
+interface PersistedTrustData {
+	[sessionId: string]: {
+		trustedCerts?: { host: string; fingerprint: string; expiresAt: number }[];
+	};
+}
+
+/**
+ * Public subset of {@link BrowserSessionTrust} exposed to consumers
+ * (e.g. {@link BrowserView}) that need to trust/untrust certificates
+ * or query certificate errors.
+ */
+export interface IBrowserSessionTrust {
+	trustCertificate(host: string, fingerprint: string): Promise<void>;
+	untrustCertificate(host: string, fingerprint: string): Promise<void>;
+	getCertificateError(url: string): IBrowserViewCertificateError | undefined;
+	installCertErrorHandler(webContents: Electron.WebContents): void;
+}
+
+/**
+ * Centralises all certificate and trust-related security logic for a
+ * browser session.  Owns the trusted-certificate store, the cert-error
+ * cache, the `setCertificateVerifyProc` handler on the Electron session,
+ * and the per-`WebContents` `certificate-error` handler.
+ */
+export class BrowserSessionTrust implements IBrowserSessionTrust {
+
+	/**
+	 * Trusted certificates stored as host → (fingerprint → expiration epoch ms).
+	 * Entries are time-limited; see {@link TRUST_DURATION_MS}.
+	 */
+	private readonly _trustedCertificates = new Map<string, Map<string, /* expiresAt */ number>>();
+
+	/**
+	 * Last known certificate per host (hostname → { fingerprint, error }).
+	 * Populated by `setCertificateVerifyProc` which fires for every TLS
+	 * handshake, not just errors. This lets us look up cert status for a
+	 * URL even after Chromium has cached the allow decision.
+	 */
+	private readonly _certErrors = new Map<string, { certificate: Electron.Certificate; error: string }>();
+
+	/**
+	 * Application storage service for persisting trusted certificates
+	 * across restarts. Set via {@link connectStorage}; `undefined` until then.
+	 */
+	private _storage: IApplicationStorageMainService | undefined;
+
+	constructor(
+		private readonly _session: BrowserSession,
+	) {
+		this._installCertVerifyProc();
+	}
+
+	/**
+	 * Install the session-level certificate verification callback that records cert errors.
+	 * This does not grant any trust by itself; it just populates the `_certErrors` cache.
+	 */
+	private _installCertVerifyProc(): void {
+		this._session.electronSession.setCertificateVerifyProc((request, callback) => {
+			const { hostname, errorCode, certificate, verificationResult } = request;
+
+			if (errorCode !== 0) {
+				this._certErrors.set(hostname, { certificate, error: verificationResult });
+			} else {
+				this._certErrors.delete(hostname);
+			}
+
+			return callback(-3); // Always use default handling from Chromium
+		});
+	}
+
+	/**
+	 * Install a `certificate-error` handler on a {@link Electron.WebContents}
+	 * so that user-trusted certificates are accepted at the page level.
+	 */
+	installCertErrorHandler(webContents: Electron.WebContents): void {
+		webContents.on('certificate-error', (event, url, _error, certificate, callback) => {
+			event.preventDefault();
+
+			const host = URL.parse(url)?.hostname;
+			if (!host) {
+				return callback(false);
+			}
+
+			if (this.isCertificateTrusted(host, certificate.fingerprint)) {
+				return callback(true);
+			}
+
+			return callback(false);
+		});
+	}
+
+	/**
+	 * Look up the certificate status for a URL by extracting the host and
+	 * checking whether we have a last-known bad cert that was user-trusted.
+	 * Returns the cert error info if the host has a bad cert that was trusted,
+	 * or `undefined` if the cert is valid or unknown.
+	 */
+	getCertificateError(url: string): IBrowserViewCertificateError | undefined {
+		const parsed = URL.parse(url);
+		if (!parsed || parsed.protocol !== 'https:') {
+			return undefined;
+		}
+
+		const host = parsed.hostname;
+		if (!host) {
+			return undefined;
+		}
+
+		const known = this._certErrors.get(host);
+		if (!known) {
+			return undefined;
+		}
+
+		const cert = known.certificate;
+		return {
+			host,
+			fingerprint: cert.fingerprint,
+			error: known.error,
+			url,
+			hasTrustedException: this.isCertificateTrusted(host, cert.fingerprint),
+			issuerName: cert.issuerName,
+			subjectName: cert.subjectName,
+			validStart: cert.validStart,
+			validExpiry: cert.validExpiry,
+		};
+	}
+
+	/**
+	 * Trust a certificate identified by host and SHA-256 fingerprint.
+	 */
+	async trustCertificate(host: string, fingerprint: string): Promise<void> {
+		let entries = this._trustedCertificates.get(host);
+		if (!entries) {
+			entries = new Map();
+			this._trustedCertificates.set(host, entries);
+		}
+		entries.set(fingerprint, Date.now() + TRUST_DURATION_MS);
+		this.writeStorage();
+	}
+
+	/**
+	 * Revoke trust for a certificate identified by host and fingerprint.
+	 */
+	async untrustCertificate(host: string, fingerprint: string): Promise<void> {
+		const entries = this._trustedCertificates.get(host);
+		if (entries && entries.delete(fingerprint)) {
+			if (entries.size === 0) {
+				this._trustedCertificates.delete(host);
+			}
+		} else {
+			throw new Error(`Certificate not found: host=${host} fingerprint=${fingerprint}`);
+		}
+		this.writeStorage();
+		// Important: close all connections since they may be using the now-untrusted cert.
+		await this._session.electronSession.closeAllConnections();
+	}
+
+	/**
+	 * Check whether a certificate is trusted for a given host.
+	 */
+	isCertificateTrusted(host: string, fingerprint: string): boolean {
+		const expiresAt = this._trustedCertificates.get(host)?.get(fingerprint);
+		if (expiresAt === undefined) {
+			return false;
+		}
+		if (Date.now() > expiresAt) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Connect application storage so that trusted certificates are
+	 * persisted across restarts. Restores any previously-saved data on
+	 * first call; subsequent calls are no-ops.
+	 */
+	connectStorage(storage: IApplicationStorageMainService): void {
+		if (this._storage) {
+			return; // already connected
+		}
+		this._storage = storage;
+		this.readStorage();
+	}
+
+	/**
+	 * Clear all trust state: in-memory certs, cert-error cache, persisted
+	 * data, and close open connections that may be using now-untrusted certs.
+	 */
+	async clear(): Promise<void> {
+		this._trustedCertificates.clear();
+		this._certErrors.clear();
+		this.writeStorage();
+		// Important: close all connections since they may be using now-untrusted certs.
+		await this._session.electronSession.closeAllConnections();
+	}
+
+	// #region Persistence helpers
+
+	/**
+	 * Restore trusted certificates from application storage.
+	 */
+	private readStorage(): void {
+		const storage = this._storage;
+		if (!storage) {
+			return;
+		}
+
+		const raw = storage.get(STORAGE_KEY, StorageScope.APPLICATION);
+		if (!raw) {
+			return;
+		}
+
+		const now = Date.now();
+		let pruned = false;
+		try {
+			const all: PersistedTrustData = JSON.parse(raw);
+			const certs = all[this._session.id]?.trustedCerts;
+			if (certs) {
+				for (const { host, fingerprint, expiresAt } of certs) {
+					if (expiresAt > now) {
+						let entries = this._trustedCertificates.get(host);
+						if (!entries) {
+							entries = new Map();
+							this._trustedCertificates.set(host, entries);
+						}
+						entries.set(fingerprint, expiresAt);
+					} else {
+						pruned = true;
+					}
+				}
+			}
+		} catch {
+			// Corrupt data — ignore
+		}
+
+		// Flush expired entries from storage
+		if (pruned) {
+			this.writeStorage();
+		}
+	}
+
+	/**
+	 * Write trusted certificates to application storage.
+	 * The single storage key holds **all** sessions' data so that we can
+	 * clean up stale entries atomically.
+	 */
+	private writeStorage(): void {
+		const storage = this._storage;
+		if (!storage) {
+			return;
+		}
+
+		// Read existing blob (other sessions may have data too)
+		let all: PersistedTrustData = {};
+		try {
+			const raw = storage.get(STORAGE_KEY, StorageScope.APPLICATION);
+			if (raw) {
+				all = JSON.parse(raw);
+			}
+		} catch {
+			// Overwrite corrupt data
+		}
+
+		// Ensure this session's entry exists
+		if (!all[this._session.id]) {
+			all[this._session.id] = {};
+		}
+
+		// Update the trusted certs slice
+		if (this._trustedCertificates.size === 0) {
+			delete all[this._session.id].trustedCerts;
+		} else {
+			const certs: { host: string; fingerprint: string; expiresAt: number }[] = [];
+			for (const [host, entries] of this._trustedCertificates) {
+				for (const [fingerprint, expiresAt] of entries) {
+					certs.push({ host, fingerprint, expiresAt });
+				}
+			}
+			all[this._session.id].trustedCerts = certs;
+		}
+
+		// Remove empty session entries
+		if (Object.keys(all[this._session.id]).length === 0) {
+			delete all[this._session.id];
+		}
+
+		// Write back (or remove if empty)
+		if (Object.keys(all).length === 0) {
+			storage.remove(STORAGE_KEY, StorageScope.APPLICATION);
+		} else {
+			storage.store(STORAGE_KEY, JSON.stringify(all), StorageScope.APPLICATION, StorageTarget.MACHINE);
+		}
+	}
+
+	// #endregion
+}
diff --git a/src/vs/platform/browserView/electron-main/browserView.ts b/src/vs/platform/browserView/electron-main/browserView.ts
index e08d161db21..8f61ab5cf80 100644
--- a/src/vs/platform/browserView/electron-main/browserView.ts
+++ b/src/vs/platform/browserView/electron-main/browserView.ts
@@ -4,16 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { WebContentsView, webContents } from 'electron';
-import { FileAccess } from '../../../base/common/network.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { IBrowserViewBounds, IBrowserViewDevToolsStateEvent, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent, BrowserNewPageLocation, browserViewIsolatedWorldId } from '../common/browserView.js';
-import { EVENT_KEY_CODE_MAP, KeyCode, KeyMod, SCAN_CODE_STR_TO_EVENT_KEY_CODE } from '../../../base/common/keyCodes.js';
+import { IBrowserViewBounds, IBrowserViewDevToolsStateEvent, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent, BrowserNewPageLocation, browserViewIsolatedWorldId, browserZoomFactors, browserZoomDefaultIndex } from '../common/browserView.js';
 import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 import { ICodeWindow } from '../../window/electron-main/window.js';
 import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-main/auxiliaryWindows.js';
-import { isMacintosh } from '../../../base/common/platform.js';
 import { BrowserViewUri } from '../common/browserViewUri.js';
 import { BrowserViewDebugger } from './browserViewDebugger.js';
 import { ILogService } from '../../log/common/log.js';
@@ -21,18 +18,7 @@ import { ICDPTarget, ICDPConnection, CDPTargetInfo } from '../common/cdp/types.j
 import { BrowserSession } from './browserSession.js';
 import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
 import { hasKey } from '../../../base/common/types.js';
-
-/** Key combinations that are used in system-level shortcuts. */
-const nativeShortcuts = new Set([
-	KeyMod.CtrlCmd | KeyCode.KeyA,
-	KeyMod.CtrlCmd | KeyCode.KeyC,
-	KeyMod.CtrlCmd | KeyCode.KeyV,
-	KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
-	KeyMod.CtrlCmd | KeyCode.KeyX,
-	...(isMacintosh ? [] : [KeyMod.CtrlCmd | KeyCode.KeyY]),
-	KeyMod.CtrlCmd | KeyCode.KeyZ,
-	KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyZ
-]);
+import { SCAN_CODE_STR_TO_EVENT_KEY_CODE } from '../../../base/common/keyCodes.js';
 
 /**
  * Represents a single browser view instance with its WebContentsView and all associated logic.
@@ -46,10 +32,10 @@ export class BrowserView extends Disposable implements ICDPTarget {
 	private _lastFavicon: string | undefined = undefined;
 	private _lastError: IBrowserViewLoadError | undefined = undefined;
 	private _lastUserGestureTimestamp: number = -Infinity;
+	private _browserZoomIndex: number = browserZoomDefaultIndex;
 
 	private _debugger: BrowserViewDebugger;
 	private _window: ICodeWindow | IAuxiliaryWindow | undefined;
-	private _isSendingKeyEvent = false;
 	private _isDisposed = false;
 
 	private readonly _onDidNavigate = this._register(new Emitter<IBrowserViewNavigationEvent>());
@@ -105,7 +91,6 @@ export class BrowserView extends Disposable implements ICDPTarget {
 			sandbox: true,
 			webviewTag: false,
 			session: this.session.electronSession,
-			preload: FileAccess.asFileUri('vs/platform/browserView/electron-browser/preload-browserView.js').fsPath,
 
 			// TODO@kycutler: Remove this once https://github.com/electron/electron/issues/42578 is fixed
 			type: 'browserView'
@@ -137,11 +122,12 @@ export class BrowserView extends Disposable implements ICDPTarget {
 				action: 'allow',
 				createWindow: (options) => {
 					const childView = createChildView(options);
-					const resource = BrowserViewUri.forUrl(details.url, childView.id);
+					const resource = BrowserViewUri.forId(childView.id);
 
 					// Fire event for the workbench to open this view
 					this._onDidRequestNewPage.fire({
 						resource,
+						url: details.url,
 						location,
 						position: { x: options.x, y: options.y, width: options.width, height: options.height }
 					});
@@ -162,8 +148,6 @@ export class BrowserView extends Disposable implements ICDPTarget {
 
 		this._debugger = new BrowserViewDebugger(this, this.logService);
 
-		this._register(session.acquire());
-
 		this.setupEventListeners();
 	}
 
@@ -185,6 +169,9 @@ export class BrowserView extends Disposable implements ICDPTarget {
 			for (const url of favicons) {
 				if (!this._faviconRequestCache.has(url)) {
 					this._faviconRequestCache.set(url, (async () => {
+						if (url.startsWith('data:image/')) {
+							return url;
+						}
 						const response = await webContents.session.fetch(url, {
 							cache: 'force-cache'
 						});
@@ -192,6 +179,9 @@ export class BrowserView extends Disposable implements ICDPTarget {
 							throw new Error(`Failed to fetch favicon: ${response.status} ${response.statusText}`);
 						}
 						const type = await response.headers.get('content-type');
+						if (!type?.startsWith('image/')) {
+							throw new Error(`Favicon is not an image: ${type}`);
+						}
 						const buffer = await response.arrayBuffer();
 
 						return `data:${type};base64,${Buffer.from(buffer).toString('base64')}`;
@@ -221,11 +211,13 @@ export class BrowserView extends Disposable implements ICDPTarget {
 		});
 
 		const fireNavigationEvent = () => {
+			const url = webContents.getURL();
 			this._onDidNavigate.fire({
-				url: webContents.getURL(),
+				url,
 				title: webContents.getTitle(),
 				canGoBack: webContents.navigationHistory.canGoBack(),
-				canGoForward: webContents.navigationHistory.canGoForward()
+				canGoForward: webContents.navigationHistory.canGoForward(),
+				certificateError: this.session.trust.getCertificateError(url)
 			});
 		};
 
@@ -250,7 +242,9 @@ export class BrowserView extends Disposable implements ICDPTarget {
 				this._lastError = {
 					url: validatedURL,
 					errorCode,
-					errorDescription
+					errorDescription,
+					// -200 - -220 are the range of certificate errors in Chromium.
+					certificateError: errorCode <= -200 && errorCode >= -220 ? this.session.trust.getCertificateError(validatedURL) : undefined
 				};
 
 				fireLoadingEvent(false);
@@ -258,12 +252,15 @@ export class BrowserView extends Disposable implements ICDPTarget {
 					url: validatedURL,
 					title: '',
 					canGoBack: webContents.navigationHistory.canGoBack(),
-					canGoForward: webContents.navigationHistory.canGoForward()
+					canGoForward: webContents.navigationHistory.canGoForward(),
+					certificateError: this.session.trust.getCertificateError(validatedURL)
 				});
 			}
 		});
 		webContents.on('did-finish-load', () => fireLoadingEvent(false));
 
+		this.session.trust.installCertErrorHandler(webContents);
+
 		webContents.on('render-process-gone', (_event, details) => {
 			this._lastError = {
 				url: webContents.getURL(),
@@ -278,6 +275,12 @@ export class BrowserView extends Disposable implements ICDPTarget {
 		webContents.on('did-navigate', fireNavigationEvent);
 		webContents.on('did-navigate-in-page', fireNavigationEvent);
 
+		// Chromium resets the zoom factor to its per-origin default (100%) when
+		// navigating to a new document. Re-apply our stored zoom to override it.
+		webContents.on('did-navigate', () => {
+			this._view.webContents.setZoomFactor(browserZoomFactors[this._browserZoomIndex]);
+		});
+
 		// Focus events
 		webContents.on('focus', () => {
 			this._onDidChangeFocus.fire({ focused: true });
@@ -287,13 +290,41 @@ export class BrowserView extends Disposable implements ICDPTarget {
 			this._onDidChangeFocus.fire({ focused: false });
 		});
 
-		// Key down events - listen for raw key input events
-		webContents.on('before-input-event', async (event, input) => {
-			if (input.type === 'keyDown' && !this._isSendingKeyEvent) {
-				if (this.tryHandleCommand(input)) {
-					event.preventDefault();
-				}
+		// Forward key down events that weren't handled by the page to the workbench for shortcut handling.
+		webContents.ipc.on('vscode:browserView:keydown', (_event, keyEvent: IBrowserViewKeyDownEvent) => {
+			this._onDidKeyCommand.fire(keyEvent);
+		});
+		// If the page won't be able to handle events, forward key down events directly.
+		webContents.on('before-input-event', (event, input) => {
+			if (input.type !== 'keyDown') {
+				return;
 			}
+
+			const pageIsAvailable = this._view.getVisible()
+				&& !webContents.isCrashed()
+				&& !this._debugger.isPaused;
+			if (pageIsAvailable) {
+				return;
+			}
+
+			// This logic should mirror that in preload-browserView.ts.
+			if (!(input.control || input.alt || input.meta) && input.key.length === 1) {
+				return;
+			}
+
+			event.preventDefault();
+
+			const eventKeyCode = SCAN_CODE_STR_TO_EVENT_KEY_CODE[input.code] || 0;
+			this._onDidKeyCommand.fire({
+				key: input.key,
+				keyCode: eventKeyCode,
+				code: input.code,
+				ctrlKey: input.control,
+				shiftKey: input.shift,
+				altKey: input.alt,
+				metaKey: input.meta,
+				repeat: input.isAutoRepeat
+			});
 		});
 
 		// Track user gestures for popup blocking logic.
@@ -353,8 +384,10 @@ export class BrowserView extends Disposable implements ICDPTarget {
 	 */
 	getState(): IBrowserViewState {
 		const webContents = this._view.webContents;
+		const url = webContents.getURL();
+
 		return {
-			url: webContents.getURL(),
+			url,
 			title: webContents.getTitle(),
 			canGoBack: webContents.navigationHistory.canGoBack(),
 			canGoForward: webContents.navigationHistory.canGoForward(),
@@ -365,8 +398,9 @@ export class BrowserView extends Disposable implements ICDPTarget {
 			lastScreenshot: this._lastScreenshot,
 			lastFavicon: this._lastFavicon,
 			lastError: this._lastError,
+			certificateError: this.session.trust.getCertificateError(url),
 			storageScope: this.session.storageScope,
-			zoomFactor: webContents.getZoomFactor()
+			browserZoomIndex: this._browserZoomIndex
 		};
 	}
 
@@ -390,7 +424,6 @@ export class BrowserView extends Disposable implements ICDPTarget {
 			}
 		}
 
-		this._view.webContents.setZoomFactor(bounds.zoomFactor);
 		this._view.setBorderRadius(Math.round(bounds.cornerRadius * bounds.zoomFactor));
 		this._view.setBounds({
 			x: Math.round(bounds.x * bounds.zoomFactor),
@@ -400,6 +433,12 @@ export class BrowserView extends Disposable implements ICDPTarget {
 		});
 	}
 
+	setBrowserZoomIndex(zoomIndex: number): void {
+		this._browserZoomIndex = Math.max(0, Math.min(zoomIndex, browserZoomFactors.length - 1));
+		const browserZoomFactor = browserZoomFactors[this._browserZoomIndex];
+		this._view.webContents.setZoomFactor(browserZoomFactor);
+	}
+
 	/**
 	 * Set the visibility of this view
 	 */
@@ -491,35 +530,6 @@ export class BrowserView extends Disposable implements ICDPTarget {
 		return screenshot;
 	}
 
-	/**
-	 * Dispatch a keyboard event to this view
-	 */
-	async dispatchKeyEvent(keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
-		const event: Electron.KeyboardInputEvent = {
-			type: 'keyDown',
-			keyCode: keyEvent.key,
-			modifiers: []
-		};
-		if (keyEvent.ctrlKey) {
-			event.modifiers!.push('control');
-		}
-		if (keyEvent.shiftKey) {
-			event.modifiers!.push('shift');
-		}
-		if (keyEvent.altKey) {
-			event.modifiers!.push('alt');
-		}
-		if (keyEvent.metaKey) {
-			event.modifiers!.push('meta');
-		}
-		this._isSendingKeyEvent = true;
-		try {
-			await this._view.webContents.sendInputEvent(event);
-		} finally {
-			this._isSendingKeyEvent = false;
-		}
-	}
-
 	/**
 	 * Focus this view
 	 */
@@ -570,7 +580,23 @@ export class BrowserView extends Disposable implements ICDPTarget {
 	 * Clear all storage data for this browser view's session
 	 */
 	async clearStorage(): Promise<void> {
-		await this.session.electronSession.clearData();
+		await this.session.clearData();
+	}
+
+	/**
+	 * Trust a certificate for a given host and reload the page.
+	 */
+	async trustCertificate(host: string, fingerprint: string): Promise<void> {
+		await this.session.trust.trustCertificate(host, fingerprint);
+		this._view.webContents.reload();
+	}
+
+	/**
+	 * Revoke trust for a previously trusted certificate and close the view.
+	 */
+	async untrustCertificate(host: string, fingerprint: string): Promise<void> {
+		await this.session.trust.untrustCertificate(host, fingerprint);
+		this.dispose();
 	}
 
 	/**
@@ -629,60 +655,13 @@ export class BrowserView extends Disposable implements ICDPTarget {
 		this._onDidClose.fire();
 
 		// Clean up the view and all its event listeners
-		this._view.webContents.close({ waitForBeforeUnload: false });
+		if (!this._view.webContents.isDestroyed()) {
+			this._view.webContents.close({ waitForBeforeUnload: false });
+		}
 
 		super.dispose();
 	}
 
-	/**
-	 * Potentially handle an input event as a VS Code command.
-	 * Returns `true` if the event was forwarded to VS Code and should not be handled natively.
-	 */
-	private tryHandleCommand(input: Electron.Input): boolean {
-		const eventKeyCode = SCAN_CODE_STR_TO_EVENT_KEY_CODE[input.code] || 0;
-		const keyCode = EVENT_KEY_CODE_MAP[eventKeyCode] || KeyCode.Unknown;
-
-		const isArrowKey = keyCode >= KeyCode.LeftArrow && keyCode <= KeyCode.DownArrow;
-		const isNonEditingKey =
-			keyCode === KeyCode.Escape ||
-			keyCode >= KeyCode.F1 && keyCode <= KeyCode.F24 ||
-			keyCode >= KeyCode.AudioVolumeMute;
-
-		// Ignore most Alt-only inputs (often used for accented characters or menu accelerators)
-		const isAltOnlyInput = input.alt && !input.control && !input.meta;
-		if (isAltOnlyInput && !isNonEditingKey && !isArrowKey) {
-			return false;
-		}
-
-		// Only reroute if there's a command modifier or it's a non-editing key
-		const hasCommandModifier = input.control || input.alt || input.meta;
-		if (!hasCommandModifier && !isNonEditingKey) {
-			return false;
-		}
-
-		// Ignore Ctrl/Cmd + [A,C,V,X,Z] shortcuts to allow native handling (e.g. copy/paste)
-		const isControlInput = isMacintosh ? input.meta : input.control;
-		const modifiedKeyCode = keyCode |
-			(isControlInput ? KeyMod.CtrlCmd : 0) |
-			(input.shift ? KeyMod.Shift : 0) |
-			(input.alt ? KeyMod.Alt : 0);
-		if (nativeShortcuts.has(modifiedKeyCode)) {
-			return false;
-		}
-
-		this._onDidKeyCommand.fire({
-			key: input.key,
-			keyCode: eventKeyCode,
-			code: input.code,
-			ctrlKey: input.control || false,
-			shiftKey: input.shift || false,
-			altKey: input.alt || false,
-			metaKey: input.meta || false,
-			repeat: input.isAutoRepeat || false
-		});
-		return true;
-	}
-
 	private _windowById(windowId: number | undefined): ICodeWindow | IAuxiliaryWindow | undefined {
 		return this._codeWindowById(windowId) ?? this._auxiliaryWindowById(windowId);
 	}
diff --git a/src/vs/platform/browserView/electron-main/browserViewDebugger.ts b/src/vs/platform/browserView/electron-main/browserViewDebugger.ts
index c0bdb734ef7..ebdbdb3bf3e 100644
--- a/src/vs/platform/browserView/electron-main/browserViewDebugger.ts
+++ b/src/vs/platform/browserView/electron-main/browserViewDebugger.ts
@@ -20,6 +20,10 @@ export class BrowserViewDebugger extends Disposable implements ICDPTarget {
 	/** Map from CDP sessionId to the per-connection event emitter */
 	private readonly _sessions = this._register(new DisposableMap<string, DebugSession>());
 
+	/** Whether any attached debugger session has paused JavaScript execution. */
+	private _isPaused = false;
+	get isPaused(): boolean { return this._isPaused; }
+
 	/**
 	 * The real CDP targetId discovered from Target.getTargets().
 	 * Ideally this could be fetched synchronously from the WebContents,
@@ -141,6 +145,13 @@ export class BrowserViewDebugger extends Disposable implements ICDPTarget {
 			return;
 		}
 
+		// Track debugger pause state
+		if (method === 'Debugger.paused') {
+			this._isPaused = true;
+		} else if (method === 'Debugger.resumed') {
+			this._isPaused = false;
+		}
+
 		// Find the session for this sessionId and fire the event
 		const session = this._sessions.get(sessionId);
 		if (session) {
diff --git a/src/vs/platform/browserView/electron-main/browserViewMainService.ts b/src/vs/platform/browserView/electron-main/browserViewMainService.ts
index 313b3f416de..d7e9ac1737f 100644
--- a/src/vs/platform/browserView/electron-main/browserViewMainService.ts
+++ b/src/vs/platform/browserView/electron-main/browserViewMainService.ts
@@ -6,7 +6,7 @@
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { IBrowserViewBounds, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewService, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, BrowserViewCommandId } from '../common/browserView.js';
+import { IBrowserViewBounds, IBrowserViewState, IBrowserViewService, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, BrowserViewCommandId } from '../common/browserView.js';
 import { clipboard, Menu, MenuItem } from 'electron';
 import { ICDPTarget, CDPBrowserVersion, CDPWindowBounds, CDPTargetInfo, ICDPConnection, ICDPBrowserTarget } from '../common/cdp/types.js';
 import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
@@ -17,6 +17,7 @@ import { BrowserViewUri } from '../common/browserViewUri.js';
 import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 import { BrowserSession } from './browserSession.js';
 import { IProductService } from '../../product/common/productService.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
 import { CDPBrowserProxy } from '../common/cdp/proxy.js';
 import { IntegratedBrowserOpenSource, logBrowserOpen } from '../common/browserViewTelemetry.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -61,7 +62,8 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 		@IProductService private readonly productService: IProductService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService
+		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
+		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService
 	) {
 		super();
 	}
@@ -193,8 +195,6 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 				await this.destroyBrowserView(view.id);
 			}
 		}
-
-		browserSession.dispose();
 	}
 
 	/**
@@ -304,10 +304,6 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		return this._getBrowserView(id).captureScreenshot(options);
 	}
 
-	async dispatchKeyEvent(id: string, keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
-		return this._getBrowserView(id).dispatchKeyEvent(keyEvent);
-	}
-
 	async focus(id: string): Promise<void> {
 		return this._getBrowserView(id).focus();
 	}
@@ -328,9 +324,22 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		return this._getBrowserView(id).clearStorage();
 	}
 
+	async setBrowserZoomIndex(id: string, zoomIndex: number): Promise<void> {
+		return this._getBrowserView(id).setBrowserZoomIndex(zoomIndex);
+	}
+
+	async trustCertificate(id: string, host: string, fingerprint: string): Promise<void> {
+		return this._getBrowserView(id).trustCertificate(host, fingerprint);
+	}
+
+	async untrustCertificate(id: string, host: string, fingerprint: string): Promise<void> {
+		return this._getBrowserView(id).untrustCertificate(host, fingerprint);
+	}
+
 	async clearGlobalStorage(): Promise<void> {
 		const browserSession = BrowserSession.getOrCreateGlobal();
-		await browserSession.electronSession.clearData();
+		browserSession.connectStorage(this.applicationStorageMainService);
+		await browserSession.clearData();
 	}
 
 	async clearWorkspaceStorage(workspaceId: string): Promise<void> {
@@ -338,7 +347,8 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 			workspaceId,
 			this.environmentMainService.workspaceStorageHome
 		);
-		await browserSession.electronSession.clearData();
+		browserSession.connectStorage(this.applicationStorageMainService);
+		await browserSession.clearData();
 	}
 
 	async updateKeybindings(keybindings: { [commandId: string]: string }): Promise<void> {
@@ -353,6 +363,8 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 			throw new Error(`Browser view with id ${id} already exists`);
 		}
 
+		browserSession.connectStorage(this.applicationStorageMainService);
+
 		const view = this.instantiationService.createInstance(
 			BrowserView,
 			id,
@@ -401,7 +413,7 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		// Request the workbench to open the editor
 		window.sendWhenReady('vscode:runAction', CancellationToken.None, {
 			id: '_workbench.open',
-			args: [BrowserViewUri.forUrl(url, targetId), [undefined, editorOptions], undefined]
+			args: [BrowserViewUri.forId(targetId), [undefined, { ...editorOptions, viewState: { url } }], undefined]
 		});
 
 		return view;
diff --git a/src/vs/platform/browserView/test/electron-main/browserSessionTrust.test.ts b/src/vs/platform/browserView/test/electron-main/browserSessionTrust.test.ts
new file mode 100644
index 00000000000..4dc9fab0496
--- /dev/null
+++ b/src/vs/platform/browserView/test/electron-main/browserSessionTrust.test.ts
@@ -0,0 +1,340 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import * as sinon from 'sinon';
+import { EventEmitter } from 'events';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { StorageScope, StorageTarget } from '../../../storage/common/storage.js';
+import { IApplicationStorageMainService } from '../../../storage/electron-main/storageMainService.js';
+import { BrowserSessionTrust } from '../../electron-main/browserSessionTrust.js';
+import type { BrowserSession } from '../../electron-main/browserSession.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+const STORAGE_KEY = 'browserView.sessionTrustData';
+const TRUST_DURATION_MS = 7 * 24 * 60 * 60 * 1000;
+
+type CertificateVerifyProc = Parameters<Electron.Session['setCertificateVerifyProc']>[0];
+type CertificateVerifyRequest = Parameters<NonNullable<CertificateVerifyProc>>[0];
+
+class TestElectronSession {
+	readonly closeAllConnections = sinon.stub().resolves();
+	certificateVerifyProc: CertificateVerifyProc | undefined;
+
+	setCertificateVerifyProc(callback: CertificateVerifyProc): void {
+		this.certificateVerifyProc = callback;
+	}
+
+	asSession(): Electron.Session {
+		return this as unknown as Electron.Session;
+	}
+}
+
+class TestBrowserSession {
+	constructor(
+		readonly id: string,
+		readonly electronSession: Electron.Session,
+	) { }
+
+	asBrowserSession(): BrowserSession {
+		return this as unknown as BrowserSession;
+	}
+}
+
+class TestApplicationStorageMainService {
+	private readonly data = new Map<string, string>();
+	readonly store = sinon.stub<[string, string | number | boolean | object | null | undefined, StorageScope, StorageTarget], void>().callsFake((key, value) => {
+		this.data.set(key, String(value));
+	});
+	readonly remove = sinon.stub<[string, StorageScope], void>().callsFake(key => {
+		this.data.delete(key);
+	});
+
+	get(key: string, _scope: StorageScope, fallbackValue?: string): string | undefined {
+		return this.data.get(key) ?? fallbackValue;
+	}
+
+	seed(key: string, value: string): void {
+		this.data.set(key, value);
+	}
+
+	read(key: string): string | undefined {
+		return this.data.get(key);
+	}
+
+	asService(): IApplicationStorageMainService {
+		return this as unknown as IApplicationStorageMainService;
+	}
+}
+
+class TestWebContents extends EventEmitter {
+	asWebContents(): Electron.WebContents {
+		return this as unknown as Electron.WebContents;
+	}
+}
+
+function createTrust(sessionId = 'test-session'): {
+	trust: BrowserSessionTrust;
+	electronSession: TestElectronSession;
+	storage: TestApplicationStorageMainService;
+} {
+	const electronSession = new TestElectronSession();
+	const browserSession = new TestBrowserSession(sessionId, electronSession.asSession());
+	const trust = new BrowserSessionTrust(browserSession.asBrowserSession());
+	const storage = new TestApplicationStorageMainService();
+
+	return { trust, electronSession, storage };
+}
+
+function createCertificate(fingerprint: string, extra?: Partial<Electron.Certificate>): Electron.Certificate {
+	return { fingerprint, issuerName: 'Test CA', subjectName: 'test.example.com', validStart: 0, validExpiry: 0, ...extra } as Electron.Certificate;
+}
+
+function invokeVerifyProc(
+	electronSession: TestElectronSession,
+	request: Partial<CertificateVerifyRequest> & { hostname: string; certificate: Electron.Certificate }
+): number {
+	assert.ok(electronSession.certificateVerifyProc);
+
+	let result: number | undefined;
+	electronSession.certificateVerifyProc!({
+		errorCode: 0,
+		verificationResult: 'OK',
+		...request
+	} as CertificateVerifyRequest, value => {
+		result = value;
+	});
+
+	assert.notStrictEqual(result, undefined);
+	return result!;
+}
+
+suite('BrowserSessionTrust', () => {
+	teardown(() => {
+		sinon.restore();
+	});
+
+	test('installs certificate verify proc and tracks certificate errors', () => {
+		const { trust, electronSession } = createTrust();
+
+		const verificationResult = invokeVerifyProc(electronSession, {
+			hostname: 'example.com',
+			errorCode: -202,
+			verificationResult: 'net::ERR_CERT_AUTHORITY_INVALID',
+			certificate: createCertificate('abc123')
+		});
+
+		assert.strictEqual(verificationResult, -3);
+		assert.deepStrictEqual(trust.getCertificateError('https://example.com/path'), {
+			host: 'example.com',
+			fingerprint: 'abc123',
+			error: 'net::ERR_CERT_AUTHORITY_INVALID',
+			url: 'https://example.com/path',
+			hasTrustedException: false,
+			issuerName: 'Test CA',
+			subjectName: 'test.example.com',
+			validStart: 0,
+			validExpiry: 0,
+		});
+
+		invokeVerifyProc(electronSession, {
+			hostname: 'example.com',
+			certificate: createCertificate('abc123')
+		});
+
+		assert.strictEqual(trust.getCertificateError('https://example.com/path'), undefined);
+	});
+
+	test('trustCertificate persists data under the trust storage key', async () => {
+		const { trust, storage } = createTrust();
+		trust.connectStorage(storage.asService());
+
+		await trust.trustCertificate('example.com', 'abc123');
+
+		assert.strictEqual(storage.store.calledOnce, true);
+		assert.deepStrictEqual(storage.store.firstCall.args.slice(0, 4), [STORAGE_KEY, storage.read(STORAGE_KEY), StorageScope.APPLICATION, StorageTarget.MACHINE]);
+
+		const persisted = JSON.parse(storage.read(STORAGE_KEY)!);
+		assert.deepStrictEqual(persisted['test-session'].trustedCerts.map((entry: { host: string; fingerprint: string }) => ({ host: entry.host, fingerprint: entry.fingerprint })), [{ host: 'example.com', fingerprint: 'abc123' }]);
+	});
+
+	test('trustCertificate stores expiresAt relative to current time', async () => {
+		const clock = sinon.useFakeTimers({ now: Date.parse('2026-03-01T00:00:00.000Z') });
+		const { trust, storage } = createTrust();
+		trust.connectStorage(storage.asService());
+
+		await trust.trustCertificate('example.com', 'abc123');
+
+		const persisted = JSON.parse(storage.read(STORAGE_KEY)!);
+		const [entry] = persisted['test-session'].trustedCerts as { host: string; fingerprint: string; expiresAt: number }[];
+		assert.strictEqual(entry.host, 'example.com');
+		assert.strictEqual(entry.fingerprint, 'abc123');
+		assert.strictEqual(entry.expiresAt, Date.now() + TRUST_DURATION_MS);
+
+		clock.restore();
+	});
+
+	test('trust is valid at expiration and invalid after expiration', async () => {
+		const clock = sinon.useFakeTimers({ now: Date.parse('2026-03-01T00:00:00.000Z') });
+		const { trust, electronSession, storage } = createTrust();
+		const webContents = new TestWebContents();
+		trust.installCertErrorHandler(webContents.asWebContents());
+		trust.connectStorage(storage.asService());
+		await trust.trustCertificate('example.com', 'abc123');
+		electronSession.closeAllConnections.resetHistory();
+
+		// Prior to the expiration boundary, trust should still be valid
+		clock.tick(TRUST_DURATION_MS - 10);
+		let callbackResult: boolean | undefined;
+		const firstEvent = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', firstEvent, 'https://example.com', 'ERR_CERT', createCertificate('abc123'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, true);
+
+		// After expiration, trust should be revoked
+		clock.tick(20);
+		const secondEvent = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', secondEvent, 'https://example.com', 'ERR_CERT', createCertificate('abc123'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, false);
+
+		clock.restore();
+	});
+
+	test('connectStorage restores valid trust entries and prunes expired ones', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const { trust, storage } = createTrust();
+		const webContents = new TestWebContents();
+		trust.installCertErrorHandler(webContents.asWebContents());
+		storage.seed(STORAGE_KEY, JSON.stringify({
+			'test-session': {
+				trustedCerts: [
+					{ host: 'valid.example.com', fingerprint: 'valid', expiresAt: Date.now() + 1000 },
+					{ host: 'expired.example.com', fingerprint: 'expired', expiresAt: Date.now() - 1000 }
+				]
+			}
+		}));
+
+		trust.connectStorage(storage.asService());
+
+		let callbackResult: boolean | undefined;
+		const validEvent = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', validEvent, 'https://valid.example.com', 'ERR_CERT', createCertificate('valid'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, true);
+
+		const expiredEvent = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', expiredEvent, 'https://expired.example.com', 'ERR_CERT', createCertificate('expired'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, false);
+
+		const persisted = JSON.parse(storage.read(STORAGE_KEY)!);
+		assert.deepStrictEqual(persisted['test-session'].trustedCerts.map((entry: { host: string; fingerprint: string }) => ({ host: entry.host, fingerprint: entry.fingerprint })), [{ host: 'valid.example.com', fingerprint: 'valid' }]);
+	}));
+
+	test('stored and reloaded trust expires and is pruned', async () => {
+		const clock = sinon.useFakeTimers({ now: Date.parse('2026-03-01T00:00:00.000Z') });
+
+		const storage = new TestApplicationStorageMainService();
+		const firstSession = new TestElectronSession();
+		const firstBrowserSession = new TestBrowserSession('test-session', firstSession.asSession());
+		const firstTrust = new BrowserSessionTrust(firstBrowserSession.asBrowserSession());
+		firstTrust.connectStorage(storage.asService());
+		await firstTrust.trustCertificate('reload.example.com', 'reload-fingerprint');
+
+		clock.tick(TRUST_DURATION_MS + 1);
+
+		const secondSession = new TestElectronSession();
+		const secondBrowserSession = new TestBrowserSession('test-session', secondSession.asSession());
+		const secondTrust = new BrowserSessionTrust(secondBrowserSession.asBrowserSession());
+		const webContents = new TestWebContents();
+		secondTrust.installCertErrorHandler(webContents.asWebContents());
+		secondTrust.connectStorage(storage.asService());
+
+		let callbackResult: boolean | undefined;
+		const event = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', event, 'https://reload.example.com', 'ERR_CERT', createCertificate('reload-fingerprint'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, false);
+		assert.strictEqual(storage.read(STORAGE_KEY), undefined);
+
+		clock.restore();
+	});
+
+	test('untrustCertificate removes persisted trust and closes connections', async () => {
+		const { trust, electronSession, storage } = createTrust();
+		trust.connectStorage(storage.asService());
+		await trust.trustCertificate('example.com', 'abc123');
+		electronSession.closeAllConnections.resetHistory();
+		storage.store.resetHistory();
+
+		await trust.untrustCertificate('example.com', 'abc123');
+
+		assert.strictEqual(electronSession.closeAllConnections.calledOnce, true);
+		assert.strictEqual(storage.remove.calledOnceWithExactly(STORAGE_KEY, StorageScope.APPLICATION), true);
+		assert.strictEqual(storage.read(STORAGE_KEY), undefined);
+	});
+
+	test('untrustCertificate throws when certificate is not found', async () => {
+		const { trust, electronSession, storage } = createTrust();
+		trust.connectStorage(storage.asService());
+
+		await assert.rejects(
+			() => trust.untrustCertificate('missing.example.com', 'missing-fingerprint'),
+			error => {
+				assert.ok(error instanceof Error);
+				assert.strictEqual(error.message, 'Certificate not found: host=missing.example.com fingerprint=missing-fingerprint');
+				return true;
+			}
+		);
+		assert.strictEqual(electronSession.closeAllConnections.called, false);
+	});
+
+	test('clear removes trust, clears cert errors, and closes connections', async () => {
+		const { trust, electronSession, storage } = createTrust();
+		trust.connectStorage(storage.asService());
+		await trust.trustCertificate('example.com', 'abc123');
+		invokeVerifyProc(electronSession, {
+			hostname: 'example.com',
+			errorCode: -202,
+			verificationResult: 'net::ERR_CERT_COMMON_NAME_INVALID',
+			certificate: createCertificate('abc123')
+		});
+
+		await trust.clear();
+
+		assert.strictEqual(electronSession.closeAllConnections.calledOnce, true);
+		assert.strictEqual(trust.getCertificateError('https://example.com'), undefined);
+		assert.strictEqual(storage.read(STORAGE_KEY), undefined);
+	});
+
+	test('installCertErrorHandler only allows trusted certificates', async () => {
+		const { trust } = createTrust();
+		const webContents = new TestWebContents();
+		trust.installCertErrorHandler(webContents.asWebContents());
+
+		let callbackResult: boolean | undefined;
+		const firstEvent = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', firstEvent, 'https://example.com', 'ERR_CERT', createCertificate('abc123'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, false);
+		assert.strictEqual(firstEvent.preventDefault.calledOnce, true);
+
+		await trust.trustCertificate('example.com', 'abc123');
+		const secondEvent = { preventDefault: sinon.spy() };
+		webContents.emit('certificate-error', secondEvent, 'https://example.com', 'ERR_CERT', createCertificate('abc123'), (value: boolean) => {
+			callbackResult = value;
+		});
+		assert.strictEqual(callbackResult, true);
+		assert.strictEqual(secondEvent.preventDefault.calledOnce, true);
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+});
diff --git a/src/vs/platform/download/common/download.ts b/src/vs/platform/download/common/download.ts
index d608e078ecb..8d26b20e5a3 100644
--- a/src/vs/platform/download/common/download.ts
+++ b/src/vs/platform/download/common/download.ts
@@ -13,6 +13,6 @@ export interface IDownloadService {
 
 	readonly _serviceBrand: undefined;
 
-	download(uri: URI, to: URI, cancellationToken?: CancellationToken): Promise<void>;
+	download(uri: URI, to: URI, callSite: string, cancellationToken?: CancellationToken): Promise<void>;
 
 }
diff --git a/src/vs/platform/download/common/downloadIpc.ts b/src/vs/platform/download/common/downloadIpc.ts
index c3ba6d6c249..efd3a3e2113 100644
--- a/src/vs/platform/download/common/downloadIpc.ts
+++ b/src/vs/platform/download/common/downloadIpc.ts
@@ -19,7 +19,7 @@ export class DownloadServiceChannel implements IServerChannel {
 
 	call(context: any, command: string, args?: any): Promise<any> {
 		switch (command) {
-			case 'download': return this.service.download(URI.revive(args[0]), URI.revive(args[1]));
+			case 'download': return this.service.download(URI.revive(args[0]), URI.revive(args[1]), args[2] ?? 'downloadIpc');
 		}
 		throw new Error('Invalid call');
 	}
@@ -31,7 +31,7 @@ export class DownloadServiceChannelClient implements IDownloadService {
 
 	constructor(private channel: IChannel, private getUriTransformer: () => IURITransformer | null) { }
 
-	async download(from: URI, to: URI): Promise<void> {
+	async download(from: URI, to: URI, _callSite?: string): Promise<void> {
 		const uriTransformer = this.getUriTransformer();
 		if (uriTransformer) {
 			from = uriTransformer.transformOutgoingURI(from);
diff --git a/src/vs/platform/download/common/downloadService.ts b/src/vs/platform/download/common/downloadService.ts
index 79cedcb1668..4782f506588 100644
--- a/src/vs/platform/download/common/downloadService.ts
+++ b/src/vs/platform/download/common/downloadService.ts
@@ -19,13 +19,13 @@ export class DownloadService implements IDownloadService {
 		@IFileService private readonly fileService: IFileService
 	) { }
 
-	async download(resource: URI, target: URI, cancellationToken: CancellationToken = CancellationToken.None): Promise<void> {
+	async download(resource: URI, target: URI, callSite: string, cancellationToken: CancellationToken = CancellationToken.None): Promise<void> {
 		if (resource.scheme === Schemas.file || resource.scheme === Schemas.vscodeRemote) {
 			// Intentionally only support this for file|remote<->file|remote scenarios
 			await this.fileService.copy(resource, target);
 			return;
 		}
-		const options = { type: 'GET', url: resource.toString(true) };
+		const options = { type: 'GET' as const, url: resource.toString(true), callSite };
 		const context = await this.requestService.request(options, cancellationToken);
 		if (context.res.statusCode === 200) {
 			await this.fileService.writeFile(target, context.stream);
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
index d0751cb4bc9..b43d8d53137 100644
--- a/src/vs/platform/editor/common/editor.ts
+++ b/src/vs/platform/editor/common/editor.ts
@@ -334,6 +334,11 @@ export interface IModalEditorPartOptions {
 	 */
 	readonly maximized?: boolean;
 
+	/**
+	 * Minimum width of the modal editor part in pixels.
+	 */
+	readonly minWidth?: number;
+
 	/**
 	 * Size of the modal editor part unless it is maximized.
 	 */
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index 72938572635..72752cf9ed1 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -24,6 +24,7 @@ export interface NativeParsedArgs {
 		};
 	};
 	'serve-web'?: INativeCliOptions;
+	'agent-host'?: INativeCliOptions;
 	chat?: {
 		_: string[];
 		'add-file'?: string[];
@@ -86,6 +87,8 @@ export interface NativeParsedArgs {
 	'inspect-brk-search'?: string;
 	'inspect-ptyhost'?: string;
 	'inspect-brk-ptyhost'?: string;
+	'inspect-agenthost'?: string;
+	'inspect-brk-agenthost'?: string;
 	'inspect-sharedprocess'?: string;
 	'inspect-brk-sharedprocess'?: string;
 	'disable-extensions'?: boolean;
@@ -107,6 +110,7 @@ export interface NativeParsedArgs {
 	'disable-telemetry'?: boolean;
 	'export-default-configuration'?: string;
 	'export-policy-data'?: string;
+	'export-default-keybindings'?: string;
 	'install-source'?: string;
 	'add-mcp'?: string[];
 	'disable-updates'?: boolean;
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 137a08dab33..883ed24b0fc 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -149,6 +149,7 @@ export interface INativeEnvironmentService extends IEnvironmentService {
 
 	crossOriginIsolated?: boolean;
 	exportPolicyData?: string;
+	exportDefaultKeybindings?: string;
 
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	//
diff --git a/src/vs/platform/environment/common/environmentService.ts b/src/vs/platform/environment/common/environmentService.ts
index c6869a109f1..3502a718fa0 100644
--- a/src/vs/platform/environment/common/environmentService.ts
+++ b/src/vs/platform/environment/common/environmentService.ts
@@ -264,6 +264,10 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 		return this.args['export-policy-data'];
 	}
 
+	get exportDefaultKeybindings(): string | undefined {
+		return this.args['export-default-keybindings'];
+	}
+
 	get continueOn(): string | undefined {
 		return this.args['continueOn'];
 	}
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 9068c9ad77a..3b7f625a6ab 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -45,7 +45,7 @@ export type OptionDescriptions<T> = {
 	Subcommand<T[P]>
 };
 
-export const NATIVE_CLI_COMMANDS = ['tunnel', 'serve-web'] as const;
+export const NATIVE_CLI_COMMANDS = ['tunnel', 'serve-web', 'agent-host'] as const;
 
 export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'chat': {
@@ -71,6 +71,15 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 			'telemetry-level': { type: 'string' },
 		}
 	},
+	'agent-host': {
+		type: 'subcommand',
+		description: 'Run a server that hosts agents.',
+		options: {
+			'cli-data-dir': { type: 'string', args: 'dir', description: localize('cliDataDir', "Directory where CLI metadata should be stored.") },
+			'disable-telemetry': { type: 'boolean' },
+			'telemetry-level': { type: 'string' },
+		}
+	},
 	'tunnel': {
 		type: 'subcommand',
 		description: 'Make the current machine accessible from vscode.dev or other machines through a secure tunnel.',
@@ -158,12 +167,15 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'debugRenderer': { type: 'boolean' },
 	'inspect-ptyhost': { type: 'string', allowEmptyValue: true },
 	'inspect-brk-ptyhost': { type: 'string', allowEmptyValue: true },
+	'inspect-agenthost': { type: 'string', allowEmptyValue: true },
+	'inspect-brk-agenthost': { type: 'string', allowEmptyValue: true },
 	'inspect-search': { type: 'string', deprecates: ['debugSearch'], allowEmptyValue: true },
 	'inspect-brk-search': { type: 'string', deprecates: ['debugBrkSearch'], allowEmptyValue: true },
 	'inspect-sharedprocess': { type: 'string', allowEmptyValue: true },
 	'inspect-brk-sharedprocess': { type: 'string', allowEmptyValue: true },
 	'export-default-configuration': { type: 'string' },
 	'export-policy-data': { type: 'string', allowEmptyValue: true },
+	'export-default-keybindings': { type: 'string', allowEmptyValue: true },
 	'install-source': { type: 'string' },
 	'enable-smoke-test-driver': { type: 'boolean' },
 	'skip-sessions-welcome': { type: 'boolean' },
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index ae9e7e1d477..1bb9d708407 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -25,6 +25,10 @@ export function parsePtyHostDebugPort(args: NativeParsedArgs, isBuilt: boolean):
 	return parseDebugParams(args['inspect-ptyhost'], args['inspect-brk-ptyhost'], 5877, isBuilt, args.extensionEnvironment);
 }
 
+export function parseAgentHostDebugPort(args: NativeParsedArgs, isBuilt: boolean): IDebugParams {
+	return parseDebugParams(args['inspect-agenthost'], args['inspect-brk-agenthost'], 5878, isBuilt, args.extensionEnvironment);
+}
+
 export function parseSharedProcessDebugPort(args: NativeParsedArgs, isBuilt: boolean): IDebugParams {
 	return parseDebugParams(args['inspect-sharedprocess'], args['inspect-brk-sharedprocess'], 5879, isBuilt, args.extensionEnvironment);
 }
diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index e9595bd406a..426df59122b 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -167,11 +167,20 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			const results = await this.installGalleryExtensions([{ extension, options }]);
 			const result = results.find(({ identifier }) => areSameExtensions(identifier, extension.identifier));
 			if (result?.local) {
-				return result?.local;
+				return result.local;
 			}
 			if (result?.error) {
 				throw result.error;
 			}
+			// Extension might have been redirected due to deprecation (e.g., github.copilot -> github.copilot-chat)
+			// In this case, the result will have the redirected extension's identifier
+			const redirectedResult = results[0];
+			if (redirectedResult?.local) {
+				return redirectedResult.local;
+			}
+			if (redirectedResult?.error) {
+				throw redirectedResult.error;
+			}
 			throw new ExtensionManagementError(`Unknown error while installing extension ${extension.identifier.id}`, ExtensionManagementErrorCode.Unknown);
 		} catch (error) {
 			throw toExtensionManagementError(error);
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 5b52e9acec7..6414a467547 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -1082,7 +1082,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			this.telemetryService.publicLog2<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension: extensionId, extensionVersion: version });
 
 			const headers = { 'Accept-Encoding': 'gzip' };
-			const context = await this.getAsset(extensionId, manifestAsset, AssetType.Manifest, version, { headers });
+			const context = await this.getAsset(extensionId, manifestAsset, AssetType.Manifest, version, 'extensionGalleryService.engineVersion', { headers });
 			const manifest = await asJson<IExtensionManifest>(context);
 			if (!manifest) {
 				this.logService.error(`Manifest was not found for the extension ${extensionId} with version ${version}`);
@@ -1439,7 +1439,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				type: 'POST',
 				url: extensionsQueryApi,
 				data,
-				headers
+				headers,
+				callSite: 'extensionGalleryService.queryRawGalleryExtensions'
 			}, token);
 
 			if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
@@ -1588,7 +1589,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				type: 'GET',
 				url: uri.toString(true),
 				headers,
-				timeout: this.getRequestTimeout()
+				timeout: this.getRequestTimeout(),
+				callSite: 'extensionGalleryService.getLatestRawGalleryExtension'
 			}, token);
 
 			if (context.res.statusCode === 404) {
@@ -1686,7 +1688,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			await this.requestService.request({
 				type: 'POST',
 				url,
-				headers
+				headers,
+				callSite: 'extensionGalleryService.reportStatistic'
 			}, CancellationToken.None);
 		} catch (error) { /* Ignore */ }
 	}
@@ -1704,7 +1707,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 		const activityId = extension.queryContext?.[SEARCH_ACTIVITY_HEADER_NAME];
 		const headers: IHeaders | undefined = activityId && typeof activityId === 'string' ? { [SEARCH_ACTIVITY_HEADER_NAME]: activityId } : undefined;
-		const context = await this.getAsset(extension.identifier.id, downloadAsset, AssetType.VSIX, extension.version, headers ? { headers } : undefined);
+		const context = await this.getAsset(extension.identifier.id, downloadAsset, AssetType.VSIX, extension.version, 'extensionGalleryService.download', headers ? { headers } : undefined);
 
 		try {
 			await this.fileService.writeFile(location, context.stream);
@@ -1737,7 +1740,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 		this.logService.trace('ExtensionGalleryService#downloadSignatureArchive', extension.identifier.id);
 
-		const context = await this.getAsset(extension.identifier.id, extension.assets.signature, AssetType.Signature, extension.version);
+		const context = await this.getAsset(extension.identifier.id, extension.assets.signature, AssetType.Signature, extension.version, 'extensionGalleryService.signature');
 		try {
 			await this.fileService.writeFile(location, context.stream);
 		} catch (error) {
@@ -1754,7 +1757,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	async getReadme(extension: IGalleryExtension, token: CancellationToken): Promise<string> {
 		if (extension.assets.readme) {
-			const context = await this.getAsset(extension.identifier.id, extension.assets.readme, AssetType.Details, extension.version, {}, token);
+			const context = await this.getAsset(extension.identifier.id, extension.assets.readme, AssetType.Details, extension.version, 'extensionGalleryService.readme', {}, token);
 			const content = await asTextOrError(context);
 			return content || '';
 		}
@@ -1763,7 +1766,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	async getManifest(extension: IGalleryExtension, token: CancellationToken): Promise<IExtensionManifest | null> {
 		if (extension.assets.manifest) {
-			const context = await this.getAsset(extension.identifier.id, extension.assets.manifest, AssetType.Manifest, extension.version, {}, token);
+			const context = await this.getAsset(extension.identifier.id, extension.assets.manifest, AssetType.Manifest, extension.version, 'extensionGalleryService.manifest', {}, token);
 			const text = await asTextOrError(context);
 			return text ? JSON.parse(text) : null;
 		}
@@ -1773,7 +1776,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	async getCoreTranslation(extension: IGalleryExtension, languageId: string): Promise<ITranslation | null> {
 		const asset = extension.assets.coreTranslations.filter(t => t[0] === languageId.toUpperCase())[0];
 		if (asset) {
-			const context = await this.getAsset(extension.identifier.id, asset[1], asset[0], extension.version);
+			const context = await this.getAsset(extension.identifier.id, asset[1], asset[0], extension.version, 'extensionGalleryService.coreTranslation');
 			const text = await asTextOrError(context);
 			return text ? JSON.parse(text) : null;
 		}
@@ -1782,7 +1785,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	async getChangelog(extension: IGalleryExtension, token: CancellationToken): Promise<string> {
 		if (extension.assets.changelog) {
-			const context = await this.getAsset(extension.identifier.id, extension.assets.changelog, AssetType.Changelog, extension.version, {}, token);
+			const context = await this.getAsset(extension.identifier.id, extension.assets.changelog, AssetType.Changelog, extension.version, 'extensionGalleryService.changelog', {}, token);
 			const content = await asTextOrError(context);
 			return content || '';
 		}
@@ -1869,7 +1872,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return result;
 	}
 
-	private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, extensionVersion: string, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): Promise<IRequestContext> {
+	private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, extensionVersion: string, callSite: string, options: Omit<IRequestOptions, 'callSite'> = {}, token: CancellationToken = CancellationToken.None): Promise<IRequestContext> {
 		const commonHeaders = await this.commonHeadersPromise;
 		const baseOptions = { type: 'GET' };
 		const headers = { ...commonHeaders, ...(options.headers || {}) };
@@ -1877,7 +1880,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 		const url = asset.uri;
 		const fallbackUrl = asset.fallbackUri;
-		const firstOptions = { ...options, url, timeout: this.getRequestTimeout() };
+		const firstOptions = { ...options, url, timeout: this.getRequestTimeout(), callSite };
 
 		let context;
 		try {
@@ -1923,7 +1926,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				endToEndId: this.getHeaderValue(context?.res.headers, END_END_ID_HEADER_NAME),
 			});
 
-			const fallbackOptions = { ...options, url: fallbackUrl, timeout: this.getRequestTimeout() };
+			const fallbackOptions = { ...options, url: fallbackUrl, timeout: this.getRequestTimeout(), callSite: `${callSite}.fallback` };
 			return this.requestService.request(fallbackOptions, token);
 		}
 	}
@@ -1942,7 +1945,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		const context = await this.requestService.request({
 			type: 'GET',
 			url: this.extensionsControlUrl,
-			timeout: this.getRequestTimeout()
+			timeout: this.getRequestTimeout(),
+			callSite: 'extensionGalleryService.getExtensionsControlManifest'
 		}, CancellationToken.None);
 
 		if (context.res.statusCode !== 200) {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index cdf0c67facd..cef0d3c59c1 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -261,7 +261,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		}
 		this.logService.trace('Downloading extension from', vsix.toString());
 		const location = joinPath(this.extensionsDownloader.extensionsDownloadDir, generateUuid());
-		await this.downloadService.download(vsix, location);
+		await this.downloadService.download(vsix, location, 'extensionManagement.downloadVsix');
 		this.logService.info('Downloaded extension to', location.toString());
 		const cleanup = async () => {
 			try {
diff --git a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts
index e360b843193..638db346546 100644
--- a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts
+++ b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoaderService.ts
@@ -34,7 +34,7 @@ export class ExtensionResourceLoaderService extends AbstractExtensionResourceLoa
 	async readExtensionResource(uri: URI): Promise<string> {
 		if (await this.isExtensionGalleryResource(uri)) {
 			const headers = await this.getExtensionGalleryRequestHeaders();
-			const requestContext = await this._requestService.request({ url: uri.toString(), headers }, CancellationToken.None);
+			const requestContext = await this._requestService.request({ url: uri.toString(), headers, callSite: 'extensionResourceLoader.readExtensionResource' }, CancellationToken.None);
 			return (await asTextOrError(requestContext)) || '';
 		}
 		const result = await this._fileService.readFile(uri);
diff --git a/src/vs/platform/extensions/common/extensionHostStarter.ts b/src/vs/platform/extensions/common/extensionHostStarter.ts
index 3560e56c19c..81574ba47f9 100644
--- a/src/vs/platform/extensions/common/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/common/extensionHostStarter.ts
@@ -9,6 +9,7 @@ import { createDecorator } from '../../instantiation/common/instantiation.js';
 export const IExtensionHostStarter = createDecorator<IExtensionHostStarter>('extensionHostStarter');
 
 export const ipcExtensionHostStarterChannelName = 'extensionHostStarter';
+export const extensionHostGraceTimeMs = 6000;
 
 export interface IExtensionHostProcessOptions {
 	responseWindowId: number;
@@ -31,6 +32,7 @@ export interface IExtensionHostStarter {
 	createExtensionHost(): Promise<{ id: string }>;
 	start(id: string, opts: IExtensionHostProcessOptions): Promise<{ pid: number | undefined }>;
 	enableInspectPort(id: string): Promise<boolean>;
+	waitForExit(id: string, maxWaitTimeMs: number): Promise<void>;
 	kill(id: string): Promise<void>;
 
 }
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index 3e5b309b826..e1a24c7190b 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -237,6 +237,7 @@ export interface IExtensionContributions {
 	readonly chatInstructions?: ReadonlyArray<IChatFileContribution>;
 	readonly chatAgents?: ReadonlyArray<IChatFileContribution>;
 	readonly chatSkills?: ReadonlyArray<IChatFileContribution>;
+	readonly chatPlugins?: ReadonlyArray<IChatFileContribution>;
 	readonly languageModelTools?: ReadonlyArray<IToolContribution>;
 	readonly languageModelToolSets?: ReadonlyArray<IToolSetContribution>;
 	readonly mcpServerDefinitionProviders?: ReadonlyArray<IMcpCollectionContribution>;
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 00e09a016ac..5ecf5cf10fa 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -37,6 +37,9 @@ const _allApiProposals = {
 	authenticationChallenges: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authenticationChallenges.d.ts',
 	},
+	browser: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.browser.d.ts',
+	},
 	canonicalUriProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
 	},
@@ -45,7 +48,7 @@ const _allApiProposals = {
 	},
 	chatDebug: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatDebug.d.ts',
-		version: 3
+		version: 4
 	},
 	chatHooks: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatHooks.d.ts',
@@ -76,6 +79,9 @@ const _allApiProposals = {
 	chatReferenceDiagnostic: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts',
 	},
+	chatSessionCustomizations: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSessionCustomizations.d.ts',
+	},
 	chatSessionsProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts',
 		version: 3
@@ -314,6 +320,7 @@ const _allApiProposals = {
 	},
 	mcpServerDefinitions: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts',
+		version: 1
 	},
 	mcpToolDefinitions: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts',
@@ -426,6 +433,9 @@ const _allApiProposals = {
 	taskProblemMatcherStatus: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskProblemMatcherStatus.d.ts',
 	},
+	taskRunOptions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskRunOptions.d.ts',
+	},
 	telemetry: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
 	},
@@ -480,6 +490,9 @@ const _allApiProposals = {
 	tokenInformation: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tokenInformation.d.ts',
 	},
+	toolInvocationApproveCombination: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.toolInvocationApproveCombination.d.ts',
+	},
 	toolProgress: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.toolProgress.d.ts',
 	},
diff --git a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
index 97a0519a493..d5cddd2c8cd 100644
--- a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
@@ -7,7 +7,7 @@ import { Promises } from '../../../base/common/async.js';
 import { canceled } from '../../../base/common/errors.js';
 import { Event } from '../../../base/common/event.js';
 import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
-import { IExtensionHostProcessOptions, IExtensionHostStarter } from '../common/extensionHostStarter.js';
+import { extensionHostGraceTimeMs, IExtensionHostProcessOptions, IExtensionHostStarter } from '../common/extensionHostStarter.js';
 import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
 import { ILogService } from '../../log/common/log.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -121,7 +121,7 @@ export class ExtensionHostStarter extends Disposable implements IDisposable, IEx
 			allowLoadingUnsignedLibraries: true,
 			respondToAuthRequestsFromMainProcess: true,
 			windowLifecycleBound: true,
-			windowLifecycleGraceTime: 6000,
+			windowLifecycleGraceTime: extensionHostGraceTimeMs,
 			correlationId: id
 		});
 		const pid = await Event.toPromise(extHost.onSpawn);
@@ -151,6 +151,17 @@ export class ExtensionHostStarter extends Disposable implements IDisposable, IEx
 		extHostProcess.kill();
 	}
 
+	async waitForExit(id: string, maxWaitTimeMs: number): Promise<void> {
+		if (this._shutdown) {
+			throw canceled();
+		}
+		const extHostProcess = this._extHosts.get(id);
+		if (!extHostProcess) {
+			return;
+		}
+		await extHostProcess.waitForExit(maxWaitTimeMs);
+	}
+
 	async _killAllNow(): Promise<void> {
 		for (const [, extHost] of this._extHosts) {
 			extHost.kill();
diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
index 05660234e61..097d8a73a84 100644
--- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts
+++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
@@ -77,6 +77,7 @@ export interface IKeybindingsRegistry {
 	setExtensionKeybindings(rules: IExtensionKeybindingRule[]): void;
 	registerCommandAndKeybindingRule<Args extends unknown[] = unknown[]>(desc: ICommandAndKeybindingRule<Args>): IDisposable;
 	getDefaultKeybindings(): IKeybindingItem[];
+	getDefaultKeybindingsForOS(os: OperatingSystem): IKeybindingItem[];
 }
 
 /**
@@ -85,24 +86,23 @@ export interface IKeybindingsRegistry {
 class KeybindingsRegistryImpl implements IKeybindingsRegistry {
 
 	private _coreKeybindings: LinkedList<IKeybindingItem>;
+	private _coreKeybindingRules: LinkedList<IKeybindingRule>;
 	private _extensionKeybindings: IKeybindingItem[];
 	private _cachedMergedKeybindings: IKeybindingItem[] | null;
 
 	constructor() {
 		this._coreKeybindings = new LinkedList();
+		this._coreKeybindingRules = new LinkedList();
 		this._extensionKeybindings = [];
 		this._cachedMergedKeybindings = null;
 	}
 
-	/**
-	 * Take current platform into account and reduce to primary & secondary.
-	 */
-	private static bindToCurrentPlatform(kb: IKeybindings): { primary?: number; secondary?: number[] } {
-		if (OS === OperatingSystem.Windows) {
+	private static bindToPlatform(kb: IKeybindings, os: OperatingSystem): { primary?: number; secondary?: number[] } {
+		if (os === OperatingSystem.Windows) {
 			if (kb && kb.win) {
 				return kb.win;
 			}
-		} else if (OS === OperatingSystem.Macintosh) {
+		} else if (os === OperatingSystem.Macintosh) {
 			if (kb && kb.mac) {
 				return kb.mac;
 			}
@@ -111,10 +111,16 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry {
 				return kb.linux;
 			}
 		}
-
 		return kb;
 	}
 
+	/**
+	 * Take current platform into account and reduce to primary & secondary.
+	 */
+	private static bindToCurrentPlatform(kb: IKeybindings): { primary?: number; secondary?: number[] } {
+		return KeybindingsRegistryImpl.bindToPlatform(kb, OS);
+	}
+
 	public registerKeybindingRule(rule: IKeybindingRule): IDisposable {
 		const actualKb = KeybindingsRegistryImpl.bindToCurrentPlatform(rule);
 		const result = new DisposableStore();
@@ -135,6 +141,10 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry {
 				}
 			}
 		}
+
+		const removeRule = this._coreKeybindingRules.push(rule);
+		result.add(toDisposable(() => { removeRule(); }));
+
 		return result;
 	}
 
@@ -193,6 +203,51 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry {
 		}
 		return this._cachedMergedKeybindings.slice(0);
 	}
+
+	public getDefaultKeybindingsForOS(os: OperatingSystem): IKeybindingItem[] {
+		const result: IKeybindingItem[] = [];
+		for (const rule of this._coreKeybindingRules) {
+			const actualKb = KeybindingsRegistryImpl.bindToPlatform(rule, os);
+
+			if (actualKb && actualKb.primary) {
+				const kk = decodeKeybinding(actualKb.primary, os);
+				if (kk) {
+					result.push({
+						keybinding: kk,
+						command: rule.id,
+						commandArgs: rule.args,
+						when: rule.when,
+						weight1: rule.weight,
+						weight2: 0,
+						extensionId: null,
+						isBuiltinExtension: false
+					});
+				}
+			}
+
+			if (actualKb && Array.isArray(actualKb.secondary)) {
+				for (let i = 0, len = actualKb.secondary.length; i < len; i++) {
+					const k = actualKb.secondary[i];
+					const kk = decodeKeybinding(k, os);
+					if (kk) {
+						result.push({
+							keybinding: kk,
+							command: rule.id,
+							commandArgs: rule.args,
+							when: rule.when,
+							weight1: rule.weight,
+							weight2: -i - 1,
+							extensionId: null,
+							isBuiltinExtension: false
+						});
+					}
+				}
+			}
+		}
+
+		result.sort(sorter);
+		return result;
+	}
 }
 export const KeybindingsRegistry: IKeybindingsRegistry = new KeybindingsRegistryImpl();
 
diff --git a/src/vs/platform/keyboardLayout/common/keyboardLayout.ts b/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
index a1db5be9f32..3e96e1622ce 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardLayout.ts
@@ -132,13 +132,13 @@ export function parseKeyboardLayoutDescription(layout: IKeyboardLayoutInfo | nul
 
 		if (/^com\.apple\.keylayout\./.test(macLayout.id)) {
 			return {
-				label: macLayout.id.replace(/^com\.apple\.keylayout\./, '').replace(/-/, ' '),
+				label: macLayout.id.replace(/^com\.apple\.keylayout\./, '').replace(/-/g, ' '),
 				description: ''
 			};
 		}
 		if (/^.*inputmethod\./.test(macLayout.id)) {
 			return {
-				label: macLayout.id.replace(/^.*inputmethod\./, '').replace(/[-\.]/, ' '),
+				label: macLayout.id.replace(/^.*inputmethod\./, '').replace(/[-\.]/g, ' '),
 				description: `Input Method (${macLayout.lang})`
 			};
 		}
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
index 1da00285dc8..11d3f7c7d92 100644
--- a/src/vs/platform/label/common/label.ts
+++ b/src/vs/platform/label/common/label.ts
@@ -66,4 +66,10 @@ export interface ResourceLabelFormatting {
 	workspaceTooltip?: string;
 	authorityPrefix?: string;
 	stripPathStartingSeparator?: boolean;
+	/**
+	 * Number of leading path segments to strip from `${path}` before
+	 * substitution. For example, a value of `2` turns
+	 * `/scheme/authority/rest/of/path` into `/rest/of/path`.
+	 */
+	stripPathSegments?: number;
 }
diff --git a/src/vs/platform/mcp/common/mcpGalleryManifestService.ts b/src/vs/platform/mcp/common/mcpGalleryManifestService.ts
index 377d3071260..a86f67c36d4 100644
--- a/src/vs/platform/mcp/common/mcpGalleryManifestService.ts
+++ b/src/vs/platform/mcp/common/mcpGalleryManifestService.ts
@@ -134,6 +134,7 @@ export class McpGalleryManifestService extends Disposable implements IMcpGallery
 			const context = await this.requestService.request({
 				type: 'GET',
 				url: `${url}/${version}/servers?limit=1`,
+				callSite: 'mcpGalleryManifestService.checkVersion'
 			}, CancellationToken.None);
 			if (isSuccess(context)) {
 				return true;
diff --git a/src/vs/platform/mcp/common/mcpGalleryService.ts b/src/vs/platform/mcp/common/mcpGalleryService.ts
index 5de645fe436..6dbb16e2960 100644
--- a/src/vs/platform/mcp/common/mcpGalleryService.ts
+++ b/src/vs/platform/mcp/common/mcpGalleryService.ts
@@ -816,6 +816,7 @@ export class McpGalleryService extends Disposable implements IMcpGalleryService
 		const context = await this.requestService.request({
 			type: 'GET',
 			url: readmeUrl,
+			callSite: 'mcpGalleryService.getReadme'
 		}, token);
 
 		const result = await asText(context);
@@ -951,6 +952,7 @@ export class McpGalleryService extends Disposable implements IMcpGalleryService
 		const context = await this.requestService.request({
 			type: 'GET',
 			url,
+			callSite: 'mcpGalleryService.queryMcpServers'
 		}, token);
 
 		const data = await asJson(context);
@@ -972,6 +974,7 @@ export class McpGalleryService extends Disposable implements IMcpGalleryService
 		const context = await this.requestService.request({
 			type: 'GET',
 			url: mcpServerUrl,
+			callSite: 'mcpGalleryService.getMcpServer'
 		}, CancellationToken.None);
 
 		if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
diff --git a/src/vs/platform/mcp/common/mcpGateway.ts b/src/vs/platform/mcp/common/mcpGateway.ts
index 27fd5426922..ccc91ac7f0a 100644
--- a/src/vs/platform/mcp/common/mcpGateway.ts
+++ b/src/vs/platform/mcp/common/mcpGateway.ts
@@ -13,39 +13,61 @@ export const IMcpGatewayService = createDecorator<IMcpGatewayService>('IMcpGatew
 export const McpGatewayChannelName = 'mcpGateway';
 export const McpGatewayToolBrokerChannelName = 'mcpGatewayToolBroker';
 
-export interface IGatewayCallToolResult {
-	result: MCP.CallToolResult;
-	serverIndex: number;
-}
-
-export interface IGatewayServerResources {
-	serverIndex: number;
-	resources: readonly MCP.Resource[];
-}
-
-export interface IGatewayServerResourceTemplates {
-	serverIndex: number;
-	resourceTemplates: readonly MCP.ResourceTemplate[];
-}
-
-export interface IMcpGatewayToolInvoker {
-	readonly onDidChangeTools: Event<void>;
-	readonly onDidChangeResources: Event<void>;
-	listTools(): Promise<readonly MCP.Tool[]>;
-	callTool(name: string, args: Record<string, unknown>): Promise<IGatewayCallToolResult>;
-	listResources(): Promise<readonly IGatewayServerResources[]>;
-	readResource(serverIndex: number, uri: string): Promise<MCP.ReadResourceResult>;
-	listResourceTemplates(): Promise<readonly IGatewayServerResourceTemplates[]>;
+/**
+ * Descriptor for an MCP server known to the gateway.
+ */
+export interface IMcpGatewayServerDescriptor {
+	readonly id: string;
+	readonly label: string;
 }
 
 /**
- * Result of creating an MCP gateway.
+ * A single server entry exposed by the gateway.
  */
-export interface IMcpGatewayInfo {
-	/**
-	 * The address of the HTTP endpoint for this gateway.
-	 */
+export interface IMcpGatewayServerInfo {
+	readonly label: string;
 	readonly address: URI;
+}
+
+/**
+ * Per-server tool invoker used by a single gateway route/session.
+ * All methods operate on the specific server this invoker is bound to.
+ */
+export interface IMcpGatewaySingleServerInvoker {
+	readonly onDidChangeTools: Event<void>;
+	readonly onDidChangeResources: Event<void>;
+	listTools(): Promise<readonly MCP.Tool[]>;
+	callTool(name: string, args: Record<string, unknown>): Promise<MCP.CallToolResult>;
+	listResources(): Promise<readonly MCP.Resource[]>;
+	readResource(uri: string): Promise<MCP.ReadResourceResult>;
+	listResourceTemplates(): Promise<readonly MCP.ResourceTemplate[]>;
+}
+
+/**
+ * Aggregating tool invoker that provides per-server operations and
+ * server lifecycle tracking. Used by the gateway service to create
+ * and manage per-server routes.
+ */
+export interface IMcpGatewayToolInvoker {
+	readonly onDidChangeServers: Event<readonly IMcpGatewayServerDescriptor[]>;
+	readonly onDidChangeTools: Event<void>;
+	readonly onDidChangeResources: Event<void>;
+	listServers(): readonly IMcpGatewayServerDescriptor[];
+	listToolsForServer(serverId: string): Promise<readonly MCP.Tool[]>;
+	callToolForServer(serverId: string, name: string, args: Record<string, unknown>): Promise<MCP.CallToolResult>;
+	listResourcesForServer(serverId: string): Promise<readonly MCP.Resource[]>;
+	readResourceForServer(serverId: string, uri: string): Promise<MCP.ReadResourceResult>;
+	listResourceTemplatesForServer(serverId: string): Promise<readonly MCP.ResourceTemplate[]>;
+}
+
+/**
+ * Serializable result of creating an MCP gateway (safe for IPC).
+ */
+export interface IMcpGatewayDto {
+	/**
+	 * The servers currently exposed by this gateway.
+	 */
+	readonly servers: readonly IMcpGatewayServerInfo[];
 
 	/**
 	 * The unique identifier for this gateway, used for disposal.
@@ -53,6 +75,16 @@ export interface IMcpGatewayInfo {
 	readonly gatewayId: string;
 }
 
+/**
+ * Result of creating an MCP gateway (in-process, includes event).
+ */
+export interface IMcpGatewayInfo extends IMcpGatewayDto {
+	/**
+	 * Event that fires when the set of servers changes.
+	 */
+	readonly onDidChangeServers: Event<readonly IMcpGatewayServerInfo[]>;
+}
+
 /**
  * Service that manages MCP gateway HTTP endpoints in the main process (or remote server).
  *
diff --git a/src/vs/platform/mcp/node/mcpGatewayChannel.ts b/src/vs/platform/mcp/node/mcpGatewayChannel.ts
index 78d0e93a3f0..9507f2fd7eb 100644
--- a/src/vs/platform/mcp/node/mcpGatewayChannel.ts
+++ b/src/vs/platform/mcp/node/mcpGatewayChannel.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from '../../../base/common/event.js';
-import { Disposable } from '../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 import { IPCServer, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { ILoggerService } from '../../log/common/log.js';
-import { IGatewayCallToolResult, IGatewayServerResources, IGatewayServerResourceTemplates, IMcpGatewayService, McpGatewayToolBrokerChannelName } from '../common/mcpGateway.js';
+import { IMcpGatewayServerDescriptor, IMcpGatewayServerInfo, IMcpGatewayService, McpGatewayToolBrokerChannelName } from '../common/mcpGateway.js';
 import { MCP } from '../common/modelContextProtocol.js';
 
 /**
@@ -18,6 +18,11 @@ import { MCP } from '../common/modelContextProtocol.js';
  */
 export class McpGatewayChannel<TContext> extends Disposable implements IServerChannel<TContext> {
 
+	private readonly _onDidChangeGatewayServers = this._register(new Emitter<{ gatewayId: string; servers: readonly IMcpGatewayServerInfo[] }>());
+	private readonly _gatewayDisposables = this._register(new DisposableMap<string, DisposableStore>());
+	/** Tracks which gateways belong to which client for cleanup on disconnect */
+	private readonly _clientGateways = new Map<TContext, Set<string>>();
+
 	constructor(
 		private readonly _ipcServer: IPCServer<TContext>,
 		@IMcpGatewayService private readonly mcpGatewayService: IMcpGatewayService,
@@ -27,11 +32,23 @@ export class McpGatewayChannel<TContext> extends Disposable implements IServerCh
 		this._register(_ipcServer.onDidRemoveConnection(c => {
 			this._loggerService.getLogger('mcpGateway')?.info(`[McpGateway][Channel] Client disconnected: ${c.ctx}, cleaning up gateways`);
 			mcpGatewayService.disposeGatewaysForClient(c.ctx);
+
+			// Clean up per-gateway change-event forwarders for this client
+			const gatewaysForClient = this._clientGateways.get(c.ctx);
+			if (gatewaysForClient) {
+				for (const gatewayId of gatewaysForClient) {
+					this._gatewayDisposables.deleteAndDispose(gatewayId);
+				}
+				this._clientGateways.delete(c.ctx);
+			}
 		}));
 	}
 
-	listen<T>(_ctx: TContext, _event: string): Event<T> {
-		throw new Error('Invalid listen');
+	listen<T>(_ctx: TContext, event: string): Event<T> {
+		if (event === 'onDidChangeGatewayServers') {
+			return this._onDidChangeGatewayServers.event as Event<T>;
+		}
+		throw new Error(`Invalid listen: ${event}`);
 	}
 
 	async call<T>(ctx: TContext, command: string, args?: unknown): Promise<T> {
@@ -41,21 +58,59 @@ export class McpGatewayChannel<TContext> extends Disposable implements IServerCh
 		switch (command) {
 			case 'createGateway': {
 				const brokerChannel = ipcChannelForContext(this._ipcServer, ctx);
+
+				// Fetch initial server list before creating the gateway (IPC is async, but the invoker interface is sync)
+				let currentServers = await brokerChannel.call<readonly IMcpGatewayServerDescriptor[]>('listServers');
+				const onDidChangeServersListener = brokerChannel.listen<readonly IMcpGatewayServerDescriptor[]>('onDidChangeServers');
+
 				const result = await this.mcpGatewayService.createGateway(ctx, {
+					onDidChangeServers: Event.map(onDidChangeServersListener, servers => {
+						currentServers = servers;
+						return servers;
+					}),
 					onDidChangeTools: brokerChannel.listen<void>('onDidChangeTools'),
 					onDidChangeResources: brokerChannel.listen<void>('onDidChangeResources'),
-					listTools: () => brokerChannel.call<readonly MCP.Tool[]>('listTools'),
-					callTool: (name, callArgs) => brokerChannel.call<IGatewayCallToolResult>('callTool', { name, args: callArgs }),
-					listResources: () => brokerChannel.call<readonly IGatewayServerResources[]>('listResources'),
-					readResource: (serverIndex, uri) => brokerChannel.call<MCP.ReadResourceResult>('readResource', { serverIndex, uri }),
-					listResourceTemplates: () => brokerChannel.call<readonly IGatewayServerResourceTemplates[]>('listResourceTemplates'),
+					listServers: () => currentServers,
+					listToolsForServer: serverId => brokerChannel.call<readonly MCP.Tool[]>('listToolsForServer', { serverId }),
+					callToolForServer: (serverId, name, callArgs) => brokerChannel.call<MCP.CallToolResult>('callToolForServer', { serverId, name, args: callArgs }),
+					listResourcesForServer: serverId => brokerChannel.call<readonly MCP.Resource[]>('listResourcesForServer', { serverId }),
+					readResourceForServer: (serverId, uri) => brokerChannel.call<MCP.ReadResourceResult>('readResourceForServer', { serverId, uri }),
+					listResourceTemplatesForServer: serverId => brokerChannel.call<readonly MCP.ResourceTemplate[]>('listResourceTemplatesForServer', { serverId }),
 				});
-				logger?.info(`[McpGateway][Channel] Gateway created: ${result.gatewayId} for client ${ctx}`);
-				return result as T;
+				// Forward server change events via IPC
+				const gatewayStore = new DisposableStore();
+				gatewayStore.add(result.onDidChangeServers(servers => {
+					this._onDidChangeGatewayServers.fire({ gatewayId: result.gatewayId, servers });
+				}));
+				this._gatewayDisposables.set(result.gatewayId, gatewayStore);
+
+				// Track client → gateway for disconnect cleanup
+				let gatewaysForClient = this._clientGateways.get(ctx);
+				if (!gatewaysForClient) {
+					gatewaysForClient = new Set<string>();
+					this._clientGateways.set(ctx, gatewaysForClient);
+				}
+				gatewaysForClient.add(result.gatewayId);
+
+				logger?.info(`[McpGateway][Channel] Gateway created: ${result.gatewayId} with ${result.servers.length} server(s) for client ${ctx}`);
+				// eslint-disable-next-line local/code-no-dangerous-type-assertions
+				return { gatewayId: result.gatewayId, servers: result.servers } as T;
 			}
 			case 'disposeGateway': {
-				logger?.info(`[McpGateway][Channel] Disposing gateway: ${args as string} for client ${ctx}`);
-				await this.mcpGatewayService.disposeGateway(args as string);
+				const gatewayId = args as string;
+				logger?.info(`[McpGateway][Channel] Disposing gateway: ${gatewayId} for client ${ctx}`);
+				this._gatewayDisposables.deleteAndDispose(gatewayId);
+
+				// Remove from client tracking
+				const gatewaysForClient = this._clientGateways.get(ctx);
+				if (gatewaysForClient) {
+					gatewaysForClient.delete(gatewayId);
+					if (gatewaysForClient.size === 0) {
+						this._clientGateways.delete(ctx);
+					}
+				}
+
+				await this.mcpGatewayService.disposeGateway(gatewayId);
 				return undefined as T;
 			}
 		}
diff --git a/src/vs/platform/mcp/node/mcpGatewayService.ts b/src/vs/platform/mcp/node/mcpGatewayService.ts
index 6131c7677da..e00be3def1b 100644
--- a/src/vs/platform/mcp/node/mcpGatewayService.ts
+++ b/src/vs/platform/mcp/node/mcpGatewayService.ts
@@ -5,12 +5,13 @@
 
 import type * as http from 'http';
 import { DeferredPromise } from '../../../base/common/async.js';
+import { Emitter } from '../../../base/common/event.js';
 import { JsonRpcMessage, JsonRpcProtocol } from '../../../base/common/jsonRpcProtocol.js';
-import { Disposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { ILogger, ILoggerService } from '../../log/common/log.js';
-import { IMcpGatewayInfo, IMcpGatewayService, IMcpGatewayToolInvoker } from '../common/mcpGateway.js';
+import { IMcpGatewayInfo, IMcpGatewayServerDescriptor, IMcpGatewayServerInfo, IMcpGatewayService, IMcpGatewaySingleServerInvoker, IMcpGatewayToolInvoker } from '../common/mcpGateway.js';
 import { isInitializeMessage, McpGatewaySession } from './mcpGatewaySession.js';
 
 /**
@@ -24,9 +25,16 @@ export class McpGatewayService extends Disposable implements IMcpGatewayService
 
 	private _server: http.Server | undefined;
 	private _port: number | undefined;
-	private readonly _gateways = new Map<string, McpGatewayRoute>();
+	/** All active routes keyed by their route UUID */
+	private readonly _routes = new Map<string, McpGatewayRoute>();
+	/** Maps gatewayId → set of route UUIDs belonging to that gateway */
+	private readonly _gatewayRoutes = new Map<string, Set<string>>();
+	/** Maps gatewayId → serverId → routeId for reverse lookup */
+	private readonly _gatewayServerRoutes = new Map<string, Map<string, string>>();
 	/** Maps gatewayId to clientId for tracking ownership */
 	private readonly _gatewayToClient = new Map<string, unknown>();
+	/** Per-gateway disposables (e.g. event listeners) */
+	private readonly _gatewayDisposables = new Map<string, DisposableStore>();
 	private _serverStartPromise: Promise<void> | undefined;
 	private readonly _logger: ILogger;
 
@@ -46,48 +54,185 @@ export class McpGatewayService extends Disposable implements IMcpGatewayService
 			throw new Error('[McpGatewayService] Server failed to start, port is undefined');
 		}
 
-		// Generate a secure random ID for the gateway route
-		const gatewayId = generateUuid();
-
-		// Create the gateway route
 		if (!toolInvoker) {
 			throw new Error('[McpGatewayService] Tool invoker is required to create gateway');
 		}
 
-		const gateway = new McpGatewayRoute(gatewayId, this._logger, toolInvoker);
-		this._gateways.set(gatewayId, gateway);
-		this._logger.info(`[McpGatewayService] Active gateways: ${this._gateways.size}`);
+		const gatewayId = generateUuid();
+		const routeIds = new Set<string>();
+		const serverRouteMap = new Map<string, string>();
+		this._gatewayRoutes.set(gatewayId, routeIds);
+		this._gatewayServerRoutes.set(gatewayId, serverRouteMap);
 
-		// Track client ownership if clientId provided (for cleanup on disconnect)
-		if (clientId) {
-			this._gatewayToClient.set(gatewayId, clientId);
-			this._logger.info(`[McpGatewayService] Created gateway at http://127.0.0.1:${this._port}/gateway/${gatewayId} for client ${clientId}`);
-		} else {
-			this._logger.warn(`[McpGatewayService] Created gateway without client tracking at http://127.0.0.1:${this._port}/gateway/${gatewayId}`);
+		const disposables = new DisposableStore();
+		this._gatewayDisposables.set(gatewayId, disposables);
+
+		try {
+			// Create initial server routes
+			const serverDescriptors = toolInvoker.listServers();
+			const servers: IMcpGatewayServerInfo[] = [];
+			for (const descriptor of serverDescriptors) {
+				const serverInfo = this._createRouteForServer(gatewayId, descriptor.id, descriptor.label, toolInvoker, routeIds, serverRouteMap);
+				servers.push(serverInfo);
+			}
+
+			// Track client ownership
+			if (clientId) {
+				this._gatewayToClient.set(gatewayId, clientId);
+				this._logger.info(`[McpGatewayService] Created gateway ${gatewayId} with ${servers.length} server(s) for client ${clientId}`);
+			} else {
+				this._logger.warn(`[McpGatewayService] Created gateway ${gatewayId} with ${servers.length} server(s) without client tracking`);
+			}
+
+			// Listen for server changes to dynamically add/remove routes
+			const onDidChangeServers = disposables.add(new Emitter<readonly IMcpGatewayServerInfo[]>());
+			disposables.add(toolInvoker.onDidChangeServers(newDescriptors => {
+				this._refreshGatewayServers(gatewayId, newDescriptors, toolInvoker, routeIds, serverRouteMap, onDidChangeServers);
+			}));
+
+			return {
+				servers,
+				onDidChangeServers: onDidChangeServers.event,
+				gatewayId,
+			};
+		} catch (error) {
+			// Clean up partially-created state on failure
+			this._cleanupGateway(gatewayId);
+			throw error;
+		}
+	}
+
+	private _refreshGatewayServers(
+		gatewayId: string,
+		newDescriptors: readonly IMcpGatewayServerDescriptor[],
+		toolInvoker: IMcpGatewayToolInvoker,
+		routeIds: Set<string>,
+		serverRouteMap: Map<string, string>,
+		onDidChangeServers: Emitter<readonly IMcpGatewayServerInfo[]>,
+	): void {
+		// Bail out if the gateway has been disposed
+		if (!this._gatewayRoutes.has(gatewayId)) {
+			return;
 		}
 
-		const address = URI.parse(`http://127.0.0.1:${this._port}/gateway/${gatewayId}`);
+		const newServerIds = new Set(newDescriptors.map(d => d.id));
+		const existingServerIds = new Set(serverRouteMap.keys());
 
-		return {
-			address,
-			gatewayId,
+		// Remove routes for servers that are gone
+		for (const serverId of existingServerIds) {
+			if (!newServerIds.has(serverId)) {
+				const routeId = serverRouteMap.get(serverId);
+				if (routeId) {
+					this._disposeRoute(routeId);
+					routeIds.delete(routeId);
+					serverRouteMap.delete(serverId);
+				}
+			}
+		}
+
+		// Add routes for new servers, and update labels for existing ones.
+		for (const descriptor of newDescriptors) {
+			if (!existingServerIds.has(descriptor.id)) {
+				this._createRouteForServer(gatewayId, descriptor.id, descriptor.label, toolInvoker, routeIds, serverRouteMap);
+				continue;
+			}
+
+			const routeId = serverRouteMap.get(descriptor.id);
+			const route = routeId ? this._routes.get(routeId) : undefined;
+			if (route && route.label !== descriptor.label) {
+				route.label = descriptor.label;
+			}
+		}
+
+		const updatedServers = this._getGatewayServers(gatewayId);
+		this._logger.info(`[McpGatewayService] Gateway ${gatewayId} servers changed: ${updatedServers.length} server(s)`);
+		onDidChangeServers.fire(updatedServers);
+	}
+
+	private _cleanupGateway(gatewayId: string): void {
+		const routeIds = this._gatewayRoutes.get(gatewayId);
+		if (routeIds) {
+			for (const routeId of routeIds) {
+				this._disposeRoute(routeId);
+			}
+		}
+		this._gatewayRoutes.delete(gatewayId);
+		this._gatewayServerRoutes.delete(gatewayId);
+		this._gatewayToClient.delete(gatewayId);
+		this._gatewayDisposables.get(gatewayId)?.dispose();
+		this._gatewayDisposables.delete(gatewayId);
+	}
+
+	private _createRouteForServer(
+		gatewayId: string,
+		serverId: string,
+		label: string,
+		toolInvoker: IMcpGatewayToolInvoker,
+		routeIds: Set<string>,
+		serverRouteMap: Map<string, string>,
+	): IMcpGatewayServerInfo {
+		const routeId = generateUuid();
+
+		// Create a single-server invoker that delegates to the aggregating invoker
+		const singleServerInvoker: IMcpGatewaySingleServerInvoker = {
+			onDidChangeTools: toolInvoker.onDidChangeTools,
+			onDidChangeResources: toolInvoker.onDidChangeResources,
+			listTools: () => toolInvoker.listToolsForServer(serverId),
+			callTool: (name, args) => toolInvoker.callToolForServer(serverId, name, args),
+			listResources: () => toolInvoker.listResourcesForServer(serverId),
+			readResource: uri => toolInvoker.readResourceForServer(serverId, uri),
+			listResourceTemplates: () => toolInvoker.listResourceTemplatesForServer(serverId),
 		};
+
+		const route = new McpGatewayRoute(routeId, this._logger, singleServerInvoker, label);
+		this._routes.set(routeId, route);
+		routeIds.add(routeId);
+		serverRouteMap.set(serverId, routeId);
+
+		const address = URI.parse(`http://127.0.0.1:${this._port}/gateway/${routeId}`);
+		this._logger.info(`[McpGatewayService] Created route ${routeId} for server '${label}' (${serverId}) at ${address}`);
+
+		return { label, address };
+	}
+
+	private _getGatewayServers(gatewayId: string): IMcpGatewayServerInfo[] {
+		const serverRouteMap = this._gatewayServerRoutes.get(gatewayId);
+		if (!serverRouteMap) {
+			return [];
+		}
+		const servers: IMcpGatewayServerInfo[] = [];
+		for (const [_serverId, routeId] of serverRouteMap) {
+			const route = this._routes.get(routeId);
+			if (route) {
+				servers.push({
+					label: route.label,
+					address: URI.parse(`http://127.0.0.1:${this._port}/gateway/${routeId}`),
+				});
+			}
+		}
+		return servers;
+	}
+
+	private _disposeRoute(routeId: string): void {
+		const route = this._routes.get(routeId);
+		if (route) {
+			route.dispose();
+			this._routes.delete(routeId);
+			this._logger.info(`[McpGatewayService] Disposed route: ${routeId}`);
+		}
 	}
 
 	async disposeGateway(gatewayId: string): Promise<void> {
-		const gateway = this._gateways.get(gatewayId);
-		if (!gateway) {
+		if (!this._gatewayRoutes.has(gatewayId)) {
 			this._logger.warn(`[McpGatewayService] Attempted to dispose unknown gateway: ${gatewayId}`);
 			return;
 		}
 
-		gateway.dispose();
-		this._gateways.delete(gatewayId);
-		this._gatewayToClient.delete(gatewayId);
-		this._logger.info(`[McpGatewayService] Disposed gateway: ${gatewayId} (remaining: ${this._gateways.size})`);
+		this._cleanupGateway(gatewayId);
+		this._logger.info(`[McpGatewayService] Disposed gateway: ${gatewayId} (remaining routes: ${this._routes.size})`);
 
-		// If no more gateways, shut down the server
-		if (this._gateways.size === 0) {
+		// If no more routes, shut down the server
+		if (this._routes.size === 0) {
 			this._stopServer();
 		}
 	}
@@ -102,16 +247,14 @@ export class McpGatewayService extends Disposable implements IMcpGatewayService
 		}
 
 		if (gatewaysToDispose.length > 0) {
-			this._logger.info(`[McpGatewayService] Disposing ${gatewaysToDispose.length} gateway(s) for disconnected client ${clientId}: [${gatewaysToDispose.join(', ')}]`);
+			this._logger.info(`[McpGatewayService] Disposing ${gatewaysToDispose.length} gateway(s) for disconnected client ${clientId}`);
 
 			for (const gatewayId of gatewaysToDispose) {
-				this._gateways.get(gatewayId)?.dispose();
-				this._gateways.delete(gatewayId);
-				this._gatewayToClient.delete(gatewayId);
+				this._cleanupGateway(gatewayId);
 			}
 
-			// If no more gateways, shut down the server
-			if (this._gateways.size === 0) {
+			// If no more routes, shut down the server
+			if (this._routes.size === 0) {
 				this._stopServer();
 			}
 		}
@@ -187,7 +330,7 @@ export class McpGatewayService extends Disposable implements IMcpGatewayService
 			return;
 		}
 
-		this._logger.info('[McpGatewayService] Stopping server (no more gateways)');
+		this._logger.info('[McpGatewayService] Stopping server (no more routes)');
 
 		this._server.close(err => {
 			if (err) {
@@ -205,38 +348,45 @@ export class McpGatewayService extends Disposable implements IMcpGatewayService
 		const url = new URL(req.url!, `http://${req.headers.host}`);
 		const pathParts = url.pathname.split('/').filter(Boolean);
 
-		this._logger.debug(`[McpGatewayService] ${req.method} ${url.pathname} (active gateways: ${this._gateways.size})`);
+		this._logger.debug(`[McpGatewayService] ${req.method} ${url.pathname} (active routes: ${this._routes.size})`);
 
-		// Expected path: /gateway/{gatewayId}
+		// Expected path: /gateway/{routeId}
 		if (pathParts.length >= 2 && pathParts[0] === 'gateway') {
-			const gatewayId = pathParts[1];
-			const gateway = this._gateways.get(gatewayId);
+			const routeId = pathParts[1];
+			const route = this._routes.get(routeId);
 
-			if (gateway) {
-				gateway.handleRequest(req, res);
+			if (route) {
+				route.handleRequest(req, res);
 				return;
 			}
 		}
 
 		// Not found
-		this._logger.warn(`[McpGatewayService] ${req.method} ${url.pathname}: gateway not found`);
+		this._logger.warn(`[McpGatewayService] ${req.method} ${url.pathname}: route not found`);
 		res.writeHead(404, { 'Content-Type': 'application/json' });
 		res.end(JSON.stringify({ error: 'Gateway not found' }));
 	}
 
 	override dispose(): void {
-		this._logger.info(`[McpGatewayService] Disposing service (gateways: ${this._gateways.size})`);
+		this._logger.info(`[McpGatewayService] Disposing service (routes: ${this._routes.size})`);
 		this._stopServer();
-		for (const gateway of this._gateways.values()) {
-			gateway.dispose();
+		for (const route of this._routes.values()) {
+			route.dispose();
 		}
-		this._gateways.clear();
+		this._routes.clear();
+		this._gatewayRoutes.clear();
+		this._gatewayServerRoutes.clear();
+		this._gatewayToClient.clear();
+		for (const disposables of this._gatewayDisposables.values()) {
+			disposables.dispose();
+		}
+		this._gatewayDisposables.clear();
 		super.dispose();
 	}
 }
 
 /**
- * Represents a single MCP gateway route.
+ * Represents a single MCP gateway route for one MCP server.
  */
 class McpGatewayRoute extends Disposable {
 	private readonly _sessions = new Map<string, McpGatewaySession>();
@@ -244,15 +394,16 @@ class McpGatewayRoute extends Disposable {
 	private static readonly SessionHeaderName = 'mcp-session-id';
 
 	constructor(
-		public readonly gatewayId: string,
+		public readonly routeId: string,
 		private readonly _logger: ILogger,
-		private readonly _toolInvoker: IMcpGatewayToolInvoker,
+		private readonly _serverInvoker: IMcpGatewaySingleServerInvoker,
+		public label: string = '',
 	) {
 		super();
 	}
 
 	handleRequest(req: http.IncomingMessage, res: http.ServerResponse): void {
-		this._logger.debug(`[McpGateway][route ${this.gatewayId}] ${req.method} request (sessions: ${this._sessions.size})`);
+		this._logger.debug(`[McpGateway][route ${this.routeId}] ${req.method} request (sessions: ${this._sessions.size})`);
 
 		if (req.method === 'POST') {
 			void this._handlePost(req, res);
@@ -273,7 +424,7 @@ class McpGatewayRoute extends Disposable {
 	}
 
 	public override dispose(): void {
-		this._logger.info(`[McpGateway][route ${this.gatewayId}] Disposing route (sessions: ${this._sessions.size})`);
+		this._logger.info(`[McpGateway][route ${this.routeId}] Disposing route (sessions: ${this._sessions.size})`);
 		for (const session of this._sessions.values()) {
 			session.dispose();
 		}
@@ -294,7 +445,7 @@ class McpGatewayRoute extends Disposable {
 			return;
 		}
 
-		this._logger.info(`[McpGateway][route ${this.gatewayId}] Deleting session ${sessionId}`);
+		this._logger.info(`[McpGateway][route ${this.routeId}] Deleting session ${sessionId}`);
 		session.dispose();
 		this._sessions.delete(sessionId);
 		res.writeHead(204);
@@ -314,7 +465,7 @@ class McpGatewayRoute extends Disposable {
 			return;
 		}
 
-		this._logger.info(`[McpGateway][route ${this.gatewayId}] SSE connection requested for session ${sessionId}`);
+		this._logger.info(`[McpGateway][route ${this.routeId}] SSE connection requested for session ${sessionId}`);
 		session.attachSseClient(req, res);
 	}
 
@@ -325,13 +476,13 @@ class McpGatewayRoute extends Disposable {
 			return;
 		}
 
-		this._logger.debug(`[McpGateway][route ${this.gatewayId}] Handling POST`);
+		this._logger.debug(`[McpGateway][route ${this.routeId}] Handling POST`);
 
 		let message: JsonRpcMessage | JsonRpcMessage[];
 		try {
 			message = JSON.parse(body) as JsonRpcMessage | JsonRpcMessage[];
 		} catch (error) {
-			this._logger.warn(`[McpGateway][route ${this.gatewayId}] JSON parse error: ${error instanceof Error ? error.message : String(error)}`);
+			this._logger.warn(`[McpGateway][route ${this.routeId}] JSON parse error: ${error instanceof Error ? error.message : String(error)}`);
 			res.writeHead(400, { 'Content-Type': 'application/json' });
 			res.end(JSON.stringify(JsonRpcProtocol.createParseError('Parse error', error instanceof Error ? error.message : String(error))));
 			return;
@@ -352,14 +503,14 @@ class McpGatewayRoute extends Disposable {
 			};
 
 			if (responses.length === 0) {
-				this._logger.debug(`[McpGateway][route ${this.gatewayId}] POST response: 202 (no content)`);
+				this._logger.debug(`[McpGateway][route ${this.routeId}] POST response: 202 (no content)`);
 				res.writeHead(202, headers);
 				res.end();
 				return;
 			}
 
 			const responseBody = JSON.stringify(Array.isArray(message) ? responses : responses[0]);
-			this._logger.debug(`[McpGateway][route ${this.gatewayId}] POST response: 200, body: ${responseBody}`);
+			this._logger.debug(`[McpGateway][route ${this.routeId}] POST response: 200, body: ${responseBody}`);
 			res.writeHead(200, headers);
 			res.end(responseBody);
 		} catch (error) {
@@ -372,7 +523,7 @@ class McpGatewayRoute extends Disposable {
 		if (headerSessionId) {
 			const existing = this._sessions.get(headerSessionId);
 			if (!existing) {
-				this._logger.warn(`[McpGateway][route ${this.gatewayId}] Session not found: ${headerSessionId}`);
+				this._logger.warn(`[McpGateway][route ${this.routeId}] Session not found: ${headerSessionId}`);
 				this._respondHttpError(res, 404, 'Session not found');
 				return undefined;
 			}
@@ -386,16 +537,16 @@ class McpGatewayRoute extends Disposable {
 		}
 
 		const sessionId = generateUuid();
-		this._logger.info(`[McpGateway][route ${this.gatewayId}] Creating new session ${sessionId}`);
+		this._logger.info(`[McpGateway][route ${this.routeId}] Creating new session ${sessionId}`);
 		const session = new McpGatewaySession(sessionId, this._logger, () => {
 			this._sessions.delete(sessionId);
-		}, this._toolInvoker);
+		}, this._serverInvoker);
 		this._sessions.set(sessionId, session);
 		return session;
 	}
 
 	private _respondHttpError(res: http.ServerResponse, statusCode: number, error: string): void {
-		this._logger.debug(`[McpGateway][route ${this.gatewayId}] HTTP error response: ${statusCode} ${error}`);
+		this._logger.debug(`[McpGateway][route ${this.routeId}] HTTP error response: ${statusCode} ${error}`);
 		res.writeHead(statusCode, { 'Content-Type': 'application/json' });
 		res.end(JSON.stringify({ jsonrpc: '2.0', error: { code: statusCode, message: error } } satisfies JsonRpcMessage));
 	}
diff --git a/src/vs/platform/mcp/node/mcpGatewaySession.ts b/src/vs/platform/mcp/node/mcpGatewaySession.ts
index 20f6d23dc71..067899cb32f 100644
--- a/src/vs/platform/mcp/node/mcpGatewaySession.ts
+++ b/src/vs/platform/mcp/node/mcpGatewaySession.ts
@@ -11,7 +11,7 @@ import {
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { hasKey } from '../../../base/common/types.js';
 import { ILogger } from '../../log/common/log.js';
-import { IMcpGatewayToolInvoker } from '../common/mcpGateway.js';
+import { IMcpGatewaySingleServerInvoker } from '../common/mcpGateway.js';
 import { MCP } from '../common/modelContextProtocol.js';
 
 const MCP_LATEST_PROTOCOL_VERSION = '2025-11-25';
@@ -26,56 +26,6 @@ const MCP_INVALID_REQUEST = -32600;
 const MCP_METHOD_NOT_FOUND = -32601;
 const MCP_INVALID_PARAMS = -32602;
 
-const GATEWAY_URI_AUTHORITY_RE = /^([a-zA-Z][a-zA-Z0-9+.-]*:\/\/)([^/?#]*)(.*)/;
-
-/**
- * Encodes a resource URI for the gateway by appending `-{serverIndex}` to the authority.
- * This namespaces resources from different MCP servers served through the same gateway.
- */
-export function encodeGatewayResourceUri(uri: string, serverIndex: number): string {
-	const match = uri.match(GATEWAY_URI_AUTHORITY_RE);
-	if (!match) {
-		return uri;
-	}
-	const [, prefix, authority, rest] = match;
-	return `${prefix}${authority}-${serverIndex}${rest}`;
-}
-
-/**
- * Decodes a gateway-encoded resource URI, extracting the server index and original URI.
- */
-export function decodeGatewayResourceUri(uri: string): { serverIndex: number; originalUri: string } {
-	const match = uri.match(GATEWAY_URI_AUTHORITY_RE);
-	if (!match) {
-		throw new JsonRpcError(MCP_INVALID_PARAMS, `Invalid resource URI: ${uri}`);
-	}
-	const [, prefix, authority, rest] = match;
-	const suffixMatch = authority.match(/^(.*)-([0-9]+)$/);
-	if (!suffixMatch) {
-		throw new JsonRpcError(MCP_INVALID_PARAMS, `Invalid gateway resource URI (no server index): ${uri}`);
-	}
-	const [, originalAuthority, indexStr] = suffixMatch;
-	return {
-		serverIndex: parseInt(indexStr, 10),
-		originalUri: `${prefix}${originalAuthority}${rest}`,
-	};
-}
-
-function encodeResourceUrisInContent(content: MCP.ContentBlock[], serverIndex: number): MCP.ContentBlock[] {
-	return content.map(block => {
-		if (block.type === 'resource_link') {
-			return { ...block, uri: encodeGatewayResourceUri(block.uri, serverIndex) };
-		}
-		if (block.type === 'resource') {
-			return {
-				...block,
-				resource: { ...block.resource, uri: encodeGatewayResourceUri(block.resource.uri, serverIndex) },
-			};
-		}
-		return block;
-	});
-}
-
 export class McpGatewaySession extends Disposable {
 	private readonly _rpc: JsonRpcProtocol;
 	private readonly _sseClients = new Set<http.ServerResponse>();
@@ -86,7 +36,7 @@ export class McpGatewaySession extends Disposable {
 		public readonly id: string,
 		private readonly _logService: ILogger,
 		private readonly _onDidDispose: () => void,
-		private readonly _toolInvoker: IMcpGatewayToolInvoker,
+		private readonly _serverInvoker: IMcpGatewaySingleServerInvoker,
 	) {
 		super();
 
@@ -98,7 +48,7 @@ export class McpGatewaySession extends Disposable {
 			}
 		));
 
-		this._register(this._toolInvoker.onDidChangeTools(() => {
+		this._register(this._serverInvoker.onDidChangeTools(() => {
 			if (!this._isInitialized) {
 				return;
 			}
@@ -107,7 +57,7 @@ export class McpGatewaySession extends Disposable {
 			this._rpc.sendNotification({ method: 'notifications/tools/list_changed' });
 		}));
 
-		this._register(this._toolInvoker.onDidChangeResources(() => {
+		this._register(this._serverInvoker.onDidChangeResources(() => {
 			if (!this._isInitialized) {
 				return;
 			}
@@ -282,39 +232,25 @@ export class McpGatewaySession extends Disposable {
 		this._logService.debug(`[McpGateway][session ${this.id}] Calling tool '${params.name}' with args: ${JSON.stringify(argumentsValue)}`);
 
 		try {
-			const { result, serverIndex } = await this._toolInvoker.callTool(params.name, argumentsValue);
+			const result = await this._serverInvoker.callTool(params.name, argumentsValue);
 			this._logService.debug(`[McpGateway][session ${this.id}] Tool '${params.name}' completed (isError=${result.isError ?? false}, content blocks=${result.content.length})`);
-			return {
-				...result,
-				content: encodeResourceUrisInContent(result.content, serverIndex),
-			};
+			return result;
 		} catch (error) {
 			this._logService.error(`[McpGateway][session ${this.id}] Tool '${params.name}' invocation failed`, error);
 			throw new JsonRpcError(MCP_INVALID_PARAMS, String(error));
 		}
 	}
 
-	private _handleListTools(): unknown {
-		return this._toolInvoker.listTools()
-			.then(tools => {
-				this._logService.debug(`[McpGateway][session ${this.id}] Listed ${tools.length} tool(s): [${tools.map(t => t.name).join(', ')}]`);
-				return { tools };
-			});
+	private async _handleListTools(): Promise<MCP.ListToolsResult> {
+		const tools = await this._serverInvoker.listTools();
+		this._logService.debug(`[McpGateway][session ${this.id}] Listed ${tools.length} tool(s): [${tools.map(t => t.name).join(', ')}]`);
+		return { tools: tools as MCP.Tool[] };
 	}
 
 	private async _handleListResources(): Promise<MCP.ListResourcesResult> {
-		const serverResults = await this._toolInvoker.listResources();
-		const allResources: MCP.Resource[] = [];
-		for (const { serverIndex, resources } of serverResults) {
-			for (const resource of resources) {
-				allResources.push({
-					...resource,
-					uri: encodeGatewayResourceUri(resource.uri, serverIndex),
-				});
-			}
-		}
-		this._logService.debug(`[McpGateway][session ${this.id}] Listed ${allResources.length} resource(s) from ${serverResults.length} server(s)`);
-		return { resources: allResources };
+		const resources = await this._serverInvoker.listResources();
+		this._logService.debug(`[McpGateway][session ${this.id}] Listed ${resources.length} resource(s)`);
+		return { resources: resources as MCP.Resource[] };
 	}
 
 	private async _handleReadResource(request: IJsonRpcRequest): Promise<MCP.ReadResourceResult> {
@@ -323,36 +259,21 @@ export class McpGatewaySession extends Disposable {
 			throw new JsonRpcError(MCP_INVALID_PARAMS, 'Missing resource URI');
 		}
 
-		const { serverIndex, originalUri } = decodeGatewayResourceUri(params.uri);
-		this._logService.debug(`[McpGateway][session ${this.id}] Reading resource '${originalUri}' from server ${serverIndex}`);
+		this._logService.debug(`[McpGateway][session ${this.id}] Reading resource '${params.uri}'`);
 		try {
-			const result = await this._toolInvoker.readResource(serverIndex, originalUri);
+			const result = await this._serverInvoker.readResource(params.uri);
 			this._logService.debug(`[McpGateway][session ${this.id}] Resource read returned ${result.contents.length} content(s)`);
-			return {
-				contents: result.contents.map(content => ({
-					...content,
-					uri: encodeGatewayResourceUri(content.uri, serverIndex),
-				})),
-			};
+			return result;
 		} catch (error) {
-			this._logService.error(`[McpGateway][session ${this.id}] Resource read failed for '${originalUri}'`, error);
+			this._logService.error(`[McpGateway][session ${this.id}] Resource read failed for '${params.uri}'`, error);
 			throw new JsonRpcError(MCP_INVALID_PARAMS, String(error));
 		}
 	}
 
 	private async _handleListResourceTemplates(): Promise<MCP.ListResourceTemplatesResult> {
-		const serverResults = await this._toolInvoker.listResourceTemplates();
-		const allTemplates: MCP.ResourceTemplate[] = [];
-		for (const { serverIndex, resourceTemplates } of serverResults) {
-			for (const template of resourceTemplates) {
-				allTemplates.push({
-					...template,
-					uriTemplate: encodeGatewayResourceUri(template.uriTemplate, serverIndex),
-				});
-			}
-		}
-		this._logService.debug(`[McpGateway][session ${this.id}] Listed ${allTemplates.length} resource template(s) from ${serverResults.length} server(s)`);
-		return { resourceTemplates: allTemplates };
+		const resourceTemplates = await this._serverInvoker.listResourceTemplates();
+		this._logService.debug(`[McpGateway][session ${this.id}] Listed ${resourceTemplates.length} resource template(s)`);
+		return { resourceTemplates: resourceTemplates as MCP.ResourceTemplate[] };
 	}
 }
 
diff --git a/src/vs/platform/mcp/test/node/mcpGatewaySession.test.ts b/src/vs/platform/mcp/test/node/mcpGatewaySession.test.ts
index d30d166d09f..029e51118b7 100644
--- a/src/vs/platform/mcp/test/node/mcpGatewaySession.test.ts
+++ b/src/vs/platform/mcp/test/node/mcpGatewaySession.test.ts
@@ -11,7 +11,7 @@ import { IJsonRpcErrorResponse, IJsonRpcSuccessResponse } from '../../../../base
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { NullLogService } from '../../../log/common/log.js';
 import { MCP } from '../../common/modelContextProtocol.js';
-import { decodeGatewayResourceUri, encodeGatewayResourceUri, McpGatewaySession } from '../../node/mcpGatewaySession.js';
+import { McpGatewaySession } from '../../node/mcpGatewaySession.js';
 
 class TestServerResponse extends EventEmitter {
 	public statusCode: number | undefined;
@@ -73,16 +73,13 @@ suite('McpGatewaySession', () => {
 				onDidChangeResources: onDidChangeResources.event,
 				listTools: async () => tools,
 				callTool: async (_name: string, args: Record<string, unknown>) => ({
-					result: {
-						content: [{ type: 'text' as const, text: `Hello, ${typeof args.name === 'string' ? args.name : 'World'}!` }]
-					},
-					serverIndex: 0,
+					content: [{ type: 'text' as const, text: `Hello, ${typeof args.name === 'string' ? args.name : 'World'}!` }]
 				}),
-				listResources: async () => [{ serverIndex: 0, resources }],
-				readResource: async (_serverIndex: number, _uri: string) => ({
+				listResources: async () => resources,
+				readResource: async (_uri: string) => ({
 					contents: [{ uri: 'file:///test/resource.txt', text: 'hello world', mimeType: 'text/plain' }],
 				}),
-				listResourceTemplates: async () => [{ serverIndex: 0, resourceTemplates: [{ uriTemplate: 'file:///test/{name}', name: 'Test Template' }] }],
+				listResourceTemplates: async () => [{ uriTemplate: 'file:///test/{name}', name: 'Test Template' }],
 			}
 		};
 	}
@@ -380,7 +377,7 @@ suite('McpGatewaySession', () => {
 		onDidChangeResources.dispose();
 	});
 
-	test('serves resources/list with encoded URIs', async () => {
+	test('serves resources/list with raw URIs', async () => {
 		const { invoker, onDidChangeTools, onDidChangeResources } = createInvoker();
 		const session = new McpGatewaySession('session-8', new NullLogService(), () => { }, invoker);
 
@@ -391,14 +388,14 @@ suite('McpGatewaySession', () => {
 		const response = responses[0] as IJsonRpcSuccessResponse;
 		const resources = (response.result as { resources: Array<{ uri: string; name: string }> }).resources;
 		assert.strictEqual(resources.length, 1);
-		assert.strictEqual(resources[0].uri, 'file://-0/test/resource.txt');
+		assert.strictEqual(resources[0].uri, 'file:///test/resource.txt');
 		assert.strictEqual(resources[0].name, 'resource.txt');
 		session.dispose();
 		onDidChangeTools.dispose();
 		onDidChangeResources.dispose();
 	});
 
-	test('serves resources/read with URI decoding and re-encoding', async () => {
+	test('serves resources/read with raw URIs', async () => {
 		const { invoker, onDidChangeTools, onDidChangeResources } = createInvoker();
 		const session = new McpGatewaySession('session-9', new NullLogService(), () => { }, invoker);
 
@@ -409,19 +406,19 @@ suite('McpGatewaySession', () => {
 			jsonrpc: '2.0',
 			id: 2,
 			method: 'resources/read',
-			params: { uri: 'file://-0/test/resource.txt' },
+			params: { uri: 'file:///test/resource.txt' },
 		});
 		const response = responses[0] as IJsonRpcSuccessResponse;
 		const contents = (response.result as { contents: Array<{ uri: string; text: string }> }).contents;
 		assert.strictEqual(contents.length, 1);
-		assert.strictEqual(contents[0].uri, 'file://-0/test/resource.txt');
+		assert.strictEqual(contents[0].uri, 'file:///test/resource.txt');
 		assert.strictEqual(contents[0].text, 'hello world');
 		session.dispose();
 		onDidChangeTools.dispose();
 		onDidChangeResources.dispose();
 	});
 
-	test('serves resources/templates/list with encoded URI templates', async () => {
+	test('serves resources/templates/list with raw URI templates', async () => {
 		const { invoker, onDidChangeTools, onDidChangeResources } = createInvoker();
 		const session = new McpGatewaySession('session-10', new NullLogService(), () => { }, invoker);
 
@@ -432,71 +429,10 @@ suite('McpGatewaySession', () => {
 		const response = responses[0] as IJsonRpcSuccessResponse;
 		const templates = (response.result as { resourceTemplates: Array<{ uriTemplate: string; name: string }> }).resourceTemplates;
 		assert.strictEqual(templates.length, 1);
-		assert.strictEqual(templates[0].uriTemplate, 'file://-0/test/{name}');
+		assert.strictEqual(templates[0].uriTemplate, 'file:///test/{name}');
 		assert.strictEqual(templates[0].name, 'Test Template');
 		session.dispose();
 		onDidChangeTools.dispose();
 		onDidChangeResources.dispose();
 	});
 });
-
-suite('Gateway Resource URI encoding', () => {
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('encodes and decodes URI with authority', () => {
-		const encoded = encodeGatewayResourceUri('https://example.com/resource', 3);
-		assert.strictEqual(encoded, 'https://example.com-3/resource');
-		const decoded = decodeGatewayResourceUri(encoded);
-		assert.strictEqual(decoded.serverIndex, 3);
-		assert.strictEqual(decoded.originalUri, 'https://example.com/resource');
-	});
-
-	test('encodes and decodes URI with empty authority', () => {
-		const encoded = encodeGatewayResourceUri('file:///path/to/file', 0);
-		assert.strictEqual(encoded, 'file://-0/path/to/file');
-		const decoded = decodeGatewayResourceUri(encoded);
-		assert.strictEqual(decoded.serverIndex, 0);
-		assert.strictEqual(decoded.originalUri, 'file:///path/to/file');
-	});
-
-	test('encodes and decodes URI with authority containing hyphens', () => {
-		const encoded = encodeGatewayResourceUri('https://my-server.example.com/res', 12);
-		assert.strictEqual(encoded, 'https://my-server.example.com-12/res');
-		const decoded = decodeGatewayResourceUri(encoded);
-		assert.strictEqual(decoded.serverIndex, 12);
-		assert.strictEqual(decoded.originalUri, 'https://my-server.example.com/res');
-	});
-
-	test('encodes and decodes URI with port', () => {
-		const encoded = encodeGatewayResourceUri('http://localhost:8080/api', 5);
-		assert.strictEqual(encoded, 'http://localhost:8080-5/api');
-		const decoded = decodeGatewayResourceUri(encoded);
-		assert.strictEqual(decoded.serverIndex, 5);
-		assert.strictEqual(decoded.originalUri, 'http://localhost:8080/api');
-	});
-
-	test('encodes and decodes URI with query and fragment', () => {
-		const encoded = encodeGatewayResourceUri('https://example.com/resource?q=1#section', 2);
-		assert.strictEqual(encoded, 'https://example.com-2/resource?q=1#section');
-		const decoded = decodeGatewayResourceUri(encoded);
-		assert.strictEqual(decoded.serverIndex, 2);
-		assert.strictEqual(decoded.originalUri, 'https://example.com/resource?q=1#section');
-	});
-
-	test('encodes and decodes custom scheme URIs', () => {
-		const encoded = encodeGatewayResourceUri('custom://myhost/path', 7);
-		assert.strictEqual(encoded, 'custom://myhost-7/path');
-		const decoded = decodeGatewayResourceUri(encoded);
-		assert.strictEqual(decoded.serverIndex, 7);
-		assert.strictEqual(decoded.originalUri, 'custom://myhost/path');
-	});
-
-	test('returns URI unchanged if no scheme match', () => {
-		const encoded = encodeGatewayResourceUri('not-a-uri', 1);
-		assert.strictEqual(encoded, 'not-a-uri');
-	});
-
-	test('throws on decode of URI without server index suffix', () => {
-		assert.throws(() => decodeGatewayResourceUri('https://example.com/resource'));
-	});
-});
diff --git a/src/vs/platform/quickinput/browser/pickerQuickAccess.ts b/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
index d200f15a66e..2731fcd47ea 100644
--- a/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
@@ -6,7 +6,7 @@
 import { timeout } from '../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { IKeyMods, IQuickPickDidAcceptEvent, IQuickPickSeparator, IQuickPick, IQuickPickItem, IQuickInputButton } from '../common/quickInput.js';
+import { IKeyMods, IQuickPickDidAcceptEvent, IQuickPickSeparator, IQuickPick, IQuickPickItem, IQuickInputButton, isKeyModified } from '../common/quickInput.js';
 import { IQuickAccessProvider, IQuickAccessProviderRunOptions } from '../common/quickAccess.js';
 import { isFunction } from '../../../base/common/types.js';
 
@@ -51,12 +51,22 @@ export interface IPickerQuickAccessItem extends IQuickPickItem {
 	 * @param buttonIndex index of the button of the item that
 	 * was clicked.
 	 *
-	 * @param the state of modifier keys when the button was triggered.
+	 * @param keyMods the state of modifier keys when the button was triggered.
 	 *
 	 * @returns a value that indicates what should happen after the trigger
 	 * which can be a `Promise` for long running operations.
 	 */
 	trigger?(buttonIndex: number, keyMods: IKeyMods): TriggerAction | Promise<TriggerAction>;
+
+	/**
+	 * When set, this will be invoked instead of `accept` if modifier keys are held down.
+	 * This is useful for actions like "attach to context" where you want to keep the picker
+	 * open and allow multiple picks.
+	 *
+	 * @param keyMods the state of modifier keys when the item was accepted.
+	 * @param event the underlying event that caused this to trigger.
+	 */
+	attach?(keyMods: IKeyMods, event: IQuickPickDidAcceptEvent): void;
 }
 
 export interface IPickerQuickAccessSeparator extends IQuickPickSeparator {
@@ -67,7 +77,7 @@ export interface IPickerQuickAccessSeparator extends IQuickPickSeparator {
 	 * @param buttonIndex index of the button of the item that
 	 * was clicked.
 	 *
-	 * @param the state of modifier keys when the button was triggered.
+	 * @param keyMods the state of modifier keys when the button was triggered.
 	 *
 	 * @returns a value that indicates what should happen after the trigger
 	 * which can be a `Promise` for long running operations.
@@ -337,6 +347,11 @@ export abstract class PickerQuickAccessProvider<T extends IPickerQuickAccessItem
 
 			const [item] = picker.selectedItems;
 			if (typeof item?.accept === 'function') {
+				const isAttachAction = isKeyModified(picker.keyMods) && !!item.attach;
+				if (isAttachAction) {
+					item.attach!(picker.keyMods, event);
+					return;
+				}
 				if (!event.inBackground) {
 					picker.hide(); // hide picker unless we accept in background
 				}
diff --git a/src/vs/platform/quickinput/browser/quickInputActions.ts b/src/vs/platform/quickinput/browser/quickInputActions.ts
index a536022fb22..6c705825036 100644
--- a/src/vs/platform/quickinput/browser/quickInputActions.ts
+++ b/src/vs/platform/quickinput/browser/quickInputActions.ts
@@ -44,7 +44,7 @@ function registerQuickPickCommandAndKeybindingRule(rule: PartialExcept<ICommandA
 const ctrlKeyMod = isMacintosh ? KeyMod.WinCtrl : KeyMod.CtrlCmd;
 
 // This function will generate all the combinations of keybindings for the given primary keybinding
-function getSecondary(primary: number, secondary: number[], options: { withAltMod?: boolean; withCtrlMod?: boolean; withCmdMod?: boolean } = {}): number[] {
+function getSecondary(primary: number, secondary: number[], options: { withAltMod?: boolean; withCtrlMod?: boolean; withCmdMod?: boolean; withShiftMod?: boolean } = {}): number[] {
 	if (options.withAltMod) {
 		secondary.push(KeyMod.Alt + primary);
 	}
@@ -54,6 +54,18 @@ function getSecondary(primary: number, secondary: number[], options: { withAltMo
 			secondary.push(KeyMod.Alt + ctrlKeyMod + primary);
 		}
 	}
+	if (options.withShiftMod) {
+		secondary.push(KeyMod.Shift + primary);
+		if (options.withAltMod) {
+			secondary.push(KeyMod.Alt + KeyMod.Shift + primary);
+		}
+		if (options.withCtrlMod) {
+			secondary.push(ctrlKeyMod + KeyMod.Shift + primary);
+			if (options.withAltMod) {
+				secondary.push(KeyMod.Alt + ctrlKeyMod + KeyMod.Shift + primary);
+			}
+		}
+	}
 
 	if (options.withCmdMod && isMacintosh) {
 		secondary.push(KeyMod.CtrlCmd + primary);
@@ -213,7 +225,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const currentQuickPick = accessor.get(IQuickInputService).currentQuickInput as IQuickPick<any> | IQuickTree<any> | IInputBox;
 		currentQuickPick?.accept();
 	},
-	secondary: getSecondary(KeyCode.Enter, [], { withAltMod: true, withCtrlMod: true, withCmdMod: true })
+	secondary: getSecondary(KeyCode.Enter, [], { withAltMod: true, withCtrlMod: true, withCmdMod: true, withShiftMod: true })
 });
 
 registerQuickPickCommandAndKeybindingRule(
diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index 162d90de81b..18db803496b 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -60,7 +60,7 @@ export class QuickInputController extends Disposable {
 	private readonly onDidAcceptEmitter = this._register(new Emitter<void>());
 	private readonly onDidCustomEmitter = this._register(new Emitter<void>());
 	private readonly onDidTriggerButtonEmitter = this._register(new Emitter<IQuickInputButton>());
-	private keyMods: Writeable<IKeyMods> = { ctrlCmd: false, alt: false };
+	private keyMods: Writeable<IKeyMods> = { ctrlCmd: false, alt: false, shift: false };
 
 	private controller: IQuickInput | null = null;
 	get currentQuickInput() { return this.controller ?? undefined; }
@@ -120,6 +120,7 @@ export class QuickInputController extends Disposable {
 		const listener = (e: KeyboardEvent | MouseEvent) => {
 			this.keyMods.ctrlCmd = e.ctrlKey || e.metaKey;
 			this.keyMods.alt = e.altKey;
+			this.keyMods.shift = e.shiftKey;
 		};
 
 		for (const event of [dom.EventType.KEY_DOWN, dom.EventType.KEY_UP, dom.EventType.MOUSE_DOWN]) {
@@ -837,13 +838,14 @@ export class QuickInputController extends Disposable {
 		}
 	}
 
-	async accept(keyMods: IKeyMods = { alt: false, ctrlCmd: false }) {
+	async accept(keyMods: IKeyMods = { alt: false, ctrlCmd: false, shift: false }) {
 		// When accepting the item programmatically, it is important that
 		// we update `keyMods` either from the provided set or unset it
 		// because the accept did not happen from mouse or keyboard
 		// interaction on the list itself
 		this.keyMods.alt = keyMods.alt;
 		this.keyMods.ctrlCmd = keyMods.ctrlCmd;
+		this.keyMods.shift = keyMods.shift;
 
 		this.onDidAcceptEmitter.fire();
 	}
diff --git a/src/vs/platform/quickinput/browser/quickInputList.ts b/src/vs/platform/quickinput/browser/quickInputList.ts
index 8580b264014..f71937903f3 100644
--- a/src/vs/platform/quickinput/browser/quickInputList.ts
+++ b/src/vs/platform/quickinput/browser/quickInputList.ts
@@ -321,14 +321,26 @@ class QuickInputAccessibilityProvider implements IListAccessibilityProvider<IQui
 	}
 }
 
-abstract class BaseQuickInputListRenderer<T extends IQuickPickElement> implements ITreeRenderer<T, void, IQuickInputItemTemplateData> {
+abstract class BaseQuickInputListRenderer<T extends IQuickPickElement> extends Disposable implements ITreeRenderer<T, void, IQuickInputItemTemplateData> {
 	abstract templateId: string;
 
+	private readonly _onDidDisposeFocusedElement = this._register(new Emitter<void>());
+
+	/**
+	 * This event is emitted when the renderer disposes an element that has focus.
+	 * This allows the list to re-focus itself and prevent focus from being lost
+	 * (potentially causing quickinput to dismiss itself) when an element is
+	 * removed while focused.
+	 */
+	readonly onDidDisposeFocusedElement = this._onDidDisposeFocusedElement.event;
+
 	constructor(
 		private readonly hoverDelegate: IHoverDelegate | undefined,
 		private readonly toggleStyles: IToggleStyles,
 		private readonly contextMenuService: IContextMenuService
-	) { }
+	) {
+		super();
+	}
 
 	// TODO: only do the common stuff here and have a subclass handle their specific stuff
 	renderTemplate(container: HTMLElement): IQuickInputItemTemplateData {
@@ -392,6 +404,9 @@ abstract class BaseQuickInputListRenderer<T extends IQuickPickElement> implement
 	}
 
 	disposeElement(_element: ITreeNode<IQuickPickElement, void>, _index: number, data: IQuickInputItemTemplateData): void {
+		if (dom.isAncestorOfActiveElement(data.entry)) {
+			this._onDidDisposeFocusedElement.fire();
+		}
 		data.toDisposeElement.clear();
 		data.toolBar.setActions([]);
 	}
@@ -746,8 +761,8 @@ export class QuickInputList extends Disposable {
 	) {
 		super();
 		this._container = dom.append(this.parent, $('.quick-input-list'));
-		this._separatorRenderer = instantiationService.createInstance(QuickPickSeparatorElementRenderer, hoverDelegate, this.styles.toggle);
-		this._itemRenderer = instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate, this.styles.toggle);
+		this._separatorRenderer = this._register(instantiationService.createInstance(QuickPickSeparatorElementRenderer, hoverDelegate, this.styles.toggle));
+		this._itemRenderer = this._register(instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate, this.styles.toggle));
 		this._tree = this._register(instantiationService.createInstance(
 			WorkbenchObjectTree<IQuickPickElement, void>,
 			'QuickInput',
@@ -786,6 +801,8 @@ export class QuickInputList extends Disposable {
 			}
 		));
 		this._tree.getHTMLElement().id = id;
+		this._register(this._itemRenderer.onDidDisposeFocusedElement(() => this._tree.domFocus()));
+		this._register(this._separatorRenderer.onDidDisposeFocusedElement(() => this._tree.domFocus()));
 		this._registerListeners();
 	}
 
diff --git a/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts b/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts
index 896564c768a..893665466a9 100644
--- a/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts
+++ b/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts
@@ -117,6 +117,9 @@ export class QuickInputTreeController extends Disposable {
 				identityProvider: new QuickInputTreeIdentityProvider()
 			}
 		));
+		this._register(this._renderer.onDidDisposeFocusedElement(() => {
+			this._tree.domFocus();
+		}));
 		this.registerCheckboxStateListeners();
 		this.registerOnDidChangeFocus();
 	}
@@ -297,18 +300,22 @@ export class QuickInputTreeController extends Disposable {
 		}));
 
 		this._register(this._checkboxStateHandler.onDidChangeCheckboxState(e => {
-			this.updateCheckboxState(e.item, e.checked === true);
+			this.updateCheckboxState(e.item, e.checked === true, true);
+			this._tree.setFocus([e.item]);
+			this._tree.setSelection([e.item]);
 		}));
 	}
 
-	private updateCheckboxState(item: IQuickTreeItem, newState: boolean): void {
+	private updateCheckboxState(item: IQuickTreeItem, newState: boolean, skipItemRerender = false): void {
 		if ((item.checked ?? false) === newState) {
 			return; // No change
 		}
 
 		// Handle checked item
 		item.checked = newState;
-		this._tree.rerender(item);
+		if (!skipItemRerender) {
+			this._tree.rerender(item);
+		}
 
 		// Handle children of the checked item
 		const updateSet = new Set<IQuickTreeItem>();
diff --git a/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts b/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts
index 1cc5c821591..362c6ac18bc 100644
--- a/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts
+++ b/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts
@@ -48,6 +48,16 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 	static readonly ID = 'quickInputTreeElement';
 	templateId = QuickInputTreeRenderer.ID;
 
+	private readonly _onDidDisposeFocusedElement = this._register(new Emitter<void>());
+
+	/**
+	 * This event is emitted when the renderer disposes an element that has focus.
+	 * This allows the list to re-focus itself and prevent focus from being lost
+	 * (potentially causing quickinput to dismiss itself) when an element is
+	 * removed while focused.
+	 */
+	public readonly onDidDisposeFocusedElement = this._onDidDisposeFocusedElement.event;
+
 	constructor(
 		private readonly _hoverDelegate: IHoverDelegate | undefined,
 		private readonly _buttonTriggeredEmitter: Emitter<IQuickTreeItemButtonEvent<T>>,
@@ -172,6 +182,9 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 	}
 
 	disposeElement(_element: ITreeNode<T, IQuickTreeFilterData>, _index: number, templateData: IQuickTreeTemplateData, _details?: ITreeElementRenderDetails): void {
+		if (dom.isAncestorOfActiveElement(templateData.entry)) {
+			this._onDidDisposeFocusedElement.fire();
+		}
 		templateData.toDisposeElement.clear();
 		templateData.actionBar.setActions([]);
 	}
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index 04d91e66aa4..1b15c20bd56 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -115,9 +115,14 @@ export interface IQuickPickSeparator {
 export interface IKeyMods {
 	readonly ctrlCmd: boolean;
 	readonly alt: boolean;
+	readonly shift: boolean;
 }
 
-export const NO_KEY_MODS: IKeyMods = { ctrlCmd: false, alt: false };
+export function isKeyModified(keyMods: IKeyMods): boolean {
+	return keyMods.ctrlCmd || keyMods.alt || keyMods.shift;
+}
+
+export const NO_KEY_MODS: IKeyMods = { ctrlCmd: false, alt: false, shift: false };
 
 export interface IQuickNavigateConfiguration {
 	keybindings: readonly ResolvedKeybinding[];
diff --git a/src/vs/platform/quickinput/test/browser/quickinput.test.ts b/src/vs/platform/quickinput/test/browser/quickinput.test.ts
index db57dedbffa..02ae5f0e506 100644
--- a/src/vs/platform/quickinput/test/browser/quickinput.test.ts
+++ b/src/vs/platform/quickinput/test/browser/quickinput.test.ts
@@ -19,7 +19,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/c
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { QuickPick } from '../../browser/quickInput.js';
-import { IQuickPickItem, ItemActivation } from '../../common/quickInput.js';
+import { IQuickPickItem, ItemActivation, isKeyModified, NO_KEY_MODS } from '../../common/quickInput.js';
 import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
 import { IThemeService } from '../../../theme/common/themeService.js';
 import { IConfigurationService } from '../../../configuration/common/configuration.js';
@@ -278,4 +278,16 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543
 		assert.strictEqual(activeItemsFromEvent.length, 0);
 		assert.strictEqual(quickpick.activeItems.length, 0);
 	});
+
+	test('isKeyModified - returns false when no modifiers are pressed', () => {
+		assert.strictEqual(isKeyModified(NO_KEY_MODS), false);
+		assert.strictEqual(isKeyModified({ ctrlCmd: false, alt: false, shift: false }), false);
+	});
+
+	test('isKeyModified - returns true when any modifier is pressed', () => {
+		assert.strictEqual(isKeyModified({ ctrlCmd: true, alt: false, shift: false }), true);
+		assert.strictEqual(isKeyModified({ ctrlCmd: false, alt: true, shift: false }), true);
+		assert.strictEqual(isKeyModified({ ctrlCmd: false, alt: false, shift: true }), true);
+		assert.strictEqual(isKeyModified({ ctrlCmd: true, alt: true, shift: true }), true);
+	});
 });
diff --git a/src/vs/platform/remote/common/remoteAgentEnvironment.ts b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
index 51cb401dcfb..e63de4e540f 100644
--- a/src/vs/platform/remote/common/remoteAgentEnvironment.ts
+++ b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
@@ -12,6 +12,7 @@ export interface IRemoteAgentEnvironment {
 	pid: number;
 	connectionToken: string;
 	appRoot: URI;
+	execPath: string;
 	tmpDir: URI;
 	settingsPath: URI;
 	mcpResource: URI;
diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts
index df18c523dd7..8db0214ed89 100644
--- a/src/vs/platform/request/common/request.ts
+++ b/src/vs/platform/request/common/request.ts
@@ -6,6 +6,7 @@
 import { streamToBuffer } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
+import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { IHeaders, IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
 import { localize } from '../../../nls.js';
@@ -16,6 +17,19 @@ import { Registry } from '../../registry/common/platform.js';
 
 export const IRequestService = createDecorator<IRequestService>('requestService');
 
+/**
+ * Use as the {@link IRequestOptions.callSite} value to prevent
+ * request telemetry from being emitted. This is needed for
+ * callers such as the telemetry sender to avoid cyclical calls.
+ */
+export const NO_FETCH_TELEMETRY = 'NO_FETCH_TELEMETRY';
+
+export interface IRequestCompleteEvent {
+	readonly callSite: string;
+	readonly latency: number;
+	readonly statusCode: number | undefined;
+}
+
 export interface AuthInfo {
 	isProxy: boolean;
 	scheme: string;
@@ -33,6 +47,11 @@ export interface Credentials {
 export interface IRequestService {
 	readonly _serviceBrand: undefined;
 
+	/**
+	 * Fires when a request completes (successfully or with an error response).
+	 */
+	readonly onDidCompleteRequest: Event<IRequestCompleteEvent>;
+
 	request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext>;
 
 	resolveProxy(url: string): Promise<string | undefined>;
@@ -70,6 +89,9 @@ export abstract class AbstractRequestService extends Disposable implements IRequ
 
 	private counter = 0;
 
+	private readonly _onDidCompleteRequest = this._register(new Emitter<IRequestCompleteEvent>());
+	readonly onDidCompleteRequest = this._onDidCompleteRequest.event;
+
 	constructor(protected readonly logService: ILogService) {
 		super();
 	}
@@ -77,9 +99,15 @@ export abstract class AbstractRequestService extends Disposable implements IRequ
 	protected async logAndRequest(options: IRequestOptions, request: () => Promise<IRequestContext>): Promise<IRequestContext> {
 		const prefix = `#${++this.counter}: ${options.url}`;
 		this.logService.trace(`${prefix} - begin`, options.type, new LoggableHeaders(options.headers ?? {}));
+		const startTime = Date.now();
 		try {
 			const result = await request();
 			this.logService.trace(`${prefix} - end`, options.type, result.res.statusCode, result.res.headers);
+			this._onDidCompleteRequest.fire({
+				callSite: options.callSite,
+				latency: Date.now() - startTime,
+				statusCode: result.res.statusCode,
+			});
 			return result;
 		} catch (error) {
 			this.logService.error(`${prefix} - error`, options.type, getErrorMessage(error));
@@ -284,6 +312,12 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
 					markdownDescription: localize('fetchAdditionalSupport', "Controls whether Node.js' fetch implementation should be extended with additional support. Currently proxy support ({1}) and system certificates ({2}) are added when the corresponding settings are enabled. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`', '`#http.proxySupport#`', '`#http.systemCertificates#`'),
 					restricted: true
 				},
+				'http.webSocketAdditionalSupport': {
+					type: 'boolean',
+					default: true,
+					markdownDescription: localize('webSocketAdditionalSupport', "Controls whether the built-in WebSocket implementation should be extended with additional support. Currently proxy support ({1}) and system certificates ({2}) are added when the corresponding settings are enabled. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`', '`#http.proxySupport#`', '`#http.systemCertificates#`'),
+					restricted: true
+				},
 				'http.experimental.networkInterfaceCheckInterval': {
 					type: 'number',
 					default: 300,
diff --git a/src/vs/platform/request/common/requestIpc.ts b/src/vs/platform/request/common/requestIpc.ts
index 0b3aff1a886..341556406fc 100644
--- a/src/vs/platform/request/common/requestIpc.ts
+++ b/src/vs/platform/request/common/requestIpc.ts
@@ -8,7 +8,7 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Event } from '../../../base/common/event.js';
 import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { IHeaders, IRequestContext, IRequestOptions } from '../../../base/parts/request/common/request.js';
-import { AuthInfo, Credentials, IRequestService } from './request.js';
+import { AuthInfo, Credentials, IRequestCompleteEvent, IRequestService } from './request.js';
 
 type RequestResponse = [
 	{
@@ -46,6 +46,8 @@ export class RequestChannelClient implements IRequestService {
 
 	declare readonly _serviceBrand: undefined;
 
+	readonly onDidCompleteRequest = Event.None as Event<IRequestCompleteEvent>;
+
 	constructor(private readonly channel: IChannel) { }
 
 	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
diff --git a/src/vs/platform/request/test/common/requestService.test.ts b/src/vs/platform/request/test/common/requestService.test.ts
new file mode 100644
index 00000000000..3760902fb1f
--- /dev/null
+++ b/src/vs/platform/request/test/common/requestService.test.ts
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { bufferToStream, VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IRequestContext, IRequestOptions } from '../../../../base/parts/request/common/request.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { AbstractRequestService, AuthInfo, Credentials, IRequestCompleteEvent, NO_FETCH_TELEMETRY } from '../../common/request.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+class TestRequestService extends AbstractRequestService {
+
+	constructor(private readonly handler: (options: IRequestOptions) => Promise<IRequestContext>) {
+		super(new NullLogService());
+	}
+
+	async request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
+		return this.logAndRequest(options, () => this.handler(options));
+	}
+
+	async resolveProxy(_url: string): Promise<string | undefined> { return undefined; }
+	async lookupAuthorization(_authInfo: AuthInfo): Promise<Credentials | undefined> { return undefined; }
+	async lookupKerberosAuthorization(_url: string): Promise<string | undefined> { return undefined; }
+	async loadCertificates(): Promise<string[]> { return []; }
+}
+
+function makeResponse(statusCode: number): IRequestContext {
+	return {
+		res: { headers: {}, statusCode },
+		stream: bufferToStream(VSBuffer.fromString(''))
+	};
+}
+
+suite('AbstractRequestService', () => {
+
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('onDidCompleteRequest fires with correct data', async () => {
+		const service = store.add(new TestRequestService(() => Promise.resolve(makeResponse(200))));
+
+		const events: IRequestCompleteEvent[] = [];
+		store.add(service.onDidCompleteRequest(e => events.push(e)));
+
+		await service.request({ url: 'http://test', callSite: 'test.callSite' }, CancellationToken.None);
+
+		assert.strictEqual(events.length, 1);
+		assert.strictEqual(events[0].callSite, 'test.callSite');
+		assert.strictEqual(events[0].statusCode, 200);
+		assert.ok(events[0].latency >= 0);
+	});
+
+	test('onDidCompleteRequest reports status code from response', async () => {
+		const service = store.add(new TestRequestService(() => Promise.resolve(makeResponse(404))));
+
+		const events: IRequestCompleteEvent[] = [];
+		store.add(service.onDidCompleteRequest(e => events.push(e)));
+
+		await service.request({ url: 'http://test', callSite: 'test.notFound' }, CancellationToken.None);
+
+		assert.strictEqual(events.length, 1);
+		assert.strictEqual(events[0].statusCode, 404);
+	});
+
+	test('onDidCompleteRequest fires for NO_FETCH_TELEMETRY', async () => {
+		const service = store.add(new TestRequestService(() => Promise.resolve(makeResponse(200))));
+
+		const events: IRequestCompleteEvent[] = [];
+		store.add(service.onDidCompleteRequest(e => events.push(e)));
+
+		await service.request({ url: 'http://test', callSite: NO_FETCH_TELEMETRY }, CancellationToken.None);
+
+		assert.strictEqual(events.length, 1);
+		assert.strictEqual(events[0].callSite, NO_FETCH_TELEMETRY);
+	});
+
+	test('onDidCompleteRequest does not fire when request throws', async () => {
+		const service = store.add(new TestRequestService(() => Promise.reject(new Error('network error'))));
+
+		const events: IRequestCompleteEvent[] = [];
+		store.add(service.onDidCompleteRequest(e => events.push(e)));
+
+		await assert.rejects(() => service.request({ url: 'http://test', callSite: 'test.error' }, CancellationToken.None));
+
+		assert.strictEqual(events.length, 0);
+	});
+
+	test('onDidCompleteRequest fires for each request', async () => {
+		const service = store.add(new TestRequestService(() => Promise.resolve(makeResponse(200))));
+
+		const events: IRequestCompleteEvent[] = [];
+		store.add(service.onDidCompleteRequest(e => events.push(e)));
+
+		await service.request({ url: 'http://test/1', callSite: 'first' }, CancellationToken.None);
+		await service.request({ url: 'http://test/2', callSite: 'second' }, CancellationToken.None);
+
+		assert.deepStrictEqual(events.map(e => e.callSite), ['first', 'second']);
+	});
+});
diff --git a/src/vs/platform/request/test/node/requestService.test.ts b/src/vs/platform/request/test/node/requestService.test.ts
index 8e8c8850149..50f7d72068a 100644
--- a/src/vs/platform/request/test/node/requestService.test.ts
+++ b/src/vs/platform/request/test/node/requestService.test.ts
@@ -36,7 +36,7 @@ suite('Request Service', () => {
 		setTimeout(() => cts.cancel(), 50);
 
 		try {
-			await nodeRequest({ url: 'http://localhost:9999/nonexistent' }, cts.token);
+			await nodeRequest({ url: 'http://localhost:9999/nonexistent', callSite: 'requestService.test.cancellation' }, cts.token);
 			assert.fail('Request should have been cancelled');
 		} catch (err) {
 			const elapsed = Date.now() - startTime;
@@ -74,7 +74,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'GET',
-				getRawRequest: () => mockRawRequest as IRawRequestFunction
+				getRawRequest: () => mockRawRequest as IRawRequestFunction,
+				callSite: 'requestService.test.retryGET'
 			}, CancellationToken.None);
 		} catch (err) {
 			// Expected to eventually succeed or fail after retries
@@ -106,7 +107,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'POST',
-				getRawRequest: () => mockRawRequest
+				getRawRequest: () => mockRawRequest,
+				callSite: 'requestService.test.noRetryPOST'
 			}, CancellationToken.None);
 			assert.fail('Should have thrown an error');
 		} catch (err) {
@@ -144,7 +146,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'HEAD',
-				getRawRequest: () => mockRawRequest as IRawRequestFunction
+				getRawRequest: () => mockRawRequest as IRawRequestFunction,
+				callSite: 'requestService.test.retryHEAD'
 			}, CancellationToken.None);
 		} catch (err) {
 			// Expected to eventually succeed or fail after retries
@@ -181,7 +184,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'OPTIONS',
-				getRawRequest: () => mockRawRequest as IRawRequestFunction
+				getRawRequest: () => mockRawRequest as IRawRequestFunction,
+				callSite: 'requestService.test.retryOPTIONS'
 			}, CancellationToken.None);
 		} catch (err) {
 			// Expected to eventually succeed or fail after retries
@@ -213,7 +217,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'DELETE',
-				getRawRequest: () => mockRawRequest
+				getRawRequest: () => mockRawRequest,
+				callSite: 'requestService.test.noRetryDELETE'
 			}, CancellationToken.None);
 			assert.fail('Should have thrown an error');
 		} catch (err) {
@@ -246,7 +251,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'PUT',
-				getRawRequest: () => mockRawRequest
+				getRawRequest: () => mockRawRequest,
+				callSite: 'requestService.test.noRetryPUT'
 			}, CancellationToken.None);
 			assert.fail('Should have thrown an error');
 		} catch (err) {
@@ -279,7 +285,8 @@ suite('Request Service', () => {
 			await nodeRequest({
 				url: 'http://example.com',
 				type: 'PATCH',
-				getRawRequest: () => mockRawRequest
+				getRawRequest: () => mockRawRequest,
+				callSite: 'requestService.test.noRetryPATCH'
 			}, CancellationToken.None);
 			assert.fail('Should have thrown an error');
 		} catch (err) {
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index 7c5c89eae08..d1acea8ff5d 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -309,13 +309,14 @@ function anonymizeFilePaths(stack: string, cleanupPatterns: RegExp[]): string {
 		}
 	}
 
-	const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
+	// Match node_modules or node_modules.asar at any position in the path, capturing the node_modules/... suffix
+	const nodeModulesRegex = /(?:^|[\\\/])((node_modules|node_modules\.asar)[\\\/].*)$/;
 	// Match VS Code extension paths:
 	// 1. User extensions: .vscode/extensions/, .vscode-insiders/extensions/, .vscode-server/extensions/, .vscode-server-insiders/extensions/, etc.
 	// 2. Built-in extensions: resources/app/extensions/
 	// Capture everything from the vscode folder or resources/app/extensions onwards
 	const vscodeExtensionsPathRegex = /^(.*?)((?:\.vscode(?:-[a-z]+)*|resources[\\\/]app)[\\\/]extensions[\\\/].*)$/i;
-	const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w-\._]+(\\\\|\\|\/))+[\w-\._]*/g;
+	const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w\-\._@]+(\\\\|\\|\/))+[\w\-\._@]*/g;
 	let lastIndex = 0;
 	updatedStack = '';
 
@@ -329,14 +330,20 @@ function anonymizeFilePaths(stack: string, cleanupPatterns: RegExp[]): string {
 		const overlappingRange = cleanUpIndexes.some(([start, end]) => result.index < end && start < fileRegex.lastIndex);
 
 		// anoynimize user file paths that do not need to be retained or cleaned up.
-		if (!nodeModulesRegex.test(result[0]) && !overlappingRange) {
+		if (!overlappingRange) {
 			// Check if this is a VS Code extension path - if so, preserve the .vscode*/extensions/... portion
 			const vscodeExtMatch = vscodeExtensionsPathRegex.exec(result[0]);
 			if (vscodeExtMatch) {
 				// Keep ".vscode[-variant]/extensions/extension-name/..." but redact the parent folder
 				updatedStack += stack.substring(lastIndex, result.index) + '<REDACTED: user-file-path>/' + vscodeExtMatch[2];
 			} else {
-				updatedStack += stack.substring(lastIndex, result.index) + '<REDACTED: user-file-path>';
+				// Check if node_modules appears in the path — preserve node_modules/... suffix
+				const nodeModulesMatch = nodeModulesRegex.exec(result[0]);
+				if (nodeModulesMatch) {
+					updatedStack += stack.substring(lastIndex, result.index) + '<REDACTED: user-file-path>/' + nodeModulesMatch[1];
+				} else {
+					updatedStack += stack.substring(lastIndex, result.index) + '<REDACTED: user-file-path>';
+				}
 			}
 			lastIndex = fileRegex.lastIndex;
 		}
diff --git a/src/vs/platform/telemetry/node/1dsAppender.ts b/src/vs/platform/telemetry/node/1dsAppender.ts
index 0d3f9369eb5..0fdbbd1a732 100644
--- a/src/vs/platform/telemetry/node/1dsAppender.ts
+++ b/src/vs/platform/telemetry/node/1dsAppender.ts
@@ -7,7 +7,7 @@ import type { IPayloadData, IXHROverride } from '@microsoft/1ds-post-js';
 import { streamToBuffer } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { IRequestOptions } from '../../../base/parts/request/common/request.js';
-import { IRequestService } from '../../request/common/request.js';
+import { IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
 import { AbstractOneDataSystemAppender, IAppInsightsCore } from '../common/1dsAppender.js';
 
 type OnCompleteFunc = (status: number, headers: { [headerName: string]: string }, response?: string) => void;
@@ -81,7 +81,8 @@ async function sendPostAsync(requestService: IRequestService | undefined, payloa
 			'Content-Length': Buffer.byteLength(payload.data).toString()
 		},
 		url: payload.urlString,
-		data: telemetryRequestData
+		data: telemetryRequestData,
+		callSite: NO_FETCH_TELEMETRY
 	};
 
 	try {
diff --git a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
index d6a1b2370d5..cf93a8cc0cd 100644
--- a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
@@ -57,7 +57,13 @@ class ErrorTestingSettings {
 	public randomUserFile: string = 'a/path/that/doe_snt/con-tain/code/names.js';
 	public anonymizedRandomUserFile: string = '<REDACTED: user-file-path>';
 	public nodeModulePathToRetain: string = 'node_modules/path/that/shouldbe/retained/names.js:14:15854';
+	public anonymizedNodeModulePath: string = '<REDACTED: user-file-path>/node_modules/path/that/shouldbe/retained/names.js:14:15854';
 	public nodeModuleAsarPathToRetain: string = 'node_modules.asar/path/that/shouldbe/retained/names.js:14:12354';
+	public anonymizedNodeModuleAsarPath: string = '<REDACTED: user-file-path>/node_modules.asar/path/that/shouldbe/retained/names.js:14:12354';
+	public fullNodeModulePath: string = '/Users/username/projects/vscode/node_modules/@xterm/xterm/lib/xterm.js:1:243732';
+	public anonymizedFullNodeModulePath: string = '<REDACTED: user-file-path>/node_modules/@xterm/xterm/lib/xterm.js:1:243732';
+	public fullNodeModuleAsarPath: string = '/Users/username/projects/vscode/node_modules.asar/@xterm/xterm/lib/xterm.js:1:376066';
+	public anonymizedFullNodeModuleAsarPath: string = '<REDACTED: user-file-path>/node_modules.asar/@xterm/xterm/lib/xterm.js:1:376066';
 	public extensionPathToRetain: string = '.vscode/extensions/ms-python.python-2024.0.1/out/extension.js:144:145516';
 	public fullExtensionPath: string = '/Users/username/.vscode/extensions/ms-python.python-2024.0.1/out/extension.js:144:145516';
 	public anonymizedExtensionPath: string = '<REDACTED: user-file-path>/.vscode/extensions/ms-python.python-2024.0.1/out/extension.js:144:145516';
@@ -90,6 +96,8 @@ class ErrorTestingSettings {
 		`    at t._handleMessage (${this.nodeModuleAsarPathToRetain})`,
 		`    at t._onmessage (/${this.nodeModulePathToRetain})`,
 		`    at t.onmessage (${this.nodeModulePathToRetain})`,
+		`    at get dimensions (${this.fullNodeModulePath})`,
+		`    at _._refreshCanvasDimensions (${this.fullNodeModuleAsarPath})`,
 		`    at uv.provideCodeActions (${this.fullExtensionPath})`,
 		`    at remote.handleConnection (${this.fullServerInsidersExtensionPath})`,
 		`    at git.getRepositoryState (${this.fullBuiltinExtensionPath})`,
@@ -468,10 +476,8 @@ suite('TelemetryService', () => {
 
 		assert.strictEqual(errorStub.callCount, 1);
 		// Test that important information remains but personal info does not
-		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(settings.anonymizedNodeModuleAsarPath), -1, 'bare node_modules.asar path');
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(settings.anonymizedNodeModulePath), -1, 'bare node_modules path');
 		assert.notStrictEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
 		assert.strictEqual(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
 		assert.strictEqual(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
@@ -504,10 +510,12 @@ suite('TelemetryService', () => {
 			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
-			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+			// All node_modules paths (bare and full) should preserve the node_modules/... suffix after redaction
+			const cs = testAppender.events[0].data.callstack;
+			assert.notStrictEqual(cs.indexOf(settings.anonymizedNodeModuleAsarPath), -1, 'bare node_modules.asar path');
+			assert.notStrictEqual(cs.indexOf(settings.anonymizedNodeModulePath), -1, 'bare node_modules path');
+			assert.notStrictEqual(cs.indexOf(settings.anonymizedFullNodeModulePath), -1, 'full node_modules path');
+			assert.notStrictEqual(cs.indexOf(settings.anonymizedFullNodeModuleAsarPath), -1, 'full node_modules.asar path');
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -1033,5 +1041,44 @@ suite('TelemetryService', () => {
 		sinon.restore();
 	}));
 
+	test('Unexpected Error Telemetry strips web origin but preserves path in web stack traces when piiPaths includes origin', sinonTestFn(function (this: any) {
+		const origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
+
+		try {
+			const testAppender = new TestTelemetryAppender();
+			const webOrigin = 'https://codespace-host.github.dev';
+			const service = new TestErrorTelemetryService({ appenders: [testAppender], piiPaths: [webOrigin] });
+			const errorTelemetry = new ErrorTelemetry(service);
+
+			const bundlePath = '/static/build/bundle.js';
+			const stack = [
+				`Error: Something failed`,
+				`    at x3t._delegate (${webOrigin}${bundlePath}:1:200953)`,
+				`    at y4u.run (${webOrigin}${bundlePath}:1:304822)`,
+				`    at DedicatedWorkerGlobalScope.self.onmessage`,
+			];
+
+			const webError: any = new Error('Something failed');
+			webError.stack = stack.join('\n');
+
+			Errors.onUnexpectedError(webError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+			assert.strictEqual(testAppender.getEventsCount(), 1);
+			const cs = testAppender.events[0].data.callstack;
+			// Verify the web origin is stripped (not leaked as PII)
+			assert.strictEqual(cs.indexOf(webOrigin), -1, 'Web origin should be stripped');
+			assert.strictEqual(cs.indexOf('https://'), -1, 'HTTPS scheme should be stripped');
+			// Verify the bundle path is preserved for debugging
+			assert.notStrictEqual(cs.indexOf(bundlePath), -1, 'Bundle path should be preserved');
+
+			errorTelemetry.dispose();
+			service.dispose();
+		} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
+	}));
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
index 2a2fe067485..a4f68648930 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
@@ -131,13 +131,25 @@ export class TerminalCommand implements ITerminalCommand {
 			return undefined;
 		}
 		let output = '';
+		let currentLine = '';
 		let line: IBufferLine | undefined;
+		const buffer = this._xterm.buffer.active;
 		for (let i = startLine; i < endLine; i++) {
-			line = this._xterm.buffer.active.getLine(i);
+			line = buffer.getLine(i);
 			if (!line) {
 				continue;
 			}
-			output += line.translateToString(!line.isWrapped) + (line.isWrapped ? '' : '\n');
+			// NOTE: xterm stores wrapping state on the *next* line, not the current one.
+			// Use next line's `isWrapped` to determine whether this line should be joined.
+			const isWrapped = i + 1 < endLine ? !!buffer.getLine(i + 1)?.isWrapped : false;
+			currentLine += line.translateToString(!isWrapped);
+			if (!isWrapped) {
+				output += currentLine + '\n';
+				currentLine = '';
+			}
+		}
+		if (currentLine.length > 0) {
+			output += currentLine;
 		}
 		return output === '' ? undefined : output;
 	}
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index 44e53e09a64..dc7c596c346 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -122,7 +122,6 @@ export const enum TerminalSettingId {
 	FontLigaturesFallbackLigatures = 'terminal.integrated.fontLigatures.fallbackLigatures',
 	EnableKittyKeyboardProtocol = 'terminal.integrated.enableKittyKeyboardProtocol',
 	EnableWin32InputMode = 'terminal.integrated.enableWin32InputMode',
-	ExperimentalAiProfileGrouping = 'terminal.integrated.experimental.aiProfileGrouping',
 	AllowInUntrustedWorkspace = 'terminal.integrated.allowInUntrustedWorkspace',
 
 	// Developer/debug settings
diff --git a/src/vs/platform/terminal/node/childProcessMonitor.ts b/src/vs/platform/terminal/node/childProcessMonitor.ts
index 40ac2d23050..2b9bdfb2e5b 100644
--- a/src/vs/platform/terminal/node/childProcessMonitor.ts
+++ b/src/vs/platform/terminal/node/childProcessMonitor.ts
@@ -49,12 +49,20 @@ export class ChildProcessMonitor extends Disposable {
 	readonly onDidChangeHasChildProcesses = this._onDidChangeHasChildProcesses.event;
 
 	constructor(
-		private readonly _pid: number,
+		private _pid: number,
 		@ILogService private readonly _logService: ILogService
 	) {
 		super();
 	}
 
+	/**
+	 * Updates the pid to monitor. This is needed when the pid is not available
+	 * immediately after spawn (e.g. node-pty deferred conpty connection).
+	 */
+	setPid(pid: number): void {
+		this._pid = pid;
+	}
+
 	/**
 	 * Input was triggered on the process.
 	 */
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index e684180e35d..efb8c243bd3 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -31,7 +31,7 @@ const enum ShutdownConstants {
 	 * on Windows under conpty, killing a process while data is being output will cause the [conhost
 	 * flush to hang the pty host][2] because [conhost should be hosted on another thread][3].
 	 *
-	 * [1]: https://github.com/Tyriar/node-pty/issues/72
+	 * [1]: https://github.com/microsoft/node-pty/issues/72
 	 * [2]: https://github.com/microsoft/vscode/issues/71966
 	 * [3]: https://github.com/microsoft/node-pty/pull/415
 	 */
@@ -110,7 +110,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 
 	private _isPtyPaused: boolean = false;
 	private _unacknowledgedCharCount: number = 0;
-	private _writeQueue: Promise<void> = Promise.resolve();
 	get exitMessage(): string | undefined { return this._exitMessage; }
 
 	get currentTitle(): string { return this._windowsShellHelper?.shellTitle || this._currentTitle; }
@@ -338,7 +337,20 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			this._exitCode = e.exitCode;
 			this._queueProcessExit();
 		}));
-		this._sendProcessId(ptyProcess.pid);
+		// node-pty >= 1.2.0-beta.11 defers conptyNative.connect() on Windows, so
+		// ptyProcess.pid may be 0 immediately after spawn. In that case we wait
+		// for the first data event which only fires after the connection completes
+		// and the real pid is available. See microsoft/node-pty#885.
+		if (ptyProcess.pid > 0) {
+			this._sendProcessId(ptyProcess.pid);
+		} else {
+			const dataListener = ptyProcess.onData(() => {
+				dataListener.dispose();
+				this._childProcessMonitor?.setPid(ptyProcess.pid);
+				this._sendProcessId(ptyProcess.pid);
+			});
+			this._register(dataListener);
+		}
 		this._setupTitlePolling(ptyProcess);
 	}
 
@@ -356,7 +368,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	}
 
 	// Allow any trailing data events to be sent before the exit event is sent.
-	// See https://github.com/Tyriar/node-pty/issues/72
+	// See https://github.com/microsoft/node-pty/issues/72
 	private _queueProcessExit() {
 		if (this._logService.getLevel() === LogLevel.Trace) {
 			this._logService.trace('TerminalProcess#_queueProcessExit', new Error().stack?.replace(/^Error/, ''));
@@ -469,32 +481,12 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._logService.trace('node-pty.IPty#write', data, isBinary);
 		if (isBinary) {
 			this._ptyProcess!.write(Buffer.from(data, 'binary'));
-		} else if (isMacintosh && data.length > 512 && data.includes('\r')) {
-			// macOS PTY has a ~1024-byte canonical-mode input buffer. Multiline
-			// input exceeding this causes writes to block or corrupt due to
-			// backpressure from the shell's line editor echoing characters.
-			// https://github.com/microsoft/vscode/issues/296955
-			this._writeChunked(data);
 		} else {
 			this._ptyProcess!.write(data);
 		}
 		this._childProcessMonitor?.handleInput();
 	}
 
-	private _writeChunked(data: string): void {
-		this._writeQueue = this._writeQueue.then(async () => {
-			for (let i = 0; i < data.length; i += 512) {
-				if (this._store.isDisposed) {
-					return;
-				}
-				this._ptyProcess!.write(data.slice(i, i + 512));
-				if (i + 512 < data.length) {
-					await timeout(5);
-				}
-			}
-		});
-	}
-
 	sendSignal(signal: string): void {
 		if (this._store.isDisposed || !this._ptyProcess) {
 			return;
diff --git a/src/vs/platform/terminal/test/node/terminalProcess.test.ts b/src/vs/platform/terminal/test/node/terminalProcess.test.ts
deleted file mode 100644
index b5aed3fed0a..00000000000
--- a/src/vs/platform/terminal/test/node/terminalProcess.test.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { deepStrictEqual } from 'assert';
-import { tmpdir } from 'os';
-import * as path from '../../../../base/common/path.js';
-import * as fs from 'fs';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
-import { NullLogService } from '../../../log/common/log.js';
-import { IProductService } from '../../../product/common/productService.js';
-import { ITerminalProcessOptions, ITerminalLaunchError } from '../../common/terminal.js';
-import { TerminalProcess } from '../../node/terminalProcess.js';
-import { isWindows } from '../../../../base/common/platform.js';
-
-const processOptions: ITerminalProcessOptions = {
-	shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' },
-	windowsUseConptyDll: false,
-	environmentVariableCollections: undefined,
-	workspaceFolder: undefined,
-	isScreenReaderOptimized: false
-};
-
-/**
- * Build a multiline shell command that writes its content to a file.
- * The command writes numbered lines to a temp file so we can verify
- * the entire payload was received intact by the shell.
- */
-function buildMultilineCommand(lineCount: number, outputFile: string): { command: string; expectedLines: string[] } {
-	const lines: string[] = [];
-	for (let i = 1; i <= lineCount; i++) {
-		// Pad line number, add filler to make each line ~55 chars
-		const line = `L${String(i).padStart(2, '0')} ${'a'.repeat(51)}`;
-		lines.push(line);
-	}
-	// Use cat heredoc to write content to a file — this exercises multiline PTY input
-	const command = `cat > ${outputFile} << 'TESTEOF'\n${lines.join('\n')}\nTESTEOF\n`;
-	return { command, expectedLines: lines };
-}
-
-// These tests spawn real PTY processes and are macOS/Linux only
-(isWindows ? suite.skip : suite)('TerminalProcess - multiline write', () => {
-	const store = ensureNoDisposablesAreLeakedInTestSuite();
-	let outputDir: string;
-
-	setup(() => {
-		outputDir = fs.mkdtempSync(path.join(tmpdir(), 'vscode-pty-test-'));
-	});
-
-	teardown(() => {
-		fs.rmSync(outputDir, { recursive: true, force: true });
-	});
-
-	async function runMultilineTest(lineCount: number): Promise<void> {
-		const outputFile = path.join(outputDir, `output-${lineCount}.txt`);
-		const { command, expectedLines } = buildMultilineCommand(lineCount, outputFile);
-
-		const terminalProcess = store.add(new TerminalProcess(
-			{ executable: '/bin/bash', args: ['--norc', '--noprofile', '-i'] },
-			outputDir,
-			80,
-			24,
-			{ ...process.env } as Record<string, string>,
-			{ ...process.env } as Record<string, string>,
-			processOptions,
-			new NullLogService(),
-			{ applicationName: 'vscode' } as IProductService
-		));
-
-		const result = await terminalProcess.start();
-		const error = result as ITerminalLaunchError | undefined;
-		if (error?.message) {
-			throw new Error(`Failed to start terminal: ${error.message}`);
-		}
-
-		// Wait for shell to produce output (prompt), indicating it's ready for input
-		await new Promise<void>(resolve => {
-			const timeout = setTimeout(() => {
-				listener.dispose();
-				resolve();
-			}, 10000);
-			const listener = terminalProcess.onProcessData(() => {
-				clearTimeout(timeout);
-				listener.dispose();
-				resolve();
-			});
-		});
-
-		// Send the multiline command — newlines are converted to \r for PTY
-		const ptyData = command.replace(/\n/g, '\r');
-		terminalProcess.input(ptyData);
-
-		// Wait for the command to execute and write the file
-		const maxWait = 10000;
-		const start = Date.now();
-		while (Date.now() - start < maxWait) {
-			await new Promise(resolve => setTimeout(resolve, 200));
-			if (fs.existsSync(outputFile)) {
-				// Give a moment for the write to flush
-				await new Promise(resolve => setTimeout(resolve, 200));
-				break;
-			}
-		}
-
-		// Shut down and wait for the process to exit
-		const exitPromise = new Promise<void>(resolve => {
-			const listener = terminalProcess.onProcessExit(() => {
-				listener.dispose();
-				resolve();
-			});
-		});
-		terminalProcess.shutdown(true);
-		await exitPromise;
-
-		if (!fs.existsSync(outputFile)) {
-			throw new Error(`Output file was not created — terminal likely got stuck (command was ${command.length} bytes)`);
-		}
-
-		const actualContent = fs.readFileSync(outputFile, 'utf-8');
-		const actualLines = actualContent.trimEnd().split('\n');
-		deepStrictEqual(actualLines, expectedLines);
-	}
-
-	test('small multiline command (10 lines, ~700 bytes)', async function () {
-		this.timeout(15000);
-		await runMultilineTest(10);
-	});
-
-	test('medium multiline command (20 lines, ~1300 bytes)', async function () {
-		this.timeout(15000);
-		await runMultilineTest(20);
-	});
-
-	test.skip('large multiline command (500 lines, ~32KB)', async function () {
-		this.timeout(30000);
-		await runMultilineTest(500);
-	});
-});
diff --git a/src/vs/platform/theme/common/colorUtils.ts b/src/vs/platform/theme/common/colorUtils.ts
index f55c8aad640..6f725c9c924 100644
--- a/src/vs/platform/theme/common/colorUtils.ts
+++ b/src/vs/platform/theme/common/colorUtils.ts
@@ -126,6 +126,11 @@ export interface IColorRegistry {
 	 */
 	getColorReferenceSchema(): IJSONSchema;
 
+	/**
+	 * Update the default color of a color identifier.
+	 */
+	updateDefaultColor(id: string, defaults: ColorDefaults | ColorValue | null): void;
+
 	/**
 	 * Notify when the color theme or settings change.
 	 */
@@ -186,6 +191,13 @@ class ColorRegistry extends Disposable implements IColorRegistry {
 	}
 
 
+	public updateDefaultColor(id: string, defaults: ColorDefaults | ColorValue | null): void {
+		const existing = this.colorsById[id];
+		if (existing) {
+			this.colorsById[id] = { ...existing, defaults };
+		}
+	}
+
 	public deregisterColor(id: string): void {
 		delete this.colorsById[id];
 		delete this.colorSchema.properties[id];
diff --git a/src/vs/platform/theme/electron-main/themeMainService.ts b/src/vs/platform/theme/electron-main/themeMainService.ts
index 531fc6171e6..94c46d84185 100644
--- a/src/vs/platform/theme/electron-main/themeMainService.ts
+++ b/src/vs/platform/theme/electron-main/themeMainService.ts
@@ -23,4 +23,12 @@ export interface IThemeMainService {
 	getWindowSplash(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined): IPartsSplash | undefined;
 
 	getColorScheme(): IColorScheme;
+
+	/**
+	 * Whether OS color-scheme auto-detection is active.
+	 * Returns `true` when the `window.autoDetectColorScheme` setting is enabled,
+	 * or for fresh installs where no theme has been stored yet and the user
+	 * has not explicitly configured the setting (e.g. via settings sync).
+	 */
+	isAutoDetectColorScheme(): boolean;
 }
diff --git a/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts b/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts
index 25e5fe37f77..56c103875a6 100644
--- a/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts
+++ b/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts
@@ -113,7 +113,7 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 	}
 
 	private updateSystemColorTheme(): void {
-		if (isLinux || Setting.DETECT_COLOR_SCHEME.getValue(this.configurationService)) {
+		if (isLinux || this.isAutoDetectColorScheme()) {
 			electron.nativeTheme.themeSource = 'system'; // only with `system` we can detect the system color scheme
 		} else {
 			switch (Setting.SYSTEM_COLOR_THEME.getValue(this.configurationService)) {
@@ -174,13 +174,26 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 			return colorScheme.dark ? ThemeTypeSelector.HC_BLACK : ThemeTypeSelector.HC_LIGHT;
 		}
 
-		if (Setting.DETECT_COLOR_SCHEME.getValue(this.configurationService)) {
+		if (this.isAutoDetectColorScheme()) {
 			return colorScheme.dark ? ThemeTypeSelector.VS_DARK : ThemeTypeSelector.VS;
 		}
 
 		return undefined;
 	}
 
+	isAutoDetectColorScheme(): boolean {
+		if (Setting.DETECT_COLOR_SCHEME.getValue(this.configurationService)) {
+			return true;
+		}
+		// For new installs with no stored theme, auto-detect OS color scheme by default
+		// unless the user has explicitly configured the setting (e.g. via settings sync)
+		if (!this.stateService.getItem(THEME_STORAGE_KEY)) {
+			const { userValue } = this.configurationService.inspect<boolean>(Setting.DETECT_COLOR_SCHEME.key);
+			return userValue === undefined;
+		}
+		return false;
+	}
+
 	getBackgroundColor(): string {
 		const preferred = this.getPreferredBaseTheme();
 		const stored = this.getStoredBaseTheme();
diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts
index 76483ca546e..53e3a783872 100644
--- a/src/vs/platform/update/common/update.config.contribution.ts
+++ b/src/vs/platform/update/common/update.config.contribution.ts
@@ -7,6 +7,7 @@ import { isWeb, isWindows } from '../../../base/common/platform.js';
 import { PolicyCategory } from '../../../base/common/policy.js';
 import { localize } from '../../../nls.js';
 import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
+import product from '../../product/common/product.js';
 import { Registry } from '../../registry/common/platform.js';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -92,8 +93,8 @@ configurationRegistry.registerConfiguration({
 		},
 		'update.titleBar': {
 			type: 'string',
-			enum: ['none', 'actionable', 'detailed'],
-			default: 'none',
+			enum: ['none', 'actionable', 'detailed', 'always'],
+			default: product.quality !== 'stable' ? 'actionable' : 'none',
 			scope: ConfigurationScope.APPLICATION,
 			tags: ['experimental'],
 			experiment: { mode: 'startup' },
@@ -101,7 +102,8 @@ configurationRegistry.registerConfiguration({
 			enumDescriptions: [
 				localize('titleBarNone', "The title bar entry is never shown."),
 				localize('titleBarActionable', "The title bar entry is shown when an action is required (e.g., download, install, or restart)."),
-				localize('titleBarDetailed', "The title bar entry is shown for all update states including progress.")
+				localize('titleBarDetailed', "The title bar entry is shown for progress and actionable update states, but not for idle or disabled states."),
+				localize('titleBarAlways', "The title bar entry is shown for all update states.")
 			]
 		}
 	}
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index c207a036712..c46686f9905 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -16,8 +16,13 @@ import { ILifecycleMainService, LifecycleMainPhase } from '../../lifecycle/elect
 import { ILogService } from '../../log/common/log.js';
 import { IProductService } from '../../product/common/productService.js';
 import { IRequestService } from '../../request/common/request.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
 
+const LAST_KNOWN_VERSION_STORAGE_KEY = 'abstractUpdateService/lastKnownVersion';
+
 export interface IUpdateURLOptions {
 	readonly background?: boolean;
 	readonly internalOrg?: string;
@@ -94,6 +99,12 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		this._state = state;
 		this._onStateChange.fire(state);
 
+		// Clear transient one-time properties from Idle state after delivering the event.
+		// This prevents new windows from seeing stale error/notAvailable messages.
+		if (state.type === StateType.Idle && (state.error || state.notAvailable)) {
+			this._state = State.Idle(state.updateType);
+		}
+
 		// Schedule 5-minute checks when in Ready state and overwrite is supported
 		if (this.supportsUpdateOverwrite) {
 			if (state.type === StateType.Ready) {
@@ -111,6 +122,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		@IRequestService protected requestService: IRequestService,
 		@ILogService protected logService: ILogService,
 		@IProductService protected readonly productService: IProductService,
+		@ITelemetryService protected readonly telemetryService: ITelemetryService,
+		@IApplicationStorageMainService protected readonly applicationStorageMainService: IApplicationStorageMainService,
 		@IMeteredConnectionService protected readonly meteredConnectionService: IMeteredConnectionService,
 		protected readonly supportsUpdateOverwrite: boolean,
 	) {
@@ -129,6 +142,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 			return; // updates are never enabled when running out of sources
 		}
 
+		await this.trackVersionChange();
+
 		if (this.environmentMainService.disableUpdates) {
 			this.setState(State.Disabled(DisablementReason.DisabledByEnvironment));
 			this.logService.info('update#ctor - updates are disabled by the environment');
@@ -185,6 +200,77 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		}
 	}
 
+	private async trackVersionChange(): Promise<void> {
+		await this.applicationStorageMainService.whenReady;
+
+		interface ILastKnownVersion {
+			readonly version: string;
+			readonly commit: string | undefined;
+			readonly timestamp: number;
+		}
+
+		let from: ILastKnownVersion | undefined;
+		const raw = this.applicationStorageMainService.get(LAST_KNOWN_VERSION_STORAGE_KEY, StorageScope.APPLICATION);
+		if (typeof raw === 'string') {
+			try {
+				from = JSON.parse(raw);
+			} catch (error) {
+				// ignore
+			}
+		}
+
+		const to: ILastKnownVersion = {
+			version: this.productService.version,
+			commit: this.productService.commit,
+			timestamp: Date.now(),
+		};
+
+		if (from?.commit === to.commit) {
+			return;
+		}
+
+		this.applicationStorageMainService.store(LAST_KNOWN_VERSION_STORAGE_KEY, JSON.stringify(to), StorageScope.APPLICATION, StorageTarget.MACHINE);
+
+		if (!from) {
+			return;
+		}
+
+		type VersionChangeEvent = {
+			fromVersion: string | undefined;
+			fromCommit: string | undefined;
+			fromVersionTime: number | undefined;
+			toVersion: string;
+			toCommit: string | undefined;
+			timeToUpdateMs: number | undefined;
+			updateMode: string | undefined;
+			titleBarMode: string | undefined;
+		};
+
+		type VersionChangeClassification = {
+			owner: 'dmitriv';
+			comment: 'Fired when VS Code detects a version change on startup.';
+			fromVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The previous version of VS Code.' };
+			fromCommit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The commit hash of the previous version.' };
+			fromVersionTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Timestamp when the previous version was first detected.' };
+			toVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The current version of VS Code.' };
+			toCommit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The commit hash of the current version.' };
+			timeToUpdateMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Milliseconds between the previous version install and this version install.' };
+			updateMode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The update mode configured by the user.' };
+			titleBarMode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The title bar update indicator mode configured by the user.' };
+		};
+
+		this.telemetryService.publicLog2<VersionChangeEvent, VersionChangeClassification>('update:versionChanged', {
+			fromVersion: from.version,
+			fromCommit: from.commit,
+			fromVersionTime: from.timestamp,
+			toVersion: to.version,
+			toCommit: to.commit,
+			timeToUpdateMs: to.timestamp - from.timestamp,
+			updateMode: this.configurationService.getValue<string>('update.mode'),
+			titleBarMode: this.configurationService.getValue<string>('update.titleBar')
+		});
+	}
+
 	private getProductQuality(updateMode: string): string | undefined {
 		return updateMode === 'none' ? undefined : this.productService.quality;
 	}
@@ -334,7 +420,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		this.logService.trace('update#isLatestVersion() - checking update server', { url, headers });
 
 		try {
-			const context = await this.requestService.request({ url, headers }, token);
+			const context = await this.requestService.request({ url, headers, callSite: 'updateService.isLatestVersion' }, token);
 			const statusCode = context.res.statusCode;
 			this.logService.trace('update#isLatestVersion() - response', { statusCode });
 			// The update server replies with 204 (No Content) when no
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index a9e46ff937e..cbf603459c5 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -15,6 +15,7 @@ import { ILifecycleMainService, IRelaunchHandler, IRelaunchOptions } from '../..
 import { ILogService } from '../../log/common/log.js';
 import { IProductService } from '../../product/common/productService.js';
 import { asJson, IRequestService } from '../../request/common/request.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, IUpdate, State, StateType, UpdateType } from '../common/update.js';
 import { IMeteredConnectionService } from '../../meteredConnection/common/meteredConnection.js';
@@ -40,14 +41,15 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 	constructor(
 		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ITelemetryService telemetryService: ITelemetryService,
 		@IEnvironmentMainService environmentMainService: IEnvironmentMainService,
 		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService,
 		@IProductService productService: IProductService,
+		@IApplicationStorageMainService applicationStorageMainService: IApplicationStorageMainService,
 		@IMeteredConnectionService meteredConnectionService: IMeteredConnectionService,
 	) {
-		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService, meteredConnectionService, true);
+		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService, telemetryService, applicationStorageMainService, meteredConnectionService, true);
 
 		lifecycleMainService.setRelaunchHandler(this);
 	}
@@ -165,7 +167,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		this.logService.trace('update#checkForUpdateNoDownload - checking update server', { url, headers });
 
 		try {
-			const context = await this.requestService.request({ url, headers }, CancellationToken.None);
+			const context = await this.requestService.request({ url, headers, callSite: 'updateService.darwin.checkForUpdates' }, CancellationToken.None);
 			const statusCode = context.res.statusCode;
 			this.logService.trace('update#checkForUpdateNoDownload - response', { statusCode });
 
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index 4c6c0b76191..2be53f61322 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -12,6 +12,8 @@ import { IMeteredConnectionService } from '../../meteredConnection/common/metere
 import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
 import { IProductService } from '../../product/common/productService.js';
 import { asJson, IRequestService } from '../../request/common/request.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/update.js';
 import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions } from './abstractUpdateService.js';
 
@@ -25,9 +27,11 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		@ILogService logService: ILogService,
 		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
 		@IProductService productService: IProductService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IApplicationStorageMainService applicationStorageMainService: IApplicationStorageMainService,
 		@IMeteredConnectionService meteredConnectionService: IMeteredConnectionService,
 	) {
-		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService, meteredConnectionService, false);
+		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService, telemetryService, applicationStorageMainService, meteredConnectionService, false);
 	}
 
 	protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string {
@@ -44,7 +48,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		const url = this.buildUpdateFeedUrl(this.quality, this.productService.commit!, { background, internalOrg });
 		this.setState(State.CheckingForUpdates(explicit));
 
-		this.requestService.request({ url }, CancellationToken.None)
+		this.requestService.request({ url, callSite: 'updateService.linux.checkForUpdates' }, CancellationToken.None)
 			.then<IUpdate | null>(asJson)
 			.then(update => {
 				if (!update || !update.url || !update.version || !update.productVersion) {
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
index ae2df6ac89d..6b941c89854 100644
--- a/src/vs/platform/update/electron-main/updateService.snap.ts
+++ b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -31,6 +31,12 @@ abstract class AbstractUpdateService implements IUpdateService {
 		this.logService.info('update#setState', state.type);
 		this._state = state;
 		this._onStateChange.fire(state);
+
+		// Clear transient one-time properties from Idle state after delivering the event.
+		// This prevents new windows from seeing stale error/notAvailable messages.
+		if (state.type === StateType.Idle && (state.error || state.notAvailable)) {
+			this._state = State.Idle(state.updateType);
+		}
 	}
 
 	constructor(
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 905928b8d2e..b73f09450c5 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -30,6 +30,7 @@ import { IMeteredConnectionService } from '../../meteredConnection/common/metere
 import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
 import { IProductService } from '../../product/common/productService.js';
 import { asJson, IRequestService } from '../../request/common/request.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
 import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js';
@@ -69,16 +70,17 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 	constructor(
 		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ITelemetryService telemetryService: ITelemetryService,
 		@IEnvironmentMainService environmentMainService: IEnvironmentMainService,
 		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService,
 		@IFileService private readonly fileService: IFileService,
 		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
 		@IProductService productService: IProductService,
+		@IApplicationStorageMainService applicationStorageMainService: IApplicationStorageMainService,
 		@IMeteredConnectionService meteredConnectionService: IMeteredConnectionService,
 	) {
-		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService, meteredConnectionService, true);
+		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService, telemetryService, applicationStorageMainService, meteredConnectionService, true);
 
 		lifecycleMainService.setRelaunchHandler(this);
 	}
@@ -207,7 +209,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		}
 
 		const headers = getUpdateRequestHeaders(this.productService.version);
-		this.requestService.request({ url, headers }, CancellationToken.None)
+		this.requestService.request({ url, headers, callSite: 'updateService.win32.checkForUpdates' }, CancellationToken.None)
 			.then<IUpdate | null>(asJson)
 			.then(update => {
 				const updateType = getUpdateType();
@@ -256,7 +258,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 
 							const downloadPath = `${updatePackagePath}.tmp`;
 
-							return this.requestService.request({ url: update.url }, CancellationToken.None)
+							return this.requestService.request({ url: update.url, callSite: 'updateService.win32.downloadUpdate' }, CancellationToken.None)
 								.then(context => {
 									// Get total size from Content-Length header
 									const contentLengthHeader = context.res.headers['content-length'];
diff --git a/src/vs/platform/url/common/urlGlob.ts b/src/vs/platform/url/common/urlGlob.ts
index 9cfd6f530d2..9202ee672cd 100644
--- a/src/vs/platform/url/common/urlGlob.ts
+++ b/src/vs/platform/url/common/urlGlob.ts
@@ -131,7 +131,10 @@ function doUrlPartMatch(
 		if (!['/', ':'].includes(urlPart[urlOffset])) {
 			options.push(doUrlPartMatch(memo, includePortLogic, urlPart, globUrlPart, urlOffset + 1, globUrlOffset));
 		}
-		options.push(doUrlPartMatch(memo, includePortLogic, urlPart, globUrlPart, urlOffset, globUrlOffset + 2));
+		// Only skip *. if we're at the start (bare domain) or at a dot boundary
+		if (urlOffset === 0 || urlPart[urlOffset - 1] === '.') {
+			options.push(doUrlPartMatch(memo, includePortLogic, urlPart, globUrlPart, urlOffset, globUrlOffset + 2));
+		}
 	}
 
 	if (globUrlPart[globUrlOffset] === '*') {
diff --git a/src/vs/platform/url/electron-main/electronUrlListener.ts b/src/vs/platform/url/electron-main/electronUrlListener.ts
index 49c508e8450..fe9ce0b757d 100644
--- a/src/vs/platform/url/electron-main/electronUrlListener.ts
+++ b/src/vs/platform/url/electron-main/electronUrlListener.ts
@@ -7,7 +7,7 @@ import { app, Event as ElectronEvent } from 'electron';
 import { disposableTimeout } from '../../../base/common/async.js';
 import { Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { isWindows } from '../../../base/common/platform.js';
+import { INodeProcess, isWindows } from '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
 import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
 import { ILogService } from '../../log/common/log.js';
@@ -50,8 +50,9 @@ export class ElectronURLListener extends Disposable {
 
 		// Windows: install as protocol handler
 		// Skip in portable mode: the registered command wouldn't preserve
-		// portable mode settings, causing issues with OAuth flows
-		if (isWindows && !environmentMainService.isPortable) {
+		// portable mode settings, causing issues with OAuth flows.
+		// Skip for embedded apps: protocol handler is registered at install time.
+		if (isWindows && !environmentMainService.isPortable && !(process as INodeProcess).isEmbeddedApp) {
 			const windowsParameters = environmentMainService.isBuilt ? [] : [`"${environmentMainService.appRoot}"`];
 			windowsParameters.push('--open-url', '--');
 			app.setAsDefaultProtocolClient(productService.urlProtocol, process.execPath, windowsParameters);
diff --git a/src/vs/platform/url/test/common/urlGlob.test.ts b/src/vs/platform/url/test/common/urlGlob.test.ts
index 83534f62ad6..90fee896069 100644
--- a/src/vs/platform/url/test/common/urlGlob.test.ts
+++ b/src/vs/platform/url/test/common/urlGlob.test.ts
@@ -56,8 +56,29 @@ suite('urlGlob', () => {
 			assert.strictEqual(testUrlMatchesGlob('https://sub.example.com', 'https://*.example.com'), true);
 			assert.strictEqual(testUrlMatchesGlob('https://sub.domain.example.com', 'https://*.example.com'), true);
 			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://*.example.com'), true);
-			// *. matches any number of characters before the domain, including other domains
-			assert.strictEqual(testUrlMatchesGlob('https://notexample.com', 'https://*.example.com'), true);
+		});
+
+		test('subdomain wildcard must match on dot boundary', () => {
+			// Should NOT match: no dot boundary before the domain
+			assert.strictEqual(testUrlMatchesGlob('https://notexample.com', 'https://*.example.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://evil-microsoft.com', 'https://*.microsoft.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://evilmicrosoft.com', 'https://*.microsoft.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://evil-example.com', 'https://*.example.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://myexample.com', 'https://*.example.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://notexample.com/path', 'https://*.example.com/path'), false);
+
+			// Should match: proper subdomain with dot boundary
+			assert.strictEqual(testUrlMatchesGlob('https://sub.microsoft.com', 'https://*.microsoft.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://a.b.c.microsoft.com', 'https://*.microsoft.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://microsoft.com', 'https://*.microsoft.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://sub.example.com/path', 'https://*.example.com/path'), true);
+		});
+
+		test('subdomain wildcard without scheme must match on dot boundary', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://evil-microsoft.com', '*.microsoft.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('http://evil-microsoft.com', '*.microsoft.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://sub.microsoft.com', '*.microsoft.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('http://sub.microsoft.com', '*.microsoft.com'), true);
 		});
 
 		test('port matching', () => {
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
index e5642bc2b8c..cda7b80d8bc 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -258,7 +258,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		headers = { ...headers };
 		headers['Content-Type'] = 'application/json';
 
-		const context = await this.request(url, { type: 'GET', headers }, [], CancellationToken.None);
+		const context = await this.request(url, { type: 'GET', headers, callSite: 'userDataSync.getAllCollections' }, [], CancellationToken.None);
 
 		return (await asJson<{ id: string }[]>(context))?.map(({ id }) => id) || [];
 	}
@@ -272,7 +272,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		headers = { ...headers };
 		headers['Content-Type'] = Mimes.text;
 
-		const context = await this.request(url, { type: 'POST', headers }, [], CancellationToken.None);
+		const context = await this.request(url, { type: 'POST', headers, callSite: 'userDataSync.createCollection' }, [], CancellationToken.None);
 		const collectionId = await asTextOrError(context);
 		if (!collectionId) {
 			throw new UserDataSyncStoreError('Server did not return the collection id', url, UserDataSyncErrorCode.NoCollection, context.res.statusCode, context.res.headers[HEADER_OPERATION_ID]);
@@ -288,7 +288,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		const url = collection ? joinPath(this.userDataSyncStoreUrl, 'collection', collection).toString() : joinPath(this.userDataSyncStoreUrl, 'collection').toString();
 		headers = { ...headers };
 
-		await this.request(url, { type: 'DELETE', headers }, [], CancellationToken.None);
+		await this.request(url, { type: 'DELETE', headers, callSite: 'userDataSync.deleteCollection' }, [], CancellationToken.None);
 	}
 
 	// #endregion
@@ -303,7 +303,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		const uri = this.getResourceUrl(this.userDataSyncStoreUrl, collection, resource);
 		const headers: IHeaders = {};
 
-		const context = await this.request(uri.toString(), { type: 'GET', headers }, [], CancellationToken.None);
+		const context = await this.request(uri.toString(), { type: 'GET', headers, callSite: 'userDataSync.getAllResourceRefs' }, [], CancellationToken.None);
 
 		const result = await asJson<{ url: string; created: number }[]>(context) || [];
 		return result.map(({ url, created }) => ({ ref: relativePath(uri, uri.with({ path: url }))!, created: created * 1000 /* Server returns in seconds */ }));
@@ -318,7 +318,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		headers = { ...headers };
 		headers['Cache-Control'] = 'no-cache';
 
-		const context = await this.request(url, { type: 'GET', headers }, [], CancellationToken.None);
+		const context = await this.request(url, { type: 'GET', headers, callSite: 'userDataSync.resolveResourceContent' }, [], CancellationToken.None);
 		const content = await asTextOrError(context);
 		return content;
 	}
@@ -331,7 +331,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		const url = ref !== null ? joinPath(this.getResourceUrl(this.userDataSyncStoreUrl, collection, resource), ref).toString() : this.getResourceUrl(this.userDataSyncStoreUrl, collection, resource).toString();
 		const headers: IHeaders = {};
 
-		await this.request(url, { type: 'DELETE', headers }, [], CancellationToken.None);
+		await this.request(url, { type: 'DELETE', headers, callSite: 'userDataSync.deleteResource' }, [], CancellationToken.None);
 	}
 
 	async deleteResources(): Promise<void> {
@@ -342,7 +342,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		const url = joinPath(this.userDataSyncStoreUrl, 'resource').toString();
 		const headers: IHeaders = { 'Content-Type': Mimes.text };
 
-		await this.request(url, { type: 'DELETE', headers }, [], CancellationToken.None);
+		await this.request(url, { type: 'DELETE', headers, callSite: 'userDataSync.deleteResources' }, [], CancellationToken.None);
 	}
 
 	async readResource(resource: ServerResource, oldValue: IUserData | null, collection?: string, headers: IHeaders = {}): Promise<IUserData> {
@@ -358,7 +358,7 @@ export class UserDataSyncStoreClient extends Disposable {
 			headers['If-None-Match'] = oldValue.ref;
 		}
 
-		const context = await this.request(url, { type: 'GET', headers }, [304], CancellationToken.None);
+		const context = await this.request(url, { type: 'GET', headers, callSite: 'userDataSync.readResource' }, [304], CancellationToken.None);
 
 		let userData: IUserData | null = null;
 		if (context.res.statusCode === 304) {
@@ -394,7 +394,7 @@ export class UserDataSyncStoreClient extends Disposable {
 			headers['If-Match'] = ref;
 		}
 
-		const context = await this.request(url, { type: 'POST', data, headers }, [], CancellationToken.None);
+		const context = await this.request(url, { type: 'POST', data, headers, callSite: 'userDataSync.writeResource' }, [], CancellationToken.None);
 
 		const newRef = context.res.headers['etag'];
 		if (!newRef) {
@@ -417,7 +417,7 @@ export class UserDataSyncStoreClient extends Disposable {
 			headers['If-None-Match'] = oldValue.ref;
 		}
 
-		const context = await this.request(url, { type: 'GET', headers }, [304], CancellationToken.None);
+		const context = await this.request(url, { type: 'GET', headers, callSite: 'userDataSync.manifest' }, [304], CancellationToken.None);
 
 		let manifest: IUserDataManifest | null = null;
 		if (context.res.statusCode === 304) {
@@ -481,7 +481,7 @@ export class UserDataSyncStoreClient extends Disposable {
 
 		headers = { ...headers };
 		headers['Content-Type'] = 'application/json';
-		const context = await this.request(url, { type: 'GET', headers }, [], CancellationToken.None);
+		const context = await this.request(url, { type: 'GET', headers, callSite: 'userDataSync.getLatestData' }, [], CancellationToken.None);
 
 		if (!isSuccess(context)) {
 			throw new UserDataSyncStoreError('Server returned ' + context.res.statusCode, url, UserDataSyncErrorCode.EmptyResponse, context.res.statusCode, context.res.headers[HEADER_OPERATION_ID]);
@@ -530,7 +530,7 @@ export class UserDataSyncStoreClient extends Disposable {
 		const url = joinPath(this.userDataSyncStoreUrl, 'download').toString();
 		const headers: IHeaders = {};
 
-		const context = await this.request(url, { type: 'GET', headers }, [], CancellationToken.None);
+		const context = await this.request(url, { type: 'GET', headers, callSite: 'userDataSync.getActivityData' }, [], CancellationToken.None);
 
 		if (!isSuccess(context)) {
 			throw new UserDataSyncStoreError('Server returned ' + context.res.statusCode, url, UserDataSyncErrorCode.EmptyResponse, context.res.statusCode, context.res.headers[HEADER_OPERATION_ID]);
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
index e53e7777416..058eab04cfb 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -6,7 +6,7 @@
 import { bufferToStream, VSBuffer } from '../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IStringDictionary } from '../../../../base/common/collections.js';
-import { Emitter } from '../../../../base/common/event.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
 import { FormattingOptions } from '../../../../base/common/jsonFormatter.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
@@ -26,7 +26,7 @@ import { TestInstantiationService } from '../../../instantiation/test/common/ins
 import { ILogService, NullLogService } from '../../../log/common/log.js';
 import product from '../../../product/common/product.js';
 import { IProductService } from '../../../product/common/productService.js';
-import { AuthInfo, Credentials, IRequestService } from '../../../request/common/request.js';
+import { AuthInfo, Credentials, IRequestCompleteEvent, IRequestService } from '../../../request/common/request.js';
 import { InMemoryStorageService, IStorageService } from '../../../storage/common/storage.js';
 import { ITelemetryService } from '../../../telemetry/common/telemetry.js';
 import { NullTelemetryService } from '../../../telemetry/common/telemetryUtils.js';
@@ -181,6 +181,8 @@ export class UserDataSyncTestServer implements IRequestService {
 
 	_serviceBrand: undefined;
 
+	readonly onDidCompleteRequest = Event.None as Event<IRequestCompleteEvent>;
+
 	readonly url: string = 'http://host:3000';
 	private session: string | null = null;
 	private readonly collections = new Map<string, Map<ServerResource, IUserData>>();
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
index 4f720f7d231..847a3847089 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
@@ -13,7 +13,7 @@ import { runWithFakedTimers } from '../../../../base/test/common/timeTravelSched
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { NullLogService } from '../../../log/common/log.js';
 import { IProductService } from '../../../product/common/productService.js';
-import { IRequestService } from '../../../request/common/request.js';
+import { IRequestCompleteEvent, IRequestService } from '../../../request/common/request.js';
 import { IUserDataSyncStoreService, SyncResource, UserDataSyncErrorCode, UserDataSyncStoreError } from '../../common/userDataSync.js';
 import { RequestsSession, UserDataSyncStoreService } from '../../common/userDataSyncStoreService.js';
 import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
@@ -412,6 +412,7 @@ suite('UserDataSyncRequestsSession', () => {
 
 	const requestService: IRequestService = {
 		_serviceBrand: undefined,
+		onDidCompleteRequest: Event.None as Event<IRequestCompleteEvent>,
 		async request() { return { res: { headers: {} }, stream: newWriteableBufferStream() }; },
 		async resolveProxy() { return undefined; },
 		async lookupAuthorization() { return undefined; },
@@ -424,10 +425,10 @@ suite('UserDataSyncRequestsSession', () => {
 
 	test('too many requests are thrown when limit exceeded', async () => {
 		const testObject = new RequestsSession(1, 500, requestService, new NullLogService());
-		await testObject.request('url', {}, CancellationToken.None);
+		await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 
 		try {
-			await testObject.request('url', {}, CancellationToken.None);
+			await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 		} catch (error) {
 			assert.ok(error instanceof UserDataSyncStoreError);
 			assert.strictEqual((<UserDataSyncStoreError>error).code, UserDataSyncErrorCode.LocalTooManyRequests);
@@ -438,19 +439,19 @@ suite('UserDataSyncRequestsSession', () => {
 
 	test('requests are handled after session is expired', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
 		const testObject = new RequestsSession(1, 100, requestService, new NullLogService());
-		await testObject.request('url', {}, CancellationToken.None);
+		await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 		await timeout(125);
-		await testObject.request('url', {}, CancellationToken.None);
+		await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 	}));
 
 	test('too many requests are thrown after session is expired', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
 		const testObject = new RequestsSession(1, 100, requestService, new NullLogService());
-		await testObject.request('url', {}, CancellationToken.None);
+		await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 		await timeout(125);
-		await testObject.request('url', {}, CancellationToken.None);
+		await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 
 		try {
-			await testObject.request('url', {}, CancellationToken.None);
+			await testObject.request('url', { callSite: 'test' }, CancellationToken.None);
 		} catch (error) {
 			assert.ok(error instanceof UserDataSyncStoreError);
 			assert.strictEqual((<UserDataSyncStoreError>error).code, UserDataSyncErrorCode.LocalTooManyRequests);
diff --git a/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts b/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts
index ae70e341c0c..f5d2edb2796 100644
--- a/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts
+++ b/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts
@@ -31,7 +31,7 @@ export class SharedWebContentExtractorService implements ISharedWebContentExtrac
 			const content = VSBuffer.wrap(await (response as unknown as { bytes: () => Promise<Uint8Array<ArrayBuffer>> } /* workaround https://github.com/microsoft/TypeScript/issues/61826 */).bytes());
 			return content;
 		} catch (err) {
-			console.log(err);
+			console.error(err);
 			return undefined;
 		}
 	}
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 9771a607efe..ec4b29a101b 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -1561,7 +1561,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			os: { release: release(), hostname: hostname(), arch: arch() },
 
 			autoDetectHighContrast: windowConfig?.autoDetectHighContrast ?? true,
-			autoDetectColorScheme: windowConfig?.autoDetectColorScheme ?? false,
+			autoDetectColorScheme: windowConfig?.autoDetectColorScheme ?? this.themeMainService.isAutoDetectColorScheme(),
 			accessibilitySupport: app.accessibilitySupportEnabled,
 			colorScheme: this.themeMainService.getColorScheme(),
 			policiesData: this.policyService.serialize(),
diff --git a/src/vs/server/node/remoteAgentEnvironmentImpl.ts b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
index 6505a5aa7d8..640c74695a5 100644
--- a/src/vs/server/node/remoteAgentEnvironmentImpl.ts
+++ b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
@@ -112,6 +112,7 @@ export class RemoteAgentEnvironmentChannel implements IServerChannel {
 			pid: process.pid,
 			connectionToken: (this._connectionToken.type !== ServerConnectionTokenType.None ? this._connectionToken.value : ''),
 			appRoot: URI.file(this._environmentService.appRoot),
+			execPath: process.execPath,
 			tmpDir: this._environmentService.tmpDir,
 			settingsPath: this._environmentService.machineSettingsResource,
 			mcpResource: this._environmentService.mcpResource,
diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index da7e417cd5c..5c4f3c2a1d2 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -13,7 +13,7 @@ import { VSBuffer } from '../../base/common/buffer.js';
 import { CharCode } from '../../base/common/charCode.js';
 import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from '../../base/common/errors.js';
 import { isEqualOrParent } from '../../base/common/extpath.js';
-import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../base/common/lifecycle.js';
 import { connectionTokenQueryName, FileAccess, getServerProductSegment, Schemas } from '../../base/common/network.js';
 import { dirname, join } from '../../base/common/path.js';
 import * as perf from '../../base/common/performance.js';
@@ -37,12 +37,11 @@ import { ExtensionHostConnection } from './extensionHostConnection.js';
 import { ManagementConnection } from './remoteExtensionManagement.js';
 import { determineServerConnectionToken, requestHasValidConnectionToken as httpRequestHasValidConnectionToken, ServerConnectionToken, ServerConnectionTokenParseError, ServerConnectionTokenType } from './serverConnectionToken.js';
 import { IServerEnvironmentService, ServerParsedArgs } from './serverEnvironmentService.js';
+import { IServerLifetimeService } from './serverLifetimeService.js';
 import { setupServerServices, SocketServer } from './serverServices.js';
 import { CacheControl, serveError, serveFile, WebClientServer } from './webClientServer.js';
 const require = createRequire(import.meta.url);
 
-const SHUTDOWN_TIMEOUT = 5 * 60 * 1000;
-
 declare namespace vsda {
 	// the signer is a native module that for historical reasons uses a lower case class name
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -62,6 +61,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 	private readonly _extHostConnections: { [reconnectionToken: string]: ExtensionHostConnection };
 	private readonly _managementConnections: { [reconnectionToken: string]: ManagementConnection };
 	private readonly _allReconnectionTokens: Set<string>;
+	private readonly _extHostLifetimeTokens = this._register(new DisposableMap<string>());
 	private readonly _webClientServer: WebClientServer | null;
 	private readonly _webEndpointOriginChecker: WebEndpointOriginChecker;
 	private readonly _reconnectionGraceTime: number;
@@ -69,8 +69,6 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 	private readonly _serverBasePath: string | undefined;
 	private readonly _serverProductPath: string;
 
-	private shutdownTimer: Timeout | undefined;
-
 	constructor(
 		private readonly _socketServer: SocketServer<RemoteAgentConnectionContext>,
 		private readonly _connectionToken: ServerConnectionToken,
@@ -81,6 +79,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 		@IProductService private readonly _productService: IProductService,
 		@ILogService private readonly _logService: ILogService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IServerLifetimeService private readonly _serverLifetimeService: IServerLifetimeService,
 	) {
 		super();
 		this._webEndpointOriginChecker = WebEndpointOriginChecker.create(this._productService);
@@ -101,8 +100,6 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 		);
 		this._logService.info(`Extension host agent started.`);
 		this._reconnectionGraceTime = this._environmentService.reconnectionGraceTime;
-
-		this._waitThenShutdown(true);
 	}
 
 	public async handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
@@ -139,7 +136,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 
 		// Delay shutdown
 		if (pathname === '/delay-shutdown') {
-			this._delayShutdown();
+			this._serverLifetimeService.delay();
 			res.writeHead(200);
 			return void res.end('OK');
 		}
@@ -478,10 +475,11 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 				const con = this._instantiationService.createInstance(ExtensionHostConnection, reconnectionToken, remoteAddress, socket, dataChunk);
 				this._extHostConnections[reconnectionToken] = con;
 				this._allReconnectionTokens.add(reconnectionToken);
+				this._extHostLifetimeTokens.set(reconnectionToken, this._serverLifetimeService.active(`ExtensionHost:${reconnectionToken.substring(0, 8)}`));
 				con.onClose(() => {
 					con.dispose();
 					delete this._extHostConnections[reconnectionToken];
-					this._onDidCloseExtHostConnection();
+					this._extHostLifetimeTokens.deleteAndDispose(reconnectionToken);
 				});
 				con.start(startParams);
 			}
@@ -555,72 +553,6 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 		startParams.break = undefined;
 		return Promise.resolve(startParams);
 	}
-
-	private async _onDidCloseExtHostConnection(): Promise<void> {
-		if (!this._environmentService.args['enable-remote-auto-shutdown']) {
-			return;
-		}
-
-		this._cancelShutdown();
-
-		const hasActiveExtHosts = !!Object.keys(this._extHostConnections).length;
-		if (!hasActiveExtHosts) {
-			console.log('Last EH closed, waiting before shutting down');
-			this._logService.info('Last EH closed, waiting before shutting down');
-			this._waitThenShutdown();
-		}
-	}
-
-	private _waitThenShutdown(initial = false): void {
-		if (!this._environmentService.args['enable-remote-auto-shutdown']) {
-			return;
-		}
-
-		if (this._environmentService.args['remote-auto-shutdown-without-delay'] && !initial) {
-			this._shutdown();
-		} else {
-			this.shutdownTimer = setTimeout(() => {
-				this.shutdownTimer = undefined;
-
-				this._shutdown();
-			}, SHUTDOWN_TIMEOUT);
-		}
-	}
-
-	private _shutdown(): void {
-		const hasActiveExtHosts = !!Object.keys(this._extHostConnections).length;
-		if (hasActiveExtHosts) {
-			console.log('New EH opened, aborting shutdown');
-			this._logService.info('New EH opened, aborting shutdown');
-			return;
-		} else {
-			console.log('Last EH closed, shutting down');
-			this._logService.info('Last EH closed, shutting down');
-			this.dispose();
-			process.exit(0);
-		}
-	}
-
-	/**
-	 * If the server is in a shutdown timeout, cancel it and start over
-	 */
-	private _delayShutdown(): void {
-		if (this.shutdownTimer) {
-			console.log('Got delay-shutdown request while in shutdown timeout, delaying');
-			this._logService.info('Got delay-shutdown request while in shutdown timeout, delaying');
-			this._cancelShutdown();
-			this._waitThenShutdown();
-		}
-	}
-
-	private _cancelShutdown(): void {
-		if (this.shutdownTimer) {
-			console.log('Cancelling previous shutdown timeout');
-			this._logService.info('Cancelling previous shutdown timeout');
-			clearTimeout(this.shutdownTimer);
-			this.shutdownTimer = undefined;
-		}
-	}
 }
 
 export interface IServerAPI {
@@ -834,6 +766,7 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 		output += `\n`;
 		console.log(output);
 	}
+
 	return remoteExtensionHostAgentServer;
 }
 
diff --git a/src/vs/server/node/serverAgentHostManager.ts b/src/vs/server/node/serverAgentHostManager.ts
new file mode 100644
index 00000000000..dff86352208
--- /dev/null
+++ b/src/vs/server/node/serverAgentHostManager.ts
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../base/common/event.js';
+import { Disposable, MutableDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { ProxyChannel } from '../../base/parts/ipc/common/ipc.js';
+import { IAgentHostConnection, IAgentHostStarter } from '../../platform/agentHost/common/agent.js';
+import { AgentHostIpcChannels, IAgentService } from '../../platform/agentHost/common/agentService.js';
+import { createDecorator } from '../../platform/instantiation/common/instantiation.js';
+import { ILogService, ILoggerService } from '../../platform/log/common/log.js';
+import { RemoteLoggerChannelClient } from '../../platform/log/common/logIpc.js';
+import { IServerLifetimeService } from './serverLifetimeService.js';
+
+export const IServerAgentHostManager = createDecorator<IServerAgentHostManager>('serverAgentHostManager');
+
+/**
+ * Server-specific agent host manager. Eagerly starts the agent host process,
+ * handles crash recovery, and tracks both active agent sessions and connected
+ * WebSocket clients via {@link IServerLifetimeService} to keep the server
+ * alive while either signal is active.
+ *
+ * The lifetime token is held when active sessions > 0 OR connected clients > 0.
+ * It is released only when both are zero.
+ */
+export interface IServerAgentHostManager {
+	readonly _serviceBrand: undefined;
+}
+
+/**
+ * Proxy interface for the connection tracker IPC channel exposed by the agent
+ * host process. This is NOT part of the agent host protocol -- it is a
+ * server-only process-management concern.
+ */
+interface IConnectionTrackerService {
+	readonly onDidChangeConnectionCount: Event<number>;
+}
+
+enum Constants {
+	MaxRestarts = 5,
+}
+
+export class ServerAgentHostManager extends Disposable implements IServerAgentHostManager {
+	declare readonly _serviceBrand: undefined;
+
+	private _restartCount = 0;
+
+	/** Lifetime token held while sessions are active or clients are connected. */
+	private readonly _lifetimeToken = this._register(new MutableDisposable());
+
+	private _hasActiveSessions = false;
+	private _connectionCount = 0;
+
+	constructor(
+		private readonly _starter: IAgentHostStarter,
+		@ILogService private readonly _logService: ILogService,
+		@ILoggerService private readonly _loggerService: ILoggerService,
+		@IServerLifetimeService private readonly _serverLifetimeService: IServerLifetimeService,
+	) {
+		super();
+		this._register(this._starter);
+		this._start();
+	}
+
+	private _start(): void {
+		const connection = this._starter.start();
+
+		this._logService.info('ServerAgentHostManager: agent host started');
+
+		// Connect logger channel so agent host logs appear in the output channel
+		connection.store.add(new RemoteLoggerChannelClient(this._loggerService, connection.client.getChannel(AgentHostIpcChannels.Logger)));
+
+		this._trackActiveSessions(connection);
+		this._trackClientConnections(connection);
+
+		// Handle unexpected exit
+		connection.store.add(connection.onDidProcessExit(e => {
+			if (!this._store.isDisposed) {
+				// Both signals are gone when the process exits
+				this._hasActiveSessions = false;
+				this._connectionCount = 0;
+				this._lifetimeToken.clear();
+
+				if (this._restartCount <= Constants.MaxRestarts) {
+					this._logService.error(`ServerAgentHostManager: agent host terminated unexpectedly with code ${e.code}`);
+					this._restartCount++;
+					connection.store.dispose();
+					this._start();
+				} else {
+					this._logService.error(`ServerAgentHostManager: agent host terminated with code ${e.code}, giving up after ${Constants.MaxRestarts} restarts`);
+				}
+			}
+		}));
+
+		this._register(toDisposable(() => connection.store.dispose()));
+	}
+
+	private _trackActiveSessions(connection: IAgentHostConnection): void {
+		const agentService = ProxyChannel.toService<IAgentService>(connection.client.getChannel(AgentHostIpcChannels.AgentHost));
+		connection.store.add(agentService.onDidAction(envelope => {
+			if (envelope.action.type === 'root/activeSessionsChanged') {
+				this._hasActiveSessions = envelope.action.activeSessions > 0;
+				this._updateLifetimeToken();
+			}
+		}));
+	}
+
+	private _trackClientConnections(connection: IAgentHostConnection): void {
+		const connectionTracker = ProxyChannel.toService<IConnectionTrackerService>(connection.client.getChannel(AgentHostIpcChannels.ConnectionTracker));
+		connection.store.add(connectionTracker.onDidChangeConnectionCount(count => {
+			this._connectionCount = count;
+			this._updateLifetimeToken();
+		}));
+	}
+
+	private _updateLifetimeToken(): void {
+		if (this._hasActiveSessions || this._connectionCount > 0) {
+			this._lifetimeToken.value ??= this._serverLifetimeService.active('AgentHost');
+		} else {
+			this._lifetimeToken.clear();
+		}
+	}
+}
diff --git a/src/vs/server/node/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts
index ef423dc80fb..bacdd289d31 100644
--- a/src/vs/server/node/serverEnvironmentService.ts
+++ b/src/vs/server/node/serverEnvironmentService.ts
@@ -85,6 +85,9 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 	'remote-auto-shutdown-without-delay': { type: 'boolean' },
 	'inspect-ptyhost': { type: 'string', allowEmptyValue: true },
 
+	'agent-host-port': { type: 'string', cat: 'o', args: 'port', description: nls.localize('agent-host-port', "The port the agent host WebSocket server should listen on.") },
+	'agent-host-path': { type: 'string', cat: 'o', args: 'path', description: nls.localize('agent-host-path', "The path to a socket file for the agent host WebSocket server to listen on.") },
+
 	'use-host-proxy': { type: 'boolean' },
 	'without-browser-env-var': { type: 'boolean' },
 	'reconnection-grace-time': { type: 'string', cat: 'o', args: 'seconds', description: nls.localize('reconnection-grace-time', "Override the reconnection grace time window in seconds. Defaults to 10800 (3 hours).") },
@@ -215,6 +218,9 @@ export interface ServerParsedArgs {
 	'remote-auto-shutdown-without-delay'?: boolean;
 	'inspect-ptyhost'?: string;
 
+	'agent-host-port'?: string;
+	'agent-host-path'?: string;
+
 	'use-host-proxy'?: boolean;
 	'without-browser-env-var'?: boolean;
 	'reconnection-grace-time'?: string;
diff --git a/src/vs/server/node/serverLifetimeService.ts b/src/vs/server/node/serverLifetimeService.ts
new file mode 100644
index 00000000000..397c3eed307
--- /dev/null
+++ b/src/vs/server/node/serverLifetimeService.ts
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
+import { createDecorator } from '../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../platform/log/common/log.js';
+
+export const IServerLifetimeService = createDecorator<IServerLifetimeService>('serverLifetimeService');
+
+export const SHUTDOWN_TIMEOUT = 5 * 60 * 1000;
+
+/** Options controlling the auto-shutdown behaviour. */
+export interface IServerLifetimeOptions {
+	/** When `false` (default), the server never auto-shuts down. */
+	readonly enableAutoShutdown?: boolean;
+	/** When `true`, skip the 5-minute grace period on non-initial shutdowns. */
+	readonly shutdownWithoutDelay?: boolean;
+}
+
+/**
+ * Tracks active consumers (extension hosts, agent sessions, etc.) that keep
+ * the server alive. When auto-shutdown is enabled, the service manages a
+ * shutdown timer and fires {@link onDidShutdownRequested} when it is time for
+ * the process to exit.
+ */
+export interface IServerLifetimeService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Marks a consumer as active. The server will not auto-shutdown until the
+	 * returned {@link IDisposable} is disposed.
+	 */
+	active(consumer: string): IDisposable;
+
+	/**
+	 * Delays the auto-shutdown timer. If the server is currently in a shutdown
+	 * timeout (all consumers inactive), the timer is reset.
+	 */
+	delay(): void;
+
+	/** Whether any consumer is currently active. */
+	readonly hasActiveConsumers: boolean;
+}
+
+export class ServerLifetimeService extends Disposable implements IServerLifetimeService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _consumers = new Map<string, number>();
+	private _totalCount = 0;
+	private _shutdownTimer: ReturnType<typeof setTimeout> | undefined;
+
+	constructor(
+		private readonly _options: IServerLifetimeOptions,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		if (this._options.enableAutoShutdown) {
+			// Start initial shutdown timer (no clients connected yet)
+			this._scheduleShutdown(true);
+		}
+	}
+
+	get hasActiveConsumers(): boolean {
+		return this._totalCount > 0;
+	}
+
+	active(consumer: string): IDisposable {
+		const wasEmpty = this._totalCount === 0;
+		const current = this._consumers.get(consumer) ?? 0;
+		this._consumers.set(consumer, current + 1);
+		this._totalCount++;
+
+		this._logService.debug(`ServerLifetime: consumer '${consumer}' active (total: ${this._totalCount})`);
+
+		if (wasEmpty) {
+			this._cancelShutdown();
+		}
+
+		let disposed = false;
+		return toDisposable(() => {
+			if (disposed) {
+				return;
+			}
+			disposed = true;
+
+			const count = this._consumers.get(consumer);
+			if (count !== undefined) {
+				if (count <= 1) {
+					this._consumers.delete(consumer);
+				} else {
+					this._consumers.set(consumer, count - 1);
+				}
+			}
+			this._totalCount--;
+
+			this._logService.debug(`ServerLifetime: consumer '${consumer}' inactive (total: ${this._totalCount})`);
+
+			if (this._totalCount === 0 && this._options.enableAutoShutdown) {
+				this._scheduleShutdown(false);
+			}
+		});
+	}
+
+	delay(): void {
+		if (this._shutdownTimer) {
+			this._logService.debug('ServerLifetime: delay requested, resetting shutdown timer');
+			this._cancelShutdown();
+			this._scheduleShutdown(false);
+		}
+	}
+
+	private _scheduleShutdown(initial: boolean): void {
+		if (this._options.shutdownWithoutDelay && !initial) {
+			this._tryShutdown();
+		} else {
+			this._logService.debug('ServerLifetime: scheduling shutdown timer');
+			this._shutdownTimer = setTimeout(() => {
+				this._shutdownTimer = undefined;
+				this._tryShutdown();
+			}, SHUTDOWN_TIMEOUT);
+		}
+	}
+
+	private _tryShutdown(): void {
+		if (this._totalCount > 0) {
+			this._logService.debug('ServerLifetime: consumer became active, aborting shutdown');
+			return;
+		}
+		console.log('All consumers inactive, shutting down');
+		this._logService.info('ServerLifetime: all consumers inactive, shutting down');
+		this.dispose();
+		process.exit(0);
+	}
+
+	private _cancelShutdown(): void {
+		if (this._shutdownTimer) {
+			this._logService.debug('ServerLifetime: cancelling shutdown timer');
+			clearTimeout(this._shutdownTimer);
+			this._shutdownTimer = undefined;
+		}
+	}
+}
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index d37663dfefb..c562b017550 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -56,7 +56,7 @@ import { ServerTelemetryChannel } from '../../platform/telemetry/common/remoteTe
 import { IServerTelemetryService, ServerNullTelemetryService, ServerTelemetryService } from '../../platform/telemetry/common/serverTelemetryService.js';
 import { RemoteTerminalChannel } from './remoteTerminalChannel.js';
 import { createURITransformer } from '../../base/common/uriTransformer.js';
-import { ServerConnectionToken } from './serverConnectionToken.js';
+import { ServerConnectionToken, ServerConnectionTokenType } from './serverConnectionToken.js';
 import { ServerEnvironmentService, ServerParsedArgs } from './serverEnvironmentService.js';
 import { REMOTE_TERMINAL_CHANNEL_NAME } from '../../workbench/contrib/terminal/common/remote/remoteTerminalChannel.js';
 import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from '../../workbench/services/remote/common/remoteFileSystemProviderClient.js';
@@ -77,6 +77,9 @@ import { RemoteExtensionsScannerChannel, RemoteExtensionsScannerService } from '
 import { RemoteExtensionsScannerChannelName } from '../../platform/remote/common/remoteExtensionsScanner.js';
 import { RemoteUserDataProfilesServiceChannel } from '../../platform/userDataProfile/common/userDataProfileIpc.js';
 import { NodePtyHostStarter } from '../../platform/terminal/node/nodePtyHostStarter.js';
+import { NodeAgentHostStarter } from '../../platform/agentHost/node/nodeAgentHostStarter.js';
+import { ServerAgentHostManager } from './serverAgentHostManager.js';
+import { IServerLifetimeService, ServerLifetimeService } from './serverLifetimeService.js';
 import { CSSDevelopmentService, ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 import { AllowedExtensionsService } from '../../platform/extensionManagement/common/allowedExtensionsService.js';
 import { TelemetryLogAppender } from '../../platform/telemetry/common/telemetryLogAppender.js';
@@ -228,6 +231,23 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	const ptyHostService = instantiationService.createInstance(PtyHostService, ptyHostStarter);
 	services.set(IPtyService, ptyHostService);
 
+	const serverLifetimeService = instantiationService.createInstance(ServerLifetimeService, {
+		enableAutoShutdown: !!args['enable-remote-auto-shutdown'],
+		shutdownWithoutDelay: !!args['remote-auto-shutdown-without-delay'],
+	});
+	services.set(IServerLifetimeService, serverLifetimeService);
+
+	if (args['agent-host-port'] || args['agent-host-path']) {
+		const agentHostStarter = instantiationService.createInstance(NodeAgentHostStarter);
+		agentHostStarter.setWebSocketConfig({
+			port: args['agent-host-port'],
+			socketPath: args['agent-host-path'],
+			host: args.host || 'localhost',
+			connectionToken: connectionToken.type === ServerConnectionTokenType.Mandatory ? connectionToken.value : undefined,
+		});
+		disposables.add(instantiationService.createInstance(ServerAgentHostManager, agentHostStarter));
+	}
+
 	services.set(IAllowedMcpServersService, new SyncDescriptor(AllowedMcpServersService));
 	services.set(IMcpResourceScannerService, new SyncDescriptor(McpResourceScannerService));
 	services.set(IMcpGalleryService, new SyncDescriptor(McpGalleryService));
diff --git a/src/vs/server/node/webClientServer.ts b/src/vs/server/node/webClientServer.ts
index 7881ad0393d..c920340ed13 100644
--- a/src/vs/server/node/webClientServer.ts
+++ b/src/vs/server/node/webClientServer.ts
@@ -73,10 +73,29 @@ export async function serveFile(filePath: string, cacheControl: CacheControl, lo
 
 		responseHeaders['Content-Type'] = textMimeType[extname(filePath)] || getMediaMime(filePath) || 'text/plain';
 
-		res.writeHead(200, responseHeaders);
-
-		// Data
-		createReadStream(filePath).pipe(res);
+		// Create the stream first and wait for it to open before sending
+		// headers so that errors (e.g. ENOENT race) can still produce a
+		// proper 404 response instead of aborting a half-sent 200.
+		const fileStream = createReadStream(filePath);
+		await new Promise<void>((resolve, reject) => {
+			fileStream.on('error', reject);
+			fileStream.on('open', () => {
+				// File opened successfully - send headers and pipe
+				res.writeHead(200, responseHeaders);
+				fileStream.pipe(res);
+				// Destroy the read stream if the response is closed prematurely
+				// (e.g. client disconnect) to avoid leaking the file descriptor.
+				res.once('close', () => fileStream.destroy());
+				fileStream.on('end', resolve);
+				// Replace the initial error handler now that headers are sent
+				fileStream.removeAllListeners('error');
+				fileStream.on('error', error => {
+					logService.error(error);
+					console.error(error.toString());
+					res.destroy();
+				});
+			});
+		});
 	} catch (error) {
 		if (error.code !== 'ENOENT') {
 			logService.error(error);
@@ -206,7 +225,8 @@ export class WebClientServer {
 		const context = await this._requestService.request({
 			type: 'GET',
 			url: uri.toString(true),
-			headers
+			headers,
+			callSite: 'webClientServer.fetchAndWriteFile'
 		}, CancellationToken.None);
 
 		const status = context.res.statusCode || 500;
diff --git a/src/vs/server/test/node/serverAgentHostManager.test.ts b/src/vs/server/test/node/serverAgentHostManager.test.ts
new file mode 100644
index 00000000000..81ec4b695e6
--- /dev/null
+++ b/src/vs/server/test/node/serverAgentHostManager.test.ts
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { IChannel, IChannelClient } from '../../../base/parts/ipc/common/ipc.js';
+import { IAgentHostConnection, IAgentHostStarter } from '../../../platform/agentHost/common/agent.js';
+import { AgentHostIpcChannels } from '../../../platform/agentHost/common/agentService.js';
+import { NullLogService, NullLoggerService } from '../../../platform/log/common/log.js';
+import { ServerAgentHostManager } from '../../node/serverAgentHostManager.js';
+import { IServerLifetimeService } from '../../node/serverLifetimeService.js';
+
+// ---- Mock helpers -----------------------------------------------------------
+
+class MockChannel implements IChannel {
+	private readonly _listeners = new Map<string, Emitter<unknown>>();
+	private readonly _callResults = new Map<string, unknown>();
+
+	getEmitter(event: string): Emitter<unknown> {
+		let emitter = this._listeners.get(event);
+		if (!emitter) {
+			emitter = new Emitter<unknown>();
+			this._listeners.set(event, emitter);
+		}
+		return emitter;
+	}
+
+	setCallResult(command: string, value: unknown): void {
+		this._callResults.set(command, value);
+	}
+
+	call<T>(command: string, _arg?: unknown): Promise<T> {
+		return Promise.resolve((this._callResults.get(command) ?? undefined) as T);
+	}
+
+	listen<T>(event: string, _arg?: unknown): Event<T> {
+		return this.getEmitter(event).event as Event<T>;
+	}
+
+	dispose(): void {
+		for (const emitter of this._listeners.values()) {
+			emitter.dispose();
+		}
+		this._listeners.clear();
+	}
+}
+
+class MockAgentHostStarter implements IAgentHostStarter {
+	private readonly _onDidProcessExit = new Emitter<{ code: number; signal: string }>();
+
+	readonly agentHostChannel = new MockChannel();
+	readonly loggerChannel: MockChannel;
+	readonly connectionTrackerChannel = new MockChannel();
+
+	constructor() {
+		this.loggerChannel = new MockChannel();
+		this.loggerChannel.setCallResult('getRegisteredLoggers', []);
+	}
+
+	start(): IAgentHostConnection {
+		const store = new DisposableStore();
+		const client: IChannelClient = {
+			getChannel: <T extends IChannel>(name: string): T => {
+				switch (name) {
+					case AgentHostIpcChannels.AgentHost:
+						return this.agentHostChannel as unknown as T;
+					case AgentHostIpcChannels.Logger:
+						return this.loggerChannel as unknown as T;
+					case AgentHostIpcChannels.ConnectionTracker:
+						return this.connectionTrackerChannel as unknown as T;
+					default:
+						throw new Error(`Unknown channel: ${name}`);
+				}
+			},
+		};
+		return {
+			client,
+			store,
+			onDidProcessExit: this._onDidProcessExit.event,
+		};
+	}
+
+	fireProcessExit(code: number): void {
+		this._onDidProcessExit.fire({ code, signal: '' });
+	}
+
+	dispose(): void {
+		this._onDidProcessExit.dispose();
+		this.agentHostChannel.dispose();
+		this.loggerChannel.dispose();
+		this.connectionTrackerChannel.dispose();
+	}
+}
+
+class MockServerLifetimeService implements IServerLifetimeService {
+	declare readonly _serviceBrand: undefined;
+
+	private _activeCount = 0;
+
+	get hasActiveConsumers(): boolean {
+		return this._activeCount > 0;
+	}
+
+	active(_consumer: string): IDisposable {
+		this._activeCount++;
+		return toDisposable(() => { this._activeCount--; });
+	}
+
+	delay(): void { }
+}
+
+suite('ServerAgentHostManager', () => {
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let starter: MockAgentHostStarter;
+	let lifetimeService: MockServerLifetimeService;
+
+	setup(() => {
+		starter = new MockAgentHostStarter();
+		lifetimeService = new MockServerLifetimeService();
+	});
+
+	function createManager(): ServerAgentHostManager {
+		return ds.add(new ServerAgentHostManager(
+			starter,
+			new NullLogService(),
+			ds.add(new NullLoggerService()),
+			lifetimeService,
+		));
+	}
+
+	function fireActiveSessions(count: number): void {
+		starter.agentHostChannel.getEmitter('onDidAction').fire({
+			action: { type: 'root/activeSessionsChanged', activeSessions: count },
+			serverSeq: 1,
+			origin: undefined,
+		});
+	}
+
+	function fireConnectionCount(count: number): void {
+		starter.connectionTrackerChannel.getEmitter('onDidChangeConnectionCount').fire(count);
+	}
+
+	test('no lifetime token initially', () => {
+		createManager();
+		assert.strictEqual(lifetimeService.hasActiveConsumers, false);
+	});
+
+	test('acquires token when sessions become active', () => {
+		createManager();
+		fireActiveSessions(1);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+	});
+
+	test('acquires token when clients connect (no active sessions)', () => {
+		createManager();
+		fireConnectionCount(2);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+	});
+
+	test('releases token only when both sessions and connections are zero', () => {
+		createManager();
+
+		// Sessions active, no connections
+		fireActiveSessions(1);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+
+		// Connections appear too
+		fireConnectionCount(1);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+
+		// Sessions go idle, but connections remain
+		fireActiveSessions(0);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+
+		// Connections drop to zero -- now both are idle
+		fireConnectionCount(0);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, false);
+	});
+
+	test('releases token only when connections drop after sessions already idle', () => {
+		createManager();
+
+		fireConnectionCount(3);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+
+		fireConnectionCount(0);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, false);
+	});
+
+	test('process exit resets both signals and clears token', () => {
+		createManager();
+
+		fireActiveSessions(2);
+		fireConnectionCount(1);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, true);
+
+		starter.fireProcessExit(1);
+		assert.strictEqual(lifetimeService.hasActiveConsumers, false);
+	});
+});
diff --git a/src/vs/server/test/node/serverLifetimeService.test.ts b/src/vs/server/test/node/serverLifetimeService.test.ts
new file mode 100644
index 00000000000..54fe5194121
--- /dev/null
+++ b/src/vs/server/test/node/serverLifetimeService.test.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { NullLogService } from '../../../platform/log/common/log.js';
+import { IServerLifetimeOptions, ServerLifetimeService } from '../../node/serverLifetimeService.js';
+
+suite('ServerLifetimeService', () => {
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
+
+	function create(opts: IServerLifetimeOptions = {}): ServerLifetimeService {
+		return ds.add(new ServerLifetimeService(opts, new NullLogService()));
+	}
+
+	test('starts with no active consumers', () => {
+		const service = create();
+		assert.strictEqual(service.hasActiveConsumers, false);
+	});
+
+	test('active() marks a consumer and dispose releases it', () => {
+		const service = create();
+		const d = service.active('test');
+		assert.strictEqual(service.hasActiveConsumers, true);
+		d.dispose();
+		assert.strictEqual(service.hasActiveConsumers, false);
+	});
+
+	test('multiple active consumers require all to dispose', () => {
+		const service = create();
+		const d1 = service.active('a');
+		const d2 = service.active('b');
+		assert.strictEqual(service.hasActiveConsumers, true);
+		d1.dispose();
+		assert.strictEqual(service.hasActiveConsumers, true);
+		d2.dispose();
+		assert.strictEqual(service.hasActiveConsumers, false);
+	});
+
+	test('same consumer name counted multiple times', () => {
+		const service = create();
+		const d1 = service.active('ext');
+		const d2 = service.active('ext');
+		assert.strictEqual(service.hasActiveConsumers, true);
+		d1.dispose();
+		assert.strictEqual(service.hasActiveConsumers, true);
+		d2.dispose();
+		assert.strictEqual(service.hasActiveConsumers, false);
+	});
+
+	test('dispose is idempotent', () => {
+		const service = create();
+		const d1 = service.active('a');
+		const d2 = service.active('a');
+		d1.dispose();
+		d1.dispose();
+		assert.strictEqual(service.hasActiveConsumers, true);
+		d2.dispose();
+		assert.strictEqual(service.hasActiveConsumers, false);
+	});
+});
diff --git a/src/vs/sessions/AI_CUSTOMIZATIONS.md b/src/vs/sessions/AI_CUSTOMIZATIONS.md
index e3c8ec0b8d1..acb2203f9af 100644
--- a/src/vs/sessions/AI_CUSTOMIZATIONS.md
+++ b/src/vs/sessions/AI_CUSTOMIZATIONS.md
@@ -14,17 +14,22 @@ src/vs/workbench/contrib/chat/browser/aiCustomization/
 ├── aiCustomizationManagement.ts                # IDs + context keys
 ├── aiCustomizationManagementEditor.ts          # SplitView list/editor
 ├── aiCustomizationManagementEditorInput.ts     # Singleton input
-├── aiCustomizationListWidget.ts                # Search + grouped list
+├── aiCustomizationListWidget.ts                # Search + grouped list + harness toggle
+├── aiCustomizationListWidgetUtils.ts           # List item helpers (truncation, etc.)
 ├── aiCustomizationDebugPanel.ts                # Debug diagnostics panel
 ├── aiCustomizationWorkspaceService.ts          # Core VS Code workspace service impl
+├── customizationHarnessService.ts              # Core harness service impl (agent-gated)
 ├── customizationCreatorService.ts              # AI-guided creation flow
-├── mcpListWidget.ts                            # MCP servers section
+├── customizationGroupHeaderRenderer.ts         # Collapsible group header renderer
+├── mcpListWidget.ts                            # MCP servers section (Extensions + Built-in groups)
+├── pluginListWidget.ts                         # Agent plugins section
 ├── aiCustomizationIcons.ts                     # Icons
 └── media/
     └── aiCustomizationManagement.css
 
 src/vs/workbench/contrib/chat/common/
-└── aiCustomizationWorkspaceService.ts          # IAICustomizationWorkspaceService + IStorageSourceFilter
+├── aiCustomizationWorkspaceService.ts          # IAICustomizationWorkspaceService + IStorageSourceFilter + BUILTIN_STORAGE
+└── customizationHarnessService.ts              # ICustomizationHarnessService + ISectionOverride + helpers
 ```
 
 The tree view and overview live in `vs/sessions` (sessions window only):
@@ -44,8 +49,10 @@ Sessions-specific overrides:
 ```
 src/vs/sessions/contrib/chat/browser/
 ├── aiCustomizationWorkspaceService.ts          # Sessions workspace service override
+├── customizationHarnessService.ts              # Sessions harness service (CLI harness only)
 └── promptsService.ts                           # AgenticPromptsService (CLI user roots)
 src/vs/sessions/contrib/sessions/browser/
+├── aiCustomizationShortcutsWidget.ts           # Shortcuts widget
 ├── customizationCounts.ts                      # Source count utilities (type-aware)
 └── customizationsToolbar.contribution.ts       # Sidebar customization links
 ```
@@ -56,11 +63,47 @@ The `IAICustomizationWorkspaceService` interface controls per-window behavior:
 
 | Property / Method | Core VS Code | Sessions Window |
 |----------|-------------|----------|
-| `managementSections` | All sections except Models | Same minus MCP |
-| `getStorageSourceFilter(type)` | All sources, no user root filter | Per-type (see below) |
+| `managementSections` | All sections except Models | All sections except Models |
+| `getStorageSourceFilter(type)` | Delegates to `ICustomizationHarnessService` | Delegates to `ICustomizationHarnessService` |
 | `isSessionsWindow` | `false` | `true` |
 | `activeProjectRoot` | First workspace folder | Active session worktree |
 
+### ICustomizationHarnessService
+
+A harness represents the AI execution environment that consumes customizations.
+Storage answers "where did this come from?"; harness answers "who consumes it?".
+
+The service is defined in `common/customizationHarnessService.ts` which also provides:
+- **`CustomizationHarnessServiceBase`** — reusable base class handling active-harness state, the observable list, and `getStorageSourceFilter` dispatch.
+- **`ISectionOverride`** — per-section UI customization: `commandId` (command invocation), `rootFile` + `label` (root-file creation), `typeLabel` (custom type name), `fileExtension` (override default), `rootFileShortcuts` (dropdown shortcuts).
+- **Factory functions** — `createVSCodeHarnessDescriptor`, `createCliHarnessDescriptor`, `createClaudeHarnessDescriptor`. The VS Code harness receives `[PromptsStorage.extension, BUILTIN_STORAGE]` as extras; CLI and Claude in core receive `[]` (no extension source). Sessions CLI receives `[BUILTIN_STORAGE]`.
+- **Well-known root helpers** — `getCliUserRoots(userHome)` and `getClaudeUserRoots(userHome)` centralize the `~/.copilot`, `~/.claude`, `~/.agents` path knowledge.
+- **Filter helpers** — `matchesWorkspaceSubpath()` for segment-safe subpath matching; `matchesInstructionFileFilter()` for filename/path-prefix pattern matching.
+
+Available harnesses:
+
+| Harness | Label | Description |
+|---------|-------|-------------|
+| `vscode` | Local | Shows all storage sources (default in core) |
+| `cli` | Copilot CLI | Restricts user roots to `~/.copilot`, `~/.claude`, `~/.agents` |
+| `claude` | Claude | Restricts user roots to `~/.claude`; hides Prompts + Plugins sections |
+
+In core VS Code, all three harnesses are registered but CLI and Claude only appear when their respective agents are registered (`requiredAgentId` checked via `IChatAgentService`). VS Code is the default.
+In sessions, only CLI is registered (single harness, toggle bar hidden).
+
+### IHarnessDescriptor
+
+Key properties on the harness descriptor:
+
+| Property | Purpose |
+|----------|--------|
+| `hiddenSections` | Sidebar sections to hide (e.g. Claude: `[Prompts, Plugins]`) |
+| `workspaceSubpaths` | Restrict file creation/display to directories (e.g. Claude: `['.claude']`) |
+| `hideGenerateButton` | Replace "Generate X" sparkle button with "New X" |
+| `sectionOverrides` | Per-section `ISectionOverride` map for button behavior |
+| `requiredAgentId` | Agent ID that must be registered for harness to appear |
+| `instructionFileFilter` | Filename/path patterns to filter instruction items |
+
 ### IStorageSourceFilter
 
 A unified per-type filter controlling which storage sources and user file roots are visible.
@@ -75,15 +118,54 @@ interface IStorageSourceFilter {
 
 The shared `applyStorageSourceFilter()` helper applies this filter to any `{uri, storage}` array.
 
-**Sessions filter behavior by type:**
+**Sessions filter behavior (CLI harness):**
 
 | Type | sources | includedUserFileRoots |
 |------|---------|----------------------|
-| Hooks | `[local]` | N/A |
-| Prompts | `[local, user]` | `undefined` (all roots) |
-| Agents, Skills, Instructions | `[local, user]` | `[~/.copilot, ~/.claude, ~/.agents]` |
+| Hooks | `[local, plugin]` | N/A |
+| Prompts | `[local, user, plugin, builtin]` | `undefined` (all roots) |
+| Agents, Skills, Instructions | `[local, user, plugin, builtin]` | `[~/.copilot, ~/.claude, ~/.agents]` |
 
-**Core VS Code:** All types use `[local, user, extension, plugin]` with no user root filter.
+**Core VS Code filter behavior:**
+
+Local harness: all types use `[local, user, extension, plugin, builtin]` with no user root filter. Items from the default chat extension (`productService.defaultChatAgent.chatExtensionId`) are grouped under "Built-in" via `groupKey` override in the list widget.
+
+CLI harness (core):
+
+| Type | sources | includedUserFileRoots |
+|------|---------|----------------------|
+| Hooks | `[local, plugin]` | N/A |
+| Prompts | `[local, user, plugin]` | `undefined` (all roots) |
+| Agents, Skills, Instructions | `[local, user, plugin]` | `[~/.copilot, ~/.claude, ~/.agents]` |
+
+Claude harness (core):
+
+| Type | sources | includedUserFileRoots |
+|------|---------|----------------------|
+| Hooks | `[local, plugin]` | N/A |
+| Prompts | `[local, user, plugin]` | `undefined` (all roots) |
+| Agents, Skills, Instructions | `[local, user, plugin]` | `[~/.claude]` |
+
+Claude additionally applies:
+- `hiddenSections: [Prompts, Plugins]`
+- `instructionFileFilter: ['CLAUDE.md', 'CLAUDE.local.md', '.claude/rules/', 'copilot-instructions.md']`
+- `workspaceSubpaths: ['.claude']` (instruction files matching `instructionFileFilter` are exempt)
+- `sectionOverrides`: Hooks → `copilot.claude.hooks` command; Instructions → "Add CLAUDE.md" primary, "Rule" type label, `.md` file extension
+
+### Built-in Extension Grouping (Core VS Code)
+
+In core VS Code, customization items contributed by the default chat extension (`productService.defaultChatAgent.chatExtensionId`, typically `GitHub.copilot-chat`) are grouped under the "Built-in" header in the management editor list widget, separate from third-party "Extensions".
+
+This follows the same pattern as the MCP list widget, which determines grouping at the UI layer by inspecting collection sources. The list widget uses `IProductService` to identify the chat extension and sets `groupKey: BUILTIN_STORAGE` on matching items:
+
+- **Agents**: checks `agent.source.extensionId` against the chat extension ID
+- **Skills**: builds a URI→ExtensionIdentifier lookup from `listPromptFiles(PromptsType.skill)`, then checks each skill's URI
+- **Prompts**: checks `command.promptPath.extension?.identifier`
+- **Instructions/Hooks**: checks `item.extension?.identifier` via `IPromptPath`
+
+The underlying `storage` remains `PromptsStorage.extension` — the grouping is a UI-level override via `groupKey` that keeps `applyStorageSourceFilter` working with existing storage types while visually distinguishing chat-extension items from third-party extension items.
+
+`BUILTIN_STORAGE` is defined in `aiCustomizationWorkspaceService.ts` (common layer) and re-exported by both `aiCustomizationManagement.ts` (browser) and `builtinPromptsStorage.ts` (sessions) for backward compatibility.
 
 ### AgenticPromptsService (Sessions)
 
@@ -115,7 +197,11 @@ Prompt files bundled with the Sessions app live in `src/vs/sessions/prompts/`. T
 | Skills | `findAgentSkills()` | Parsed skills with frontmatter |
 | Prompts | `getPromptSlashCommands()` | Filters out skill-type commands |
 | Instructions | `listPromptFiles()` + `listAgentInstructions()` | Includes AGENTS.md, CLAUDE.md etc. |
-| Hooks | `listPromptFiles()` | Raw hook files |
+| Hooks | `listPromptFiles()` | Individual hooks parsed via `parseHooksFromFile()` |
+
+### Item Badges
+
+`IAICustomizationListItem.badge` is an optional string that renders as a small inline tag next to the item name (same visual style as the MCP "Bridged" badge). For context instructions, this badge shows the raw `applyTo` pattern (e.g. a glob like `**/*.ts`), while the tooltip (`badgeTooltip`) explains the behavior. The badge text is also included in search filtering.
 
 ### Debug Panel
 
@@ -141,8 +227,9 @@ All commands and UI respect `ChatContextKeys.enabled` and the `chat.customizatio
 
 ## Settings
 
-Settings use the `chat.customizationsMenu.` namespace:
+Settings use the `chat.customizationsMenu.` and `chat.customizations.` namespaces:
 
 | Setting | Default | Description |
 |---------|---------|-------------|
 | `chat.customizationsMenu.enabled` | `true` | Show the Chat Customizations editor in the Command Palette |
+| `chat.customizations.harnessSelector.enabled` | `true` | Show the harness selector dropdown in the sidebar |
diff --git a/src/vs/sessions/LAYOUT.md b/src/vs/sessions/LAYOUT.md
index ad54a086c7f..b04e41b985e 100644
--- a/src/vs/sessions/LAYOUT.md
+++ b/src/vs/sessions/LAYOUT.md
@@ -374,7 +374,7 @@ The Agent Sessions workbench uses specialized part implementations that extend t
 | Configuration listening | Many settings | Minimal |
 | Context menu actions | Full set | Simplified |
 | Title bar | Full support | Sidebar: `hasTitle: true` (with footer); ChatBar: `hasTitle: false`; Auxiliary Bar & Panel: `hasTitle: true` |
-| Visual margins | None | Auxiliary Bar: 8px top/bottom/right (card appearance); Panel: 8px bottom/left/right (card appearance); Sidebar: 0 (flush) |
+| Visual margins | None | Auxiliary Bar: 16px top/right, 18px bottom (card appearance); Panel: 18px bottom, 16px left/right (card appearance); Sidebar: 0 (flush) |
 
 ### 9.3 Part Creation
 
@@ -442,6 +442,8 @@ The `SidebarPart` includes a footer section (35px height) positioned below the p
 
 On macOS native with custom titlebar, the sidebar title area includes a traffic light spacer (70px) to push content past the system window controls. The spacer is hidden in fullscreen mode and is not created when using native titlebar (since the OS renders traffic lights in its own title bar).
 
+The sessions appear animation applies only to the sidebar body (`.part.sidebar > .content`). The sidebar container, title area, and footer do not participate in the reveal animation, so the header region stays visually fixed while the body slides/fades in. Normal hover and pressed feedback for header/footer controls is preserved.
+
 ---
 
 ## 10. Workbench Contributions
@@ -640,6 +642,7 @@ interface IPartVisibilityState {
 
 | Date | Change |
 |------|--------|
+| 2026-03-26 | Updated the sessions sidebar appear animation so only the body content (`.part.sidebar > .content`) slides/fades in during reveal while the sidebar title/header and footer remain fixed |
 | 2026-03-02 | Fixed macOS sidebar traffic light spacer to only render with custom titlebar; added `!hasNativeTitlebar()` guard to `SidebarPart.createTitleArea()` so the 70px spacer is not created when using native titlebar (traffic lights are in the OS title bar, not overlapping the sidebar) |
 | 2026-02-20 | Replaced custom `EditorModal` with standard `ModalEditorPart` via `MODAL_GROUP`; main editor part created but hidden; changed `workbench.editor.useModal` from boolean to enum (`off`/`some`/`all`); sessions config uses `all`; removed `editorModal.ts` and editor modal CSS |
 | 2026-02-17 | Added `-webkit-app-region: drag` to sidebar title area so it can be used to drag the window; interactive children (actions, composite bar, labels) marked `no-drag`; CSS rules scoped to `.agent-sessions-workbench` in `parts/media/sidebarPart.css` |
diff --git a/src/vs/sessions/README.md b/src/vs/sessions/README.md
index d03cecc3dd1..9e8d73a6e36 100644
--- a/src/vs/sessions/README.md
+++ b/src/vs/sessions/README.md
@@ -112,6 +112,260 @@ The Agentic Window (`Workbench`) provides a simplified, fixed-layout workbench t
 
 See [LAYOUT.md](LAYOUT.md) for the detailed layout specification.
 
+## Sessions Provider Architecture
+
+The sessions window uses an extensible provider model to manage sessions. Instead of hardcoding session type logic (CLI, Cloud, Agent Host) throughout the codebase, all session behavior is encapsulated in **sessions providers** that register with a central registry.
+
+### Overview Diagram
+
+```
+┌──────────────────────────────────────────────────────────────────────────────────┐
+│                              UI Components                                      │
+│  ┌──────────────┐  ┌──────────────┐  ┌────────────────────┐  ┌──────────────┐  │
+│  │ SessionsView │  │  TitleBar    │  │   NewChatWidget    │  │ ChangesView  │  │
+│  │   Pane       │  │   Widget     │  │ (workspace/type    │  │              │  │
+│  │              │  │              │  │  pickers)          │  │              │  │
+│  └──────┬───────┘  └──────┬───────┘  └────────┬───────────┘  └──────┬───────┘  │
+│         │                 │                    │                     │          │
+│         │     reads ISessionData observables   │                     │          │
+│         │   (title, status, changes, workspace, isArchived, ...)     │          │
+│         └─────────────────┼────────────────────┼─────────────────────┘          │
+│                           │                    │                                │
+│                    ┌──────▼────────────────────▼──┐                              │
+│                    │  Sessions Management Service │  ISessionsManagementService  │
+│                    │  - activeSession: IObservable<ISessionData>                 │
+│                    │  - getSessions(): ISessionData[]                            │
+│                    │  - openSession / createNewSession                           │
+│                    │  - sendRequest / setSessionType                             │
+│                    │  - onDidChangeSessions                                      │
+│                    └──────────────┬────────────────┘                             │
+│                                  │                                              │
+│                    ┌─────────────▼─────────────┐                                │
+│                    │ Sessions Providers Service │  ISessionsProvidersService     │
+│                    │ - registerProvider(p)      │                                │
+│                    │ - getProviders()           │                                │
+│                    │ - getSessions() (merged)   │                                │
+│                    └─────────────┬──────────────┘                               │
+│                                  │                                              │
+│              ┌───────────────────┼───────────────────┐                          │
+│              │                   │                   │                          │
+│       ┌──────▼──────┐     ┌──────▼──────┐     ┌──────▼──────┐                  │
+│       │  Copilot    │     │ Remote Agent│     │   Custom    │                  │
+│       │  Chat       │     │ Host        │     │  Provider   │                  │
+│       │  Sessions   │     │ Provider    │     │  (future)   │                  │
+│       │  Provider   │     │             │     │             │                  │
+│       └──────┬──────┘     └──────┬──────┘     └─────────────┘                  │
+│              │                   │                                              │
+│              │    Each provider returns ISessionData[]                          │
+│              │                   │                                              │
+│       ┌──────▼──────┐     ┌──────▼──────┐                                      │
+│       │ Agent       │     │ Agent Host  │                                      │
+│       │ Sessions    │     │ Protocol    │                                      │
+│       │ Service     │     │             │                                      │
+│       └─────────────┘     └─────────────┘                                      │
+└──────────────────────────────────────────────────────────────────────────────────┘
+
+ISessionData (reactive session facade)
+┌─────────────────────────────────────────────────────────────┐
+│  sessionId: string          providerId: string              │
+│  resource: URI              sessionType: string             │
+│  icon: ThemeIcon            createdAt: Date                 │
+├─────────────────────────────────────────────────────────────┤
+│  Observable properties (auto-update UI when changed):       │
+│                                                             │
+│  title ─────────── "Fix login bug"                          │
+│  status ────────── InProgress | NeedsInput | Completed      │
+│  workspace ─────── { label, icon, repositories[] }          │
+│  changes ───────── [{ modifiedUri, insertions, deletions }] │
+│  updatedAt ─────── Date                                     │
+│  lastTurnEnd ───── Date | undefined                         │
+│  isArchived ────── boolean                                  │
+│  isRead ────────── boolean                                  │
+│  modelId ───────── "gpt-4o" | undefined                     │
+│  mode ──────────── { id, kind } | undefined                 │
+│  loading ───────── boolean                                  │
+└─────────────────────────────────────────────────────────────┘
+
+ISessionWorkspace (nested in ISessionData.workspace)
+┌─────────────────────────────────────────────────────────────┐
+│  label: "my-app"     icon: Codicon.folder                   │
+│  repositories: [{                                           │
+│      uri ──────────── file:///repo or github-remote-file:// │
+│      workingDirectory ── file:///worktree (if isolation)     │
+│      detail ─────────── "feature-branch"                    │
+│      baseBranchProtected ── true/false                      │
+│  }]                                                         │
+└─────────────────────────────────────────────────────────────┘
+```
+
+### Core Concepts
+
+#### Session Type (`ISessionType`)
+
+A lightweight label identifying an agent backend. Says nothing about where it runs or how it's configured.
+
+```typescript
+// Platform-level session type (registered once)
+interface ISessionType {
+    readonly id: string;      // e.g., 'copilot-cli', 'copilot-cloud'
+    readonly label: string;   // e.g., 'Copilot CLI', 'Cloud'
+    readonly icon: ThemeIcon;
+}
+```
+
+#### Sessions Provider (`ISessionsProvider`)
+
+A compute environment adapter. One provider can serve multiple session types. Multiple provider instances can serve the same session type.
+
+```typescript
+interface ISessionsProvider {
+    readonly id: string;                       // 'default-copilot', 'agenthost-hostA'
+    readonly label: string;
+    readonly sessionTypes: readonly ISessionType[];
+
+    // Workspace browsing
+    getWorkspaces(): ISessionWorkspace[];
+    readonly browseActions: readonly ISessionsBrowseAction[];
+
+    // Session CRUD
+    getSessions(): ISessionData[];
+    createNewSession(workspace: ISessionWorkspace): ISessionData;
+    sendRequest(sessionId: string, options: ISendRequestOptions): Promise<ISessionData>;
+
+    // Lifecycle
+    archiveSession(sessionId: string): Promise<void>;
+    deleteSession(sessionId: string): Promise<void>;
+    renameSession(sessionId: string, title: string): Promise<void>;
+}
+```
+
+#### Session Data (`ISessionData`)
+
+The universal session interface. All reactive properties are observables — UI components subscribe and update automatically.
+
+```typescript
+interface ISessionData {
+    readonly sessionId: string;          // Globally unique: 'providerId:localId'
+    readonly resource: URI;
+    readonly providerId: string;
+    readonly sessionType: string;        // e.g., 'copilot-cli'
+
+    // Reactive properties
+    readonly title: IObservable<string>;
+    readonly status: IObservable<SessionStatus>;
+    readonly workspace: IObservable<ISessionWorkspace | undefined>;
+    readonly changes: IObservable<readonly IChatSessionFileChange[]>;
+    readonly isArchived: IObservable<boolean>;
+    readonly isRead: IObservable<boolean>;
+    readonly lastTurnEnd: IObservable<Date | undefined>;
+}
+```
+
+### Examples
+
+#### Example 1: CopilotChatSessionsProvider
+
+The default provider wrapping existing CLI and Cloud sessions:
+
+```
+CopilotChatSessionsProvider
+├── id: 'default-copilot'
+├── sessionTypes: [CopilotCLI, CopilotCloud]
+├── browseActions:
+│   ├── "Browse Folders..." → file dialog
+│   └── "Browse Repositories..." → GitHub repo picker
+├── getSessions() → wraps IAgentSession[] as AgentSessionAdapter[]
+├── createNewSession(workspace)
+│   ├── file:// URI → CopilotCLISession (local background agent)
+│   └── github-remote-file:// → RemoteNewSession (cloud agent)
+└── sendRequest() → delegates to IChatService
+```
+
+#### Example 2: RemoteAgentHostSessionsProvider
+
+One instance per connected remote agent host:
+
+```
+RemoteAgentHostSessionsProvider
+├── id: 'agenthost-<hostId>'
+├── sessionTypes: [CopilotCLI]  (reuses platform type)
+├── browseActions:
+│   └── "Browse Remote Folders..." → remote folder picker
+├── getSessions() → sessions from this specific host
+└── createNewSession(workspace)
+    └── Creates session on the remote agent host
+```
+
+### Data Flow
+
+#### Creating a New Session
+
+```
+User picks workspace in WorkspacePicker
+    │
+    ▼
+SessionsManagementService.createNewSession(providerId, workspace)
+    │
+    ├── Finds provider by ID
+    ├── Calls provider.createNewSession(workspace)
+    │       │
+    │       ▼
+    │   Provider creates ISessionData
+    │   (e.g., CopilotCLISession or RemoteNewSession)
+    │
+    ├── Sets as active session
+    └── Returns ISessionData to widget
+
+User types message and sends
+    │
+    ▼
+SessionsManagementService.sendRequest(session, options)
+    │
+    ├── Finds provider by session.providerId
+    ├── Calls provider.sendRequest(sessionId, options)
+    │       │
+    │       ▼
+    │   Provider creates real agent session
+    │   (e.g., starts CLI agent, opens cloud session)
+    │
+    └── Returns created ISessionData (now backed by real session)
+```
+
+#### Session Change Events
+
+```
+Agent session completes a turn
+    │
+    ▼
+AgentSessionsService fires onDidChangeSessions
+    │
+    ▼
+CopilotChatSessionsProvider._refreshSessionCache()
+    ├── Diffs current sessions vs cache
+    ├── Updates AgentSessionAdapter observables (title, status, changes)
+    └── Fires onDidChangeSessions { added, removed, changed, archived }
+         │
+         ▼
+    SessionsProvidersService forwards event
+         │
+         ▼
+    SessionsManagementService forwards event
+         │
+         ├── UI re-renders (sessions list, titlebar, changes view)
+         └── Context keys updated (hasChanges, isBackground, etc.)
+```
+
+### Key Files
+
+| File | Purpose |
+|------|---------|
+| `contrib/sessions/common/sessionData.ts` | `ISessionData`, `ISessionWorkspace`, `ISessionRepository`, `SessionStatus` |
+| `contrib/sessions/browser/sessionsProvider.ts` | `ISessionsProvider`, `ISessionType`, `ISessionsChangeEvent` |
+| `contrib/sessions/browser/sessionsProvidersService.ts` | `ISessionsProvidersService` + implementation |
+| `contrib/sessions/browser/sessionsManagementService.ts` | `ISessionsManagementService` — active session, routing |
+| `contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts` | Default Copilot provider |
+| `contrib/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts` | Remote agent host provider |
+
 ## Adding New Functionality
 
 When adding features to the agentic window:
diff --git a/src/vs/sessions/SESSIONS_PROVIDER.md b/src/vs/sessions/SESSIONS_PROVIDER.md
new file mode 100644
index 00000000000..3292867ed5d
--- /dev/null
+++ b/src/vs/sessions/SESSIONS_PROVIDER.md
@@ -0,0 +1,453 @@
+# Sessions Provider Architecture
+
+## Overview
+
+The Sessions Provider architecture introduces an **extensible provider model** for managing agent sessions in the Sessions window. Instead of hardcoding session types and backends, multiple providers register with a central registry (`ISessionsProvidersService`), which aggregates sessions from all providers and routes actions to the correct one.
+
+This design allows new compute environments (remote agent hosts, cloud backends, third-party agents) to plug in without modifying core session management code.
+
+### Architectural Flow
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                        UI Components                            │
+│  (SessionsView, TitleBar, NewSession, Changes | Terminal)       │
+└───────────────────────────┬─────────────────────────────────────┘
+                            │
+                ┌───────────▼────────────┐
+                │ SessionsManagementService│  ← High-level orchestration
+                │  (active session, send,  │     context keys, provider
+                │   session types, etc.)   │     selection
+                └───────────┬──────────────┘
+                            │
+                ┌───────────▼────────────┐
+                │ SessionsProvidersService │  ← Central registry & router
+                │  (register, aggregate,   │
+                │   route by session ID)   │
+                └──────┬──────────┬────────┘
+                       │          │
+          ┌────────────▼──┐  ┌───▼──────────────────┐
+          │  CopilotChat  │  │ RemoteAgentHost       │
+          │  Sessions     │  │ Sessions Provider     │
+          │  Provider     │  │ (one per connection)  │
+          └───────┬───────┘  └──────────┬────────────┘
+                  │                     │
+          ┌───────▼───────┐  ┌──────────▼────────────┐
+          │ AgentSessions │  │  Agent Host Connection │
+          │ Service /     │  │  (WebSocket, HTTP)     │
+          │ ChatService   │  │                        │
+          └───────────────┘  └────────────────────────┘
+```
+
+## Core Interfaces
+
+### `ISessionData` — Universal Session Facade
+
+**File:** `src/vs/sessions/contrib/sessions/common/sessionData.ts`
+
+The common session interface exposed by all providers. It is a self-contained facade — consumers should not reach back to underlying services to resolve additional data. All mutable properties are **observables** for reactive UI binding.
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `sessionId` | `string` | Globally unique ID in the format `providerId:localId` |
+| `resource` | `URI` | Resource URI identifying this session |
+| `providerId` | `string` | ID of the owning provider |
+| `sessionType` | `string` | Session type ID (e.g., `'background'`, `'cloud'`) |
+| `icon` | `ThemeIcon` | Display icon |
+| `createdAt` | `Date` | Creation timestamp |
+| `workspace` | `IObservable<ISessionWorkspace \| undefined>` | Workspace info (repositories, label, icon) |
+| `title` | `IObservable<string>` | Display title (auto-titled or renamed) |
+| `updatedAt` | `IObservable<Date>` | Last update timestamp |
+| `status` | `IObservable<SessionStatus>` | Current status (Untitled, InProgress, NeedsInput, Completed, Error) |
+| `changes` | `IObservable<readonly IChatSessionFileChange[]>` | File changes produced by the session |
+| `modelId` | `IObservable<string \| undefined>` | Selected model identifier |
+| `mode` | `IObservable<{id, kind} \| undefined>` | Selected mode identifier and kind |
+| `loading` | `IObservable<boolean>` | Whether the session is initializing |
+| `isArchived` | `IObservable<boolean>` | Archive state |
+| `isRead` | `IObservable<boolean>` | Read/unread state |
+| `description` | `IObservable<string \| undefined>` | Status description (e.g., current agent action) |
+| `lastTurnEnd` | `IObservable<Date \| undefined>` | When the last agent turn ended |
+| `pullRequest` | `IObservable<ISessionPullRequest \\| undefined>` | Associated pull request |
+
+#### Supporting Types
+
+**`ISessionWorkspace`** — Workspace information for a session:
+- `label: string` — Display label (e.g., "my-app", "org/repo")
+- `icon: ThemeIcon` — Workspace icon
+- `repositories: ISessionRepository[]` — One or more repositories
+
+**`ISessionRepository`** — A repository within a workspace:
+- `uri: URI` — Source repository URI (`file://` or `github-remote-file://`)
+- `workingDirectory: URI | undefined` — Worktree or checkout path
+- `detail: string | undefined` — Provider-chosen display detail (e.g., branch name)
+- `baseBranchProtected: boolean | undefined` — Whether the base branch is protected
+
+**`SessionStatus`** — Enum: `Untitled`, `InProgress`, `NeedsInput`, `Completed`, `Error`
+
+---
+
+### `ISessionsProvider` — Provider Contract
+
+**File:** `src/vs/sessions/contrib/sessions/browser/sessionsProvider.ts`
+
+A sessions provider encapsulates a compute environment. It owns workspace discovery, session creation, session listing, and picker contributions. One provider can serve multiple session types, and multiple provider instances can serve the same session type (e.g., one per remote agent host).
+
+#### Identity
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `id` | `string` | Unique provider instance ID (e.g., `'default-copilot'`, `'agenthost-hostA-copilot'`) |
+| `label` | `string` | Display label |
+| `icon` | `ThemeIcon` | Provider icon |
+| `sessionTypes` | `readonly ISessionType[]` | Session types this provider supports |
+
+#### Workspace Discovery
+
+| Member | Description |
+|--------|-------------|
+| `browseActions: readonly ISessionsBrowseAction[]` | Actions shown in the workspace picker (e.g., "Browse Folders...", "Browse Repositories...") |
+| `resolveWorkspace(repositoryUri: URI): ISessionWorkspace` | Resolve a URI to a session workspace with label and icon |
+
+#### Session Listing
+
+| Member | Description |
+|--------|-------------|
+| `getSessions(): ISessionData[]` | Returns all sessions owned by this provider |
+| `onDidChangeSessions: Event<ISessionsChangeEvent>` | Fires when sessions are added, removed, or changed |
+
+#### Session Lifecycle
+
+| Method | Description |
+|--------|-------------|
+| `createNewSession(workspace)` | Create a new session for a given workspace |
+| `setSessionType(sessionId, type)` | Change the session type |
+| `getSessionTypes(session)` | Get available session types for a session |
+| `renameSession(sessionId, title)` | Rename a session |
+| `setModel(sessionId, modelId)` | Set the model |
+| `archiveSession(sessionId)` | Archive a session |
+| `unarchiveSession(sessionId)` | Unarchive a session |
+| `deleteSession(sessionId)` | Delete a session |
+| `setRead(sessionId, read)` | Mark read/unread |
+
+#### Send
+
+| Method | Description |
+|--------|-------------|
+| `sendRequest(sessionId, options)` | Send the initial request for a new session; returns the created `ISessionData` |
+
+#### Supporting Types
+
+**`ISessionType`** — A platform-level session type identifying an agent backend:
+- `id: string` — Unique identifier (e.g., `'background'`, `'cloud'`)
+- `label: string` — Display label
+- `icon: ThemeIcon` — Icon
+- `requiresWorkspaceTrust?: boolean` — Whether workspace trust is required
+
+**`ISessionsBrowseAction`** — A browse action shown in the workspace picker:
+- `label`, `icon`, `providerId`
+- `execute(): Promise<ISessionWorkspace | undefined>` — Opens the browse dialog
+
+**`ISessionsChangeEvent`** — Change event:
+- `added: readonly ISessionData[]`
+- `removed: readonly ISessionData[]`
+- `changed: readonly ISessionData[]`
+
+**`ISendRequestOptions`** — Send request options:
+- `query: string` — Query text
+- `attachedContext?: IChatRequestVariableEntry[]` — Optional attached context entries
+
+---
+
+### `ISessionsProvidersService` — Central Registry & Aggregator
+
+**File:** `src/vs/sessions/contrib/sessions/browser/sessionsProvidersService.ts`
+
+Central service that aggregates sessions across all registered providers. Owns the provider registry, unified session list, and routes session actions to the correct provider.
+
+#### Provider Registry
+
+| Member | Description |
+|--------|-------------|
+| `registerProvider(provider): IDisposable` | Register a provider; returns disposable to unregister |
+| `getProviders(): ISessionsProvider[]` | Get all registered providers |
+| `onDidChangeProviders: Event<void>` | Fires when providers are added or removed |
+
+#### Session Types
+
+| Member | Description |
+|--------|-------------|
+| `getSessionTypesForProvider(providerId)` | Get session types from a specific provider |
+| `getSessionTypes(session)` | Get session types available for a session |
+
+#### Aggregated Sessions
+
+| Member | Description |
+|--------|-------------|
+| `getSessions(): ISessionData[]` | Get all sessions from all providers |
+| `getSession(sessionId): ISessionData \| undefined` | Look up a session by its globally unique ID |
+| `onDidChangeSessions: Event<ISessionsChangeEvent>` | Fires when sessions change across any provider |
+
+#### Routed Actions
+
+Actions are automatically routed to the correct provider by extracting the provider ID from the session ID:
+
+- `archiveSession(sessionId)`
+- `unarchiveSession(sessionId)`
+- `deleteSession(sessionId)`
+- `renameSession(sessionId, title)`
+- `setRead(sessionId, read)`
+- `resolveWorkspace(providerId, repositoryUri)`
+
+#### Session ID Format
+
+Session IDs use the format `${providerId}:${localId}`, where `providerId` identifies the owning provider and `localId` is a provider-scoped identifier (typically the session resource URI string). The separator `:` allows the registry to parse the provider ID for routing.
+
+---
+
+### `ISessionsManagementService` — High-Level Orchestration
+
+**File:** `src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts`
+
+Coordinates active session tracking, provider selection, and user workflows. Sits above the providers service and adds UI-facing concerns.
+
+#### Key Responsibilities
+
+- **Active session tracking** — `activeSession: IObservable<ISessionData | undefined>` tracks the currently selected session
+- **Provider selection** — `activeProviderId: IObservable<string | undefined>` auto-selects when one provider exists, persists to storage
+- **Context keys** — Manages `isNewChatSession`, `activeSessionProviderId`, `activeSessionType`, `isActiveSessionBackgroundProvider`
+- **Session creation** — `createNewSession(providerId, workspace)` delegates to the correct provider
+- **Send orchestration** — `sendRequest(session, options)` sends through the provider and manages state transitions
+- **GitHub context** — `getGitHubContext(session)` derives owner/repo/PR info from session metadata
+- **File resolution** — `resolveSessionFileUri(sessionResource, relativePath)` resolves file paths within session worktrees
+
+---
+
+## Provider Implementations
+
+### `CopilotChatSessionsProvider` — Default Copilot Provider
+
+**File:** `src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts`
+
+The default sessions provider, registered with ID `'default-copilot'`. Wraps the existing agent session infrastructure into the extensible provider model. Supports two session types: **Copilot CLI** (local) and **Copilot Cloud** (remote).
+
+#### Registration
+
+Registered via `DefaultSessionsProviderContribution` workbench contribution at `WorkbenchPhase.AfterRestored`:
+
+```
+src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessions.contribution.ts
+```
+
+```typescript
+class DefaultSessionsProviderContribution extends Disposable {
+    constructor(instantiationService, sessionsProvidersService) {
+        const provider = instantiationService.createInstance(CopilotChatSessionsProvider);
+        sessionsProvidersService.registerProvider(provider);
+    }
+}
+```
+
+#### Identity
+
+| Property | Value |
+|----------|-------|
+| `id` | `'default-copilot'` |
+| `label` | `'Copilot Chat'` |
+| `icon` | `Codicon.copilot` |
+| `sessionTypes` | `[CopilotCLISessionType, CopilotCloudSessionType]` |
+
+#### Browse Actions
+
+- **"Browse Folders..."** — Opens a folder dialog; creates a workspace with a `file://` URI
+- **"Browse Repositories..."** — Executes `github.copilot.chat.cloudSessions.openRepository`; creates a workspace with a `github-remote-file://` URI
+
+#### New Session Classes
+
+When `createNewSession(workspace)` is called, the provider creates one of two concrete `ISessionData` implementations based on the workspace URI scheme:
+
+**`CopilotCLISession`** — For local `file://` workspaces:
+- Implements `ISessionData` plus provider-specific observable fields (`permissionLevel`, `branchObservable`, `isolationModeObservable`)
+- Performs async git repository resolution during construction (sets `loading` to true until resolved)
+- Configuration methods: `setIsolationMode()`, `setBranch()`, `setModelId()`, `setMode()`, `setPermissionLevel()`, `setModeById()`
+- Tracks selected options via `Map<string, IChatSessionProviderOptionItem>` and syncs to `IChatSessionsService`
+- Uses `IGitService` to open the repository and resolve branch information
+
+**`RemoteNewSession`** — For cloud `github-remote-file://` workspaces:
+- Implements `ISessionData`
+- Manages dynamic option groups from `IChatSessionsService.getOptionGroupsForSessionType()` with `when` clause visibility
+- No-ops for isolation/branch/client mode (cloud-managed)
+- Provides `getModelOptionGroup()`, `getOtherOptionGroups()` for UI to render provider-specific pickers
+- Watches context key changes to dynamically show/hide option groups
+
+#### `AgentSessionAdapter` — Wrapping Existing Sessions
+
+Adapts an existing `IAgentSession` from the chat layer into the `ISessionData` facade:
+- Constructs with initial values from the agent session's metadata and timing
+- `update(session)` performs a batched observable transaction to update all reactive properties
+- Extracts workspace info, changes, description, and PR URI from session metadata
+- Maps `ChatSessionStatus` → `SessionStatus`
+- Handles both CLI and Cloud session metadata formats for repository resolution
+
+#### Session Cache & Change Events
+
+The provider maintains a `Map<string, AgentSessionAdapter>` cache keyed by resource URI:
+- `_ensureSessionCache()` performs lazy initialization
+- `_refreshSessionCache()` diffs current `IAgentSession` list against the cache, producing `added`, `removed`, and `changed` arrays
+- Changed adapters are updated in-place via `adapter.update(session)`
+- Change events are forwarded through `onDidChangeSessions`
+
+#### Send Flow
+
+1. Validate the session is a current new session (`CopilotCLISession` or `RemoteNewSession`)
+2. Resolve mode, permission level, and send options from session configuration
+3. Get or create a chat session via `IChatSessionsService`
+4. Open the chat widget via `IChatWidgetService.openSession()`
+5. Load the session model and apply selected model, mode, and options
+6. Send the request via `IChatService.sendRequest()`
+7. Wait for a new `IAgentSession` to appear in `IAgentSessionsService.model.sessions`
+8. Wrap the new agent session as `AgentSessionAdapter` and return it
+9. Clear the current new session reference
+
+---
+
+### `RemoteAgentHostSessionsProvider` — Remote Agent Host Provider
+
+**File:** `src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts`
+
+A sessions provider for a single agent on a remote agent host connection. One instance is created per agent discovered on each connection.
+
+#### Registration
+
+Registered dynamically by `RemoteAgentHostContribution`:
+
+```
+src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHost.contribution.ts
+```
+
+- Monitors `IRemoteAgentHostService.onDidChangeConnections`
+- Creates one `RemoteAgentHostSessionsProvider` per agent per connection
+- Registers via `sessionsProvidersService.registerProvider(sessionsProvider)` into a per-agent `DisposableStore`
+- Disposes providers when connections are removed
+
+#### Identity
+
+| Property | Format |
+|----------|--------|
+| `id` | `'agenthost-${sanitizedAuthority}-${agentProvider}'` |
+| `label` | Connection name or `'${agentProvider} (${address})'` |
+| `icon` | `Codicon.remote` |
+| `sessionTypes` | `[CopilotCLISessionType]` (reuses the platform type) |
+
+#### Browse Actions
+
+- **"Browse Remote Folders..."** — Opens a file dialog scoped to the agent host filesystem (`agent-host://` scheme)
+
+#### New Session Behavior
+
+`createNewSession(workspace)` creates a minimal `ISessionData` object literal (not a class instance) with:
+- All observable fields initialized via `observableValue()`
+- Status set to `SessionStatus.Untitled`
+- Workspace label derived from the URI path
+
+#### Stubbed Operations
+
+Most session actions are no-ops because session lifecycle is managed by the existing `AgentHostSessionHandler` and `AgentHostSessionListController`, which are registered separately by the contribution:
+- `archiveSession` / `unarchiveSession` / `deleteSession` / `renameSession` / `setRead` — no-op
+- `sendRequest` — throws (handled by the session handler)
+- `getSessions()` — returns empty array (managed by the list controller)
+
+---
+
+## Data Flow: Session Lifecycle
+
+### Creating a New Session
+
+```
+1. User picks a workspace in the workspace picker
+   → SessionsManagementService.createNewSession(providerId, workspace)
+   → Looks up provider by ID in SessionsProvidersService
+   → Calls provider.createNewSession(workspace)
+   → Provider creates CopilotCLISession (file://) or RemoteNewSession (github-remote-file://)
+   → Returns ISessionData, sets as activeSession observable
+
+2. User configures session (model, isolation mode, branch)
+   → Modifies observable fields on the new session object
+   → Selections synced to IChatSessionsService via setOption()
+
+3. User types a message and sends
+   → SessionsManagementService.sendRequest(session, {query, attachedContext})
+   → Delegates to provider.sendRequest(sessionId, options)
+   → Provider opens chat widget, applies config, sends through IChatService
+   → Waits for IAgentSession to appear in the model
+   → Wraps as AgentSessionAdapter, caches it
+   → Returns new ISessionData
+   → isNewChatSession context → false
+```
+
+### Session Change Propagation
+
+```
+Agent session state changes (turn complete, status update, etc.)
+  → AgentSessionsService.model.onDidChangeSessions
+  → CopilotChatSessionsProvider._refreshSessionCache()
+    - Diffs current IAgentSession list vs cache
+    - Updates existing AgentSessionAdapter observables
+    - Creates/removes entries as needed
+    - Fires onDidChangeSessions { added, removed, changed }
+  → SessionsProvidersService forwards the event
+  → SessionsManagementService forwards and updates active session
+  → UI re-renders via observable subscriptions
+```
+
+### Session ID Routing
+
+When the management service or UI invokes an action (e.g., `archiveSession`):
+
+```
+sessionId = "default-copilot:background:///untitled-abc123"
+           ├──────────────┤ ├──────────────────────────────┤
+            provider ID      local ID (resource URI string)
+
+SessionsProvidersService._resolveProvider(sessionId)
+  → Splits at first ':'
+  → Looks up provider 'default-copilot' in the registry
+  → Delegates to provider.archiveSession(sessionId)
+```
+
+---
+
+## Context Keys
+
+| Context Key | Type | Description |
+|-------------|------|-------------|
+| `isNewChatSession` | `boolean` | `true` when viewing the new-session form (no established session selected) |
+| `activeSessionProviderId` | `string` | Provider ID of the active session (e.g., `'default-copilot'`) |
+| `activeSessionType` | `string` | Session type of the active session (e.g., `'background'`, `'cloud'`) |
+| `isActiveSessionBackgroundProvider` | `boolean` | Whether the active session uses the background agent provider |
+
+---
+
+## Adding a New Provider
+
+To add a new sessions provider:
+
+1. **Implement `ISessionsProvider`** with a unique `id`, supported `sessionTypes`, and `browseActions`
+2. **Create session data classes** implementing `ISessionData` with observable properties for the new session type
+3. **Register via a workbench contribution** at `WorkbenchPhase.AfterRestored`:
+   ```typescript
+   class MyProviderContribution extends Disposable implements IWorkbenchContribution {
+       constructor(
+           @IInstantiationService instantiationService: IInstantiationService,
+           @ISessionsProvidersService sessionsProvidersService: ISessionsProvidersService,
+       ) {
+           super();
+           const provider = this._register(instantiationService.createInstance(MyProvider));
+           this._register(sessionsProvidersService.registerProvider(provider));
+       }
+   }
+   registerWorkbenchContribution2(MyProviderContribution.ID, MyProviderContribution, WorkbenchPhase.AfterRestored);
+   ```
+4. Session IDs must use the format `${providerId}:${localId}` so the registry can route actions correctly
+5. Fire `onDidChangeSessions` when sessions are added, removed, or updated
+6. The provider's `browseActions` will automatically appear in the workspace picker
+7. The provider's `sessionTypes` will be available for session type selection
diff --git a/src/vs/sessions/browser/layoutActions.ts b/src/vs/sessions/browser/layoutActions.ts
index c9bf983b7c9..996acb9fdeb 100644
--- a/src/vs/sessions/browser/layoutActions.ts
+++ b/src/vs/sessions/browser/layoutActions.ts
@@ -9,20 +9,14 @@ import { KeyCode, KeyMod } from '../../base/common/keyCodes.js';
 import { localize, localize2 } from '../../nls.js';
 import { Categories } from '../../platform/action/common/actionCommonCategories.js';
 import { Action2, MenuRegistry, registerAction2 } from '../../platform/actions/common/actions.js';
-import { ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
 import { Menus } from './menus.js';
 import { ServicesAccessor } from '../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../platform/keybinding/common/keybindingsRegistry.js';
 import { registerIcon } from '../../platform/theme/common/iconRegistry.js';
-import { AuxiliaryBarVisibleContext, IsAuxiliaryWindowContext, IsWindowAlwaysOnTopContext, SideBarVisibleContext } from '../../workbench/common/contextkeys.js';
+import { IsAuxiliaryWindowContext, IsWindowAlwaysOnTopContext } from '../../workbench/common/contextkeys.js';
 import { IWorkbenchLayoutService, Parts } from '../../workbench/services/layout/browser/layoutService.js';
-import { SessionsWelcomeVisibleContext } from '../common/contextkeys.js';
 
 // Register Icons
-const panelLeftIcon = registerIcon('agent-panel-left', Codicon.layoutSidebarLeft, localize('panelLeft', "Represents a side bar in the left position"));
-const panelLeftOffIcon = registerIcon('agent-panel-left-off', Codicon.layoutSidebarLeftOff, localize('panelLeftOff', "Represents a side bar in the left position that is hidden"));
-const panelRightIcon = registerIcon('agent-panel-right', Codicon.layoutSidebarRight, localize('panelRight', "Represents a secondary side bar in the right position"));
-const panelRightOffIcon = registerIcon('agent-panel-right-off', Codicon.layoutSidebarRightOff, localize('panelRightOff', "Represents a secondary side bar in the right position that is hidden"));
 const panelCloseIcon = registerIcon('agent-panel-close', Codicon.close, localize('agentPanelCloseIcon', "Icon to close the panel."));
 
 class ToggleSidebarVisibilityAction extends Action2 {
@@ -34,13 +28,7 @@ class ToggleSidebarVisibilityAction extends Action2 {
 		super({
 			id: ToggleSidebarVisibilityAction.ID,
 			title: localize2('toggleSidebar', 'Toggle Primary Side Bar Visibility'),
-			icon: panelLeftOffIcon,
-			toggled: {
-				condition: SideBarVisibleContext,
-				icon: panelLeftIcon,
-				title: localize('primary sidebar', "Primary Side Bar"),
-				mnemonicTitle: localize({ key: 'primary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Primary Side Bar"),
-			},
+			icon: panelCloseIcon,
 			metadata: {
 				description: localize('openAndCloseSidebar', 'Open/Show and Close/Hide Sidebar'),
 			},
@@ -51,12 +39,6 @@ class ToggleSidebarVisibilityAction extends Action2 {
 				primary: KeyMod.CtrlCmd | KeyCode.KeyB
 			},
 			menu: [
-				{
-					id: Menus.TitleBarLeftLayout,
-					group: 'navigation',
-					order: 0,
-					when: ContextKeyExpr.and(IsAuxiliaryWindowContext.toNegated(), SessionsWelcomeVisibleContext.toNegated())
-				},
 				{
 					id: Menus.TitleBarContext,
 					group: 'navigation',
@@ -90,25 +72,13 @@ class ToggleSecondarySidebarVisibilityAction extends Action2 {
 		super({
 			id: ToggleSecondarySidebarVisibilityAction.ID,
 			title: localize2('toggleSecondarySidebar', 'Toggle Secondary Side Bar Visibility'),
-			icon: panelRightOffIcon,
-			toggled: {
-				condition: AuxiliaryBarVisibleContext,
-				icon: panelRightIcon,
-				title: localize('secondary sidebar', "Secondary Side Bar"),
-				mnemonicTitle: localize({ key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Secondary Side Bar"),
-			},
+			icon: panelCloseIcon,
 			metadata: {
 				description: localize('openAndCloseSecondarySidebar', 'Open/Show and Close/Hide Secondary Side Bar'),
 			},
 			category: Categories.View,
 			f1: true,
 			menu: [
-				{
-					id: Menus.TitleBarRightLayout,
-					group: 'navigation',
-					order: 10,
-					when: ContextKeyExpr.and(IsAuxiliaryWindowContext.toNegated(), SessionsWelcomeVisibleContext.toNegated())
-				},
 				{
 					id: Menus.TitleBarContext,
 					order: 1,
diff --git a/src/vs/sessions/browser/media/style.css b/src/vs/sessions/browser/media/style.css
index 0a57fa73f7d..9b96e780e25 100644
--- a/src/vs/sessions/browser/media/style.css
+++ b/src/vs/sessions/browser/media/style.css
@@ -15,32 +15,49 @@
  *
  * Margin values (must match the constants in the Part classes):
  *   Sidebar:       no card (flush, spans full height)
- *   Auxiliary bar:  top=8, bottom=8, right=8
- *   Panel:          bottom=8, left=8, right=8
+ *   Auxiliary bar:  top=16, bottom=18, right=16
+ *   Panel:          bottom=18, left=16, right=16
  */
 
 .agent-sessions-workbench .part.sidebar {
-	background: var(--vscode-sideBar-background);
-	border-right: 1px solid var(--vscode-sideBar-border, transparent);
+	background: var(--vscode-sessionsSidebar-background);
+}
+
+.agent-sessions-workbench .part.chatbar {
+	margin: 0 12px 2px 12px;
+	background: var(--part-background);
+	border: 1px solid var(--part-border-color, transparent);
+	border-radius: 8px;
+	box-sizing: border-box;
+}
+
+.agent-sessions-workbench:not(.nosidebar) .part.chatbar {
+	margin-left: 0;
 }
 
 .agent-sessions-workbench .part.auxiliarybar {
-	margin: 8px 8px 8px 0;
+	margin: 0 12px 2px 0;
 	background: var(--part-background);
 	border: 1px solid var(--part-border-color, transparent);
 	border-radius: 8px;
+	box-sizing: border-box;
 }
 
 .agent-sessions-workbench .part.panel {
-	margin: 0 8px 8px 8px;
+	margin: 0 12px 14px 12px;
 	background: var(--part-background);
 	border: 1px solid var(--part-border-color, transparent);
 	border-radius: 8px;
+	box-sizing: border-box;
 }
 
-/* Grid background matches the chat bar / sidebar background */
+.agent-sessions-workbench:not(.nosidebar) .part.panel {
+	margin-left: 0;
+}
+
+/* Grid background matches the sessions sidebar background */
 .agent-sessions-workbench > .monaco-grid-view {
-	background-color: var(--vscode-sideBar-background);
+	background-color: var(--vscode-sessionsSidebar-background);
 }
 
 /* ---- Chat Layout ---- */
@@ -54,19 +71,29 @@
 .agent-sessions-workbench .interactive-session .interactive-item-container {
 	max-width: 950px;
 	margin: 0 auto;
-	padding-left: 8px;
-	padding-right: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
 	box-sizing: border-box;
 }
 
 .agent-sessions-workbench .interactive-session > .chat-suggest-next-widget {
 	max-width: 950px;
 	margin: 0 auto;
-	padding-left: 8px;
-	padding-right: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
 	box-sizing: border-box;
 }
 
+/* ---- Chat Output ---- */
+
+/* Top fade overlay: dims content scrolled near the top edge of the chat bar card.
+ * Use the Monaco scroll shadow element, which is only shown when scrollTop > 0. */
+.agent-sessions-workbench .part.chatbar .monaco-scrollable-element > .shadow.top {
+	height: 16px;
+	background: linear-gradient(to bottom, var(--part-background), transparent);
+	box-shadow: none;
+}
+
 /* ---- Chat Input ---- */
 
 .agent-sessions-workbench .interactive-session .chat-input-container {
@@ -79,6 +106,143 @@
 	margin: 0 auto !important;
 	display: inherit !important;
 	/* Align with panel (terminal) card margin */
-	padding: 4px 8px 6px 8px !important;
+	padding: 4px 16px 16px 16px !important;
 	box-sizing: border-box;
 }
+
+/* ---- Modal Editor Block ---- */
+
+.agent-sessions-workbench .monaco-modal-editor-block {
+	background: rgba(0, 0, 0, 0.5);
+}
+
+
+/* ---- Customization Empty State ---- */
+
+/* Icon + title side by side in a row, description underneath */
+.agent-sessions-workbench .ai-customization-list-widget .list-empty-state .empty-state-header {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 6px;
+}
+
+.agent-sessions-workbench .ai-customization-list-widget .list-empty-state .empty-state-header > .empty-state-icon {
+	font-size: 16px;
+	margin-bottom: 0;
+	flex-shrink: 0;
+}
+
+/* MCP / Plugin empty state: icon + title side by side */
+.agent-sessions-workbench .mcp-empty-state .empty-state-header {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 6px;
+}
+
+.agent-sessions-workbench .mcp-empty-state .empty-state-header > .empty-icon {
+	font-size: 16px;
+	margin-bottom: 0;
+	flex-shrink: 0;
+}
+
+/* ---- Part Appear Transitions ---- */
+
+/*
+ * Subtle appear animation when parts transition from display:none → visible
+ * (via split-view-view .visible class).
+ *
+ * Auxiliary bar, panel, and chat bar animate their container via opacity,
+ * margin, border-color, and background. The sidebar reveal animation applies
+ * only to `.part.sidebar > .content`, using opacity + transform so the
+ * sidebar container, header, and footer stay visually fixed.
+ *
+ * Opacity transiently creates a stacking context while it animates from 0 to 1
+ * over 250ms — once settled at opacity: 1, no additional stacking context is
+ * introduced by this animation. Margin and transform shifts are purely visual
+ * within the grid-allocated space.
+ */
+
+.agent-sessions-workbench .part.auxiliarybar,
+.agent-sessions-workbench .part.panel,
+.agent-sessions-workbench .part.chatbar {
+	transition:
+		opacity 250ms ease-out,
+		margin-top 250ms ease-out,
+		margin-right 250ms ease-out,
+		margin-bottom 250ms ease-out,
+		border-color 250ms ease-out,
+		background 250ms ease-out;
+}
+
+/* Auxiliary bar also transitions horizontal margin */
+.agent-sessions-workbench .part.auxiliarybar {
+	transition:
+		opacity 250ms ease-out,
+		margin 250ms ease-out,
+		border-color 250ms ease-out,
+		background 250ms ease-out;
+}
+
+.agent-sessions-workbench .part.sidebar > .content {
+	transition:
+		opacity 250ms ease-out,
+		transform 250ms ease-out;
+}
+
+@starting-style {
+	/* Shared starting values */
+	.agent-sessions-workbench .part.auxiliarybar,
+	.agent-sessions-workbench .part.panel,
+	.agent-sessions-workbench .part.chatbar {
+		opacity: 0;
+		border-color: transparent;
+	}
+
+	/* Card parts: blend from surrounding background */
+	.agent-sessions-workbench .part.auxiliarybar,
+	.agent-sessions-workbench .part.panel,
+	.agent-sessions-workbench .part.chatbar {
+		background: color-mix(in srgb, var(--part-background) 60%, var(--vscode-sideBar-background));
+	}
+
+	.agent-sessions-workbench .part.sidebar > .content {
+		opacity: 0;
+		transform: translateX(-6px);
+	}
+
+	/* Panel (bottom): slides down from 6px above → margin: 0 16px 18px 16px */
+	.agent-sessions-workbench .part.panel {
+		margin: 6px 16px 18px 16px;
+	}
+
+	/* Auxiliary bar (right): slides in from 6px right → margin: 0 16px 2px 0 */
+	.agent-sessions-workbench .part.auxiliarybar {
+		margin: 0 16px 2px 6px;
+	}
+
+	/* Chat bar (center-bottom): slides up from 6px below → margin: 0 16px 2px 16px */
+	.agent-sessions-workbench .part.chatbar {
+		margin: 6px 16px 2px 16px;
+	}
+}
+
+@media (prefers-reduced-motion: reduce) {
+	.agent-sessions-workbench .part.auxiliarybar,
+	.agent-sessions-workbench .part.panel,
+	.agent-sessions-workbench .part.chatbar {
+		transition: none;
+	}
+
+	.agent-sessions-workbench .part.sidebar > .content {
+		transition: none;
+	}
+}
+
+/* ---- Widget Customizations ---- */
+
+/* Badge */
+.agent-sessions-workbench .badge > .badge-content {
+	border-radius: 4px !important;
+}
diff --git a/src/vs/sessions/browser/menus.ts b/src/vs/sessions/browser/menus.ts
index c322fba968b..600ab4d3cbd 100644
--- a/src/vs/sessions/browser/menus.ts
+++ b/src/vs/sessions/browser/menus.ts
@@ -24,4 +24,10 @@ export const Menus = {
 	SidebarFooter: new MenuId('SessionsSidebarFooter'),
 	SidebarCustomizations: new MenuId('SessionsSidebarCustomizations'),
 	AgentFeedbackEditorContent: new MenuId('AgentFeedbackEditorContent'),
+
+	// New session picker menus — providers contribute actions into these
+	// scoped by context keys (sessionsProviderId, sessionType, etc.)
+	NewSessionRepositoryConfig: new MenuId('NewSessions.RepositoryConfigMenu'),
+	NewSessionConfig: new MenuId('NewSessions.SessionConfigMenu'),
+	NewSessionControl: new MenuId('NewSessions.SessionControlMenu'),
 } as const;
diff --git a/src/vs/sessions/browser/parts/auxiliaryBarPart.ts b/src/vs/sessions/browser/parts/auxiliaryBarPart.ts
index f97118b5419..97dad470f20 100644
--- a/src/vs/sessions/browser/parts/auxiliaryBarPart.ts
+++ b/src/vs/sessions/browser/parts/auxiliaryBarPart.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import '../../../workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css';
+import './media/auxiliaryBarPart.css';
 import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
@@ -12,9 +13,9 @@ import { INotificationService } from '../../../platform/notification/common/noti
 import { IStorageService } from '../../../platform/storage/common/storage.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
 import { ActiveAuxiliaryContext, AuxiliaryBarFocusContext } from '../../../workbench/common/contextkeys.js';
-import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../workbench/common/theme.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_BORDER, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../workbench/common/theme.js';
 import { contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
-import { sessionsSidebarBorder } from '../../common/theme.js';
+import { sessionsAuxiliaryBarBackground } from '../../common/theme.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../workbench/common/views.js';
 import { IExtensionService } from '../../../workbench/services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService, Parts } from '../../../workbench/services/layout/browser/layoutService.js';
@@ -47,9 +48,9 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 	static readonly viewContainersWorkspaceStateKey = 'workbench.agentsession.auxiliarybar.viewContainersWorkspaceState';
 
 	/** Visual margin values for the card-like appearance */
-	static readonly MARGIN_TOP = 8;
-	static readonly MARGIN_BOTTOM = 8;
-	static readonly MARGIN_RIGHT = 8;
+	static readonly MARGIN_TOP = 12;
+	static readonly MARGIN_BOTTOM = 2;
+	static readonly MARGIN_RIGHT = 12;
 
 	// Action ID for run script - defined here to avoid layering issues
 	private static readonly RUN_SCRIPT_ACTION_ID = 'workbench.action.agentSessions.runScript';
@@ -82,7 +83,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			return undefined;
 		}
 
-		return Math.max(width, 300);
+		return Math.max(width, 380);
 	}
 
 	readonly priority = LayoutPriority.Low;
@@ -106,7 +107,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			{
 				hasTitle: true,
 				trailingSeparator: false,
-				borderWidth: () => (this.getColor(sessionsSidebarBorder) || this.getColor(contrastBorder)) ? 1 : 0,
+				borderWidth: () => 0,
 			},
 			AuxiliaryBarPart.activeViewSettingsKey,
 			ActiveAuxiliaryContext.bindTo(contextKeyService),
@@ -141,9 +142,9 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 		const container = assertReturnsDefined(this.getContainer());
 
 		// Store background and border as CSS variables for the card styling on .part
-		container.style.setProperty('--part-background', this.getColor(SIDE_BAR_BACKGROUND) || '');
-		container.style.setProperty('--part-border-color', this.getColor(sessionsSidebarBorder) || this.getColor(contrastBorder) || 'transparent');
-		container.style.backgroundColor = 'transparent';
+		container.style.setProperty('--part-background', this.getColor(sessionsAuxiliaryBarBackground) || '');
+		container.style.setProperty('--part-border-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || 'transparent');
+		container.style.backgroundColor = this.getColor(sessionsAuxiliaryBarBackground) || '';
 		container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
 
 		// Clear borders - the card appearance uses border-radius instead
@@ -173,8 +174,8 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			iconSize: 16,
 			get overflowActionSize() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? 40 : 30; },
 			colors: theme => ({
-				activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
-				inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
+				activeBackgroundColor: theme.getColor(sessionsAuxiliaryBarBackground),
+				inactiveBackgroundColor: theme.getColor(sessionsAuxiliaryBarBackground),
 				get activeBorderBottomColor() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_ACTIVE_TITLE_BORDER) : theme.getColor(ACTIVITY_BAR_TOP_ACTIVE_BORDER); },
 				get activeForegroundColor() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND) : theme.getColor(ACTIVITY_BAR_TOP_FOREGROUND); },
 				get inactiveForegroundColor() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND) : theme.getColor(ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND); },
@@ -261,10 +262,11 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			return;
 		}
 
-		// Layout content with reduced dimensions to account for visual margins
+		// Layout content with reduced dimensions to account for visual margins and border
+		const borderTotal = 2; // 1px border on each side
 		super.layout(
-			width - AuxiliaryBarPart.MARGIN_RIGHT,
-			height - AuxiliaryBarPart.MARGIN_TOP - AuxiliaryBarPart.MARGIN_BOTTOM,
+			width - AuxiliaryBarPart.MARGIN_RIGHT - borderTotal,
+			height - AuxiliaryBarPart.MARGIN_TOP - AuxiliaryBarPart.MARGIN_BOTTOM - borderTotal,
 			top, left
 		);
 
diff --git a/src/vs/sessions/browser/parts/chatBarPart.ts b/src/vs/sessions/browser/parts/chatBarPart.ts
index ebafc12e5c3..35ae014de3d 100644
--- a/src/vs/sessions/browser/parts/chatBarPart.ts
+++ b/src/vs/sessions/browser/parts/chatBarPart.ts
@@ -11,7 +11,9 @@ import { IKeybindingService } from '../../../platform/keybinding/common/keybindi
 import { INotificationService } from '../../../platform/notification/common/notification.js';
 import { IStorageService } from '../../../platform/storage/common/storage.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
-import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../workbench/common/theme.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_BORDER, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../workbench/common/theme.js';
+import { contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
+import { sessionsChatBarBackground } from '../../common/theme.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../workbench/common/views.js';
 import { IExtensionService } from '../../../workbench/services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService, Parts } from '../../../workbench/services/layout/browser/layoutService.js';
@@ -19,6 +21,7 @@ import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
 import { assertReturnsDefined } from '../../../base/common/types.js';
 import { LayoutPriority } from '../../../base/browser/ui/splitview/splitview.js';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../../../workbench/browser/parts/paneCompositePart.js';
+import { Part } from '../../../workbench/browser/part.js';
 import { ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { IPaneCompositeBarOptions } from '../../../workbench/browser/parts/paneCompositeBar.js';
 import { IMenuService } from '../../../platform/actions/common/actions.js';
@@ -39,6 +42,15 @@ export class ChatBarPart extends AbstractPaneCompositePart {
 	override readonly minimumHeight: number = 0;
 	override readonly maximumHeight: number = Number.POSITIVE_INFINITY;
 
+	/** Visual margin values for the card-like appearance */
+	static readonly MARGIN_TOP = 12;
+	static readonly MARGIN_LEFT = 12;
+	static readonly MARGIN_RIGHT = 12;
+	static readonly MARGIN_BOTTOM = 2;
+
+	/** Border width on the card (1px each side) */
+	static readonly BORDER_WIDTH = 1;
+
 	get preferredHeight(): number | undefined {
 		return this.layoutService.mainContainerDimension.height * 0.4;
 	}
@@ -96,10 +108,32 @@ export class ChatBarPart extends AbstractPaneCompositePart {
 		super.updateStyles();
 
 		const container = assertReturnsDefined(this.getContainer());
-		container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
+
+		// Store background and border as CSS variables for the card styling on .part
+		container.style.setProperty('--part-background', this.getColor(sessionsChatBarBackground) || '');
+		container.style.setProperty('--part-border-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || 'transparent');
+		container.style.backgroundColor = this.getColor(sessionsChatBarBackground) || '';
 		container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
 	}
 
+	override layout(width: number, height: number, top: number, left: number): void {
+		if (!this.layoutService.isVisible(Parts.CHATBAR_PART)) {
+			return;
+		}
+
+		// Layout content with reduced dimensions to account for visual margins and border
+		const borderTotal = ChatBarPart.BORDER_WIDTH * 2;
+		const marginLeft = this.layoutService.isVisible(Parts.SIDEBAR_PART) ? 0 : ChatBarPart.MARGIN_LEFT;
+		super.layout(
+			width - marginLeft - ChatBarPart.MARGIN_RIGHT - borderTotal,
+			height - ChatBarPart.MARGIN_TOP - ChatBarPart.MARGIN_BOTTOM - borderTotal,
+			top, left
+		);
+
+		// Restore the full grid-allocated dimensions so that Part.relayout() works correctly.
+		Part.prototype.layout.call(this, width, height, top, left);
+	}
+
 	protected getCompositeBarOptions(): IPaneCompositeBarOptions {
 		return {
 			partContainerClass: 'chatbar',
@@ -117,8 +151,8 @@ export class ChatBarPart extends AbstractPaneCompositePart {
 			iconSize: 16,
 			overflowActionSize: 30,
 			colors: theme => ({
-				activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
-				inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
+				activeBackgroundColor: theme.getColor(sessionsChatBarBackground),
+				inactiveBackgroundColor: theme.getColor(sessionsChatBarBackground),
 				activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
 				activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
 				inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
diff --git a/src/vs/sessions/browser/parts/media/auxiliaryBarPart.css b/src/vs/sessions/browser/parts/media/auxiliaryBarPart.css
new file mode 100644
index 00000000000..d3802d00b10
--- /dev/null
+++ b/src/vs/sessions/browser/parts/media/auxiliaryBarPart.css
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* ===== Modern action label styling for sessions auxiliary bar ===== */
+
+/* Base label: lowercase text + heavier weight + pill padding */
+.agent-sessions-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.icon) .action-label {
+	text-transform: capitalize;
+	font-weight: 500;
+	border-radius: 4px;
+	padding: 0px 8px;
+	font-size: 12px;
+	line-height: 22px;
+}
+
+.agent-sessions-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item {
+	padding-left: 0;
+	padding-right: 0;
+}
+
+.agent-sessions-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .badge {
+	margin-left: -4px;
+	padding-right: 6px;
+}
+
+.agent-sessions-workbench .part.auxiliarybar > .title {
+	padding-left: 4px;
+	padding-right: 2px;
+	background-color: var(--vscode-sessionsAuxiliaryBar-background);
+}
+
+/* Hide the underline indicator entirely */
+.agent-sessions-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .active-item-indicator:before {
+	display: none !important;
+}
+
+/* Active/checked state: background container instead of underline */
+.agent-sessions-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked {
+	background-color: var(--vscode-activityBarTop-activeBackground, color-mix(in srgb, var(--vscode-sideBarTitle-foreground) 5%, transparent)) !important;
+	border-radius: 4px;
+}
+
+/* Override base workbench monaco editor background in auxiliary bar content */
+.agent-sessions-workbench .part.auxiliarybar > .content .monaco-editor,
+.agent-sessions-workbench .part.auxiliarybar > .content .monaco-editor .margin,
+.agent-sessions-workbench .part.auxiliarybar > .content .monaco-editor .monaco-editor-background {
+	background-color: var(--vscode-sessionsAuxiliaryBar-background);
+}
diff --git a/src/vs/sessions/browser/parts/media/chatBarPart.css b/src/vs/sessions/browser/parts/media/chatBarPart.css
index 4db26e2e5b0..94dfd719e50 100644
--- a/src/vs/sessions/browser/parts/media/chatBarPart.css
+++ b/src/vs/sessions/browser/parts/media/chatBarPart.css
@@ -14,6 +14,10 @@
 	background-color: var(--vscode-sideBar-background);
 }
 
+.monaco-workbench .part.chatbar > .content > .monaco-progress-container {
+	top: 0;
+}
+
 .monaco-workbench .part.chatbar .title-actions .actions-container {
 	justify-content: flex-end;
 }
diff --git a/src/vs/sessions/browser/parts/media/panelPart.css b/src/vs/sessions/browser/parts/media/panelPart.css
index 92e2987bb32..7156bcb1d91 100644
--- a/src/vs/sessions/browser/parts/media/panelPart.css
+++ b/src/vs/sessions/browser/parts/media/panelPart.css
@@ -7,3 +7,39 @@
 .monaco-workbench .part.panel.bottom .composite.title {
 	border-top-width: 0;
 }
+
+/* ===== Modern action label styling for sessions panel ===== */
+
+/* Hide the underline indicator entirely */
+.agent-sessions-workbench .part.panel > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .active-item-indicator:before {
+	display: none !important;
+}
+
+/* Make icon action items 24px tall */
+.agent-sessions-workbench .part.panel > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon {
+	height: 24px;
+}
+
+.agent-sessions-workbench .part.panel > .title {
+	padding-left: 6px;
+	padding-right: 6px;
+	background-color: var(--vscode-sessionsPanel-background);
+}
+
+/* Active/checked state: background container instead of underline */
+.agent-sessions-workbench .part.panel > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked {
+	background-color: var(--vscode-activityBarTop-activeBackground, color-mix(in srgb, var(--vscode-sideBarTitle-foreground) 5%, transparent)) !important;
+	border-radius: 4px;
+}
+
+/* Override base workbench panel content background for terminal */
+.agent-sessions-workbench .part.panel > .content .monaco-editor,
+.agent-sessions-workbench .part.panel > .content .monaco-editor .margin,
+.agent-sessions-workbench .part.panel > .content .monaco-editor .monaco-editor-background {
+	background-color: var(--vscode-sessionsPanel-background);
+}
+
+/* Terminal body background */
+.agent-sessions-workbench .part.panel .terminal-wrapper {
+	background-color: var(--vscode-sessionsPanel-background);
+}
diff --git a/src/vs/sessions/browser/parts/media/sidebarPart.css b/src/vs/sessions/browser/parts/media/sidebarPart.css
index 0162bcb26d0..bc92b2b424e 100644
--- a/src/vs/sessions/browser/parts/media/sidebarPart.css
+++ b/src/vs/sessions/browser/parts/media/sidebarPart.css
@@ -24,20 +24,37 @@
 }
 
 /* Interactive elements in the title area must not be draggable */
-.agent-sessions-workbench .part.sidebar > .composite.title .action-item {
+.agent-sessions-workbench .part.sidebar > .composite.title .action-item,
+.agent-sessions-workbench .part.sidebar > .composite.title > .session-status-toggle {
 	-webkit-app-region: no-drag;
 }
 
 /* Sidebar Footer Container */
-.monaco-workbench .part.sidebar > .sidebar-footer {
+.agent-sessions-workbench .part.sidebar > .sidebar-footer {
 	display: flex;
 	align-items: stretch;
 	gap: 4px;
-	padding: 6px;
-	border-top: 1px solid var(--vscode-sideBarSectionHeader-border, transparent);
+	padding: 6px 0;
+	border-top: 1px solid var(--vscode-panel-border, transparent);
+	margin: 0 12px 12px 12px;
 	flex-shrink: 0;
 }
 
+/* Inset pane section header borders — hide inline border-top, replace with inset pseudo-element */
+.agent-sessions-workbench .part.sidebar .pane > .pane-header {
+	border-top-color: transparent !important;
+}
+
+.agent-sessions-workbench .part.sidebar .split-view-view:not(:first-of-type) > .pane > .pane-header::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 12px;
+	right: 0;
+	height: 1px;
+	background-color: var(--vscode-panel-border, transparent);
+}
+
 /* Make the toolbar fill the footer width and stack actions vertically */
 .monaco-workbench .part.sidebar > .sidebar-footer .monaco-toolbar,
 .monaco-workbench .part.sidebar > .sidebar-footer .monaco-action-bar,
@@ -56,3 +73,38 @@
 	max-width: 100%;
 	cursor: default;
 }
+
+/* Session status toggle — standalone button in sidebar title area */
+.agent-sessions-workbench .part.sidebar .session-status-toggle {
+	display: flex;
+	align-items: center;
+	align-self: center;
+	gap: 3px;
+	height: 22px;
+	padding: 0 4px;
+	margin-right: 4px;
+	border: none;
+	border-radius: 4px;
+	cursor: pointer;
+	color: inherit;
+	font: inherit;
+	background: var(--vscode-toolbar-activeBackground);
+	outline: none;
+	position: relative;
+	z-index: 1;
+}
+
+.agent-sessions-workbench .part.sidebar .session-status-toggle:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.agent-sessions-workbench .part.sidebar .session-status-toggle .codicon {
+	font-size: 16px;
+}
+
+.agent-sessions-workbench .part.sidebar .session-status-toggle-badge {
+	font-size: 12px;
+	font-variant-numeric: tabular-nums;
+	line-height: 16px;
+	color: inherit;
+}
diff --git a/src/vs/sessions/browser/parts/media/titlebarpart.css b/src/vs/sessions/browser/parts/media/titlebarpart.css
index 146ed67fa61..6c22ca862d3 100644
--- a/src/vs/sessions/browser/parts/media/titlebarpart.css
+++ b/src/vs/sessions/browser/parts/media/titlebarpart.css
@@ -38,12 +38,12 @@
 	margin: unset;
 }
 
-.agent-sessions-workbench.monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right {
+.agent-sessions-workbench.monaco-workbench.mac .part.titlebar > .sessions-titlebar-container > .titlebar-right {
 	order: 2;
 	width: fit-content;
 	flex-grow: 0;
 	justify-content: flex-end;
-	margin-right: 10px;
+	margin-right: 12px;
 }
 
 /* Session Title Actions Container (before right toolbar) */
@@ -59,8 +59,8 @@
 	align-items: center;
 }
 
-/* Separator between session actions and layout actions toolbar */
-.monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right > .titlebar-session-actions-container:not(.has-no-actions) + .titlebar-layout-actions-container:not(.has-no-actions)::before {
+/* Separator before right layout toolbar */
+.monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right > .titlebar-right-layout-container:not(.has-no-actions)::before {
 	content: '';
 	width: 1px;
 	height: 16px;
@@ -68,8 +68,14 @@
 	background-color: var(--vscode-disabledForeground);
 }
 
-.monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right > .titlebar-actions-container .codicon {
-	color: inherit;
+/* Toggled action buttons in session actions toolbar */
+.monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right > .titlebar-session-actions-container .action-label.checked {
+	background: var(--vscode-toolbar-activeBackground);
+	border-radius: var(--vscode-cornerRadius-medium);
+}
+
+.monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right > .titlebar-actions-container .monaco-action-bar .action-item:not(.disabled) .codicon {
+	color: var(--vscode-icon-foreground);
 }
 
 .monaco-workbench .part.titlebar > .sessions-titlebar-container > .titlebar-right > .titlebar-actions-container .monaco-action-bar .action-item {
@@ -109,6 +115,11 @@
 	display: none !important;
 }
 
+/* Remove the titlebar shadow in agent sessions */
+.agent-sessions-workbench.monaco-workbench .part.titlebar {
+	box-shadow: none;
+}
+
 /* macOS native: the spacer uses window-controls-container but should not block dragging */
 .agent-sessions-workbench.mac .part.titlebar .window-controls-container {
 	-webkit-app-region: drag;
diff --git a/src/vs/sessions/browser/parts/panelPart.ts b/src/vs/sessions/browser/parts/panelPart.ts
index 2fccc865f15..cc1f700ba01 100644
--- a/src/vs/sessions/browser/parts/panelPart.ts
+++ b/src/vs/sessions/browser/parts/panelPart.ts
@@ -14,9 +14,9 @@ import { IContextMenuService } from '../../../platform/contextview/browser/conte
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
-import { PANEL_BACKGROUND, PANEL_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER, PANEL_TITLE_BADGE_BACKGROUND, PANEL_TITLE_BADGE_FOREGROUND } from '../../../workbench/common/theme.js';
+import { PANEL_BORDER, PANEL_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER, PANEL_TITLE_BADGE_BACKGROUND, PANEL_TITLE_BADGE_FOREGROUND } from '../../../workbench/common/theme.js';
 import { contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
-import { sessionsSidebarBorder } from '../../common/theme.js';
+import { sessionsPanelBackground } from '../../common/theme.js';
 import { INotificationService } from '../../../platform/notification/common/notification.js';
 import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
 import { assertReturnsDefined } from '../../../base/common/types.js';
@@ -69,9 +69,9 @@ export class PanelPart extends AbstractPaneCompositePart {
 	static readonly activePanelSettingsKey = 'workbench.agentsession.panelpart.activepanelid';
 
 	/** Visual margin values for the card-like appearance */
-	static readonly MARGIN_BOTTOM = 8;
-	static readonly MARGIN_LEFT = 8;
-	static readonly MARGIN_RIGHT = 8;
+	static readonly MARGIN_BOTTOM = 14;
+	static readonly MARGIN_LEFT = 12;
+	static readonly MARGIN_RIGHT = 12;
 
 	constructor(
 		@INotificationService notificationService: INotificationService,
@@ -129,9 +129,9 @@ export class PanelPart extends AbstractPaneCompositePart {
 		const container = assertReturnsDefined(this.getContainer());
 
 		// Store background and border as CSS variables for the card styling on .part
-		container.style.setProperty('--part-background', this.getColor(PANEL_BACKGROUND) || '');
-		container.style.setProperty('--part-border-color', this.getColor(sessionsSidebarBorder) || this.getColor(contrastBorder) || 'transparent');
-		container.style.backgroundColor = 'transparent';
+		container.style.setProperty('--part-background', this.getColor(sessionsPanelBackground) || '');
+		container.style.setProperty('--part-border-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder) || 'transparent');
+		container.style.backgroundColor = this.getColor(sessionsPanelBackground) || '';
 
 		// Clear inline borders - the card appearance uses CSS border-radius instead
 		container.style.borderTopColor = '';
@@ -157,8 +157,8 @@ export class PanelPart extends AbstractPaneCompositePart {
 			compact: true,
 			overflowActionSize: 44,
 			colors: theme => ({
-				activeBackgroundColor: theme.getColor(PANEL_BACKGROUND),
-				inactiveBackgroundColor: theme.getColor(PANEL_BACKGROUND),
+				activeBackgroundColor: theme.getColor(sessionsPanelBackground),
+				inactiveBackgroundColor: theme.getColor(sessionsPanelBackground),
 				activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
 				activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
 				inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
@@ -176,10 +176,12 @@ export class PanelPart extends AbstractPaneCompositePart {
 			return;
 		}
 
-		// Layout content with reduced dimensions to account for visual margins
+		// Layout content with reduced dimensions to account for visual margins and border
+		const borderTotal = 2; // 1px border on each side
+		const marginLeft = this.layoutService.isVisible(Parts.SIDEBAR_PART) ? 0 : PanelPart.MARGIN_LEFT;
 		super.layout(
-			width - PanelPart.MARGIN_LEFT - PanelPart.MARGIN_RIGHT,
-			height - PanelPart.MARGIN_BOTTOM,
+			width - marginLeft - PanelPart.MARGIN_RIGHT - borderTotal,
+			height - PanelPart.MARGIN_BOTTOM - borderTotal,
 			top, left
 		);
 
diff --git a/src/vs/sessions/browser/parts/sidebarPart.ts b/src/vs/sessions/browser/parts/sidebarPart.ts
index 75eb74869dd..cca74c97a11 100644
--- a/src/vs/sessions/browser/parts/sidebarPart.ts
+++ b/src/vs/sessions/browser/parts/sidebarPart.ts
@@ -12,9 +12,8 @@ import { IContextMenuService } from '../../../platform/contextview/browser/conte
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
-import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from '../../../workbench/common/theme.js';
-import { contrastBorder } from '../../../platform/theme/common/colorRegistry.js';
-import { sessionsSidebarBorder, sessionsSidebarHeaderBackground, sessionsSidebarHeaderForeground } from '../../common/theme.js';
+import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from '../../../workbench/common/theme.js';
+import { sessionsSidebarBackground, sessionsSidebarHeaderBackground, sessionsSidebarHeaderForeground } from '../../common/theme.js';
 import { INotificationService } from '../../../platform/notification/common/notification.js';
 import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
 import { AnchorAlignment } from '../../../base/browser/ui/contextview/contextview.js';
@@ -33,13 +32,19 @@ import { Separator } from '../../../base/common/actions.js';
 import { IHoverService } from '../../../platform/hover/browser/hover.js';
 import { Extensions } from '../../../workbench/browser/panecomposite.js';
 import { Menus } from '../menus.js';
-import { $, append, getWindowId, prepend } from '../../../base/browser/dom.js';
+import { $, addDisposableListener, append, EventType, getWindowId, prepend } from '../../../base/browser/dom.js';
 import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
 import { isMacintosh, isNative } from '../../../base/common/platform.js';
 import { isFullscreen, onDidChangeFullscreen } from '../../../base/browser/browser.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { hasNativeTitlebar, getTitleBarStyle } from '../../../platform/window/common/window.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { IAgentSessionsService } from '../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { countUnreadSessions } from '../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { localize } from '../../../nls.js';
 
 /**
  * Sidebar part specifically for agent sessions workbench.
@@ -59,6 +64,8 @@ export class SidebarPart extends AbstractPaneCompositePart {
 	private static readonly FOOTER_ITEM_HEIGHT = 26;
 	private static readonly FOOTER_ITEM_GAP = 4;
 	private static readonly FOOTER_VERTICAL_PADDING = 6;
+	private static readonly FOOTER_BOTTOM_MARGIN = 12;
+	private static readonly FOOTER_BORDER_TOP = 1;
 
 	private footerContainer: HTMLElement | undefined;
 	private sideBarTitleArea: HTMLElement | undefined;
@@ -109,7 +116,7 @@ export class SidebarPart extends AbstractPaneCompositePart {
 	) {
 		super(
 			Parts.SIDEBAR_PART,
-			{ hasTitle: true, trailingSeparator: false, borderWidth: () => (this.getColor(sessionsSidebarBorder) || this.getColor(contrastBorder)) ? 1 : 0 },
+			{ hasTitle: true, trailingSeparator: false, borderWidth: () => 0 },
 			SidebarPart.activeViewletSettingsKey,
 			ActiveViewletContext.bindTo(contextKeyService),
 			SidebarFocusContext.bindTo(contextKeyService),
@@ -151,6 +158,11 @@ export class SidebarPart extends AbstractPaneCompositePart {
 			prepend(titleArea, $('div.titlebar-drag-region'));
 		}
 
+		// Session toggle widget (right side of title area)
+		if (titleArea) {
+			this.createSessionsToggle(titleArea);
+		}
+
 		// macOS native: the sidebar spans full height and the traffic lights
 		// overlay the top-left corner. Add a fixed-width spacer inside the
 		// title area to push content horizontally past the traffic lights.
@@ -177,6 +189,49 @@ export class SidebarPart extends AbstractPaneCompositePart {
 		return titleArea;
 	}
 
+	/**
+	 * Creates a standalone session toggle widget appended to the sidebar title area.
+	 * Displays a tasklist icon with an optional unread badge. Clicking hides the sidebar.
+	 */
+	private createSessionsToggle(titleArea: HTMLElement): void {
+		const widgetDisposables = this._register(new DisposableStore());
+
+		const widget = append(titleArea, $('button.session-status-toggle')) as HTMLButtonElement;
+		widget.type = 'button';
+		widget.tabIndex = 0;
+		widget.setAttribute('aria-label', localize('hideSidebar', "Hide Side Bar"));
+		append(widget, $(ThemeIcon.asCSSSelector(Codicon.tasklist)));
+		const badge = append(widget, $('span.session-status-toggle-badge'));
+
+		// Toggle sidebar on click
+		widgetDisposables.add(addDisposableListener(widget, EventType.CLICK, (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
+		}));
+
+		// Update badge on session changes (deferred to avoid service unavailability)
+		const updateBadge = (svc: IAgentSessionsService) => {
+			const unread = countUnreadSessions(svc.model.sessions);
+			badge.textContent = unread > 0 ? `${unread}` : '';
+			badge.style.display = unread > 0 ? '' : 'none';
+			widget.setAttribute('aria-label', unread > 0
+				? localize('hideSidebarUnread', "Hide Side Bar, {0} unread session(s)", unread)
+				: localize('hideSidebar', "Hide Side Bar"));
+		};
+
+		setTimeout(() => {
+			try {
+				const svc = this.instantiationService.invokeFunction(accessor => accessor.get(IAgentSessionsService));
+				updateBadge(svc);
+				widgetDisposables.add(svc.model.onDidChangeSessions(() => updateBadge(svc)));
+			} catch {
+				// Service not yet available
+				badge.style.display = 'none';
+			}
+		}, 0);
+	}
+
 	private createFooter(parent: HTMLElement): void {
 		const footer = append(parent, $('.sidebar-footer.sidebar-action-list'));
 		this.footerContainer = footer;
@@ -203,7 +258,9 @@ export class SidebarPart extends AbstractPaneCompositePart {
 
 		return SidebarPart.FOOTER_VERTICAL_PADDING * 2
 			+ (actionCount * SidebarPart.FOOTER_ITEM_HEIGHT)
-			+ ((actionCount - 1) * SidebarPart.FOOTER_ITEM_GAP);
+			+ ((actionCount - 1) * SidebarPart.FOOTER_ITEM_GAP)
+			+ SidebarPart.FOOTER_BOTTOM_MARGIN
+			+ SidebarPart.FOOTER_BORDER_TOP;
 	}
 
 	private updateFooterVisibility(): void {
@@ -220,15 +277,14 @@ export class SidebarPart extends AbstractPaneCompositePart {
 
 		const container = assertReturnsDefined(this.getContainer());
 
-		container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
+		container.style.backgroundColor = this.getColor(sessionsSidebarBackground) || '';
 		container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
 		container.style.outlineColor = this.getColor(SIDE_BAR_DRAG_AND_DROP_BACKGROUND) ?? '';
 
-		// Right border to separate from the right section
-		const borderColor = this.getColor(sessionsSidebarBorder) || this.getColor(contrastBorder) || '';
-		container.style.borderRightWidth = borderColor ? '1px' : '';
-		container.style.borderRightStyle = borderColor ? 'solid' : '';
-		container.style.borderRightColor = borderColor;
+		// No right border in sessions sidebar
+		container.style.borderRightWidth = '';
+		container.style.borderRightStyle = '';
+		container.style.borderRightColor = '';
 
 		// Title area uses sessions-specific header colors
 		if (this.sideBarTitleArea) {
@@ -295,8 +351,8 @@ export class SidebarPart extends AbstractPaneCompositePart {
 			iconSize: 16,
 			overflowActionSize: 30,
 			colors: theme => ({
-				activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
-				inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
+				activeBackgroundColor: theme.getColor(sessionsSidebarBackground),
+				inactiveBackgroundColor: theme.getColor(sessionsSidebarBackground),
 				activeBorderBottomColor: theme.getColor(ACTIVITY_BAR_TOP_ACTIVE_BORDER),
 				activeForegroundColor: theme.getColor(ACTIVITY_BAR_TOP_FOREGROUND),
 				inactiveForegroundColor: theme.getColor(ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND),
diff --git a/src/vs/sessions/browser/parts/titlebarPart.ts b/src/vs/sessions/browser/parts/titlebarPart.ts
index 18c2d2867f0..c6895116d9c 100644
--- a/src/vs/sessions/browser/parts/titlebarPart.ts
+++ b/src/vs/sessions/browser/parts/titlebarPart.ts
@@ -81,6 +81,10 @@ export class TitlebarPart extends Part implements ITitlebarPart {
 	private centerContent!: HTMLElement;
 	private rightContent!: HTMLElement;
 
+	get leftContainer(): HTMLElement { return this.leftContent; }
+	get rightContainer(): HTMLElement { return this.rightContent; }
+	get rightWindowControlsContainer(): HTMLElement | undefined { return this.windowControlsContainer; }
+
 	private readonly titleBarStyle: TitlebarStyle;
 	private isInactive: boolean = false;
 
@@ -203,10 +207,11 @@ export class TitlebarPart extends Part implements ITitlebarPart {
 			toolbarOptions: { primaryGroup: () => true },
 		}));
 
-		// Right toolbar (driven by Menus.TitleBarRight - includes account submenu)
-		const rightToolbarContainer = prepend(this.rightContent, $('div.titlebar-actions-container.titlebar-layout-actions-container'));
+		// Right toolbar (driven by Menus.TitleBarRightLayout - includes layout actions)
+		const rightToolbarContainer = prepend(this.rightContent, $('div.titlebar-actions-container.titlebar-right-layout-container'));
 		this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, rightToolbarContainer, Menus.TitleBarRightLayout, {
 			contextMenu: Menus.TitleBarContext,
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
 			telemetrySource: 'titlePart.right',
 			toolbarOptions: { primaryGroup: () => true },
 		}));
diff --git a/src/vs/sessions/browser/workbench.ts b/src/vs/sessions/browser/workbench.ts
index 1b34d6c3aec..3ebbfbf7da0 100644
--- a/src/vs/sessions/browser/workbench.ts
+++ b/src/vs/sessions/browser/workbench.ts
@@ -783,7 +783,7 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 
 		// Default sizes
 		const sideBarSize = 300;
-		const auxiliaryBarSize = 300;
+		const auxiliaryBarSize = 380;
 		const panelSize = 300;
 		const titleBarHeight = this.titleBarPartView?.minimumHeight ?? 30;
 
@@ -1123,6 +1123,8 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 			this.workbenchGrid.exitMaximizedView();
 		}
 
+		const panelHadFocus = !hidden || this.hasFocus(Parts.PANEL_PART);
+
 		this.partVisibility.panel = !hidden;
 		this.mainContainer.classList.toggle(LayoutClasses.PANEL_HIDDEN, hidden);
 
@@ -1135,15 +1137,24 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 		// If panel becomes hidden, also hide the current active pane composite
 		if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
 			this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Panel);
+
+			// Focus the chat bar when hiding the panel if it had focus
+			if (panelHadFocus) {
+				this.focusPart(Parts.CHATBAR_PART);
+			}
 		}
 
-		// If panel becomes visible, show last active panel or default
-		if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
-			const panelToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Panel) ??
-				this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Panel)?.id;
-			if (panelToOpen) {
-				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.Panel);
+		// If panel becomes visible, show last active panel or default and focus it
+		if (!hidden) {
+			if (!this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
+				const panelToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Panel) ??
+					this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Panel)?.id;
+				if (panelToOpen) {
+					this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.Panel);
+				}
 			}
+
+			this.focusPart(Parts.PANEL_PART);
 		}
 	}
 
diff --git a/src/vs/sessions/common/theme.ts b/src/vs/sessions/common/theme.ts
index 2f928d12aec..2217701d347 100644
--- a/src/vs/sessions/common/theme.ts
+++ b/src/vs/sessions/common/theme.ts
@@ -4,30 +4,44 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from '../../nls.js';
-import { registerColor, transparent } from '../../platform/theme/common/colorUtils.js';
+import { getColorRegistry, registerColor, transparent } from '../../platform/theme/common/colorUtils.js';
 import { contrastBorder, iconForeground } from '../../platform/theme/common/colorRegistry.js';
-import { Color } from '../../base/common/color.js';
 import { buttonBackground } from '../../platform/theme/common/colors/inputColors.js';
-import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from '../../workbench/common/theme.js';
+import { editorBackground } from '../../platform/theme/common/colors/editorColors.js';
+import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from '../../workbench/common/theme.js';
 
 // Sessions sidebar background color
 export const sessionsSidebarBackground = registerColor(
 	'sessionsSidebar.background',
-	SIDE_BAR_BACKGROUND,
+	editorBackground,
 	localize('sessionsSidebar.background', 'Background color of the sidebar view in the agent sessions window.')
 );
 
-// Sessions sidebar border color
-export const sessionsSidebarBorder = registerColor(
-	'sessionsSidebar.border',
-	{ dark: Color.fromHex('#808080').transparent(0.35), light: Color.fromHex('#808080').transparent(0.35), hcDark: contrastBorder, hcLight: contrastBorder },
-	localize('sessionsSidebar.border', 'Border color of the sidebar in the agent sessions window.')
+// Sessions auxiliary bar background color
+export const sessionsAuxiliaryBarBackground = registerColor(
+	'sessionsAuxiliaryBar.background',
+	SIDE_BAR_BACKGROUND,
+	localize('sessionsAuxiliaryBar.background', 'Background color of the auxiliary bar in the agent sessions window.')
+);
+
+// Sessions panel background color
+export const sessionsPanelBackground = registerColor(
+	'sessionsPanel.background',
+	SIDE_BAR_BACKGROUND,
+	localize('sessionsPanel.background', 'Background color of the panel in the agent sessions window.')
+);
+
+// Sessions chat bar background color
+export const sessionsChatBarBackground = registerColor(
+	'sessionsChatBar.background',
+	SIDE_BAR_BACKGROUND,
+	localize('sessionsChatBar.background', 'Background color of the chat bar in the agent sessions window.')
 );
 
 // Sessions sidebar header colors
 export const sessionsSidebarHeaderBackground = registerColor(
 	'sessionsSidebarHeader.background',
-	SIDE_BAR_BACKGROUND,
+	sessionsSidebarBackground,
 	localize('sessionsSidebarHeader.background', 'Background color of the sidebar header area in the agent sessions window.')
 );
 
@@ -40,7 +54,7 @@ export const sessionsSidebarHeaderForeground = registerColor(
 // Chat bar title colors
 export const chatBarTitleBackground = registerColor(
 	'chatBarTitle.background',
-	SIDE_BAR_BACKGROUND,
+	sessionsSidebarBackground,
 	localize('chatBarTitle.background', 'Background color of the chat bar title area in the agent sessions window.')
 );
 
@@ -69,3 +83,8 @@ export const sessionsUpdateButtonDownloadedBackground = registerColor(
 	transparent(buttonBackground, 0.7),
 	localize('sessionsUpdateButton.downloadedBackground', 'Background color of the update button when download is complete in the agent sessions window.')
 );
+
+const colorRegistry = getColorRegistry();
+
+// Override panel background to use editor background in sessions window
+colorRegistry.updateDefaultColor(PANEL_BACKGROUND, editorBackground);
diff --git a/src/vs/sessions/contrib/accountMenu/browser/media/accountWidget.css b/src/vs/sessions/contrib/accountMenu/browser/media/accountWidget.css
index 3e852ea53ba..540db578943 100644
--- a/src/vs/sessions/contrib/accountMenu/browser/media/accountWidget.css
+++ b/src/vs/sessions/contrib/accountMenu/browser/media/accountWidget.css
@@ -19,6 +19,11 @@
 	min-width: 0;
 }
 
+/* Hide the default action-label rendered by the toolbar — the account widget provides its own button */
+.account-widget > .action-label {
+	display: none;
+}
+
 /* Account Button */
 .monaco-workbench .part.sidebar > .sidebar-footer .account-widget-account {
 	overflow: hidden;
@@ -70,7 +75,7 @@
 /* Boxed hint style for embedded app update indicator — outlined, no fill */
 .account-widget-update .account-widget-update-button.account-widget-update-button-hint {
 	background-color: transparent !important;
-	color: var(--vscode-button-foreground) !important;
+	color: var(--vscode-button-background) !important;
 	border: 1px solid var(--vscode-button-background) !important;
 }
 
@@ -106,6 +111,7 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	min-width: 0;
+	font-weight: 500;
 }
 
 .account-widget-account .account-widget-account-button {
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedback.contribution.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedback.contribution.ts
index 7ff02612cc1..bcae4ce6990 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedback.contribution.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedback.contribution.ts
@@ -6,17 +6,78 @@
 import './agentFeedbackEditorInputContribution.js';
 import './agentFeedbackEditorWidgetContribution.js';
 import './agentFeedbackOverviewRulerContribution.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IsSessionsWindowContext } from '../../../../workbench/common/contextkeys.js';
 import { AgentFeedbackService, IAgentFeedbackService } from './agentFeedbackService.js';
 import { AgentFeedbackAttachmentContribution } from './agentFeedbackAttachment.js';
 import { AgentFeedbackAttachmentWidget } from './agentFeedbackAttachmentWidget.js';
 import { AgentFeedbackEditorOverlay } from './agentFeedbackEditorOverlay.js';
-import { registerAgentFeedbackEditorActions } from './agentFeedbackEditorActions.js';
+import { hasActiveSessionAgentFeedback, registerAgentFeedbackEditorActions, submitActiveSessionFeedbackActionId } from './agentFeedbackEditorActions.js';
 import { IChatAttachmentWidgetRegistry } from '../../../../workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.js';
 import { IAgentFeedbackVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
+/**
+ * Sets the `hasActiveSessionAgentFeedback` context key to true when the
+ * currently active session has pending agent feedback items.
+ */
+class ActiveSessionFeedbackContextContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.activeSessionFeedbackContext';
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IAgentFeedbackService agentFeedbackService: IAgentFeedbackService,
+		@ISessionsManagementService sessionManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		const contextKey = hasActiveSessionAgentFeedback.bindTo(contextKeyService);
+		const menuRegistration = this._register(new MutableDisposable());
+
+		const feedbackChanged = observableFromEvent(
+			this,
+			agentFeedbackService.onDidChangeFeedback,
+			e => e,
+		);
+
+		this._register(autorun(reader => {
+			feedbackChanged.read(reader);
+			const activeSession = sessionManagementService.activeSession.read(reader);
+			menuRegistration.clear();
+			if (!activeSession) {
+				contextKey.set(false);
+				return;
+			}
+			const feedback = agentFeedbackService.getFeedback(activeSession.resource);
+			const count = feedback.length;
+			contextKey.set(count > 0);
+
+			if (count > 0) {
+				menuRegistration.value = MenuRegistry.appendMenuItem(MenuId.ChatEditingSessionApplySubmenu, {
+					command: {
+						id: submitActiveSessionFeedbackActionId,
+						icon: Codicon.comment,
+						title: localize('agentFeedback.submitFeedbackCount', "Submit Feedback ({0})", count),
+					},
+					group: 'navigation',
+					order: 3,
+					when: ContextKeyExpr.and(IsSessionsWindowContext, hasActiveSessionAgentFeedback),
+				});
+			}
+		}));
+	}
+}
+
+registerWorkbenchContribution2(ActiveSessionFeedbackContextContribution.ID, ActiveSessionFeedbackContextContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(AgentFeedbackEditorOverlay.ID, AgentFeedbackEditorOverlay, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(AgentFeedbackAttachmentContribution.ID, AgentFeedbackAttachmentContribution, WorkbenchPhase.AfterRestored);
 
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackAttachment.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackAttachment.ts
index 04e66cf8dd0..961b2a0c571 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackAttachment.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackAttachment.ts
@@ -7,10 +7,8 @@ import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js'
 import { Codicon } from '../../../../base/common/codicons.js';
 import { basename } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../nls.js';
-import { IAgentFeedbackService, IAgentFeedback } from './agentFeedbackService.js';
+import { IAgentFeedbackService } from './agentFeedbackService.js';
 import { IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
 import { IAgentFeedbackVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
 
@@ -28,13 +26,9 @@ export class AgentFeedbackAttachmentContribution extends Disposable {
 	/** Track onDidAcceptInput subscriptions per widget session */
 	private readonly _widgetListeners = this._store.add(new DisposableMap<string>());
 
-	/** Cache of resolved code snippets keyed by feedback ID */
-	private readonly _snippetCache = new Map<string, string | undefined>();
-
 	constructor(
 		@IAgentFeedbackService private readonly _agentFeedbackService: IAgentFeedbackService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
-		@ITextModelService private readonly _textModelService: ITextModelService,
 	) {
 		super();
 
@@ -55,11 +49,10 @@ export class AgentFeedbackAttachmentContribution extends Disposable {
 
 		if (feedbackItems.length === 0) {
 			widget.attachmentModel.delete(attachmentId);
-			this._snippetCache.clear();
 			return;
 		}
 
-		const value = await this._buildFeedbackValue(feedbackItems);
+		const value = this._buildFeedbackValue(feedbackItems);
 
 		const entry: IAgentFeedbackVariableEntry = {
 			kind: 'agentFeedback',
@@ -74,7 +67,9 @@ export class AgentFeedbackAttachmentContribution extends Disposable {
 				text: f.text,
 				resourceUri: f.resourceUri,
 				range: f.range,
-				codeSelection: this._snippetCache.get(f.id),
+				codeSelection: f.codeSelection,
+				diffHunks: f.diffHunks,
+				sourcePRReviewCommentId: f.sourcePRReviewCommentId,
 			})),
 			value,
 		};
@@ -85,41 +80,26 @@ export class AgentFeedbackAttachmentContribution extends Disposable {
 	}
 
 	/**
-	 * Builds a rich string value for the agent feedback attachment that includes
-	 * the code snippet at each feedback item's location alongside the feedback text.
-	 * Uses a cache keyed by feedback ID to avoid re-resolving snippets for
-	 * items that haven't changed.
+	 * Builds a rich string value for the agent feedback attachment from
+	 * the selection and diff context already stored on each feedback item.
 	 */
-	private async _buildFeedbackValue(feedbackItems: readonly IAgentFeedback[]): Promise<string> {
-		// Prune stale cache entries for items that no longer exist
-		const currentIds = new Set(feedbackItems.map(f => f.id));
-		for (const cachedId of this._snippetCache.keys()) {
-			if (!currentIds.has(cachedId)) {
-				this._snippetCache.delete(cachedId);
-			}
-		}
-
-		// Resolve only new (uncached) snippets
-		const uncachedItems = feedbackItems.filter(f => !this._snippetCache.has(f.id));
-		if (uncachedItems.length > 0) {
-			await Promise.all(uncachedItems.map(async f => {
-				const snippet = await this._getCodeSnippet(f.resourceUri, f.range);
-				this._snippetCache.set(f.id, snippet);
-			}));
-		}
-
-		// Build the final string from cache
+	private _buildFeedbackValue(feedbackItems: IAgentFeedbackVariableEntry['feedbackItems']): string {
 		const parts: string[] = ['The following comments were made on the code changes:'];
 		for (const item of feedbackItems) {
-			const codeSnippet = this._snippetCache.get(item.id);
 			const fileName = basename(item.resourceUri);
 			const lineRef = item.range.startLineNumber === item.range.endLineNumber
 				? `${item.range.startLineNumber}`
 				: `${item.range.startLineNumber}-${item.range.endLineNumber}`;
 
 			let part = `[${fileName}:${lineRef}]`;
-			if (codeSnippet) {
-				part += `\n\`\`\`\n${codeSnippet}\n\`\`\``;
+			if (item.sourcePRReviewCommentId) {
+				part += `\n(PR review comment, thread ID: ${item.sourcePRReviewCommentId} — resolve this thread when addressed)`;
+			}
+			if (item.codeSelection) {
+				part += `\nSelection:\n\`\`\`\n${item.codeSelection}\n\`\`\``;
+			}
+			if (item.diffHunks) {
+				part += `\nDiff Hunks:\n\`\`\`diff\n${item.diffHunks}\n\`\`\``;
 			}
 			part += `\nComment: ${item.text}`;
 			parts.push(part);
@@ -128,23 +108,6 @@ export class AgentFeedbackAttachmentContribution extends Disposable {
 		return parts.join('\n\n');
 	}
 
-	/**
-	 * Resolves the text model for a resource and extracts the code in the given range.
-	 * Returns undefined if the model cannot be resolved.
-	 */
-	private async _getCodeSnippet(resourceUri: URI, range: IRange): Promise<string | undefined> {
-		try {
-			const ref = await this._textModelService.createModelReference(resourceUri);
-			try {
-				return ref.object.textEditorModel.getValueInRange(range);
-			} finally {
-				ref.dispose();
-			}
-		} catch {
-			return undefined;
-		}
-	}
-
 	/**
 	 * Ensure we listen for the chat widget's submit event so we can clear feedback after send.
 	 */
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorActions.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorActions.ts
index c16e39d3bde..67e3057e827 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorActions.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorActions.ts
@@ -21,9 +21,9 @@ import { IAgentFeedbackService } from './agentFeedbackService.js';
 import { getActiveResourceCandidates, getSessionForResource } from './agentFeedbackEditorUtils.js';
 import { Menus } from '../../../browser/menus.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { ICodeReviewService } from '../../codeReview/browser/codeReviewService.js';
 import { getSessionEditorComments } from './sessionEditorComments.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 
 export const submitFeedbackActionId = 'agentFeedbackEditor.action.submit';
 export const navigatePreviousFeedbackActionId = 'agentFeedbackEditor.action.navigatePrevious';
@@ -32,6 +32,8 @@ export const clearAllFeedbackActionId = 'agentFeedbackEditor.action.clearAll';
 export const navigationBearingFakeActionId = 'agentFeedbackEditor.navigation.bearings';
 export const hasSessionEditorComments = new RawContextKey<boolean>('agentFeedbackEditor.hasSessionComments', false);
 export const hasSessionAgentFeedback = new RawContextKey<boolean>('agentFeedbackEditor.hasAgentFeedback', false);
+export const hasActiveSessionAgentFeedback = new RawContextKey<boolean>('agentFeedbackEditor.hasActiveSessionAgentFeedback', false);
+export const submitActiveSessionFeedbackActionId = 'agentFeedbackEditor.action.submitActiveSession';
 
 abstract class AgentFeedbackEditorAction extends Action2 {
 
@@ -46,7 +48,7 @@ abstract class AgentFeedbackEditorAction extends Action2 {
 		const editorService = accessor.get(IEditorService);
 		const agentFeedbackService = accessor.get(IAgentFeedbackService);
 		const chatEditingService = accessor.get(IChatEditingService);
-		const agentSessionsService = accessor.get(IAgentSessionsService);
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
 		const codeReviewService = accessor.get(ICodeReviewService);
 
 		const editorGroupsService = accessor.get(IEditorGroupsService);
@@ -56,7 +58,7 @@ abstract class AgentFeedbackEditorAction extends Action2 {
 			?? editorService.visibleEditorPanes[0];
 		const candidates = getActiveResourceCandidates(activePane?.input);
 		for (const candidate of candidates) {
-			const sessionResource = getSessionForResource(candidate, chatEditingService, agentSessionsService)
+			const sessionResource = getSessionForResource(candidate, chatEditingService, sessionsManagementService)
 				?? agentFeedbackService.getMostRecentSessionForResource(candidate);
 			if (!sessionResource) {
 				continue;
@@ -122,7 +124,7 @@ class SubmitFeedbackAction extends AgentFeedbackEditorAction {
 			await editorService.closeEditors(editorsToClose);
 		}
 
-		await widget.acceptInput('Act on the provided feedback');
+		await widget.acceptInput('act on feedback'); // move to use /act-on-feedback when the bug is fixed
 	}
 }
 
@@ -190,8 +192,66 @@ class ClearAllFeedbackAction extends AgentFeedbackEditorAction {
 	}
 }
 
+class SubmitActiveSessionFeedbackAction extends Action2 {
+
+	static readonly ID = submitActiveSessionFeedbackActionId;
+
+	constructor() {
+		super({
+			id: SubmitActiveSessionFeedbackAction.ID,
+			title: localize2('agentFeedback.submitFeedback', 'Submit Feedback'),
+			icon: Codicon.comment,
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, hasActiveSessionAgentFeedback),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const sessionManagementService = accessor.get(ISessionsManagementService);
+		const agentFeedbackService = accessor.get(IAgentFeedbackService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const editorService = accessor.get(IEditorService);
+		const logService = accessor.get(ILogService);
+
+		const activeSession = sessionManagementService.activeSession.get();
+		if (!activeSession) {
+			return;
+		}
+
+		const sessionResource = activeSession.resource;
+		const feedbackItems = agentFeedbackService.getFeedback(sessionResource);
+		if (feedbackItems.length === 0) {
+			return;
+		}
+
+		const widget = chatWidgetService.getWidgetBySessionResource(sessionResource);
+		if (!widget) {
+			logService.error('[AgentFeedback] Cannot submit feedback: no chat widget found for session', sessionResource.toString());
+			return;
+		}
+
+		// Close all editors belonging to the session resource
+		const editorsToClose: IEditorIdentifier[] = [];
+		for (const { editor, groupId } of editorService.getEditors(EditorsOrder.SEQUENTIAL)) {
+			const candidates = getActiveResourceCandidates(editor);
+			const belongsToSession = candidates.some(uri =>
+				isEqual(agentFeedbackService.getMostRecentSessionForResource(uri), sessionResource)
+			);
+			if (belongsToSession) {
+				editorsToClose.push({ editor, groupId });
+			}
+		}
+		if (editorsToClose.length) {
+			await editorService.closeEditors(editorsToClose);
+		}
+
+		await widget.acceptInput('act on feedback');
+	}
+}
+
 export function registerAgentFeedbackEditorActions(): void {
 	registerAction2(SubmitFeedbackAction);
+	registerAction2(SubmitActiveSessionFeedbackAction);
 	registerAction2(class extends NavigateFeedbackAction { constructor() { super(false); } });
 	registerAction2(class extends NavigateFeedbackAction { constructor() { super(true); } });
 	registerAction2(ClearAllFeedbackAction);
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorInputContribution.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorInputContribution.ts
index 1f881cc1223..ae5fa614c3d 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorInputContribution.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorInputContribution.ts
@@ -5,18 +5,19 @@
 
 import './media/agentFeedbackEditorInput.css';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditor, IDiffEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
 import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
-import { SelectionDirection } from '../../../../editor/common/core/selection.js';
+import { Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
 import { URI } from '../../../../base/common/uri.js';
 import { addStandardDisposableListener, getWindow, ModifierKeyEmitter } from '../../../../base/browser/dom.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { IAgentFeedbackService } from './agentFeedbackService.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { getSessionForResource } from './agentFeedbackEditorUtils.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { createAgentFeedbackContext, getSessionForResource } from './agentFeedbackEditorUtils.js';
 import { localize } from '../../../../nls.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Action } from '../../../../base/common/actions.js';
@@ -204,7 +205,8 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 		private readonly _editor: ICodeEditor,
 		@IAgentFeedbackService private readonly _agentFeedbackService: IAgentFeedbackService,
 		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
+		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
 	) {
 		super();
 
@@ -278,7 +280,7 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 		}
 
 		const selection = this._editor.getSelection();
-		if (!selection || selection.isEmpty()) {
+		if (!selection || (selection.isEmpty() && !this._getDiffHunkForSelection(selection))) {
 			this._hide();
 			return;
 		}
@@ -289,7 +291,7 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 			return;
 		}
 
-		const sessionResource = getSessionForResource(model.uri, this._chatEditingService, this._agentSessionsService);
+		const sessionResource = getSessionForResource(model.uri, this._chatEditingService, this._sessionsManagementService);
 		if (!sessionResource) {
 			this._hide();
 			return;
@@ -369,6 +371,16 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 					return;
 				}
 
+				// Keep caret/navigation keys in the editor. Only actual typing should move focus.
+				if (
+					e.keyCode === KeyCode.UpArrow
+					|| e.keyCode === KeyCode.DownArrow
+					|| e.keyCode === KeyCode.LeftArrow
+					|| e.keyCode === KeyCode.RightArrow
+				) {
+					return;
+				}
+
 				// Only auto-focus the input on typing when the document is readonly;
 				// when editable the user must click or use Ctrl+I to focus.
 				if (!this._editor.getOption(EditorOption.readOnly)) {
@@ -462,7 +474,7 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 			return false;
 		}
 
-		this._agentFeedbackService.addFeedback(this._sessionResource, model.uri, selection, text);
+		this._agentFeedbackService.addFeedback(this._sessionResource, model.uri, selection, text, undefined, createAgentFeedbackContext(this._editor, this._codeEditorService, model.uri, selection));
 		this._hideAndRefocusEditor();
 		return true;
 	}
@@ -485,7 +497,52 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 
 		const sessionResource = this._sessionResource;
 		this._hideAndRefocusEditor();
-		this._agentFeedbackService.addFeedbackAndSubmit(sessionResource, model.uri, selection, text);
+		this._agentFeedbackService.addFeedbackAndSubmit(sessionResource, model.uri, selection, text, undefined, createAgentFeedbackContext(this._editor, this._codeEditorService, model.uri, selection));
+	}
+
+	private _getContainingDiffEditor(): IDiffEditor | undefined {
+		return this._codeEditorService.listDiffEditors().find(diffEditor =>
+			diffEditor.getModifiedEditor() === this._editor || diffEditor.getOriginalEditor() === this._editor
+		);
+	}
+
+	private _getDiffHunkForSelection(selection: Selection): { startLineNumber: number; endLineNumberExclusive: number } | undefined {
+		if (!selection.isEmpty()) {
+			return undefined;
+		}
+
+		const diffEditor = this._getContainingDiffEditor();
+		if (!diffEditor) {
+			return undefined;
+		}
+
+		const diffResult = diffEditor.getDiffComputationResult();
+		if (!diffResult) {
+			return undefined;
+		}
+
+		const position = selection.getStartPosition();
+		const lineNumber = position.lineNumber;
+		const isModifiedEditor = diffEditor.getModifiedEditor() === this._editor;
+		for (const change of diffResult.changes2) {
+			const lineRange = isModifiedEditor ? change.modified : change.original;
+			if (!lineRange.isEmpty && lineRange.contains(lineNumber)) {
+				// Don't show when cursor is at the start or end position of the hunk
+				const isAtHunkStart = lineNumber === lineRange.startLineNumber && position.column === 1;
+				const lastHunkLine = lineRange.endLineNumberExclusive - 1;
+				const model = this._editor.getModel();
+				const isAtHunkEnd = model && lineNumber === lastHunkLine && position.column === model.getLineMaxColumn(lastHunkLine);
+				if (isAtHunkStart || isAtHunkEnd) {
+					return undefined;
+				}
+				return {
+					startLineNumber: lineRange.startLineNumber,
+					endLineNumberExclusive: lineRange.endLineNumberExclusive,
+				};
+			}
+		}
+
+		return undefined;
 	}
 
 	private _updatePosition(): void {
@@ -494,11 +551,50 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 		}
 
 		const selection = this._editor.getSelection();
-		if (!selection || selection.isEmpty()) {
+		if (!selection) {
 			this._hide();
 			return;
 		}
 
+		const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+		const layoutInfo = this._editor.getLayoutInfo();
+		const widgetDom = this._widget.getDomNode();
+		const widgetHeight = widgetDom.offsetHeight || 30;
+		const widgetWidth = widgetDom.offsetWidth || 150;
+
+		if (selection.isEmpty()) {
+			const diffHunk = this._getDiffHunkForSelection(selection);
+			if (!diffHunk) {
+				this._hide();
+				return;
+			}
+
+			const cursorPosition = selection.getStartPosition();
+			const scrolledPosition = this._editor.getScrolledVisiblePosition(cursorPosition);
+			if (!scrolledPosition) {
+				this._widget.setPosition(null);
+				return;
+			}
+
+			const hunkLineCount = diffHunk.endLineNumberExclusive - diffHunk.startLineNumber;
+			const cursorLineOffset = cursorPosition.lineNumber - diffHunk.startLineNumber;
+			const topHalfLineCount = Math.ceil(hunkLineCount / 2);
+			const top = hunkLineCount < 10
+				? cursorLineOffset < topHalfLineCount
+					? scrolledPosition.top - (cursorLineOffset * lineHeight) - widgetHeight
+					: scrolledPosition.top + ((diffHunk.endLineNumberExclusive - cursorPosition.lineNumber) * lineHeight)
+				: scrolledPosition.top - widgetHeight;
+			const left = Math.max(0, Math.min(scrolledPosition.left, layoutInfo.width - widgetWidth));
+
+			this._widget.setPosition({
+				preference: {
+					top: Math.max(0, Math.min(top, layoutInfo.height - widgetHeight)),
+					left,
+				}
+			});
+			return;
+		}
+
 		const cursorPosition = selection.getDirection() === SelectionDirection.LTR
 			? selection.getEndPosition()
 			: selection.getStartPosition();
@@ -509,12 +605,6 @@ export class AgentFeedbackEditorInputContribution extends Disposable implements
 			return;
 		}
 
-		const lineHeight = this._editor.getOption(EditorOption.lineHeight);
-		const layoutInfo = this._editor.getLayoutInfo();
-		const widgetDom = this._widget.getDomNode();
-		const widgetHeight = widgetDom.offsetHeight || 30;
-		const widgetWidth = widgetDom.offsetWidth || 150;
-
 		// Compute vertical position, flipping if out of bounds
 		let top: number;
 		if (selection.getDirection() === SelectionDirection.LTR) {
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorOverlay.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorOverlay.ts
index 7780c40acab..28aa27175ff 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorOverlay.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorOverlay.ts
@@ -24,9 +24,9 @@ import { localize } from '../../../../nls.js';
 import { getActiveResourceCandidates, getSessionForResource } from './agentFeedbackEditorUtils.js';
 import { Menus } from '../../../browser/menus.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { ICodeReviewService } from '../../codeReview/browser/codeReviewService.js';
 import { getSessionEditorComments, hasAgentFeedbackComments } from './sessionEditorComments.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 
 class AgentFeedbackActionViewItem extends ActionViewItem {
 
@@ -144,7 +144,7 @@ class AgentFeedbackOverlayController {
 		container: HTMLElement,
 		group: IEditorGroup,
 		@IAgentFeedbackService agentFeedbackService: IAgentFeedbackService,
-		@IAgentSessionsService agentSessionsService: IAgentSessionsService,
+		@ISessionsManagementService sessionsManagementService: ISessionsManagementService,
 		@IInstantiationService instaService: IInstantiationService,
 		@IChatEditingService chatEditingService: IChatEditingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -189,7 +189,7 @@ class AgentFeedbackOverlayController {
 			let navigationBearings = undefined;
 			let hasAgentFeedback = false;
 			for (const candidate of candidates) {
-				const sessionResource = getSessionForResource(candidate, chatEditingService, agentSessionsService);
+				const sessionResource = getSessionForResource(candidate, chatEditingService, sessionsManagementService);
 				if (!sessionResource) {
 					continue;
 				}
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorUtils.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorUtils.ts
index bb42a4ff242..5085864a03c 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorUtils.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorUtils.ts
@@ -4,27 +4,34 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../base/common/uri.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ICodeEditor, IDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { DetailedLineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../../workbench/common/editor.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { agentSessionContainsResource, editingEntriesContainResource } from '../../../../workbench/contrib/chat/browser/sessionResourceMatching.js';
+import { editingEntriesContainResource } from '../../../../workbench/contrib/chat/browser/sessionResourceMatching.js';
+import { IChatSessionFileChange, IChatSessionFileChange2, isIChatSessionFileChange2 } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 
 /**
- * Find the session that contains the given resource by checking editing sessions and agent sessions.
+ * Find the session that contains the given resource by checking editing sessions,
+ * sessions providers, and agent sessions.
  */
 export function getSessionForResource(
 	resourceUri: URI,
 	chatEditingService: IChatEditingService,
-	agentSessionsService: IAgentSessionsService,
+	sessionsManagementService: ISessionsManagementService,
 ): URI | undefined {
 	for (const editingSession of chatEditingService.editingSessionsObs.get()) {
 		if (editingEntriesContainResource(editingSession.entries.get(), resourceUri)) {
 			return editingSession.chatSessionResource;
 		}
 	}
-
-	for (const session of agentSessionsService.model.sessions) {
-		if (agentSessionContainsResource(session, resourceUri)) {
+	for (const session of sessionsManagementService.getSessions()) {
+		const changes = session.changes.get();
+		if (changes.some(change => changeMatchesResource(change, resourceUri))) {
 			return session.resource;
 		}
 	}
@@ -32,6 +39,280 @@ export function getSessionForResource(
 	return undefined;
 }
 
+export type AgentFeedbackSessionChange = IChatSessionFileChange | IChatSessionFileChange2;
+
+export interface IAgentFeedbackContext {
+	readonly codeSelection?: string;
+	readonly diffHunks?: string;
+}
+
+export function changeMatchesResource(change: AgentFeedbackSessionChange, resourceUri: URI): boolean {
+	if (isIChatSessionFileChange2(change)) {
+		return change.uri.fsPath === resourceUri.fsPath
+			|| change.modifiedUri?.fsPath === resourceUri.fsPath
+			|| change.originalUri?.fsPath === resourceUri.fsPath;
+	}
+
+	return change.modifiedUri.fsPath === resourceUri.fsPath
+		|| change.originalUri?.fsPath === resourceUri.fsPath;
+}
+
+export function getSessionChangeForResource(
+	sessionResource: URI | undefined,
+	resourceUri: URI,
+	sessionsManagementService: ISessionsManagementService,
+): AgentFeedbackSessionChange | undefined {
+	if (!sessionResource) {
+		return undefined;
+	}
+
+	const sessionData = sessionsManagementService.getSession(sessionResource);
+	if (sessionData) {
+		const changes = sessionData.changes.get();
+		return changes.find(change => changeMatchesResource(change, resourceUri));
+	}
+
+	return undefined;
+}
+
+export function createAgentFeedbackContext(
+	editor: ICodeEditor,
+	codeEditorService: ICodeEditorService,
+	resourceUri: URI,
+	range: IRange,
+): IAgentFeedbackContext {
+	const codeSelection = getCodeSelection(editor, codeEditorService, resourceUri, range);
+	const diffHunks = getDiffHunks(editor, codeEditorService, resourceUri, range);
+	return { codeSelection, diffHunks };
+}
+
+function getCodeSelection(
+	editor: ICodeEditor,
+	codeEditorService: ICodeEditorService,
+	resourceUri: URI,
+	range: IRange,
+): string | undefined {
+	const model = getModelForResource(editor, codeEditorService, resourceUri);
+	if (!model) {
+		return undefined;
+	}
+
+	const selection = model.getValueInRange(range);
+	return selection.length > 0 ? selection : undefined;
+}
+
+function getDiffHunks(
+	editor: ICodeEditor,
+	codeEditorService: ICodeEditorService,
+	resourceUri: URI,
+	range: IRange,
+): string | undefined {
+	const diffEditor = getContainingDiffEditor(editor, codeEditorService);
+	if (!diffEditor) {
+		return undefined;
+	}
+
+	const originalModel = diffEditor.getOriginalEditor().getModel();
+	const modifiedModel = diffEditor.getModifiedEditor().getModel();
+	if (!originalModel || !modifiedModel) {
+		return undefined;
+	}
+
+	const selectionIsInOriginal = isEqual(resourceUri, originalModel.uri);
+	const selectionIsInModified = isEqual(resourceUri, modifiedModel.uri);
+	if (!selectionIsInOriginal && !selectionIsInModified) {
+		return undefined;
+	}
+
+	const diffResult = diffEditor.getDiffComputationResult();
+	if (!diffResult) {
+		return undefined;
+	}
+
+	const selectionIsEmpty = range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn;
+	const relevantGroups = groupChanges(diffResult.changes2).filter(group => {
+		const changeTouchesSelection = (change: DetailedLineRangeMapping) => rangeTouchesChange(range, selectionIsInOriginal ? change.original : change.modified);
+		return selectionIsEmpty ? group.some(changeTouchesSelection) : group.every(changeTouchesSelection);
+	});
+	if (relevantGroups.length === 0) {
+		return undefined;
+	}
+
+	const originalText = originalModel.getValue();
+	const modifiedText = modifiedModel.getValue();
+	const originalEndsWithNewline = originalText.length > 0 && originalText.endsWith('\n');
+	const modifiedEndsWithNewline = modifiedText.length > 0 && modifiedText.endsWith('\n');
+	const originalLines = originalText.split('\n');
+	const modifiedLines = modifiedText.split('\n');
+
+	if (originalEndsWithNewline && originalLines[originalLines.length - 1] === '') {
+		originalLines.pop();
+	}
+	if (modifiedEndsWithNewline && modifiedLines[modifiedLines.length - 1] === '') {
+		modifiedLines.pop();
+	}
+
+	return relevantGroups.map(group => renderHunkGroup(group, originalLines, modifiedLines, originalEndsWithNewline, modifiedEndsWithNewline)).join('\n');
+}
+
+function getContainingDiffEditor(editor: ICodeEditor, codeEditorService: ICodeEditorService): IDiffEditor | undefined {
+	return codeEditorService.listDiffEditors().find(diffEditor =>
+		diffEditor.getModifiedEditor() === editor || diffEditor.getOriginalEditor() === editor
+	);
+}
+
+function getModelForResource(editor: ICodeEditor, codeEditorService: ICodeEditorService, resourceUri: URI) {
+	const currentModel = editor.getModel();
+	if (currentModel && isEqual(currentModel.uri, resourceUri)) {
+		return currentModel;
+	}
+
+	const diffEditor = getContainingDiffEditor(editor, codeEditorService);
+	const originalModel = diffEditor?.getOriginalEditor().getModel();
+	if (originalModel && isEqual(originalModel.uri, resourceUri)) {
+		return originalModel;
+	}
+
+	const modifiedModel = diffEditor?.getModifiedEditor().getModel();
+	if (modifiedModel && isEqual(modifiedModel.uri, resourceUri)) {
+		return modifiedModel;
+	}
+
+	return undefined;
+}
+
+function groupChanges(changes: readonly DetailedLineRangeMapping[]): DetailedLineRangeMapping[][] {
+	const contextSize = 3;
+	const groups: DetailedLineRangeMapping[][] = [];
+	let currentGroup: DetailedLineRangeMapping[] = [];
+
+	for (const change of changes) {
+		if (currentGroup.length === 0) {
+			currentGroup.push(change);
+			continue;
+		}
+
+		const lastChange = currentGroup[currentGroup.length - 1];
+		const lastContextEnd = lastChange.original.endLineNumberExclusive - 1 + contextSize;
+		const currentContextStart = change.original.startLineNumber - contextSize;
+		if (currentContextStart <= lastContextEnd + 1) {
+			currentGroup.push(change);
+		} else {
+			groups.push(currentGroup);
+			currentGroup = [change];
+		}
+	}
+
+	if (currentGroup.length > 0) {
+		groups.push(currentGroup);
+	}
+
+	return groups;
+}
+
+function rangeTouchesChange(
+	range: IRange,
+	lineRange: { startLineNumber: number; endLineNumberExclusive: number; isEmpty: boolean; contains(lineNumber: number): boolean },
+): boolean {
+	const isEmptySelection = range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn;
+	if (isEmptySelection) {
+		return !lineRange.isEmpty && lineRange.contains(range.startLineNumber);
+	}
+
+	const selectionStart = range.startLineNumber;
+	const selectionEndExclusive = range.endLineNumber + 1;
+	return selectionStart <= lineRange.startLineNumber && lineRange.endLineNumberExclusive <= selectionEndExclusive;
+}
+
+function renderHunkGroup(
+	group: readonly DetailedLineRangeMapping[],
+	originalLines: string[],
+	modifiedLines: string[],
+	originalEndsWithNewline: boolean,
+	modifiedEndsWithNewline: boolean,
+): string {
+	const contextSize = 3;
+	const firstChange = group[0];
+	const lastChange = group[group.length - 1];
+	const hunkOrigStart = Math.max(1, firstChange.original.startLineNumber - contextSize);
+	const hunkOrigEnd = Math.min(originalLines.length, lastChange.original.endLineNumberExclusive - 1 + contextSize);
+	const hunkModStart = Math.max(1, firstChange.modified.startLineNumber - contextSize);
+
+	const hunkLines: string[] = [];
+	let lastOriginalLineIndex = -1;
+	let lastModifiedLineIndex = -1;
+	let origLineNum = hunkOrigStart;
+	let origCount = 0;
+	let modCount = 0;
+
+	for (const change of group) {
+		const origStart = change.original.startLineNumber;
+		const origEnd = change.original.endLineNumberExclusive;
+		const modStart = change.modified.startLineNumber;
+		const modEnd = change.modified.endLineNumberExclusive;
+
+		while (origLineNum < origStart) {
+			const idx = hunkLines.length;
+			hunkLines.push(` ${originalLines[origLineNum - 1]}`);
+			if (origLineNum === originalLines.length) {
+				lastOriginalLineIndex = idx;
+			}
+			const modLineNum = hunkModStart + modCount;
+			if (modLineNum === modifiedLines.length) {
+				lastModifiedLineIndex = idx;
+			}
+			origLineNum++;
+			origCount++;
+			modCount++;
+		}
+
+		for (let i = origStart; i < origEnd; i++) {
+			const idx = hunkLines.length;
+			hunkLines.push(`-${originalLines[i - 1]}`);
+			if (i === originalLines.length) {
+				lastOriginalLineIndex = idx;
+			}
+			origLineNum++;
+			origCount++;
+		}
+
+		for (let i = modStart; i < modEnd; i++) {
+			const idx = hunkLines.length;
+			hunkLines.push(`+${modifiedLines[i - 1]}`);
+			if (i === modifiedLines.length) {
+				lastModifiedLineIndex = idx;
+			}
+			modCount++;
+		}
+	}
+
+	while (origLineNum <= hunkOrigEnd) {
+		const idx = hunkLines.length;
+		hunkLines.push(` ${originalLines[origLineNum - 1]}`);
+		if (origLineNum === originalLines.length) {
+			lastOriginalLineIndex = idx;
+		}
+		const modLineNum = hunkModStart + modCount;
+		if (modLineNum === modifiedLines.length) {
+			lastModifiedLineIndex = idx;
+		}
+		origLineNum++;
+		origCount++;
+		modCount++;
+	}
+
+	const header = `@@ -${hunkOrigStart},${origCount} +${hunkModStart},${modCount} @@`;
+	const result = [header, ...hunkLines];
+
+	if (!originalEndsWithNewline && lastOriginalLineIndex >= 0) {
+		result.splice(lastOriginalLineIndex + 2, 0, '\\ No newline at end of file');
+	} else if (!modifiedEndsWithNewline && lastModifiedLineIndex >= 0) {
+		result.splice(lastModifiedLineIndex + 2, 0, '\\ No newline at end of file');
+	}
+
+	return result.join('\n');
+}
+
 export function getActiveResourceCandidates(input: Parameters<typeof EditorResourceAccessor.getOriginalUri>[0]): URI[] {
 	const result: URI[] = [];
 	const resources = EditorResourceAccessor.getOriginalUri(input, { supportSideBySide: SideBySideEditor.BOTH });
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorWidgetContribution.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorWidgetContribution.ts
index 09ccece7717..ef11a8b2180 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorWidgetContribution.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorWidgetContribution.ts
@@ -11,11 +11,12 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { Event } from '../../../../base/common/event.js';
 import { autorun, observableSignalFromEvent } from '../../../../base/common/observable.js';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from '../../../../editor/common/editorCommon.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { $, addDisposableListener, clearNode, getTotalWidth } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, addStandardDisposableListener, clearNode, getTotalWidth } from '../../../../base/browser/dom.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { overviewRulerRangeHighlight } from '../../../../editor/common/core/editorColorRegistry.js';
@@ -26,8 +27,8 @@ import * as nls from '../../../../nls.js';
 import { IAgentFeedbackService } from './agentFeedbackService.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
 import { IChatSessionFileChange, IChatSessionFileChange2, isIChatSessionFileChange2 } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { getSessionForResource } from './agentFeedbackEditorUtils.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { createAgentFeedbackContext, getSessionForResource } from './agentFeedbackEditorUtils.js';
 import { ICodeReviewService, IPRReviewState } from '../../codeReview/browser/codeReviewService.js';
 import { getSessionEditorComments, groupNearbySessionEditorComments, ISessionEditorComment, SessionEditorCommentSource, toSessionEditorCommentId } from './sessionEditorComments.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
@@ -35,6 +36,13 @@ import { isEqual } from '../../../../base/common/resources.js';
 import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+
+interface ICommentItemActions {
+	editAction: Action;
+	convertAction: Action | undefined;
+	removeAction: Action;
+}
 
 /**
  * Widget that displays agent feedback comments for a group of nearby feedback items.
@@ -67,6 +75,7 @@ export class AgentFeedbackEditorWidget extends Disposable implements IOverlayWid
 		@IAgentFeedbackService private readonly _agentFeedbackService: IAgentFeedbackService,
 		@ICodeReviewService private readonly _codeReviewService: ICodeReviewService,
 		@IMarkdownRendererService private readonly _markdownRendererService: IMarkdownRendererService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
 	) {
 		super();
 
@@ -189,22 +198,42 @@ export class AgentFeedbackEditorWidget extends Disposable implements IOverlayWid
 
 			const actionBarContainer = $('div.agent-feedback-widget-item-actions');
 			const actionBar = this._eventStore.add(new ActionBar(actionBarContainer));
+
+			const itemActions: ICommentItemActions = { editAction: undefined!, convertAction: undefined, removeAction: undefined! };
+
+			// Edit action — only disabled for PR review comments
+			const isEditable = comment.source !== SessionEditorCommentSource.PRReview;
+			const editTooltip = isEditable
+				? nls.localize('editComment', "Edit")
+				: nls.localize('editPRCommentDisabled', "PR review comments cannot be edited");
+			itemActions.editAction = new Action(
+				'agentFeedback.widget.edit',
+				editTooltip,
+				ThemeIcon.asClassName(Codicon.edit),
+				isEditable,
+				(): void => { this._startEditing(comment, text, itemActions); },
+			);
+			actionBar.push(itemActions.editAction, { icon: true, label: false });
+
 			if (comment.canConvertToAgentFeedback) {
-				actionBar.push(new Action(
+				itemActions.convertAction = new Action(
 					'agentFeedback.widget.convert',
 					nls.localize('convertComment', "Convert to Agent Feedback"),
 					ThemeIcon.asClassName(Codicon.check),
 					true,
 					() => this._convertToAgentFeedback(comment),
-				), { icon: true, label: false });
+				);
+				actionBar.push(itemActions.convertAction, { icon: true, label: false });
 			}
-			actionBar.push(new Action(
+			itemActions.removeAction = new Action(
 				'agentFeedback.widget.remove',
 				nls.localize('removeComment', "Remove"),
 				ThemeIcon.asClassName(Codicon.close),
 				true,
 				() => this._removeComment(comment),
-			), { icon: true, label: false });
+			);
+			actionBar.push(itemActions.removeAction, { icon: true, label: false });
+
 			itemHeader.appendChild(actionBarContainer);
 			item.appendChild(itemHeader);
 
@@ -293,15 +322,112 @@ export class AgentFeedbackEditorWidget extends Disposable implements IOverlayWid
 		this._agentFeedbackService.removeFeedback(this._sessionResource, comment.sourceId);
 	}
 
+	private _startEditing(comment: ISessionEditorComment, textContainer: HTMLElement, actions: ICommentItemActions): void {
+		if (comment.source === SessionEditorCommentSource.PRReview) {
+			return;
+		}
+
+		// Disable all actions while editing
+		actions.editAction.enabled = false;
+		if (actions.convertAction) {
+			actions.convertAction.enabled = false;
+		}
+		actions.removeAction.enabled = false;
+
+		const editStore = new DisposableStore();
+		this._eventStore.add(editStore);
+
+		clearNode(textContainer);
+		textContainer.classList.add('editing');
+
+		const textarea = $('textarea.agent-feedback-widget-edit-textarea') as HTMLTextAreaElement;
+		textarea.value = comment.text;
+		textarea.rows = 1;
+		textContainer.appendChild(textarea);
+
+		// Auto-size the textarea
+		const autoSize = () => {
+			textarea.style.height = 'auto';
+			textarea.style.height = `${textarea.scrollHeight}px`;
+			this._editor.layoutOverlayWidget(this);
+		};
+		autoSize();
+
+		editStore.add(addDisposableListener(textarea, 'input', autoSize));
+
+		editStore.add(addStandardDisposableListener(textarea, 'keydown', (e) => {
+			if (e.keyCode === KeyCode.Enter && !e.shiftKey) {
+				e.preventDefault();
+				e.stopPropagation();
+				const newText = textarea.value.trim();
+				if (newText) {
+					this._saveEdit(comment, newText);
+				}
+				// Widget will be rebuilt by the change event
+			} else if (e.keyCode === KeyCode.Escape) {
+				e.preventDefault();
+				e.stopPropagation();
+				this._stopEditing(comment, textContainer, editStore, actions);
+			}
+		}));
+
+		// Stop editing when focus is lost
+		editStore.add(addDisposableListener(textarea, 'blur', () => {
+			this._stopEditing(comment, textContainer, editStore, actions);
+		}));
+
+		textarea.focus();
+	}
+
+	private _saveEdit(comment: ISessionEditorComment, newText: string): void {
+		if (comment.source === SessionEditorCommentSource.AgentFeedback) {
+			this._agentFeedbackService.updateFeedback(this._sessionResource, comment.sourceId, newText);
+		} else if (comment.source === SessionEditorCommentSource.CodeReview) {
+			this._codeReviewService.updateComment(this._sessionResource, comment.sourceId, newText);
+		}
+	}
+
+	private _stopEditing(comment: ISessionEditorComment, textContainer: HTMLElement, editStore: DisposableStore, actions: ICommentItemActions): void {
+		editStore.dispose();
+
+		// Re-enable actions
+		actions.editAction.enabled = comment.source !== SessionEditorCommentSource.PRReview;
+		if (actions.convertAction) {
+			actions.convertAction.enabled = true;
+		}
+		actions.removeAction.enabled = true;
+
+		textContainer.classList.remove('editing');
+		clearNode(textContainer);
+		const rendered = this._markdownRendererService.render(new MarkdownString(comment.text));
+		this._eventStore.add(rendered);
+		textContainer.appendChild(rendered.element);
+		this._editor.layoutOverlayWidget(this);
+	}
+
 	private _convertToAgentFeedback(comment: ISessionEditorComment): void {
 		if (!comment.canConvertToAgentFeedback) {
 			return;
 		}
 
-		const feedback = this._agentFeedbackService.addFeedback(this._sessionResource, comment.resourceUri, comment.range, comment.text, comment.suggestion);
+		const sourcePRReviewCommentId = comment.source === SessionEditorCommentSource.PRReview
+			? comment.sourceId
+			: undefined;
+
+		const feedback = this._agentFeedbackService.addFeedback(
+			this._sessionResource,
+			comment.resourceUri,
+			comment.range,
+			comment.text,
+			comment.suggestion,
+			createAgentFeedbackContext(this._editor, this._codeEditorService, comment.resourceUri, comment.range),
+			sourcePRReviewCommentId,
+		);
 		this._agentFeedbackService.setNavigationAnchor(this._sessionResource, toSessionEditorCommentId(SessionEditorCommentSource.AgentFeedback, feedback.id));
 		if (comment.source === SessionEditorCommentSource.CodeReview) {
 			this._codeReviewService.removeComment(this._sessionResource, comment.sourceId);
+		} else if (comment.source === SessionEditorCommentSource.PRReview) {
+			this._codeReviewService.markPRReviewCommentConverted(this._sessionResource, comment.sourceId);
 		}
 	}
 
@@ -413,9 +539,10 @@ export class AgentFeedbackEditorWidget extends Disposable implements IOverlayWid
 
 		const widgetWidth = getTotalWidth(this._domNode) || 280;
 		const widgetHeight = this._domNode.offsetHeight || 0;
+		const headerHeight = this._headerNode.offsetHeight || lineHeight;
 
-		// Compute content-relative top and clamp to keep the widget within the editor content area
-		const contentRelativeTop = this._editor.getTopForLineNumber(startLineNumber) - lineHeight;
+		// Align the header center with the start line center before clamping within the editor content area.
+		const contentRelativeTop = this._editor.getTopForLineNumber(startLineNumber) + (lineHeight - headerHeight) / 2;
 		const scrollHeight = this._editor.getScrollHeight();
 		const clampedContentTop = Math.min(Math.max(0, contentRelativeTop), Math.max(0, scrollHeight - widgetHeight));
 
@@ -500,7 +627,7 @@ class AgentFeedbackEditorWidgetContribution extends Disposable implements IEdito
 		private readonly _editor: ICodeEditor,
 		@IAgentFeedbackService private readonly _agentFeedbackService: IAgentFeedbackService,
 		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
+		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
 		@ICodeReviewService private readonly _codeReviewService: ICodeReviewService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
@@ -545,7 +672,7 @@ class AgentFeedbackEditorWidgetContribution extends Disposable implements IEdito
 			this._sessionResource = undefined;
 			return;
 		}
-		this._sessionResource = getSessionForResource(model.uri, this._chatEditingService, this._agentSessionsService);
+		this._sessionResource = getSessionForResource(model.uri, this._chatEditingService, this._sessionsManagementService);
 	}
 
 	private _rebuildWidgets(
@@ -576,7 +703,11 @@ class AgentFeedbackEditorWidgetContribution extends Disposable implements IEdito
 
 		const groups = groupNearbySessionEditorComments(fileComments, 5);
 
-		for (const group of groups) {
+		// Create widgets in reverse file order so that widgets further up in the
+		// file are added to the DOM last and therefore render on top of widgets
+		// further down.
+		for (let i = groups.length - 1; i >= 0; i--) {
+			const group = groups[i];
 			const widget = this._instantiationService.createInstance(AgentFeedbackEditorWidget, this._editor, group, this._sessionResource);
 			this._widgets.push(widget);
 
@@ -602,8 +733,8 @@ class AgentFeedbackEditorWidgetContribution extends Disposable implements IEdito
 			return undefined;
 		}
 
-		const changes = this._agentSessionsService.getSession(this._sessionResource)?.changes;
-		if (!(changes instanceof Array)) {
+		const changes = this._sessionsManagementService.getSession(this._sessionResource)?.changes.get();
+		if (!changes) {
 			return undefined;
 		}
 
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackHover.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackHover.ts
index ea4414455e5..027e8ca5399 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackHover.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackHover.ts
@@ -43,6 +43,7 @@ interface IFeedbackCommentElement {
 	readonly text: string;
 	readonly resourceUri: URI;
 	readonly codeSelection?: string;
+	readonly diffHunks?: string;
 }
 
 type FeedbackTreeElement = IFeedbackFileElement | IFeedbackCommentElement;
@@ -227,6 +228,11 @@ class FeedbackCommentRenderer implements ITreeRenderer<IFeedbackCommentElement,
 			markdown.appendCodeblock(languageId ?? '', element.codeSelection);
 		}
 
+		if (element.diffHunks) {
+			markdown.appendMarkdown('\n\n');
+			markdown.appendCodeblock('diff', element.diffHunks);
+		}
+
 		return {
 			content: markdown,
 			style: HoverStyle.Pointer,
@@ -351,6 +357,7 @@ export class AgentFeedbackHover extends Disposable {
 		return {
 			content: hoverElement,
 			style: HoverStyle.Pointer,
+			persistence: { hideOnHover: false },
 			position: { hoverPosition: HoverPosition.ABOVE },
 			trapFocus: true,
 			appearance: { compact: true },
@@ -376,6 +383,7 @@ export class AgentFeedbackHover extends Disposable {
 				text: item.text,
 				resourceUri: item.resourceUri,
 				codeSelection: item.codeSelection,
+				diffHunks: item.diffHunks,
 			});
 		}
 
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackOverviewRulerContribution.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackOverviewRulerContribution.ts
index ecbca6154b3..77cb16fcac7 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackOverviewRulerContribution.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackOverviewRulerContribution.ts
@@ -15,8 +15,8 @@ import { localize } from '../../../../nls.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IAgentFeedbackService } from './agentFeedbackService.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { getSessionForResource } from './agentFeedbackEditorUtils.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 
 const overviewRulerAgentFeedbackForeground = registerColor(
 	'editorOverviewRuler.agentFeedbackForeground',
@@ -35,7 +35,7 @@ export class AgentFeedbackOverviewRulerContribution extends Disposable implement
 		private readonly _editor: ICodeEditor,
 		@IAgentFeedbackService private readonly _agentFeedbackService: IAgentFeedbackService,
 		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
+		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
 	) {
 		super();
 
@@ -57,7 +57,7 @@ export class AgentFeedbackOverviewRulerContribution extends Disposable implement
 			this._sessionResource = undefined;
 			return;
 		}
-		this._sessionResource = getSessionForResource(model.uri, this._chatEditingService, this._agentSessionsService);
+		this._sessionResource = getSessionForResource(model.uri, this._chatEditingService, this._sessionsManagementService);
 	}
 
 	private _updateDecorations(): void {
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.ts b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.ts
index c92a4ab67c4..cbd0f3beca8 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.ts
+++ b/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.ts
@@ -12,9 +12,10 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
 import { IChatSessionFileChange, IChatSessionFileChange2, isIChatSessionFileChange2 } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { agentSessionContainsResource, editingEntriesContainResource } from '../../../../workbench/contrib/chat/browser/sessionResourceMatching.js';
-import { IEditorService, MODAL_GROUP } from '../../../../workbench/services/editor/common/editorService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { editingEntriesContainResource } from '../../../../workbench/contrib/chat/browser/sessionResourceMatching.js';
+import { changeMatchesResource, IAgentFeedbackContext } from './agentFeedbackEditorUtils.js';
+import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
 import { IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -29,6 +30,10 @@ export interface IAgentFeedback {
 	readonly range: IRange;
 	readonly sessionResource: URI;
 	readonly suggestion?: ICodeReviewSuggestion;
+	readonly codeSelection?: string;
+	readonly diffHunks?: string;
+	/** When this feedback was converted from a PR review comment, the original thread ID. */
+	readonly sourcePRReviewCommentId?: string;
 }
 
 export interface INavigableSessionComment {
@@ -58,13 +63,18 @@ export interface IAgentFeedbackService {
 	/**
 	 * Add a feedback item for the given session.
 	 */
-	addFeedback(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion): IAgentFeedback;
+	addFeedback(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion, context?: IAgentFeedbackContext, sourcePRReviewCommentId?: string): IAgentFeedback;
 
 	/**
 	 * Remove a single feedback item.
 	 */
 	removeFeedback(sessionResource: URI, feedbackId: string): void;
 
+	/**
+	 * Update the text of an existing feedback item.
+	 */
+	updateFeedback(sessionResource: URI, feedbackId: string, newText: string): void;
+
 	/**
 	 * Get all feedback items for a session.
 	 */
@@ -107,7 +117,7 @@ export interface IAgentFeedbackService {
 	 * Add a feedback item and then submit the feedback. Waits for the
 	 * attachment to be updated in the chat widget before submitting.
 	 */
-	addFeedbackAndSubmit(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion): Promise<void>;
+	addFeedbackAndSubmit(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion, context?: IAgentFeedbackContext, sourcePRReviewCommentId?: string): Promise<void>;
 }
 
 // --- Implementation -----------------------------------------------------------
@@ -129,7 +139,7 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 
 	constructor(
 		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
+		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 		@ICommandService private readonly _commandService: ICommandService,
@@ -138,7 +148,7 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 		super();
 	}
 
-	addFeedback(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion): IAgentFeedback {
+	addFeedback(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion, context?: IAgentFeedbackContext, sourcePRReviewCommentId?: string): IAgentFeedback {
 		const key = sessionResource.toString();
 		let feedbackItems = this._feedbackBySession.get(key);
 		if (!feedbackItems) {
@@ -153,6 +163,9 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 			range,
 			sessionResource,
 			suggestion,
+			codeSelection: context?.codeSelection,
+			diffHunks: context?.diffHunks,
+			sourcePRReviewCommentId,
 		};
 
 		// Insert at the correct sorted position.
@@ -215,6 +228,25 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 		}
 	}
 
+	updateFeedback(sessionResource: URI, feedbackId: string, newText: string): void {
+		const key = sessionResource.toString();
+		const feedbackItems = this._feedbackBySession.get(key);
+		if (!feedbackItems) {
+			return;
+		}
+
+		const idx = feedbackItems.findIndex(f => f.id === feedbackId);
+		if (idx >= 0) {
+			const existing = feedbackItems[idx];
+			feedbackItems[idx] = {
+				...existing,
+				text: newText,
+			};
+			this._sessionUpdatedOrder.set(key, ++this._sessionUpdatedSequence);
+			this._onDidChangeFeedback.fire({ sessionResource, feedbackItems });
+		}
+	}
+
 	getFeedback(sessionResource: URI): readonly IAgentFeedback[] {
 		return this._feedbackBySession.get(sessionResource.toString()) ?? [];
 	}
@@ -258,14 +290,14 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 			}
 		}
 
-		for (const session of this._agentSessionsService.model.sessions) {
-			if (!isEqual(session.resource, sessionResource)) {
-				continue;
-			}
+		const session = this._sessionsManagementService.getSession(sessionResource);
+		if (!session) {
+			return false;
+		}
 
-			if (agentSessionContainsResource(session, resourceUri)) {
-				return true;
-			}
+		const changes = session.changes.get();
+		if (changes.some(change => changeMatchesResource(change, resourceUri))) {
+			return true;
 		}
 
 		return false;
@@ -283,7 +315,8 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 
 	async revealSessionComment(sessionResource: URI, commentId: string, resourceUri: URI, range: IRange): Promise<void> {
 		const selection = { startLineNumber: range.startLineNumber, startColumn: range.startColumn };
-		const sessionChange = this._getSessionChange(resourceUri, this._agentSessionsService.getSession(sessionResource)?.changes);
+		const sessionData = this._sessionsManagementService.getSession(sessionResource);
+		const sessionChange = this._getSessionChange(resourceUri, sessionData?.changes.get());
 
 		if (sessionChange?.isDeletion && sessionChange.originalUri) {
 			await this._editorService.openEditor({
@@ -294,7 +327,7 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 					revealIfVisible: true,
 					selection,
 				}
-			}, MODAL_GROUP);
+			});
 		} else if (sessionChange?.originalUri) {
 			await this._editorService.openEditor({
 				original: { resource: sessionChange.originalUri },
@@ -305,7 +338,7 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 					revealIfVisible: true,
 					selection,
 				}
-			}, MODAL_GROUP);
+			});
 		} else {
 			await this._editorService.openEditor({
 				resource: sessionChange?.modifiedUri ?? resourceUri,
@@ -315,7 +348,7 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 					revealIfVisible: true,
 					selection,
 				}
-			}, MODAL_GROUP);
+			});
 		}
 
 		this.setNavigationAnchor(sessionResource, commentId);
@@ -414,8 +447,8 @@ export class AgentFeedbackService extends Disposable implements IAgentFeedbackSe
 		this._onDidChangeFeedback.fire({ sessionResource, feedbackItems: [] });
 	}
 
-	async addFeedbackAndSubmit(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion): Promise<void> {
-		this.addFeedback(sessionResource, resourceUri, range, text, suggestion);
+	async addFeedbackAndSubmit(sessionResource: URI, resourceUri: URI, range: IRange, text: string, suggestion?: ICodeReviewSuggestion, context?: IAgentFeedbackContext, sourcePRReviewCommentId?: string): Promise<void> {
+		this.addFeedback(sessionResource, resourceUri, range, text, suggestion, context, sourcePRReviewCommentId);
 
 		// Wait for the attachment contribution to update the chat widget's attachment model
 		const widget = this._chatWidgetService.getWidgetBySessionResource(sessionResource);
diff --git a/src/vs/sessions/contrib/agentFeedback/browser/media/agentFeedbackEditorWidget.css b/src/vs/sessions/contrib/agentFeedback/browser/media/agentFeedbackEditorWidget.css
index 938da413b02..ef551fd0870 100644
--- a/src/vs/sessions/contrib/agentFeedback/browser/media/agentFeedbackEditorWidget.css
+++ b/src/vs/sessions/contrib/agentFeedback/browser/media/agentFeedbackEditorWidget.css
@@ -36,7 +36,7 @@
 .agent-feedback-widget-arrow {
 	position: absolute;
 	left: -8px;
-	top: 12px;
+	top: 9px;
 	width: 0;
 	height: 0;
 	border-top: 8px solid transparent;
@@ -286,3 +286,28 @@
 	z-index: 5;
 	border-left: 2px solid var(--vscode-editorGutter-modifiedBackground);
 }
+
+/* Inline edit textarea */
+.agent-feedback-widget-text.editing {
+	padding: 0;
+}
+
+.agent-feedback-widget-edit-textarea {
+	width: 100%;
+	min-height: 22px;
+	padding: 4px 6px;
+	border: 1px solid var(--vscode-focusBorder);
+	border-radius: 4px;
+	background: var(--vscode-input-background);
+	color: var(--vscode-input-foreground);
+	font-size: 12px;
+	line-height: 1.4;
+	resize: none;
+	overflow: hidden;
+	box-sizing: border-box;
+}
+
+.agent-feedback-widget-edit-textarea:focus {
+	outline: none;
+	border-color: var(--vscode-focusBorder);
+}
diff --git a/src/vs/sessions/contrib/agentFeedback/test/browser/agentFeedbackService.test.ts b/src/vs/sessions/contrib/agentFeedback/test/browser/agentFeedbackService.test.ts
index 7818c7e172d..de89dd854bc 100644
--- a/src/vs/sessions/contrib/agentFeedback/test/browser/agentFeedbackService.test.ts
+++ b/src/vs/sessions/contrib/agentFeedback/test/browser/agentFeedbackService.test.ts
@@ -197,4 +197,14 @@ suite('AgentFeedbackService - Ordering', () => {
 		assert.strictEqual(items[0].id, f1.id);
 		assert.strictEqual(items[1].id, f2.id);
 	});
+
+	test('preserves optional feedback context fields', () => {
+		const feedback = service.addFeedback(session, fileA, r(10), 'with context', undefined, {
+			codeSelection: 'const value = 1;',
+			diffHunks: '@@ -1,1 +1,1 @@\n-const value = 0;\n+const value = 1;',
+		});
+
+		assert.strictEqual(feedback.codeSelection, 'const value = 1;');
+		assert.strictEqual(feedback.diffHunks, '@@ -1,1 +1,1 @@\n-const value = 0;\n+const value = 1;');
+	});
 });
diff --git a/src/vs/sessions/contrib/agentFeedback/test/browser/sessionEditorComments.test.ts b/src/vs/sessions/contrib/agentFeedback/test/browser/sessionEditorComments.test.ts
index f7bb4f0aa5b..4e003899579 100644
--- a/src/vs/sessions/contrib/agentFeedback/test/browser/sessionEditorComments.test.ts
+++ b/src/vs/sessions/contrib/agentFeedback/test/browser/sessionEditorComments.test.ts
@@ -7,8 +7,8 @@ import assert from 'assert';
 import { URI } from '../../../../../base/common/uri.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { CodeReviewStateKind, ICodeReviewState, IPRReviewState, PRReviewStateKind } from '../../../codeReview/browser/codeReviewService.js';
 import { getResourceEditorComments, getSessionEditorComments, groupNearbySessionEditorComments, hasAgentFeedbackComments, SessionEditorCommentSource } from '../../browser/sessionEditorComments.js';
+import { ICodeReviewState, CodeReviewStateKind, IPRReviewState, PRReviewStateKind } from '../../../codeReview/browser/codeReviewService.js';
 
 type ICodeReviewResultState = Extract<ICodeReviewState, { kind: CodeReviewStateKind.Result }>;
 
@@ -23,7 +23,9 @@ suite('SessionEditorComments', () => {
 		return {
 			kind: CodeReviewStateKind.Result,
 			version: 'v1',
+			reviewCount: 1,
 			comments,
+			didProduceComments: comments.length > 0,
 		};
 	}
 
diff --git a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationOverviewView.ts b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationOverviewView.ts
index 2bcd3717a81..b9fd774f52a 100644
--- a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationOverviewView.ts
+++ b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationOverviewView.ts
@@ -27,7 +27,7 @@ import { AICustomizationManagementEditor } from '../../../../workbench/contrib/c
 import { agentIcon, instructionsIcon, mcpServerIcon, pluginIcon, promptIcon, skillIcon } from '../../../../workbench/contrib/chat/browser/aiCustomization/aiCustomizationIcons.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IAICustomizationWorkspaceService } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
-import { IEditorService, MODAL_GROUP } from '../../../../workbench/services/editor/common/editorService.js';
+import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
 import { IMcpService } from '../../../../workbench/contrib/mcp/common/mcpTypes.js';
 import { IAgentPluginService } from '../../../../workbench/contrib/chat/common/plugins/agentPluginService.js';
 
@@ -213,7 +213,7 @@ export class AICustomizationOverviewView extends ViewPane {
 
 	private async openSection(sectionId: AICustomizationManagementSection): Promise<void> {
 		const input = AICustomizationManagementEditorInput.getOrCreate();
-		const editor = await this.editorService.openEditor(input, { pinned: true }, MODAL_GROUP);
+		const editor = await this.editorService.openEditor(input, { pinned: true });
 
 		// Deep-link to the section
 		if (editor instanceof AICustomizationManagementEditor) {
diff --git a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.ts b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.ts
index a7edc620be2..3258fa7a595 100644
--- a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.ts
+++ b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.ts
@@ -7,13 +7,19 @@ import { localize, localize2 } from '../../../../nls.js';
 import { Action2, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { AICustomizationItemMenuId } from './aiCustomizationTreeView.js';
-import { AICustomizationItemTypeContextKey } from './aiCustomizationTreeViewViews.js';
+import { AI_CUSTOMIZATION_VIEW_ID, AICustomizationItemMenuId } from './aiCustomizationTreeView.js';
+import { AICustomizationItemDisabledContextKey, AICustomizationItemStorageContextKey, AICustomizationItemTypeContextKey, AICustomizationViewPane } from './aiCustomizationTreeViewViews.js';
 import { PromptsType } from '../../../../workbench/contrib/chat/common/promptSyntax/promptTypes.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
+import { IFileService, FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IPromptsService } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
+import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
+import { BUILTIN_STORAGE } from '../../chat/common/builtinPromptsStorage.js';
 
 //#region Utilities
 
@@ -21,13 +27,13 @@ import { IEditorService } from '../../../../workbench/services/editor/common/edi
  * Type for context passed to actions from tree context menus.
  * Handles both direct URI arguments and serialized context objects.
  */
-type URIContext = { uri: URI | string;[key: string]: unknown } | URI | string;
+type ItemContext = { uri: URI | string; promptType?: string; disabled?: boolean;[key: string]: unknown } | URI | string;
 
 /**
  * Extracts a URI from various context formats.
  * Context can be a URI, string, or an object with uri property.
  */
-function extractURI(context: URIContext): URI {
+function extractURI(context: ItemContext): URI {
 	if (URI.isUri(context)) {
 		return context;
 	}
@@ -54,7 +60,7 @@ registerAction2(class extends Action2 {
 			icon: Codicon.goToFile,
 		});
 	}
-	async run(accessor: ServicesAccessor, context: URIContext): Promise<void> {
+	async run(accessor: ServicesAccessor, context: ItemContext): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 		await editorService.openEditor({
 			resource: extractURI(context)
@@ -73,13 +79,72 @@ registerAction2(class extends Action2 {
 			icon: Codicon.play,
 		});
 	}
-	async run(accessor: ServicesAccessor, context: URIContext): Promise<void> {
+	async run(accessor: ServicesAccessor, context: ItemContext): Promise<void> {
 		const commandService = accessor.get(ICommandService);
 		await commandService.executeCommand('workbench.action.chat.run.prompt.current', extractURI(context));
 	}
 });
 
+// Delete file action
+const DELETE_AI_CUSTOMIZATION_FILE_ID = 'aiCustomization.deleteFile';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: DELETE_AI_CUSTOMIZATION_FILE_ID,
+			title: localize2('delete', "Delete"),
+			icon: Codicon.trash,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: ItemContext): Promise<void> {
+		const fileService = accessor.get(IFileService);
+		const dialogService = accessor.get(IDialogService);
+		const uri = extractURI(context);
+		const name = typeof context === 'object' && !URI.isUri(context) ? (context as { name?: string }).name ?? '' : '';
+
+		if (uri.scheme !== 'file') {
+			return;
+		}
+
+		const confirmation = await dialogService.confirm({
+			message: localize('confirmDelete', "Are you sure you want to delete '{0}'?", name || uri.path),
+			primaryButton: localize('delete', "Delete"),
+		});
+
+		if (confirmation.confirmed) {
+			const useTrash = fileService.hasCapability(uri, FileSystemProviderCapabilities.Trash);
+			await fileService.del(uri, { useTrash, recursive: true });
+		}
+	}
+});
+
+// Copy path action
+const COPY_AI_CUSTOMIZATION_PATH_ID = 'aiCustomization.copyPath';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: COPY_AI_CUSTOMIZATION_PATH_ID,
+			title: localize2('copyPath', "Copy Path"),
+			icon: Codicon.clippy,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: ItemContext): Promise<void> {
+		const clipboardService = accessor.get(IClipboardService);
+		const uri = extractURI(context);
+		const textToCopy = uri.scheme === 'file' ? uri.fsPath : uri.toString(true);
+		await clipboardService.writeText(textToCopy);
+	}
+});
+
 // Register context menu items
+
+// Inline hover actions (shown as icon buttons on hover)
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: DELETE_AI_CUSTOMIZATION_FILE_ID, title: localize('delete', "Delete"), icon: Codicon.trash },
+	group: 'inline',
+	order: 10,
+});
+
+// Context menu items (shown on right-click)
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 	command: { id: OPEN_AI_CUSTOMIZATION_FILE_ID, title: localize('open', "Open") },
 	group: '1_open',
@@ -93,4 +158,126 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 	when: ContextKeyExpr.equals(AICustomizationItemTypeContextKey.key, PromptsType.prompt),
 });
 
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: COPY_AI_CUSTOMIZATION_PATH_ID, title: localize('copyPath', "Copy Path") },
+	group: '3_modify',
+	order: 1,
+});
+
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: DELETE_AI_CUSTOMIZATION_FILE_ID, title: localize('delete', "Delete") },
+	group: '3_modify',
+	order: 10,
+});
+
+// Disable item action
+const DISABLE_AI_CUSTOMIZATION_ITEM_ID = 'aiCustomization.disableItem';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: DISABLE_AI_CUSTOMIZATION_ITEM_ID,
+			title: localize2('disable', "Disable"),
+			icon: Codicon.eyeClosed,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: ItemContext): Promise<void> {
+		if (typeof context !== 'object' || URI.isUri(context)) {
+			return;
+		}
+		const promptsService = accessor.get(IPromptsService);
+		const viewsService = accessor.get(IViewsService);
+		const uri = extractURI(context);
+		const promptType = context.promptType as PromptsType | undefined;
+		if (!promptType) {
+			return;
+		}
+
+		const disabled = promptsService.getDisabledPromptFiles(promptType);
+		disabled.add(uri);
+		promptsService.setDisabledPromptFiles(promptType, disabled);
+
+		const view = viewsService.getActiveViewWithId<AICustomizationViewPane>(AI_CUSTOMIZATION_VIEW_ID);
+		view?.refresh();
+	}
+});
+
+// Enable item action
+const ENABLE_AI_CUSTOMIZATION_ITEM_ID = 'aiCustomization.enableItem';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: ENABLE_AI_CUSTOMIZATION_ITEM_ID,
+			title: localize2('enable', "Enable"),
+			icon: Codicon.eye,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: ItemContext): Promise<void> {
+		if (typeof context !== 'object' || URI.isUri(context)) {
+			return;
+		}
+		const promptsService = accessor.get(IPromptsService);
+		const viewsService = accessor.get(IViewsService);
+		const uri = extractURI(context);
+		const promptType = context.promptType as PromptsType | undefined;
+		if (!promptType) {
+			return;
+		}
+
+		const disabled = promptsService.getDisabledPromptFiles(promptType);
+		disabled.delete(uri);
+		promptsService.setDisabledPromptFiles(promptType, disabled);
+
+		const view = viewsService.getActiveViewWithId<AICustomizationViewPane>(AI_CUSTOMIZATION_VIEW_ID);
+		view?.refresh();
+	}
+});
+
+// Context menu: Disable (shown when builtin item is enabled)
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: DISABLE_AI_CUSTOMIZATION_ITEM_ID, title: localize('disable', "Disable") },
+	group: '4_toggle',
+	order: 1,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AICustomizationItemDisabledContextKey.key, false),
+		ContextKeyExpr.equals(AICustomizationItemStorageContextKey.key, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AICustomizationItemTypeContextKey.key, PromptsType.skill),
+	),
+});
+
+// Context menu: Enable (shown when builtin item is disabled)
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: ENABLE_AI_CUSTOMIZATION_ITEM_ID, title: localize('enable', "Enable") },
+	group: '4_toggle',
+	order: 1,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AICustomizationItemDisabledContextKey.key, true),
+		ContextKeyExpr.equals(AICustomizationItemStorageContextKey.key, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AICustomizationItemTypeContextKey.key, PromptsType.skill),
+	),
+});
+
+// Inline hover: Disable (shown when builtin item is enabled)
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: DISABLE_AI_CUSTOMIZATION_ITEM_ID, title: localize('disable', "Disable"), icon: Codicon.eyeClosed },
+	group: 'inline',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AICustomizationItemDisabledContextKey.key, false),
+		ContextKeyExpr.equals(AICustomizationItemStorageContextKey.key, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AICustomizationItemTypeContextKey.key, PromptsType.skill),
+	),
+});
+
+// Inline hover: Enable (shown when builtin item is disabled)
+MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
+	command: { id: ENABLE_AI_CUSTOMIZATION_ITEM_ID, title: localize('enable', "Enable"), icon: Codicon.eye },
+	group: 'inline',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AICustomizationItemDisabledContextKey.key, true),
+		ContextKeyExpr.equals(AICustomizationItemStorageContextKey.key, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AICustomizationItemTypeContextKey.key, PromptsType.skill),
+	),
+});
+
 //#endregion
diff --git a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeViewViews.ts b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeViewViews.ts
index e68286ee17c..f5cfae860f4 100644
--- a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeViewViews.ts
+++ b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeViewViews.ts
@@ -5,6 +5,7 @@
 
 import './media/aiCustomizationTreeView.css';
 import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observable.js';
@@ -12,7 +13,7 @@ import { basename, dirname } from '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
-import { getContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { createActionViewItem, getContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -36,7 +37,7 @@ import { AICustomizationManagementEditor } from '../../../../workbench/contrib/c
 import { IAsyncDataSource, ITreeNode, ITreeRenderer, ITreeContextMenuEvent } from '../../../../base/browser/ui/tree/tree.js';
 import { FuzzyScore } from '../../../../base/common/filters.js';
 import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
-import { IEditorService, MODAL_GROUP } from '../../../../workbench/services/editor/common/editorService.js';
+import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IAICustomizationWorkspaceService } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
@@ -53,6 +54,16 @@ export const AICustomizationIsEmptyContextKey = new RawContextKey<boolean>('aiCu
  */
 export const AICustomizationItemTypeContextKey = new RawContextKey<string>('aiCustomizationItemType', '');
 
+/**
+ * Context key indicating whether the current item is disabled.
+ */
+export const AICustomizationItemDisabledContextKey = new RawContextKey<boolean>('aiCustomizationItemDisabled', false);
+
+/**
+ * Context key for the current item's storage type in context menus.
+ */
+export const AICustomizationItemStorageContextKey = new RawContextKey<string>('aiCustomizationItemStorage', '');
+
 //#endregion
 
 //#region Tree Item Types
@@ -97,6 +108,7 @@ interface IAICustomizationFileItem {
 	readonly description?: string;
 	readonly storage: AICustomizationPromptsStorage;
 	readonly promptType: PromptsType;
+	readonly disabled: boolean;
 }
 
 /**
@@ -149,6 +161,9 @@ interface IFileTemplateData {
 	readonly container: HTMLElement;
 	readonly icon: HTMLElement;
 	readonly name: HTMLElement;
+	readonly actionBar: ActionBar;
+	readonly elementDisposables: DisposableStore;
+	readonly templateDisposables: DisposableStore;
 }
 
 class AICustomizationCategoryRenderer implements ITreeRenderer<IAICustomizationTypeItem | IAICustomizationLinkItem, FuzzyScore, ICategoryTemplateData> {
@@ -189,15 +204,29 @@ class AICustomizationGroupRenderer implements ITreeRenderer<IAICustomizationGrou
 class AICustomizationFileRenderer implements ITreeRenderer<IAICustomizationFileItem, FuzzyScore, IFileTemplateData> {
 	readonly templateId = 'file';
 
+	constructor(
+		private readonly menuService: IMenuService,
+		private readonly contextKeyService: IContextKeyService,
+		private readonly instantiationService: IInstantiationService,
+	) { }
+
 	renderTemplate(container: HTMLElement): IFileTemplateData {
 		const element = dom.append(container, dom.$('.ai-customization-tree-item'));
 		const icon = dom.append(element, dom.$('.icon'));
 		const name = dom.append(element, dom.$('.name'));
-		return { container: element, icon, name };
+		const actionsContainer = dom.append(element, dom.$('.actions'));
+
+		const templateDisposables = new DisposableStore();
+		const actionBar = templateDisposables.add(new ActionBar(actionsContainer, {
+			actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService),
+		}));
+
+		return { container: element, icon, name, actionBar, elementDisposables: new DisposableStore(), templateDisposables };
 	}
 
 	renderElement(node: ITreeNode<IAICustomizationFileItem, FuzzyScore>, _index: number, templateData: IFileTemplateData): void {
 		const item = node.element;
+		templateData.elementDisposables.clear();
 
 		// Set icon based on prompt type
 		let icon: ThemeIcon;
@@ -222,12 +251,53 @@ class AICustomizationFileRenderer implements ITreeRenderer<IAICustomizationFileI
 
 		templateData.name.textContent = item.name;
 
+		// Apply disabled styling
+		templateData.container.classList.toggle('disabled', item.disabled);
+
 		// Set tooltip with name and description
 		const tooltip = item.description ? `${item.name} - ${item.description}` : item.name;
 		templateData.container.title = tooltip;
+
+		// Build context for menu actions
+		const context = {
+			uri: item.uri.toString(),
+			name: item.name,
+			promptType: item.promptType,
+			storage: item.storage,
+		};
+
+		// Create scoped context key service with item type for when-clause filtering
+		const overlay = this.contextKeyService.createOverlay([
+			[AICustomizationItemTypeContextKey.key, item.promptType],
+			[AICustomizationItemDisabledContextKey.key, item.disabled],
+			[AICustomizationItemStorageContextKey.key, item.storage],
+		]);
+
+		// Create menu and extract inline actions
+		const menu = templateData.elementDisposables.add(
+			this.menuService.createMenu(AICustomizationItemMenuId, overlay)
+		);
+
+		const updateActions = () => {
+			const actions = menu.getActions({ arg: context, shouldForwardArgs: true });
+			const { primary } = getContextMenuActions(actions, 'inline');
+			templateData.actionBar.clear();
+			templateData.actionBar.push(primary, { icon: true, label: false });
+		};
+		updateActions();
+		templateData.elementDisposables.add(menu.onDidChange(updateActions));
+
+		templateData.actionBar.context = context;
 	}
 
-	disposeTemplate(_templateData: IFileTemplateData): void { }
+	disposeElement(_node: ITreeNode<IAICustomizationFileItem, FuzzyScore>, _index: number, templateData: IFileTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeTemplate(templateData: IFileTemplateData): void {
+		templateData.templateDisposables.dispose();
+		templateData.elementDisposables.dispose();
+	}
 }
 
 /**
@@ -356,6 +426,7 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 			const workspaceSkills = cached.skills.filter(s => s.storage === PromptsStorage.local);
 			const userSkills = cached.skills.filter(s => s.storage === PromptsStorage.user);
 			const extensionSkills = cached.skills.filter(s => s.storage === PromptsStorage.extension);
+			const builtinSkills = cached.skills.filter(s => s.storage === BUILTIN_STORAGE);
 
 			if (workspaceSkills.length > 0) {
 				groups.push(this.createGroupItem(promptType, PromptsStorage.local, workspaceSkills.length));
@@ -366,6 +437,9 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 			if (extensionSkills.length > 0) {
 				groups.push(this.createGroupItem(promptType, PromptsStorage.extension, extensionSkills.length));
 			}
+			if (builtinSkills.length > 0) {
+				groups.push(this.createGroupItem(promptType, BUILTIN_STORAGE, builtinSkills.length));
+			}
 
 			return groups;
 		}
@@ -455,13 +529,16 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 	 */
 	private async getFilesForStorageAndType(storage: AICustomizationPromptsStorage, promptType: PromptsType): Promise<IAICustomizationFileItem[]> {
 		const cached = this.cache.get(promptType);
+		const disabledUris = this.promptsService.getDisabledPromptFiles(promptType);
 
-		// For skills, use the cached skills data
+		// For skills, use the cached skills data and merge in disabled skills
 		if (promptType === PromptsType.skill) {
 			const skills = cached?.skills || [];
 			const filtered = skills.filter(skill => skill.storage === storage);
-			return filtered
+			const seenUris = new Set<string>();
+			const result: IAICustomizationFileItem[] = filtered
 				.map(skill => {
+					seenUris.add(skill.uri.toString());
 					// Use skill name from frontmatter, or fallback to parent folder name
 					const skillName = skill.name || basename(dirname(skill.uri)) || basename(skill.uri);
 					return {
@@ -472,8 +549,30 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 						description: skill.description,
 						storage: skill.storage,
 						promptType,
+						disabled: disabledUris.has(skill.uri),
 					};
 				});
+
+			// Include disabled skills not already in the enabled list
+			if (disabledUris.size > 0) {
+				const allSkillFiles = await this.promptsService.listPromptFiles(PromptsType.skill, CancellationToken.None);
+				for (const file of allSkillFiles) {
+					if (file.storage === storage && !seenUris.has(file.uri.toString()) && disabledUris.has(file.uri)) {
+						result.push({
+							type: 'file' as const,
+							id: file.uri.toString(),
+							uri: file.uri,
+							name: file.name || basename(dirname(file.uri)) || basename(file.uri),
+							description: file.description,
+							storage: file.storage,
+							promptType,
+							disabled: true,
+						});
+					}
+				}
+			}
+
+			return result;
 		}
 
 		// Use cached files data (already fetched in getStorageGroups)
@@ -486,6 +585,7 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 			description: item.description,
 			storage: item.storage,
 			promptType,
+			disabled: disabledUris.has(item.uri),
 		}));
 	}
 }
@@ -508,6 +608,8 @@ export class AICustomizationViewPane extends ViewPane {
 	// Context keys for controlling menu visibility and welcome content
 	private readonly isEmptyContextKey: IContextKey<boolean>;
 	private readonly itemTypeContextKey: IContextKey<string>;
+	private readonly itemDisabledContextKey: IContextKey<boolean>;
+	private readonly itemStorageContextKey: IContextKey<string>;
 
 	constructor(
 		options: IViewPaneOptions,
@@ -532,6 +634,8 @@ export class AICustomizationViewPane extends ViewPane {
 		// Initialize context keys
 		this.isEmptyContextKey = AICustomizationIsEmptyContextKey.bindTo(contextKeyService);
 		this.itemTypeContextKey = AICustomizationItemTypeContextKey.bindTo(contextKeyService);
+		this.itemDisabledContextKey = AICustomizationItemDisabledContextKey.bindTo(contextKeyService);
+		this.itemStorageContextKey = AICustomizationItemStorageContextKey.bindTo(contextKeyService);
 
 		// Subscribe to prompt service events to refresh tree
 		this._register(this.promptsService.onDidChangeCustomAgents(() => this.refresh()));
@@ -575,7 +679,7 @@ export class AICustomizationViewPane extends ViewPane {
 			[
 				new AICustomizationCategoryRenderer(),
 				new AICustomizationGroupRenderer(),
-				new AICustomizationFileRenderer(),
+				new AICustomizationFileRenderer(this.menuService, this.contextKeyService, this.instantiationService),
 			],
 			this.dataSource,
 			{
@@ -590,10 +694,13 @@ export class AICustomizationViewPane extends ViewPane {
 						if (element.type === 'group') {
 							return element.label;
 						}
-						// For files, include description if available
-						return element.description
+						// For files, include description and disabled state
+						const nameAndDesc = element.description
 							? localize('fileAriaLabel', "{0}, {1}", element.name, element.description)
 							: element.name;
+						return element.disabled
+							? localize('fileAriaLabelDisabled', "{0}, disabled", nameAndDesc)
+							: nameAndDesc;
 					},
 					getWidgetAriaLabel: () => localize('aiCustomizationTree', "Chat Customization Items"),
 				},
@@ -616,7 +723,7 @@ export class AICustomizationViewPane extends ViewPane {
 				});
 			} else if (e.element && e.element.type === 'link') {
 				const input = AICustomizationManagementEditorInput.getOrCreate();
-				const editor = await this.editorService.openEditor(input, { pinned: true }, MODAL_GROUP);
+				const editor = await this.editorService.openEditor(input, { pinned: true });
 				if (editor instanceof AICustomizationManagementEditor) {
 					editor.selectSectionById(e.element.section);
 				}
@@ -671,14 +778,17 @@ export class AICustomizationViewPane extends ViewPane {
 
 		const element = e.element;
 
-		// Set context key for the item type so menu items can use `when` clauses
+		// Set context keys for the item so menu items can use `when` clauses
 		this.itemTypeContextKey.set(element.promptType);
+		this.itemDisabledContextKey.set(element.disabled);
+		this.itemStorageContextKey.set(element.storage);
 
 		// Get menu actions from the menu service
 		const context = {
 			uri: element.uri.toString(),
 			name: element.name,
 			promptType: element.promptType,
+			disabled: element.disabled,
 		};
 		const menu = this.menuService.getMenuActions(AICustomizationItemMenuId, this.contextKeyService, { arg: context, shouldForwardArgs: true });
 		const { secondary } = getContextMenuActions(menu, 'inline');
@@ -690,8 +800,10 @@ export class AICustomizationViewPane extends ViewPane {
 				getActions: () => secondary,
 				getActionsContext: () => context,
 				onHide: () => {
-					// Clear the context key when menu closes
+					// Clear the context keys when menu closes
 					this.itemTypeContextKey.reset();
+					this.itemDisabledContextKey.reset();
+					this.itemStorageContextKey.reset();
 				},
 			});
 		}
diff --git a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/media/aiCustomizationTreeView.css b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/media/aiCustomizationTreeView.css
index 0756725fc2b..d9e40517d16 100644
--- a/src/vs/sessions/contrib/aiCustomizationTreeView/browser/media/aiCustomizationTreeView.css
+++ b/src/vs/sessions/contrib/aiCustomizationTreeView/browser/media/aiCustomizationTreeView.css
@@ -31,11 +31,24 @@
 }
 
 .ai-customization-view .ai-customization-tree-item .name {
+	flex: 1;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
+.ai-customization-view .ai-customization-tree-item .actions {
+	display: none;
+	flex-shrink: 0;
+	max-width: fit-content;
+}
+
+.ai-customization-view .monaco-list .monaco-list-row:hover .ai-customization-tree-item > .actions,
+.ai-customization-view .monaco-list .monaco-list-row.focused .ai-customization-tree-item > .actions,
+.ai-customization-view .monaco-list .monaco-list-row.selected .ai-customization-tree-item > .actions {
+	display: flex;
+}
+
 .ai-customization-view .ai-customization-tree-item .description {
 	flex-shrink: 1;
 	color: var(--vscode-descriptionForeground);
@@ -90,6 +103,11 @@
 	white-space: nowrap;
 }
 
+/* Disabled items */
+.ai-customization-view .ai-customization-tree-item.disabled {
+	opacity: 0.5;
+}
+
 /* Empty state */
 .ai-customization-view .empty-message {
 	padding: 10px;
diff --git a/src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.ts b/src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.ts
index 1c02efa68e6..c3d198e1d16 100644
--- a/src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.ts
+++ b/src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.ts
@@ -43,7 +43,8 @@ class ApplyChangesToParentRepoContribution extends Disposable implements IWorkbe
 
 		this._register(autorun(reader => {
 			const activeSession = sessionManagementService.activeSession.read(reader);
-			const hasWorktreeAndRepo = !!activeSession?.worktree && !!activeSession?.repository;
+			const repo = activeSession?.workspace.read(reader)?.repositories[0];
+			const hasWorktreeAndRepo = !!repo?.workingDirectory && !!repo?.uri;
 			worktreeAndRepoKey.set(hasWorktreeAndRepo);
 		}));
 	}
@@ -85,13 +86,14 @@ class ApplyChangesToParentRepoAction extends Action2 {
 		const openerService = accessor.get(IOpenerService);
 		const productService = accessor.get(IProductService);
 
-		const activeSession = sessionManagementService.getActiveSession();
-		if (!activeSession?.worktree || !activeSession?.repository) {
+		const activeSession = sessionManagementService.activeSession.get();
+		const repo = activeSession?.workspace.get()?.repositories[0];
+		if (!activeSession || !repo?.workingDirectory || !repo?.uri) {
 			return;
 		}
 
-		const worktreeRoot = activeSession.worktree;
-		const repoRoot = activeSession.repository;
+		const worktreeRoot = repo.workingDirectory;
+		const repoRoot = repo.uri;
 
 		const openFolderAction = toAction({
 			id: 'applyChangesToParentRepo.openFolder',
diff --git a/src/vs/sessions/contrib/changes/browser/changesTitleBarWidget.ts b/src/vs/sessions/contrib/changes/browser/changesTitleBarWidget.ts
new file mode 100644
index 00000000000..5519f5024f7
--- /dev/null
+++ b/src/vs/sessions/contrib/changes/browser/changesTitleBarWidget.ts
@@ -0,0 +1,193 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/changesTitleBarWidget.css';
+
+import { $, append } from '../../../../base/browser/dom.js';
+import { BaseActionViewItem, IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { localize } from '../../../../nls.js';
+import { Action2, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IWorkbenchContribution } from '../../../../workbench/common/contributions.js';
+import { IsAuxiliaryWindowContext, AuxiliaryBarVisibleContext } from '../../../../workbench/common/contextkeys.js';
+import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { getAgentChangesSummary } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../workbench/services/layout/browser/layoutService.js';
+import { IPaneCompositePartService } from '../../../../workbench/services/panecomposite/browser/panecomposite.js';
+import { ViewContainerLocation } from '../../../../workbench/common/views.js';
+import { Menus } from '../../../browser/menus.js';
+import { SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { CHANGES_VIEW_CONTAINER_ID } from './changesView.js';
+
+const TOGGLE_CHANGES_VIEW_ID = 'workbench.action.agentSessions.toggleChangesView';
+
+/**
+ * Action view item that renders the diff stats indicator (file change counts)
+ * in the titlebar session toolbar. Shows [diff icon] +insertions -deletions.
+ * Clicking toggles the auxiliary bar with the Changes view.
+ */
+class ChangesTitleBarActionViewItem extends BaseActionViewItem {
+
+	private _container: HTMLElement | undefined;
+	private readonly _indicatorDisposables = this._register(new DisposableStore());
+	private readonly _hoverDelegate = this._register(createInstantHoverDelegate());
+
+	constructor(
+		action: IAction,
+		options: IBaseActionViewItemOptions | undefined,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@ISessionsManagementService private readonly activeSessionService: ISessionsManagementService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+	) {
+		super(undefined, action, options);
+
+		// Re-render when the active session changes
+		this._register(autorun(reader => {
+			this.activeSessionService.activeSession.read(reader);
+			this._rebuildIndicators();
+		}));
+
+		// Re-render when sessions data changes
+		this._register(this.agentSessionsService.model.onDidChangeSessions(() => {
+			this._rebuildIndicators();
+		}));
+
+		// Update active state when auxiliary bar visibility changes
+		this._register(this.layoutService.onDidChangePartVisibility(e => {
+			if (e.partId === Parts.AUXILIARYBAR_PART) {
+				this._updateActiveState();
+			}
+		}));
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+
+		this._container = container;
+		container.classList.add('changes-titlebar-indicator');
+
+		this._rebuildIndicators();
+		this._updateActiveState();
+	}
+
+	override onClick(): void {
+		this._action.run();
+	}
+
+	private _updateActiveState(): void {
+		this._container?.classList.toggle('active', this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
+	}
+
+	private _rebuildIndicators(): void {
+		if (!this._container) {
+			return;
+		}
+
+		this._indicatorDisposables.clear();
+
+		const btn = this._container;
+		btn.textContent = '';
+
+		// Get change summary from the active session
+		const activeSession = this.activeSessionService.activeSession.get();
+		const resource = activeSession?.resource;
+		const session = resource ? this.agentSessionsService.getSession(resource) : undefined;
+		const summary = session ? getAgentChangesSummary(session.changes) : undefined;
+
+		// Rebuild inner content: [diff icon] +insertions -deletions
+		append(btn, $(ThemeIcon.asCSSSelector(Codicon.diffMultiple)));
+
+		if (summary && summary.insertions > 0) {
+			const insLabel = append(btn, $('span.changes-titlebar-count.changes-titlebar-insertions'));
+			insLabel.textContent = `+${summary.insertions}`;
+		}
+
+		if (summary && summary.deletions > 0) {
+			const delLabel = append(btn, $('span.changes-titlebar-count.changes-titlebar-deletions'));
+			delLabel.textContent = `-${summary.deletions}`;
+		}
+
+		if (summary) {
+			this._indicatorDisposables.add(this.hoverService.setupManagedHover(
+				this._hoverDelegate, btn,
+				localize('changesSummary', "{0} file(s) changed, {1} insertion(s), {2} deletion(s)", summary.files, summary.insertions, summary.deletions)
+			));
+		} else {
+			this._indicatorDisposables.add(this.hoverService.setupManagedHover(
+				this._hoverDelegate, btn,
+				localize('showChanges', "Show Changes")
+			));
+		}
+	}
+}
+
+/**
+ * Registers the changes indicator action in the titlebar session toolbar
+ * (`TitleBarSessionMenu`) and provides a custom action view item to render
+ * the diff stats widget.
+ */
+export class ChangesTitleBarContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.changesTitleBar';
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		// Register the toggle action in the session toolbar
+		this._register(MenuRegistry.appendMenuItem(Menus.TitleBarSessionMenu, {
+			command: {
+				id: TOGGLE_CHANGES_VIEW_ID,
+				title: localize('toggleChanges', "Toggle Changes"),
+				icon: Codicon.diffMultiple,
+				toggled: AuxiliaryBarVisibleContext,
+			},
+			group: 'navigation',
+			order: 10, // After Run Script (8) and Terminal toggle (9)
+			when: ContextKeyExpr.and(IsAuxiliaryWindowContext.toNegated(), SessionsWelcomeVisibleContext.toNegated()),
+		}));
+
+		// Provide a custom action view item that renders the diff stats
+		this._register(actionViewItemService.register(Menus.TitleBarSessionMenu, TOGGLE_CHANGES_VIEW_ID, (action, options) => {
+			return instantiationService.createInstance(ChangesTitleBarActionViewItem, action, options);
+		}));
+	}
+}
+
+// Register the toggle action
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: TOGGLE_CHANGES_VIEW_ID,
+			title: localize('toggleChanges', "Toggle Changes"),
+			icon: Codicon.diffMultiple,
+			precondition: ContextKeyExpr.and(IsAuxiliaryWindowContext.toNegated(), SessionsWelcomeVisibleContext.toNegated()),
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const layoutService = accessor.get(IWorkbenchLayoutService);
+		const paneCompositeService = accessor.get(IPaneCompositePartService);
+
+		const isVisible = !layoutService.isVisible(Parts.AUXILIARYBAR_PART);
+		layoutService.setPartHidden(!isVisible, Parts.AUXILIARYBAR_PART);
+		if (isVisible) {
+			paneCompositeService.openPaneComposite(CHANGES_VIEW_CONTAINER_ID, ViewContainerLocation.AuxiliaryBar);
+		}
+	}
+});
diff --git a/src/vs/sessions/contrib/changes/browser/changesView.contribution.ts b/src/vs/sessions/contrib/changes/browser/changesView.contribution.ts
index 9da044d818d..11648ded361 100644
--- a/src/vs/sessions/contrib/changes/browser/changesView.contribution.ts
+++ b/src/vs/sessions/contrib/changes/browser/changesView.contribution.ts
@@ -12,7 +12,9 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../work
 import { IViewContainersRegistry, ViewContainerLocation, IViewsRegistry, Extensions as ViewContainerExtensions, WindowVisibility } from '../../../../workbench/common/views.js';
 import { CHANGES_VIEW_CONTAINER_ID, CHANGES_VIEW_ID, ChangesViewPane, ChangesViewPaneContainer } from './changesView.js';
 import './changesViewActions.js';
-import { ToggleChangesViewContribution } from './toggleChangesView.js';
+import './fixCIChecksAction.js';
+import { ChangesViewController } from './changesViewController.js';
+import { ChangesTitleBarContribution } from './changesTitleBarWidget.js';
 
 const changesViewIcon = registerIcon('changes-view-icon', Codicon.gitCompare, localize2('changesViewIcon', 'View icon for the Changes view.').value);
 
@@ -20,7 +22,7 @@ const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContaine
 
 const changesViewContainer = viewContainersRegistry.registerViewContainer({
 	id: CHANGES_VIEW_CONTAINER_ID,
-	title: localize2('changes', 'Changes'),
+	title: localize2('artifacts', 'Artifacts'),
 	ctorDescriptor: new SyncDescriptor(ChangesViewPaneContainer),
 	icon: changesViewIcon,
 	order: 10,
@@ -32,7 +34,7 @@ const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsR
 
 viewsRegistry.registerViews([{
 	id: CHANGES_VIEW_ID,
-	name: localize2('changes', 'Changes'),
+	name: localize2('artifacts', 'Artifacts'),
 	containerIcon: changesViewIcon,
 	ctorDescriptor: new SyncDescriptor(ChangesViewPane),
 	canToggleVisibility: true,
@@ -42,4 +44,5 @@ viewsRegistry.registerViews([{
 	windowVisibility: WindowVisibility.Sessions
 }], changesViewContainer);
 
-registerWorkbenchContribution2(ToggleChangesViewContribution.ID, ToggleChangesViewContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChangesViewController.ID, ChangesViewController, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChangesTitleBarContribution.ID, ChangesTitleBarContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/sessions/contrib/changes/browser/changesView.ts b/src/vs/sessions/contrib/changes/browser/changesView.ts
index ffb41b25c95..8b12436b27e 100644
--- a/src/vs/sessions/contrib/changes/browser/changesView.ts
+++ b/src/vs/sessions/contrib/changes/browser/changesView.ts
@@ -10,10 +10,10 @@ import { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressed
 import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
 import { IObjectTreeElement, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Iterable } from '../../../../base/common/iterator.js';
-import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, derived, derivedOpts, IObservable, IObservableWithChange, observableFromEvent, observableFromPromise, observableValue } from '../../../../base/common/observable.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { autorun, constObservable, derived, derivedOpts, IObservable, IObservableWithChange, ISettableObservable, ObservablePromise, observableSignalFromEvent, observableValue, runOnChange } from '../../../../base/common/observable.js';
 import { basename, dirname } from '../../../../base/common/path.js';
 import { extUriBiasedIgnorePathCase, isEqual } from '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -23,7 +23,7 @@ import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/but
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId, Action2, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
@@ -48,22 +48,24 @@ import { IViewsService } from '../../../../workbench/services/views/common/views
 import { IsSessionsWindowContext } from '../../../../workbench/common/contextkeys.js';
 import { CHAT_CATEGORY } from '../../../../workbench/contrib/chat/browser/actions/chatActions.js';
 import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
 import { ChatContextKeys } from '../../../../workbench/contrib/chat/common/actions/chatContextKeys.js';
 import { IChatSessionFileChange, IChatSessionFileChange2, isIChatSessionFileChange2 } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { chatEditingWidgetFileStateContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, ModifiedFileEntryState } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { getChatSessionType } from '../../../../workbench/contrib/chat/common/model/chatUri.js';
+import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
 import { createFileIconThemableTreeContainerScope } from '../../../../workbench/contrib/files/browser/views/explorerView.js';
-import { IActivityService, NumberBadge } from '../../../../workbench/services/activity/common/activity.js';
-import { IEditorService, MODAL_GROUP, SIDE_GROUP } from '../../../../workbench/services/editor/common/editorService.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../../workbench/services/editor/common/editorService.js';
 import { IExtensionService } from '../../../../workbench/services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../../workbench/services/layout/browser/layoutService.js';
 import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
-import { GITHUB_REMOTE_FILE_SCHEME } from '../../fileTreeView/browser/githubFileSystemProvider.js';
 import { CodeReviewStateKind, getCodeReviewFilesFromSessionChanges, getCodeReviewVersion, ICodeReviewService, PRReviewStateKind } from '../../codeReview/browser/codeReviewService.js';
 import { IGitRepository, IGitService } from '../../../../workbench/contrib/git/common/gitService.js';
 import { IGitHubService } from '../../github/browser/githubService.js';
 import { CIStatusWidget } from './ciStatusWidget.js';
+import { arrayEqualsC } from '../../../../base/common/equals.js';
+import { GITHUB_REMOTE_FILE_SCHEME } from '../../sessions/common/sessionData.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
+import { IView, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
+import { Color } from '../../../../base/common/color.js';
+import { PANEL_SECTION_BORDER } from '../../../../workbench/common/theme.js';
 
 const $ = dom.$;
 
@@ -86,12 +88,14 @@ const changesViewModeContextKey = new RawContextKey<ChangesViewMode>('changesVie
 
 const enum ChangesVersionMode {
 	AllChanges = 'allChanges',
-	LastTurn = 'lastTurn',
-	Uncommitted = 'uncommitted'
+	LastTurn = 'lastTurn'
 }
 
 const changesVersionModeContextKey = new RawContextKey<ChangesVersionMode>('sessions.changesVersionMode', ChangesVersionMode.AllChanges);
-const hasUncommittedChangesContextKey = new RawContextKey<boolean>('sessions.hasUncommittedChanges', false);
+const isMergeBaseBranchProtectedContextKey = new RawContextKey<boolean>('sessions.isMergeBaseBranchProtected', false);
+const hasOpenPullRequestContextKey = new RawContextKey<boolean>('sessions.hasOpenPullRequest', false);
+const hasIncomingChangesContextKey = new RawContextKey<boolean>('sessions.hasIncomingChanges', false);
+const hasOutgoingChangesContextKey = new RawContextKey<boolean>('sessions.hasOutgoingChanges', false);
 
 // --- List Item
 
@@ -115,13 +119,6 @@ interface IChangesFolderItem {
 	readonly name: string;
 }
 
-interface IActiveSession {
-	readonly resource: URI;
-	readonly sessionType: string;
-	readonly repository: URI | undefined;
-	readonly worktree: URI | undefined;
-}
-
 type ChangesTreeElement = IChangesFileItem | IChangesFolderItem;
 
 function isChangesFileItem(element: ChangesTreeElement): element is IChangesFileItem {
@@ -210,12 +207,107 @@ function buildTreeChildren(items: IChangesFileItem[]): IObjectTreeElement<Change
 	return convert(root);
 }
 
+// --- View Model
+
+class ChangesViewModel extends Disposable {
+	readonly sessionsChangedSignal: IObservable<void>;
+	readonly activeSessionResourceObs: IObservable<URI | undefined>;
+	readonly activeSessionRepositoryObs: IObservableWithChange<IGitRepository | undefined>;
+	readonly activeSessionChangesObs: IObservable<readonly (IChatSessionFileChange | IChatSessionFileChange2)[]>;
+
+	readonly versionModeObs: ISettableObservable<ChangesVersionMode>;
+	setVersionMode(mode: ChangesVersionMode): void {
+		if (this.versionModeObs.get() === mode) {
+			return;
+		}
+		this.versionModeObs.set(mode, undefined);
+	}
+
+	readonly viewModeObs: ISettableObservable<ChangesViewMode>;
+	setViewMode(mode: ChangesViewMode): void {
+		if (this.viewModeObs.get() === mode) {
+			return;
+		}
+		this.viewModeObs.set(mode, undefined);
+		this.storageService.store('changesView.viewMode', mode, StorageScope.WORKSPACE, StorageTarget.USER);
+	}
+
+	constructor(
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IGitService private readonly gitService: IGitService,
+		@ISessionsManagementService private readonly sessionManagementService: ISessionsManagementService,
+		@IStorageService private readonly storageService: IStorageService,
+	) {
+		super();
+
+		// Active session changes
+		this.sessionsChangedSignal = observableSignalFromEvent(this,
+			this.agentSessionsService.model.onDidChangeSessions);
+
+		// Active session resource
+		this.activeSessionResourceObs = derivedOpts({ equalsFn: isEqual }, reader => {
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			return activeSession?.resource;
+		});
+
+		// Active session changes
+		this.activeSessionChangesObs = derivedOpts({
+			equalsFn: arrayEqualsC<IChatSessionFileChange | IChatSessionFileChange2>()
+		}, reader => {
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			if (!activeSession) {
+				return Iterable.empty();
+			}
+			return activeSession.changes.read(reader) as readonly (IChatSessionFileChange | IChatSessionFileChange2)[];
+		});
+
+		// Active session repository
+		const activeSessionRepositoryPromiseObs = derived(reader => {
+			const activeSessionResource = this.activeSessionResourceObs.read(reader);
+			if (!activeSessionResource) {
+				return constObservable(undefined);
+			}
+
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			const worktree = activeSession?.workspace.read(reader)?.repositories[0]?.workingDirectory;
+			if (!worktree) {
+				return constObservable(undefined);
+			}
+
+			return new ObservablePromise(this.gitService.openRepository(worktree)).resolvedValue;
+		});
+
+		this.activeSessionRepositoryObs = derived<IGitRepository | undefined>(reader => {
+			const activeSessionRepositoryPromise = activeSessionRepositoryPromiseObs.read(reader);
+			if (activeSessionRepositoryPromise === undefined) {
+				return undefined;
+			}
+
+			return activeSessionRepositoryPromise.read(reader);
+		});
+
+		// Version mode
+		this.versionModeObs = observableValue<ChangesVersionMode>(this, ChangesVersionMode.AllChanges);
+
+		this._register(runOnChange(this.activeSessionResourceObs, () => {
+			this.setVersionMode(ChangesVersionMode.AllChanges);
+		}));
+
+		// View mode
+		const storedMode = this.storageService.get('changesView.viewMode', StorageScope.WORKSPACE);
+		const initialMode = storedMode === ChangesViewMode.Tree ? ChangesViewMode.Tree : ChangesViewMode.List;
+		this.viewModeObs = observableValue<ChangesViewMode>(this, initialMode);
+	}
+}
+
 // --- View Pane
 
 export class ChangesViewPane extends ViewPane {
 
 	private bodyContainer: HTMLElement | undefined;
 	private welcomeContainer: HTMLElement | undefined;
+	private filesHeaderNode: HTMLElement | undefined;
+	private filesCountBadge: HTMLElement | undefined;
 	private contentContainer: HTMLElement | undefined;
 	private overviewContainer: HTMLElement | undefined;
 	private summaryContainer: HTMLElement | undefined;
@@ -225,6 +317,8 @@ export class ChangesViewPane extends ViewPane {
 
 	private tree: WorkbenchCompressibleObjectTree<ChangesTreeElement> | undefined;
 	private ciStatusWidget: CIStatusWidget | undefined;
+	private splitView: SplitView | undefined;
+	private splitViewContainer: HTMLElement | undefined;
 
 	private readonly renderDisposables = this._register(new DisposableStore());
 
@@ -232,45 +326,7 @@ export class ChangesViewPane extends ViewPane {
 	private currentBodyHeight = 0;
 	private currentBodyWidth = 0;
 
-	// View mode (list vs tree)
-	private readonly viewModeObs: ReturnType<typeof observableValue<ChangesViewMode>>;
-	private readonly viewModeContextKey: IContextKey<ChangesViewMode>;
-
-	get viewMode(): ChangesViewMode { return this.viewModeObs.get(); }
-	set viewMode(mode: ChangesViewMode) {
-		if (this.viewModeObs.get() === mode) {
-			return;
-		}
-		this.viewModeObs.set(mode, undefined);
-		this.viewModeContextKey.set(mode);
-		this.storageService.store('changesView.viewMode', mode, StorageScope.WORKSPACE, StorageTarget.USER);
-	}
-
-	// Version mode (all changes, last turn, uncommitted)
-	private readonly versionModeObs = observableValue<ChangesVersionMode>(this, ChangesVersionMode.AllChanges);
-	private readonly versionModeContextKey: IContextKey<ChangesVersionMode>;
-
-	setVersionMode(mode: ChangesVersionMode): void {
-		if (this.versionModeObs.get() === mode) {
-			return;
-		}
-		this.versionModeObs.set(mode, undefined);
-		this.versionModeContextKey.set(mode);
-	}
-
-	// Track the active session used by this view
-	private readonly activeSession: IObservableWithChange<IActiveSession | undefined>;
-	private readonly activeSessionFileCountObs: IObservableWithChange<number>;
-	private readonly activeSessionHasChangesObs: IObservableWithChange<boolean>;
-	private readonly activeSessionRepositoryChangesObs: IObservableWithChange<IChangesFileItem[] | undefined>;
-	private readonly activeSessionRepositoryObs: IObservableWithChange<IObservable<{ value?: IGitRepository }> | undefined>;
-
-	get activeSessionHasChanges(): IObservable<boolean> {
-		return this.activeSessionHasChangesObs;
-	}
-
-	// Badge for file count
-	private readonly badgeDisposable = this._register(new MutableDisposable());
+	readonly viewModel: ChangesViewModel;
 
 	constructor(
 		options: IViewPaneOptions,
@@ -283,148 +339,36 @@ export class ChangesViewPane extends ViewPane {
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
 		@IHoverService hoverService: IHoverService,
-		@IChatEditingService private readonly chatEditingService: IChatEditingService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IActivityService private readonly activityService: IActivityService,
 		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
 		@ISessionsManagementService private readonly sessionManagementService: ISessionsManagementService,
 		@ILabelService private readonly labelService: ILabelService,
-		@IStorageService private readonly storageService: IStorageService,
 		@ICodeReviewService private readonly codeReviewService: ICodeReviewService,
-		@IGitService private readonly gitService: IGitService,
 		@IGitHubService private readonly gitHubService: IGitHubService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
+		super({ ...options, titleMenuId: MenuId.ChatEditingSessionTitleToolbar }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
-		// View mode
-		const storedMode = this.storageService.get('changesView.viewMode', StorageScope.WORKSPACE);
-		const initialMode = storedMode === ChangesViewMode.Tree ? ChangesViewMode.Tree : ChangesViewMode.List;
-		this.viewModeObs = observableValue<ChangesViewMode>(this, initialMode);
-		this.viewModeContextKey = changesViewModeContextKey.bindTo(contextKeyService);
-		this.viewModeContextKey.set(initialMode);
+		this.viewModel = this.instantiationService.createInstance(ChangesViewModel);
+		this._register(this.viewModel);
 
 		// Version mode
-		this.versionModeContextKey = changesVersionModeContextKey.bindTo(contextKeyService);
-		this.versionModeContextKey.set(ChangesVersionMode.AllChanges);
-
-		// Track active session from sessions management service
-		this.activeSession = derivedOpts<IActiveSession | undefined>({
-			equalsFn: (a, b) => isEqual(a?.resource, b?.resource),
-		}, reader => {
-			const activeSession = this.sessionManagementService.activeSession.read(reader);
-			if (!activeSession?.resource) {
-				return undefined;
-			}
-
-			return {
-				resource: activeSession.resource,
-				repository: activeSession.repository,
-				worktree: activeSession.worktree,
-				sessionType: getChatSessionType(activeSession.resource),
-			};
-		}).recomputeInitiallyAndOnChange(this._store);
-
-		// Track active session repository changes
-		this.activeSessionRepositoryObs = derived(reader => {
-			const activeSessionWorktree = this.activeSession.read(reader)?.worktree;
-			if (!activeSessionWorktree) {
-				return undefined;
-			}
-
-			return observableFromPromise(this.gitService.openRepository(activeSessionWorktree));
-		});
-
-		this.activeSessionRepositoryChangesObs = derived(reader => {
-			const repository = this.activeSessionRepositoryObs.read(reader)?.read(reader);
-			if (!repository) {
-				return undefined;
-			}
-
-			const state = repository.value?.state.read(reader);
-			const headCommit = state?.HEAD?.commit;
-			return (state?.workingTreeChanges ?? []).map(change => {
-				const isDeletion = change.modifiedUri === undefined;
-				const isAddition = change.originalUri === undefined;
-				const fileUri = change.modifiedUri ?? change.uri;
-				return {
-					type: 'file',
-					uri: fileUri,
-					originalUri: isDeletion || !headCommit ? change.originalUri
-						: fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: headCommit }) }),
-					state: ModifiedFileEntryState.Accepted,
-					isDeletion,
-					changeType: isDeletion ? 'deleted' : isAddition ? 'added' : 'modified',
-					reviewCommentCount: 0,
-					linesAdded: 0,
-					linesRemoved: 0,
-				} satisfies IChangesFileItem;
-			});
-		});
-
-		this.activeSessionFileCountObs = this.createActiveSessionFileCountObservable();
-		this.activeSessionHasChangesObs = this.activeSessionFileCountObs.map(fileCount => fileCount > 0).recomputeInitiallyAndOnChange(this._store);
-
-		// Set chatSessionType on the view's context key service so ViewTitle
-		// menu items can use it in their `when` clauses. Update reactively
-		// when the active session changes.
-		const viewSessionTypeKey = this.scopedContextKeyService.createKey<string>(ChatContextKeys.agentSessionType.key, '');
-		this._register(autorun(reader => {
-			const activeSession = this.activeSession.read(reader);
-			viewSessionTypeKey.set(activeSession?.sessionType ?? '');
+		this._register(bindContextKey(changesVersionModeContextKey, this.scopedContextKeyService, reader => {
+			return this.viewModel.versionModeObs.read(reader);
 		}));
-	}
 
-	private createActiveSessionFileCountObservable(): IObservableWithChange<number> {
-		const activeSessionResource = this.activeSession.map(a => a?.resource);
+		// View mode
+		this._register(bindContextKey(changesViewModeContextKey, this.scopedContextKeyService, reader => {
+			return this.viewModel.viewModeObs.read(reader);
+		}));
 
-		const sessionsChangedSignal = observableFromEvent(
-			this,
-			this.agentSessionsService.model.onDidChangeSessions,
-			() => ({}),
-		);
+		// Set chatSessionType on the view's context key service so ViewTitle menu items
+		// can use it in their `when` clauses. Update reactively when the active session
+		// changes.
+		this._register(bindContextKey(ChatContextKeys.agentSessionType, this.scopedContextKeyService, reader => {
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			return activeSession?.sessionType ?? '';
+		}));
 
-		const sessionFileChangesObs = derived(reader => {
-			const sessionResource = activeSessionResource.read(reader);
-			sessionsChangedSignal.read(reader);
-			if (!sessionResource) {
-				return Iterable.empty();
-			}
-
-			const model = this.agentSessionsService.getSession(sessionResource);
-			return model?.changes instanceof Array ? model.changes : Iterable.empty();
-		});
-
-		return derived(reader => {
-			const activeSession = this.activeSession.read(reader);
-			if (!activeSession) {
-				return 0;
-			}
-
-			const isBackgroundSession = activeSession.sessionType === AgentSessionProviders.Background;
-
-			let editingSessionCount = 0;
-			if (!isBackgroundSession) {
-				const sessions = this.chatEditingService.editingSessionsObs.read(reader);
-				const session = sessions.find(candidate => isEqual(candidate.chatSessionResource, activeSession.resource));
-				editingSessionCount = session ? session.entries.read(reader).length : 0;
-			}
-
-			const sessionFiles = [...sessionFileChangesObs.read(reader)];
-			const sessionFilesCount = sessionFiles.length;
-
-			return editingSessionCount + sessionFilesCount;
-		}).recomputeInitiallyAndOnChange(this._store);
-	}
-
-	private updateBadge(fileCount: number): void {
-		if (fileCount > 0) {
-			const message = fileCount === 1
-				? localize('changesView.oneFileChanged', '1 file changed')
-				: localize('changesView.filesChanged', '{0} files changed', fileCount);
-			this.badgeDisposable.value = this.activityService.showViewActivity(CHANGES_VIEW_ID, { badge: new NumberBadge(fileCount, () => message) });
-		} else {
-			this.badgeDisposable.clear();
-		}
 	}
 
 	protected override renderBody(container: HTMLElement): void {
@@ -442,8 +386,11 @@ export class ChangesViewPane extends ViewPane {
 		// Actions container - positioned outside and above the card
 		this.actionsContainer = dom.append(this.bodyContainer, $('.chat-editing-session-actions.outside-card'));
 
-		// Main container with file icons support (the "card")
-		this.contentContainer = dom.append(this.bodyContainer, $('.chat-editing-session-container.show-file-icons'));
+		// SplitView container for resizable file tree / CI checks split
+		this.splitViewContainer = dom.append(this.bodyContainer, $('.changes-splitview-container'));
+
+		// Main container with file icons support (the "card") — top pane
+		this.contentContainer = dom.append(this.splitViewContainer, $('.chat-editing-session-container.show-file-icons'));
 		this._register(createFileIconThemableTreeContainerScope(this.contentContainer, this.themeService));
 
 		// Toggle class based on whether the file icon theme has file icons
@@ -453,6 +400,12 @@ export class ChangesViewPane extends ViewPane {
 		updateHasFileIcons();
 		this._register(this.themeService.onDidFileIconThemeChange(updateHasFileIcons));
 
+		// Files header
+		this.filesHeaderNode = dom.append(this.contentContainer, $('.changes-files-header'));
+		const filesTitle = dom.append(this.filesHeaderNode, $('.changes-files-title'));
+		filesTitle.textContent = localize('changesView.filesTitle', "Changed Files");
+		this.filesCountBadge = dom.append(this.filesHeaderNode, $('.changes-files-count'));
+
 		// Overview section (header with summary only - actions moved outside card)
 		this.overviewContainer = dom.append(this.contentContainer, $('.chat-editing-session-overview'));
 		this.summaryContainer = dom.append(this.overviewContainer, $('.changes-summary'));
@@ -460,8 +413,71 @@ export class ChangesViewPane extends ViewPane {
 		// List container
 		this.listContainer = dom.append(this.contentContainer, $('.chat-editing-session-list'));
 
-		// CI Status widget beneath the card
-		this.ciStatusWidget = this._register(this.instantiationService.createInstance(CIStatusWidget, this.bodyContainer));
+		// CI Status widget — bottom pane
+		this.ciStatusWidget = this._register(this.instantiationService.createInstance(CIStatusWidget, this.splitViewContainer));
+
+		// Create SplitView
+		this.splitView = this._register(new SplitView(this.splitViewContainer, {
+			orientation: Orientation.VERTICAL,
+			proportionalLayout: false,
+		}));
+
+		// Shared constants for pane sizing
+		const ciMinHeight = CIStatusWidget.HEADER_HEIGHT + CIStatusWidget.MIN_BODY_HEIGHT;
+		const treeMinHeight = 3 * ChangesTreeDelegate.ROW_HEIGHT;
+
+		// Top pane: file tree
+		const treePane: IView = {
+			element: this.contentContainer,
+			minimumSize: treeMinHeight,
+			maximumSize: Number.POSITIVE_INFINITY,
+			onDidChange: Event.None,
+			layout: (height) => {
+				this.contentContainer!.style.height = `${height}px`;
+				this._layoutTreeInPane(height);
+			},
+		};
+
+		// Bottom pane: CI checks
+		const ciElement = this.ciStatusWidget.element;
+		const ciWidget = this.ciStatusWidget;
+		const ciPane: IView = {
+			element: ciElement,
+			minimumSize: ciMinHeight,
+			maximumSize: Number.POSITIVE_INFINITY,
+			onDidChange: Event.map(this.ciStatusWidget.onDidChangeHeight, () => undefined),
+			layout: (height) => {
+				ciElement.style.height = `${height}px`;
+				const bodyHeight = Math.max(0, height - CIStatusWidget.HEADER_HEIGHT);
+				ciWidget.layout(bodyHeight);
+			},
+		};
+
+		this.splitView.addView(treePane, Sizing.Distribute, 0, true);
+		this.splitView.addView(ciPane, CIStatusWidget.HEADER_HEIGHT + CIStatusWidget.PREFERRED_BODY_HEIGHT, 1, true);
+
+		// Style the sash as a visible separator between sections
+		const updateSplitViewStyles = () => {
+			const borderColor = this.themeService.getColorTheme().getColor(PANEL_SECTION_BORDER);
+			this.splitView!.style({ separatorBorder: borderColor ?? Color.transparent });
+		};
+		updateSplitViewStyles();
+		this._register(this.themeService.onDidColorThemeChange(updateSplitViewStyles));
+
+		// Initially hide CI pane until checks arrive
+		this.splitView.setViewVisible(1, false);
+
+		this._register(this.ciStatusWidget.onDidChangeHeight(() => {
+			if (!this.splitView || !this.ciStatusWidget) {
+				return;
+			}
+			const visible = this.ciStatusWidget.visible;
+			const isCurrentlyVisible = this.splitView.isViewVisible(1);
+			if (visible !== isCurrentlyVisible) {
+				this.splitView.setViewVisible(1, visible);
+			}
+			this.layoutSplitView();
+		}));
 
 		this._register(this.onDidChangeBodyVisibility(visible => {
 			if (visible) {
@@ -477,82 +493,16 @@ export class ChangesViewPane extends ViewPane {
 		}
 	}
 
+	override getActionsContext(): URI | undefined {
+		return this.viewModel.activeSessionResourceObs.get();
+	}
+
 	private onVisible(): void {
 		this.renderDisposables.clear();
-		const activeSessionResource = this.activeSession.map(a => a?.resource);
-
-		// Create observable for the active editing session
-		// Note: We must read editingSessionsObs to establish a reactive dependency,
-		// so that the view updates when a new editing session is added (e.g., cloud sessions)
-		const activeEditingSessionObs = derived(reader => {
-			const activeSession = this.activeSession.read(reader);
-			if (!activeSession) {
-				return undefined;
-			}
-			const sessions = this.chatEditingService.editingSessionsObs.read(reader);
-			return sessions.find(candidate => isEqual(candidate.chatSessionResource, activeSession.resource));
-		});
-
-		// Create observable for edit session entries from the ACTIVE session only (local editing sessions)
-		const editSessionEntriesObs = derived(reader => {
-			const activeSession = this.activeSession.read(reader);
-
-			// Background chat sessions render the working set based on the session files, not the editing session
-			if (activeSession?.sessionType === AgentSessionProviders.Background) {
-				return [];
-			}
-
-			const session = activeEditingSessionObs.read(reader);
-			if (!session) {
-				return [];
-			}
-
-			const entries = session.entries.read(reader);
-			const items: IChangesFileItem[] = [];
-
-			for (const entry of entries) {
-				const isDeletion = entry.isDeletion ?? false;
-				const linesAdded = entry.linesAdded?.read(reader) ?? 0;
-				const linesRemoved = entry.linesRemoved?.read(reader) ?? 0;
-
-				items.push({
-					type: 'file',
-					uri: entry.modifiedURI,
-					originalUri: entry.originalURI,
-					state: entry.state.read(reader),
-					isDeletion,
-					changeType: isDeletion ? 'deleted' : 'modified',
-					linesAdded,
-					linesRemoved,
-					reviewCommentCount: 0,
-				});
-			}
-
-			return items;
-		});
-
-		// Signal observable that triggers when sessions data changes
-		const sessionsChangedSignal = observableFromEvent(
-			this.renderDisposables,
-			this.agentSessionsService.model.onDidChangeSessions,
-			() => ({}),
-		);
-
-		// Observable for session file changes from agentSessionsService (cloud/background sessions)
-		// Reactive to both activeSession changes AND session data changes
-		const sessionFileChangesObs = derived(reader => {
-			const sessionResource = activeSessionResource.read(reader);
-			sessionsChangedSignal.read(reader);
-			if (!sessionResource) {
-				return Iterable.empty();
-			}
-			const model = this.agentSessionsService.getSession(sessionResource);
-			return model?.changes instanceof Array ? model.changes : Iterable.empty();
-		});
 
 		const reviewCommentCountByFileObs = derived(reader => {
-			const sessionResource = activeSessionResource.read(reader);
-			const sessionChanges = [...sessionFileChangesObs.read(reader)];
+			const sessionResource = this.viewModel.activeSessionResourceObs.read(reader);
+			const changes = [...this.viewModel.activeSessionChangesObs.read(reader)];
 
 			if (!sessionResource) {
 				return new Map<string, number>();
@@ -567,11 +517,11 @@ export class ChangesViewPane extends ViewPane {
 				}
 			}
 
-			if (sessionChanges.length === 0) {
+			if (changes.length === 0) {
 				return result;
 			}
 
-			const reviewFiles = getCodeReviewFilesFromSessionChanges(sessionChanges as readonly IChatSessionFileChange[] | readonly IChatSessionFileChange2[]);
+			const reviewFiles = getCodeReviewFilesFromSessionChanges(changes as readonly IChatSessionFileChange[] | readonly IChatSessionFileChange2[]);
 			const reviewVersion = getCodeReviewVersion(reviewFiles);
 			const reviewState = this.codeReviewService.getReviewState(sessionResource).read(reader);
 
@@ -590,8 +540,9 @@ export class ChangesViewPane extends ViewPane {
 		// Convert session file changes to list items (cloud/background sessions)
 		const sessionFilesObs = derived(reader => {
 			const reviewCommentCountByFile = reviewCommentCountByFileObs.read(reader);
+			const changes = [...this.viewModel.activeSessionChangesObs.read(reader)];
 
-			return [...sessionFileChangesObs.read(reader)].map((entry): IChangesFileItem => {
+			return changes.map((entry): IChangesFileItem => {
 				const isDeletion = entry.modifiedUri === undefined;
 				const isAddition = entry.originalUri === undefined;
 				const uri = isIChatSessionFileChange2(entry)
@@ -611,45 +562,71 @@ export class ChangesViewPane extends ViewPane {
 			});
 		});
 
-		// Create observable for last turn changes using diffBetweenWithStats
-		// Reactively computes the diff between HEAD^ and HEAD. Memoize the diff observable so
-		// that we only recompute it when the HEAD commit id actually changes.
 		const headCommitObs = derived(reader => {
-			const repository = this.activeSessionRepositoryObs.read(reader)?.read(reader)?.value;
+			const repository = this.viewModel.activeSessionRepositoryObs.read(reader);
 			return repository?.state.read(reader)?.HEAD?.commit;
 		});
 
-		const lastTurnChangesObs = derived(reader => {
-			const repository = this.activeSessionRepositoryObs.read(reader)?.read(reader)?.value;
-			const headCommit = headCommitObs.read(reader);
-			if (!repository || !headCommit) {
+		const lastCheckpointRefObs = derived(reader => {
+			const sessionResource = this.viewModel.activeSessionResourceObs.read(reader);
+			if (!sessionResource) {
 				return undefined;
 			}
 
-			return observableFromPromise(repository.diffBetweenWithStats(`${headCommit}^`, headCommit));
+			this.viewModel.sessionsChangedSignal.read(reader);
+			const model = this.agentSessionsService.getSession(sessionResource);
+
+			return model?.metadata?.lastCheckpointRef as string | undefined;
+		});
+
+		const lastTurnChangesObs = derived(reader => {
+			const repository = this.viewModel.activeSessionRepositoryObs.read(reader);
+			const headCommit = headCommitObs.read(reader);
+
+			if (!repository || !headCommit) {
+				return constObservable(undefined);
+			}
+
+			const lastCheckpointRef = lastCheckpointRefObs.read(reader);
+
+			return lastCheckpointRef
+				? new ObservablePromise(repository.diffBetweenWithStats(`${lastCheckpointRef}^`, lastCheckpointRef)).resolvedValue
+				: new ObservablePromise(repository.diffBetweenWithStats(`${headCommit}^`, headCommit)).resolvedValue;
 		});
 
 		// Combine both entry sources for display
 		const combinedEntriesObs = derived(reader => {
 			const headCommit = headCommitObs.read(reader);
-			const editEntries = editSessionEntriesObs.read(reader);
 			const sessionFiles = sessionFilesObs.read(reader);
-			const repositoryFiles = this.activeSessionRepositoryChangesObs.read(reader) ?? [];
-			const versionMode = this.versionModeObs.read(reader);
+			const lastTurnDiffChanges = lastTurnChangesObs.read(reader).read(reader);
+			const versionMode = this.viewModel.versionModeObs.read(reader);
 
 			let sourceEntries: IChangesFileItem[];
-			if (versionMode === ChangesVersionMode.Uncommitted) {
-				sourceEntries = repositoryFiles;
-			} else if (versionMode === ChangesVersionMode.LastTurn) {
-				const lastTurn = lastTurnChangesObs.read(reader);
-				const diffChanges = lastTurn?.read(reader).value ?? [];
-				const parentRef = headCommit ? `${headCommit}^` : '';
+			if (versionMode === ChangesVersionMode.LastTurn) {
+				const diffChanges = lastTurnDiffChanges ?? [];
+				const lastCheckpointRef = lastCheckpointRefObs.read(undefined);
+
+				const ref = lastCheckpointRef
+					? lastCheckpointRef
+					: headCommit;
+
+				const parentRef = lastCheckpointRef
+					? `${lastCheckpointRef}^`
+					: headCommit ? `${headCommit}^` : undefined;
+
 				sourceEntries = diffChanges.map(change => {
 					const isDeletion = change.modifiedUri === undefined;
 					const isAddition = change.originalUri === undefined;
-					const fileUri = change.modifiedUri ?? change.uri;
-					const originalUri = isAddition ? change.originalUri
-						: headCommit ? fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: parentRef }) })
+					const uri = change.modifiedUri ?? change.uri;
+					const fileUri = isDeletion
+						? uri
+						: ref
+							? uri.with({ scheme: 'git', query: JSON.stringify({ path: uri.fsPath, ref }) })
+							: uri;
+					const originalUri = isAddition
+						? change.originalUri
+						: parentRef
+							? fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: parentRef }) })
 							: change.originalUri;
 					return {
 						type: 'file',
@@ -664,7 +641,7 @@ export class ChangesViewPane extends ViewPane {
 					} satisfies IChangesFileItem;
 				});
 			} else {
-				sourceEntries = [...editEntries, ...sessionFiles, ...repositoryFiles];
+				sourceEntries = [...sessionFiles];
 			}
 
 			const resources = new Set();
@@ -680,9 +657,6 @@ export class ChangesViewPane extends ViewPane {
 
 		// Calculate stats from combined entries
 		const topLevelStats = derived(reader => {
-			const editEntries = editSessionEntriesObs.read(reader);
-			const sessionFiles = sessionFilesObs.read(reader);
-			const repositoryFiles = this.activeSessionRepositoryChangesObs.read(reader) ?? [];
 			const entries = combinedEntriesObs.read(reader);
 
 			let added = 0, removed = 0;
@@ -692,89 +666,58 @@ export class ChangesViewPane extends ViewPane {
 				removed += entry.linesRemoved;
 			}
 
-			const files = entries.length;
-			const isSessionMenu = editEntries.length === 0 && (sessionFiles.length > 0 || repositoryFiles.length > 0);
-
-			return { files, added, removed, isSessionMenu };
+			return { files: entries.length, added, removed };
 		});
 
 		// Setup context keys and actions toolbar
 		if (this.actionsContainer) {
 			dom.clearNode(this.actionsContainer);
 
-			const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(this.actionsContainer));
-			const scopedInstantiationService = this.renderDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService])));
-
-			// Set the chat session type context key reactively so that menu items with
-			// `chatSessionType == copilotcli` (e.g. Create Pull Request) are shown
-			const chatSessionTypeKey = scopedContextKeyService.createKey<string>(ChatContextKeys.agentSessionType.key, '');
-			this.renderDisposables.add(autorun(reader => {
-				const activeSession = this.activeSession.read(reader);
-				chatSessionTypeKey.set(activeSession?.sessionType ?? '');
-			}));
-
-			// Bind required context keys for the menu buttons
-			this.renderDisposables.add(bindContextKey(hasUndecidedChatEditingResourceContextKey, scopedContextKeyService, r => {
-				const session = activeEditingSessionObs.read(r);
-				if (!session) {
-					return false;
-				}
-				const entries = session.entries.read(r);
-				return entries.some(entry => entry.state.read(r) === ModifiedFileEntryState.Modified);
-			}));
-
-			this.renderDisposables.add(bindContextKey(hasAppliedChatEditsContextKey, scopedContextKeyService, r => {
-				const session = activeEditingSessionObs.read(r);
-				if (!session) {
-					return false;
-				}
-				const entries = session.entries.read(r);
-				return entries.length > 0;
-			}));
-
-			this.renderDisposables.add(bindContextKey(ChatContextKeys.hasAgentSessionChanges, scopedContextKeyService, r => {
-				const { files } = topLevelStats.read(r);
+			this.renderDisposables.add(bindContextKey(ChatContextKeys.hasAgentSessionChanges, this.scopedContextKeyService, reader => {
+				const { files } = topLevelStats.read(reader);
 				return files > 0;
 			}));
 
-			// Also bind to the ViewPane's scoped context key service so the ViewTitle menu can evaluate it
-			this.renderDisposables.add(bindContextKey(ChatContextKeys.hasAgentSessionChanges, this.scopedContextKeyService, r => {
-				const { files } = topLevelStats.read(r);
-				return files > 0;
+			this.renderDisposables.add(bindContextKey(isMergeBaseBranchProtectedContextKey, this.scopedContextKeyService, reader => {
+				const activeSession = this.sessionManagementService.activeSession.read(reader);
+				return activeSession?.workspace.read(reader)?.repositories[0]?.baseBranchProtected === true;
 			}));
 
-			// Track whether there are uncommitted (working tree) changes
-			this.renderDisposables.add(bindContextKey(hasUncommittedChangesContextKey, this.scopedContextKeyService, r => {
-				const repositoryFiles = this.activeSessionRepositoryChangesObs.read(r);
-				return (repositoryFiles?.length ?? 0) > 0;
-			}));
-
-			// Set context key for merge base branch protection
-			const isMergeBaseBranchProtectedContextKey = scopedContextKeyService.createKey<boolean>('sessions.isMergeBaseBranchProtected', false);
-			this.renderDisposables.add(autorun(reader => {
-				const repository = this.activeSessionRepositoryObs.read(reader)?.read(reader).value;
-				const state = repository?.state.read(reader);
-				isMergeBaseBranchProtectedContextKey.set(state?.HEAD?.base?.isProtected === true);
-			}));
-
-			// Set context key for PR state from session metadata
-			const hasOpenPullRequestKey = scopedContextKeyService.createKey<boolean>('sessions.hasOpenPullRequest', false);
-			this.renderDisposables.add(autorun(reader => {
-				const sessionResource = activeSessionResource.read(reader);
-				sessionsChangedSignal.read(reader);
-				if (sessionResource) {
-					const metadata = this.agentSessionsService.getSession(sessionResource)?.metadata;
-					hasOpenPullRequestKey.set(!!metadata?.pullRequestUrl);
-				} else {
-					hasOpenPullRequestKey.set(false);
+			this.renderDisposables.add(bindContextKey(hasOpenPullRequestContextKey, this.scopedContextKeyService, reader => {
+				this.viewModel.sessionsChangedSignal.read(reader);
+				const sessionResource = this.viewModel.activeSessionResourceObs.read(reader);
+				if (!sessionResource) {
+					return false;
 				}
+
+				const metadata = this.agentSessionsService.getSession(sessionResource)?.metadata;
+				return metadata?.pullRequestUrl !== undefined;
 			}));
 
+			this.renderDisposables.add(bindContextKey(hasIncomingChangesContextKey, this.scopedContextKeyService, reader => {
+				const repository = this.viewModel.activeSessionRepositoryObs.read(reader);
+				const repositoryState = repository?.state.read(reader);
+				return (repositoryState?.HEAD?.behind ?? 0) > 0;
+			}));
+
+			const outgoingChangesObs = derived(reader => {
+				const repository = this.viewModel.activeSessionRepositoryObs.read(reader);
+				const repositoryState = repository?.state.read(reader);
+				return repositoryState?.HEAD?.ahead ?? 0;
+			});
+
+			this.renderDisposables.add(bindContextKey(hasOutgoingChangesContextKey, this.scopedContextKeyService, reader => {
+				const outgoingChanges = outgoingChangesObs.read(reader);
+				return outgoingChanges > 0;
+			}));
+
+			const scopedServiceCollection = new ServiceCollection([IContextKeyService, this.scopedContextKeyService]);
+			const scopedInstantiationService = this.instantiationService.createChild(scopedServiceCollection);
+			this.renderDisposables.add(scopedInstantiationService);
+
 			this.renderDisposables.add(autorun(reader => {
-				const { isSessionMenu, added, removed } = topLevelStats.read(reader);
-				const sessionResource = activeSessionResource.read(reader);
-				sessionsChangedSignal.read(reader); // Re-evaluate when session metadata changes (e.g. pullRequestUrl)
-				const menuId = isSessionMenu ? MenuId.ChatEditingSessionChangesToolbar : MenuId.ChatEditingWidgetToolbar;
+				const outgoingChanges = outgoingChangesObs.read(reader);
+				const sessionResource = this.viewModel.activeSessionResourceObs.read(reader);
 
 				// Read code review state to update the button label dynamically
 				let reviewCommentCount: number | undefined;
@@ -782,9 +725,10 @@ export class ChangesViewPane extends ViewPane {
 				if (sessionResource) {
 					const prReviewState = this.codeReviewService.getPRReviewState(sessionResource).read(reader);
 					const prReviewCommentCount = prReviewState.kind === PRReviewStateKind.Loaded ? prReviewState.comments.length : 0;
-					const sessionChanges = this.agentSessionsService.getSession(sessionResource)?.changes;
-					if (sessionChanges instanceof Array && sessionChanges.length > 0) {
-						const reviewFiles = getCodeReviewFilesFromSessionChanges(sessionChanges as readonly IChatSessionFileChange[] | readonly IChatSessionFileChange2[]);
+					const activeSession = this.sessionManagementService.activeSession.read(reader);
+					const sessionChanges = activeSession?.changes.read(reader);
+					if (sessionChanges && sessionChanges.length > 0) {
+						const reviewFiles = getCodeReviewFilesFromSessionChanges(sessionChanges);
 						const reviewVersion = getCodeReviewVersion(reviewFiles);
 						const reviewState = this.codeReviewService.getReviewState(sessionResource).read(reader);
 						if (reviewState.kind === CodeReviewStateKind.Loading && reviewState.version === reviewVersion) {
@@ -804,20 +748,16 @@ export class ChangesViewPane extends ViewPane {
 				reader.store.add(scopedInstantiationService.createInstance(
 					MenuWorkbenchButtonBar,
 					this.actionsContainer!,
-					menuId,
+					MenuId.ChatEditingSessionChangesToolbar,
 					{
 						telemetrySource: 'changesView',
-						disableWhileRunning: isSessionMenu,
-						menuOptions: isSessionMenu && sessionResource
+						disableWhileRunning: true,
+						menuOptions: sessionResource
 							? { args: [sessionResource, this.agentSessionsService.getSession(sessionResource)?.metadata] }
 							: { shouldForwardArgs: true },
 						buttonConfigProvider: (action) => {
 							if (action.id === 'chatEditing.viewChanges' || action.id === 'chatEditing.viewPreviousEdits' || action.id === 'chatEditing.viewAllSessionChanges' || action.id === 'chat.openSessionWorktreeInVSCode') {
-								const diffStatsLabel = new MarkdownString(
-									`<span class="working-set-lines-added">+${added}</span>&nbsp;<span class="working-set-lines-removed">-${removed}</span>`,
-									{ supportHtml: true }
-								);
-								return { showIcon: true, showLabel: true, isSecondary: true, customClass: 'working-set-diff-stats', customLabel: diffStatsLabel };
+								return { showIcon: true, showLabel: false, isSecondary: true };
 							}
 							if (action.id === RUN_SESSION_CODE_REVIEW_ACTION_ID) {
 								if (codeReviewLoading) {
@@ -829,11 +769,18 @@ export class ChangesViewPane extends ViewPane {
 								return { showIcon: true, showLabel: false, isSecondary: true };
 							}
 							if (action.id === 'chatEditing.synchronizeChanges') {
-								return { showIcon: true, showLabel: true, isSecondary: true };
+								return { showIcon: true, showLabel: true, isSecondary: false };
 							}
 							if (action.id === 'github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR') {
 								return { showIcon: true, showLabel: true, isSecondary: false };
 							}
+							if (action.id === 'github.copilot.chat.createPullRequestCopilotCLIAgentSession.updatePR') {
+								const customLabel = outgoingChanges > 0
+									? localize('updatePRWithOutgoingChanges', 'Update Pull Request {0}↑', outgoingChanges)
+									: localize('updatePR', 'Update Pull Request');
+
+								return { customLabel, showIcon: true, showLabel: true, isSecondary: false };
+							}
 							if (action.id === 'github.copilot.chat.openPullRequestCopilotCLIAgentSession.openPR') {
 								return { showIcon: true, showLabel: false, isSecondary: true };
 							}
@@ -847,19 +794,19 @@ export class ChangesViewPane extends ViewPane {
 			}));
 		}
 
-		// Update visibility based on entries
+		// Update visibility and file count badge based on entries
 		this.renderDisposables.add(autorun(reader => {
 			const { files } = topLevelStats.read(reader);
 			const hasEntries = files > 0;
 
 			dom.setVisibility(hasEntries, this.contentContainer!);
 			dom.setVisibility(hasEntries, this.actionsContainer!);
+			dom.setVisibility(hasEntries, this.splitViewContainer!);
 			dom.setVisibility(!hasEntries, this.welcomeContainer!);
-		}));
 
-		// Update badge when file count changes
-		this.renderDisposables.add(autorun(reader => {
-			this.updateBadge(topLevelStats.read(reader).files);
+			if (this.filesCountBadge) {
+				this.filesCountBadge.textContent = `${files}`;
+			}
 		}));
 
 		// Update summary text (line counts only, file count is shown in badge)
@@ -888,7 +835,7 @@ export class ChangesViewPane extends ViewPane {
 				'ChangesViewTree',
 				this.listContainer,
 				new ChangesTreeDelegate(),
-				[this.instantiationService.createInstance(ChangesTreeRenderer, resourceLabels, MenuId.ChatEditingWidgetModifiedFilesToolbar)],
+				[this.instantiationService.createInstance(ChangesTreeRenderer, resourceLabels, MenuId.ChatEditingSessionChangesToolbar)],
 				{
 					alwaysConsumeMouseWheel: false,
 					accessibilityProvider: {
@@ -922,7 +869,7 @@ export class ChangesViewPane extends ViewPane {
 					},
 					compressionEnabled: true,
 					twistieAdditionalCssClass: (e: unknown) => {
-						return this.viewMode === ChangesViewMode.List
+						return this.viewModel.viewModeObs.get() === ChangesViewMode.List
 							? 'force-no-twistie'
 							: undefined;
 					},
@@ -935,7 +882,7 @@ export class ChangesViewPane extends ViewPane {
 			const tree = this.tree;
 
 			// Re-layout when collapse state changes so the card height adjusts
-			this.renderDisposables.add(tree.onDidChangeContentHeight(() => this.layoutTree()));
+			this.renderDisposables.add(tree.onDidChangeContentHeight(() => this.layoutSplitView()));
 
 			const openFileItem = (item: IChangesFileItem, items: IChangesFileItem[], sideBySide: boolean) => {
 				const { uri: modifiedFileUri, originalUri, isDeletion } = item;
@@ -952,7 +899,7 @@ export class ChangesViewPane extends ViewPane {
 					}
 				};
 
-				const group = sideBySide ? SIDE_GROUP : MODAL_GROUP;
+				const group = sideBySide ? SIDE_GROUP : ACTIVE_GROUP;
 
 				if (isDeletion && originalUri) {
 					this.editorService.openEditor({
@@ -990,6 +937,7 @@ export class ChangesViewPane extends ViewPane {
 		// Bind CI status widget to active session's PR CI model
 		if (this.ciStatusWidget) {
 			const activeSessionResourceObs = derived(this, reader => this.sessionManagementService.activeSession.read(reader)?.resource);
+
 			const ciModelObs = derived(this, reader => {
 				const session = this.sessionManagementService.activeSession.read(reader);
 				if (!session) {
@@ -999,16 +947,18 @@ export class ChangesViewPane extends ViewPane {
 				if (!context || context.prNumber === undefined) {
 					return undefined;
 				}
-				// Use the PR's headRef from the PR model to get CI checks
 				const prModel = this.gitHubService.getPullRequest(context.owner, context.repo, context.prNumber);
 				const pr = prModel.pullRequest.read(reader);
 				if (!pr) {
-					// Trigger a refresh if PR data isn't loaded yet
-					prModel.refresh();
 					return undefined;
 				}
-				const ciModel = this.gitHubService.getPullRequestCI(context.owner, context.repo, pr.headRef);
+				// Use the PR's headSha (commit SHA) rather than the branch
+				// name so CI checks can still be fetched after branch deletion
+				// (e.g. after the PR is merged).
+				const ciModel = this.gitHubService.getPullRequestCI(context.owner, context.repo, pr.headSha);
 				ciModel.refresh();
+				ciModel.startPolling();
+				reader.store.add({ dispose: () => ciModel.stopPolling() });
 				return ciModel;
 			});
 			this.renderDisposables.add(this.ciStatusWidget.bind(ciModelObs, activeSessionResourceObs));
@@ -1017,7 +967,7 @@ export class ChangesViewPane extends ViewPane {
 		// Update tree data with combined entries
 		this.renderDisposables.add(autorun(reader => {
 			const entries = combinedEntriesObs.read(reader);
-			const viewMode = this.viewModeObs.read(reader);
+			const viewMode = this.viewModel.viewModeObs.read(reader);
 
 			if (!this.tree) {
 				return;
@@ -1039,47 +989,45 @@ export class ChangesViewPane extends ViewPane {
 				this.tree.setChildren(null, listChildren);
 			}
 
-			this.layoutTree();
+			this.layoutSplitView();
 		}));
 	}
 
-	private layoutTree(): void {
-		if (!this.tree || !this.listContainer) {
+	/** Layout the tree within its SplitView pane. */
+	private _layoutTreeInPane(paneHeight: number): void {
+		if (!this.tree) {
 			return;
 		}
+		// Subtract overview/padding within the content container
+		const overviewHeight = this.overviewContainer?.offsetHeight ?? 0;
+		const filesHeaderHeight = this.filesHeaderNode?.offsetHeight ?? 0;
+		const treeHeight = Math.max(0, paneHeight - filesHeaderHeight - overviewHeight);
+		this.tree.layout(treeHeight, this.currentBodyWidth);
+		this.tree.getHTMLElement().style.height = `${treeHeight}px`;
+	}
 
-		// Calculate remaining height for the tree by subtracting other elements
+	/** Layout the SplitView to fill available body space. */
+	private layoutSplitView(): void {
+		if (!this.splitView || !this.splitViewContainer) {
+			return;
+		}
 		const bodyHeight = this.currentBodyHeight;
 		if (bodyHeight <= 0) {
 			return;
 		}
-
-		// Measure non-list elements height (padding, actions, overview)
 		const bodyPadding = 16; // 8px top + 8px bottom from .changes-view-body
 		const actionsHeight = this.actionsContainer?.offsetHeight ?? 0;
-		const actionsMargin = actionsHeight > 0 ? 8 : 0; // margin-bottom on actions container
-		const overviewHeight = this.overviewContainer?.offsetHeight ?? 0;
-		const containerPadding = 8; // 4px top + 4px bottom from .chat-editing-session-container
-		const containerBorder = 2; // 1px top + 1px bottom border
-		const ciWidgetHeight = this.ciStatusWidget?.element.offsetHeight ?? 0;
-		const ciWidgetMargin = ciWidgetHeight > 0 ? 8 : 0; // margin-top on CI widget
-
-		const usedHeight = bodyPadding + actionsHeight + actionsMargin + overviewHeight + containerPadding + containerBorder + ciWidgetHeight + ciWidgetMargin;
-		const availableHeight = Math.max(0, bodyHeight - usedHeight);
-
-		// Limit height to the content so the tree doesn't exceed its items
-		const contentHeight = this.tree.contentHeight;
-		const treeHeight = Math.min(availableHeight, contentHeight);
-
-		this.tree.layout(treeHeight, this.currentBodyWidth);
-		this.tree.getHTMLElement().style.height = `${treeHeight}px`;
+		const actionsMargin = actionsHeight > 0 ? 8 : 0;
+		const availableHeight = Math.max(0, bodyHeight - bodyPadding - actionsHeight - actionsMargin);
+		this.splitViewContainer.style.height = `${availableHeight}px`;
+		this.splitView.layout(availableHeight);
 	}
 
 	protected override layoutBody(height: number, width: number): void {
 		super.layoutBody(height, width);
 		this.currentBodyHeight = height;
 		this.currentBodyWidth = width;
-		this.layoutTree();
+		this.layoutSplitView();
 	}
 
 	override focus(): void {
@@ -1120,8 +1068,10 @@ export class ChangesViewPaneContainer extends ViewPaneContainer {
 // --- Tree Delegate & Renderer
 
 class ChangesTreeDelegate implements IListVirtualDelegate<ChangesTreeElement> {
+	static readonly ROW_HEIGHT = 22;
+
 	getHeight(_element: ChangesTreeElement): number {
-		return 22;
+		return ChangesTreeDelegate.ROW_HEIGHT;
 	}
 
 	getTemplateId(_element: ChangesTreeElement): string {
@@ -1317,8 +1267,7 @@ class SetChangesListViewModeAction extends ViewAction<ChangesViewPane> {
 			icon: Codicon.listTree,
 			toggled: changesViewModeContextKey.isEqualTo(ChangesViewMode.List),
 			menu: {
-				id: MenuId.ViewTitle,
-				when: ContextKeyExpr.equals('view', CHANGES_VIEW_ID),
+				id: MenuId.ChatEditingSessionTitleToolbar,
 				group: '1_viewmode',
 				order: 1
 			}
@@ -1326,7 +1275,7 @@ class SetChangesListViewModeAction extends ViewAction<ChangesViewPane> {
 	}
 
 	async runInView(_: ServicesAccessor, view: ChangesViewPane): Promise<void> {
-		view.viewMode = ChangesViewMode.List;
+		view.viewModel.setViewMode(ChangesViewMode.List);
 	}
 }
 
@@ -1340,8 +1289,7 @@ class SetChangesTreeViewModeAction extends ViewAction<ChangesViewPane> {
 			icon: Codicon.listFlat,
 			toggled: changesViewModeContextKey.isEqualTo(ChangesViewMode.Tree),
 			menu: {
-				id: MenuId.ViewTitle,
-				when: ContextKeyExpr.equals('view', CHANGES_VIEW_ID),
+				id: MenuId.ChatEditingSessionTitleToolbar,
 				group: '1_viewmode',
 				order: 2
 			}
@@ -1349,7 +1297,7 @@ class SetChangesTreeViewModeAction extends ViewAction<ChangesViewPane> {
 	}
 
 	async runInView(_: ServicesAccessor, view: ChangesViewPane): Promise<void> {
-		view.viewMode = ChangesViewMode.Tree;
+		view.viewModel.setViewMode(ChangesViewMode.Tree);
 	}
 }
 
@@ -1358,13 +1306,13 @@ registerAction2(SetChangesTreeViewModeAction);
 
 // --- Versions Submenu
 
-MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
+MenuRegistry.appendMenuItem(MenuId.ChatEditingSessionTitleToolbar, {
 	submenu: MenuId.ChatEditingSessionChangesVersionsSubmenu,
 	title: localize2('versionsActions', 'Versions'),
 	icon: Codicon.versions,
 	group: 'navigation',
 	order: 9,
-	when: ContextKeyExpr.and(ContextKeyExpr.equals('view', CHANGES_VIEW_ID), IsSessionsWindowContext, ChatContextKeys.hasAgentSessionChanges),
+	when: ContextKeyExpr.and(ContextKeyExpr.equals('view', CHANGES_VIEW_ID), IsSessionsWindowContext),
 });
 
 class AllChangesAction extends Action2 {
@@ -1385,7 +1333,7 @@ class AllChangesAction extends Action2 {
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const viewsService = accessor.get(IViewsService);
 		const view = viewsService.getActiveViewWithId<ChangesViewPane>(CHANGES_VIEW_ID);
-		view?.setVersionMode(ChangesVersionMode.AllChanges);
+		view?.viewModel.setVersionMode(ChangesVersionMode.AllChanges);
 	}
 }
 registerAction2(AllChangesAction);
@@ -1408,31 +1356,7 @@ class LastTurnChangesAction extends Action2 {
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const viewsService = accessor.get(IViewsService);
 		const view = viewsService.getActiveViewWithId<ChangesViewPane>(CHANGES_VIEW_ID);
-		view?.setVersionMode(ChangesVersionMode.LastTurn);
+		view?.viewModel.setVersionMode(ChangesVersionMode.LastTurn);
 	}
 }
 registerAction2(LastTurnChangesAction);
-
-class UncommittedChangesAction extends Action2 {
-	constructor() {
-		super({
-			id: 'chatEditing.versionsUncommittedChanges',
-			title: localize2('chatEditing.versionsUncommittedChanges', 'Uncommitted Changes'),
-			category: CHAT_CATEGORY,
-			toggled: changesVersionModeContextKey.isEqualTo(ChangesVersionMode.Uncommitted),
-			precondition: hasUncommittedChangesContextKey,
-			menu: [{
-				id: MenuId.ChatEditingSessionChangesVersionsSubmenu,
-				group: '2_uncommitted',
-				order: 1,
-			}],
-		});
-	}
-
-	override async run(accessor: ServicesAccessor): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
-		const view = viewsService.getActiveViewWithId<ChangesViewPane>(CHANGES_VIEW_ID);
-		view?.setVersionMode(ChangesVersionMode.Uncommitted);
-	}
-}
-registerAction2(UncommittedChangesAction);
diff --git a/src/vs/sessions/contrib/changes/browser/changesViewActions.ts b/src/vs/sessions/contrib/changes/browser/changesViewActions.ts
index 9ca4eeb503d..42532133a8d 100644
--- a/src/vs/sessions/contrib/changes/browser/changesViewActions.ts
+++ b/src/vs/sessions/contrib/changes/browser/changesViewActions.ts
@@ -5,13 +5,10 @@
 
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { observableFromEvent } from '../../../../base/common/observable.js';
 import { localize2 } from '../../../../nls.js';
 import { Action2, IAction2Options, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
-import { hasValidDiff } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
 import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 import { CHANGES_VIEW_ID } from './changesView.js';
@@ -50,21 +47,17 @@ class ChangesViewActionsContribution extends Disposable implements IWorkbenchCon
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ISessionsManagementService sessionManagementService: ISessionsManagementService,
-		@IAgentSessionsService agentSessionsService: IAgentSessionsService,
 	) {
 		super();
 
 		// Bind context key: true when the active session has changes
-		const sessionsChanged = observableFromEvent(this, agentSessionsService.model.onDidChangeSessions, () => { });
 		this._register(bindContextKey(activeSessionHasChangesContextKey, contextKeyService, reader => {
-			sessionManagementService.activeSession.read(reader);
-			sessionsChanged.read(reader);
-			const activeSession = sessionManagementService.getActiveSession();
+			const activeSession = sessionManagementService.activeSession.read(reader);
 			if (!activeSession) {
 				return false;
 			}
-			const agentSession = agentSessionsService.getSession(activeSession.resource);
-			return !!agentSession?.changes && hasValidDiff(agentSession.changes);
+			const changes = activeSession.changes.read(reader);
+			return changes.length > 0;
 		}));
 	}
 }
diff --git a/src/vs/sessions/contrib/changes/browser/changesViewController.ts b/src/vs/sessions/contrib/changes/browser/changesViewController.ts
new file mode 100644
index 00000000000..4b29423e649
--- /dev/null
+++ b/src/vs/sessions/contrib/changes/browser/changesViewController.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { autorun, derived } from '../../../../base/common/observable.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IChatService } from '../../../../workbench/contrib/chat/common/chatService/chatService.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../workbench/services/layout/browser/layoutService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
+import { CHANGES_VIEW_ID } from './changesView.js';
+
+interface IPendingTurnState {
+	readonly hadChangesBeforeSend: boolean;
+	readonly submittedAt: number;
+}
+
+export class ChangesViewController extends Disposable {
+
+	static readonly ID = 'workbench.contrib.changesViewController';
+
+	private readonly pendingTurnStateByResource = new ResourceMap<IPendingTurnState>();
+
+	constructor(
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@ISessionsManagementService private readonly sessionManagementService: ISessionsManagementService,
+		@IChatService private readonly chatService: IChatService,
+		@IViewsService private readonly viewsService: IViewsService,
+	) {
+		super();
+
+		const activeSessionHasChangesObs = derived<boolean>(reader => {
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			if (!activeSession) {
+				return false;
+			}
+			const changes = activeSession.changes.read(reader);
+			return changes.length > 0;
+		});
+
+		// Switch between sessions
+		this._register(autorun(reader => {
+			const activeSessionHasChanges = activeSessionHasChangesObs.read(reader);
+			this.syncAuxiliaryBarVisibility(activeSessionHasChanges);
+		}));
+
+		// When a turn is completed, check if there were changes before the turn and
+		// if there are changes after the turn. If there were no changes before the
+		// turn and there are changes after the turn, show the auxiliary bar.
+		this._register(autorun((reader) => {
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			const activeSessionHasChanges = activeSessionHasChangesObs.read(reader);
+			if (!activeSession) {
+				return;
+			}
+
+			const pendingTurnState = this.pendingTurnStateByResource.get(activeSession.resource);
+			if (!pendingTurnState) {
+				return;
+			}
+
+			const lastTurnEnd = activeSession.lastTurnEnd.read(reader);
+			const turnCompleted = !!lastTurnEnd && lastTurnEnd.getTime() >= pendingTurnState.submittedAt;
+			if (!turnCompleted) {
+				return;
+			}
+
+			if (!pendingTurnState.hadChangesBeforeSend && activeSessionHasChanges) {
+				this.layoutService.setPartHidden(false, Parts.AUXILIARYBAR_PART);
+			}
+
+			this.pendingTurnStateByResource.delete(activeSession.resource);
+		}));
+
+		this._register(this.chatService.onDidSubmitRequest(({ chatSessionResource }) => {
+			this.pendingTurnStateByResource.set(chatSessionResource, {
+				hadChangesBeforeSend: activeSessionHasChangesObs.get(),
+				submittedAt: Date.now(),
+			});
+		}));
+	}
+
+	private syncAuxiliaryBarVisibility(hasChanges: boolean): void {
+		if (hasChanges) {
+			this.viewsService.openView(CHANGES_VIEW_ID, false);
+		} else {
+			this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
+		}
+	}
+}
diff --git a/src/vs/sessions/contrib/changes/browser/ciStatusWidget.ts b/src/vs/sessions/contrib/changes/browser/ciStatusWidget.ts
index 78023d8bff4..63dab1fb216 100644
--- a/src/vs/sessions/contrib/changes/browser/ciStatusWidget.ts
+++ b/src/vs/sessions/contrib/changes/browser/ciStatusWidget.ts
@@ -9,6 +9,7 @@ import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js'
 import { IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { Action } from '../../../../base/common/actions.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, IObservable } from '../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -17,22 +18,15 @@ import { localize } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
 import { ChatViewPaneTarget, IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
 import { DEFAULT_LABELS_CONTAINER, IResourceLabel, ResourceLabels } from '../../../../workbench/browser/labels.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { GitHubCheckConclusion, GitHubCheckStatus, GitHubCIOverallStatus, IGitHubCICheck } from '../../github/common/types.js';
+import { GitHubCheckConclusion, GitHubCheckStatus, IGitHubCICheck } from '../../github/common/types.js';
 import { GitHubPullRequestCIModel } from '../../github/browser/models/githubPullRequestCIModel.js';
+import { CICheckGroup, buildFixChecksPrompt, getCheckGroup, getCheckStateLabel, getFailedChecks } from './fixCIChecksAction.js';
 
 const $ = dom.$;
 
-const enum CICheckGroup {
-	Running,
-	Pending,
-	Failed,
-	Successful,
-}
-
 interface ICICheckListItem {
 	readonly check: IGitHubCICheck;
 	readonly group: CICheckGroup;
@@ -46,7 +40,7 @@ interface ICICheckCounts {
 }
 
 class CICheckListDelegate implements IListVirtualDelegate<ICICheckListItem> {
-	static readonly ITEM_HEIGHT = 24;
+	static readonly ITEM_HEIGHT = 28;
 
 	getHeight(_element: ICICheckListItem): number {
 		return CICheckListDelegate.ITEM_HEIGHT;
@@ -136,24 +130,32 @@ class CICheckListRenderer implements IListRenderer<ICICheckListItem, ICICheckTem
 }
 
 /**
- * A collapsible widget that shows the CI status of a PR.
- * Rendered beneath the changes tree in the changes view.
+ * A widget that shows the CI status of a PR.
+ * Rendered beneath the changes tree in the changes view as a SplitView pane.
  */
 export class CIStatusWidget extends Disposable {
 
+	static readonly HEADER_HEIGHT = 30;
+	static readonly MIN_BODY_HEIGHT = 84; // at least 3 checks (3 * 28)
+	static readonly PREFERRED_BODY_HEIGHT = 112; // preferred 4 checks (4 * 28)
+	static readonly MAX_BODY_HEIGHT = 240; // at most ~8 checks
+
 	private readonly _domNode: HTMLElement;
 	private readonly _headerNode: HTMLElement;
 	private readonly _titleNode: HTMLElement;
-	private readonly _titleLabel: IResourceLabel;
+	private readonly _titleLabelNode: HTMLElement;
+	private readonly _countsNode: HTMLElement;
 	private readonly _headerActionBarContainer: HTMLElement;
 	private readonly _headerActionBar: ActionBar;
-	private readonly _twistieNode: HTMLElement;
 	private readonly _bodyNode: HTMLElement;
 	private readonly _list: WorkbenchList<ICICheckListItem>;
 	private readonly _labels: ResourceLabels;
 	private readonly _headerActionDisposables = this._register(new DisposableStore());
 
-	private _collapsed = true;
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	private _checkCount = 0;
 	private _model: GitHubPullRequestCIModel | undefined;
 	private _sessionResource: URI | undefined;
 
@@ -161,6 +163,19 @@ export class CIStatusWidget extends Disposable {
 		return this._domNode;
 	}
 
+	/** The full content height the widget would like (header + all checks). */
+	get desiredHeight(): number {
+		if (this._checkCount === 0) {
+			return 0;
+		}
+		return CIStatusWidget.HEADER_HEIGHT + this._checkCount * CICheckListDelegate.ITEM_HEIGHT;
+	}
+
+	/** Whether the widget is currently visible (has checks to show). */
+	get visible(): boolean {
+		return this._checkCount > 0;
+	}
+
 	constructor(
 		container: HTMLElement,
 		@IOpenerService private readonly _openerService: IOpenerService,
@@ -176,22 +191,18 @@ export class CIStatusWidget extends Disposable {
 		// Header (always visible)
 		this._headerNode = dom.append(this._domNode, $('.ci-status-widget-header'));
 		this._titleNode = dom.append(this._headerNode, $('.ci-status-widget-title'));
-		this._titleLabel = this._register(this._labels.create(this._titleNode, { supportIcons: true }));
+		this._titleLabelNode = dom.append(this._titleNode, $('.ci-status-widget-title-label'));
+		this._titleLabelNode.textContent = localize('ci.checksLabel', "PR Checks");
+		this._countsNode = dom.append(this._titleNode, $('.ci-status-widget-counts'));
 		this._headerActionBarContainer = dom.append(this._headerNode, $('.ci-status-widget-header-actions'));
 		this._headerActionBar = this._register(new ActionBar(this._headerActionBarContainer));
-		this._headerActionBarContainer.style.display = 'none';
 		this._register(dom.addDisposableListener(this._headerActionBarContainer, dom.EventType.CLICK, e => {
 			e.preventDefault();
 			e.stopPropagation();
 		}));
-		this._twistieNode = dom.append(this._headerNode, $('.ci-status-widget-twistie'));
-		this._updateTwistie();
 
-		this._register(dom.addDisposableListener(this._headerNode, 'click', () => this._toggle()));
-
-		// Body (collapsible list of checks)
+		// Body (list of checks)
 		this._bodyNode = dom.append(this._domNode, $('.ci-status-widget-body'));
-		this._bodyNode.style.display = 'none';
 
 		const listContainer = $('.ci-status-widget-list');
 		this._list = this._register(this._instantiationService.createInstance(
@@ -225,53 +236,69 @@ export class CIStatusWidget extends Disposable {
 			this._sessionResource = sessionResource.read(reader);
 			this._model = model;
 			if (!model) {
+				this._checkCount = 0;
 				this._renderBody([]);
 				this._renderHeaderActions([]);
 				this._domNode.style.display = 'none';
+				this._onDidChangeHeight.fire();
 				return;
 			}
 
 			const checks = model.checks.read(reader);
-			const overallStatus = model.overallStatus.read(reader);
 
 			if (checks.length === 0) {
+				this._checkCount = 0;
 				this._renderBody([]);
 				this._renderHeaderActions([]);
 				this._domNode.style.display = 'none';
+				this._onDidChangeHeight.fire();
 				return;
 			}
 
+			const sorted = sortChecks(checks);
+			const oldCount = this._checkCount;
+			this._checkCount = sorted.length;
+
 			this._domNode.style.display = '';
-			this._renderHeader(checks, overallStatus);
+			this._renderHeader(checks);
 			this._renderHeaderActions(getFailedChecks(checks));
-			this._renderBody(sortChecks(checks));
+			this._renderBody(sorted);
+
+			if (this._checkCount !== oldCount) {
+				this._onDidChangeHeight.fire();
+			}
 		});
 	}
 
-	private _toggle(): void {
-		this._collapsed = !this._collapsed;
-		this._bodyNode.style.display = this._collapsed ? 'none' : '';
-		this._updateTwistie();
-	}
+	private _renderHeader(checks: readonly IGitHubCICheck[]): void {
+		const counts = getCheckCounts(checks);
 
-	private _updateTwistie(): void {
-		dom.clearNode(this._twistieNode);
-		this._twistieNode.appendChild(renderIcon(this._collapsed ? Codicon.chevronRight : Codicon.chevronDown));
-	}
+		// Update count badges
+		dom.clearNode(this._countsNode);
 
-	private _renderHeader(checks: readonly IGitHubCICheck[], overallStatus: GitHubCIOverallStatus): void {
-		const { icon, className } = getHeaderIconAndClass(checks, overallStatus);
-		this._titleNode.className = `ci-status-widget-title ${className}`;
+		if (counts.running > 0) {
+			const badge = dom.append(this._countsNode, $('.ci-status-widget-count-badge.ci-status-running'));
+			badge.appendChild(renderIcon(Codicon.circleFilled));
+			dom.append(badge, $('span')).textContent = `${counts.running}`;
+		}
 
-		const summary = getChecksSummary(checks);
-		const title = localize('ci.headerTitle', "Checks: {0}", summary);
-		this._titleLabel.setResource({
-			name: title,
-			resource: URI.from({ scheme: 'github-checks', path: '/summary' }),
-		}, {
-			icon: icon,
-			title,
-		});
+		if (counts.failed > 0) {
+			const badge = dom.append(this._countsNode, $('.ci-status-widget-count-badge.ci-status-failure'));
+			badge.appendChild(renderIcon(Codicon.error));
+			dom.append(badge, $('span')).textContent = `${counts.failed}`;
+		}
+
+		if (counts.pending > 0) {
+			const badge = dom.append(this._countsNode, $('.ci-status-widget-count-badge.ci-status-pending'));
+			badge.appendChild(renderIcon(Codicon.circleFilled));
+			dom.append(badge, $('span')).textContent = `${counts.pending}`;
+		}
+
+		if (counts.successful > 0) {
+			const badge = dom.append(this._countsNode, $('.ci-status-widget-count-badge.ci-status-success'));
+			badge.appendChild(renderIcon(Codicon.passFilled));
+			dom.append(badge, $('span')).textContent = `${counts.successful}`;
+		}
 	}
 
 	private _renderHeaderActions(failedChecks: readonly IGitHubCICheck[]): void {
@@ -279,14 +306,15 @@ export class CIStatusWidget extends Disposable {
 		this._headerActionBar.clear();
 
 		if (failedChecks.length === 0) {
-			this._headerActionBarContainer.style.display = 'none';
+			this._headerActionBarContainer.classList.remove('has-actions');
+			this._domNode.classList.remove('has-fix-actions');
 			return;
 		}
 
 		const fixChecksAction = this._headerActionDisposables.add(new Action(
 			'ci.fixChecks',
 			localize('ci.fixChecks', "Fix Checks"),
-			ThemeIcon.asClassName(Codicon.sparkle),
+			ThemeIcon.asClassName(Codicon.lightbulbAutofix),
 			true,
 			async () => {
 				await this._sendFixChecksPrompt(failedChecks);
@@ -294,13 +322,29 @@ export class CIStatusWidget extends Disposable {
 		));
 
 		this._headerActionBar.push([fixChecksAction], { icon: true, label: false });
-		this._headerActionBarContainer.style.display = 'flex';
+		this._headerActionBarContainer.classList.add('has-actions');
+		this._domNode.classList.add('has-fix-actions');
+	}
+
+	/**
+	 * Layout the widget body list to the given height.
+	 * Called by the parent view after computing available space.
+	 */
+	layout(maxBodyHeight: number): void {
+		if (this._checkCount === 0) {
+			return;
+		}
+		const contentHeight = this._checkCount * CICheckListDelegate.ITEM_HEIGHT;
+		const bodyHeight = Math.min(contentHeight, maxBodyHeight);
+		this._list.getHTMLElement().style.height = `${bodyHeight}px`;
+		this._list.layout(bodyHeight);
 	}
 
 	private _renderBody(checks: readonly ICICheckListItem[]): void {
-		const height = checks.length * CICheckListDelegate.ITEM_HEIGHT;
-		this._list.getHTMLElement().style.height = `${height}px`;
-		this._list.layout(height);
+		const contentHeight = checks.length * CICheckListDelegate.ITEM_HEIGHT;
+		const bodyHeight = Math.min(contentHeight, CIStatusWidget.MAX_BODY_HEIGHT);
+		this._list.getHTMLElement().style.height = `${bodyHeight}px`;
+		this._list.layout(bodyHeight);
 		this._list.splice(0, this._list.length, checks);
 	}
 
@@ -345,17 +389,6 @@ function compareChecks(a: IGitHubCICheck, b: IGitHubCICheck): number {
 	return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' });
 }
 
-function getCheckGroup(check: IGitHubCICheck): CICheckGroup {
-	switch (check.status) {
-		case GitHubCheckStatus.InProgress:
-			return CICheckGroup.Running;
-		case GitHubCheckStatus.Queued:
-			return CICheckGroup.Pending;
-		case GitHubCheckStatus.Completed:
-			return isFailedConclusion(check.conclusion) ? CICheckGroup.Failed : CICheckGroup.Successful;
-	}
-}
-
 function getCheckCounts(checks: readonly IGitHubCICheck[]): ICICheckCounts {
 	let running = 0;
 	let pending = 0;
@@ -382,92 +415,12 @@ function getCheckCounts(checks: readonly IGitHubCICheck[]): ICICheckCounts {
 	return { running, pending, failed, successful };
 }
 
-function getFailedChecks(checks: readonly IGitHubCICheck[]): readonly IGitHubCICheck[] {
-	return checks.filter(check => getCheckGroup(check) === CICheckGroup.Failed);
-}
-
-function getChecksSummary(checks: readonly IGitHubCICheck[]): string {
-	const counts = getCheckCounts(checks);
-	const parts: string[] = [];
-
-	if (counts.running > 0) {
-		parts.push(counts.running === 1
-			? localize('ci.oneRunning', "1 running")
-			: localize('ci.manyRunning', "{0} running", counts.running));
-	}
-
-	if (counts.pending > 0) {
-		parts.push(counts.pending === 1
-			? localize('ci.onePending', "1 pending")
-			: localize('ci.manyPending', "{0} pending", counts.pending));
-	}
-
-	if (counts.failed > 0) {
-		parts.push(counts.failed === 1
-			? localize('ci.oneFailed', "1 failed")
-			: localize('ci.manyFailed', "{0} failed", counts.failed));
-	}
-
-	if (counts.successful > 0) {
-		parts.push(counts.successful === 1
-			? localize('ci.oneSuccessful', "1 successful")
-			: localize('ci.manySuccessful', "{0} successful", counts.successful));
-	}
-
-	return parts.join(', ');
-}
-
-function buildFixChecksPrompt(failedChecks: ReadonlyArray<{ check: IGitHubCICheck; annotations: string }>): string {
-	const sections = failedChecks.map(({ check, annotations }) => {
-		const parts = [
-			`Check: ${check.name}`,
-			`Status: ${getCheckStateLabel(check)}`,
-			`Conclusion: ${check.conclusion ?? 'unknown'}`,
-		];
-
-		if (check.detailsUrl) {
-			parts.push(`Details: ${check.detailsUrl}`);
-		}
-
-		parts.push('', 'Annotations and output:', annotations || 'No output available for this check run.');
-		return parts.join('\n');
-	});
-
-	return [
-		'Please fix the failed CI checks for this session immediately.',
-		'Use the failed check information below, including annotations and check output, to identify the root causes and make the necessary code changes.',
-		'Focus on resolving these CI failures. Avoid unrelated changes unless they are required to fix the checks.',
-		'',
-		'Failed CI checks:',
-		'',
-		sections.join('\n\n---\n\n'),
-	].join('\n');
-}
-
-function getHeaderIconAndClass(checks: readonly IGitHubCICheck[], overallStatus: GitHubCIOverallStatus): { icon: ThemeIcon; className: string } {
-	const counts = getCheckCounts(checks);
-	if (counts.running > 0) {
-		return { icon: spinningLoading, className: 'ci-status-running' };
-	}
-
-	switch (overallStatus) {
-		case GitHubCIOverallStatus.Success:
-			return { icon: Codicon.passFilled, className: 'ci-status-success' };
-		case GitHubCIOverallStatus.Failure:
-			return { icon: Codicon.error, className: 'ci-status-failure' };
-		case GitHubCIOverallStatus.Pending:
-			return { icon: Codicon.circle, className: 'ci-status-pending' };
-		default:
-			return { icon: Codicon.circleFilled, className: 'ci-status-neutral' };
-	}
-}
-
 function getCheckIcon(check: IGitHubCICheck): ThemeIcon {
 	switch (check.status) {
 		case GitHubCheckStatus.InProgress:
-			return spinningLoading;
+			return Codicon.clock;
 		case GitHubCheckStatus.Queued:
-			return Codicon.circle;
+			return Codicon.circleFilled;
 		case GitHubCheckStatus.Completed:
 			switch (check.conclusion) {
 				case GitHubCheckConclusion.Success:
@@ -483,6 +436,8 @@ function getCheckIcon(check: IGitHubCICheck): ThemeIcon {
 				default:
 					return Codicon.circleFilled;
 			}
+		default:
+			return Codicon.circleFilled;
 	}
 }
 
@@ -498,22 +453,3 @@ function getCheckStatusClass(check: IGitHubCICheck): string {
 			return 'ci-status-success';
 	}
 }
-
-function getCheckStateLabel(check: IGitHubCICheck): string {
-	switch (getCheckGroup(check)) {
-		case CICheckGroup.Running:
-			return localize('ci.runningState', "running");
-		case CICheckGroup.Pending:
-			return localize('ci.pendingState', "pending");
-		case CICheckGroup.Failed:
-			return localize('ci.failedState', "failed");
-		case CICheckGroup.Successful:
-			return localize('ci.successfulState', "successful");
-	}
-}
-
-function isFailedConclusion(conclusion: GitHubCheckConclusion | undefined): boolean {
-	return conclusion === GitHubCheckConclusion.Failure
-		|| conclusion === GitHubCheckConclusion.TimedOut
-		|| conclusion === GitHubCheckConclusion.ActionRequired;
-}
diff --git a/src/vs/sessions/contrib/changes/browser/fixCIChecksAction.ts b/src/vs/sessions/contrib/changes/browser/fixCIChecksAction.ts
new file mode 100644
index 00000000000..dbaa2ceee63
--- /dev/null
+++ b/src/vs/sessions/contrib/changes/browser/fixCIChecksAction.ts
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { derived } from '../../../../base/common/observable.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IsSessionsWindowContext } from '../../../../workbench/common/contextkeys.js';
+import { ChatViewPaneTarget, IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
+import { ChatContextKeys } from '../../../../workbench/contrib/chat/common/actions/chatContextKeys.js';
+import { CHAT_CATEGORY } from '../../../../workbench/contrib/chat/browser/actions/chatActions.js';
+import { IGitHubService } from '../../github/browser/githubService.js';
+import { GitHubCheckConclusion, GitHubCheckStatus, IGitHubCICheck } from '../../github/common/types.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+
+export const hasActiveSessionFailedCIChecks = new RawContextKey<boolean>('sessions.hasActiveSessionFailedCIChecks', false);
+
+// --- Shared CI check utilities ------------------------------------------------
+
+export const enum CICheckGroup {
+	Running,
+	Pending,
+	Failed,
+	Successful,
+}
+
+export function isFailedConclusion(conclusion: GitHubCheckConclusion | undefined): boolean {
+	return conclusion === GitHubCheckConclusion.Failure
+		|| conclusion === GitHubCheckConclusion.TimedOut
+		|| conclusion === GitHubCheckConclusion.ActionRequired;
+}
+
+export function getCheckGroup(check: IGitHubCICheck): CICheckGroup {
+	switch (check.status) {
+		case GitHubCheckStatus.InProgress:
+			return CICheckGroup.Running;
+		case GitHubCheckStatus.Queued:
+			return CICheckGroup.Pending;
+		case GitHubCheckStatus.Completed:
+			return isFailedConclusion(check.conclusion) ? CICheckGroup.Failed : CICheckGroup.Successful;
+	}
+}
+
+export function getCheckStateLabel(check: IGitHubCICheck): string {
+	switch (getCheckGroup(check)) {
+		case CICheckGroup.Running:
+			return localize('ci.runningState', "running");
+		case CICheckGroup.Pending:
+			return localize('ci.pendingState', "pending");
+		case CICheckGroup.Failed:
+			return localize('ci.failedState', "failed");
+		case CICheckGroup.Successful:
+			return localize('ci.successfulState', "successful");
+	}
+}
+
+export function getFailedChecks(checks: readonly IGitHubCICheck[]): readonly IGitHubCICheck[] {
+	return checks.filter(check => getCheckGroup(check) === CICheckGroup.Failed);
+}
+
+export function buildFixChecksPrompt(failedChecks: ReadonlyArray<{ check: IGitHubCICheck; annotations: string }>): string {
+	const sections = failedChecks.map(({ check, annotations }) => {
+		const parts = [
+			`Check: ${check.name}`,
+			`Status: ${getCheckStateLabel(check)}`,
+			`Conclusion: ${check.conclusion ?? 'unknown'}`,
+		];
+
+		if (check.detailsUrl) {
+			parts.push(`Details: ${check.detailsUrl}`);
+		}
+
+		parts.push('', 'Annotations and output:', annotations || 'No output available for this check run.');
+		return parts.join('\n');
+	});
+
+	return [
+		'Please fix the failed CI checks for this session immediately.',
+		'Use the failed check information below, including annotations and check output, to identify the root causes and make the necessary code changes.',
+		'Focus on resolving these CI failures. Avoid unrelated changes unless they are required to fix the checks.',
+		'',
+		'Failed CI checks:',
+		'',
+		sections.join('\n\n---\n\n'),
+	].join('\n');
+}
+
+/**
+ * Sets the `hasActiveSessionFailedCIChecks` context key to true when the
+ * active session has a PR with CI checks and at least one has failed.
+ */
+class ActiveSessionFailedCIChecksContextContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.activeSessionFailedCIChecksContext';
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ISessionsManagementService sessionManagementService: ISessionsManagementService,
+		@IGitHubService gitHubService: IGitHubService,
+	) {
+		super();
+
+		const ciModelObs = derived(this, reader => {
+			const session = sessionManagementService.activeSession.read(reader);
+			if (!session) {
+				return undefined;
+			}
+			const context = sessionManagementService.getGitHubContextForSession(session.resource);
+			if (!context || context.prNumber === undefined) {
+				return undefined;
+			}
+			const prModel = gitHubService.getPullRequest(context.owner, context.repo, context.prNumber);
+			const pr = prModel.pullRequest.read(reader);
+			if (!pr) {
+				return undefined;
+			}
+			return gitHubService.getPullRequestCI(context.owner, context.repo, pr.headRef);
+		});
+
+		this._register(bindContextKey(hasActiveSessionFailedCIChecks, contextKeyService, reader => {
+			const ciModel = ciModelObs.read(reader);
+			if (!ciModel) {
+				return false;
+			}
+			const checks = ciModel.checks.read(reader);
+			return getFailedChecks(checks).length > 0;
+		}));
+	}
+}
+
+class FixCIChecksAction extends Action2 {
+
+	static readonly ID = 'sessions.action.fixCIChecks';
+
+	constructor() {
+		super({
+			id: FixCIChecksAction.ID,
+			title: localize2('fixCIChecks', 'Fix CI Checks'),
+			icon: Codicon.lightbulbAutofix,
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, hasActiveSessionFailedCIChecks),
+			menu: [{
+				id: MenuId.ChatEditingSessionApplySubmenu,
+				group: 'navigation',
+				order: 4,
+				when: ContextKeyExpr.and(IsSessionsWindowContext, hasActiveSessionFailedCIChecks),
+			}],
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const sessionManagementService = accessor.get(ISessionsManagementService);
+		const gitHubService = accessor.get(IGitHubService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const logService = accessor.get(ILogService);
+
+		const activeSession = sessionManagementService.activeSession.get();
+		if (!activeSession) {
+			return;
+		}
+
+		const sessionResource = activeSession.resource;
+		const context = sessionManagementService.getGitHubContextForSession(sessionResource);
+		if (!context || context.prNumber === undefined) {
+			return;
+		}
+
+		const prModel = gitHubService.getPullRequest(context.owner, context.repo, context.prNumber);
+		const pr = prModel.pullRequest.get();
+		if (!pr) {
+			return;
+		}
+
+		const ciModel = gitHubService.getPullRequestCI(context.owner, context.repo, pr.headRef);
+		const checks = ciModel.checks.get();
+		const failedChecks = getFailedChecks(checks);
+		if (failedChecks.length === 0) {
+			return;
+		}
+
+		const failedCheckDetails = await Promise.all(failedChecks.map(async check => {
+			const annotations = await ciModel.getCheckRunAnnotations(check.id);
+			return { check, annotations };
+		}));
+
+		const prompt = buildFixChecksPrompt(failedCheckDetails);
+		const chatWidget = chatWidgetService.getWidgetBySessionResource(sessionResource)
+			?? await chatWidgetService.openSession(sessionResource, ChatViewPaneTarget);
+		if (!chatWidget) {
+			logService.error('[FixCIChecks] Cannot fix CI checks: no chat widget found for session', sessionResource.toString());
+			return;
+		}
+
+		await chatWidget.acceptInput(prompt, { noCommandDetection: true });
+	}
+}
+
+registerWorkbenchContribution2(ActiveSessionFailedCIChecksContextContribution.ID, ActiveSessionFailedCIChecksContextContribution, WorkbenchPhase.AfterRestored);
+registerAction2(FixCIChecksAction);
diff --git a/src/vs/sessions/contrib/changes/browser/media/changesTitleBarWidget.css b/src/vs/sessions/contrib/changes/browser/media/changesTitleBarWidget.css
new file mode 100644
index 00000000000..a8a456ab4aa
--- /dev/null
+++ b/src/vs/sessions/contrib/changes/browser/media/changesTitleBarWidget.css
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* ---- Changes Titlebar Indicator (in right toolbar) ---- */
+
+.agent-sessions-workbench .changes-titlebar-indicator {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 22px;
+	padding: 0 4px;
+	border-radius: var(--vscode-cornerRadius-medium);
+	cursor: pointer;
+	color: inherit;
+	gap: 3px;
+}
+
+.agent-sessions-workbench .changes-titlebar-indicator:hover {
+	background: var(--vscode-toolbar-hoverBackground);
+}
+
+.agent-sessions-workbench .changes-titlebar-indicator.active {
+	background: var(--vscode-toolbar-activeBackground);
+}
+
+.agent-sessions-workbench .changes-titlebar-indicator .codicon {
+	font-size: 16px;
+	color: inherit;
+}
+
+.agent-sessions-workbench .changes-titlebar-count {
+	font-size: 11px;
+	font-variant-numeric: tabular-nums;
+	line-height: 16px;
+	color: inherit;
+}
+
+.agent-sessions-workbench .changes-titlebar-insertions {
+	color: var(--vscode-gitDecoration-addedResourceForeground);
+	font-weight: 600;
+}
+
+.agent-sessions-workbench .changes-titlebar-deletions {
+	color: var(--vscode-gitDecoration-deletedResourceForeground);
+	font-weight: 600;
+}
diff --git a/src/vs/sessions/contrib/changes/browser/media/changesView.css b/src/vs/sessions/contrib/changes/browser/media/changesView.css
index 1b187233832..e1c29be83bd 100644
--- a/src/vs/sessions/contrib/changes/browser/media/changesView.css
+++ b/src/vs/sessions/contrib/changes/browser/media/changesView.css
@@ -3,16 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.flex-grow {
-	flex-grow: 1;
-}
-
 .changes-view-body {
 	display: flex;
 	flex-direction: column;
 	height: 100%;
 	padding: 8px;
-		box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+/* SplitView container */
+.changes-view-body .changes-splitview-container {
+	flex: 1;
+	min-height: 0;
+	overflow: hidden;
 }
 
 /* Welcome/Empty state */
@@ -21,10 +24,10 @@
 	flex-direction: column;
 	align-items: center;
 	justify-content: center;
-		flex: 1;
-		padding: 20px;
-		text-align: center;
-		gap: 8px;
+	flex: 1;
+	padding: 20px;
+	text-align: center;
+	gap: 8px;
 }
 
 .changes-view-body .changes-welcome-icon.codicon {
@@ -38,19 +41,46 @@
 	font-size: 12px;
 }
 
-/* Main container - matches chat editing session styling */
+/* Main container */
 .changes-view-body .chat-editing-session-container {
-	padding: 4px 3px;
 	box-sizing: border-box;
-	background-color: var(--vscode-editor-background);
-	border: 1px solid var(--vscode-input-border, transparent);
-	border-radius: 4px;
 	display: flex;
 	flex-direction: column;
 	gap: 2px;
 	overflow: hidden;
 }
 
+/* Files header */
+.changes-view-body .changes-files-header {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 2px 8px;
+	min-height: 22px;
+	font-weight: 500;
+	font-size: 12px;
+}
+
+.changes-view-body .changes-files-title {
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.changes-view-body .changes-files-count {
+	flex-shrink: 0;
+	font-size: 11px;
+	padding: 2px 0;
+	border-radius: 4px;
+	background-color: var(--vscode-badge-background);
+	color: var(--vscode-badge-foreground);
+	line-height: 1;
+	font-weight: 600;
+	min-width: 16px;
+	text-align: center;
+}
+
 /* Overview section (header) - hidden since actions moved outside card */
 .changes-view-body .chat-editing-session-overview {
 	display: none;
@@ -68,29 +98,27 @@
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	border: 1px solid var(--vscode-input-border);
-	border-radius: 4px;
 }
 
 /* Line counts in header */
 .changes-view-body .changes-summary .working-set-lines-added {
 	color: var(--vscode-chat-linesAddedForeground);
 	font-size: 11px;
-		font-weight: 500;
+	font-weight: 500;
 }
 
 .changes-view-body .changes-summary .working-set-lines-removed {
 	color: var(--vscode-chat-linesRemovedForeground);
 	font-size: 11px;
-		font-weight: 500;
+	font-weight: 500;
 }
 
 /* Actions container */
 .changes-view-body .chat-editing-session-actions {
 	display: flex;
 	flex-direction: row;
-		flex-wrap: nowrap;
-		gap: 6px;
+	flex-wrap: nowrap;
+	gap: 6px;
 	align-items: center;
 }
 
@@ -185,6 +213,7 @@
 .changes-view-body .chat-editing-session-list .monaco-tl-twistie.force-no-twistie {
 	padding-left: 0 !important;
 }
+
 /* List rows */
 .changes-view-body .chat-editing-session-container:not(.has-file-icons) .monaco-list-row .monaco-icon-label {
 	margin-left: 6px;
diff --git a/src/vs/sessions/contrib/changes/browser/media/ciStatusWidget.css b/src/vs/sessions/contrib/changes/browser/media/ciStatusWidget.css
index 2acaa1fa18d..7c71c508cf5 100644
--- a/src/vs/sessions/contrib/changes/browser/media/ciStatusWidget.css
+++ b/src/vs/sessions/contrib/changes/browser/media/ciStatusWidget.css
@@ -3,60 +3,97 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* CI Status Widget - beneath the changes tree */
+/* CI Status Widget - beneath the files list */
 .ci-status-widget {
-	margin-top: 8px;
-	border: 1px solid var(--vscode-input-border, transparent);
-	border-radius: 4px;
-	background-color: var(--vscode-editor-background);
+	display: flex;
+	flex-direction: column;
+	flex-shrink: 0;
+	box-sizing: border-box;
 	overflow: hidden;
 	font-size: 12px;
 }
 
-/* Header - always visible, clickable */
+/* Header */
 .ci-status-widget-header {
+	position: relative;
 	display: flex;
 	align-items: center;
 	gap: 6px;
-	padding: 4px 8px 4px 4px;
-	cursor: pointer;
-	-webkit-user-select: none;
-	user-select: none;
+	padding: 2px 0;
 	min-height: 22px;
-}
-
-.ci-status-widget-header:hover {
-	background-color: var(--vscode-list-hoverBackground);
+	font-weight: 500;
 }
 
 /* Title - single line, overflow ellipsis */
 .ci-status-widget-title {
 	flex: 1;
+	display: flex;
+	align-items: center;
+	gap: 6px;
 	overflow: hidden;
 	color: var(--vscode-foreground);
+	padding-left: 8px;
 }
 
-.ci-status-widget-title .monaco-icon-label {
-	width: 100%;
-}
-
-.ci-status-widget-title .monaco-icon-label-container,
-.ci-status-widget-title .monaco-icon-name-container {
-	display: block;
-	overflow: hidden;
-}
-
-.ci-status-widget-title .label-name {
+.ci-status-widget-title-label {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
+/* Status count badges in the header */
+.ci-status-widget-counts {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	flex-shrink: 0;
+	margin-left: auto;
+	padding-right: 8px;
+}
+
+.ci-status-widget.has-fix-actions:hover .ci-status-widget-counts,
+.ci-status-widget.has-fix-actions:focus-within .ci-status-widget-counts {
+	visibility: hidden;
+}
+
+.ci-status-widget-count-badge {
+	display: inline-flex;
+	align-items: center;
+	gap: 2px;
+	font-size: 11px;
+	line-height: 1;
+}
+
+.ci-status-widget-count-badge .codicon {
+	font-size: 14px;
+}
+
+.ci-status-widget-count-badge.ci-status-success .codicon {
+	color: var(--vscode-testing-iconPassed, #73c991);
+}
+
+.ci-status-widget-count-badge.ci-status-failure .codicon {
+	color: var(--vscode-testing-iconFailed, #f14c4c);
+}
+
+.ci-status-widget-count-badge.ci-status-running .codicon {
+	color: var(--vscode-testing-iconQueued, var(--vscode-editorWarning-foreground));
+}
+
+.ci-status-widget-count-badge.ci-status-pending .codicon {
+	color: var(--vscode-descriptionForeground);
+}
+
 .ci-status-widget-header-actions {
-	flex: 0 0 auto;
+	position: absolute;
+	right: 0;
 	display: none;
 	align-items: center;
-	margin-left: auto;
+}
+
+.ci-status-widget:hover .ci-status-widget-header-actions.has-actions,
+.ci-status-widget:focus-within .ci-status-widget-header-actions.has-actions {
+	display: flex;
 }
 
 .ci-status-widget-header-actions .monaco-action-bar {
@@ -69,18 +106,11 @@
 	height: 16px;
 }
 
-/* Twistie icon on the right */
-.ci-status-widget-twistie {
-	flex: 0 0 auto;
-	display: flex;
-	align-items: center;
-	color: var(--vscode-foreground);
-	opacity: 0.7;
-}
-
-/* Body - collapsible list */
+/* Body - check list */
 .ci-status-widget-body {
-	border-top: 1px solid var(--vscode-input-border, transparent);
+	flex: 1;
+	min-height: 0;
+	overflow: hidden;
 }
 
 .ci-status-widget-list {
@@ -93,23 +123,21 @@
 }
 
 /* Individual check row */
+.ci-status-widget .ci-status-widget-list .monaco-list-row {
+	border-radius: 4px;
+}
+
 .ci-status-widget-check {
 	display: flex;
 	align-items: center;
 	gap: 6px;
-	padding: 4px 8px 4px 4px;
+	padding: 4px 8px;
 	height: 100%;
 	width: 100%;
 	box-sizing: border-box;
 	min-width: 0;
 }
 
-.ci-status-widget-list .monaco-list-row:hover .ci-status-widget-check,
-.ci-status-widget-list .monaco-list-row.focused .ci-status-widget-check,
-.ci-status-widget-list .monaco-list-row.selected .ci-status-widget-check {
-	background-color: var(--vscode-list-hoverBackground);
-}
-
 .ci-status-widget-check-label {
 	display: flex;
 	flex: 1;
@@ -117,7 +145,6 @@
 	overflow: hidden;
 }
 
-
 .ci-status-widget-check-label .monaco-icon-label {
 	display: flex;
 	flex: 1;
@@ -140,24 +167,22 @@
 	color: var(--vscode-foreground);
 }
 
-.ci-status-widget-title.ci-status-success .monaco-icon-label::before,
 .ci-status-widget-check.ci-status-success .monaco-icon-label::before {
 	color: var(--vscode-testing-iconPassed, #73c991);
 }
 
-.ci-status-widget-title.ci-status-failure .monaco-icon-label::before,
 .ci-status-widget-check.ci-status-failure .monaco-icon-label::before {
 	color: var(--vscode-testing-iconFailed, #f14c4c);
 }
 
-.ci-status-widget-title.ci-status-running .monaco-icon-label::before,
-.ci-status-widget-check.ci-status-running .monaco-icon-label::before,
-.ci-status-widget-title.ci-status-pending .monaco-icon-label::before,
-.ci-status-widget-check.ci-status-pending .monaco-icon-label::before {
+.ci-status-widget-check.ci-status-running .monaco-icon-label::before {
 	color: var(--vscode-testing-iconQueued, var(--vscode-editorWarning-foreground));
 }
 
-.ci-status-widget-title.ci-status-neutral .monaco-icon-label::before,
+.ci-status-widget-check.ci-status-pending .monaco-icon-label::before {
+	color: var(--vscode-descriptionForeground);
+}
+
 .ci-status-widget-check.ci-status-neutral .monaco-icon-label::before {
 	color: var(--vscode-descriptionForeground);
 }
diff --git a/src/vs/sessions/contrib/changes/browser/toggleChangesView.ts b/src/vs/sessions/contrib/changes/browser/toggleChangesView.ts
deleted file mode 100644
index abc40780aa6..00000000000
--- a/src/vs/sessions/contrib/changes/browser/toggleChangesView.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { autorun, derivedOpts, IReader } from '../../../../base/common/observable.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { URI } from '../../../../base/common/uri.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { IChatService } from '../../../../workbench/contrib/chat/common/chatService/chatService.js';
-import { IChatEditingService } from '../../../../workbench/contrib/chat/common/editing/chatEditingService.js';
-import { getChatSessionType } from '../../../../workbench/contrib/chat/common/model/chatUri.js';
-import { IWorkbenchLayoutService, Parts } from '../../../../workbench/services/layout/browser/layoutService.js';
-import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
-import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
-import { CHANGES_VIEW_ID } from './changesView.js';
-
-interface IPendingTurnState {
-	readonly hadChangesBeforeSend: boolean;
-	readonly submittedAt: number;
-}
-
-export class ToggleChangesViewContribution extends Disposable {
-
-	static readonly ID = 'workbench.contrib.toggleChangesView';
-
-	private readonly pendingTurnStateByResource = new ResourceMap<IPendingTurnState>();
-
-	constructor(
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@ISessionsManagementService private readonly sessionManagementService: ISessionsManagementService,
-		@IChatEditingService private readonly chatEditingService: IChatEditingService,
-		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
-		@IChatService private readonly chatService: IChatService,
-		@IViewsService private readonly viewsService: IViewsService,
-	) {
-		super();
-
-		const activeSessionResourceObs = derivedOpts<URI | undefined>({
-			equalsFn: isEqual,
-		}, (reader) => {
-			return this.sessionManagementService.activeSession.map(activeSession => activeSession?.resource).read(reader);
-		}).recomputeInitiallyAndOnChange(this._store);
-
-		this._register(this.chatService.onDidSubmitRequest(({ chatSessionResource }) => {
-			this.pendingTurnStateByResource.set(chatSessionResource, {
-				hadChangesBeforeSend: this.hasSessionChanges(chatSessionResource),
-				submittedAt: Date.now(),
-			});
-		}));
-
-		// When a turn is completed, check if there were changes before the turn and if there are changes after the turn.
-		// If there were no changes before the turn and there are changes after the turn, show the auxiliary bar.
-		this._register(autorun((reader) => {
-			const activeSessionResource = activeSessionResourceObs.read(reader);
-			if (!activeSessionResource) {
-				return;
-			}
-
-			const pendingTurnState = this.pendingTurnStateByResource.get(activeSessionResource);
-			if (!pendingTurnState) {
-				return;
-			}
-
-			const activeSession = this.agentSessionsService.getSession(activeSessionResource);
-			const turnCompleted = !!activeSession?.timing.lastRequestEnded && activeSession.timing.lastRequestEnded >= pendingTurnState.submittedAt;
-			if (!turnCompleted) {
-				return;
-			}
-
-			const hasChangesAfterTurn = this.hasSessionChanges(activeSessionResource, reader);
-			if (!pendingTurnState.hadChangesBeforeSend && hasChangesAfterTurn) {
-				this.layoutService.setPartHidden(false, Parts.AUXILIARYBAR_PART);
-			}
-
-			this.pendingTurnStateByResource.delete(activeSessionResource);
-		}));
-
-		// When the session is switched, show the auxiliary bar if there are pending changes from the session
-		this._register(autorun(reader => {
-			const sessionResource = activeSessionResourceObs.read(reader);
-			if (!sessionResource) {
-				this.syncAuxiliaryBarVisibility(false);
-				return;
-			}
-
-			const hasChanges = this.hasSessionChanges(sessionResource, reader);
-			this.syncAuxiliaryBarVisibility(hasChanges);
-		}));
-	}
-
-	private hasSessionChanges(sessionResource: URI, reader?: IReader): boolean {
-		const isBackgroundSession = getChatSessionType(sessionResource) === AgentSessionProviders.Background;
-
-		let editingSessionCount = 0;
-		if (!isBackgroundSession) {
-			const sessions = this.chatEditingService.editingSessionsObs.read(reader);
-			const editingSession = sessions.find(candidate => isEqual(candidate.chatSessionResource, sessionResource));
-			editingSessionCount = editingSession ? editingSession.entries.read(reader).length : 0;
-		}
-
-		const session = this.agentSessionsService.getSession(sessionResource);
-		const sessionFilesCount = session?.changes instanceof Array ? session.changes.length : 0;
-
-		return editingSessionCount + sessionFilesCount > 0;
-	}
-
-	private syncAuxiliaryBarVisibility(hasChanges: boolean): void {
-		if (hasChanges) {
-			this.viewsService.openView(CHANGES_VIEW_ID, false);
-		} else {
-			this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
-		}
-	}
-}
diff --git a/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts b/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts
index 1f0fd2142ad..169051def86 100644
--- a/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts
+++ b/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts
@@ -4,17 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { derived, IObservable, observableValue, ISettableObservable } from '../../../../base/common/observable.js';
-import { joinPath, relativePath } from '../../../../base/common/resources.js';
+import { relativePath } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IAICustomizationWorkspaceService, AICustomizationManagementSection, IStorageSourceFilter, applyStorageSourceFilter } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
-import { IChatPromptSlashCommand, IPromptsService, PromptsStorage } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
-import { BUILTIN_STORAGE } from '../../chat/common/builtinPromptsStorage.js';
+import { IChatPromptSlashCommand, IPromptsService } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
+import { ICustomizationHarnessService } from '../../../../workbench/contrib/chat/common/customizationHarnessService.js';
 import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { CustomizationCreatorService } from '../../../../workbench/contrib/chat/browser/aiCustomization/customizationCreatorService.js';
 import { PromptsType } from '../../../../workbench/contrib/chat/common/promptSyntax/promptTypes.js';
-import { IPathService } from '../../../../workbench/services/path/common/pathService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
@@ -43,37 +42,16 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
 	 */
 	private readonly _overrideRoot: ISettableObservable<URI | undefined>;
 
-	/**
-	 * CLI-accessible user directories for customization file filtering and creation.
-	 */
-	private readonly _cliUserRoots: readonly URI[];
-
-	/**
-	 * Pre-built filter for types that should only show CLI-accessible user roots.
-	 */
-	private readonly _cliUserFilter: IStorageSourceFilter;
-
 	constructor(
 		@ISessionsManagementService private readonly sessionsService: ISessionsManagementService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IPromptsService private readonly promptsService: IPromptsService,
-		@IPathService pathService: IPathService,
+		@ICustomizationHarnessService private readonly harnessService: ICustomizationHarnessService,
 		@ICommandService private readonly commandService: ICommandService,
 		@ILogService private readonly logService: ILogService,
 		@IFileService private readonly fileService: IFileService,
 		@INotificationService private readonly notificationService: INotificationService,
 	) {
-		const userHome = pathService.userHome({ preferLocal: true });
-		this._cliUserRoots = [
-			joinPath(userHome, '.copilot'),
-			joinPath(userHome, '.claude'),
-			joinPath(userHome, '.agents'),
-		];
-		this._cliUserFilter = {
-			sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.plugin, BUILTIN_STORAGE],
-			includedUserFileRoots: this._cliUserRoots,
-		};
-
 		this._overrideRoot = observableValue(this, undefined);
 
 		this.activeProjectRoot = derived(reader => {
@@ -82,7 +60,8 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
 				return override;
 			}
 			const session = this.sessionsService.activeSession.read(reader);
-			return session?.worktree ?? session?.repository;
+			const repo = session?.workspace.read(reader)?.repositories[0];
+			return repo?.workingDirectory ?? repo?.uri;
 		});
 
 		this.hasOverrideProjectRoot = derived(reader => {
@@ -95,8 +74,9 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
 		if (override) {
 			return override;
 		}
-		const session = this.sessionsService.getActiveSession();
-		return session?.worktree ?? session?.repository;
+		const session = this.sessionsService.activeSession.get();
+		const repo = session?.workspace.get()?.repositories[0];
+		return repo?.workingDirectory ?? repo?.uri;
 	}
 
 	setOverrideProjectRoot(root: URI): void {
@@ -117,24 +97,8 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
 		AICustomizationManagementSection.Plugins,
 	];
 
-	private static readonly _hooksFilter: IStorageSourceFilter = {
-		sources: [PromptsStorage.local, PromptsStorage.plugin],
-	};
-
-	private static readonly _allUserRootsFilter: IStorageSourceFilter = {
-		sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.plugin, BUILTIN_STORAGE],
-	};
-
 	getStorageSourceFilter(type: PromptsType): IStorageSourceFilter {
-		if (type === PromptsType.hook) {
-			return SessionsAICustomizationWorkspaceService._hooksFilter;
-		}
-		if (type === PromptsType.prompt) {
-			// Prompts are shown from all user roots (including VS Code profile)
-			return SessionsAICustomizationWorkspaceService._allUserRootsFilter;
-		}
-		// Other types only show user files from CLI-accessible roots (~/.copilot, ~/.claude, ~/.agents)
-		return this._cliUserFilter;
+		return this.harnessService.getStorageSourceFilter(type);
 	}
 
 	readonly isSessionsWindow = true;
@@ -145,13 +109,14 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
 	 * the file is also committed there so the session sees it immediately.
 	 */
 	async commitFiles(_projectRoot: URI, fileUris: URI[]): Promise<void> {
-		const session = this.sessionsService.getActiveSession();
-		if (!session?.repository) {
+		const session = this.sessionsService.activeSession.get();
+		const repo = session?.workspace.get()?.repositories[0];
+		if (!repo?.uri) {
 			return;
 		}
 
 		for (const fileUri of fileUris) {
-			await this.commitFileToRepos(fileUri, session.repository, session.worktree);
+			await this.commitFileToRepos(fileUri, repo.uri, repo.workingDirectory);
 		}
 	}
 
@@ -161,13 +126,14 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
 	 * in the worktree if one is active.
 	 */
 	async deleteFiles(_projectRoot: URI, fileUris: URI[]): Promise<void> {
-		const session = this.sessionsService.getActiveSession();
-		if (!session?.repository) {
+		const session = this.sessionsService.activeSession.get();
+		const repo = session?.workspace.get()?.repositories[0];
+		if (!repo?.uri) {
 			return;
 		}
 
 		for (const fileUri of fileUris) {
-			await this.commitDeletionToRepos(fileUri, session.repository, session.worktree);
+			await this.commitDeletionToRepos(fileUri, repo.uri, repo.workingDirectory);
 		}
 	}
 
diff --git a/src/vs/sessions/contrib/chat/browser/branchPicker.ts b/src/vs/sessions/contrib/chat/browser/branchPicker.ts
index 0e4ff4ce967..a4a092d8349 100644
--- a/src/vs/sessions/contrib/chat/browser/branchPicker.ts
+++ b/src/vs/sessions/contrib/chat/browser/branchPicker.ts
@@ -2,210 +2,3 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-import * as dom from '../../../../base/browser/dom.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { localize } from '../../../../nls.js';
-import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
-import { IGitRepository } from '../../../../workbench/contrib/git/common/gitService.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-const COPILOT_WORKTREE_PATTERN = 'copilot-worktree-';
-const FILTER_THRESHOLD = 10;
-
-interface IBranchItem {
-	readonly name: string;
-}
-
-/**
- * A self-contained widget for selecting a git branch.
- * Uses `IGitRepository.getRefs` to list local branches.
- * Copilot worktree branches are shown in a collapsible section;
- * other branches are listed without a section header.
- * Writes the selected branch to the new session object.
- */
-export class BranchPicker extends Disposable {
-
-	private _selectedBranch: string | undefined;
-	private _preferredBranch: string | undefined;
-	private _branches: string[] = [];
-
-	private readonly _onDidChange = this._register(new Emitter<string | undefined>());
-	readonly onDidChange: Event<string | undefined> = this._onDidChange.event;
-
-	private readonly _onDidChangeLoading = this._register(new Emitter<boolean>());
-	readonly onDidChangeLoading: Event<boolean> = this._onDidChangeLoading.event;
-
-	private readonly _renderDisposables = this._register(new DisposableStore());
-	private _slotElement: HTMLElement | undefined;
-	private _triggerElement: HTMLElement | undefined;
-
-	get selectedBranch(): string | undefined {
-		return this._selectedBranch;
-	}
-
-	/**
-	 * Sets a preferred branch to select when branches are loaded.
-	 */
-	setPreferredBranch(branch: string | undefined): void {
-		this._preferredBranch = branch;
-	}
-
-	constructor(
-		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
-	) {
-		super();
-	}
-
-	/**
-	 * Sets the git repository and loads its branches.
-	 * When undefined, the picker is shown disabled.
-	 */
-	async setRepository(repository: IGitRepository | undefined): Promise<void> {
-		this._branches = [];
-		this._selectedBranch = undefined;
-
-		if (!repository) {
-			this._onDidChange.fire(undefined);
-			this._setLoading(false);
-			this._updateTriggerLabel();
-			return;
-		}
-
-		this._setLoading(true);
-
-		try {
-			const refs = await repository.getRefs({ pattern: 'refs/heads' });
-			this._branches = refs
-				.map(ref => ref.name)
-				.filter((name): name is string => !!name)
-				.filter(name => !name.includes(COPILOT_WORKTREE_PATTERN));
-
-			// Select preferred branch (from draft), active branch, main, master, or the first branch
-			const preferred = this._preferredBranch;
-			this._preferredBranch = undefined;
-			const defaultBranch = (preferred ? this._branches.find(b => b === preferred) : undefined)
-				?? this._branches.find(b => b === repository.state.get().HEAD?.name)
-				?? this._branches.find(b => b === 'main')
-				?? this._branches.find(b => b === 'master')
-				?? this._branches[0];
-			if (defaultBranch) {
-				this._selectBranch(defaultBranch);
-			}
-		} finally {
-			this._setLoading(false);
-			this._updateTriggerLabel();
-		}
-	}
-
-	/**
-	 * Renders the branch picker trigger into the given container.
-	 */
-	render(container: HTMLElement): void {
-		this._renderDisposables.clear();
-
-		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
-		this._slotElement = slot;
-		this._renderDisposables.add({ dispose: () => slot.remove() });
-
-		const trigger = dom.append(slot, dom.$('a.action-label'));
-		trigger.tabIndex = 0;
-		trigger.role = 'button';
-		this._triggerElement = trigger;
-		this._updateTriggerLabel();
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
-			dom.EventHelper.stop(e, true);
-			this.showPicker();
-		}));
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
-			if (e.key === 'Enter' || e.key === ' ') {
-				dom.EventHelper.stop(e, true);
-				this.showPicker();
-			}
-		}));
-	}
-
-	/**
-	 * Shows or hides the picker.
-	 */
-	setVisible(visible: boolean): void {
-		if (this._slotElement) {
-			this._slotElement.style.display = visible ? '' : 'none';
-		}
-	}
-
-	/**
-	 * Shows the branch picker dropdown anchored to the trigger element.
-	 */
-	showPicker(): void {
-		if (!this._triggerElement || this.actionWidgetService.isVisible || this._branches.length === 0) {
-			return;
-		}
-
-		const items = this._buildItems();
-		const triggerElement = this._triggerElement;
-		const delegate: IActionListDelegate<IBranchItem> = {
-			onSelect: (item) => {
-				this.actionWidgetService.hide();
-				this._selectBranch(item.name);
-			},
-			onHide: () => { triggerElement.focus(); },
-		};
-
-		const totalActions = items.filter(i => i.kind === ActionListItemKind.Action).length;
-
-		this.actionWidgetService.show<IBranchItem>(
-			'branchPicker',
-			false,
-			items,
-			delegate,
-			this._triggerElement,
-			undefined,
-			[],
-			{
-				getAriaLabel: (item) => item.label ?? '',
-				getWidgetAriaLabel: () => localize('branchPicker.ariaLabel', "Branch Picker"),
-			},
-			totalActions > FILTER_THRESHOLD ? { showFilter: true, filterPlaceholder: localize('branchPicker.filter', "Filter branches...") } : undefined,
-		);
-	}
-
-	private _buildItems(): IActionListItem<IBranchItem>[] {
-		return this._branches.map(branch => ({
-			kind: ActionListItemKind.Action,
-			label: branch,
-			group: { title: '', icon: Codicon.gitBranch },
-			item: { name: branch },
-		}));
-	}
-
-	private _selectBranch(branch: string): void {
-		if (this._selectedBranch !== branch) {
-			this._selectedBranch = branch;
-			this._onDidChange.fire(branch);
-			this._updateTriggerLabel();
-		}
-	}
-
-	private _updateTriggerLabel(): void {
-		if (!this._triggerElement) {
-			return;
-		}
-		dom.clearNode(this._triggerElement);
-		const isDisabled = this._branches.length === 0;
-		const label = this._selectedBranch ?? localize('branchPicker.select', "Branch");
-		dom.append(this._triggerElement, renderIcon(Codicon.gitBranch));
-		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
-		labelSpan.textContent = label;
-		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
-		this._slotElement?.classList.toggle('disabled', isDisabled);
-	}
-
-	private _setLoading(loading: boolean): void {
-		this._onDidChangeLoading.fire(loading);
-	}
-}
diff --git a/src/vs/sessions/contrib/chat/browser/chat.contribution.ts b/src/vs/sessions/contrib/chat/browser/chat.contribution.ts
index 5e49081cc2b..91a82b13dfc 100644
--- a/src/vs/sessions/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/sessions/contrib/chat/browser/chat.contribution.ts
@@ -28,7 +28,9 @@ import { AgenticPromptsService } from './promptsService.js';
 import { IPromptsService } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
 import { ISessionsConfigurationService, SessionsConfigurationService } from './sessionsConfigurationService.js';
 import { IAICustomizationWorkspaceService } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
+import { ICustomizationHarnessService } from '../../../../workbench/contrib/chat/common/customizationHarnessService.js';
 import { SessionsAICustomizationWorkspaceService } from './aiCustomizationWorkspaceService.js';
+import { SessionsCustomizationHarnessService } from './customizationHarnessService.js';
 import { ChatViewContainerId, ChatViewId } from '../../../../workbench/contrib/chat/browser/chat.js';
 import { CHAT_CATEGORY } from '../../../../workbench/contrib/chat/browser/actions/chatActions.js';
 import { NewChatViewPane, SessionsViewId } from './newChatViewPane.js';
@@ -49,9 +51,9 @@ export class OpenSessionWorktreeInVSCodeAction extends Action2 {
 			icon: Codicon.vscodeInsiders,
 			precondition: IsActiveSessionBackgroundProviderContext,
 			menu: [{
-				id: Menus.TitleBarSessionMenu,
+				id: Menus.TitleBarRightLayout,
 				group: 'navigation',
-				order: 10,
+				order: 0,
 				when: ContextKeyExpr.and(IsAuxiliaryWindowContext.toNegated(), SessionsWelcomeVisibleContext.toNegated(), IsActiveSessionBackgroundProviderContext),
 			}]
 		});
@@ -67,7 +69,9 @@ export class OpenSessionWorktreeInVSCodeAction extends Action2 {
 			return;
 		}
 
-		const folderUri = activeSession.providerType === AgentSessionProviders.Background ? activeSession?.worktree ?? activeSession?.repository : undefined;
+		const workspace = activeSession.workspace.get();
+		const repo = workspace?.repositories[0];
+		const folderUri = activeSession.sessionType === AgentSessionProviders.Background ? repo?.workingDirectory ?? repo?.uri : undefined;
 
 		if (!folderUri) {
 			return;
@@ -195,3 +199,4 @@ registerWorkbenchContribution2(RunScriptContribution.ID, RunScriptContribution,
 registerSingleton(IPromptsService, AgenticPromptsService, InstantiationType.Delayed);
 registerSingleton(ISessionsConfigurationService, SessionsConfigurationService, InstantiationType.Delayed);
 registerSingleton(IAICustomizationWorkspaceService, SessionsAICustomizationWorkspaceService, InstantiationType.Delayed);
+registerSingleton(ICustomizationHarnessService, SessionsCustomizationHarnessService, InstantiationType.Delayed);
diff --git a/src/vs/sessions/contrib/chat/browser/customizationHarnessService.ts b/src/vs/sessions/contrib/chat/browser/customizationHarnessService.ts
new file mode 100644
index 00000000000..c11d8ade171
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/customizationHarnessService.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import {
+	CustomizationHarness,
+	CustomizationHarnessServiceBase,
+	createCliHarnessDescriptor,
+	getCliUserRoots,
+} from '../../../../workbench/contrib/chat/common/customizationHarnessService.js';
+import { IPathService } from '../../../../workbench/services/path/common/pathService.js';
+import { BUILTIN_STORAGE } from '../common/builtinPromptsStorage.js';
+
+/**
+ * Sessions-window override of the customization harness service.
+ *
+ * Only the CLI harness is registered because sessions always run via
+ * the Copilot CLI. With a single harness the toggle bar is hidden.
+ */
+export class SessionsCustomizationHarnessService extends CustomizationHarnessServiceBase {
+	constructor(
+		@IPathService pathService: IPathService,
+	) {
+		const userHome = pathService.userHome({ preferLocal: true });
+		const extras = [BUILTIN_STORAGE];
+		super(
+			[createCliHarnessDescriptor(getCliUserRoots(userHome), extras)],
+			CustomizationHarness.CLI,
+		);
+	}
+}
diff --git a/src/vs/sessions/contrib/chat/browser/extensionToolbarPickers.ts b/src/vs/sessions/contrib/chat/browser/extensionToolbarPickers.ts
new file mode 100644
index 00000000000..769ecae8d4c
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/extensionToolbarPickers.ts
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { toAction } from '../../../../base/common/actions.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ChatSessionPickerActionItem, IChatSessionPickerDelegate } from '../../../../workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.js';
+import { SearchableOptionPickerActionItem } from '../../../../workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.js';
+import { IChatSessionProviderOptionItem } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { ISessionOptionGroup } from './newSession.js';
+import { RemoteNewSession } from '../../copilotChatSessions/browser/copilotChatSessionsProvider.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+
+/**
+ * Self-contained widget that renders extension-driven toolbar pickers
+ * for Cloud/Remote sessions. Observes the active session from
+ * {@link ISessionsProvidersService} and dynamically creates/destroys
+ * picker widgets as option groups change.
+ */
+export class ExtensionToolbarPickers extends Disposable {
+
+	private _container: HTMLElement | undefined;
+	private readonly _pickerWidgets = new Map<string, ChatSessionPickerActionItem | SearchableOptionPickerActionItem>();
+	private readonly _pickerDisposables = this._register(new DisposableStore());
+	private readonly _optionEmitters = new Map<string, Emitter<IChatSessionProviderOptionItem>>();
+	private readonly _optionContextKeys = new Map<string, IContextKey<string>>();
+	private readonly _sessionDisposables = this._register(new DisposableStore());
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		// Observe active session and render toolbar pickers when it has option groups
+		this._register(autorun(reader => {
+			const session = this.sessionsManagementService.activeSession.read(reader);
+			this._sessionDisposables.clear();
+
+			if (session) {
+				// The session data is directly a RemoteNewSession — access its option groups.
+				this._bindToSession();
+			} else {
+				this._clearPickers();
+			}
+		}));
+	}
+
+	/**
+	 * Sets the container element where toolbar pickers will be rendered.
+	 */
+	setContainer(container: HTMLElement): void {
+		this._container = container;
+	}
+
+	private _bindToSession(): void {
+		// Get the current new session from the provider's internal state
+		const providers = this.sessionsProvidersService.getProviders();
+		for (const provider of providers) {
+			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+			const currentSession = (provider as any)._currentNewSession;
+			if (currentSession instanceof RemoteNewSession) {
+				this._renderToolbarPickers(currentSession, true);
+				this._sessionDisposables.add(currentSession.onDidChangeOptionGroups(() => {
+					this._renderToolbarPickers(currentSession);
+				}));
+				return;
+			}
+		}
+	}
+
+	private _renderToolbarPickers(session: RemoteNewSession, force?: boolean): void {
+		if (!this._container) {
+			return;
+		}
+
+		const toolbarOptions = session.getOtherOptionGroups();
+		const visibleGroups = toolbarOptions.filter(option => {
+			const group = option.group;
+			return group.items.length > 0 || (group.commands || []).length > 0 || !!group.searchable;
+		});
+
+		if (visibleGroups.length === 0) {
+			this._clearPickers();
+			return;
+		}
+
+		if (!force) {
+			const allMatch = visibleGroups.length === this._pickerWidgets.size
+				&& visibleGroups.every(o => this._pickerWidgets.has(o.group.id));
+			if (allMatch) {
+				return;
+			}
+		}
+
+		this._clearPickers();
+
+		for (const option of visibleGroups) {
+			this._renderPickerWidget(option, session);
+		}
+	}
+
+	private _renderPickerWidget(option: ISessionOptionGroup, session: RemoteNewSession): void {
+		const { group: optionGroup, value: initialItem } = option;
+
+		if (initialItem) {
+			this._updateOptionContextKey(optionGroup.id, initialItem.id);
+		}
+
+		const initialState = { group: optionGroup, item: initialItem };
+		const emitter = this._getOrCreateOptionEmitter(optionGroup.id);
+		const itemDelegate: IChatSessionPickerDelegate = {
+			getCurrentOption: () => session.getOptionValue(optionGroup.id) ?? initialItem,
+			onDidChangeOption: emitter.event,
+			setOption: (item: IChatSessionProviderOptionItem) => {
+				this._updateOptionContextKey(optionGroup.id, item.id);
+				emitter.fire(item);
+				session.setOptionValue(optionGroup.id, item);
+			},
+			getOptionGroup: () => {
+				const modelOpt = session.getModelOptionGroup();
+				if (modelOpt?.group.id === optionGroup.id) {
+					return modelOpt.group;
+				}
+				return session.getOtherOptionGroups().find(o => o.group.id === optionGroup.id)?.group;
+			},
+			getSessionResource: () => session.resource,
+		};
+
+		const action = toAction({ id: optionGroup.id, label: optionGroup.name, run: () => { } });
+		const widget = this.instantiationService.createInstance(
+			optionGroup.searchable ? SearchableOptionPickerActionItem : ChatSessionPickerActionItem,
+			action, initialState, itemDelegate, undefined
+		);
+
+		this._pickerDisposables.add(widget);
+		this._pickerWidgets.set(optionGroup.id, widget);
+
+		const slot = dom.append(this._container!, dom.$('.sessions-chat-picker-slot'));
+		widget.render(slot);
+	}
+
+	private _updateOptionContextKey(optionGroupId: string, optionItemId: string): void {
+		let contextKey = this._optionContextKeys.get(optionGroupId);
+		if (!contextKey) {
+			const rawKey = new RawContextKey<string>(`chatSessionOption.${optionGroupId}`, '');
+			contextKey = rawKey.bindTo(this.contextKeyService);
+			this._optionContextKeys.set(optionGroupId, contextKey);
+		}
+		contextKey.set(optionItemId.trim());
+	}
+
+	private _getOrCreateOptionEmitter(optionGroupId: string): Emitter<IChatSessionProviderOptionItem> {
+		let emitter = this._optionEmitters.get(optionGroupId);
+		if (!emitter) {
+			emitter = new Emitter<IChatSessionProviderOptionItem>();
+			this._optionEmitters.set(optionGroupId, emitter);
+			this._pickerDisposables.add(emitter);
+		}
+		return emitter;
+	}
+
+	private _clearPickers(): void {
+		this._pickerDisposables.clear();
+		this._pickerWidgets.clear();
+		this._optionEmitters.clear();
+		if (this._container) {
+			dom.clearNode(this._container);
+		}
+	}
+}
diff --git a/src/vs/sessions/contrib/chat/browser/folderPicker.ts b/src/vs/sessions/contrib/chat/browser/folderPicker.ts
deleted file mode 100644
index 26d7626d546..00000000000
--- a/src/vs/sessions/contrib/chat/browser/folderPicker.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as dom from '../../../../base/browser/dom.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { basename, extUriBiasedIgnorePathCase, isEqual } from '../../../../base/common/resources.js';
-import { URI } from '../../../../base/common/uri.js';
-import { localize } from '../../../../nls.js';
-import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-
-const STORAGE_KEY_LAST_FOLDER = 'agentSessions.lastPickedFolder';
-const STORAGE_KEY_RECENT_FOLDERS = 'agentSessions.recentlyPickedFolders';
-const MAX_RECENT_FOLDERS = 10;
-const FILTER_THRESHOLD = 10;
-
-interface IFolderItem {
-	readonly uri: URI;
-	readonly label: string;
-	readonly checked?: boolean;
-}
-
-/**
- * A folder picker that uses the action widget dropdown to show a list of
- * recently selected and recently opened folders. Remembers the last selected
- * folder and recently picked folders in storage. Enables a filter input when
- * there are more than 10 items.
- */
-export class FolderPicker extends Disposable {
-
-	private readonly _onDidSelectFolder = this._register(new Emitter<URI>());
-	readonly onDidSelectFolder: Event<URI> = this._onDidSelectFolder.event;
-
-	private _selectedFolderUri: URI | undefined;
-	private _recentlyPickedFolders: URI[] = [];
-
-	private _triggerElement: HTMLElement | undefined;
-	private readonly _renderDisposables = this._register(new DisposableStore());
-
-	get selectedFolderUri(): URI | undefined {
-		return this._selectedFolderUri;
-	}
-
-	constructor(
-		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
-		@IStorageService private readonly storageService: IStorageService,
-		@IFileDialogService private readonly fileDialogService: IFileDialogService,
-		@ICommandService private readonly commandService: ICommandService,
-	) {
-		super();
-
-		// Restore last picked folder
-		const lastFolder = this.storageService.get(STORAGE_KEY_LAST_FOLDER, StorageScope.PROFILE);
-		if (lastFolder) {
-			try { this._selectedFolderUri = URI.parse(lastFolder); } catch { /* ignore */ }
-		}
-
-		// Restore recently picked folders
-		try {
-			const stored = this.storageService.get(STORAGE_KEY_RECENT_FOLDERS, StorageScope.PROFILE);
-			if (stored) {
-				this._recentlyPickedFolders = JSON.parse(stored).map((s: string) => URI.parse(s));
-			}
-		} catch { /* ignore */ }
-	}
-
-	/**
-	 * Renders the folder picker trigger button into the given container.
-	 * Returns the container element.
-	 */
-	render(container: HTMLElement): HTMLElement {
-		this._renderDisposables.clear();
-
-		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
-		this._renderDisposables.add({ dispose: () => slot.remove() });
-
-		const trigger = dom.append(slot, dom.$('a.action-label'));
-		trigger.tabIndex = 0;
-		trigger.role = 'button';
-		this._triggerElement = trigger;
-
-		this._updateTriggerLabel(trigger);
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
-			dom.EventHelper.stop(e, true);
-			this.showPicker();
-		}));
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
-			if (e.key === 'Enter' || e.key === ' ') {
-				dom.EventHelper.stop(e, true);
-				this.showPicker();
-			}
-		}));
-
-		return slot;
-	}
-
-	/**
-	 * Shows the folder picker dropdown anchored to the trigger element.
-	 */
-	showPicker(): void {
-		if (!this._triggerElement || this.actionWidgetService.isVisible) {
-			return;
-		}
-
-		const currentFolderUri = this._selectedFolderUri;
-		const items = this._buildItems(currentFolderUri);
-		const showFilter = items.filter(i => i.kind === ActionListItemKind.Action).length > FILTER_THRESHOLD;
-
-		const triggerElement = this._triggerElement;
-		const delegate: IActionListDelegate<IFolderItem> = {
-			onSelect: (item) => {
-				this.actionWidgetService.hide();
-				if (item.uri.scheme === 'command' && item.uri.path === 'browse') {
-					this._browseForFolder();
-				} else if (item.uri.scheme === 'command' && item.uri.path === 'clone') {
-					this._cloneRepository();
-				} else {
-					this._selectFolder(item.uri);
-				}
-			},
-			onHide: () => { triggerElement.focus(); },
-		};
-
-		const listOptions = showFilter ? { showFilter: true, filterPlaceholder: localize('folderPicker.filter', "Filter folders...") } : undefined;
-
-		this.actionWidgetService.show<IFolderItem>(
-			'folderPicker',
-			false,
-			items,
-			delegate,
-			this._triggerElement,
-			undefined,
-			[],
-			{
-				getAriaLabel: (item) => item.label ?? '',
-				getWidgetAriaLabel: () => localize('folderPicker.ariaLabel', "Folder Picker"),
-			},
-			listOptions,
-		);
-	}
-
-	/**
-	 * Programmatically set the selected folder (e.g. restoring draft state).
-	 */
-	setSelectedFolder(folderUri: URI): void {
-		this._selectFolder(folderUri);
-	}
-
-	/**
-	 * Clears the selected folder.
-	 */
-	clearSelection(): void {
-		this._selectedFolderUri = undefined;
-		this._updateTriggerLabel(this._triggerElement);
-	}
-
-	private _selectFolder(folderUri: URI): void {
-		this._selectedFolderUri = folderUri;
-		this._addToRecentlyPickedFolders(folderUri);
-		this.storageService.store(STORAGE_KEY_LAST_FOLDER, folderUri.toString(), StorageScope.PROFILE, StorageTarget.MACHINE);
-		this._updateTriggerLabel(this._triggerElement);
-		this._onDidSelectFolder.fire(folderUri);
-	}
-
-	private async _browseForFolder(): Promise<void> {
-		try {
-			const selected = await this.fileDialogService.showOpenDialog({
-				canSelectFiles: false,
-				canSelectFolders: true,
-				canSelectMany: false,
-				title: localize('selectFolder', "Select Folder"),
-			});
-			if (selected?.[0]) {
-				this._selectFolder(selected[0]);
-			}
-		} catch {
-			// dialog was cancelled or failed — nothing to do
-		}
-	}
-
-	private async _cloneRepository(): Promise<void> {
-		try {
-			const clonedPath: string | undefined = await this.commandService.executeCommand('git.clone', undefined, undefined, { postCloneAction: 'none' });
-			if (clonedPath) {
-				this._selectFolder(URI.file(clonedPath));
-			}
-		} catch {
-			// clone was cancelled or failed — nothing to do
-		}
-	}
-
-	private _addToRecentlyPickedFolders(folderUri: URI): void {
-		this._recentlyPickedFolders = [folderUri, ...this._recentlyPickedFolders.filter(f => !isEqual(f, folderUri))].slice(0, MAX_RECENT_FOLDERS);
-		this.storageService.store(STORAGE_KEY_RECENT_FOLDERS, JSON.stringify(this._recentlyPickedFolders.map(f => f.toString())), StorageScope.PROFILE, StorageTarget.MACHINE);
-	}
-
-	private _buildItems(currentFolderUri: URI | undefined): IActionListItem<IFolderItem>[] {
-		const seenUris = new Set<string>();
-
-		const items: IActionListItem<IFolderItem>[] = [];
-
-		// Collect all folders (current + recently picked), deduplicated and sorted by name
-		const allFolders: { uri: URI; label: string }[] = [];
-		if (currentFolderUri) {
-			seenUris.add(currentFolderUri.toString());
-			allFolders.push({ uri: currentFolderUri, label: basename(currentFolderUri) });
-		}
-		for (const folderUri of this._recentlyPickedFolders) {
-			const key = folderUri.toString();
-			if (seenUris.has(key)) {
-				continue;
-			}
-			seenUris.add(key);
-			allFolders.push({ uri: folderUri, label: basename(folderUri) });
-		}
-		allFolders.sort((a, b) => extUriBiasedIgnorePathCase.compare(a.uri, b.uri));
-		for (const folder of allFolders) {
-			const isCurrent = currentFolderUri && isEqual(folder.uri, currentFolderUri);
-			items.push({
-				kind: ActionListItemKind.Action,
-				label: folder.label,
-				group: { title: '', icon: Codicon.folder },
-				item: { uri: folder.uri, label: folder.label, checked: isCurrent || false },
-				...(!isCurrent ? { onRemove: () => this._removeFolder(folder.uri) } : {}),
-			});
-		}
-
-		// Separator + Browse...
-		if (items.length > 0) {
-			items.push({
-				kind: ActionListItemKind.Separator,
-				label: '',
-			});
-		}
-		items.push({
-			kind: ActionListItemKind.Action,
-			label: localize('browseFolder', "Browse..."),
-			group: { title: '', icon: Codicon.search },
-			item: { uri: URI.from({ scheme: 'command', path: 'browse' }), label: localize('browseFolder', "Browse...") },
-		});
-		items.push({
-			kind: ActionListItemKind.Action,
-			label: localize('cloneRepository', "Clone..."),
-			group: { title: '', icon: Codicon.repoClone },
-			item: { uri: URI.from({ scheme: 'command', path: 'clone' }), label: localize('cloneRepository', "Clone...") },
-		});
-
-		return items;
-	}
-
-	/**
-	 * Removes a folder from the recently picked list and storage.
-	 */
-	removeFromRecents(folderUri: URI): void {
-		this._recentlyPickedFolders = this._recentlyPickedFolders.filter(f => !isEqual(f, folderUri));
-		this.storageService.store(STORAGE_KEY_RECENT_FOLDERS, JSON.stringify(this._recentlyPickedFolders.map(f => f.toString())), StorageScope.PROFILE, StorageTarget.MACHINE);
-		// If this was the last picked folder, clear it
-		if (this._selectedFolderUri && isEqual(this._selectedFolderUri, folderUri)) {
-			this._selectedFolderUri = undefined;
-			this.storageService.remove(STORAGE_KEY_LAST_FOLDER, StorageScope.PROFILE);
-			this._updateTriggerLabel(this._triggerElement);
-		}
-	}
-
-	private _removeFolder(folderUri: URI): void {
-		this._recentlyPickedFolders = this._recentlyPickedFolders.filter(f => !isEqual(f, folderUri));
-		this.storageService.store(STORAGE_KEY_RECENT_FOLDERS, JSON.stringify(this._recentlyPickedFolders.map(f => f.toString())), StorageScope.PROFILE, StorageTarget.MACHINE);
-	}
-
-	private _updateTriggerLabel(trigger: HTMLElement | undefined): void {
-		if (!trigger) {
-			return;
-		}
-
-		dom.clearNode(trigger);
-		const folderUri = this._selectedFolderUri;
-		const label = folderUri ? basename(folderUri) : localize('pickFolder', "Pick Folder");
-
-		dom.append(trigger, renderIcon(Codicon.folder));
-		const labelSpan = dom.append(trigger, dom.$('span.sessions-chat-dropdown-label'));
-		labelSpan.textContent = label;
-		dom.append(trigger, renderIcon(Codicon.chevronDown));
-	}
-}
diff --git a/src/vs/sessions/contrib/chat/browser/media/chatWelcomePart.css b/src/vs/sessions/contrib/chat/browser/media/chatWelcomePart.css
index 57410a89fc0..0c6223fb1e5 100644
--- a/src/vs/sessions/contrib/chat/browser/media/chatWelcomePart.css
+++ b/src/vs/sessions/contrib/chat/browser/media/chatWelcomePart.css
@@ -12,7 +12,7 @@
 	height: 100%;
 	box-sizing: border-box;
 	overflow: hidden;
-	padding: 0 12px 10% 12px;
+	padding: 0 16px 48px 16px;
 	container-type: size;
 }
 
@@ -105,10 +105,13 @@
 	width: 100%;
 	max-width: 800px;
 	margin-top: 8px;
+	padding-left: 7px;
+	padding-right: 7px;
 	box-sizing: border-box;
 	display: none;
 	flex-direction: row;
 	align-items: center;
+	gap: 4px;
 	min-height: 28px;
 }
 
@@ -164,6 +167,7 @@
 	flex-direction: row;
 	flex-wrap: nowrap;
 	align-items: center;
+	justify-content: center;
 	width: 100%;
 	box-sizing: border-box;
 	padding: 0;
@@ -173,96 +177,34 @@
 	display: none;
 }
 
-/* Left half: target switcher, right-justified */
-.sessions-chat-pickers-left-half {
-	flex: 1;
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	min-width: 0;
+/* Prominent project picker button */
+.sessions-chat-picker-slot.sessions-chat-workspace-picker .action-label {
+	height: auto;
+	padding: 8px 20px;
+	font-size: 15px;
+	border: 1px solid var(--vscode-button-border);
+	background-color: var(--vscode-button-secondaryBackground);
+	color: var(--vscode-button-secondaryForeground);
+	border-radius: 6px;
 }
 
-/* Right half: pickers, left-justified */
-.sessions-chat-pickers-right-half {
-	flex: 1;
-	display: flex;
-	justify-content: flex-start;
-	align-items: center;
-	min-width: 0;
+.sessions-chat-picker-slot.sessions-chat-workspace-picker .action-label:hover {
+	background-color: var(--vscode-button-secondaryHoverBackground);
 }
 
-/* Separator between switcher and folder picker */
-.sessions-chat-pickers-left-separator {
-	width: 1px;
-	height: 22px;
-	background-color: var(--vscode-editorWidget-border, var(--vscode-contrastBorder));
-	margin: 0 12px;
-	flex-shrink: 0;
-	display: none;
+.sessions-chat-picker-slot.sessions-chat-workspace-picker .action-label .codicon {
+	font-size: 18px;
+	margin-right: 2px;
 }
 
-/* Target switcher radio buttons - bigger and fancier */
-.sessions-chat-dropdown-wrapper .monaco-custom-radio > .monaco-button {
-	font-size: 13px;
-	line-height: 1.4em;
-	padding: 4px 14px;
+.sessions-chat-picker-slot.sessions-chat-project-picker .action-label .codicon-chevron-down {
+	margin-right: 0;
+	position: relative;
+	top: 1px;
 }
 
-.sessions-chat-dropdown-wrapper .monaco-custom-radio > .monaco-button:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-.sessions-chat-dropdown-wrapper .monaco-custom-radio > .monaco-button:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-.sessions-chat-dropdown-wrapper .monaco-custom-radio > .monaco-button:focus {
-	outline: none;
-}
-
-/* Folder label next to the picker */
-.sessions-chat-folder-label {
-	font-size: 13px;
-	color: var(--vscode-descriptionForeground);
-	white-space: nowrap;
-	margin-right: 6px;
-}
-
-/* Target dropdown button */
-.sessions-chat-dropdown-button {
-	display: flex;
-	align-items: center;
-	height: 16px;
-	padding: 3px 3px 3px 6px;
-	cursor: pointer;
-	font-size: 13px;
-	color: var(--vscode-descriptionForeground);
-	background-color: transparent;
-	border: none;
-	white-space: nowrap;
-	border-radius: 4px;
-}
-
-.sessions-chat-dropdown-button:hover {
-	background-color: var(--vscode-toolbar-hoverBackground);
-	color: var(--vscode-foreground);
-}
-
-.sessions-chat-dropdown-button:focus-visible {
-	outline: 1px solid var(--vscode-focusBorder);
-	outline-offset: -1px;
-}
-
-.sessions-chat-dropdown-button .codicon {
-	font-size: 14px;
-	flex-shrink: 0;
-}
-
-.sessions-chat-dropdown-button .codicon.codicon-chevron-down {
-	font-size: 12px;
-	margin-left: 2px;
+.sessions-chat-picker-slot.sessions-chat-workspace-picker .action-label .sessions-chat-dropdown-label {
+	font-size: 15px;
 }
 
 .sessions-chat-dropdown-label {
@@ -284,7 +226,7 @@
 	padding: 3px 3px 3px 6px;
 	background-color: transparent;
 	border: none;
-	color: var(--vscode-descriptionForeground);
+	color: var(--vscode-icon-foreground);
 	font-size: 13px;
 	cursor: pointer;
 	white-space: nowrap;
@@ -306,7 +248,13 @@
 
 .sessions-chat-picker-slot.disabled .action-label:hover {
 	background-color: transparent;
-	color: var(--vscode-descriptionForeground);
+	color: var(--vscode-icon-foreground);
+}
+
+.chat-input-picker-item .action-label.disabled {
+	opacity: 0.5;
+	cursor: default;
+	pointer-events: none;
 }
 
 .sessions-chat-picker-slot.loading .action-label {
@@ -343,7 +291,7 @@
 
 .sessions-chat-picker-slot .action-label .codicon-chevron-down {
 	font-size: 12px;
-	margin-left: 2px;
+	margin-left: 6px;
 }
 
 .sessions-chat-picker-slot .action-label .chat-session-option-label {
@@ -355,6 +303,34 @@
 	margin-left: 2px;
 }
 
+.sessions-chat-picker-slot .action-label.warning {
+	color: var(--vscode-problemsWarningIcon-foreground);
+	opacity: 0.75;
+}
+
+.sessions-chat-picker-slot .action-label.warning .codicon {
+	color: var(--vscode-problemsWarningIcon-foreground) !important;
+}
+
+.sessions-chat-picker-slot .action-label.warning:hover {
+	color: var(--vscode-problemsWarningIcon-foreground);
+	opacity: 1;
+}
+
+.sessions-chat-picker-slot .action-label.info {
+	color: var(--vscode-problemsInfoIcon-foreground);
+	opacity: 0.75;
+}
+
+.sessions-chat-picker-slot .action-label.info .codicon {
+	color: var(--vscode-problemsInfoIcon-foreground) !important;
+}
+
+.sessions-chat-picker-slot .action-label.info:hover {
+	color: var(--vscode-problemsInfoIcon-foreground);
+	opacity: 1;
+}
+
 /* Sync indicator: a slim non-interactive-looking separator before the button */
 .sessions-chat-sync-indicator {
 	margin-left: 4px;
diff --git a/src/vs/sessions/contrib/chat/browser/media/chatWidget.css b/src/vs/sessions/contrib/chat/browser/media/chatWidget.css
index b9e7bbe6a02..70276f22fcb 100644
--- a/src/vs/sessions/contrib/chat/browser/media/chatWidget.css
+++ b/src/vs/sessions/contrib/chat/browser/media/chatWidget.css
@@ -72,29 +72,52 @@
 }
 
 /* Model picker - uses workbench ModelPickerActionItem */
-.sessions-chat-model-picker {
+/* Session config toolbar (mode, model pickers via MenuWorkbenchToolBar) */
+.sessions-chat-config-toolbar {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+	overflow: hidden;
+}
+
+.sessions-chat-config-toolbar .monaco-toolbar {
+	height: auto;
+}
+
+.sessions-chat-config-toolbar .monaco-action-bar .action-item {
 	display: flex;
 	align-items: center;
 }
 
-.sessions-chat-model-picker .action-label {
+.sessions-chat-config-toolbar .action-label {
 	display: flex;
 	align-items: center;
-	gap: 4px;
 	height: 16px;
-	padding: 3px 6px;
+	padding: 3px 3px 3px 6px;
+	background-color: transparent;
+	border: none;
 	border-radius: 4px;
-	font-size: 12px;
+	font-size: 13px;
 	cursor: pointer;
 	color: var(--vscode-icon-foreground);
+	white-space: nowrap;
+	min-width: 0;
+	overflow: hidden;
 }
 
-.sessions-chat-model-picker .action-label:hover {
+.sessions-chat-config-toolbar .action-label:hover {
 	background-color: var(--vscode-toolbar-hoverBackground);
+	color: var(--vscode-foreground);
 }
 
-.sessions-chat-model-picker .action-label .codicon {
+.sessions-chat-config-toolbar .action-label .codicon {
+	font-size: 14px;
+	flex-shrink: 0;
+}
+
+.sessions-chat-config-toolbar .action-label .codicon-chevron-down {
 	font-size: 12px;
+	margin-left: 6px;
 }
 
 /* Send button - wraps a Button widget */
diff --git a/src/vs/sessions/contrib/chat/browser/media/runScriptAction.css b/src/vs/sessions/contrib/chat/browser/media/runScriptAction.css
new file mode 100644
index 00000000000..0837bc7b8c0
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/media/runScriptAction.css
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.run-script-action-widget {
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+	background-color: var(--vscode-quickInput-background);
+	padding: 8px 8px 12px;
+}
+
+.run-script-action-section {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+}
+
+.run-script-action-label {
+	font-size: 12px;
+	font-weight: 600;
+}
+
+.run-script-action-input .monaco-inputbox {
+	width: 100%;
+}
+
+.run-script-action-option-row {
+	display: flex;
+	align-items: center;
+	min-height: 22px;
+	gap: 8px;
+}
+
+.run-script-action-option-text {
+	cursor: pointer;
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+.run-script-action-section .monaco-custom-radio {
+	width: fit-content;
+	max-width: 100%;
+}
+
+.run-script-action-hint {
+	font-size: 12px;
+	opacity: 0.8;
+}
+
+.run-script-action-buttons {
+	display: flex;
+	justify-content: flex-end;
+	gap: 8px;
+	padding-top: 4px;
+}
diff --git a/src/vs/sessions/contrib/chat/browser/modePicker.ts b/src/vs/sessions/contrib/chat/browser/modePicker.ts
index d7cc8df61b3..a4a092d8349 100644
--- a/src/vs/sessions/contrib/chat/browser/modePicker.ts
+++ b/src/vs/sessions/contrib/chat/browser/modePicker.ts
@@ -2,242 +2,3 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-import * as dom from '../../../../base/browser/dom.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { localize } from '../../../../nls.js';
-import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { ChatMode, IChatMode, IChatModeService } from '../../../../workbench/contrib/chat/common/chatModes.js';
-import { IGitRepository } from '../../../../workbench/contrib/git/common/gitService.js';
-import { IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { Target } from '../../../../workbench/contrib/chat/common/promptSyntax/promptTypes.js';
-import { AICustomizationManagementCommands } from '../../../../workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.js';
-
-interface IModePickerItem {
-	readonly kind: 'mode';
-	readonly mode: IChatMode;
-}
-
-interface IConfigurePickerItem {
-	readonly kind: 'configure';
-}
-
-type ModePickerItem = IModePickerItem | IConfigurePickerItem;
-
-/**
- * A self-contained widget for selecting a chat mode (Agent, custom agents)
- * for local/Background sessions. Shows only modes whose target matches
- * the Background session type's customAgentTarget.
- */
-export class ModePicker extends Disposable {
-
-	private readonly _onDidChange = this._register(new Emitter<IChatMode>());
-	readonly onDidChange: Event<IChatMode> = this._onDidChange.event;
-
-	private _triggerElement: HTMLElement | undefined;
-	private _slotElement: HTMLElement | undefined;
-	private readonly _renderDisposables = this._register(new DisposableStore());
-
-	private _selectedMode: IChatMode = ChatMode.Agent;
-
-	get selectedMode(): IChatMode {
-		return this._selectedMode;
-	}
-
-	constructor(
-		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
-		@IChatModeService private readonly chatModeService: IChatModeService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@ICommandService private readonly commandService: ICommandService,
-	) {
-		super();
-
-		this._register(this.chatModeService.onDidChangeChatModes(() => {
-			// Refresh the trigger label when available chat modes change
-			if (this._triggerElement) {
-				this._updateTriggerLabel();
-			}
-		}));
-	}
-
-	/**
-	 * Sets the git repository. When the repository changes, resets the selected mode
-	 * back to the default Agent mode.
-	 */
-	setRepository(repository: IGitRepository | undefined): void {
-		this._selectedMode = ChatMode.Agent;
-		this._updateTriggerLabel();
-	}
-
-	/**
-	 * Renders the mode picker trigger button into the given container.
-	 */
-	render(container: HTMLElement): HTMLElement {
-		this._renderDisposables.clear();
-
-		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
-		this._slotElement = slot;
-		this._renderDisposables.add({ dispose: () => slot.remove() });
-
-		const trigger = dom.append(slot, dom.$('a.action-label'));
-		trigger.tabIndex = 0;
-		trigger.role = 'button';
-		trigger.setAttribute('aria-label', localize('sessions.modePicker.ariaLabel', "Select chat mode"));
-		this._triggerElement = trigger;
-
-		this._updateTriggerLabel();
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
-			dom.EventHelper.stop(e, true);
-			this._showPicker();
-		}));
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
-			if (e.key === 'Enter' || e.key === ' ') {
-				dom.EventHelper.stop(e, true);
-				this._showPicker();
-			}
-		}));
-
-		return slot;
-	}
-
-	/**
-	 * Shows or hides the picker.
-	 */
-	setVisible(visible: boolean): void {
-		if (this._slotElement) {
-			this._slotElement.style.display = visible ? '' : 'none';
-		}
-	}
-
-	private _getAvailableModes(): IChatMode[] {
-		const customAgentTarget = this.chatSessionsService.getCustomAgentTargetForSessionType(AgentSessionProviders.Background);
-		const effectiveTarget = customAgentTarget && customAgentTarget !== Target.Undefined ? customAgentTarget : Target.GitHubCopilot;
-		const modes = this.chatModeService.getModes();
-
-		// Always include the default Agent mode
-		const result: IChatMode[] = [ChatMode.Agent];
-
-		// Add custom modes matching the target and visible to users
-		for (const mode of modes.custom) {
-			const target = mode.target.get();
-			if (target === effectiveTarget || target === Target.Undefined) {
-				const visibility = mode.visibility?.get();
-				if (visibility && !visibility.userInvocable) {
-					continue;
-				}
-				result.push(mode);
-			}
-		}
-
-		return result;
-	}
-
-	private _showPicker(): void {
-		if (!this._triggerElement || this.actionWidgetService.isVisible) {
-			return;
-		}
-
-		const modes = this._getAvailableModes();
-
-		const items = this._buildItems(modes);
-
-		const triggerElement = this._triggerElement;
-		const delegate: IActionListDelegate<ModePickerItem> = {
-			onSelect: (item) => {
-				this.actionWidgetService.hide();
-				if (item.kind === 'mode') {
-					this._selectMode(item.mode);
-				} else {
-					this.commandService.executeCommand(AICustomizationManagementCommands.OpenEditor);
-				}
-			},
-			onHide: () => { triggerElement.focus(); },
-		};
-
-		this.actionWidgetService.show<ModePickerItem>(
-			'localModePicker',
-			false,
-			items,
-			delegate,
-			this._triggerElement,
-			undefined,
-			[],
-			{
-				getAriaLabel: (item) => item.label ?? '',
-				getWidgetAriaLabel: () => localize('modePicker.ariaLabel', "Mode Picker"),
-			},
-		);
-	}
-
-	private _buildItems(modes: IChatMode[]): IActionListItem<ModePickerItem>[] {
-		const items: IActionListItem<ModePickerItem>[] = [];
-
-		// Default Agent mode
-		const agentMode = modes[0];
-		items.push({
-			kind: ActionListItemKind.Action,
-			label: agentMode.label.get(),
-			group: { title: '', icon: this._selectedMode.id === agentMode.id ? Codicon.check : Codicon.blank },
-			item: { kind: 'mode', mode: agentMode },
-		});
-
-		// Custom modes (with separator if any exist)
-		const customModes = modes.slice(1);
-		if (customModes.length > 0) {
-			items.push({ kind: ActionListItemKind.Separator, label: '' });
-			for (const mode of customModes) {
-				items.push({
-					kind: ActionListItemKind.Action,
-					label: mode.label.get(),
-					group: { title: '', icon: this._selectedMode.id === mode.id ? Codicon.check : Codicon.blank },
-					item: { kind: 'mode', mode },
-				});
-			}
-		}
-
-		// Configure Custom Agents action
-		items.push({ kind: ActionListItemKind.Separator, label: '' });
-		items.push({
-			kind: ActionListItemKind.Action,
-			label: localize('configureCustomAgents', "Configure Custom Agents..."),
-			group: { title: '', icon: Codicon.blank },
-			item: { kind: 'configure' },
-		});
-
-		return items;
-	}
-
-	private _selectMode(mode: IChatMode): void {
-		this._selectedMode = mode;
-		this._updateTriggerLabel();
-		this._onDidChange.fire(mode);
-	}
-
-	private _updateTriggerLabel(): void {
-		if (!this._triggerElement) {
-			return;
-		}
-
-		dom.clearNode(this._triggerElement);
-
-		const icon = this._selectedMode.icon.get();
-		if (icon) {
-			dom.append(this._triggerElement, renderIcon(icon));
-		}
-
-		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
-		labelSpan.textContent = this._selectedMode.label.get();
-		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
-
-		const modes = this._getAvailableModes();
-		this._slotElement?.classList.toggle('disabled', modes.length <= 1);
-	}
-}
diff --git a/src/vs/sessions/contrib/chat/browser/modelPicker.ts b/src/vs/sessions/contrib/chat/browser/modelPicker.ts
index 1cdae827ae9..a4a092d8349 100644
--- a/src/vs/sessions/contrib/chat/browser/modelPicker.ts
+++ b/src/vs/sessions/contrib/chat/browser/modelPicker.ts
@@ -2,203 +2,3 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-import * as dom from '../../../../base/browser/dom.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { localize } from '../../../../nls.js';
-import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { IChatSessionProviderOptionItem } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { RemoteNewSession } from './newSession.js';
-
-const FILTER_THRESHOLD = 10;
-
-interface IModelItem {
-	readonly id: string;
-	readonly name: string;
-	readonly description?: string;
-}
-
-/**
- * A self-contained widget for selecting a model in cloud sessions.
- * Reads the model option group from the {@link RemoteNewSession} and
- * renders an action list dropdown with the available models.
- */
-export class CloudModelPicker extends Disposable {
-
-	private readonly _onDidChange = this._register(new Emitter<IChatSessionProviderOptionItem>());
-	readonly onDidChange: Event<IChatSessionProviderOptionItem> = this._onDidChange.event;
-
-	private _triggerElement: HTMLElement | undefined;
-	private _slotElement: HTMLElement | undefined;
-	private readonly _renderDisposables = this._register(new DisposableStore());
-	private readonly _sessionDisposables = this._register(new DisposableStore());
-
-	private _session: RemoteNewSession | undefined;
-	private _selectedModel: IModelItem | undefined;
-	private _models: IModelItem[] = [];
-
-	get selectedModel(): IModelItem | undefined {
-		return this._selectedModel;
-	}
-
-	constructor(
-		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
-	) {
-		super();
-	}
-
-	/**
-	 * Sets the remote session and loads the available models from it.
-	 */
-	setSession(session: RemoteNewSession): void {
-		this._session = session;
-		this._sessionDisposables.clear();
-		this._loadModels(session);
-
-		// Sync selected model to the new session
-		if (this._selectedModel) {
-			session.setModelId(this._selectedModel.id);
-			session.setOptionValue('models', { id: this._selectedModel.id, name: this._selectedModel.name });
-		}
-
-		// Re-load models when option groups change
-		this._sessionDisposables.add(session.onDidChangeOptionGroups(() => {
-			this._loadModels(session);
-		}));
-	}
-
-	/**
-	 * Renders the model picker trigger button into the given container.
-	 */
-	render(container: HTMLElement): HTMLElement {
-		this._renderDisposables.clear();
-
-		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
-		this._slotElement = slot;
-		this._renderDisposables.add({ dispose: () => slot.remove() });
-
-		const trigger = dom.append(slot, dom.$('a.action-label'));
-		trigger.tabIndex = 0;
-		trigger.role = 'button';
-		this._triggerElement = trigger;
-
-		this._updateTriggerLabel();
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
-			dom.EventHelper.stop(e, true);
-			this._showPicker();
-		}));
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
-			if (e.key === 'Enter' || e.key === ' ') {
-				dom.EventHelper.stop(e, true);
-				this._showPicker();
-			}
-		}));
-
-		return slot;
-	}
-
-	/**
-	 * Shows or hides the picker.
-	 */
-	setVisible(visible: boolean): void {
-		if (this._slotElement) {
-			this._slotElement.style.display = visible ? '' : 'none';
-		}
-	}
-
-	private _loadModels(session: RemoteNewSession): void {
-		const modelOption = session.getModelOptionGroup();
-		if (modelOption?.group.items.length) {
-			this._models = modelOption.group.items.map(item => ({
-				id: item.id,
-				name: item.name,
-				description: item.description,
-			}));
-
-			// Select the session's current value, or the default, or the first
-			if (!this._selectedModel || !this._models.some(m => m.id === this._selectedModel!.id)) {
-				const value = modelOption.value;
-				this._selectedModel = value
-					? { id: value.id, name: value.name, description: value.description }
-					: this._models[0];
-			}
-		} else {
-			this._models = [];
-		}
-		this._updateTriggerLabel();
-	}
-
-	private _showPicker(): void {
-		if (!this._triggerElement || this.actionWidgetService.isVisible || this._models.length === 0) {
-			return;
-		}
-
-		const items = this._buildItems();
-		const showFilter = items.filter(i => i.kind === ActionListItemKind.Action).length > FILTER_THRESHOLD;
-
-		const triggerElement = this._triggerElement;
-		const delegate: IActionListDelegate<IModelItem> = {
-			onSelect: (item) => {
-				this.actionWidgetService.hide();
-				this._selectModel(item);
-			},
-			onHide: () => { triggerElement.focus(); },
-		};
-
-		this.actionWidgetService.show<IModelItem>(
-			'remoteModelPicker',
-			false,
-			items,
-			delegate,
-			this._triggerElement,
-			undefined,
-			[],
-			{
-				getAriaLabel: (item) => item.label ?? '',
-				getWidgetAriaLabel: () => localize('modelPicker.ariaLabel', "Model Picker"),
-			},
-			showFilter ? { showFilter: true, filterPlaceholder: localize('modelPicker.filter', "Filter models...") } : undefined,
-		);
-	}
-
-	private _buildItems(): IActionListItem<IModelItem>[] {
-		return this._models.map(model => ({
-			kind: ActionListItemKind.Action,
-			label: model.name,
-			group: { title: '', icon: this._selectedModel?.id === model.id ? Codicon.check : Codicon.blank },
-			item: model,
-		}));
-	}
-
-	private _selectModel(item: IModelItem): void {
-		this._selectedModel = item;
-		this._updateTriggerLabel();
-
-		if (this._session) {
-			this._session.setModelId(item.id);
-			this._session.setOptionValue('models', { id: item.id, name: item.name });
-		}
-		this._onDidChange.fire({ id: item.id, name: item.name, description: item.description });
-	}
-
-	private _updateTriggerLabel(): void {
-		if (!this._triggerElement) {
-			return;
-		}
-
-		dom.clearNode(this._triggerElement);
-		const label = this._selectedModel?.name ?? localize('modelPicker.auto', "Auto");
-
-		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
-		labelSpan.textContent = label;
-		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
-
-		this._slotElement?.classList.toggle('disabled', this._models.length === 0);
-	}
-}
diff --git a/src/vs/sessions/contrib/chat/browser/newChatContextAttachments.ts b/src/vs/sessions/contrib/chat/browser/newChatContextAttachments.ts
index 9acac072639..0c264d25f9a 100644
--- a/src/vs/sessions/contrib/chat/browser/newChatContextAttachments.ts
+++ b/src/vs/sessions/contrib/chat/browser/newChatContextAttachments.ts
@@ -15,6 +15,9 @@ import { localize } from '../../../../nls.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { registerOpenEditorListeners } from '../../../../platform/editor/browser/editor.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { ChatConfiguration } from '../../../../workbench/contrib/chat/common/constants.js';
+import { IChatImageCarouselService } from '../../../../workbench/contrib/chat/browser/chatImageCarouselService.js';
+import { coerceImageBuffer } from '../../../../workbench/contrib/chat/common/chatImageExtraction.js';
 
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
@@ -83,6 +86,7 @@ export class NewChatContextAttachments extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IModelService private readonly modelService: IModelService,
 		@ILanguageService private readonly languageService: ILanguageService,
+		@IChatImageCarouselService private readonly chatImageCarouselService: IChatImageCarouselService,
 	) {
 		super();
 		this._resourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER));
@@ -133,8 +137,19 @@ export class NewChatContextAttachments extends Disposable {
 				}
 			}
 
-			// Click to open the resource
-			if (resource) {
+			// Click to open the resource or image
+			const imageData = entry.kind === 'image' ? coerceImageBuffer(entry.value) : undefined;
+			if (imageData) {
+				pill.style.cursor = 'pointer';
+				this._renderDisposables.add(registerOpenEditorListeners(pill, async () => {
+					if (this.configurationService.getValue<boolean>(ChatConfiguration.ImageCarouselEnabled)) {
+						const imageResource = resource ?? URI.from({ scheme: 'data', path: entry.name });
+						await this.chatImageCarouselService.openCarouselAtResource(imageResource, imageData);
+					} else if (resource) {
+						await this.openerService.open(resource, { fromUserGesture: true });
+					}
+				}));
+			} else if (resource) {
 				pill.style.cursor = 'pointer';
 				this._renderDisposables.add(registerOpenEditorListeners(pill, async () => {
 					await this.openerService.open(resource, { fromUserGesture: true });
diff --git a/src/vs/sessions/contrib/chat/browser/newChatPermissionPicker.ts b/src/vs/sessions/contrib/chat/browser/newChatPermissionPicker.ts
index b5c8ee1730a..6df548a8cc9 100644
--- a/src/vs/sessions/contrib/chat/browser/newChatPermissionPicker.ts
+++ b/src/vs/sessions/contrib/chat/browser/newChatPermissionPicker.ts
@@ -9,20 +9,24 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem, IActionListOptions } from '../../../../platform/actionWidget/browser/actionList.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { CopilotCLISession } from '../../copilotChatSessions/browser/copilotChatSessionsProvider.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ChatConfiguration, ChatPermissionLevel } from '../../../../workbench/contrib/chat/common/constants.js';
 import Severity from '../../../../base/common/severity.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
 
 // Track whether warnings have been shown this VS Code session
 const shownWarnings = new Set<ChatPermissionLevel>();
 
 interface IPermissionItem {
-	readonly level: ChatPermissionLevel;
+	readonly level?: ChatPermissionLevel;
 	readonly label: string;
 	readonly icon: ThemeIcon;
 	readonly checked: boolean;
@@ -30,7 +34,7 @@ interface IPermissionItem {
 
 /**
  * A permission picker for the new-session welcome view.
- * Shows Default Approvals and Bypass Approvals options (no Autopilot for CLI sessions).
+ * Shows Default Approvals, Bypass Approvals, and Autopilot options.
  */
 export class NewChatPermissionPicker extends Disposable {
 
@@ -39,26 +43,40 @@ export class NewChatPermissionPicker extends Disposable {
 
 	private _currentLevel: ChatPermissionLevel = ChatPermissionLevel.Default;
 	private _triggerElement: HTMLElement | undefined;
-	private _container: HTMLElement | undefined;
 	private readonly _renderDisposables = this._register(new DisposableStore());
 
 	get permissionLevel(): ChatPermissionLevel {
 		return this._currentLevel;
 	}
 
+	set permissionLevel(level: ChatPermissionLevel) {
+		this._currentLevel = level;
+		this._updateTriggerLabel(this._triggerElement);
+	}
+
 	constructor(
 		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IDialogService private readonly dialogService: IDialogService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
 	) {
 		super();
+
+		// Write permission level to the active session data when it changes
+		this._register(this.onDidChangeLevel(level => {
+			const session = this.sessionsManagementService.activeSession.get();
+			if (!(session instanceof CopilotCLISession)) {
+				throw new Error('NewChatPermissionPicker requires a CopilotCLISession');
+			}
+			session.setPermissionLevel(level);
+		}));
 	}
 
 	render(container: HTMLElement): HTMLElement {
 		this._renderDisposables.clear();
 
 		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
-		this._container = slot;
 		this._renderDisposables.add({ dispose: () => slot.remove() });
 
 		const trigger = dom.append(slot, dom.$('a.action-label'));
@@ -83,18 +101,13 @@ export class NewChatPermissionPicker extends Disposable {
 		return slot;
 	}
 
-	setVisible(visible: boolean): void {
-		if (this._container) {
-			this._container.style.display = visible ? '' : 'none';
-		}
-	}
-
 	showPicker(): void {
 		if (!this._triggerElement || this.actionWidgetService.isVisible) {
 			return;
 		}
 
 		const policyRestricted = this.configurationService.inspect<boolean>(ChatConfiguration.GlobalAutoApprove).policyValue === false;
+		const isAutopilotEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.AutopilotEnabled) !== false;
 
 		const items: IActionListItem<IPermissionItem>[] = [
 			{
@@ -125,15 +138,54 @@ export class NewChatPermissionPicker extends Disposable {
 			},
 		];
 
+		if (isAutopilotEnabled) {
+			items.push({
+				kind: ActionListItemKind.Action,
+				group: { kind: ActionListItemKind.Header, title: '', icon: Codicon.rocket },
+				item: {
+					level: ChatPermissionLevel.Autopilot,
+					label: localize('permissions.autopilot', "Autopilot (Preview)"),
+					icon: Codicon.rocket,
+					checked: this._currentLevel === ChatPermissionLevel.Autopilot,
+				},
+				label: localize('permissions.autopilot', "Autopilot (Preview)"),
+				description: localize('permissions.autopilot.subtext', "Autonomously iterates from start to finish"),
+				disabled: policyRestricted,
+			});
+		}
+
+		items.push({
+			kind: ActionListItemKind.Separator,
+			label: '',
+			disabled: false,
+		});
+		items.push({
+			kind: ActionListItemKind.Action,
+			group: { kind: ActionListItemKind.Header, title: '', icon: Codicon.blank },
+			item: {
+				label: localize('permissions.learnMore', "Learn More about Permissions"),
+				icon: Codicon.blank,
+				checked: false,
+			},
+			label: localize('permissions.learnMore', "Learn More about Permissions"),
+			hideIcon: false,
+			disabled: false,
+		});
+
 		const triggerElement = this._triggerElement;
 		const delegate: IActionListDelegate<IPermissionItem> = {
 			onSelect: async (item) => {
 				this.actionWidgetService.hide();
-				await this._selectLevel(item.level);
+				if (item.level) {
+					await this._selectLevel(item.level);
+				} else {
+					await this.openerService.open(URI.parse('https://code.visualstudio.com/docs/copilot/agents/agent-tools#_permission-levels'));
+				}
 			},
 			onHide: () => { triggerElement.focus(); },
 		};
 
+		const listOptions: IActionListOptions = { descriptionBelow: true, minWidth: 255 };
 		this.actionWidgetService.show<IPermissionItem>(
 			'permissionPicker',
 			false,
@@ -146,6 +198,7 @@ export class NewChatPermissionPicker extends Disposable {
 				getAriaLabel: (item) => item.label ?? '',
 				getWidgetAriaLabel: () => localize('permissionPicker.ariaLabel', "Permission Picker"),
 			},
+			listOptions,
 		);
 	}
 
@@ -177,6 +230,33 @@ export class NewChatPermissionPicker extends Disposable {
 			shownWarnings.add(ChatPermissionLevel.AutoApprove);
 		}
 
+		if (level === ChatPermissionLevel.Autopilot && !shownWarnings.has(ChatPermissionLevel.Autopilot)) {
+			const result = await this.dialogService.prompt({
+				type: Severity.Warning,
+				message: localize('permissions.autopilot.warning.title', "Enable Autopilot?"),
+				buttons: [
+					{
+						label: localize('permissions.autopilot.warning.confirm', "Enable"),
+						run: () => true
+					},
+					{
+						label: localize('permissions.autopilot.warning.cancel', "Cancel"),
+						run: () => false
+					},
+				],
+				custom: {
+					icon: Codicon.rocket,
+					markdownDetails: [{
+						markdown: new MarkdownString(localize('permissions.autopilot.warning.detail', "Autopilot will auto-approve all tool calls and continue working autonomously until the task is complete. The agent will make decisions on your behalf without asking for confirmation.\n\nYou can stop the agent at any time by clicking the stop button. This applies to the current session only.")),
+					}],
+				},
+			});
+			if (result.result !== true) {
+				return;
+			}
+			shownWarnings.add(ChatPermissionLevel.Autopilot);
+		}
+
 		this._currentLevel = level;
 		this._updateTriggerLabel(this._triggerElement);
 		this._onDidChangeLevel.fire(level);
@@ -188,14 +268,29 @@ export class NewChatPermissionPicker extends Disposable {
 		}
 
 		dom.clearNode(trigger);
-		const icon = this._currentLevel === ChatPermissionLevel.AutoApprove ? Codicon.warning : Codicon.shield;
-		const label = this._currentLevel === ChatPermissionLevel.AutoApprove
-			? localize('permissions.autoApprove.label', "Bypass Approvals")
-			: localize('permissions.default.label', "Default Approvals");
+		let icon: ThemeIcon;
+		let label: string;
+		switch (this._currentLevel) {
+			case ChatPermissionLevel.Autopilot:
+				icon = Codicon.rocket;
+				label = localize('permissions.autopilot.label', "Autopilot (Preview)");
+				break;
+			case ChatPermissionLevel.AutoApprove:
+				icon = Codicon.warning;
+				label = localize('permissions.autoApprove.label', "Bypass Approvals");
+				break;
+			default:
+				icon = Codicon.shield;
+				label = localize('permissions.default.label', "Default Approvals");
+				break;
+		}
 
 		dom.append(trigger, renderIcon(icon));
 		const labelSpan = dom.append(trigger, dom.$('span.sessions-chat-dropdown-label'));
 		labelSpan.textContent = label;
 		dom.append(trigger, renderIcon(Codicon.chevronDown));
+
+		trigger.classList.toggle('warning', this._currentLevel === ChatPermissionLevel.Autopilot);
+		trigger.classList.toggle('info', this._currentLevel === ChatPermissionLevel.AutoApprove);
 	}
 }
diff --git a/src/vs/sessions/contrib/chat/browser/newChatViewPane.ts b/src/vs/sessions/contrib/chat/browser/newChatViewPane.ts
index 40becfe1774..ac50eacefc0 100644
--- a/src/vs/sessions/contrib/chat/browser/newChatViewPane.ts
+++ b/src/vs/sessions/contrib/chat/browser/newChatViewPane.ts
@@ -7,13 +7,11 @@ import './media/chatWidget.css';
 import './media/chatWelcomePart.css';
 import * as dom from '../../../../base/browser/dom.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { toAction } from '../../../../base/common/actions.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, observableValue } from '../../../../base/common/observable.js';
+import { Disposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
@@ -22,7 +20,7 @@ import { IModelService } from '../../../../editor/common/services/model.js';
 import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
 import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -37,66 +35,38 @@ import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js'
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { localize } from '../../../../nls.js';
 import * as aria from '../../../../base/browser/ui/aria/aria.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
 import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
-import { ChatSessionPosition, getResourceForNewChatSession } from '../../../../workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.js';
-import { ChatSessionPickerActionItem, IChatSessionPickerDelegate } from '../../../../workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.js';
-import { SearchableOptionPickerActionItem } from '../../../../workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.js';
-import { IChatSessionProviderOptionItem } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../../../workbench/contrib/chat/common/languageModels.js';
-import { IModelPickerDelegate } from '../../../../workbench/contrib/chat/browser/widget/input/modelPickerActionItem.js';
-import { EnhancedModelPickerActionItem } from '../../../../workbench/contrib/chat/browser/widget/input/modelPickerActionItem2.js';
-import { IChatInputPickerOptions } from '../../../../workbench/contrib/chat/browser/widget/input/chatInputPickerActionItem.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
 import { IViewDescriptorService } from '../../../../workbench/common/views.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IViewPaneOptions, ViewPane } from '../../../../workbench/browser/parts/views/viewPane.js';
 import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
 import { getSimpleEditorOptions } from '../../../../workbench/contrib/codeEditor/browser/simpleEditorOptions.js';
 import { NewChatContextAttachments } from './newChatContextAttachments.js';
-import { GITHUB_REMOTE_FILE_SCHEME } from '../../fileTreeView/browser/githubFileSystemProvider.js';
-import { FolderPicker } from './folderPicker.js';
-import { IGitService } from '../../../../workbench/contrib/git/common/gitService.js';
-import { IsolationMode, IsolationModePicker, SessionTargetPicker } from './sessionTargetPicker.js';
-import { BranchPicker } from './branchPicker.js';
-import { SyncIndicator } from './syncIndicator.js';
-import { INewSession, ISessionOptionGroup, RemoteNewSession } from './newSession.js';
-import { RepoPicker } from './repoPicker.js';
-import { CloudModelPicker } from './modelPicker.js';
-import { ModePicker } from './modePicker.js';
-import { getErrorMessage } from '../../../../base/common/errors.js';
+import { SessionTypePicker } from './sessionTypePicker.js';
+import { WorkspacePicker, IWorkspaceSelection } from './sessionWorkspacePicker.js';
+import { Menus } from '../../../browser/menus.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { SlashCommandHandler } from './slashCommands.js';
 import { IChatModelInputState } from '../../../../workbench/contrib/chat/common/model/chatModel.js';
 import { IChatRequestVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
 import { ChatAgentLocation, ChatModeKind } from '../../../../workbench/contrib/chat/common/constants.js';
 import { ChatHistoryNavigator } from '../../../../workbench/contrib/chat/common/widget/chatWidgetHistoryService.js';
 import { IHistoryNavigationWidget } from '../../../../base/browser/history.js';
-import { NewChatPermissionPicker } from './newChatPermissionPicker.js';
 import { registerAndCreateHistoryNavigationContext, IHistoryNavigationContext } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 
+
 const STORAGE_KEY_DRAFT_STATE = 'sessions.draftState';
 const MIN_EDITOR_HEIGHT = 50;
 const MAX_EDITOR_HEIGHT = 200;
 
-interface IDraftState extends IChatModelInputState {
-	target?: AgentSessionProviders;
-	isolationMode?: IsolationMode;
-	branch?: string;
-	folderUri?: string;
-	repo?: string;
+interface IDraftState {
+	inputText: string;
+	attachments: readonly IChatRequestVariableEntry[];
 }
 
 // #region --- Chat Welcome Widget ---
 
-/**
- * Options for creating a `NewChatWidget`.
- */
-interface INewChatWidgetOptions {
-	readonly allowedTargets: AgentSessionProviders[];
-	readonly defaultTarget: AgentSessionProviders;
-	readonly sessionPosition?: ChatSessionPosition;
-}
-
 /**
  * A self-contained new-session chat widget with a welcome view (mascot, target
  * buttons, option pickers), an input editor, model picker, and send button.
@@ -106,11 +76,8 @@ interface INewChatWidgetOptions {
  */
 class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 
-	private readonly _targetPicker: SessionTargetPicker;
-	private readonly _isolationModePicker: IsolationModePicker;
-	private readonly _branchPicker: BranchPicker;
-	private readonly _syncIndicator: SyncIndicator;
-	private readonly _options: INewChatWidgetOptions;
+	private readonly _workspacePicker: WorkspacePicker;
+	private readonly _sessionTypePicker: SessionTypePicker;
 
 	// IHistoryNavigationWidget
 	private readonly _onDidFocus = this._register(new Emitter<void>());
@@ -122,41 +89,18 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 	// Input
 	private _editor!: CodeEditorWidget;
 	private _editorContainer!: HTMLElement;
-	private readonly _currentLanguageModel = observableValue<ILanguageModelChatMetadataAndIdentifier | undefined>('currentLanguageModel', undefined);
-	private readonly _modelPickerDisposable = this._register(new MutableDisposable());
-
-	// Pending session
-	private readonly _newSession = this._register(new MutableDisposable<INewSession>());
-	private readonly _newSessionListener = this._register(new MutableDisposable());
 
 	// Send button
 	private _sendButton: Button | undefined;
 	private _sending = false;
 
-	// Repository loading
-	private readonly _openRepositoryCts = this._register(new MutableDisposable<CancellationTokenSource>());
-	private _repositoryLoading = false;
-	private _branchLoading = false;
+	// Loading state
 	private _loadingSpinner: HTMLElement | undefined;
 	private readonly _loadingDelayDisposable = this._register(new MutableDisposable());
 
 	// Welcome part
 	private _pickersContainer: HTMLElement | undefined;
-	private _extensionPickersLeftContainer: HTMLElement | undefined;
-	private _toolbarPickersContainer: HTMLElement | undefined;
-	private _localModelPickerContainer: HTMLElement | undefined;
 	private _inputSlot: HTMLElement | undefined;
-	private readonly _folderPicker: FolderPicker;
-	private _folderPickerContainer: HTMLElement | undefined;
-	private readonly _permissionPicker: NewChatPermissionPicker;
-	private readonly _repoPicker: RepoPicker;
-	private _repoPickerContainer: HTMLElement | undefined;
-	private readonly _cloudModelPicker: CloudModelPicker;
-	private readonly _modePicker: ModePicker;
-	private readonly _toolbarPickerWidgets = new Map<string, ChatSessionPickerActionItem | SearchableOptionPickerActionItem>();
-	private readonly _toolbarPickerDisposables = this._register(new DisposableStore());
-	private readonly _optionEmitters = new Map<string, Emitter<IChatSessionProviderOptionItem>>();
-	private readonly _optionContextKeys = new Map<string, IContextKey<string>>();
 
 	// Attached context
 	private readonly _contextAttachments: NewChatContextAttachments;
@@ -168,10 +112,6 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 	private _draftState: IDraftState | undefined = {
 		inputText: '',
 		attachments: [],
-		mode: { id: ChatModeKind.Agent, kind: ChatModeKind.Agent },
-		selectedModel: undefined,
-		selections: [],
-		contrib: {}
 	};
 
 	// Input history
@@ -180,101 +120,40 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 	private _historyNavigationForwardsEnablement!: IHistoryNavigationContext['historyNavigationForwardsEnablement'];
 
 	constructor(
-		options: INewChatWidgetOptions,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IModelService private readonly modelService: IModelService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@ILogService private readonly logService: ILogService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
-		@IGitService private readonly gitService: IGitService,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
 	) {
 		super();
 		this._history = this._register(this.instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
 		this._contextAttachments = this._register(this.instantiationService.createInstance(NewChatContextAttachments));
-		this._folderPicker = this._register(this.instantiationService.createInstance(FolderPicker));
-		this._permissionPicker = this._register(this.instantiationService.createInstance(NewChatPermissionPicker));
-		this._repoPicker = this._register(this.instantiationService.createInstance(RepoPicker));
-		this._cloudModelPicker = this._register(this.instantiationService.createInstance(CloudModelPicker));
-		this._modePicker = this._register(this.instantiationService.createInstance(ModePicker));
-		this._targetPicker = this._register(new SessionTargetPicker(options.allowedTargets, this._resolveDefaultTarget(options)));
-		this._isolationModePicker = this._register(this.instantiationService.createInstance(IsolationModePicker));
-		this._branchPicker = this._register(this.instantiationService.createInstance(BranchPicker));
-		this._syncIndicator = this._register(this.instantiationService.createInstance(SyncIndicator));
-		this._options = options;
+		this._workspacePicker = this._register(this.instantiationService.createInstance(WorkspacePicker));
+		this._sessionTypePicker = this._register(this.instantiationService.createInstance(SessionTypePicker));
 
-		// When target changes, create new session
-		this._register(this._targetPicker.onDidChangeTarget((target) => {
-			this._createNewSession();
-			const isLocal = target === AgentSessionProviders.Background;
-			this._isolationModePicker.setVisible(isLocal);
-			this._permissionPicker.setVisible(isLocal);
-			this._branchPicker.setVisible(isLocal);
-			this._syncIndicator.setVisible(isLocal);
-			this._updateDraftState();
+		// When a workspace is selected, create a new session
+		this._register(this._workspacePicker.onDidSelectWorkspace(async (workspace) => {
+			await this._onWorkspaceSelected(workspace);
 			this._focusEditor();
 		}));
 
-		this._register(this._branchPicker.onDidChangeLoading(loading => {
-			this._branchLoading = loading;
-			this._updateInputLoadingState();
+		// Update send button and loading state when active session changes or loads
+		this._register(autorun(reader => {
+			const session = this.sessionsManagementService.activeSession.read(reader);
+			const isLoading = session?.loading.read(reader) ?? false;
+			this._loadingSpinner?.classList.toggle('visible', isLoading);
+			this._updateSendButtonState();
 		}));
-
-		this._register(this._branchPicker.onDidChange((branch) => {
-			this._newSession.value?.setBranch(branch);
-			this._syncIndicator.setBranch(branch);
-			this._updateDraftState();
-			this._focusEditor();
-		}));
-
-		this._register(this._folderPicker.onDidSelectFolder(async (folderUri) => {
-			const trusted = await this._requestFolderTrust(folderUri);
-			if (trusted) {
-				this._newSession.value?.setRepoUri(folderUri);
-			}
-			this._updateDraftState();
-			this._focusEditor();
-		}));
-
-		this._register(this._isolationModePicker.onDidChange((mode) => {
-			this._newSession.value?.setIsolationMode(mode);
-			this._branchPicker.setVisible(mode === 'worktree');
-			this._syncIndicator.setVisible(mode === 'worktree');
-			this._updateDraftState();
-			this._focusEditor();
-		}));
-
-		// When mode changes, update the session
-		this._register(this._modePicker.onDidChange((mode) => {
-			this._newSession.value?.setMode(mode);
-			this._focusEditor();
-		}));
-
-		this._register(this._repoPicker.onDidSelectRepo((repoId) => {
-			if (this._targetPicker.selectedTarget !== AgentSessionProviders.Background) {
-				this._newSession.value?.setRepoUri(this._getRepoUri(repoId));
-			}
-			this._updateDraftState();
-		}));
-
-		// When language models change (e.g., extension activates), reinitialize if no model selected
-		this._register(this.languageModelsService.onDidChangeLanguageModels(() => {
-			this._initDefaultModel();
-		}));
-
-		// Update input state when attachments or model change
 		this._register(this._contextAttachments.onDidChangeContext(() => {
 			this._updateDraftState();
 			this._focusEditor();
 		}));
-		this._register(autorun(reader => {
-			this._currentLanguageModel.read(reader);
-			this._updateDraftState();
-		}));
 	}
 
 	// --- Rendering ---
@@ -313,34 +192,39 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 		this._createBottomToolbar(inputArea);
 		this._inputSlot.appendChild(inputArea);
 
-		// Isolation mode and branch pickers (below the input, shown when Local target is selected)
-		const isolationContainer = dom.append(welcomeElement, dom.$('.chat-full-welcome-local-mode'));
-		this._isolationModePicker.render(isolationContainer);
-		dom.append(isolationContainer, dom.$('.sessions-chat-local-mode-spacer'));
-		this._permissionPicker.render(isolationContainer);
-		const branchContainer = dom.append(isolationContainer, dom.$('.sessions-chat-local-mode-right'));
-		this._branchPicker.render(branchContainer);
-		this._syncIndicator.render(branchContainer);
+		// Below-input row: session type picker, permission control, spacer, repository config (right)
+		const belowInputRow = dom.append(welcomeElement, dom.$('.chat-full-welcome-local-mode'));
+		this._sessionTypePicker.render(belowInputRow);
+		const controlContainer = dom.append(belowInputRow, dom.$('.sessions-chat-control-toolbar'));
+		this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, controlContainer, Menus.NewSessionControl, {
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+		}));
+		dom.append(belowInputRow, dom.$('.sessions-chat-local-mode-spacer'));
+		const repoConfigContainer = dom.append(belowInputRow, dom.$('.sessions-chat-local-mode-right'));
+		this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, repoConfigContainer, Menus.NewSessionRepositoryConfig, {
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+		}));
 
-		// Set initial visibility based on default target and isolation mode
-		const isLocal = this._targetPicker.selectedTarget === AgentSessionProviders.Background;
-		const isWorktree = this._isolationModePicker.isolationMode === 'worktree';
-		this._isolationModePicker.setVisible(isLocal);
-		this._permissionPicker.setVisible(isLocal);
-		this._branchPicker.setVisible(isLocal && isWorktree);
-		this._syncIndicator.setVisible(isLocal && isWorktree);
-
-		// Render target buttons & extension pickers
+		// Render project picker & extension pickers
 		this._renderOptionGroupPickers();
 
-		// Initialize model picker
-		this._initDefaultModel();
-
 		// Restore draft input state from storage
 		this._restoreState();
 
-		// Create initial session
-		this._createNewSession();
+		// Create initial session — wait for providers if none registered yet
+		const restoredProject = this._workspacePicker.selectedProject;
+		if (restoredProject) {
+			if (this.sessionsProvidersService.getProviders().length > 0) {
+				this._createNewSession(restoredProject);
+			} else {
+				// Providers not yet registered (startup race) — wait for first registration
+				const sub = this.sessionsProvidersService.onDidChangeProviders(() => {
+					sub.dispose();
+					this._createNewSession(restoredProject);
+				});
+				this._register(sub);
+			}
+		}
 
 		// Reveal
 		welcomeElement.classList.add('revealed');
@@ -351,132 +235,17 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 		}, { once: true }));
 	}
 
-	private async _createNewSession(): Promise<void> {
-		const target = this._targetPicker.selectedTarget;
-		let defaultRepoUri = this._folderPicker.selectedFolderUri;
-
-		// For local targets, request workspace trust before creating the session
-		if (target === AgentSessionProviders.Background && defaultRepoUri) {
-			const trusted = await this._requestFolderTrust(defaultRepoUri);
-			if (!trusted) {
-				defaultRepoUri = undefined;
-			}
-		}
-
-		const resource = getResourceForNewChatSession({
-			type: target,
-			position: this._options.sessionPosition ?? ChatSessionPosition.Sidebar,
-			displayName: '',
-		});
-
-		try {
-			const session = await this.sessionsManagementService.createNewSessionForTarget(target, resource, defaultRepoUri);
-			this._setNewSession(session);
-		} catch (e) {
-			this.logService.error('Failed to create new session:', e);
-		}
-	}
-
-	private _setNewSession(session: INewSession): void {
-		this._newSession.value = session;
-
-		// Wire pickers to the new session and disconnect inactive ones
-		const target = this._targetPicker.selectedTarget;
-		if (target === AgentSessionProviders.Background) {
-			session.setIsolationMode(this._isolationModePicker.isolationMode);
-			if (this._branchPicker.selectedBranch) {
-				session.setBranch(this._branchPicker.selectedBranch);
-			}
-		} else {
-			const selectedRepo = this._repoPicker.selectedRepo;
-			if (selectedRepo) {
-				session.setRepoUri(this._getRepoUri(selectedRepo));
-			}
-		}
-
-		// Set the current model on the session (for local sessions)
-		const currentModel = this._currentLanguageModel.get();
-		if (currentModel) {
-			session.setModelId(currentModel.identifier);
-		}
-
-		// Set the current mode on the session (for local sessions)
-		session.setMode(this._modePicker.selectedMode);
-
-		// Open repository for the session's repoUri
-		if (session.repoUri) {
-			this._openRepository(session.repoUri);
-		}
-
-		// Listen for session changes
-		const listeners = new DisposableStore();
-		listeners.add(session.onDidChange((changeType) => {
-			if (changeType === 'repoUri' && session.repoUri) {
-				this._openRepository(session.repoUri);
-			}
-			if (changeType === 'isolationMode') {
-				this._branchPicker.setVisible(session.isolationMode === 'worktree');
-			}
-			if (changeType === 'disabled') {
-				this._updateSendButtonState();
-			}
-		}));
-
-		if (session instanceof RemoteNewSession) {
-			this._renderRemoteSessionPickers(session, true);
-			listeners.add(session.onDidChangeOptionGroups(() => {
-				this._renderRemoteSessionPickers(session);
-			}));
-		} else {
-			this._renderLocalSessionPickers();
-		}
-
-		this._newSessionListener.value = listeners;
-		this._updateSendButtonState();
-	}
-
-	private _openRepository(folderUri: URI): void {
-		this._openRepositoryCts.value?.cancel();
-		const cts = this._openRepositoryCts.value = new CancellationTokenSource();
-
-		this._repositoryLoading = true;
-		this._updateInputLoadingState();
-		this._branchPicker.setRepository(undefined);
-		this._isolationModePicker.setRepository(undefined);
-		this._syncIndicator.setRepository(undefined);
-		this._modePicker.setRepository(undefined);
-
-		this.gitService.openRepository(folderUri).then(repository => {
-			if (cts.token.isCancellationRequested) {
-				return;
-			}
-			this._repositoryLoading = false;
-			this._updateInputLoadingState();
-			this._isolationModePicker.setRepository(repository);
-			this._branchPicker.setRepository(repository);
-			this._syncIndicator.setRepository(repository);
-			this._modePicker.setRepository(repository);
-		}).catch(e => {
-			if (cts.token.isCancellationRequested) {
-				return;
-			}
-			this.logService.warn(`Failed to open repository at ${folderUri.toString()}`, getErrorMessage(e));
-			this._repositoryLoading = false;
-			this._updateInputLoadingState();
-			this._isolationModePicker.setRepository(undefined);
-			this._branchPicker.setRepository(undefined);
-			this._syncIndicator.setRepository(undefined);
-			this._modePicker.setRepository(undefined);
-		});
+	private _createNewSession(selection: IWorkspaceSelection): void {
+		this.sessionsManagementService.createNewSession(selection.providerId, selection.workspace);
 	}
 
 	private _updateInputLoadingState(): void {
-		const loading = this._repositoryLoading || this._branchLoading || this._sending;
+		const loading = this._sending;
 		if (loading) {
 			if (!this._loadingDelayDisposable.value) {
 				const timer = setTimeout(() => {
 					this._loadingDelayDisposable.clear();
-					if (this._repositoryLoading || this._branchLoading || this._sending) {
+					if (this._sending) {
 						this._loadingSpinner?.classList.add('visible');
 					}
 				}, 500);
@@ -514,6 +283,7 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			fontFamily: 'system-ui, -apple-system, sans-serif',
 			fontSize: 13,
 			lineHeight: 20,
+			cursorWidth: 1,
 			padding: { top: 8, bottom: 2 },
 			wrappingStrategy: 'advanced',
 			stickyScroll: { enabled: false },
@@ -624,31 +394,10 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 	}
 
 	/**
-	 * Returns the folder URI for the context picker based on the current target.
-	 * Local targets use the workspace folder; cloud targets construct a github-remote-file:// URI.
+	 * Returns the workspace URI for the context picker based on the current workspace selection.
 	 */
 	private _getContextFolderUri(): URI | undefined {
-		const target = this._targetPicker.selectedTarget;
-
-		if (target === AgentSessionProviders.Background) {
-			return this._folderPicker.selectedFolderUri;
-		}
-
-		// For cloud targets, use the repo picker's selection
-		const selectedRepo = this._repoPicker.selectedRepo;
-		if (selectedRepo && selectedRepo.includes('/')) {
-			return this._getRepoUri(selectedRepo);
-		}
-
-		return undefined;
-	}
-
-	private _getRepoUri(repoId: string): URI {
-		return URI.from({
-			scheme: GITHUB_REMOTE_FILE_SCHEME,
-			authority: 'github',
-			path: `/${repoId}/HEAD`,
-		});
+		return this._workspacePicker.selectedProject?.workspace.repositories[0]?.uri;
 	}
 
 	private _createBottomToolbar(container: HTMLElement): void {
@@ -656,19 +405,12 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 
 		this._createAttachButton(toolbar);
 
-		// Local model picker (EnhancedModelPickerActionItem)
-		this._localModelPickerContainer = dom.append(toolbar, dom.$('.sessions-chat-model-picker'));
-		this._createLocalModelPicker(this._localModelPickerContainer);
-
-		// Local mode picker
-		this._modePicker.render(toolbar);
-		this._modePicker.setVisible(false);
-
-		// Remote model picker (action list dropdown)
-		this._cloudModelPicker.render(toolbar);
-		this._cloudModelPicker.setVisible(false);
-
-		this._toolbarPickersContainer = dom.append(toolbar, dom.$('.sessions-chat-toolbar-pickers'));
+		// Session config pickers (mode, model) — rendered via MenuWorkbenchToolBar
+		// Visibility controlled by context keys (isActiveSessionBackgroundProvider, isNewChatSession)
+		const configContainer = dom.append(toolbar, dom.$('.sessions-chat-config-toolbar'));
+		this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, configContainer, Menus.NewSessionConfig, {
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+		}));
 
 		dom.append(toolbar, dom.$('.sessions-chat-toolbar-spacer'));
 
@@ -686,52 +428,6 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 		this._updateSendButtonState();
 	}
 
-	// --- Model picker ---
-
-	private _createLocalModelPicker(container: HTMLElement): void {
-		const delegate: IModelPickerDelegate = {
-			currentModel: this._currentLanguageModel,
-			setModel: (model: ILanguageModelChatMetadataAndIdentifier) => {
-				this._currentLanguageModel.set(model, undefined);
-				this._newSession.value?.setModelId(model.identifier);
-				this._focusEditor();
-			},
-			getModels: () => this._getAvailableModels(),
-			useGroupedModelPicker: () => true,
-			showManageModelsAction: () => false,
-		};
-
-		const pickerOptions: IChatInputPickerOptions = {
-			hideChevrons: observableValue('hideChevrons', false),
-			hoverPosition: { hoverPosition: HoverPosition.ABOVE },
-		};
-
-		const action = { id: 'sessions.modelPicker', label: '', enabled: true, class: undefined, tooltip: '', run: () => { } };
-
-		const modelPicker = this.instantiationService.createInstance(
-			EnhancedModelPickerActionItem, action, delegate, pickerOptions,
-		);
-		this._modelPickerDisposable.value = modelPicker;
-		modelPicker.render(container);
-	}
-
-	private _initDefaultModel(): void {
-		const models = this._getAvailableModels();
-		const draft = this._getDraftState();
-		const lastModelId = draft?.selectedModel?.identifier ?? this._history.values.at(-1)?.selectedModel?.identifier;
-		const defaultModel = (lastModelId ? models.find(m => m.identifier === lastModelId) : undefined) ?? models[0];
-		this._currentLanguageModel.set(defaultModel, undefined);
-	}
-
-	private _getAvailableModels(): ILanguageModelChatMetadataAndIdentifier[] {
-		return this.languageModelsService.getLanguageModelIds()
-			.map(id => {
-				const metadata = this.languageModelsService.lookupLanguageModel(id);
-				return metadata ? { metadata, identifier: id } : undefined;
-			})
-			.filter((m): m is ILanguageModelChatMetadataAndIdentifier => !!m && m.metadata.targetChatSessionType === AgentSessionProviders.Background);
-	}
-
 	// --- Welcome: Target & option pickers (dropdown row below input) ---
 
 	private _renderOptionGroupPickers(): void {
@@ -739,192 +435,12 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			return;
 		}
 
-		this._clearAllPickers();
 		dom.clearNode(this._pickersContainer);
 
 		const pickersRow = dom.append(this._pickersContainer, dom.$('.chat-full-welcome-pickers'));
 
-		// Left half: target switcher (right-justified within its half)
-		const leftHalf = dom.append(pickersRow, dom.$('.sessions-chat-pickers-left-half'));
-		const targetDropdownContainer = dom.append(leftHalf, dom.$('.sessions-chat-dropdown-wrapper'));
-		this._targetPicker.render(targetDropdownContainer);
-
-		// Right half: separator + pickers (left-justified within its half)
-		const rightHalf = dom.append(pickersRow, dom.$('.sessions-chat-pickers-right-half'));
-		this._extensionPickersLeftContainer = dom.append(rightHalf, dom.$('.sessions-chat-pickers-left-separator'));
-		this._extensionPickersLeftContainer.style.display = 'none';
-
-		// Repo picker for cloud (rendered once, shown/hidden based on target)
-		this._repoPickerContainer = dom.append(rightHalf, dom.$('.sessions-chat-extension-pickers-right'));
-		this._repoPickerContainer.style.display = 'none';
-		this._repoPicker.render(this._repoPickerContainer);
-
-		// Folder picker for local (rendered once, shown/hidden based on target)
-		this._folderPickerContainer = this._folderPicker.render(rightHalf);
-		this._folderPickerContainer.style.display = 'none';
-	}
-
-	// --- Local session pickers ---
-
-	private _renderLocalSessionPickers(): void {
-		this._clearAllPickers();
-		if (this._folderPickerContainer) {
-			this._folderPickerContainer.style.display = '';
-		}
-		if (this._extensionPickersLeftContainer) {
-			this._extensionPickersLeftContainer.style.display = 'block';
-		}
-		// Show local model and mode pickers, hide remote
-		if (this._localModelPickerContainer) {
-			this._localModelPickerContainer.style.display = '';
-		}
-		this._modePicker.setVisible(true);
-		this._cloudModelPicker.setVisible(false);
-	}
-
-	// --- Remote session pickers ---
-
-	private _renderRemoteSessionPickers(session: RemoteNewSession, force?: boolean): void {
-		if (!this._repoPickerContainer) {
-			return;
-		}
-
-		// Hide local-only pickers
-		if (this._folderPickerContainer) {
-			this._folderPickerContainer.style.display = 'none';
-		}
-
-		// Show remote model picker, hide local pickers
-		if (this._localModelPickerContainer) {
-			this._localModelPickerContainer.style.display = 'none';
-		}
-		this._modePicker.setVisible(false);
-		this._cloudModelPicker.setSession(session);
-		this._cloudModelPicker.setVisible(true);
-
-		// Show repo picker and separator
-		if (this._extensionPickersLeftContainer) {
-			this._extensionPickersLeftContainer.style.display = 'block';
-		}
-		this._repoPickerContainer.style.display = '';
-
-		// Render toolbar pickers (other groups)
-		this._renderToolbarPickers(session, force);
-	}
-
-	private _renderToolbarPickers(session: RemoteNewSession, force?: boolean): void {
-		if (!this._toolbarPickersContainer) {
-			return;
-		}
-
-		const toolbarOptions = session.getOtherOptionGroups();
-
-		// Filter by item availability (when-clause filtering is done by the session)
-		const visibleGroups = toolbarOptions.filter(option => {
-			const group = option.group;
-			return group.items.length > 0 || (group.commands || []).length > 0 || !!group.searchable;
-		});
-
-		if (visibleGroups.length === 0) {
-			this._clearToolbarPickers();
-			return;
-		}
-
-		if (!force) {
-			const allMatch = visibleGroups.length === this._toolbarPickerWidgets.size && visibleGroups.every(o => this._toolbarPickerWidgets.has(o.group.id));
-			if (allMatch) {
-				return;
-			}
-		}
-
-		this._clearToolbarPickers();
-
-		for (const option of visibleGroups) {
-			this._renderToolbarPickerWidget(option, session);
-		}
-	}
-
-	private _renderToolbarPickerWidget(option: ISessionOptionGroup, session: RemoteNewSession): void {
-		const { group: optionGroup, value: initialItem } = option;
-
-		if (initialItem) {
-			this._updateOptionContextKey(optionGroup.id, initialItem.id);
-		}
-
-		const initialState = { group: optionGroup, item: initialItem };
-		const emitter = this._getOrCreateOptionEmitter(optionGroup.id);
-		const itemDelegate: IChatSessionPickerDelegate = {
-			getCurrentOption: () => session.getOptionValue(optionGroup.id) ?? initialItem,
-			onDidChangeOption: emitter.event,
-			setOption: (item: IChatSessionProviderOptionItem) => {
-				this._updateOptionContextKey(optionGroup.id, item.id);
-				emitter.fire(item);
-				session.setOptionValue(optionGroup.id, item);
-				this._focusEditor();
-			},
-			getOptionGroup: () => {
-				const modelOpt = session.getModelOptionGroup();
-				if (modelOpt?.group.id === optionGroup.id) {
-					return modelOpt.group;
-				}
-				return session.getOtherOptionGroups().find(o => o.group.id === optionGroup.id)?.group;
-			},
-			getSessionResource: () => session.resource,
-		};
-
-		const action = toAction({ id: optionGroup.id, label: optionGroup.name, run: () => { } });
-		const widget = this.instantiationService.createInstance(
-			optionGroup.searchable ? SearchableOptionPickerActionItem : ChatSessionPickerActionItem,
-			action, initialState, itemDelegate, undefined
-		);
-
-		this._toolbarPickerDisposables.add(widget);
-		this._toolbarPickerWidgets.set(optionGroup.id, widget);
-
-		const slot = dom.append(this._toolbarPickersContainer!, dom.$('.sessions-chat-picker-slot'));
-		widget.render(slot);
-	}
-
-	private _updateOptionContextKey(optionGroupId: string, optionItemId: string): void {
-		let contextKey = this._optionContextKeys.get(optionGroupId);
-		if (!contextKey) {
-			const rawKey = new RawContextKey<string>(`chatSessionOption.${optionGroupId}`, '');
-			contextKey = rawKey.bindTo(this.contextKeyService);
-			this._optionContextKeys.set(optionGroupId, contextKey);
-		}
-		contextKey.set(optionItemId.trim());
-	}
-
-	private _getOrCreateOptionEmitter(optionGroupId: string): Emitter<IChatSessionProviderOptionItem> {
-		let emitter = this._optionEmitters.get(optionGroupId);
-		if (!emitter) {
-			emitter = new Emitter<IChatSessionProviderOptionItem>();
-			this._optionEmitters.set(optionGroupId, emitter);
-			this._toolbarPickerDisposables.add(emitter);
-		}
-		return emitter;
-	}
-
-	private _clearToolbarPickers(): void {
-		this._toolbarPickerDisposables.clear();
-		this._toolbarPickerWidgets.clear();
-		this._optionEmitters.clear();
-		if (this._toolbarPickersContainer) {
-			dom.clearNode(this._toolbarPickersContainer);
-		}
-	}
-
-	private _clearAllPickers(): void {
-		this._clearToolbarPickers();
-		if (this._folderPickerContainer) {
-			this._folderPickerContainer.style.display = 'none';
-		}
-		if (this._repoPickerContainer) {
-			this._repoPickerContainer.style.display = 'none';
-		}
-		if (this._extensionPickersLeftContainer) {
-			this._extensionPickersLeftContainer.style.display = 'none';
-		}
+		// Project picker (unified folder + repo picker)
+		this._workspacePicker.render(pickersRow);
 	}
 
 	// --- Input History (IHistoryNavigationWidget) ---
@@ -934,7 +450,7 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			return;
 		}
 		if (this._draftState?.inputText || this._draftState?.attachments.length) {
-			this._history.overlay(this._draftState);
+			this._history.overlay(this._toHistoryEntry(this._draftState));
 		}
 		this._navigateHistory(true);
 	}
@@ -944,25 +460,25 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			return;
 		}
 		if (this._draftState?.inputText || this._draftState?.attachments.length) {
-			this._history.overlay(this._draftState);
+			this._history.overlay(this._toHistoryEntry(this._draftState));
 		}
 		this._navigateHistory(false);
 	}
 
 	private _updateDraftState(): void {
-		const attachments = [...this._contextAttachments.attachments];
 		this._draftState = {
 			inputText: this._editor?.getModel()?.getValue() ?? '',
-			attachments,
+			attachments: [...this._contextAttachments.attachments],
+		};
+	}
+
+	private _toHistoryEntry(draft: IDraftState): IChatModelInputState {
+		return {
+			...draft,
 			mode: { id: ChatModeKind.Agent, kind: ChatModeKind.Agent },
-			selectedModel: this._currentLanguageModel.get(),
-			selections: this._editor?.getSelections() ?? [],
+			selectedModel: undefined,
+			selections: [],
 			contrib: {},
-			target: this._targetPicker.selectedTarget,
-			isolationMode: this._isolationModePicker.isolationMode,
-			branch: this._branchPicker.selectedBranch,
-			folderUri: this._folderPicker.selectedFolderUri?.toString(),
-			repo: this._repoPicker.selectedRepo,
 		};
 	}
 
@@ -992,21 +508,21 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			return;
 		}
 		const hasText = !!this._editor?.getModel()?.getValue().trim();
-		this._sendButton.enabled = !this._sending && hasText && !(this._newSession.value?.disabled ?? true);
+		const session = this.sessionsManagementService.activeSession.get();
+		const hasActiveSession = !!session;
+		const isLoading = session?.loading.get() ?? false;
+		this._sendButton.enabled = !this._sending && hasText && hasActiveSession && !isLoading;
 	}
 
 	private async _send(): Promise<void> {
 		let query = this._editor.getModel()?.getValue().trim();
-		const session = this._newSession.value;
-		if (!query || !session || this._sending) {
+		if (!query || this._sending) {
 			return;
 		}
 
-		// If the session is disabled due to missing folder/repo, open the picker
-		if (session.disabled) {
-			if (!this._hasRequiredRepoOrFolderSelection(session.target)) {
-				this._openRepoOrFolderPicker(session.target);
-			}
+		// If no workspace is selected, open the picker
+		if (!this._hasRequiredRepoOrFolderSelection()) {
+			this._openRepoOrFolderPicker();
 			return;
 		}
 
@@ -1022,13 +538,12 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			query = expanded;
 		}
 
-		session.setQuery(query);
-		session.setAttachedContext(
-			this._contextAttachments.attachments.length > 0 ? [...this._contextAttachments.attachments] : undefined
-		);
+		const attachedContext = this._contextAttachments.attachments.length > 0
+			? [...this._contextAttachments.attachments]
+			: undefined;
 
 		if (this._draftState) {
-			this._history.append(this._draftState);
+			this._history.append(this._toHistoryEntry(this._draftState));
 		}
 		this._clearDraftState();
 
@@ -1037,21 +552,18 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 		this._updateSendButtonState();
 		this._updateInputLoadingState();
 
-
 		try {
-			await this.sessionsManagementService.sendRequestForNewSession(
-				session.resource,
-				{
-					permissionLevel: this._permissionPicker.permissionLevel,
-				}
-			);
-			this._newSessionListener.clear();
+			const session = this.sessionsManagementService.activeSession.get();
+			if (!session) {
+				return;
+			}
+			await this.sessionsManagementService.sendRequest(session, { query, attachedContext });
 			this._contextAttachments.clear();
+			this._editor.getModel()?.setValue('');
 		} catch (e) {
 			this.logService.error('Failed to send request:', e);
 		}
 
-
 		this._sending = false;
 		this._editor.updateOptions({ readOnly: false });
 		this._updateSendButtonState();
@@ -1063,19 +575,12 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 	 * For Local/Background targets, checks the folder picker.
 	 * For other targets, checks extension-contributed repo/folder option groups.
 	 */
-	private _hasRequiredRepoOrFolderSelection(sessionType: AgentSessionProviders): boolean {
-		if (sessionType === AgentSessionProviders.Local || sessionType === AgentSessionProviders.Background) {
-			return !!this._folderPicker.selectedFolderUri;
-		}
-		return !!this._repoPicker.selectedRepo;
+	private _hasRequiredRepoOrFolderSelection(): boolean {
+		return !!this._workspacePicker.selectedProject;
 	}
 
-	private _openRepoOrFolderPicker(sessionType: AgentSessionProviders): void {
-		if (sessionType === AgentSessionProviders.Local || sessionType === AgentSessionProviders.Background) {
-			this._folderPicker.showPicker();
-		} else {
-			this._repoPicker.showPicker();
-		}
+	private _openRepoOrFolderPicker(): void {
+		this._workspacePicker.showPicker();
 	}
 
 	private async _requestFolderTrust(folderUri: URI): Promise<boolean> {
@@ -1084,26 +589,12 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			message: localize('trustFolderMessage', "An agent session will be able to read files, run commands, and make changes in this folder."),
 		});
 		if (!trusted) {
-			this._folderPicker.removeFromRecents(folderUri);
-			const previousFolderUri = this._newSession.value?.repoUri;
-			if (previousFolderUri) {
-				this._folderPicker.setSelectedFolder(previousFolderUri);
-			} else {
-				this._folderPicker.clearSelection();
-			}
+			this._workspacePicker.removeFromRecents(folderUri);
 		}
 		return !!trusted;
 	}
 
 
-	private _resolveDefaultTarget(options: INewChatWidgetOptions): AgentSessionProviders {
-		const draft = this._getDraftState();
-		if (draft?.target && options.allowedTargets.includes(draft.target)) {
-			return draft.target;
-		}
-		return options.defaultTarget;
-	}
-
 	private _restoreState(): void {
 		const draft = this._getDraftState();
 		if (draft) {
@@ -1111,26 +602,6 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 			if (draft.attachments?.length) {
 				this._contextAttachments.setAttachments(draft.attachments.map(IChatRequestVariableEntry.fromExport));
 			}
-			if (draft.selectedModel) {
-				const models = this._getAvailableModels();
-				const model = models.find(m => m.identifier === draft.selectedModel?.identifier);
-				if (model) {
-					this._currentLanguageModel.set(model, undefined);
-				}
-			}
-			if (draft.isolationMode) {
-				this._isolationModePicker.setPreferredIsolationMode(draft.isolationMode);
-				this._isolationModePicker.setIsolationMode(draft.isolationMode);
-			}
-			if (draft.branch) {
-				this._branchPicker.setPreferredBranch(draft.branch);
-			}
-			if (draft.folderUri) {
-				try { this._folderPicker.setSelectedFolder(URI.parse(draft.folderUri)); } catch { /* ignore */ }
-			}
-			if (draft.repo) {
-				this._repoPicker.setSelectedRepo(draft.repo);
-			}
 		}
 	}
 
@@ -1147,24 +618,8 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 	}
 
 	private _clearDraftState(): void {
-		// Preserve picker preferences so they survive widget recreation
-		const target = this._targetPicker.selectedTarget;
-		const isLocal = target === AgentSessionProviders.Background;
-		const preserved: IDraftState = {
-			inputText: '',
-			attachments: [],
-			mode: { id: ChatModeKind.Agent, kind: ChatModeKind.Agent },
-			selectedModel: this._draftState?.selectedModel,
-			selections: [],
-			contrib: {},
-			target,
-			isolationMode: isLocal ? this._isolationModePicker.isolationMode : undefined,
-			branch: isLocal ? this._branchPicker.selectedBranch : undefined,
-			folderUri: isLocal ? this._folderPicker.selectedFolderUri?.toString() : undefined,
-			repo: isLocal ? undefined : this._repoPicker.selectedRepo,
-		};
-		this._draftState = preserved;
-		this.storageService.store(STORAGE_KEY_DRAFT_STATE, JSON.stringify(preserved), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		this._draftState = { inputText: '', attachments: [] };
+		this.storageService.store(STORAGE_KEY_DRAFT_STATE, JSON.stringify(this._draftState), StorageScope.WORKSPACE, StorageTarget.MACHINE);
 	}
 
 	saveState(): void {
@@ -1185,8 +640,43 @@ class NewChatWidget extends Disposable implements IHistoryNavigationWidget {
 		this._editor?.focus();
 	}
 
-	updateAllowedTargets(targets: AgentSessionProviders[]): void {
-		this._targetPicker.updateAllowedTargets(targets);
+	/**
+	 * Handles a workspace selection from the workspace picker.
+	 * Requests folder trust if needed and creates a new session.
+	 */
+	private async _onWorkspaceSelected(selection: IWorkspaceSelection): Promise<void> {
+		if (selection.workspace.requiresWorkspaceTrust) {
+			const workspaceUri = selection.workspace.repositories[0]?.uri;
+			if (workspaceUri && !await this._requestFolderTrust(workspaceUri)) {
+				return;
+			}
+		}
+
+		this._createNewSession(selection);
+	}
+
+	prefillInput(text: string): void {
+		const editor = this._editor;
+		const model = editor?.getModel();
+		if (editor && model) {
+			model.setValue(text);
+			const lastLine = model.getLineCount();
+			const maxColumn = model.getLineMaxColumn(lastLine);
+			editor.setPosition({ lineNumber: lastLine, column: maxColumn });
+			editor.focus();
+		}
+	}
+
+	sendQuery(text: string): void {
+		const model = this._editor?.getModel();
+		if (model) {
+			model.setValue(text);
+			this._send();
+		}
+	}
+
+	selectWorkspace(workspace: IWorkspaceSelection): void {
+		this._workspacePicker.setSelectedWorkspace(workspace);
 	}
 }
 
@@ -1214,7 +704,6 @@ export class NewChatViewPane extends ViewPane {
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
 		@IHoverService hoverService: IHoverService,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 	}
@@ -1224,23 +713,10 @@ export class NewChatViewPane extends ViewPane {
 
 		this._widget = this._register(this.instantiationService.createInstance(
 			NewChatWidget,
-			{
-				allowedTargets: this.computeAllowedTargets(),
-				defaultTarget: AgentSessionProviders.Background,
-			} satisfies INewChatWidgetOptions,
 		));
 
 		this._widget.render(container);
 		this._widget.focusInput();
-
-		this._register(this.workspaceContextService.onDidChangeWorkspaceFolders(() => {
-			this._widget?.updateAllowedTargets(this.computeAllowedTargets());
-		}));
-	}
-
-	private computeAllowedTargets(): AgentSessionProviders[] {
-		const targets: AgentSessionProviders[] = [AgentSessionProviders.Background, AgentSessionProviders.Cloud];
-		return targets;
 	}
 
 	protected override layoutBody(height: number, width: number): void {
@@ -1253,6 +729,18 @@ export class NewChatViewPane extends ViewPane {
 		this._widget?.focusInput();
 	}
 
+	prefillInput(text: string): void {
+		this._widget?.prefillInput(text);
+	}
+
+	sendQuery(text: string): void {
+		this._widget?.sendQuery(text);
+	}
+
+	selectWorkspace(workspace: IWorkspaceSelection): void {
+		this._widget?.selectWorkspace(workspace);
+	}
+
 	override setVisible(visible: boolean): void {
 		super.setVisible(visible);
 		if (visible) {
diff --git a/src/vs/sessions/contrib/chat/browser/newSession.ts b/src/vs/sessions/contrib/chat/browser/newSession.ts
index 232f56251cc..336e904b367 100644
--- a/src/vs/sessions/contrib/chat/browser/newSession.ts
+++ b/src/vs/sessions/contrib/chat/browser/newSession.ts
@@ -3,17 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { IsolationMode } from './sessionTargetPicker.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-
-import { IChatRequestVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
-import { IChatMode } from '../../../../workbench/contrib/chat/common/chatModes.js';
+import { IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
 
 export type NewSessionChangeType = 'repoUri' | 'isolationMode' | 'branch' | 'options' | 'disabled' | 'agent';
 
@@ -24,346 +14,3 @@ export interface ISessionOptionGroup {
 	readonly group: IChatSessionProviderOptionGroup;
 	readonly value: IChatSessionProviderOptionItem | undefined;
 }
-
-/**
- * A new session represents a session being configured before the first
- * request is sent. It holds the user's selections (repoUri, isolationMode)
- * and fires a single event when any property changes.
- */
-export interface INewSession extends IDisposable {
-	readonly resource: URI;
-	readonly target: AgentSessionProviders;
-	readonly repoUri: URI | undefined;
-	readonly isolationMode: IsolationMode;
-	readonly branch: string | undefined;
-	readonly modelId: string | undefined;
-	readonly mode: IChatMode | undefined;
-	readonly query: string | undefined;
-	readonly attachedContext: IChatRequestVariableEntry[] | undefined;
-	readonly selectedOptions: ReadonlyMap<string, IChatSessionProviderOptionItem>;
-	readonly disabled: boolean;
-	readonly onDidChange: Event<NewSessionChangeType>;
-	setRepoUri(uri: URI): void;
-	setIsolationMode(mode: IsolationMode): void;
-	setBranch(branch: string | undefined): void;
-	setModelId(modelId: string | undefined): void;
-	setMode(mode: IChatMode | undefined): void;
-	setQuery(query: string): void;
-	setAttachedContext(context: IChatRequestVariableEntry[] | undefined): void;
-	setOption(optionId: string, value: IChatSessionProviderOptionItem | string): void;
-}
-
-const REPOSITORY_OPTION_ID = 'repository';
-const BRANCH_OPTION_ID = 'branch';
-const ISOLATION_OPTION_ID = 'isolation';
-const AGENT_OPTION_ID = 'agent';
-
-/**
- * Local new session for Background agent sessions.
- * Fires `onDidChange` for both `repoUri` and `isolationMode` changes.
- * Notifies the extension service with session options for each property change.
- */
-export class LocalNewSession extends Disposable implements INewSession {
-
-	private _repoUri: URI | undefined;
-	private _isolationMode: IsolationMode = 'worktree';
-	private _branch: string | undefined;
-	private _modelId: string | undefined;
-	private _mode: IChatMode | undefined;
-	private _query: string | undefined;
-	private _attachedContext: IChatRequestVariableEntry[] | undefined;
-
-	private readonly _onDidChange = this._register(new Emitter<NewSessionChangeType>());
-	readonly onDidChange: Event<NewSessionChangeType> = this._onDidChange.event;
-
-	readonly target = AgentSessionProviders.Background;
-	readonly selectedOptions = new Map<string, IChatSessionProviderOptionItem>();
-
-	get repoUri(): URI | undefined { return this._repoUri; }
-	get isolationMode(): IsolationMode { return this._isolationMode; }
-	get branch(): string | undefined { return this._branch; }
-	get modelId(): string | undefined { return this._modelId; }
-	get mode(): IChatMode | undefined { return this._mode; }
-	get query(): string | undefined { return this._query; }
-	get attachedContext(): IChatRequestVariableEntry[] | undefined { return this._attachedContext; }
-	get disabled(): boolean {
-		if (!this._repoUri) {
-			return true;
-		}
-		if (this._isolationMode === 'worktree' && !this._branch) {
-			return true;
-		}
-		return false;
-	}
-
-	constructor(
-		readonly resource: URI,
-		defaultRepoUri: URI | undefined,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@ILogService private readonly logService: ILogService,
-	) {
-		super();
-		if (defaultRepoUri) {
-			this._repoUri = defaultRepoUri;
-			this.setOption(REPOSITORY_OPTION_ID, defaultRepoUri.fsPath);
-		}
-	}
-
-	setRepoUri(uri: URI): void {
-		this._repoUri = uri;
-		this._isolationMode = 'workspace';
-		this._branch = undefined;
-		this._onDidChange.fire('repoUri');
-		this._onDidChange.fire('disabled');
-		this.setOption(REPOSITORY_OPTION_ID, uri.fsPath);
-	}
-
-	setIsolationMode(mode: IsolationMode): void {
-		if (this._isolationMode !== mode) {
-			this._isolationMode = mode;
-			this._onDidChange.fire('isolationMode');
-			this._onDidChange.fire('disabled');
-			this.setOption(ISOLATION_OPTION_ID, mode);
-		}
-	}
-
-	setBranch(branch: string | undefined): void {
-		if (this._branch !== branch) {
-			this._branch = branch;
-			this._onDidChange.fire('branch');
-			this._onDidChange.fire('disabled');
-			this.setOption(BRANCH_OPTION_ID, branch ?? '');
-		}
-	}
-
-	setModelId(modelId: string | undefined): void {
-		this._modelId = modelId;
-	}
-
-	setMode(mode: IChatMode | undefined): void {
-		if (this._mode?.id !== mode?.id) {
-			this._mode = mode;
-			this._onDidChange.fire('agent');
-			const modeName = mode?.isBuiltin ? undefined : mode?.name.get();
-			this.setOption(AGENT_OPTION_ID, modeName ?? '');
-		}
-	}
-
-	setQuery(query: string): void {
-		this._query = query;
-	}
-
-	setAttachedContext(context: IChatRequestVariableEntry[] | undefined): void {
-		this._attachedContext = context;
-	}
-
-	setOption(optionId: string, value: IChatSessionProviderOptionItem | string): void {
-		if (typeof value === 'string') {
-			this.selectedOptions.set(optionId, { id: value, name: value });
-		} else {
-			this.selectedOptions.set(optionId, value);
-		}
-		this.chatSessionsService.notifySessionOptionsChange(
-			this.resource,
-			[{ optionId, value }]
-		).catch((err) => this.logService.error(`Failed to notify session option ${optionId} change:`, err));
-	}
-}
-
-/**
- * Remote new session for Cloud agent sessions.
- * Manages extension-driven option groups (models, etc.) and their values.
- * Fires events for option group changes.
- */
-export class RemoteNewSession extends Disposable implements INewSession {
-
-	private _repoUri: URI | undefined;
-	private _modelId: string | undefined;
-	private _query: string | undefined;
-	private _attachedContext: IChatRequestVariableEntry[] | undefined;
-
-	private readonly _onDidChange = this._register(new Emitter<NewSessionChangeType>());
-	readonly onDidChange: Event<NewSessionChangeType> = this._onDidChange.event;
-
-	private readonly _onDidChangeOptionGroups = this._register(new Emitter<void>());
-	readonly onDidChangeOptionGroups: Event<void> = this._onDidChangeOptionGroups.event;
-
-	readonly selectedOptions = new Map<string, IChatSessionProviderOptionItem>();
-
-	get repoUri(): URI | undefined { return this._repoUri; }
-	get isolationMode(): IsolationMode { return 'worktree'; }
-	get branch(): string | undefined { return undefined; }
-	get modelId(): string | undefined { return this._modelId; }
-	get mode(): IChatMode | undefined { return undefined; }
-	get query(): string | undefined { return this._query; }
-	get attachedContext(): IChatRequestVariableEntry[] | undefined { return this._attachedContext; }
-	get disabled(): boolean {
-		return !this._repoUri && !this.selectedOptions.has('repositories');
-	}
-
-	private readonly _whenClauseKeys = new Set<string>();
-
-	constructor(
-		readonly resource: URI,
-		readonly target: AgentSessionProviders,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@ILogService private readonly logService: ILogService,
-	) {
-		super();
-
-		this._updateWhenClauseKeys();
-
-		this._register(this.chatSessionsService.onDidChangeOptionGroups(() => {
-			this._updateWhenClauseKeys();
-			this._onDidChangeOptionGroups.fire();
-			this._onDidChange.fire('options');
-		}));
-		this._register(this.contextKeyService.onDidChangeContext(e => {
-			if (this._whenClauseKeys.size > 0 && e.affectsSome(this._whenClauseKeys)) {
-				this._onDidChangeOptionGroups.fire();
-			}
-		}));
-	}
-
-	setRepoUri(uri: URI): void {
-		this._repoUri = uri;
-		this._onDidChange.fire('repoUri');
-		this._onDidChange.fire('disabled');
-		const id = uri.path.substring(1);
-		this.setOption('repositories', { id, name: id });
-	}
-
-	setIsolationMode(_mode: IsolationMode): void {
-		// No-op for remote sessions
-	}
-
-	setBranch(_branch: string | undefined): void {
-		// No-op for remote sessions
-	}
-
-	setModelId(modelId: string | undefined): void {
-		this._modelId = modelId;
-	}
-
-	setMode(_mode: IChatMode | undefined): void {
-		// Intentionally a no-op: remote sessions do not support client-side mode selection.
-		// Any mode or behavior differences are determined by the remote session provider/server.
-	}
-
-	setQuery(query: string): void {
-		this._query = query;
-	}
-
-	setAttachedContext(context: IChatRequestVariableEntry[] | undefined): void {
-		this._attachedContext = context;
-	}
-
-	setOption(optionId: string, value: IChatSessionProviderOptionItem | string): void {
-		if (typeof value !== 'string') {
-			this.selectedOptions.set(optionId, value);
-		}
-		this._onDidChange.fire('options');
-		this._onDidChange.fire('disabled');
-		this.chatSessionsService.notifySessionOptionsChange(
-			this.resource,
-			[{ optionId, value }]
-		).catch((err) => this.logService.error(`Failed to notify extension of ${optionId} change:`, err));
-	}
-
-	// --- Option group accessors ---
-
-	getModelOptionGroup(): ISessionOptionGroup | undefined {
-		const groups = this._getOptionGroups();
-		if (!groups) {
-			return undefined;
-		}
-		const group = groups.find(g => isModelOptionGroup(g));
-		if (!group) {
-			return undefined;
-		}
-		return { group, value: this._getValueForGroup(group) };
-	}
-
-	getOtherOptionGroups(): ISessionOptionGroup[] {
-		const groups = this._getOptionGroups();
-		if (!groups) {
-			return [];
-		}
-		return groups
-			.filter(g => !isModelOptionGroup(g) && !isRepositoriesOptionGroup(g) && this._isOptionGroupVisible(g))
-			.map(g => ({ group: g, value: this._getValueForGroup(g) }));
-	}
-
-	getOptionValue(groupId: string): IChatSessionProviderOptionItem | undefined {
-		return this.selectedOptions.get(groupId);
-	}
-
-	setOptionValue(groupId: string, value: IChatSessionProviderOptionItem): void {
-		this.setOption(groupId, value);
-	}
-
-	// --- Internals ---
-
-	private _getOptionGroups(): IChatSessionProviderOptionGroup[] | undefined {
-		return this.chatSessionsService.getOptionGroupsForSessionType(this.target);
-	}
-
-	private _isOptionGroupVisible(group: IChatSessionProviderOptionGroup): boolean {
-		if (!group.when) {
-			return true;
-		}
-		const expr = ContextKeyExpr.deserialize(group.when);
-		return !expr || this.contextKeyService.contextMatchesRules(expr);
-	}
-
-	private _updateWhenClauseKeys(): void {
-		this._whenClauseKeys.clear();
-		const groups = this._getOptionGroups();
-		if (!groups) {
-			return;
-		}
-		for (const group of groups) {
-			if (group.when) {
-				const expr = ContextKeyExpr.deserialize(group.when);
-				if (expr) {
-					for (const key of expr.keys()) {
-						this._whenClauseKeys.add(key);
-					}
-				}
-			}
-		}
-	}
-
-	private _getValueForGroup(group: IChatSessionProviderOptionGroup): IChatSessionProviderOptionItem | undefined {
-		const selected = this.selectedOptions.get(group.id);
-		if (selected) {
-			return selected;
-		}
-		// Check for extension-set session option
-		const sessionOption = this.chatSessionsService.getSessionOption(this.resource, group.id);
-		if (sessionOption && typeof sessionOption !== 'string') {
-			return sessionOption;
-		}
-		if (typeof sessionOption === 'string') {
-			const item = group.items.find(i => i.id === sessionOption.trim());
-			if (item) {
-				return item;
-			}
-		}
-		// Default to first item marked as default, or first item
-		return group.items.find(i => i.default === true) ?? group.items[0];
-	}
-}
-
-function isModelOptionGroup(group: IChatSessionProviderOptionGroup): boolean {
-	if (group.id === 'models') {
-		return true;
-	}
-	const nameLower = group.name.toLowerCase();
-	return nameLower === 'model' || nameLower === 'models';
-}
-
-function isRepositoriesOptionGroup(group: IChatSessionProviderOptionGroup): boolean {
-	return group.id === 'repositories';
-}
diff --git a/src/vs/sessions/contrib/chat/browser/promptsService.ts b/src/vs/sessions/contrib/chat/browser/promptsService.ts
index 45db75ebadd..22c9e661fb6 100644
--- a/src/vs/sessions/contrib/chat/browser/promptsService.ts
+++ b/src/vs/sessions/contrib/chat/browser/promptsService.ts
@@ -6,7 +6,7 @@
 import { PromptsService } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js';
 import { PromptFilesLocator } from '../../../../workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.js';
 import { Event } from '../../../../base/common/event.js';
-import { basename, isEqualOrParent, joinPath } from '../../../../base/common/resources.js';
+import { basename, dirname, isEqualOrParent, joinPath } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { FileAccess } from '../../../../base/common/network.js';
@@ -14,22 +14,27 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
-import { HOOKS_SOURCE_FOLDER, getCleanPromptName } from '../../../../workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.js';
+import { HOOKS_SOURCE_FOLDER, SKILL_FILENAME, getCleanPromptName } from '../../../../workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.js';
 import { PromptsType } from '../../../../workbench/contrib/chat/common/promptSyntax/promptTypes.js';
-import { IPromptPath, PromptsStorage } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
+import { IAgentSkill, IPromptPath, PromptsStorage } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
 import { BUILTIN_STORAGE, IBuiltinPromptPath } from '../../chat/common/builtinPromptsStorage.js';
 import { IWorkbenchEnvironmentService } from '../../../../workbench/services/environment/common/environmentService.js';
 import { IPathService } from '../../../../workbench/services/path/common/pathService.js';
 import { ISearchService } from '../../../../workbench/services/search/common/search.js';
 import { IUserDataProfileService } from '../../../../workbench/services/userDataProfile/common/userDataProfile.js';
 import { IAICustomizationWorkspaceService } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
 
 /** URI root for built-in prompts bundled with the Sessions app. */
 export const BUILTIN_PROMPTS_URI = FileAccess.asFileUri('vs/sessions/prompts');
 
+/** URI root for built-in skills bundled with the Sessions app. */
+export const BUILTIN_SKILLS_URI = FileAccess.asFileUri('vs/sessions/skills');
+
 export class AgenticPromptsService extends PromptsService {
 	private _copilotRoot: URI | undefined;
 	private _builtinPromptsCache: Map<PromptsType, Promise<readonly IBuiltinPromptPath[]>> | undefined;
+	private _builtinSkillsCache: Promise<readonly IAgentSkill[]> | undefined;
 
 	protected override createPromptFilesLocator(): PromptFilesLocator {
 		return this.instantiationService.createInstance(AgenticPromptFilesLocator);
@@ -79,27 +84,137 @@ export class AgenticPromptsService extends PromptsService {
 		}
 	}
 
+	//#region Built-in Skills
+
 	/**
-	 * Override to include built-in prompts and filter out those overridden
-	 * by user or workspace prompts with the same name.
+	 * Returns built-in skill metadata, discovering and parsing SKILL.md files
+	 * bundled in the `vs/sessions/skills/` directory.
+	 */
+	private async getBuiltinSkills(): Promise<readonly IAgentSkill[]> {
+		if (!this._builtinSkillsCache) {
+			this._builtinSkillsCache = this.discoverBuiltinSkills();
+		}
+		return this._builtinSkillsCache;
+	}
+
+	/**
+	 * Discovers built-in skills from `vs/sessions/skills/{name}/SKILL.md`.
+	 * Each subdirectory containing a SKILL.md is treated as a skill.
+	 */
+	private async discoverBuiltinSkills(): Promise<readonly IAgentSkill[]> {
+		const fileService = this.instantiationService.invokeFunction(accessor => accessor.get(IFileService));
+		try {
+			const stat = await fileService.resolve(BUILTIN_SKILLS_URI);
+			if (!stat.children) {
+				return [];
+			}
+
+			const skills: IAgentSkill[] = [];
+			for (const child of stat.children) {
+				if (!child.isDirectory) {
+					continue;
+				}
+				const skillFileUri = joinPath(child.resource, SKILL_FILENAME);
+				try {
+					const parsed = await this.parseNew(skillFileUri, CancellationToken.None);
+					const rawName = parsed.header?.name;
+					const rawDescription = parsed.header?.description;
+					if (!rawName || !rawDescription) {
+						continue;
+					}
+					const name = sanitizeSkillText(rawName, 64);
+					const description = sanitizeSkillText(rawDescription, 1024);
+					const folderName = basename(child.resource);
+					if (name !== folderName) {
+						continue;
+					}
+					skills.push({
+						uri: skillFileUri,
+						storage: BUILTIN_STORAGE as PromptsStorage,
+						name,
+						description,
+						disableModelInvocation: parsed.header?.disableModelInvocation === true,
+						userInvocable: parsed.header?.userInvocable !== false,
+					});
+				} catch (e) {
+					this.logger.warn(`[discoverBuiltinSkills] Failed to parse built-in skill: ${skillFileUri}`, e instanceof Error ? e.message : String(e));
+				}
+			}
+			return skills;
+		} catch {
+			return [];
+		}
+	}
+
+	/**
+	 * Returns built-in skill file paths for listing in the UI.
+	 */
+	private async getBuiltinSkillPaths(): Promise<readonly IBuiltinPromptPath[]> {
+		const skills = await this.getBuiltinSkills();
+		return skills.map(s => ({
+			uri: s.uri,
+			storage: BUILTIN_STORAGE,
+			type: PromptsType.skill,
+			name: s.name,
+			description: s.description,
+		}));
+	}
+
+	/**
+	 * Override to include built-in skills, appending them with lowest priority.
+	 * Skills from any other source (workspace, user, extension, internal) take precedence.
+	 */
+	public override async findAgentSkills(token: CancellationToken, sessionResource?: URI): Promise<IAgentSkill[] | undefined> {
+		const baseResult = await super.findAgentSkills(token, sessionResource);
+		if (baseResult === undefined) {
+			return undefined;
+		}
+
+		const builtinSkills = await this.getBuiltinSkills();
+		if (builtinSkills.length === 0) {
+			return baseResult;
+		}
+
+		// Collect names already present from other sources
+		const existingNames = new Set(baseResult.map(s => s.name));
+		const disabledSkills = this.getDisabledPromptFiles(PromptsType.skill);
+		const nonOverridden = builtinSkills.filter(s => !existingNames.has(s.name) && !disabledSkills.has(s.uri));
+		if (nonOverridden.length === 0) {
+			return baseResult;
+		}
+
+		return [...baseResult, ...nonOverridden];
+	}
+
+	//#endregion
+
+	/**
+	 * Override to include built-in prompts and built-in skills, filtering out
+	 * those overridden by user or workspace items with the same name.
 	 */
 	public override async listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]> {
 		const baseResults = await super.listPromptFiles(type, token);
-		const builtinPrompts = await this.getBuiltinPromptFiles(type);
-		if (builtinPrompts.length === 0) {
+
+		let builtinItems: readonly IBuiltinPromptPath[];
+		if (type === PromptsType.skill) {
+			builtinItems = await this.getBuiltinSkillPaths();
+		} else {
+			builtinItems = await this.getBuiltinPromptFiles(type);
+		}
+		if (builtinItems.length === 0) {
 			return baseResults;
 		}
 
-		// Collect names of user/workspace prompts to detect overrides
+		// Collect names of user/workspace items to detect overrides
 		const overriddenNames = new Set<string>();
 		for (const p of baseResults) {
 			if (p.storage === PromptsStorage.local || p.storage === PromptsStorage.user) {
-				overriddenNames.add(getCleanPromptName(p.uri));
+				overriddenNames.add(type === PromptsType.skill ? basename(dirname(p.uri)) : getCleanPromptName(p.uri));
 			}
 		}
 
-		const nonOverridden = builtinPrompts.filter(
-			p => !overriddenNames.has(getCleanPromptName(p.uri))
+		const nonOverridden = builtinItems.filter(
+			p => !overriddenNames.has(type === PromptsType.skill ? basename(dirname(p.uri)) : getCleanPromptName(p.uri))
 		);
 		// Built-in items use BUILTIN_STORAGE ('builtin') which is not in the
 		// core IPromptPath union but is handled by the sessions UI layer.
@@ -108,6 +223,9 @@ export class AgenticPromptsService extends PromptsService {
 
 	public override async listPromptFilesForStorage(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly IPromptPath[]> {
 		if (storage === BUILTIN_STORAGE) {
+			if (type === PromptsType.skill) {
+				return this.getBuiltinSkillPaths() as Promise<readonly IPromptPath[]>;
+			}
 			return this.getBuiltinPromptFiles(type) as Promise<readonly IPromptPath[]>;
 		}
 		return super.listPromptFilesForStorage(type, storage, token);
@@ -144,6 +262,7 @@ class AgenticPromptFilesLocator extends PromptFilesLocator {
 		@IUserDataProfileService userDataService: IUserDataProfileService,
 		@ILogService logService: ILogService,
 		@IPathService pathService: IPathService,
+		@IWorkspaceTrustManagementService workspaceTrustManagementService: IWorkspaceTrustManagementService,
 		@IAICustomizationWorkspaceService private readonly customizationWorkspaceService: IAICustomizationWorkspaceService,
 	) {
 		super(
@@ -154,7 +273,8 @@ class AgenticPromptFilesLocator extends PromptFilesLocator {
 			searchService,
 			userDataService,
 			logService,
-			pathService
+			pathService,
+			workspaceTrustManagementService
 		);
 	}
 
@@ -214,3 +334,12 @@ function getCliUserSubfolder(type: PromptsType): string | undefined {
 	}
 }
 
+/**
+ * Strips XML tags and truncates to the given max length.
+ * Matches the sanitization applied by PromptsService for other skill sources.
+ */
+function sanitizeSkillText(text: string, maxLength: number): string {
+	const sanitized = text.replace(/<[^>]+>/g, '');
+	return sanitized.length > maxLength ? sanitized.substring(0, maxLength) : sanitized;
+}
+
diff --git a/src/vs/sessions/contrib/chat/browser/runScriptAction.ts b/src/vs/sessions/contrib/chat/browser/runScriptAction.ts
index a1cd803058a..9e15ce6b4a6 100644
--- a/src/vs/sessions/contrib/chat/browser/runScriptAction.ts
+++ b/src/vs/sessions/contrib/chat/browser/runScriptAction.ts
@@ -3,34 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { $, addDisposableListener, append, EventType } from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { Action, IAction } from '../../../../base/common/actions.js';
 import { equals } from '../../../../base/common/arrays.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derivedOpts, IObservable } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize, localize2 } from '../../../../nls.js';
-import { MenuId, registerAction2, Action2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
-import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
+import { ActionWidgetDropdownActionViewItem } from '../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
+import { MenuId, registerAction2, Action2, MenuRegistry, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction } from '../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IWorkbenchContribution } from '../../../../workbench/common/contributions.js';
+import { IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
+import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
 import { SessionsCategories } from '../../../common/categories.js';
-import { IActiveSessionItem, IsActiveSessionBackgroundProviderContext, ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { IsActiveSessionBackgroundProviderContext, ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionData, SessionStatus } from '../../sessions/common/sessionData.js';
 import { Menus } from '../../../browser/menus.js';
-import { ISessionsConfigurationService, ITaskEntry, TaskStorageTarget } from './sessionsConfigurationService.js';
+import { INonSessionTaskEntry, ISessionsConfigurationService, ISessionTaskWithTarget, ITaskEntry, TaskStorageTarget } from './sessionsConfigurationService.js';
 import { IsAuxiliaryWindowContext } from '../../../../workbench/common/contextkeys.js';
 import { SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
-
+import { IRunScriptCustomTaskWidgetResult, RunScriptCustomTaskWidget } from './runScriptCustomTaskWidget.js';
+import { NewChatViewPane, SessionsViewId } from './newChatViewPane.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
 
 
 // Menu IDs - exported for use in auxiliary bar part
 export const RunScriptDropdownMenuId = MenuId.for('AgentSessionsRunScriptDropdown');
 
 // Action IDs
-const RUN_SCRIPT_ACTION_ID = 'workbench.action.agentSessions.runScript';
 const RUN_SCRIPT_ACTION_PRIMARY_ID = 'workbench.action.agentSessions.runScriptPrimary';
 const CONFIGURE_DEFAULT_RUN_ACTION_ID = 'workbench.action.agentSessions.configureDefaultRunAction';
+const GENERATE_RUN_ACTION_ID = 'workbench.action.agentSessions.generateRunAction';
 
 function getTaskDisplayLabel(task: ITaskEntry): string {
 	if (task.label && task.label.length > 0) {
@@ -48,12 +64,42 @@ function getTaskDisplayLabel(task: ITaskEntry): string {
 	return '';
 }
 
-interface IRunScriptActionContext {
-	readonly session: IActiveSessionItem;
-	readonly tasks: readonly ITaskEntry[];
-	readonly lastRunTaskLabel: string | undefined;
+function getTaskCommandPreview(task: ITaskEntry): string {
+	if (task.command && task.command.length > 0) {
+		return task.command;
+	}
+	if (task.script && task.script.length > 0) {
+		return localize('npmTaskCommandPreview', "npm run {0}", task.script);
+	}
+	if (task.task && task.task.toString().length > 0) {
+		return task.task.toString();
+	}
+	return getTaskDisplayLabel(task);
 }
 
+function getPrimaryTask(tasks: readonly ISessionTaskWithTarget[], pinnedTaskLabel: string | undefined): ISessionTaskWithTarget | undefined {
+	if (tasks.length === 0) {
+		return undefined;
+	}
+
+	if (pinnedTaskLabel) {
+		const pinnedTask = tasks.find(task => task.task.label === pinnedTaskLabel);
+		if (pinnedTask) {
+			return pinnedTask;
+		}
+	}
+
+	return tasks[0];
+}
+
+interface IRunScriptActionContext {
+	readonly session: ISessionData;
+	readonly tasks: readonly ISessionTaskWithTarget[];
+	readonly pinnedTaskLabel: string | undefined;
+}
+
+type TaskConfigurationMode = 'add' | 'configure';
+
 /**
  * Workbench contribution that adds a split dropdown action to the auxiliary bar title
  * for running a task via tasks.json.
@@ -66,9 +112,12 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 
 	constructor(
 		@ISessionsManagementService private readonly _activeSessionService: ISessionsManagementService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IKeybindingService _keybindingService: IKeybindingService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 		@ISessionsConfigurationService private readonly _sessionsConfigService: ISessionsConfigurationService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IViewsService private readonly _viewsService: IViewsService,
+		@IActionViewItemService private readonly _actionViewItemService: IActionViewItemService,
 	) {
 		super();
 
@@ -78,9 +127,12 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 				if (a === b) { return true; }
 				if (!a || !b) { return false; }
 				return a.session === b.session
-					&& a.lastRunTaskLabel === b.lastRunTaskLabel
+					&& a.pinnedTaskLabel === b.pinnedTaskLabel
 					&& equals(a.tasks, b.tasks, (t1, t2) =>
-						t1.label === t2.label && t1.command === t2.command);
+						t1.task.label === t2.task.label
+						&& t1.task.command === t2.task.command
+						&& t1.target === t2.target
+						&& t1.task.runOptions?.runOn === t2.task.runOptions?.runOn);
 			}
 		}, reader => {
 			const activeSession = this._activeSessionService.activeSession.read(reader);
@@ -89,13 +141,36 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 			}
 
 			const tasks = this._sessionsConfigService.getSessionTasks(activeSession).read(reader);
-			const lastRunTaskLabel = this._sessionsConfigService.getLastRunTaskLabel(activeSession.repository).read(reader);
-			return { session: activeSession, tasks, lastRunTaskLabel };
+			const repo = activeSession.workspace.read(reader)?.repositories[0];
+			const pinnedTaskLabel = this._sessionsConfigService.getPinnedTaskLabel(repo?.uri).read(reader);
+			return { session: activeSession, tasks, pinnedTaskLabel };
 		}).recomputeInitiallyAndOnChange(this._store);
 
+		this._registerActionViewItemProvider();
 		this._registerActions();
 	}
 
+	private _registerActionViewItemProvider(): void {
+		const that = this;
+		this._register(this._actionViewItemService.register(
+			Menus.TitleBarSessionMenu,
+			RunScriptDropdownMenuId,
+			(action, options, instantiationService) => {
+				if (!(action instanceof SubmenuItemAction)) {
+					return undefined;
+				}
+				return instantiationService.createInstance(
+					RunScriptActionViewItem,
+					action,
+					options,
+					that._activeRunState,
+					(session: ISessionData) => that._showConfigureQuickPick(session),
+					(session: ISessionData, existingTask: INonSessionTaskEntry, mode?: TaskConfigurationMode) => that._showCustomCommandInput(session, existingTask, mode),
+				);
+			},
+		));
+	}
+
 	private _registerActions(): void {
 		const that = this;
 
@@ -103,7 +178,7 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 			constructor() {
 				super({
 					id: RUN_SCRIPT_ACTION_PRIMARY_ID,
-					title: { value: localize('runPrimaryScript', 'Run Primary Script'), original: 'Run Primary Script' },
+					title: { value: localize('runPrimaryTask', 'Run Primary Task'), original: 'Run Primary Task' },
 					icon: Codicon.play,
 					category: SessionsCategories.Sessions,
 					f1: true,
@@ -116,7 +191,7 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 					return;
 				}
 
-				const { tasks, session, lastRunTaskLabel } = activeState;
+				const { tasks, session } = activeState;
 				if (tasks.length === 0) {
 					const task = await that._showConfigureQuickPick(session);
 					if (task) {
@@ -125,11 +200,11 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 					return;
 				}
 
-				const mruIndex = lastRunTaskLabel !== undefined
-					? tasks.findIndex(t => t.label === lastRunTaskLabel)
-					: -1;
-				const primaryTask = tasks[mruIndex >= 0 ? mruIndex : 0];
-				await that._sessionsConfigService.runTask(primaryTask, session);
+				const primaryTask = getPrimaryTask(tasks, activeState.pinnedTaskLabel);
+				if (!primaryTask) {
+					return;
+				}
+				await that._sessionsConfigService.runTask(primaryTask.task, session);
 			}
 		}));
 
@@ -139,52 +214,17 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 				return;
 			}
 
-			const { tasks, session, lastRunTaskLabel } = activeState;
-			const configureScriptPrecondition = session.worktree ?? session.repository ? ContextKeyExpr.true() : ContextKeyExpr.false();
+			const { session, tasks } = activeState;
+			const repo = session.workspace.read(reader)?.repositories[0];
+			const configureScriptPrecondition = repo?.workingDirectory ?? repo?.uri ? ContextKeyExpr.true() : ContextKeyExpr.false();
 
-			const mruIndex = lastRunTaskLabel !== undefined
-				? tasks.findIndex(t => t.label === lastRunTaskLabel)
-				: -1;
-
-			if (tasks.length > 0) {
-				// Register an action for each session task
-				for (let i = 0; i < tasks.length; i++) {
-					const task = tasks[i];
-					const actionId = `${RUN_SCRIPT_ACTION_ID}.${i}`;
-					const isPrimary = i === (mruIndex >= 0 ? mruIndex : 0);
-
-					reader.store.add(registerAction2(class extends Action2 {
-						constructor() {
-							super({
-								id: actionId,
-								title: getTaskDisplayLabel(task),
-								tooltip: !isPrimary ? localize('runActionTooltip', "Run '{0}' in terminal", getTaskDisplayLabel(task))
-									: localize('runActionTooltipKeybinding', "Run '{0}' in terminal ({1})", getTaskDisplayLabel(task), that._keybindingService.lookupKeybinding(RUN_SCRIPT_ACTION_PRIMARY_ID)?.getLabel() ?? ''),
-								icon: Codicon.play,
-								category: SessionsCategories.Sessions,
-								menu: [{
-									id: RunScriptDropdownMenuId,
-									group: '0_scripts',
-									order: i === mruIndex ? -1 : i,
-								}]
-							});
-						}
-
-						async run(): Promise<void> {
-							await that._sessionsConfigService.runTask(task, session);
-						}
-					}));
-				}
-			}
-
-			// Configure run action (always shown in dropdown)
 			reader.store.add(registerAction2(class extends Action2 {
 				constructor() {
 					super({
 						id: CONFIGURE_DEFAULT_RUN_ACTION_ID,
-						title: localize2('configureDefaultRunAction', "Add Run Action..."),
+						title: localize2('configureDefaultRunAction', "Add Task..."),
 						category: SessionsCategories.Sessions,
-						icon: Codicon.play,
+						icon: Codicon.add,
 						precondition: configureScriptPrecondition,
 						menu: [{
 							id: RunScriptDropdownMenuId,
@@ -201,10 +241,37 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 					}
 				}
 			}));
+
+			reader.store.add(registerAction2(class extends Action2 {
+				constructor() {
+					super({
+						id: GENERATE_RUN_ACTION_ID,
+						title: localize2('generateRunAction', "Generate New Task..."),
+						category: SessionsCategories.Sessions,
+						precondition: IsActiveSessionBackgroundProviderContext,
+						menu: [{
+							id: RunScriptDropdownMenuId,
+							group: tasks.length === 0 ? 'navigation' : '1_configure',
+							order: 1
+						}]
+					});
+				}
+
+				async run(): Promise<void> {
+					const status = session.status.read(undefined);
+					if (status === SessionStatus.Untitled) {
+						const viewPane = that._viewsService.getViewWithId<NewChatViewPane>(SessionsViewId);
+						viewPane?.sendQuery('/generate-run-commands');
+					} else {
+						const widget = that._chatWidgetService.getWidgetBySessionResource(session.resource);
+						await widget?.acceptInput('/generate-run-commands');
+					}
+				}
+			}));
 		}));
 	}
 
-	private async _showConfigureQuickPick(session: IActiveSessionItem): Promise<ITaskEntry | undefined> {
+	private async _showConfigureQuickPick(session: ISessionData): Promise<ITaskEntry | undefined> {
 		const nonSessionTasks = await this._sessionsConfigService.getNonSessionTasks(session);
 		if (nonSessionTasks.length === 0) {
 			// No existing tasks, go straight to custom command input
@@ -220,24 +287,24 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 
 		items.push({ type: 'separator', label: localize('custom', "Custom") });
 		items.push({
-			label: localize('enterCustomCommand', "Enter Custom Command..."),
+			label: localize('createNewTask', "Create new Task..."),
 			description: localize('enterCustomCommandDesc', "Create a new shell task"),
 		});
 
 		if (nonSessionTasks.length > 0) {
 			items.push({ type: 'separator', label: localize('existingTasks', "Existing Tasks") });
-			for (const task of nonSessionTasks) {
+			for (const { task, target } of nonSessionTasks) {
 				items.push({
 					label: getTaskDisplayLabel(task),
 					description: task.command,
 					task,
-					source: 'workspace',
+					source: target,
 				});
 			}
 		}
 
 		const picked = await this._quickInputService.pick(items, {
-			placeHolder: localize('pickRunAction', "Select a task or enter a custom command"),
+			placeHolder: localize('pickRunAction', "Select or create a task"),
 		});
 
 		if (!picked) {
@@ -246,82 +313,392 @@ export class RunScriptContribution extends Disposable implements IWorkbenchContr
 
 		const pickedItem = picked as ITaskPickItem;
 		if (pickedItem.task) {
-			// Existing task — set inSessions: true
-			await this._sessionsConfigService.addTaskToSessions(pickedItem.task, session, pickedItem.source ?? 'workspace');
-			return pickedItem.task;
+			return this._showCustomCommandInput(session, { task: pickedItem.task, target: pickedItem.source ?? 'workspace' });
 		} else {
 			// Custom command path
 			return this._showCustomCommandInput(session);
 		}
 	}
 
-	private async _showCustomCommandInput(session: IActiveSessionItem): Promise<ITaskEntry | undefined> {
-		const command = await this._quickInputService.input({
-			placeHolder: localize('enterCommandPlaceholder', "Enter command (e.g., npm run dev)"),
-			prompt: localize('enterCommandPrompt', "This command will be run as a task in the integrated terminal")
-		});
-
-		if (!command) {
+	private async _showCustomCommandInput(session: ISessionData, existingTask?: INonSessionTaskEntry, mode: TaskConfigurationMode = 'add'): Promise<ITaskEntry | undefined> {
+		const taskConfiguration = await this._showCustomCommandWidget(session, existingTask, mode);
+		if (!taskConfiguration) {
 			return undefined;
 		}
 
-		const target = await this._pickStorageTarget(session);
-		if (!target) {
-			return undefined;
+		if (existingTask) {
+			if (mode === 'configure') {
+				const newLabel = taskConfiguration.label?.trim() || existingTask.task.label || taskConfiguration.command;
+
+				let updatedTask: ITaskEntry = {
+					...existingTask.task,
+					label: newLabel,
+					inSessions: true,
+				};
+
+				if (taskConfiguration.command && existingTask.task.command !== undefined) {
+					updatedTask = {
+						...updatedTask,
+						command: taskConfiguration.command,
+					};
+				}
+
+				if (taskConfiguration.runOn) {
+					updatedTask = {
+						...updatedTask,
+						runOptions: {
+							...(existingTask.task.runOptions ?? {}),
+							runOn: taskConfiguration.runOn,
+						},
+					};
+				}
+
+				await this._sessionsConfigService.updateTask(existingTask.task.label, updatedTask, session, existingTask.target, taskConfiguration.target);
+				return updatedTask;
+			}
+
+			await this._sessionsConfigService.addTaskToSessions(existingTask.task, session, existingTask.target, { runOn: taskConfiguration.runOn ?? 'default' });
+			return {
+				...existingTask.task,
+				inSessions: true,
+				...(taskConfiguration.runOn ? { runOptions: { runOn: taskConfiguration.runOn } } : {}),
+			};
 		}
 
-		return this._sessionsConfigService.createAndAddTask(command, session, target);
+		return this._sessionsConfigService.createAndAddTask(
+			taskConfiguration.label,
+			taskConfiguration.command,
+			session,
+			taskConfiguration.target,
+			taskConfiguration.runOn ? { runOn: taskConfiguration.runOn } : undefined
+		);
 	}
 
-	private async _pickStorageTarget(session: IActiveSessionItem): Promise<TaskStorageTarget | undefined> {
-		const hasWorktree = !!session.worktree;
-		const hasRepository = !!session.repository;
+	private _showCustomCommandWidget(session: ISessionData, existingTask?: INonSessionTaskEntry, mode: TaskConfigurationMode = 'add'): Promise<IRunScriptCustomTaskWidgetResult | undefined> {
+		const repo = session.workspace.get()?.repositories[0];
+		const workspaceTargetDisabledReason = !(repo?.workingDirectory ?? repo?.uri)
+			? localize('workspaceStorageUnavailableTooltip', "Workspace storage is unavailable for this session")
+			: undefined;
+		const isConfigureMode = mode === 'configure';
 
-		interface IStorageTargetItem extends IQuickPickItem {
-			target: TaskStorageTarget;
+		return new Promise<IRunScriptCustomTaskWidgetResult | undefined>(resolve => {
+			const disposables = new DisposableStore();
+			let settled = false;
+
+			const quickWidget = disposables.add(this._quickInputService.createQuickWidget());
+			quickWidget.title = isConfigureMode
+				? localize('configureActionWidgetTitle', "Configure Task...")
+				: existingTask
+					? localize('addExistingActionWidgetTitle', "Add Existing Task...")
+					: localize('addActionWidgetTitle', "Add Task...");
+			quickWidget.description = isConfigureMode
+				? localize('configureActionWidgetDescription', "Update how this task is named, saved, and run")
+				: existingTask
+					? localize('addExistingActionWidgetDescription', "Enable an existing task for sessions and configure when it should run")
+					: localize('addActionWidgetDescription', "Create a shell task and configure how it should be saved and run");
+			quickWidget.ignoreFocusOut = true;
+			const widget = disposables.add(new RunScriptCustomTaskWidget({
+				label: existingTask?.task.label,
+				labelDisabledReason: existingTask && !isConfigureMode ? localize('existingTaskLabelLocked', "This name comes from an existing task and cannot be changed here.") : undefined,
+				command: existingTask ? getTaskCommandPreview(existingTask.task) : undefined,
+				commandDisabledReason: existingTask && !isConfigureMode ? localize('existingTaskCommandLocked', "This command comes from an existing task and cannot be changed here.") : undefined,
+				target: existingTask?.target,
+				targetDisabledReason: existingTask && !isConfigureMode ? localize('existingTaskTargetLocked', "This existing task cannot be moved between workspace and user storage.") : workspaceTargetDisabledReason,
+				runOn: existingTask?.task.runOptions?.runOn === 'worktreeCreated' ? 'worktreeCreated' : undefined,
+				mode: isConfigureMode ? 'configure' : existingTask ? 'add-existing' : 'add',
+			}));
+			quickWidget.widget = widget.domNode;
+
+			const complete = (result: IRunScriptCustomTaskWidgetResult | undefined) => {
+				if (settled) {
+					return;
+				}
+				settled = true;
+				resolve(result);
+				quickWidget.hide();
+			};
+
+			disposables.add(widget.onDidSubmit(result => complete(result)));
+			disposables.add(widget.onDidCancel(() => complete(undefined)));
+			disposables.add(quickWidget.onDidHide(() => {
+				if (!settled) {
+					settled = true;
+					resolve(undefined);
+				}
+				disposables.dispose();
+			}));
+
+			quickWidget.show();
+			widget.focus();
+		});
+	}
+}
+
+/**
+ * Split-button action view item for the run script picker in the sessions titlebar.
+ * The primary button runs the pinned task, or the first task if none is pinned.
+ * The dropdown arrow opens a custom action widget with categories and per-item
+ * toolbar actions (pin, configure, remove).
+ */
+class RunScriptActionViewItem extends BaseActionViewItem {
+
+	private readonly _primaryActionAction: Action;
+	private readonly _primaryAction: ActionViewItem;
+	private readonly _dropdown: ChevronActionWidgetDropdown;
+
+	constructor(
+		action: IAction,
+		_options: IActionViewItemOptions,
+		private readonly _activeRunState: IObservable<IRunScriptActionContext | undefined>,
+		private readonly _showConfigureQuickPick: (session: ISessionData) => Promise<ITaskEntry | undefined>,
+		private readonly _showCustomCommandInput: (session: ISessionData, existingTask: INonSessionTaskEntry, mode?: TaskConfigurationMode) => Promise<ITaskEntry | undefined>,
+		@ICommandService private readonly _commandService: ICommandService,
+		@ISessionsConfigurationService private readonly _sessionsConfigService: ISessionsConfigurationService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IViewsService private readonly _viewsService: IViewsService,
+	) {
+		super(undefined, action);
+
+		const state = this._activeRunState.get();
+		const hasTasks = state && state.tasks.length > 0;
+
+		// Primary action button - runs the pinned task (or first task when none is pinned)
+		this._primaryActionAction = this._register(new Action(
+			'agentSessions.runScriptPrimary',
+			this._getPrimaryActionTooltip(state),
+			ThemeIcon.asClassName(Codicon.play),
+			hasTasks,
+			() => this._commandService.executeCommand(RUN_SCRIPT_ACTION_PRIMARY_ID)
+		));
+		this._primaryAction = this._register(new ActionViewItem(undefined, this._primaryActionAction, { icon: true, label: false }));
+
+		// Update enabled state when tasks change
+		this._register(autorun(reader => {
+			const runState = this._activeRunState.read(reader);
+			this._primaryActionAction.enabled = !!runState && runState.tasks.length > 0;
+			this._primaryActionAction.label = this._getPrimaryActionTooltip(runState);
+		}));
+
+		// Dropdown with categorized actions and per-item toolbars
+		const dropdownAction = this._register(new Action('agentSessions.runScriptDropdown', localize('runDropdown', "More Tasks...")));
+		this._dropdown = this._register(new ChevronActionWidgetDropdown(
+			dropdownAction,
+			{
+				actionProvider: { getActions: () => this._getDropdownActions() },
+				showItemKeybindings: true,
+			},
+			this._actionWidgetService,
+			this._keybindingService,
+			contextKeyService,
+			telemetryService,
+		));
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		container.classList.add('monaco-dropdown-with-default');
+
+		// Primary action button
+		const primaryContainer = $('.action-container');
+		this._primaryAction.render(append(container, primaryContainer));
+		this._register(addDisposableListener(primaryContainer, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.RightArrow)) {
+				this._primaryAction.blur();
+				this._dropdown.focus();
+				event.stopPropagation();
+			}
+		}));
+
+		// Dropdown arrow button
+		const dropdownContainer = $('.dropdown-action-container');
+		this._dropdown.render(append(container, dropdownContainer));
+		this._register(addDisposableListener(dropdownContainer, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.LeftArrow)) {
+				this._dropdown.setFocusable(false);
+				this._primaryAction.focus();
+				event.stopPropagation();
+			}
+		}));
+	}
+
+	override focus(fromRight?: boolean): void {
+		if (fromRight) {
+			this._dropdown.focus();
+		} else {
+			this._primaryAction.focus();
+		}
+	}
+
+	override blur(): void {
+		this._primaryAction.blur();
+		this._dropdown.blur();
+	}
+
+	override setFocusable(focusable: boolean): void {
+		this._primaryAction.setFocusable(focusable);
+		this._dropdown.setFocusable(focusable);
+	}
+
+	private _getPrimaryActionTooltip(state: IRunScriptActionContext | undefined): string {
+		if (!state || state.tasks.length === 0) {
+			return localize('runPrimaryTaskTooltip', "Run Primary Task");
 		}
 
-		const items: IStorageTargetItem[] = [
-			{
-				target: 'user',
-				label: localize('storeInUserSettings', "User Settings"),
-				description: localize('storeInUserSettingsDesc', "Available in all sessions"),
-			},
-			hasWorktree ? {
-				target: 'workspace',
-				label: localize('storeInWorkspaceWorktreeSettings', "Workspace (Worktree)"),
-				description: localize('storeInWorkspaceWorktreeSettingsDesc', "Stored in session worktree"),
-			} : hasRepository ? {
-				target: 'workspace',
-				label: localize('storeInWorkspaceSettings', "Workspace"),
-				description: localize('storeInWorkspace', "Stored in the workspace"),
-			} : {
-				target: 'workspace',
-				label: localize('storeInWorkspaceSettingsDisable', "Workspace Unavailable"),
-				description: localize('storeInWorkspaceDisabled', "Stored in the workspace Unavailable"),
-				disabled: true,
-				italic: true,
-			}
-		];
+		const primaryTask = getPrimaryTask(state.tasks, state.pinnedTaskLabel)?.task;
+		if (!primaryTask) {
+			return localize('runPrimaryTaskTooltip', "Run Primary Task");
+		}
 
-		return new Promise<TaskStorageTarget | undefined>(resolve => {
-			const picker = this._quickInputService.createQuickPick<IStorageTargetItem>({ useSeparators: true });
-			picker.placeholder = localize('pickStorageTarget', "Where should this action be saved?");
-			picker.items = items;
+		const keybindingLabel = this._keybindingService.lookupKeybinding(RUN_SCRIPT_ACTION_PRIMARY_ID)?.getLabel();
+		return keybindingLabel
+			? localize('runActionTooltipKeybinding', "{0} ({1})", getTaskDisplayLabel(primaryTask), keybindingLabel)
+			: getTaskDisplayLabel(primaryTask);
+	}
 
-			picker.onDidAccept(() => {
-				const selected = picker.activeItems[0];
-				if (selected && (selected.target !== 'workspace' || hasWorktree)) {
-					resolve(selected.target);
-					picker.dispose();
+	private _getDropdownActions(): IActionWidgetDropdownAction[] {
+		const state = this._activeRunState.get();
+		if (!state) {
+			return [];
+		}
+
+		const { tasks, session, pinnedTaskLabel } = state;
+		const repo = session.workspace.get()?.repositories[0];
+		const actions: IActionWidgetDropdownAction[] = [];
+
+		// Category for normal tasks (no header shown)
+		const defaultCategory = { label: '', order: 0, showHeader: false };
+		// Category for worktree-creation tasks
+		const worktreeCategory = { label: localize('worktreeCreationCategory', "Run on Worktree Creation"), order: 1, showHeader: true };
+		// Category for add actions
+		const addCategory = { label: localize('addActionsCategory', "Add"), order: 2, showHeader: true };
+
+		for (let i = 0; i < tasks.length; i++) {
+			const entry = tasks[i];
+			const task = entry.task;
+			const isWorktreeTask = task.runOptions?.runOn === 'worktreeCreated';
+			const isPinned = task.label === pinnedTaskLabel;
+
+			const toolbarActions: IAction[] = [
+				{
+					id: `runScript.pin.${i}`,
+					label: isPinned ? localize('unpinTask', "Unpin") : localize('pinTask', "Pin"),
+					tooltip: isPinned ? localize('unpinTaskTooltip', "Unpin") : localize('pinTaskTooltip', "Pin"),
+					class: ThemeIcon.asClassName(isPinned ? Codicon.pinned : Codicon.pin),
+					enabled: !!repo?.uri,
+					run: async () => {
+						this._actionWidgetService.hide();
+						this._sessionsConfigService.setPinnedTaskLabel(repo?.uri, isPinned ? undefined : task.label);
+					}
+				},
+				{
+					id: `runScript.configure.${i}`,
+					label: localize('configureTask', "Configure"),
+					tooltip: localize('configureTask', "Configure"),
+					class: ThemeIcon.asClassName(Codicon.gear),
+					enabled: true,
+					run: async () => {
+						this._actionWidgetService.hide();
+						await this._showCustomCommandInput(session, { task, target: entry.target }, 'configure');
+					}
+				},
+				{
+					id: `runScript.remove.${i}`,
+					label: localize('removeTask', "Remove"),
+					tooltip: localize('removeTask', "Remove"),
+					class: ThemeIcon.asClassName(Codicon.close),
+					enabled: true,
+					run: async () => {
+						this._actionWidgetService.hide();
+						await this._sessionsConfigService.removeTask(task.label, session, entry.target);
+					}
 				}
+			];
+
+			actions.push({
+				id: `runScript.task.${i}`,
+				label: getTaskDisplayLabel(task),
+				tooltip: '',
+				hover: {
+					content: localize('runActionTooltip', "Run '{0}' in terminal", getTaskDisplayLabel(task)),
+					position: { hoverPosition: HoverPosition.LEFT }
+				},
+				icon: Codicon.play,
+				enabled: true,
+				class: undefined,
+				category: isWorktreeTask ? worktreeCategory : defaultCategory,
+				toolbarActions,
+				run: async () => {
+					await this._sessionsConfigService.runTask(task, session);
+				},
 			});
-			picker.onDidHide(() => {
-				resolve(undefined);
-				picker.dispose();
-			});
-			picker.show();
+		}
+
+		// "Add Task..." action
+		const canConfigure = !!(repo?.workingDirectory ?? repo?.uri);
+		actions.push({
+			id: 'runScript.addAction',
+			label: localize('configureDefaultRunAction', "Add Task..."),
+			tooltip: '',
+			hover: {
+				content: canConfigure
+					? localize('addActionTooltip', "Add a new task")
+					: localize('addActionTooltipDisabled', "Cannot add tasks to this session because workspace storage is unavailable"),
+				position: { hoverPosition: HoverPosition.LEFT }
+			},
+			icon: Codicon.add,
+			enabled: canConfigure,
+			class: undefined,
+			category: addCategory,
+			run: async () => {
+				const task = await this._showConfigureQuickPick(session);
+				if (task) {
+					await this._sessionsConfigService.runTask(task, session);
+				}
+			},
 		});
+
+		// "Generate New Task..." action
+		actions.push({
+			id: 'runScript.generateAction',
+			label: localize('generateRunAction', "Generate New Task..."),
+			tooltip: '',
+			hover: {
+				content: localize('generateRunActionTooltip', "Generate a new workspace task"),
+				position: { hoverPosition: HoverPosition.LEFT },
+			},
+			icon: Codicon.sparkle,
+			enabled: true,
+			class: undefined,
+			category: addCategory,
+			run: async () => {
+				if (session.status.get() === SessionStatus.Untitled) {
+					const viewPane = this._viewsService.getViewWithId<NewChatViewPane>(SessionsViewId);
+					viewPane?.sendQuery('/generate-run-commands');
+				} else {
+					const widget = this._chatWidgetService.getWidgetBySessionResource(session.resource);
+					await widget?.acceptInput('/generate-run-commands');
+				}
+			},
+		});
+
+		return actions;
+	}
+}
+
+/**
+ * {@link ActionWidgetDropdownActionViewItem} that renders a chevron-down icon
+ * as its label, used as the dropdown arrow in the split button.
+ */
+class ChevronActionWidgetDropdown extends ActionWidgetDropdownActionViewItem {
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		element.classList.add('codicon', 'codicon-chevron-down');
+		return null;
 	}
 }
 
@@ -342,7 +719,7 @@ class RunScriptNotAvailableAction extends Action2 {
 		super({
 			id: 'workbench.action.agentSessions.runScript.notAvailable',
 			title: localize2('run', "Run"),
-			tooltip: localize('runScriptNotAvailableTooltip', "Run Script is not available for this session type"),
+			tooltip: localize('runScriptNotAvailableTooltip', "Run Task is not available for this session type"),
 			icon: Codicon.play,
 			precondition: ContextKeyExpr.false(),
 			menu: [{
diff --git a/src/vs/sessions/contrib/chat/browser/runScriptCustomTaskWidget.ts b/src/vs/sessions/contrib/chat/browser/runScriptCustomTaskWidget.ts
new file mode 100644
index 00000000000..5d40dfdef39
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/runScriptCustomTaskWidget.ts
@@ -0,0 +1,243 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/runScriptAction.css';
+
+import * as dom from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { Radio } from '../../../../base/browser/ui/radio/radio.js';
+import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { localize } from '../../../../nls.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { TaskStorageTarget } from './sessionsConfigurationService.js';
+
+export const WORKTREE_CREATED_RUN_ON = 'worktreeCreated' as const;
+
+export interface IRunScriptCustomTaskWidgetState {
+	readonly label?: string;
+	readonly labelDisabledReason?: string;
+	readonly command?: string;
+	readonly commandDisabledReason?: string;
+	readonly target?: TaskStorageTarget;
+	readonly targetDisabledReason?: string;
+	readonly runOn?: typeof WORKTREE_CREATED_RUN_ON;
+	readonly mode?: 'add' | 'add-existing' | 'configure';
+}
+
+export interface IRunScriptCustomTaskWidgetResult {
+	readonly label?: string;
+	readonly command: string;
+	readonly target: TaskStorageTarget;
+	readonly runOn?: typeof WORKTREE_CREATED_RUN_ON;
+}
+
+export class RunScriptCustomTaskWidget extends Disposable {
+
+	readonly domNode: HTMLElement;
+
+	private readonly _labelInput: InputBox;
+	private readonly _commandInput: InputBox;
+	private readonly _runOnCheckbox: Checkbox;
+	private readonly _storageOptions: Radio;
+	private readonly _submitButton: Button;
+	private readonly _cancelButton: Button;
+	private readonly _labelLocked: boolean;
+	private readonly _commandLocked: boolean;
+	private readonly _targetLocked: boolean;
+	private readonly _isExistingTask: boolean;
+	private readonly _isAddExistingTask: boolean;
+	private readonly _initialLabel: string;
+	private readonly _initialCommand: string;
+	private readonly _initialRunOn: boolean;
+	private readonly _initialTarget: TaskStorageTarget;
+	private _selectedTarget: TaskStorageTarget;
+
+	private readonly _onDidSubmit = this._register(new Emitter<IRunScriptCustomTaskWidgetResult>());
+	readonly onDidSubmit: Event<IRunScriptCustomTaskWidgetResult> = this._onDidSubmit.event;
+
+	private readonly _onDidCancel = this._register(new Emitter<void>());
+	readonly onDidCancel: Event<void> = this._onDidCancel.event;
+
+	constructor(state: IRunScriptCustomTaskWidgetState) {
+		super();
+
+		this._labelLocked = !!state.labelDisabledReason;
+		this._commandLocked = !!state.commandDisabledReason;
+		this._targetLocked = !!state.targetDisabledReason && state.target !== undefined;
+		this._isExistingTask = state.mode === 'configure';
+		this._isAddExistingTask = state.mode === 'add-existing';
+		this._selectedTarget = state.target ?? (state.targetDisabledReason ? 'user' : 'workspace');
+		this._initialLabel = state.label ?? '';
+		this._initialCommand = state.command ?? '';
+		this._initialRunOn = state.runOn === WORKTREE_CREATED_RUN_ON;
+		this._initialTarget = this._selectedTarget;
+
+		this.domNode = dom.$('.run-script-action-widget');
+
+		const labelSection = dom.append(this.domNode, dom.$('.run-script-action-section'));
+		dom.append(labelSection, dom.$('label.run-script-action-label', undefined, localize('labelFieldLabel', "Name")));
+		const labelInputContainer = dom.append(labelSection, dom.$('.run-script-action-input'));
+		this._labelInput = this._register(new InputBox(labelInputContainer, undefined, {
+			placeholder: localize('enterLabelPlaceholder', "Enter a name for this task (optional)"),
+			tooltip: state.labelDisabledReason,
+			ariaLabel: localize('enterLabelAriaLabel', "Task name"),
+			inputBoxStyles: defaultInputBoxStyles,
+		}));
+		this._labelInput.value = state.label ?? '';
+		if (state.labelDisabledReason) {
+			this._labelInput.disable();
+		}
+
+		const commandSection = dom.append(this.domNode, dom.$('.run-script-action-section'));
+		dom.append(commandSection, dom.$('label.run-script-action-label', undefined, localize('commandFieldLabel', "Command")));
+		const commandInputContainer = dom.append(commandSection, dom.$('.run-script-action-input'));
+		this._commandInput = this._register(new InputBox(commandInputContainer, undefined, {
+			placeholder: localize('enterCommandPlaceholder', "Enter command (for example, npm run dev)"),
+			tooltip: state.commandDisabledReason,
+			ariaLabel: localize('enterCommandAriaLabel', "Task command"),
+			inputBoxStyles: defaultInputBoxStyles,
+		}));
+		this._commandInput.value = state.command ?? '';
+		if (state.commandDisabledReason) {
+			this._commandInput.disable();
+		}
+
+		const runOnSection = dom.append(this.domNode, dom.$('.run-script-action-section'));
+		dom.append(runOnSection, dom.$('div.run-script-action-label', undefined, localize('runOptionsLabel', "Run Options")));
+		const runOnRow = dom.append(runOnSection, dom.$('.run-script-action-option-row'));
+		this._runOnCheckbox = this._register(new Checkbox(localize('runOnWorktreeCreated', "Run When Worktree Is Created"), state.runOn === WORKTREE_CREATED_RUN_ON, defaultCheckboxStyles));
+		runOnRow.appendChild(this._runOnCheckbox.domNode);
+		const runOnText = dom.append(runOnRow, dom.$('span.run-script-action-option-text', undefined, localize('runOnWorktreeCreatedDescription', "Automatically run this task when the session worktree is created")));
+		this._register(dom.addDisposableListener(runOnText, dom.EventType.CLICK, () => this._runOnCheckbox.checked = !this._runOnCheckbox.checked));
+
+		const storageSection = dom.append(this.domNode, dom.$('.run-script-action-section'));
+		dom.append(storageSection, dom.$('div.run-script-action-label', undefined, localize('storageLabel', "Save In")));
+		const storageDisabledReason = state.targetDisabledReason;
+		const workspaceTargetDisabled = !!storageDisabledReason;
+		this._storageOptions = this._register(new Radio({
+			items: [
+				{
+					text: localize('workspaceStorageLabel', "Workspace"),
+					tooltip: storageDisabledReason ?? localize('workspaceStorageTooltip', "Save this task in the current workspace"),
+					isActive: this._selectedTarget === 'workspace',
+					disabled: workspaceTargetDisabled,
+				},
+				{
+					text: localize('userStorageLabel', "User"),
+					tooltip: this._targetLocked ? storageDisabledReason : localize('userStorageTooltip', "Save this task in your user tasks and make it available in all sessions"),
+					isActive: this._selectedTarget === 'user',
+					disabled: this._targetLocked,
+				}
+			]
+		}));
+		this._storageOptions.domNode.setAttribute('aria-label', localize('storageAriaLabel', "Task storage target"));
+		storageSection.appendChild(this._storageOptions.domNode);
+		if (storageDisabledReason && !this._targetLocked) {
+			dom.append(storageSection, dom.$('div.run-script-action-hint', undefined, storageDisabledReason));
+		}
+
+		const buttonRow = dom.append(this.domNode, dom.$('.run-script-action-buttons'));
+		this._cancelButton = this._register(new Button(buttonRow, { ...defaultButtonStyles, secondary: true }));
+		this._cancelButton.label = localize('cancelAddAction', "Cancel");
+		this._submitButton = this._register(new Button(buttonRow, defaultButtonStyles));
+		this._submitButton.label = this._getSubmitLabel();
+
+		this._register(this._labelInput.onDidChange(() => this._updateButtonState()));
+		this._register(this._commandInput.onDidChange(() => this._updateButtonState()));
+		this._register(this._storageOptions.onDidSelect(index => {
+			this._selectedTarget = index === 0 ? 'workspace' : 'user';
+			this._updateButtonState();
+		}));
+		this._register(this._runOnCheckbox.onChange(() => this._updateButtonState()));
+		this._register(this._submitButton.onDidClick(() => this._submit()));
+		this._register(this._cancelButton.onDidClick(() => this._onDidCancel.fire()));
+		this._register(dom.addDisposableListener(this._labelInput.inputElement, dom.EventType.KEY_DOWN, event => {
+			const keyboardEvent = new StandardKeyboardEvent(event);
+			if (keyboardEvent.equals(KeyCode.Enter)) {
+				keyboardEvent.preventDefault();
+				keyboardEvent.stopPropagation();
+				this._submit();
+			}
+		}));
+		this._register(dom.addDisposableListener(this._commandInput.inputElement, dom.EventType.KEY_DOWN, event => {
+			const keyboardEvent = new StandardKeyboardEvent(event);
+			if (keyboardEvent.equals(KeyCode.Enter)) {
+				keyboardEvent.preventDefault();
+				keyboardEvent.stopPropagation();
+				this._submit();
+			}
+		}));
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.KEY_DOWN, event => {
+			const keyboardEvent = new StandardKeyboardEvent(event);
+			if (keyboardEvent.equals(KeyCode.Escape)) {
+				keyboardEvent.preventDefault();
+				keyboardEvent.stopPropagation();
+				this._onDidCancel.fire();
+			}
+		}));
+
+		this._updateButtonState();
+	}
+
+	focus(): void {
+		if (!this._labelLocked) {
+			this._labelInput.focus();
+			return;
+		}
+		if (this._commandLocked) {
+			this._runOnCheckbox.focus();
+			return;
+		}
+		this._commandInput.focus();
+	}
+
+	private _submit(): void {
+		const label = this._labelInput.value.trim();
+		const command = this._commandInput.value.trim();
+		if (!command) {
+			return;
+		}
+
+		this._onDidSubmit.fire({
+			label: label.length > 0 ? label : undefined,
+			command,
+			target: this._selectedTarget,
+			runOn: this._runOnCheckbox.checked ? WORKTREE_CREATED_RUN_ON : undefined,
+		});
+	}
+
+	private _updateButtonState(): void {
+		this._submitButton.enabled = this._commandInput.value.trim().length > 0;
+		this._submitButton.label = this._getSubmitLabel();
+	}
+
+	private _getSubmitLabel(): string {
+		if (this._isAddExistingTask) {
+			return localize('confirmAddToSessions', "Add to Sessions Window");
+		}
+		if (!this._isExistingTask) {
+			return localize('confirmAddTask', "Add Task");
+		}
+
+		const targetChanged = this._selectedTarget !== this._initialTarget;
+		const labelChanged = this._labelInput.value !== this._initialLabel;
+		const commandChanged = this._commandInput.value !== this._initialCommand;
+		const runOnChanged = this._runOnCheckbox.checked !== this._initialRunOn;
+		const otherChanged = labelChanged || commandChanged || runOnChanged;
+
+		if (targetChanged && otherChanged) {
+			return localize('confirmMoveAndUpdateTask', "Move and Update Task");
+		}
+		if (targetChanged) {
+			return localize('confirmMoveTask', "Move Task");
+		}
+		return localize('confirmUpdateTask', "Update Task");
+	}
+}
diff --git a/src/vs/sessions/contrib/chat/browser/sessionTargetPicker.ts b/src/vs/sessions/contrib/chat/browser/sessionTargetPicker.ts
index 68d175b8fbe..a4a092d8349 100644
--- a/src/vs/sessions/contrib/chat/browser/sessionTargetPicker.ts
+++ b/src/vs/sessions/contrib/chat/browser/sessionTargetPicker.ts
@@ -2,300 +2,3 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-import * as dom from '../../../../base/browser/dom.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Radio } from '../../../../base/browser/ui/radio/radio.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { localize } from '../../../../nls.js';
-import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { IGitRepository } from '../../../../workbench/contrib/git/common/gitService.js';
-
-// #region --- Session Target Picker ---
-
-/**
- * A self-contained widget for selecting the session target (Local vs Cloud).
- * Encapsulates state, events, and rendering. Can be placed anywhere in the view.
- */
-export class SessionTargetPicker extends Disposable {
-
-	private _selectedTarget: AgentSessionProviders;
-	private _allowedTargets: AgentSessionProviders[];
-
-	private readonly _onDidChangeTarget = this._register(new Emitter<AgentSessionProviders>());
-	readonly onDidChangeTarget: Event<AgentSessionProviders> = this._onDidChangeTarget.event;
-
-	private readonly _renderDisposables = this._register(new DisposableStore());
-	private _container: HTMLElement | undefined;
-
-	get selectedTarget(): AgentSessionProviders {
-		return this._selectedTarget;
-	}
-
-	constructor(
-		allowedTargets: AgentSessionProviders[],
-		defaultTarget: AgentSessionProviders,
-	) {
-		super();
-		this._allowedTargets = allowedTargets;
-		this._selectedTarget = allowedTargets.includes(defaultTarget)
-			? defaultTarget
-			: allowedTargets[0];
-	}
-
-	/**
-	 * Renders the target radio (Local / Cloud) into the given container.
-	 */
-	render(container: HTMLElement): void {
-		this._container = container;
-		this._renderRadio();
-	}
-
-	updateAllowedTargets(targets: AgentSessionProviders[]): void {
-		if (targets.length === 0) {
-			return;
-		}
-		this._allowedTargets = targets;
-		if (!targets.includes(this._selectedTarget)) {
-			this._selectedTarget = targets[0];
-			this._onDidChangeTarget.fire(this._selectedTarget);
-		}
-		if (this._container) {
-			this._renderRadio();
-		}
-	}
-
-	private _renderRadio(): void {
-		if (!this._container) {
-			return;
-		}
-
-		this._renderDisposables.clear();
-		dom.clearNode(this._container);
-
-		if (this._allowedTargets.length === 0) {
-			return;
-		}
-
-		const targets = [AgentSessionProviders.Background, AgentSessionProviders.Cloud].filter(t => this._allowedTargets.includes(t));
-		const activeIndex = targets.indexOf(this._selectedTarget);
-
-		const radio = new Radio({
-			items: targets.map(target => ({
-				text: getTargetLabel(target),
-				isActive: target === this._selectedTarget,
-			})),
-		});
-		this._renderDisposables.add(radio);
-		this._container.appendChild(radio.domNode);
-
-		if (activeIndex >= 0) {
-			radio.setActiveItem(activeIndex);
-		}
-
-		this._renderDisposables.add(radio.onDidSelect(index => {
-			const target = targets[index];
-			if (this._selectedTarget !== target) {
-				this._selectedTarget = target;
-				this._onDidChangeTarget.fire(target);
-			}
-		}));
-	}
-}
-
-function getTargetLabel(provider: AgentSessionProviders): string {
-	switch (provider) {
-		case AgentSessionProviders.Local:
-		case AgentSessionProviders.Background:
-			return localize('chat.session.providerLabel.local', "Local");
-		case AgentSessionProviders.Cloud:
-			return localize('chat.session.providerLabel.cloud', "Cloud");
-		case AgentSessionProviders.Claude:
-			return 'Claude';
-		case AgentSessionProviders.Codex:
-			return 'Codex';
-		case AgentSessionProviders.Growth:
-			return 'Growth';
-	}
-}
-
-// #endregion
-
-// #region --- Isolation Mode Picker ---
-
-export type IsolationMode = 'worktree' | 'workspace';
-
-/**
- * A self-contained widget for selecting the isolation mode (Worktree vs Folder).
- * Encapsulates state, events, and rendering. Can be placed anywhere in the view.
- */
-export class IsolationModePicker extends Disposable {
-
-	private _isolationMode: IsolationMode = 'worktree';
-	private _preferredIsolationMode: IsolationMode | undefined;
-	private _repository: IGitRepository | undefined;
-
-	private readonly _onDidChange = this._register(new Emitter<IsolationMode>());
-	readonly onDidChange: Event<IsolationMode> = this._onDidChange.event;
-
-	private readonly _renderDisposables = this._register(new DisposableStore());
-	private _slotElement: HTMLElement | undefined;
-	private _triggerElement: HTMLElement | undefined;
-
-	get isolationMode(): IsolationMode {
-		return this._isolationMode;
-	}
-
-	constructor(
-		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
-	) {
-		super();
-	}
-
-	/**
-	 * Sets the git repository. When undefined, worktree option is hidden
-	 * and isolation mode falls back to 'workspace'.
-	 */
-	setRepository(repository: IGitRepository | undefined): void {
-		this._repository = repository;
-		if (repository) {
-			const preferred = this._preferredIsolationMode;
-			this._preferredIsolationMode = undefined;
-			this._setMode(preferred ?? this._isolationMode);
-		} else if (this._isolationMode === 'worktree') {
-			this._preferredIsolationMode ??= this._isolationMode;
-			this._setMode('workspace');
-		}
-		this._updateTriggerLabel();
-	}
-
-	/**
-	 * Renders the isolation mode picker into the given container.
-	 */
-	render(container: HTMLElement): void {
-		this._renderDisposables.clear();
-
-		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
-		this._slotElement = slot;
-		this._renderDisposables.add({ dispose: () => slot.remove() });
-
-		const trigger = dom.append(slot, dom.$('a.action-label'));
-		trigger.tabIndex = 0;
-		trigger.role = 'button';
-		this._triggerElement = trigger;
-		this._updateTriggerLabel();
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
-			dom.EventHelper.stop(e, true);
-			this._showPicker();
-		}));
-
-		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
-			if (e.key === 'Enter' || e.key === ' ') {
-				dom.EventHelper.stop(e, true);
-				this._showPicker();
-			}
-		}));
-	}
-
-	/**
-	 * Sets a preferred isolation mode to apply when a repository is set.
-	 */
-	setPreferredIsolationMode(mode: IsolationMode): void {
-		this._preferredIsolationMode = mode;
-	}
-
-	/**
-	 * Programmatically set the isolation mode.
-	 */
-	setIsolationMode(mode: IsolationMode): void {
-		this._setMode(mode);
-	}
-
-	/**
-	 * Shows or hides the picker.
-	 */
-	setVisible(visible: boolean): void {
-		if (this._slotElement) {
-			this._slotElement.style.display = visible ? '' : 'none';
-		}
-	}
-
-	private _showPicker(): void {
-		if (!this._triggerElement || this.actionWidgetService.isVisible || !this._repository) {
-			return;
-		}
-
-		const items: IActionListItem<IsolationMode>[] = [
-			{
-				kind: ActionListItemKind.Action,
-				label: localize('isolationMode.folder', "Folder"),
-				group: { title: '', icon: Codicon.folder },
-				item: 'workspace',
-			},
-			{
-				kind: ActionListItemKind.Action,
-				label: localize('isolationMode.worktree', "Worktree"),
-				group: { title: '', icon: Codicon.worktree },
-				item: 'worktree',
-			},
-		];
-
-		const triggerElement = this._triggerElement;
-		const delegate: IActionListDelegate<IsolationMode> = {
-			onSelect: (mode) => {
-				this.actionWidgetService.hide();
-				this._setMode(mode);
-			},
-			onHide: () => { triggerElement.focus(); },
-		};
-
-		this.actionWidgetService.show<IsolationMode>(
-			'isolationModePicker',
-			false,
-			items,
-			delegate,
-			this._triggerElement,
-			undefined,
-			[],
-			{
-				getAriaLabel: (item) => item.label ?? '',
-				getWidgetAriaLabel: () => localize('isolationModePicker.ariaLabel', "Isolation Mode"),
-			},
-		);
-	}
-
-	private _setMode(mode: IsolationMode): void {
-		if (this._isolationMode !== mode) {
-			this._isolationMode = mode;
-			this._onDidChange.fire(mode);
-			this._updateTriggerLabel();
-		}
-	}
-
-	private _updateTriggerLabel(): void {
-		if (!this._triggerElement) {
-			return;
-		}
-
-		dom.clearNode(this._triggerElement);
-		const isDisabled = !this._repository;
-		const modeIcon = this._isolationMode === 'worktree' ? Codicon.worktree : Codicon.folder;
-		const modeLabel = this._isolationMode === 'worktree'
-			? localize('isolationMode.worktree', "Worktree")
-			: localize('isolationMode.folder', "Folder");
-
-		dom.append(this._triggerElement, renderIcon(modeIcon));
-		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
-		labelSpan.textContent = modeLabel;
-		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
-
-		this._slotElement?.classList.toggle('disabled', isDisabled);
-	}
-}
-
-// #endregion
diff --git a/src/vs/sessions/contrib/chat/browser/sessionTypePicker.ts b/src/vs/sessions/contrib/chat/browser/sessionTypePicker.ts
new file mode 100644
index 00000000000..510ae8feadb
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/sessionTypePicker.ts
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { localize } from '../../../../nls.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
+import { ISessionType } from '../../sessions/browser/sessionsProvider.js';
+
+export class SessionTypePicker extends Disposable {
+
+	private _sessionType: string | undefined;
+	private _sessionTypes: ISessionType[] = [];
+
+	private readonly _renderDisposables = this._register(new DisposableStore());
+	private _slotElement: HTMLElement | undefined;
+	private _triggerElement: HTMLElement | undefined;
+
+	constructor(
+		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		this._register(autorun(reader => {
+			const session = this.sessionsManagementService.activeSession.read(reader);
+			if (session) {
+				this._sessionTypes = this.sessionsProvidersService.getSessionTypes(session);
+				this._sessionType = session.sessionType;
+			} else {
+				this._sessionTypes = [];
+				this._sessionType = undefined;
+			}
+			this._updateTriggerLabel();
+		}));
+	}
+
+	render(container: HTMLElement): void {
+		this._renderDisposables.clear();
+
+		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
+		this._slotElement = slot;
+		this._renderDisposables.add({ dispose: () => slot.remove() });
+
+		const trigger = dom.append(slot, dom.$('a.action-label'));
+		trigger.tabIndex = 0;
+		trigger.role = 'button';
+		this._triggerElement = trigger;
+		this._updateTriggerLabel();
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
+			dom.EventHelper.stop(e, true);
+			this._showPicker();
+		}));
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				dom.EventHelper.stop(e, true);
+				this._showPicker();
+			}
+		}));
+	}
+
+	private _showPicker(): void {
+		if (!this._triggerElement || this.actionWidgetService.isVisible) {
+			return;
+		}
+
+		if (this._sessionTypes.length <= 1) {
+			return;
+		}
+
+		const session = this.sessionsManagementService.activeSession.get();
+		if (!session) {
+			return;
+		}
+
+		const items: IActionListItem<ISessionType>[] = this._sessionTypes.map(type => ({
+			kind: ActionListItemKind.Action,
+			label: type.label,
+			group: { title: '', icon: type.icon },
+			item: type.id === this._sessionType ? { ...type, checked: true } : type,
+		}));
+
+		const triggerElement = this._triggerElement;
+		const delegate: IActionListDelegate<ISessionType> = {
+			onSelect: (type) => {
+				this.actionWidgetService.hide();
+				this.sessionsManagementService.setSessionType(session, type);
+			},
+			onHide: () => { triggerElement.focus(); },
+		};
+
+		this.actionWidgetService.show<ISessionType>(
+			'sessionTypePicker',
+			false,
+			items,
+			delegate,
+			this._triggerElement,
+			undefined,
+			[],
+			{
+				getAriaLabel: (item) => item.label ?? '',
+				getWidgetAriaLabel: () => localize('sessionTypePicker.ariaLabel', "Session Type"),
+			},
+		);
+	}
+
+	private _updateTriggerLabel(): void {
+		if (!this._triggerElement) {
+			return;
+		}
+
+		dom.clearNode(this._triggerElement);
+
+		const currentType = this._sessionTypes.find(t => t.id === this._sessionType);
+		const modeIcon = currentType?.icon ?? Codicon.terminal;
+		const modeLabel = currentType?.label ?? this._sessionType ?? '';
+
+		dom.append(this._triggerElement, renderIcon(modeIcon));
+		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
+		labelSpan.textContent = modeLabel;
+
+		const hasMultipleTypes = this._sessionTypes.length > 1;
+		this._slotElement?.classList.toggle('disabled', !hasMultipleTypes);
+		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
+	}
+}
diff --git a/src/vs/sessions/contrib/chat/browser/sessionWorkspacePicker.ts b/src/vs/sessions/contrib/chat/browser/sessionWorkspacePicker.ts
new file mode 100644
index 00000000000..c70e5fd750a
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/sessionWorkspacePicker.ts
@@ -0,0 +1,541 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { SubmenuAction, toAction } from '../../../../base/common/actions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { localize } from '../../../../nls.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ISessionWorkspace } from '../../sessions/common/sessionData.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionsBrowseAction } from '../../sessions/browser/sessionsProvider.js';
+import { COPILOT_PROVIDER_ID } from '../../copilotChatSessions/browser/copilotChatSessionsProvider.js';
+
+const LEGACY_STORAGE_KEY_RECENT_PROJECTS = 'sessions.recentlyPickedProjects';
+const STORAGE_KEY_RECENT_WORKSPACES = 'sessions.recentlyPickedWorkspaces';
+const FILTER_THRESHOLD = 10;
+const MAX_RECENT_WORKSPACES = 10;
+
+/**
+ * A workspace selection from the picker, pairing the workspace with its owning provider.
+ */
+export interface IWorkspaceSelection {
+	readonly providerId: string;
+	readonly workspace: ISessionWorkspace;
+}
+
+/**
+ * Stored recent workspace entry. The `checked` flag marks the currently
+ * selected workspace so we only need a single storage key.
+ */
+interface IStoredRecentWorkspace {
+	readonly uri: UriComponents;
+	readonly providerId: string;
+	readonly checked: boolean;
+}
+
+/**
+ * Item type used in the action list.
+ */
+interface IWorkspacePickerItem {
+	readonly selection?: IWorkspaceSelection;
+	readonly browseActionIndex?: number;
+	readonly checked?: boolean;
+}
+
+/**
+ * A unified workspace picker that shows workspaces from all registered session
+ * providers in a single dropdown.
+ *
+ * Browse actions from providers are appended at the bottom of the list.
+ */
+export class WorkspacePicker extends Disposable {
+
+	private readonly _onDidSelectWorkspace = this._register(new Emitter<IWorkspaceSelection>());
+	readonly onDidSelectWorkspace: Event<IWorkspaceSelection> = this._onDidSelectWorkspace.event;
+
+	private _selectedWorkspace: IWorkspaceSelection | undefined;
+
+	private _triggerElement: HTMLElement | undefined;
+	private readonly _renderDisposables = this._register(new DisposableStore());
+
+	get selectedProject(): IWorkspaceSelection | undefined {
+		return this._selectedWorkspace;
+	}
+
+	constructor(
+		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		// Migrate legacy storage to new key
+		this._migrateLegacyStorage();
+
+		// Restore selected workspace from storage
+		this._selectedWorkspace = this._restoreSelectedWorkspace();
+
+		// React to provider registrations/removals: re-validate the current
+		// selection and attempt to restore a stored workspace when none is active.
+		this._register(this.sessionsProvidersService.onDidChangeProviders(() => {
+			if (this._selectedWorkspace) {
+				// Validate that the selected workspace's provider is still registered
+				const providers = this.sessionsProvidersService.getProviders();
+				if (!providers.some(p => p.id === this._selectedWorkspace!.providerId)) {
+					this._selectedWorkspace = undefined;
+					this._updateTriggerLabel();
+				}
+			}
+			if (!this._selectedWorkspace) {
+				const restored = this._restoreSelectedWorkspace();
+				if (restored) {
+					this._selectedWorkspace = restored;
+					this._updateTriggerLabel();
+					this._onDidSelectWorkspace.fire(restored);
+				}
+			}
+		}));
+	}
+
+	/**
+	 * Renders the project picker trigger button into the given container.
+	 * Returns the container element.
+	 */
+	render(container: HTMLElement): HTMLElement {
+		this._renderDisposables.clear();
+
+		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot.sessions-chat-workspace-picker'));
+		this._renderDisposables.add({ dispose: () => slot.remove() });
+
+		const trigger = dom.append(slot, dom.$('a.action-label'));
+		trigger.tabIndex = 0;
+		trigger.role = 'button';
+		this._triggerElement = trigger;
+
+		this._updateTriggerLabel();
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
+			dom.EventHelper.stop(e, true);
+			this.showPicker();
+		}));
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				dom.EventHelper.stop(e, true);
+				this.showPicker();
+			}
+		}));
+
+		return slot;
+	}
+
+	/**
+	 * Shows the workspace picker dropdown anchored to the trigger element.
+	 */
+	showPicker(): void {
+		if (!this._triggerElement || this.actionWidgetService.isVisible) {
+			return;
+		}
+
+		const items = this._buildItems();
+		const showFilter = items.filter(i => i.kind === ActionListItemKind.Action).length > FILTER_THRESHOLD;
+
+		const triggerElement = this._triggerElement;
+		const delegate: IActionListDelegate<IWorkspacePickerItem> = {
+			onSelect: (item) => {
+				this.actionWidgetService.hide();
+				if (item.browseActionIndex !== undefined) {
+					this._executeBrowseAction(item.browseActionIndex);
+				} else if (item.selection) {
+					this._selectProject(item.selection);
+				}
+			},
+			onHide: () => { triggerElement.focus(); },
+		};
+
+		const listOptions = showFilter ? { showFilter: true, filterPlaceholder: localize('workspacePicker.filter', "Search Workspaces..."), reserveSubmenuSpace: false } : { reserveSubmenuSpace: false };
+
+		this.actionWidgetService.show<IWorkspacePickerItem>(
+			'workspacePicker',
+			false,
+			items,
+			delegate,
+			this._triggerElement,
+			undefined,
+			[],
+			{
+				getAriaLabel: (item) => item.label ?? '',
+				getWidgetAriaLabel: () => localize('workspacePicker.ariaLabel', "Workspace Picker"),
+			},
+			listOptions,
+		);
+	}
+
+	/**
+	 * Programmatically set the selected project.
+	 * @param fireEvent Whether to fire the onDidSelectWorkspace event. Defaults to true.
+	 */
+	setSelectedWorkspace(project: IWorkspaceSelection, fireEvent = true): void {
+		this._selectProject(project, fireEvent);
+	}
+
+	/**
+	 * Clears the selected project.
+	 */
+	clearSelection(): void {
+		this._selectedWorkspace = undefined;
+		// Clear checked state from all recents
+		const recents = this._getStoredRecentWorkspaces();
+		const updated = recents.map(p => ({ ...p, checked: false }));
+		this.storageService.store(STORAGE_KEY_RECENT_WORKSPACES, JSON.stringify(updated), StorageScope.PROFILE, StorageTarget.MACHINE);
+		this._updateTriggerLabel();
+	}
+
+	/**
+	 * Clears the selection if it matches the given URI.
+	 */
+	removeFromRecents(uri: URI): void {
+		if (this._selectedWorkspace && this.uriIdentityService.extUri.isEqual(this._selectedWorkspace.workspace.repositories[0]?.uri, uri)) {
+			this.clearSelection();
+		}
+	}
+
+	private _selectProject(selection: IWorkspaceSelection, fireEvent = true): void {
+		this._selectedWorkspace = selection;
+		this._persistSelectedWorkspace(selection);
+		this._updateTriggerLabel();
+		if (fireEvent) {
+			this._onDidSelectWorkspace.fire(selection);
+		}
+	}
+
+	/**
+	 * Executes a browse action from a provider, identified by index.
+	 */
+	private async _executeBrowseAction(actionIndex: number): Promise<void> {
+		const allActions = this._getAllBrowseActions();
+		const action = allActions[actionIndex];
+		if (!action) {
+			return;
+		}
+
+		try {
+			const workspace = await action.execute();
+			if (workspace) {
+				this._selectProject({ providerId: action.providerId, workspace });
+			}
+		} catch {
+			// browse action was cancelled or failed
+		}
+	}
+
+	private _getActiveProviders(): import('../../sessions/browser/sessionsProvider.js').ISessionsProvider[] {
+		const activeProviderId = this.sessionsManagementService.activeProviderId.get();
+		const allProviders = this.sessionsProvidersService.getProviders();
+		if (activeProviderId) {
+			const active = allProviders.find(p => p.id === activeProviderId);
+			if (active) {
+				return [active];
+			}
+		}
+		return allProviders;
+	}
+
+	/**
+	 * Collects browse actions from all registered providers.
+	 */
+	private _getAllBrowseActions(): ISessionsBrowseAction[] {
+		return this.sessionsProvidersService.getProviders().flatMap(p => p.browseActions);
+	}
+
+	private _buildItems(): IActionListItem<IWorkspacePickerItem>[] {
+		const items: IActionListItem<IWorkspacePickerItem>[] = [];
+
+		// Collect recent workspaces from picker storage across all providers
+		const allProviders = this.sessionsProvidersService.getProviders();
+		const providerIds = new Set(allProviders.map(p => p.id));
+		const recentWorkspaces = this._getRecentWorkspaces().filter(w => providerIds.has(w.providerId));
+		const hasMultipleProviders = allProviders.length > 1;
+
+		if (hasMultipleProviders) {
+			// Group workspaces by provider, showing provider name as description on the first entry
+			const providersWithWorkspaces = allProviders.filter(p => recentWorkspaces.some(w => w.providerId === p.id));
+			for (let pi = 0; pi < providersWithWorkspaces.length; pi++) {
+				const provider = providersWithWorkspaces[pi];
+				const providerWorkspaces = recentWorkspaces.filter(w => w.providerId === provider.id);
+				for (let i = 0; i < providerWorkspaces.length; i++) {
+					const { workspace, providerId } = providerWorkspaces[i];
+					const selection: IWorkspaceSelection = { providerId, workspace };
+					const selected = this._isSelectedWorkspace(selection);
+					items.push({
+						kind: ActionListItemKind.Action,
+						label: workspace.label,
+						description: i === 0 ? provider.label : undefined,
+						group: { title: '', icon: workspace.icon },
+						item: { selection, checked: selected || undefined },
+						onRemove: () => this._removeRecentWorkspace(selection),
+					});
+				}
+				if (pi < providersWithWorkspaces.length - 1) {
+					items.push({ kind: ActionListItemKind.Separator, label: '' });
+				}
+			}
+		} else {
+			for (const { workspace, providerId } of recentWorkspaces) {
+				const selection: IWorkspaceSelection = { providerId, workspace };
+				const selected = this._isSelectedWorkspace(selection);
+				items.push({
+					kind: ActionListItemKind.Action,
+					label: workspace.label,
+					group: { title: '', icon: workspace.icon },
+					item: { selection, checked: selected || undefined },
+					onRemove: () => this._removeRecentWorkspace(selection),
+				});
+			}
+		}
+
+		// Browse actions from all providers
+		const allBrowseActions = this._getAllBrowseActions();
+		if (items.length > 0 && allBrowseActions.length > 0) {
+			items.push({ kind: ActionListItemKind.Separator, label: '' });
+		}
+		if (hasMultipleProviders && allBrowseActions.length > 1) {
+			// Show a single "Browse..." entry with provider-grouped submenu actions
+			const providerMap = new Map<string, { provider: typeof allProviders[0]; actions: { action: ISessionsBrowseAction; index: number }[] }>();
+			allBrowseActions.forEach((action, i) => {
+				let entry = providerMap.get(action.providerId);
+				if (!entry) {
+					const provider = allProviders.find(p => p.id === action.providerId);
+					if (!provider) { return; }
+					entry = { provider, actions: [] };
+					providerMap.set(action.providerId, entry);
+				}
+				entry.actions.push({ action, index: i });
+			});
+			const submenuActions = [...providerMap.values()].map(({ provider, actions }) =>
+				new SubmenuAction(
+					`workspacePicker.browse.${provider.id}`,
+					provider.label,
+					actions.map(({ action, index }) => toAction({
+						id: `workspacePicker.browse.${index}`,
+						label: localize(`workspacePicker.browse`, "{0}...", action.label),
+						tooltip: '',
+						run: () => this._executeBrowseAction(index),
+					})),
+				)
+			);
+			items.push({
+				kind: ActionListItemKind.Action,
+				label: localize('workspacePicker.browse', "Select..."),
+				group: { title: '', icon: Codicon.folderOpened },
+				item: {},
+				submenuActions,
+			});
+		} else {
+			for (let i = 0; i < allBrowseActions.length; i++) {
+				const action = allBrowseActions[i];
+				items.push({
+					kind: ActionListItemKind.Action,
+					label: localize(`workspacePicker.browse`, "Select {0}...", action.label),
+					group: { title: '', icon: action.icon },
+					item: { browseActionIndex: i },
+				});
+			}
+		}
+
+		return items;
+	}
+
+	private _updateTriggerLabel(): void {
+		if (!this._triggerElement) {
+			return;
+		}
+
+		dom.clearNode(this._triggerElement);
+		const workspace = this._selectedWorkspace?.workspace;
+		const label = workspace ? workspace.label : localize('pickWorkspace', "Pick a Workspace");
+		const icon = workspace ? workspace.icon : Codicon.project;
+
+		dom.append(this._triggerElement, renderIcon(icon));
+		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
+		labelSpan.textContent = label;
+		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
+	}
+
+	private _isSelectedWorkspace(selection: IWorkspaceSelection): boolean {
+		if (!this._selectedWorkspace) {
+			return false;
+		}
+		if (this._selectedWorkspace.providerId !== selection.providerId) {
+			return false;
+		}
+		const selectedUri = this._selectedWorkspace.workspace.repositories[0]?.uri;
+		const candidateUri = selection.workspace.repositories[0]?.uri;
+		return this.uriIdentityService.extUri.isEqual(selectedUri, candidateUri);
+	}
+
+	private _persistSelectedWorkspace(selection: IWorkspaceSelection): void {
+		const uri = selection.workspace.repositories[0]?.uri;
+		if (!uri) {
+			return;
+		}
+		this._addRecentWorkspace(selection.providerId, selection.workspace, true);
+	}
+
+	private _restoreSelectedWorkspace(): IWorkspaceSelection | undefined {
+		try {
+			const providers = this._getActiveProviders();
+			const providerIds = new Set(providers.map(p => p.id));
+			const storedRecents = this._getStoredRecentWorkspaces();
+
+			// Find the checked entry for an active provider
+			for (const stored of storedRecents) {
+				if (!stored.checked || !providerIds.has(stored.providerId)) {
+					continue;
+				}
+				const uri = URI.revive(stored.uri);
+				const workspace = this.sessionsProvidersService.resolveWorkspace(stored.providerId, uri);
+				if (workspace) {
+					return { providerId: stored.providerId, workspace };
+				}
+			}
+
+			// No checked entry found — fall back to the first resolvable recent workspace
+			for (const stored of storedRecents) {
+				if (!providerIds.has(stored.providerId)) {
+					continue;
+				}
+				const uri = URI.revive(stored.uri);
+				const workspace = this.sessionsProvidersService.resolveWorkspace(stored.providerId, uri);
+				if (workspace) {
+					return { providerId: stored.providerId, workspace };
+				}
+			}
+			return undefined;
+		} catch {
+			return undefined;
+		}
+	}
+
+	/**
+	 * Migrate legacy `sessions.recentlyPickedProjects` storage to the new
+	 * `sessions.recentlyPickedWorkspaces` key, adding `providerId` (defaulting
+	 * to Copilot) and ensuring at least one entry is checked.
+	 */
+	private _migrateLegacyStorage(): void {
+		// Already migrated
+		if (this.storageService.get(STORAGE_KEY_RECENT_WORKSPACES, StorageScope.PROFILE)) {
+			return;
+		}
+
+		const raw = this.storageService.get(LEGACY_STORAGE_KEY_RECENT_PROJECTS, StorageScope.PROFILE);
+		if (!raw) {
+			return;
+		}
+
+		try {
+			const parsed = JSON.parse(raw) as { uri: UriComponents; checked?: boolean }[];
+			const hasAnyChecked = parsed.some(e => e.checked);
+			const migrated: IStoredRecentWorkspace[] = parsed.map((entry, index) => ({
+				uri: entry.uri,
+				providerId: COPILOT_PROVIDER_ID,
+				checked: hasAnyChecked ? !!entry.checked : index === 0,
+			}));
+			this.storageService.store(STORAGE_KEY_RECENT_WORKSPACES, JSON.stringify(migrated), StorageScope.PROFILE, StorageTarget.MACHINE);
+		} catch { /* ignore */ }
+
+		this.storageService.remove(LEGACY_STORAGE_KEY_RECENT_PROJECTS, StorageScope.PROFILE);
+	}
+
+	// -- Recent workspaces storage --
+
+	private _addRecentWorkspace(providerId: string, workspace: ISessionWorkspace, checked: boolean): void {
+		const uri = workspace.repositories[0]?.uri;
+		if (!uri) {
+			return;
+		}
+		const recents = this._getStoredRecentWorkspaces();
+		const filtered = recents.map(p => {
+			// Remove the entry being re-added (it will go to the front)
+			if (p.providerId === providerId && this.uriIdentityService.extUri.isEqual(URI.revive(p.uri), uri)) {
+				return undefined;
+			}
+			// Clear checked from other entries for the same provider when marking checked
+			if (checked && p.providerId === providerId) {
+				return { ...p, checked: false };
+			}
+			return p;
+		}).filter((p): p is IStoredRecentWorkspace => p !== undefined);
+
+		const entry: IStoredRecentWorkspace = { uri: uri.toJSON(), providerId, checked };
+		const updated = [entry, ...filtered].slice(0, MAX_RECENT_WORKSPACES);
+		this.storageService.store(STORAGE_KEY_RECENT_WORKSPACES, JSON.stringify(updated), StorageScope.PROFILE, StorageTarget.MACHINE);
+	}
+
+	private _getRecentWorkspaces(): { providerId: string; workspace: ISessionWorkspace }[] {
+		return this._getStoredRecentWorkspaces()
+			.map(stored => {
+				const uri = URI.revive(stored.uri);
+				const workspace = this.sessionsProvidersService.resolveWorkspace(stored.providerId, uri);
+				if (!workspace) {
+					return undefined;
+				}
+				return { providerId: stored.providerId, workspace };
+			})
+			.filter((w): w is { providerId: string; workspace: ISessionWorkspace } => w !== undefined)
+			.sort((a, b) => {
+				// Local folders first, then remote repositories, alphabetical within each group
+				const aIsLocal = a.workspace.repositories[0]?.uri.scheme === Schemas.file;
+				const bIsLocal = b.workspace.repositories[0]?.uri.scheme === Schemas.file;
+				if (aIsLocal !== bIsLocal) {
+					return aIsLocal ? -1 : 1;
+				}
+				return a.workspace.label.localeCompare(b.workspace.label);
+			});
+	}
+
+	private _removeRecentWorkspace(selection: IWorkspaceSelection): void {
+		const uri = selection.workspace.repositories[0]?.uri;
+		if (!uri) {
+			return;
+		}
+		const recents = this._getStoredRecentWorkspaces();
+		const updated = recents.filter(p =>
+			!(p.providerId === selection.providerId && this.uriIdentityService.extUri.isEqual(URI.revive(p.uri), uri))
+		);
+		this.storageService.store(STORAGE_KEY_RECENT_WORKSPACES, JSON.stringify(updated), StorageScope.PROFILE, StorageTarget.MACHINE);
+
+		// Clear current selection if it was the removed workspace
+		if (this._isSelectedWorkspace(selection)) {
+			this._selectedWorkspace = undefined;
+			this._updateTriggerLabel();
+		}
+	}
+
+	private _getStoredRecentWorkspaces(): IStoredRecentWorkspace[] {
+		const raw = this.storageService.get(STORAGE_KEY_RECENT_WORKSPACES, StorageScope.PROFILE);
+		if (!raw) {
+			return [];
+		}
+		try {
+			return JSON.parse(raw) as IStoredRecentWorkspace[];
+		} catch {
+			return [];
+		}
+	}
+
+}
diff --git a/src/vs/sessions/contrib/chat/browser/sessionsConfigurationService.ts b/src/vs/sessions/contrib/chat/browser/sessionsConfigurationService.ts
index a36bed73da5..39d52cfe857 100644
--- a/src/vs/sessions/contrib/chat/browser/sessionsConfigurationService.ts
+++ b/src/vs/sessions/contrib/chat/browser/sessionsConfigurationService.ts
@@ -7,19 +7,25 @@ import { Disposable, DisposableStore, MutableDisposable } from '../../../../base
 import { IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
 import { joinPath, dirname, isEqual } from '../../../../base/common/resources.js';
 import { parse } from '../../../../base/common/jsonc.js';
-import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
-import { TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionData } from '../../sessions/common/sessionData.js';
 import { IJSONEditingService } from '../../../../workbench/services/configuration/common/jsonEditing.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IPreferencesService } from '../../../../workbench/services/preferences/common/preferences.js';
-import { ITerminalInstance, ITerminalService } from '../../../../workbench/contrib/terminal/browser/terminal.js';
 import { CommandString } from '../../../../workbench/contrib/tasks/common/taskConfiguration.js';
+import { TaskRunSource } from '../../../../workbench/contrib/tasks/common/tasks.js';
+import { ITaskService } from '../../../../workbench/contrib/tasks/common/taskService.js';
 
 export type TaskStorageTarget = 'user' | 'workspace';
+type TaskRunOnOption = 'default' | 'folderOpen' | 'worktreeCreated';
+
+interface ITaskRunOptions {
+	readonly runOn?: TaskRunOnOption;
+}
 
 /**
  * Shape of a single task entry inside tasks.json.
@@ -32,12 +38,26 @@ export interface ITaskEntry {
 	readonly command?: string;
 	readonly args?: CommandString[];
 	readonly inSessions?: boolean;
+	readonly runOptions?: ITaskRunOptions;
 	readonly windows?: { command?: string; args?: CommandString[] };
 	readonly osx?: { command?: string; args?: CommandString[] };
 	readonly linux?: { command?: string; args?: CommandString[] };
 	readonly [key: string]: unknown;
 }
 
+export interface INonSessionTaskEntry {
+	readonly task: ITaskEntry;
+	readonly target: TaskStorageTarget;
+}
+
+/**
+ * A session task together with the storage target it was loaded from.
+ */
+export interface ISessionTaskWithTarget {
+	readonly task: ITaskEntry;
+	readonly target: TaskStorageTarget;
+}
+
 interface ITasksJson {
 	version?: string;
 	tasks?: ITaskEntry[];
@@ -48,38 +68,55 @@ export interface ISessionsConfigurationService {
 
 	/**
 	 * Observable list of tasks with `inSessions: true`, automatically
-	 * updated when the tasks.json file changes.
+	 * updated when the tasks.json file changes. Each entry includes the
+	 * storage target the task was loaded from.
 	 */
-	getSessionTasks(session: IActiveSessionItem): IObservable<readonly ITaskEntry[]>;
+	getSessionTasks(session: ISessionData): IObservable<readonly ISessionTaskWithTarget[]>;
 
 	/**
 	 * Returns tasks that do NOT have `inSessions: true` — used as
 	 * suggestions in the "Add Run Action" picker.
 	 */
-	getNonSessionTasks(session: IActiveSessionItem): Promise<readonly ITaskEntry[]>;
+	getNonSessionTasks(session: ISessionData): Promise<readonly INonSessionTaskEntry[]>;
 
 	/**
 	 * Sets `inSessions: true` on an existing task (identified by label),
 	 * updating it in place in its tasks.json.
 	 */
-	addTaskToSessions(task: ITaskEntry, session: IActiveSessionItem, target: TaskStorageTarget): Promise<void>;
+	addTaskToSessions(task: ITaskEntry, session: ISessionData, target: TaskStorageTarget, options?: ITaskRunOptions): Promise<void>;
 
 	/**
 	 * Creates a new shell task with `inSessions: true` and writes it to
 	 * the appropriate tasks.json (user or workspace).
 	 */
-	createAndAddTask(command: string, session: IActiveSessionItem, target: TaskStorageTarget): Promise<ITaskEntry | undefined>;
+	createAndAddTask(label: string | undefined, command: string, session: ISessionData, target: TaskStorageTarget, options?: ITaskRunOptions): Promise<ITaskEntry | undefined>;
 
 	/**
-	 * Runs a task entry in a terminal, resolving the correct platform
-	 * command and using the session worktree as cwd.
+	 * Updates an existing task entry, optionally moving it between user and
+	 * workspace storage.
 	 */
-	runTask(task: ITaskEntry, session: IActiveSessionItem): Promise<void>;
+	updateTask(originalTaskLabel: string, updatedTask: ITaskEntry, session: ISessionData, currentTarget: TaskStorageTarget, newTarget: TaskStorageTarget): Promise<void>;
 
 	/**
-	 * Observable label of the most recently run task for the given repository.
+	 * Removes an existing task entry from its tasks.json.
 	 */
-	getLastRunTaskLabel(repository: URI | undefined): IObservable<string | undefined>;
+	removeTask(taskLabel: string, session: ISessionData, target: TaskStorageTarget): Promise<void>;
+
+	/**
+	 * Runs a task via the task service, looking it up by label in the
+	 * workspace folder corresponding to the session worktree.
+	 */
+	runTask(task: ITaskEntry, session: ISessionData): Promise<void>;
+
+	/**
+	 * Observable label of the pinned task for the given repository.
+	 */
+	getPinnedTaskLabel(repository: URI | undefined): IObservable<string | undefined>;
+
+	/**
+	 * Sets or clears the pinned task for the given repository.
+	 */
+	setPinnedTaskLabel(repository: URI | undefined, taskLabel: string | undefined): void;
 }
 
 export const ISessionsConfigurationService = createDecorator<ISessionsConfigurationService>('sessionsConfigurationService');
@@ -88,15 +125,11 @@ export class SessionsConfigurationService extends Disposable implements ISession
 
 	declare readonly _serviceBrand: undefined;
 
-	private static readonly _LAST_RUN_TASK_LABELS_KEY = 'agentSessions.lastRunTaskLabels';
-	private static readonly _SUPPORTED_TASK_TYPES = new Set(['shell', 'npm']);
-
-	private readonly _sessionTasks = observableValue<readonly ITaskEntry[]>(this, []);
+	private static readonly _PINNED_TASK_LABELS_KEY = 'agentSessions.pinnedTaskLabels';
+	private readonly _sessionTasks = observableValue<readonly ISessionTaskWithTarget[]>(this, []);
 	private readonly _fileWatcher = this._register(new MutableDisposable());
-	/** Maps `cwd.toString() + command` to the terminal `instanceId`. */
-	private readonly _taskTerminals = new Map<string, number>();
-	private readonly _lastRunTaskLabels: Map<string, string>;
-	private readonly _lastRunTaskObservables = new Map<string, ReturnType<typeof observableValue<string | undefined>>>();
+	private readonly _pinnedTaskLabels: Map<string, string>;
+	private readonly _pinnedTaskObservables = new Map<string, ReturnType<typeof observableValue<string | undefined>>>();
 
 	private _watchedResource: URI | undefined;
 	private _lastRefreshedFolder: URI | undefined;
@@ -105,16 +138,18 @@ export class SessionsConfigurationService extends Disposable implements ISession
 		@IFileService private readonly _fileService: IFileService,
 		@IJSONEditingService private readonly _jsonEditingService: IJSONEditingService,
 		@IPreferencesService private readonly _preferencesService: IPreferencesService,
-		@ITerminalService private readonly _terminalService: ITerminalService,
+		@ITaskService private readonly _taskService: ITaskService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
 		@IStorageService private readonly _storageService: IStorageService,
 	) {
 		super();
-		this._lastRunTaskLabels = this._loadLastRunTaskLabels();
+		this._pinnedTaskLabels = this._loadPinnedTaskLabels();
 	}
 
-	getSessionTasks(session: IActiveSessionItem): IObservable<readonly ITaskEntry[]> {
-		const folder = session.worktree ?? session.repository;
+	getSessionTasks(session: ISessionData): IObservable<readonly ISessionTaskWithTarget[]> {
+		const repo = this._getSessionRepo(session);
+		const folder = repo?.workingDirectory ?? repo?.uri;
 		if (folder) {
 			this._ensureFileWatch(folder);
 		}
@@ -126,12 +161,33 @@ export class SessionsConfigurationService extends Disposable implements ISession
 		return this._sessionTasks;
 	}
 
-	async getNonSessionTasks(session: IActiveSessionItem): Promise<readonly ITaskEntry[]> {
-		const allTasks = await this._readAllTasks(session);
-		return allTasks.filter(t => !t.inSessions);
+	async getNonSessionTasks(session: ISessionData): Promise<readonly INonSessionTaskEntry[]> {
+		const result: INonSessionTaskEntry[] = [];
+
+		const workspaceUri = this._getTasksJsonUri(session, 'workspace');
+		if (workspaceUri) {
+			const workspaceJson = await this._readTasksJson(workspaceUri);
+			for (const task of workspaceJson.tasks ?? []) {
+				if (!task.inSessions && this._isSupportedTask(task)) {
+					result.push({ task, target: 'workspace' });
+				}
+			}
+		}
+
+		const userUri = this._getTasksJsonUri(session, 'user');
+		if (userUri) {
+			const userJson = await this._readTasksJson(userUri);
+			for (const task of userJson.tasks ?? []) {
+				if (!task.inSessions && this._isSupportedTask(task)) {
+					result.push({ task, target: 'user' });
+				}
+			}
+		}
+
+		return result;
 	}
 
-	async addTaskToSessions(task: ITaskEntry, session: IActiveSessionItem, target: TaskStorageTarget): Promise<void> {
+	async addTaskToSessions(task: ITaskEntry, session: ISessionData, target: TaskStorageTarget, options?: ITaskRunOptions): Promise<void> {
 		const tasksJsonUri = this._getTasksJsonUri(session, target);
 		if (!tasksJsonUri) {
 			return;
@@ -144,16 +200,25 @@ export class SessionsConfigurationService extends Disposable implements ISession
 			return;
 		}
 
-		await this._jsonEditingService.write(tasksJsonUri, [
-			{ path: ['tasks', index, 'inSessions'], value: true }
-		], true);
+		const edits: { path: (string | number)[]; value: unknown }[] = [
+			{ path: ['tasks', index, 'inSessions'], value: true },
+		];
+
+		if (options) {
+			edits.push({
+				path: ['tasks', index, 'runOptions'],
+				value: options.runOn && options.runOn !== 'default' ? { runOn: options.runOn } : undefined,
+			});
+		}
+
+		await this._jsonEditingService.write(tasksJsonUri, edits, true);
 
 		if (target === 'workspace') {
 			await this._commitTasksFile(session);
 		}
 	}
 
-	async createAndAddTask(command: string, session: IActiveSessionItem, target: TaskStorageTarget): Promise<ITaskEntry | undefined> {
+	async createAndAddTask(label: string | undefined, command: string, session: ISessionData, target: TaskStorageTarget, options?: ITaskRunOptions): Promise<ITaskEntry | undefined> {
 		const tasksJsonUri = this._getTasksJsonUri(session, target);
 		if (!tasksJsonUri) {
 			return undefined;
@@ -161,11 +226,13 @@ export class SessionsConfigurationService extends Disposable implements ISession
 
 		const tasksJson = await this._readTasksJson(tasksJsonUri);
 		const tasks = tasksJson.tasks ?? [];
+		const resolvedLabel = label?.trim() || command;
 		const newTask: ITaskEntry = {
-			label: command,
+			label: resolvedLabel,
 			type: 'shell',
 			command,
 			inSessions: true,
+			...(options?.runOn && options.runOn !== 'default' ? { runOptions: { runOn: options.runOn } } : {}),
 		};
 
 		await this._jsonEditingService.write(tasksJsonUri, [
@@ -180,73 +247,133 @@ export class SessionsConfigurationService extends Disposable implements ISession
 		return newTask;
 	}
 
-	async runTask(task: ITaskEntry, session: IActiveSessionItem): Promise<void> {
-		const command = this._resolveCommand(task);
-		if (!command) {
+	async updateTask(originalTaskLabel: string, updatedTask: ITaskEntry, session: ISessionData, currentTarget: TaskStorageTarget, newTarget: TaskStorageTarget): Promise<void> {
+		const currentTasksJsonUri = this._getTasksJsonUri(session, currentTarget);
+		const newTasksJsonUri = this._getTasksJsonUri(session, newTarget);
+		if (!currentTasksJsonUri || !newTasksJsonUri) {
 			return;
 		}
 
-		const cwd = session.worktree ?? session.repository;
-		if (!cwd) {
+		const currentTasksJson = await this._readTasksJson(currentTasksJsonUri);
+		const currentTasks = currentTasksJson.tasks ?? [];
+		const currentIndex = currentTasks.findIndex(task => task.label === originalTaskLabel);
+		if (currentIndex === -1) {
 			return;
 		}
 
-		const terminalKey = `${cwd.toString()}${command}`;
-		let terminal = this._getExistingTerminalInstance(terminalKey);
-		if (!terminal) {
-			terminal = await this._terminalService.createTerminal({
-				location: TerminalLocation.Panel,
-				config: { name: task.label },
-				cwd
-			});
-			this._taskTerminals.set(terminalKey, terminal.instanceId);
-		}
-		await terminal.sendText(command, true);
-		this._terminalService.setActiveInstance(terminal);
-		await this._terminalService.revealActiveTerminal();
+		if (currentTasksJsonUri.toString() === newTasksJsonUri.toString()) {
+			await this._jsonEditingService.write(currentTasksJsonUri, [
+				{ path: ['tasks', currentIndex], value: updatedTask },
+			], true);
+		} else {
+			const newTasksJson = await this._readTasksJson(newTasksJsonUri);
+			const newTasks = newTasksJson.tasks ?? [];
 
-		if (session.repository) {
-			const key = session.repository.toString();
-			this._lastRunTaskLabels.set(key, task.label);
-			this._saveLastRunTaskLabels();
-			const obs = this._lastRunTaskObservables.get(key);
-			if (obs) {
-				transaction(tx => obs.set(task.label, tx));
+			await this._jsonEditingService.write(currentTasksJsonUri, [
+				{ path: ['tasks'], value: currentTasks.filter((_, taskIndex) => taskIndex !== currentIndex) },
+			], true);
+
+			await this._jsonEditingService.write(newTasksJsonUri, [
+				{ path: ['version'], value: newTasksJson.version ?? '2.0.0' },
+				{ path: ['tasks'], value: [...newTasks, updatedTask] },
+			], true);
+		}
+
+		if (currentTarget === 'workspace' || newTarget === 'workspace') {
+			await this._commitTasksFile(session);
+		}
+
+		const repoUri = this._getSessionRepo(session)?.uri;
+		if (repoUri) {
+			const key = repoUri.toString();
+			if (this._pinnedTaskLabels.get(key) === originalTaskLabel) {
+				this._setPinnedTaskLabelForKey(key, updatedTask.label);
 			}
 		}
 	}
 
-	getLastRunTaskLabel(repository: URI | undefined): IObservable<string | undefined> {
-		if (!repository) {
-			return observableValue('lastRunTaskLabel', undefined);
+	async removeTask(taskLabel: string, session: ISessionData, target: TaskStorageTarget): Promise<void> {
+		const tasksJsonUri = this._getTasksJsonUri(session, target);
+		if (!tasksJsonUri) {
+			return;
 		}
+
+		const tasksJson = await this._readTasksJson(tasksJsonUri);
+		const tasks = tasksJson.tasks ?? [];
+		const index = tasks.findIndex(t => t.label === taskLabel);
+		if (index === -1) {
+			return;
+		}
+
+		await this._jsonEditingService.write(tasksJsonUri, [
+			{ path: ['tasks'], value: tasks.filter((_, taskIndex) => taskIndex !== index) },
+		], true);
+
+		if (target === 'workspace') {
+			await this._commitTasksFile(session);
+		}
+
+		const repoUri = this._getSessionRepo(session)?.uri;
+		if (repoUri) {
+			const key = repoUri.toString();
+			if (this._pinnedTaskLabels.get(key) === taskLabel) {
+				this._setPinnedTaskLabelForKey(key, undefined);
+			}
+		}
+	}
+
+	async runTask(task: ITaskEntry, session: ISessionData): Promise<void> {
+		const repo = this._getSessionRepo(session);
+		const cwd = repo?.workingDirectory ?? repo?.uri;
+		if (!cwd) {
+			return;
+		}
+
+		const workspaceFolder = this._workspaceContextService.getWorkspaceFolder(cwd);
+		if (!workspaceFolder) {
+			return;
+		}
+
+		const resolvedTask = await this._taskService.getTask(workspaceFolder, task.label);
+		if (!resolvedTask) {
+			return;
+		}
+
+		await this._taskService.run(resolvedTask, undefined, TaskRunSource.User);
+	}
+
+	getPinnedTaskLabel(repository: URI | undefined): IObservable<string | undefined> {
+		if (!repository) {
+			return observableValue('pinnedTaskLabel', undefined);
+		}
+
 		const key = repository.toString();
-		let obs = this._lastRunTaskObservables.get(key);
+		let obs = this._pinnedTaskObservables.get(key);
 		if (!obs) {
-			obs = observableValue('lastRunTaskLabel', this._lastRunTaskLabels.get(key));
-			this._lastRunTaskObservables.set(key, obs);
+			obs = observableValue('pinnedTaskLabel', this._pinnedTaskLabels.get(key));
+			this._pinnedTaskObservables.set(key, obs);
 		}
 		return obs;
 	}
 
-	// --- private helpers ---
+	setPinnedTaskLabel(repository: URI | undefined, taskLabel: string | undefined): void {
+		if (!repository) {
+			return;
+		}
 
-	private _getExistingTerminalInstance(terminalKey: string): ITerminalInstance | undefined {
-		const instanceId = this._taskTerminals.get(terminalKey);
-		if (instanceId === undefined) {
-			return undefined;
-		}
-		const instance = this._terminalService.instances.find(i => i.instanceId === instanceId);
-		if (!instance || instance.hasChildProcesses) {
-			this._taskTerminals.delete(terminalKey);
-			return undefined;
-		}
-		return instance;
+		this._setPinnedTaskLabelForKey(repository.toString(), taskLabel);
 	}
 
-	private _getTasksJsonUri(session: IActiveSessionItem, target: TaskStorageTarget): URI | undefined {
+	// --- private helpers ---
+
+	private _getSessionRepo(session: ISessionData) {
+		return session.workspace.get()?.repositories[0];
+	}
+
+	private _getTasksJsonUri(session: ISessionData, target: TaskStorageTarget): URI | undefined {
 		if (target === 'workspace') {
-			const folder = session.worktree ?? session.repository;
+			const repo = this._getSessionRepo(session);
+			const folder = repo?.workingDirectory ?? repo?.uri;
 			return folder ? joinPath(folder, '.vscode', 'tasks.json') : undefined;
 		}
 		return joinPath(dirname(this._preferencesService.userSettingsResource), 'tasks.json');
@@ -261,75 +388,8 @@ export class SessionsConfigurationService extends Disposable implements ISession
 		}
 	}
 
-	private async _readAllTasks(session: IActiveSessionItem): Promise<readonly ITaskEntry[]> {
-		const result: ITaskEntry[] = [];
-
-		// Read workspace tasks
-		const workspaceUri = this._getTasksJsonUri(session, 'workspace');
-		if (workspaceUri) {
-			const workspaceJson = await this._readTasksJson(workspaceUri);
-			if (workspaceJson.tasks) {
-				result.push(...workspaceJson.tasks.filter(t => this._isSupportedTask(t)));
-			}
-		}
-
-		// Read user tasks
-		const userUri = this._getTasksJsonUri(session, 'user');
-		if (userUri) {
-			const userJson = await this._readTasksJson(userUri);
-			if (userJson.tasks) {
-				result.push(...userJson.tasks.filter(t => this._isSupportedTask(t)));
-			}
-		}
-
-		return result;
-	}
-
 	private _isSupportedTask(task: ITaskEntry): boolean {
-		return !!task.type && SessionsConfigurationService._SUPPORTED_TASK_TYPES.has(task.type);
-	}
-
-	private _resolveCommand(task: ITaskEntry): string | undefined {
-		if (task.type === 'npm') {
-			if (!task.script) {
-				return undefined;
-			}
-			const base = task.path
-				? `npm --prefix ${task.path} run ${task.script}`
-				: `npm run ${task.script}`;
-			return this._appendArgs(base, task.args);
-		}
-
-		let command: string | undefined;
-		let platformArgs: CommandString[] | undefined;
-
-		if (isWindows && task.windows?.command) {
-			command = task.windows.command;
-			platformArgs = task.windows.args;
-		} else if (isMacintosh && task.osx?.command) {
-			command = task.osx.command;
-			platformArgs = task.osx.args;
-		} else if (!isWindows && !isMacintosh && task.linux?.command) {
-			command = task.linux.command;
-			platformArgs = task.linux.args;
-		} else {
-			command = task.command;
-		}
-
-		// Platform-specific args override task-level args
-		const args = platformArgs ?? task.args;
-		return this._appendArgs(command, args);
-	}
-
-	private _appendArgs(command: string | undefined, args: CommandString[] | undefined): string | undefined {
-		if (!command) {
-			return undefined;
-		}
-		if (!args || args.length === 0) {
-			return command;
-		}
-		const resolvedArgs = args.map(a => CommandString.value(a)).join(' ');
-		return `${command} ${resolvedArgs}`;
+		return !!task.label;
 	}
 
 	private _ensureFileWatch(folder: URI): void {
@@ -341,9 +401,15 @@ export class SessionsConfigurationService extends Disposable implements ISession
 
 		const disposables = new DisposableStore();
 
+		// Watch workspace tasks.json
 		disposables.add(this._fileService.watch(tasksUri));
+
+		// Also watch user-level tasks.json so that user session tasks changes refresh the observable
+		const userUri = joinPath(dirname(this._preferencesService.userSettingsResource), 'tasks.json');
+		disposables.add(this._fileService.watch(userUri));
+
 		disposables.add(this._fileService.onDidFilesChange(e => {
-			if (e.affects(tasksUri)) {
+			if (e.affects(tasksUri) || e.affects(userUri)) {
 				this._refreshSessionTasks(folder);
 			}
 		}));
@@ -359,18 +425,22 @@ export class SessionsConfigurationService extends Disposable implements ISession
 
 		const tasksUri = joinPath(folder, '.vscode', 'tasks.json');
 		const tasksJson = await this._readTasksJson(tasksUri);
-		const sessionTasks = (tasksJson.tasks ?? []).filter(t => t.inSessions && this._isSupportedTask(t));
+		const sessionTasks: ISessionTaskWithTarget[] = (tasksJson.tasks ?? [])
+			.filter(t => t.inSessions && this._isSupportedTask(t))
+			.map(t => ({ task: t, target: 'workspace' as TaskStorageTarget }));
 
 		// Also include user-level session tasks
 		const userUri = joinPath(dirname(this._preferencesService.userSettingsResource), 'tasks.json');
 		const userJson = await this._readTasksJson(userUri);
-		const userSessionTasks = (userJson.tasks ?? []).filter(t => t.inSessions && this._isSupportedTask(t));
+		const userSessionTasks: ISessionTaskWithTarget[] = (userJson.tasks ?? [])
+			.filter(t => t.inSessions && this._isSupportedTask(t))
+			.map(t => ({ task: t, target: 'user' as TaskStorageTarget }));
 
 		transaction(tx => this._sessionTasks.set([...sessionTasks, ...userSessionTasks], tx));
 	}
 
-	private async _commitTasksFile(session: IActiveSessionItem): Promise<void> {
-		const worktree = session.worktree; // Only commit if there's a worktree. The local scenario does not need it
+	private async _commitTasksFile(session: ISessionData): Promise<void> {
+		const worktree = this._getSessionRepo(session)?.workingDirectory; // Only commit if there's a worktree. The local scenario does not need it
 		if (!worktree) {
 			return;
 		}
@@ -378,8 +448,8 @@ export class SessionsConfigurationService extends Disposable implements ISession
 		await this._sessionsManagementService.commitWorktreeFiles(session, [tasksUri]);
 	}
 
-	private _loadLastRunTaskLabels(): Map<string, string> {
-		const raw = this._storageService.get(SessionsConfigurationService._LAST_RUN_TASK_LABELS_KEY, StorageScope.APPLICATION);
+	private _loadPinnedTaskLabels(): Map<string, string> {
+		const raw = this._storageService.get(SessionsConfigurationService._PINNED_TASK_LABELS_KEY, StorageScope.APPLICATION);
 		if (raw) {
 			try {
 				return new Map(Object.entries(JSON.parse(raw)));
@@ -390,12 +460,27 @@ export class SessionsConfigurationService extends Disposable implements ISession
 		return new Map();
 	}
 
-	private _saveLastRunTaskLabels(): void {
+	private _savePinnedTaskLabels(): void {
 		this._storageService.store(
-			SessionsConfigurationService._LAST_RUN_TASK_LABELS_KEY,
-			JSON.stringify(Object.fromEntries(this._lastRunTaskLabels)),
+			SessionsConfigurationService._PINNED_TASK_LABELS_KEY,
+			JSON.stringify(Object.fromEntries(this._pinnedTaskLabels)),
 			StorageScope.APPLICATION,
 			StorageTarget.USER
 		);
 	}
+
+	private _setPinnedTaskLabelForKey(key: string, taskLabel: string | undefined): void {
+		if (taskLabel === undefined) {
+			this._pinnedTaskLabels.delete(key);
+		} else {
+			this._pinnedTaskLabels.set(key, taskLabel);
+		}
+
+		this._savePinnedTaskLabels();
+
+		const obs = this._pinnedTaskObservables.get(key);
+		if (obs) {
+			transaction(tx => obs.set(taskLabel, tx));
+		}
+	}
 }
diff --git a/src/vs/sessions/contrib/chat/browser/workspacePicker.ts b/src/vs/sessions/contrib/chat/browser/workspacePicker.ts
new file mode 100644
index 00000000000..a4a092d8349
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/browser/workspacePicker.ts
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
diff --git a/src/vs/sessions/contrib/chat/common/builtinPromptsStorage.ts b/src/vs/sessions/contrib/chat/common/builtinPromptsStorage.ts
index fb3efadd52f..a4eb5afd410 100644
--- a/src/vs/sessions/contrib/chat/common/builtinPromptsStorage.ts
+++ b/src/vs/sessions/contrib/chat/common/builtinPromptsStorage.ts
@@ -4,19 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../base/common/uri.js';
-import { PromptsStorage } from '../../../../workbench/contrib/chat/common/promptSyntax/service/promptsService.js';
 import { PromptsType } from '../../../../workbench/contrib/chat/common/promptSyntax/promptTypes.js';
+import { AICustomizationPromptsStorage } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
 
-/**
- * Extended storage type for AI Customization that includes built-in prompts
- * shipped with the application, alongside the core `PromptsStorage` values.
- */
-export type AICustomizationPromptsStorage = PromptsStorage | 'builtin';
-
-/**
- * Storage type discriminator for built-in prompts shipped with the application.
- */
-export const BUILTIN_STORAGE: AICustomizationPromptsStorage = 'builtin';
+// Re-export from common for backward compatibility
+export type { AICustomizationPromptsStorage } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
+export { BUILTIN_STORAGE } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
 
 /**
  * Prompt path for built-in prompts bundled with the Sessions app.
@@ -25,4 +18,6 @@ export interface IBuiltinPromptPath {
 	readonly uri: URI;
 	readonly storage: AICustomizationPromptsStorage;
 	readonly type: PromptsType;
+	readonly name?: string;
+	readonly description?: string;
 }
diff --git a/src/vs/sessions/contrib/chat/test/browser/runScriptCustomTaskWidget.fixture.ts b/src/vs/sessions/contrib/chat/test/browser/runScriptCustomTaskWidget.fixture.ts
new file mode 100644
index 00000000000..e20913a9a98
--- /dev/null
+++ b/src/vs/sessions/contrib/chat/test/browser/runScriptCustomTaskWidget.fixture.ts
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ComponentFixtureContext, defineComponentFixture, defineThemedFixtureGroup } from '../../../../../workbench/test/browser/componentFixtures/fixtureUtils.js';
+import { IRunScriptCustomTaskWidgetState, RunScriptCustomTaskWidget, WORKTREE_CREATED_RUN_ON } from '../../browser/runScriptCustomTaskWidget.js';
+
+// Ensure color registrations are loaded
+import '../../../../common/theme.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+
+const filledLabel = 'Start Dev Server';
+const filledCommand = 'npm run dev';
+const workspaceUnavailableReason = 'Workspace storage is unavailable for this session';
+
+function renderWidget(ctx: ComponentFixtureContext, state: IRunScriptCustomTaskWidgetState): void {
+	ctx.container.style.width = '600px';
+	ctx.container.style.padding = '0';
+	ctx.container.style.borderRadius = 'var(--vscode-cornerRadius-xLarge)';
+	ctx.container.style.backgroundColor = 'var(--vscode-quickInput-background)';
+	ctx.container.style.overflow = 'hidden';
+
+	const widget = ctx.disposableStore.add(new RunScriptCustomTaskWidget(state));
+	ctx.container.appendChild(widget.domNode);
+}
+
+function defineFixture(state: IRunScriptCustomTaskWidgetState) {
+	return defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderWidget(ctx, state),
+	});
+}
+
+export default defineThemedFixtureGroup({ path: 'sessions/' }, {
+	WorkspaceSelectedEmpty: defineFixture({
+		target: 'workspace',
+	}),
+
+	WorkspaceSelectedCheckedEmpty: defineFixture({
+		target: 'workspace',
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+
+	WorkspaceSelectedFilled: defineFixture({
+		label: filledLabel,
+		target: 'workspace',
+		command: filledCommand,
+	}),
+
+	WorkspaceSelectedCheckedFilled: defineFixture({
+		label: filledLabel,
+		target: 'workspace',
+		command: filledCommand,
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+
+	UserSelectedEmpty: defineFixture({
+		target: 'user',
+	}),
+
+	UserSelectedCheckedEmpty: defineFixture({
+		target: 'user',
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+
+	UserSelectedFilled: defineFixture({
+		label: filledLabel,
+		target: 'user',
+		command: filledCommand,
+	}),
+
+	UserSelectedCheckedFilled: defineFixture({
+		label: filledLabel,
+		target: 'user',
+		command: filledCommand,
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+
+	WorkspaceUnavailableEmpty: defineFixture({
+		target: 'user',
+		targetDisabledReason: workspaceUnavailableReason,
+	}),
+
+	WorkspaceUnavailableCheckedEmpty: defineFixture({
+		target: 'user',
+		targetDisabledReason: workspaceUnavailableReason,
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+
+	WorkspaceUnavailableFilled: defineFixture({
+		label: filledLabel,
+		target: 'user',
+		command: filledCommand,
+		targetDisabledReason: workspaceUnavailableReason,
+	}),
+
+	WorkspaceUnavailableCheckedFilled: defineFixture({
+		label: filledLabel,
+		target: 'user',
+		command: filledCommand,
+		targetDisabledReason: workspaceUnavailableReason,
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+
+	ExistingWorkspaceTaskLocked: defineFixture({
+		label: filledLabel,
+		labelDisabledReason: 'This name comes from an existing task and cannot be changed here.',
+		command: filledCommand,
+		commandDisabledReason: 'This command comes from an existing task and cannot be changed here.',
+		target: 'workspace',
+		targetDisabledReason: 'This existing task cannot be moved between workspace and user storage.',
+	}),
+
+	ExistingUserTaskLockedChecked: defineFixture({
+		label: filledLabel,
+		labelDisabledReason: 'This name comes from an existing task and cannot be changed here.',
+		command: filledCommand,
+		commandDisabledReason: 'This command comes from an existing task and cannot be changed here.',
+		target: 'user',
+		targetDisabledReason: 'This existing task cannot be moved between workspace and user storage.',
+		runOn: WORKTREE_CREATED_RUN_ON,
+	}),
+});
diff --git a/src/vs/sessions/contrib/chat/test/browser/sessionsConfigurationService.test.ts b/src/vs/sessions/contrib/chat/test/browser/sessionsConfigurationService.test.ts
index d127cff33e9..876fd749002 100644
--- a/src/vs/sessions/contrib/chat/test/browser/sessionsConfigurationService.test.ts
+++ b/src/vs/sessions/contrib/chat/test/browser/sessionsConfigurationService.test.ts
@@ -13,17 +13,49 @@ import { IFileContent, IFileService } from '../../../../../platform/files/common
 import { InMemoryStorageService, IStorageService } from '../../../../../platform/storage/common/storage.js';
 import { IJSONEditingService, IJSONValue } from '../../../../../workbench/services/configuration/common/jsonEditing.js';
 import { IPreferencesService } from '../../../../../workbench/services/preferences/common/preferences.js';
-import { ITerminalInstance, ITerminalService } from '../../../../../workbench/contrib/terminal/browser/terminal.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../../sessions/browser/sessionsManagementService.js';
-import { ISessionsConfigurationService, SessionsConfigurationService, ITaskEntry } from '../../browser/sessionsConfigurationService.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { ISessionsManagementService } from '../../../sessions/browser/sessionsManagementService.js';
+import { INonSessionTaskEntry, ISessionsConfigurationService, SessionsConfigurationService, ITaskEntry } from '../../browser/sessionsConfigurationService.js';
 import { VSBuffer } from '../../../../../base/common/buffer.js';
 import { observableValue } from '../../../../../base/common/observable.js';
+import { Task } from '../../../../../workbench/contrib/tasks/common/tasks.js';
+import { ITaskService } from '../../../../../workbench/contrib/tasks/common/taskService.js';
+import { ISessionData, SessionStatus } from '../../../sessions/common/sessionData.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 
-function makeSession(opts: { repository?: URI; worktree?: URI } = {}): IActiveSessionItem {
+function makeSession(opts: { repository?: URI; worktree?: URI } = {}): ISessionData {
+	const workspace = opts.repository ? {
+		label: 'test',
+		icon: Codicon.folder,
+		repositories: [{
+			uri: opts.repository,
+			workingDirectory: opts.worktree,
+			detail: undefined,
+			baseBranchProtected: undefined,
+		}],
+		requiresWorkspaceTrust: false,
+	} : undefined;
 	return {
-		repository: opts.repository,
-		worktree: opts.worktree,
-	} as IActiveSessionItem;
+		sessionId: 'test:session',
+		resource: URI.parse('file:///session'),
+		providerId: 'test',
+		sessionType: 'background',
+		icon: Codicon.copilot,
+		createdAt: new Date(),
+		workspace: observableValue('workspace', workspace),
+		title: observableValue('title', 'session'),
+		updatedAt: observableValue('updatedAt', new Date()),
+		status: observableValue('status', SessionStatus.Untitled),
+		changes: observableValue('changes', []),
+		modelId: observableValue('modelId', undefined),
+		mode: observableValue('mode', undefined),
+		loading: observableValue('loading', false),
+		isArchived: observableValue('isArchived', false),
+		isRead: observableValue('isRead', true),
+		lastTurnEnd: observableValue('lastTurnEnd', undefined),
+		description: observableValue('description', undefined),
+		pullRequest: observableValue('pullRequest', undefined),
+	};
 }
 
 function makeTask(label: string, command?: string, inSessions?: boolean): ITaskEntry {
@@ -48,11 +80,13 @@ suite('SessionsConfigurationService', () => {
 	let service: ISessionsConfigurationService;
 	let fileContents: Map<string, string>;
 	let jsonEdits: { uri: URI; values: IJSONValue[] }[];
-	let createdTerminals: { name: string | undefined; cwd: URI | string | undefined }[];
-	let sentCommands: { command: string }[];
-	let committedFiles: { session: IActiveSessionItem; fileUris: URI[] }[];
+	let ranTasks: { label: string }[];
+	let committedFiles: { session: ISessionData; fileUris: URI[] }[];
 	let storageService: InMemoryStorageService;
 	let readFileCalls: URI[];
+	let activeSessionObs: ReturnType<typeof observableValue<ISessionData | undefined>>;
+	let tasksByLabel: Map<string, Task>;
+	let workspaceFoldersByUri: Map<string, IWorkspaceFolder>;
 
 	const userSettingsUri = URI.parse('file:///user/settings.json');
 	const repoUri = URI.parse('file:///repo');
@@ -61,12 +95,14 @@ suite('SessionsConfigurationService', () => {
 	setup(() => {
 		fileContents = new Map();
 		jsonEdits = [];
-		createdTerminals = [];
-		sentCommands = [];
+		ranTasks = [];
 		committedFiles = [];
 		readFileCalls = [];
+		tasksByLabel = new Map();
+		workspaceFoldersByUri = new Map();
 
 		const instantiationService = store.add(new TestInstantiationService());
+		activeSessionObs = observableValue('activeSession', undefined);
 
 		instantiationService.stub(IFileService, new class extends mock<IFileService>() {
 			override async readFile(resource: URI) {
@@ -91,32 +127,28 @@ suite('SessionsConfigurationService', () => {
 			override userSettingsResource = userSettingsUri;
 		});
 
-		let nextInstanceId = 1;
-		const terminalInstances: (Partial<ITerminalInstance> & { instanceId: number })[] = [];
-
-		const terminalServiceMock = new class extends mock<ITerminalService>() {
-			override get instances(): readonly ITerminalInstance[] { return terminalInstances as ITerminalInstance[]; }
-			override async createTerminal(opts?: { config?: { name?: string }; cwd?: URI }) {
-				const instance: Partial<ITerminalInstance> & { instanceId: number } = {
-					instanceId: nextInstanceId++,
-					initialCwd: opts?.cwd?.fsPath,
-					cwd: opts?.cwd?.fsPath,
-					hasChildProcesses: false,
-					sendText: async (text: string) => { sentCommands.push({ command: text }); },
-				};
-				createdTerminals.push({ name: opts?.config?.name, cwd: opts?.cwd });
-				terminalInstances.push(instance);
-				return instance as ITerminalInstance;
+		instantiationService.stub(ITaskService, new class extends mock<ITaskService>() {
+			override async getTask(_workspaceFolder: any, alias: string | any) {
+				const label = typeof alias === 'string' ? alias : '';
+				return tasksByLabel.get(label);
 			}
-			override setActiveInstance() { }
-			override async revealActiveTerminal() { }
-		};
+			override async run(task: Task | undefined) {
+				if (task) {
+					ranTasks.push({ label: task._label });
+				}
+				return undefined;
+			}
+		});
 
-		instantiationService.stub(ITerminalService, terminalServiceMock);
+		instantiationService.stub(IWorkspaceContextService, new class extends mock<IWorkspaceContextService>() {
+			override getWorkspaceFolder(resource: URI): IWorkspaceFolder | null {
+				return workspaceFoldersByUri.get(resource.toString()) ?? null;
+			}
+		});
 
 		instantiationService.stub(ISessionsManagementService, new class extends mock<ISessionsManagementService>() {
-			override activeSession = observableValue('activeSession', undefined);
-			override async commitWorktreeFiles(session: IActiveSessionItem, fileUris: URI[]) { committedFiles.push({ session, fileUris }); }
+			override activeSession = activeSessionObs;
+			override async commitWorktreeFiles(session: ISessionData, fileUris: URI[]) { committedFiles.push({ session, fileUris }); }
 		});
 
 		storageService = store.add(new InMemoryStorageService());
@@ -153,7 +185,7 @@ suite('SessionsConfigurationService', () => {
 		await new Promise(r => setTimeout(r, 10));
 		const tasks = obs.get();
 
-		assert.deepStrictEqual(tasks.map(t => t.label), ['build', 'test', 'watch']);
+		assert.deepStrictEqual(tasks.map(t => t.task.label), ['build', 'test', 'watch', 'gulp-task']);
 	});
 
 	test('getSessionTasks returns empty array when no worktree', async () => {
@@ -177,7 +209,7 @@ suite('SessionsConfigurationService', () => {
 		const obs = service.getSessionTasks(session);
 
 		await new Promise(r => setTimeout(r, 10));
-		assert.deepStrictEqual(obs.get().map(t => t.label), ['serve']);
+		assert.deepStrictEqual(obs.get().map(t => t.task.label), ['serve']);
 	});
 
 	test('getSessionTasks does not re-read files on repeated calls for the same folder', async () => {
@@ -204,7 +236,7 @@ suite('SessionsConfigurationService', () => {
 
 	// --- getNonSessionTasks ---
 
-	test('getNonSessionTasks returns only tasks without inSessions and with supported types', async () => {
+	test('getNonSessionTasks returns only tasks without inSessions', async () => {
 		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
 		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
 			makeTask('build', 'npm run build', true),
@@ -219,7 +251,7 @@ suite('SessionsConfigurationService', () => {
 		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
 		const nonSessionTasks = await service.getNonSessionTasks(session);
 
-		assert.deepStrictEqual(nonSessionTasks.map(t => t.label), ['lint', 'test', 'watch']);
+		assert.deepStrictEqual(nonSessionTasks.map(t => t.task.label), ['lint', 'test', 'watch', 'gulp-task']);
 	});
 
 	test('getNonSessionTasks reads from repository when no worktree', async () => {
@@ -234,7 +266,26 @@ suite('SessionsConfigurationService', () => {
 		const session = makeSession({ repository: repoUri });
 		const nonSessionTasks = await service.getNonSessionTasks(session);
 
-		assert.deepStrictEqual(nonSessionTasks.map(t => t.label), ['lint']);
+		assert.deepStrictEqual(nonSessionTasks.map(t => t.task.label), ['lint']);
+	});
+
+	test('getNonSessionTasks preserves the source target for workspace and user tasks', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		const userTasksUri = URI.from({ scheme: userSettingsUri.scheme, path: '/user/tasks.json' });
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('workspaceTask', 'npm run workspace'),
+		]));
+		fileContents.set(userTasksUri.toString(), tasksJsonContent([
+			makeTask('userTask', 'npm run user'),
+		]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		const nonSessionTasks = await service.getNonSessionTasks(session);
+
+		assert.deepStrictEqual(nonSessionTasks, [
+			{ task: { label: 'workspaceTask', type: 'shell', command: 'npm run workspace' }, target: 'workspace' },
+			{ task: { label: 'userTask', type: 'shell', command: 'npm run user' }, target: 'user' },
+		] satisfies INonSessionTaskEntry[]);
 	});
 
 	// --- addTaskToSessions ---
@@ -284,6 +335,36 @@ suite('SessionsConfigurationService', () => {
 		assert.strictEqual(committedFiles.length, 0, 'should not commit when there is no worktree');
 	});
 
+	test('addTaskToSessions updates runOptions when provided', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('build', 'npm run build'),
+		]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.addTaskToSessions(makeTask('build', 'npm run build'), session, 'workspace', { runOn: 'worktreeCreated' });
+
+		assert.deepStrictEqual(jsonEdits[0].values, [
+			{ path: ['tasks', 0, 'inSessions'], value: true },
+			{ path: ['tasks', 0, 'runOptions'], value: { runOn: 'worktreeCreated' } },
+		]);
+	});
+
+	test('addTaskToSessions clears runOptions when default is requested', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			{ ...makeTask('build', 'npm run build'), runOptions: { runOn: 'worktreeCreated' } },
+		]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.addTaskToSessions(makeTask('build', 'npm run build'), session, 'workspace', { runOn: 'default' });
+
+		assert.deepStrictEqual(jsonEdits[0].values, [
+			{ path: ['tasks', 0, 'inSessions'], value: true },
+			{ path: ['tasks', 0, 'runOptions'], value: undefined },
+		]);
+	});
+
 	// --- createAndAddTask ---
 
 	test('createAndAddTask writes new task with inSessions: true', async () => {
@@ -293,7 +374,7 @@ suite('SessionsConfigurationService', () => {
 		]));
 
 		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		await service.createAndAddTask('npm run dev', session, 'workspace');
+		await service.createAndAddTask(undefined, 'npm run dev', session, 'workspace');
 
 		assert.strictEqual(jsonEdits.length, 1);
 		const edit = jsonEdits[0];
@@ -315,7 +396,7 @@ suite('SessionsConfigurationService', () => {
 		]));
 
 		const session = makeSession({ repository: repoUri });
-		await service.createAndAddTask('npm run dev', session, 'workspace');
+		await service.createAndAddTask(undefined, 'npm run dev', session, 'workspace');
 
 		assert.strictEqual(jsonEdits.length, 1);
 		assert.strictEqual(jsonEdits[0].uri.toString(), repoTasksUri.toString());
@@ -328,213 +409,235 @@ suite('SessionsConfigurationService', () => {
 		assert.strictEqual(committedFiles.length, 0, 'should not commit when there is no worktree');
 	});
 
+	test('createAndAddTask writes worktreeCreated run option when requested', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.createAndAddTask(undefined, 'npm run dev', session, 'workspace', { runOn: 'worktreeCreated' });
+
+		assert.strictEqual(jsonEdits.length, 1);
+		const tasksValue = jsonEdits[0].values.find(v => v.path[0] === 'tasks');
+		assert.ok(tasksValue);
+		const tasks = tasksValue!.value as ITaskEntry[];
+		assert.deepStrictEqual(tasks[0].runOptions, { runOn: 'worktreeCreated' });
+	});
+
+	test('createAndAddTask writes a custom label when provided', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.createAndAddTask('Start Dev Server', 'npm run dev', session, 'workspace');
+
+		assert.strictEqual(jsonEdits.length, 1);
+		const tasksValue = jsonEdits[0].values.find(v => v.path[0] === 'tasks');
+		assert.ok(tasksValue);
+		const tasks = tasksValue!.value as ITaskEntry[];
+		assert.strictEqual(tasks[0].label, 'Start Dev Server');
+		assert.strictEqual(tasks[0].command, 'npm run dev');
+	});
+
+	// --- removeTask ---
+
+	test('removeTask deletes the matching task entry', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('build', 'npm run build', true),
+			makeTask('test', 'npm test', true),
+			makeTask('lint', 'npm run lint'),
+		]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.removeTask('test', session, 'workspace');
+
+		assert.strictEqual(jsonEdits.length, 1);
+		assert.deepStrictEqual(jsonEdits[0].values, [{
+			path: ['tasks'],
+			value: [
+				makeTask('build', 'npm run build', true),
+				{ label: 'lint', type: 'shell', command: 'npm run lint' },
+			],
+		}]);
+		assert.strictEqual(committedFiles.length, 1);
+		assert.strictEqual(committedFiles[0].fileUris[0].path, '/worktree/.vscode/tasks.json');
+	});
+
+	// --- updateTask ---
+
+	test('updateTask replaces an existing task in place', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('build', 'npm run build', true),
+			makeTask('test', 'npm test', true),
+		]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.updateTask('test', {
+			label: 'Test Changed',
+			type: 'shell',
+			command: 'pnpm test',
+			inSessions: true,
+			runOptions: { runOn: 'worktreeCreated' }
+		}, session, 'workspace', 'workspace');
+
+		assert.strictEqual(jsonEdits.length, 1);
+		assert.deepStrictEqual(jsonEdits[0].values, [{
+			path: ['tasks', 1],
+			value: {
+				label: 'Test Changed',
+				type: 'shell',
+				command: 'pnpm test',
+				inSessions: true,
+				runOptions: { runOn: 'worktreeCreated' }
+			}
+		}]);
+		assert.strictEqual(committedFiles.length, 1);
+	});
+
+	test('updateTask moves a task between workspace and user storage', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		const userTasksUri = URI.from({ scheme: userSettingsUri.scheme, path: '/user/tasks.json' });
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('build', 'npm run build', true),
+		]));
+		fileContents.set(userTasksUri.toString(), tasksJsonContent([
+			makeTask('userExisting', 'npm run user', true),
+		]));
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.updateTask('build', {
+			label: 'Build Changed',
+			type: 'shell',
+			command: 'pnpm build',
+			inSessions: true,
+		}, session, 'workspace', 'user');
+
+		assert.strictEqual(jsonEdits.length, 2);
+		assert.deepStrictEqual(jsonEdits[0], {
+			uri: worktreeTasksUri,
+			values: [{
+				path: ['tasks'],
+				value: []
+			}]
+		});
+		assert.deepStrictEqual(jsonEdits[1], {
+			uri: userTasksUri,
+			values: [
+				{ path: ['version'], value: '2.0.0' },
+				{
+					path: ['tasks'],
+					value: [
+						makeTask('userExisting', 'npm run user', true),
+						{
+							label: 'Build Changed',
+							type: 'shell',
+							command: 'pnpm build',
+							inSessions: true,
+						}
+					]
+				}
+			]
+		});
+		assert.strictEqual(committedFiles.length, 1);
+	});
+
+	// --- pinned task ---
+
+	test('getPinnedTaskLabel returns undefined when no task is pinned', () => {
+		const obs = service.getPinnedTaskLabel(repoUri);
+		assert.strictEqual(obs.get(), undefined);
+	});
+
+	test('setPinnedTaskLabel stores and clears the pinned task label', () => {
+		const obs = service.getPinnedTaskLabel(repoUri);
+
+		service.setPinnedTaskLabel(repoUri, 'build');
+		assert.strictEqual(obs.get(), 'build');
+
+		service.setPinnedTaskLabel(repoUri, undefined);
+		assert.strictEqual(obs.get(), undefined);
+	});
+
+	test('updateTask keeps the pinned task in sync when the label changes', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('build', 'npm run build', true),
+		]));
+		service.setPinnedTaskLabel(repoUri, 'build');
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.updateTask('build', {
+			label: 'build:watch',
+			type: 'shell',
+			command: 'npm run watch',
+			inSessions: true,
+		}, session, 'workspace', 'workspace');
+
+		assert.strictEqual(service.getPinnedTaskLabel(repoUri).get(), 'build:watch');
+	});
+
+	test('removeTask clears the pinned task when deleting the pinned entry', async () => {
+		const worktreeTasksUri = URI.parse('file:///worktree/.vscode/tasks.json');
+		fileContents.set(worktreeTasksUri.toString(), tasksJsonContent([
+			makeTask('build', 'npm run build', true),
+		]));
+		service.setPinnedTaskLabel(repoUri, 'build');
+
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.removeTask('build', session, 'workspace');
+
+		assert.strictEqual(service.getPinnedTaskLabel(repoUri).get(), undefined);
+	});
+
 	// --- runTask ---
 
-	test('runTask creates terminal and sends command', async () => {
+	function registerMockTask(label: string, folder: URI): void {
+		tasksByLabel.set(label, { _label: label } as unknown as Task);
+		workspaceFoldersByUri.set(folder.toString(), { uri: folder, name: 'folder', index: 0, toResource: () => folder } as IWorkspaceFolder);
+	}
+
+	test('runTask looks up task by label and runs it via the task service', async () => {
+		registerMockTask('build', worktreeUri);
 		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task = makeTask('build', 'npm run build');
 
-		await service.runTask(task, session);
+		await service.runTask(makeTask('build', 'npm run build'), session);
 
-		assert.strictEqual(createdTerminals.length, 1);
-		assert.strictEqual(createdTerminals[0].name, 'build');
-		assert.strictEqual(sentCommands.length, 1);
-		assert.strictEqual(sentCommands[0].command, 'npm run build');
-	});
-
-	test('runTask resolves npm task to npm run <script>', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task = makeNpmTask('watch', 'watch');
-
-		await service.runTask(task, session);
-
-		assert.strictEqual(createdTerminals.length, 1);
-		assert.strictEqual(createdTerminals[0].name, 'watch');
-		assert.strictEqual(sentCommands.length, 1);
-		assert.strictEqual(sentCommands[0].command, 'npm run watch');
-	});
-
-	test('runTask does nothing for npm task without script', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task: ITaskEntry = { label: 'broken', type: 'npm', inSessions: true };
-
-		await service.runTask(task, session);
-
-		assert.strictEqual(createdTerminals.length, 0);
-		assert.strictEqual(sentCommands.length, 0);
+		assert.strictEqual(ranTasks.length, 1);
+		assert.strictEqual(ranTasks[0].label, 'build');
 	});
 
 	test('runTask does nothing when no cwd available', async () => {
 		const session = makeSession({ repository: undefined, worktree: undefined });
 		await service.runTask(makeTask('build', 'npm run build'), session);
 
-		assert.strictEqual(createdTerminals.length, 0);
-		assert.strictEqual(sentCommands.length, 0);
+		assert.strictEqual(ranTasks.length, 0);
 	});
 
-	test('runTask reuses the same terminal for the same command and worktree', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task = makeTask('build', 'npm run build');
-
-		await service.runTask(task, session);
-		await service.runTask(task, session);
-
-		assert.strictEqual(createdTerminals.length, 1, 'should create only one terminal');
-		assert.strictEqual(sentCommands.length, 2, 'should send command twice');
-		assert.strictEqual(sentCommands[0].command, 'npm run build');
-		assert.strictEqual(sentCommands[1].command, 'npm run build');
-	});
-
-	test('runTask creates different terminals for different commands', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-
-		await service.runTask(makeTask('build', 'npm run build'), session);
-		await service.runTask(makeTask('test', 'npm test'), session);
-
-		assert.strictEqual(createdTerminals.length, 2, 'should create two terminals');
-		assert.strictEqual(createdTerminals[0].name, 'build');
-		assert.strictEqual(createdTerminals[1].name, 'test');
-	});
-
-	test('runTask appends args to shell command', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task: ITaskEntry = { label: 'build', type: 'shell', command: 'dotnet', args: ['build', '--configuration', 'Release'], inSessions: true };
-
-		await service.runTask(task, session);
-
-		assert.strictEqual(sentCommands.length, 1);
-		assert.strictEqual(sentCommands[0].command, 'dotnet build --configuration Release');
-	});
-
-	test('runTask appends args to npm task', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task: ITaskEntry = { label: 'test', type: 'npm', script: 'test', args: ['--', '--coverage'], inSessions: true };
-
-		await service.runTask(task, session);
-
-		assert.strictEqual(sentCommands.length, 1);
-		assert.strictEqual(sentCommands[0].command, 'npm run test -- --coverage');
-	});
-
-	test('runTask resolves CommandString objects in args', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task: ITaskEntry = {
-			label: 'build', type: 'shell', command: 'gcc',
-			args: [
-				{ value: '-o', quoting: 'escape' as const },
-				'output.exe',
-				'main.c',
-			],
-			inSessions: true
-		};
-
-		await service.runTask(task, session);
-
-		assert.strictEqual(sentCommands.length, 1);
-		assert.strictEqual(sentCommands[0].command, 'gcc -o output.exe main.c');
-	});
-
-	test('runTask sends only command when args is empty', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const task: ITaskEntry = { label: 'build', type: 'shell', command: 'make', args: [], inSessions: true };
-
-		await service.runTask(task, session);
-
-		assert.strictEqual(sentCommands.length, 1);
-		assert.strictEqual(sentCommands[0].command, 'make');
-	});
-
-	test('runTask creates different terminals for same command in different worktrees', async () => {
-		const wt1 = URI.parse('file:///worktree1');
-		const wt2 = URI.parse('file:///worktree2');
-		const session1 = makeSession({ worktree: wt1, repository: repoUri });
-		const session2 = makeSession({ worktree: wt2, repository: repoUri });
-
-		await service.runTask(makeTask('build', 'npm run build'), session1);
-		await service.runTask(makeTask('build', 'npm run build'), session2);
-
-		assert.strictEqual(createdTerminals.length, 2, 'should create two terminals for different worktrees');
-	});
-
-	// --- getLastRunTaskLabel (MRU) ---
-
-	test('getLastRunTaskLabel returns undefined when no task has been run', () => {
-		const obs = service.getLastRunTaskLabel(repoUri);
-		assert.strictEqual(obs.get(), undefined);
-	});
-
-	test('getLastRunTaskLabel returns label after runTask', async () => {
-		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
-		const obs = service.getLastRunTaskLabel(repoUri);
-
-		await service.runTask(makeTask('build', 'npm run build'), session);
-		assert.strictEqual(obs.get(), 'build');
-
-		await service.runTask(makeTask('test', 'npm test'), session);
-		assert.strictEqual(obs.get(), 'test');
-	});
-
-	test('getLastRunTaskLabel returns undefined for undefined repository', () => {
-		const obs = service.getLastRunTaskLabel(undefined);
-		assert.strictEqual(obs.get(), undefined);
-	});
-
-	test('getLastRunTaskLabel tracks separate repositories independently', async () => {
-		const repo1 = URI.parse('file:///repo1');
-		const repo2 = URI.parse('file:///repo2');
-		const wt1 = URI.parse('file:///wt1');
-		const wt2 = URI.parse('file:///wt2');
-
-		const session1 = makeSession({ worktree: wt1, repository: repo1 });
-		const session2 = makeSession({ worktree: wt2, repository: repo2 });
-
-		const obs1 = service.getLastRunTaskLabel(repo1);
-		const obs2 = service.getLastRunTaskLabel(repo2);
-
-		await service.runTask(makeTask('build', 'npm run build'), session1);
-		await service.runTask(makeTask('test', 'npm test'), session2);
-
-		assert.strictEqual(obs1.get(), 'build');
-		assert.strictEqual(obs2.get(), 'test');
-	});
-
-	test('getLastRunTaskLabel returns same observable for same repository', () => {
-		const obs1 = service.getLastRunTaskLabel(repoUri);
-		const obs2 = service.getLastRunTaskLabel(repoUri);
-		assert.strictEqual(obs1, obs2);
-	});
-
-	test('getLastRunTaskLabel persists across service instances', async () => {
+	test('runTask does nothing when workspace folder not found', async () => {
+		// No workspace folder registered for worktreeUri
 		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
 		await service.runTask(makeTask('build', 'npm run build'), session);
 
-		// Create a second service instance using the same storage
-		const instantiationService = store.add(new TestInstantiationService());
-		instantiationService.stub(IFileService, new class extends mock<IFileService>() {
-			override async readFile(): Promise<IFileContent> { throw new Error('not found'); }
-			override watch() { return { dispose() { } }; }
-			override onDidFilesChange: any = () => ({ dispose() { } });
-		});
-		instantiationService.stub(IJSONEditingService, new class extends mock<IJSONEditingService>() {
-			override async write() { }
-		});
-		instantiationService.stub(IPreferencesService, new class extends mock<IPreferencesService>() {
-			override userSettingsResource = userSettingsUri;
-		});
-		instantiationService.stub(ITerminalService, new class extends mock<ITerminalService>() {
-			override instances: readonly ITerminalInstance[] = [];
-			override async createTerminal() { return {} as ITerminalInstance; }
-			override setActiveInstance() { }
-			override async revealActiveTerminal() { }
-		});
-		instantiationService.stub(ISessionsManagementService, new class extends mock<ISessionsManagementService>() {
-			override activeSession = observableValue('activeSession', undefined);
-			override async commitWorktreeFiles() { }
-		});
-		instantiationService.stub(IStorageService, storageService);
+		assert.strictEqual(ranTasks.length, 0);
+	});
 
-		const service2 = store.add(instantiationService.createInstance(SessionsConfigurationService));
-		const obs = service2.getLastRunTaskLabel(repoUri);
-		assert.strictEqual(obs.get(), 'build');
+	test('runTask does nothing when task not found by label', async () => {
+		workspaceFoldersByUri.set(worktreeUri.toString(), { uri: worktreeUri, name: 'folder', index: 0, toResource: () => worktreeUri } as IWorkspaceFolder);
+		// No task registered for 'nonexistent'
+		const session = makeSession({ worktree: worktreeUri, repository: repoUri });
+		await service.runTask(makeTask('nonexistent', 'echo hi'), session);
+
+		assert.strictEqual(ranTasks.length, 0);
+	});
+
+	test('runTask uses repository as cwd when worktree is not available', async () => {
+		registerMockTask('build', repoUri);
+		const session = makeSession({ repository: repoUri });
+
+		await service.runTask(makeTask('build', 'npm run build'), session);
+
+		assert.strictEqual(ranTasks.length, 1);
+		assert.strictEqual(ranTasks[0].label, 'build');
 	});
 });
diff --git a/src/vs/sessions/contrib/chatDebug/browser/chatDebug.contribution.ts b/src/vs/sessions/contrib/chatDebug/browser/chatDebug.contribution.ts
new file mode 100644
index 00000000000..dbb92718c71
--- /dev/null
+++ b/src/vs/sessions/contrib/chatDebug/browser/chatDebug.contribution.ts
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { ViewPaneContainer } from '../../../../workbench/browser/parts/views/viewPaneContainer.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, WindowVisibility } from '../../../../workbench/common/views.js';
+
+const COPILOT_CHAT_VIEW_CONTAINER_ID = 'workbench.view.extension.copilot-chat';
+const COPILOT_CHAT_VIEW_ID = 'copilot-chat';
+const SESSIONS_CHAT_DEBUG_CONTAINER_ID = 'workbench.sessions.panel.chatDebugContainer';
+
+const chatDebugViewIcon = registerIcon('sessions-chat-debug-view-icon', Codicon.debug, localize('sessionsChatDebugViewIcon', 'View icon of the chat debug view in the sessions window.'));
+
+class RegisterChatDebugViewContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'sessions.registerChatDebugView';
+
+	constructor() {
+		super();
+
+		const viewContainerRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
+		const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
+
+		// The copilot-chat view is contributed by the Copilot Chat extension,
+		// which may register after this contribution runs. Handle both cases.
+		if (!this.tryMoveView(viewContainerRegistry, viewsRegistry)) {
+			const listener = viewsRegistry.onViewsRegistered(e => {
+				for (const { views } of e) {
+					if (views.some(v => v.id === COPILOT_CHAT_VIEW_ID)) {
+						if (this.tryMoveView(viewContainerRegistry, viewsRegistry)) {
+							listener.dispose();
+						}
+						break;
+					}
+				}
+			});
+			this._register(listener);
+		}
+	}
+
+	private tryMoveView(viewContainerRegistry: IViewContainersRegistry, viewsRegistry: IViewsRegistry): boolean {
+		const viewContainer = viewContainerRegistry.get(COPILOT_CHAT_VIEW_CONTAINER_ID);
+		if (!viewContainer) {
+			return false;
+		}
+
+		const view = viewsRegistry.getView(COPILOT_CHAT_VIEW_ID);
+		if (!view) {
+			return false;
+		}
+
+		// Deregister the view from its original extension container
+		viewsRegistry.deregisterViews([view], viewContainer);
+		viewContainerRegistry.deregisterViewContainer(viewContainer);
+
+		// Register a new chat debug view container in the Panel for the sessions window
+		const chatDebugViewContainer = viewContainerRegistry.registerViewContainer({
+			id: SESSIONS_CHAT_DEBUG_CONTAINER_ID,
+			title: localize2('chatDebug', "Chat Debug"),
+			icon: chatDebugViewIcon,
+			order: 3,
+			ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [SESSIONS_CHAT_DEBUG_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]),
+			storageId: SESSIONS_CHAT_DEBUG_CONTAINER_ID,
+			hideIfEmpty: true,
+			windowVisibility: WindowVisibility.Sessions,
+		}, ViewContainerLocation.Panel, { doNotRegisterOpenCommand: true });
+
+		// Re-register the view inside the new sessions container
+		const sessionsView: IViewDescriptor = {
+			...view,
+			canMoveView: false,
+			windowVisibility: WindowVisibility.Sessions,
+		};
+		viewsRegistry.registerViews([sessionsView], chatDebugViewContainer);
+
+		return true;
+	}
+}
+
+registerWorkbenchContribution2(RegisterChatDebugViewContribution.ID, RegisterChatDebugViewContribution, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/sessions/contrib/codeReview/browser/codeReview.contributions.ts b/src/vs/sessions/contrib/codeReview/browser/codeReview.contributions.ts
index 1efe64e6aa2..b1af990d5dd 100644
--- a/src/vs/sessions/contrib/codeReview/browser/codeReview.contributions.ts
+++ b/src/vs/sessions/contrib/codeReview/browser/codeReview.contributions.ts
@@ -5,7 +5,7 @@
 
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
+import { autorun } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
@@ -16,13 +16,12 @@ import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase
 import { IsSessionsWindowContext } from '../../../../workbench/common/contextkeys.js';
 import { ChatContextKeys } from '../../../../workbench/contrib/chat/common/actions/chatContextKeys.js';
 import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { CHAT_CATEGORY } from '../../../../workbench/contrib/chat/browser/actions/chatActions.js';
 import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
-import { CodeReviewService, CodeReviewStateKind, getCodeReviewFilesFromSessionChanges, getCodeReviewVersion, ICodeReviewService, PRReviewStateKind } from './codeReviewService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IAgentFeedbackService } from '../../agentFeedback/browser/agentFeedbackService.js';
 import { getSessionEditorComments } from '../../agentFeedback/browser/sessionEditorComments.js';
+import { CodeReviewService, CodeReviewStateKind, getCodeReviewFilesFromSessionChanges, getCodeReviewVersion, ICodeReviewService, MAX_CODE_REVIEWS_PER_SESSION_VERSION, PRReviewStateKind } from './codeReviewService.js';
 
 registerSingleton(ICodeReviewService, CodeReviewService, InstantiationType.Delayed);
 
@@ -60,28 +59,30 @@ function registerSessionCodeReviewAction(tooltip: string, icon: ThemeIcon): Disp
 
 		override async run(accessor: ServicesAccessor, sessionResource?: URI): Promise<void> {
 			const sessionManagementService = accessor.get(ISessionsManagementService);
-			const agentSessionsService = accessor.get(IAgentSessionsService);
 			const codeReviewService = accessor.get(ICodeReviewService);
 			const agentFeedbackService = accessor.get(IAgentFeedbackService);
 
 			const resource = URI.isUri(sessionResource)
 				? sessionResource
-				: sessionManagementService.getActiveSession()?.resource;
+				: sessionManagementService.activeSession.get()?.resource;
 			if (!resource) {
 				return;
 			}
 
-			const session = agentSessionsService.getSession(resource);
-			if (!(session?.changes instanceof Array) || session.changes.length === 0) {
+			// Get changes from ISessionData
+			const sessionData = sessionManagementService.getSession(resource);
+			const changes = sessionData?.changes.get();
+			if (!changes || changes.length === 0) {
 				return;
 			}
 
-			const files = getCodeReviewFilesFromSessionChanges(session.changes);
+			const files = getCodeReviewFilesFromSessionChanges(changes);
 			const version = getCodeReviewVersion(files);
 
 			// If there are existing comments (code review or PR review), navigate to the first one
 			const reviewState = codeReviewService.getReviewState(resource).get();
 			const prReviewState = codeReviewService.getPRReviewState(resource).get();
+			const reviewCount = reviewState.kind !== CodeReviewStateKind.Idle && reviewState.version === version ? reviewState.reviewCount : 0;
 			const codeReviewCount = reviewState.kind === CodeReviewStateKind.Result && reviewState.version === version ? reviewState.comments.length : 0;
 			const prReviewCount = prReviewState.kind === PRReviewStateKind.Loaded ? prReviewState.comments.length : 0;
 
@@ -99,6 +100,10 @@ function registerSessionCodeReviewAction(tooltip: string, icon: ThemeIcon): Disp
 				return;
 			}
 
+			if (reviewCount >= MAX_CODE_REVIEWS_PER_SESSION_VERSION) {
+				return;
+			}
+
 
 			codeReviewService.requestReview(resource, version, files);
 		}
@@ -115,18 +120,15 @@ class CodeReviewToolbarContribution extends Disposable implements IWorkbenchCont
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
 		@ISessionsManagementService private readonly _sessionManagementService: ISessionsManagementService,
 		@ICodeReviewService private readonly _codeReviewService: ICodeReviewService,
 	) {
 		super();
 
 		const canRunCodeReviewContext = canRunSessionCodeReviewContextKey.bindTo(contextKeyService);
-		const sessionsChangedSignal = observableFromEvent(this, this._agentSessionsService.model.onDidChangeSessions, () => undefined);
 
 		this._register(autorun(reader => {
 			const activeSession = this._sessionManagementService.activeSession.read(reader);
-			sessionsChangedSignal.read(reader);
 			this._actionRegistration.clear();
 
 			const sessionResource = activeSession?.resource;
@@ -136,17 +138,18 @@ class CodeReviewToolbarContribution extends Disposable implements IWorkbenchCont
 				return;
 			}
 
-			const session = this._agentSessionsService.getSession(sessionResource);
-			if (!(session?.changes instanceof Array) || session.changes.length === 0) {
+			const changes = activeSession.changes.read(reader);
+			if (changes.length === 0) {
 				canRunCodeReviewContext.set(false);
 				this._actionRegistration.value = registerSessionCodeReviewAction(localize('sessions.runCodeReview.noChanges', "No changes available for code review."), Codicon.codeReview);
 				return;
 			}
 
-			const files = getCodeReviewFilesFromSessionChanges(session.changes);
+			const files = getCodeReviewFilesFromSessionChanges(changes);
 			const version = getCodeReviewVersion(files);
 			const reviewState = this._codeReviewService.getReviewState(sessionResource).read(reader);
 			const prReviewState = this._codeReviewService.getPRReviewState(sessionResource).read(reader);
+			const reviewCount = reviewState.kind !== CodeReviewStateKind.Idle && reviewState.version === version ? reviewState.reviewCount : 0;
 
 			const codeReviewCount = reviewState.kind === CodeReviewStateKind.Result && reviewState.version === version ? reviewState.comments.length : 0;
 			const prReviewCount = prReviewState.kind === PRReviewStateKind.Loaded ? prReviewState.comments.length : 0;
@@ -166,10 +169,16 @@ class CodeReviewToolbarContribution extends Disposable implements IWorkbenchCont
 				tooltip = totalCommentCount === 1
 					? localize('sessions.runCodeReview.tooltip.oneUnresolved', "1 review comment unresolved.")
 					: localize('sessions.runCodeReview.tooltip.manyUnresolved', "{0} review comments unresolved.", totalCommentCount);
-			} else if (reviewState.kind === CodeReviewStateKind.Result && reviewState.version === version) {
+			} else if (reviewCount >= MAX_CODE_REVIEWS_PER_SESSION_VERSION) {
 				canRunCodeReview = false;
-				tooltip = localize('sessions.runCodeReview.tooltip.allResolved', "All review comments have been addressed.");
-				icon = Codicon.comment;
+				tooltip = localize('sessions.runCodeReview.tooltip.limitReached', "Maximum of {0} code reviews reached for this session version.", MAX_CODE_REVIEWS_PER_SESSION_VERSION);
+				icon = Codicon.codeReview;
+			} else if (reviewState.kind === CodeReviewStateKind.Result && reviewState.version === version) {
+				canRunCodeReview = true;
+				tooltip = reviewState.didProduceComments
+					? localize('sessions.runCodeReview.tooltip.runAgain', "Run another code review.")
+					: localize('sessions.runCodeReview.tooltip.noCommentsRunAgain', "Previous code review produced no comments. Run code review again.");
+				icon = reviewState.didProduceComments ? Codicon.comment : Codicon.codeReview;
 			}
 
 			canRunCodeReviewContext.set(canRunCodeReview);
diff --git a/src/vs/sessions/contrib/codeReview/browser/codeReviewService.ts b/src/vs/sessions/contrib/codeReview/browser/codeReviewService.ts
index 689c409ffe4..8505a973c52 100644
--- a/src/vs/sessions/contrib/codeReview/browser/codeReviewService.ts
+++ b/src/vs/sessions/contrib/codeReview/browser/codeReviewService.ts
@@ -15,7 +15,6 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { hash } from '../../../../base/common/hash.js';
 import { hasKey } from '../../../../base/common/types.js';
 import { IChatSessionFileChange, IChatSessionFileChange2, isIChatSessionFileChange2 } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { IGitHubService } from '../../github/browser/githubService.js';
 import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 
@@ -70,6 +69,8 @@ export function getCodeReviewVersion(files: readonly ICodeReviewFile[]): string
 	return `v1:${stableFileList.length}:${hash(stableFileList)}`;
 }
 
+export const MAX_CODE_REVIEWS_PER_SESSION_VERSION = 5;
+
 export const enum CodeReviewStateKind {
 	Idle = 'idle',
 	Loading = 'loading',
@@ -79,9 +80,9 @@ export const enum CodeReviewStateKind {
 
 export type ICodeReviewState =
 	| { readonly kind: CodeReviewStateKind.Idle }
-	| { readonly kind: CodeReviewStateKind.Loading; readonly version: string }
-	| { readonly kind: CodeReviewStateKind.Result; readonly version: string; readonly comments: readonly ICodeReviewComment[] }
-	| { readonly kind: CodeReviewStateKind.Error; readonly version: string; readonly reason: string };
+	| { readonly kind: CodeReviewStateKind.Loading; readonly version: string; readonly reviewCount: number }
+	| { readonly kind: CodeReviewStateKind.Result; readonly version: string; readonly reviewCount: number; readonly comments: readonly ICodeReviewComment[]; readonly didProduceComments: boolean }
+	| { readonly kind: CodeReviewStateKind.Error; readonly version: string; readonly reviewCount: number; readonly reason: string };
 
 // --- PR Review Types ---------------------------------------------------------
 
@@ -169,7 +170,8 @@ export interface ICodeReviewService {
 	/**
 	 * Request a code review for the given session. The review is associated with
 	 * a version string (fingerprint of changed files). If a review is already in
-	 * progress or completed for this version, this is a no-op.
+	 * progress or there are still unresolved review comments for this version,
+	 * this is a no-op.
 	 */
 	requestReview(sessionResource: URI, version: string, files: readonly { readonly currentUri: URI; readonly baseUri?: URI }[]): void;
 
@@ -178,6 +180,11 @@ export interface ICodeReviewService {
 	 */
 	removeComment(sessionResource: URI, commentId: string): void;
 
+	/**
+	 * Update the body text of a single code review comment.
+	 */
+	updateComment(sessionResource: URI, commentId: string, newBody: string): void;
+
 	/**
 	 * Dismiss/clear the review for a session entirely.
 	 */
@@ -193,12 +200,21 @@ export interface ICodeReviewService {
 	 * Resolve a PR review thread on GitHub and remove it from local state.
 	 */
 	resolvePRReviewThread(sessionResource: URI, threadId: string): Promise<void>;
+
+	/**
+	 * Mark a PR review comment as locally converted to agent feedback.
+	 * The comment is hidden from the PR review state until the session is
+	 * cleaned up.
+	 */
+	markPRReviewCommentConverted(sessionResource: URI, commentId: string): void;
 }
 
 // --- Storage Types -----------------------------------------------------------
 
 interface IStoredCodeReview {
 	readonly version: string;
+	readonly reviewCount?: number;
+	readonly didProduceComments?: boolean;
 	readonly comments: readonly IStoredCodeReviewComment[];
 }
 
@@ -291,6 +307,8 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 
 	private readonly _reviewsBySession = new Map<string, ISessionReviewData>();
 	private readonly _prReviewBySession = new Map<string, IPRSessionReviewData>();
+	/** PR review comment IDs that have been converted to agent feedback (per session). */
+	private readonly _convertedPRCommentsBySession = new Map<string, Set<string>>();
 
 	constructor(
 		@ICommandService private readonly _commandService: ICommandService,
@@ -298,7 +316,6 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 		@IStorageService private readonly _storageService: IStorageService,
 		@IGitHubService private readonly _gitHubService: IGitHubService,
 		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
 	) {
 		super();
 		this._loadFromStorage();
@@ -311,17 +328,16 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 			}
 		}));
 
-		this._register(this._agentSessionsService.model.onDidChangeSessions(() => {
-			for (const session of this._agentSessionsService.model.sessions) {
-				if (!session.isArchived()) {
-					this._ensurePRReviewInitialized(session.resource);
-				}
+		this._register(this._sessionsManagementService.onDidChangeSessions(e => {
+			const archived = e.changed.filter(s => s.isArchived.get());
+			const nonArchived = e.changed.filter(s => !s.isArchived.get());
+			// Initialize PR review for new/changed sessions
+			for (const session of [...e.added, ...nonArchived]) {
+				this._ensurePRReviewInitialized(session.resource);
 			}
-		}));
-
-		this._register(this._agentSessionsService.model.onDidChangeSessionArchivedState(e => {
-			if (e.isArchived()) {
-				this._disposePRReview(e.resource);
+			// Dispose PR review for removed and archived sessions
+			for (const session of [...e.removed, ...archived]) {
+				this._disposePRReview(session.resource);
 			}
 		}));
 	}
@@ -342,16 +358,20 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 	requestReview(sessionResource: URI, version: string, files: readonly { readonly currentUri: URI; readonly baseUri?: URI }[]): void {
 		const data = this._getOrCreateData(sessionResource);
 		const currentState = data.state.get();
+		const currentReviewCount = currentState.kind !== CodeReviewStateKind.Idle && currentState.version === version ? currentState.reviewCount : 0;
 
-		// Don't re-request if already loading or completed for this version
+		// Don't re-request if already loading or unresolved comments remain for this version.
 		if (currentState.kind === CodeReviewStateKind.Loading && currentState.version === version) {
 			return;
 		}
-		if (currentState.kind === CodeReviewStateKind.Result && currentState.version === version) {
+		if (currentReviewCount >= MAX_CODE_REVIEWS_PER_SESSION_VERSION) {
+			return;
+		}
+		if (currentState.kind === CodeReviewStateKind.Result && currentState.version === version && currentState.comments.length > 0) {
 			return;
 		}
 
-		data.state.set({ kind: CodeReviewStateKind.Loading, version }, undefined);
+		data.state.set({ kind: CodeReviewStateKind.Loading, version, reviewCount: currentReviewCount + 1 }, undefined);
 
 		this._executeReview(sessionResource, version, files, data);
 	}
@@ -368,7 +388,23 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 		}
 
 		const filtered = state.comments.filter(c => c.id !== commentId);
-		data.state.set({ kind: CodeReviewStateKind.Result, version: state.version, comments: filtered }, undefined);
+		data.state.set({ kind: CodeReviewStateKind.Result, version: state.version, reviewCount: state.reviewCount, comments: filtered, didProduceComments: state.didProduceComments }, undefined);
+		this._saveToStorage();
+	}
+
+	updateComment(sessionResource: URI, commentId: string, newBody: string): void {
+		const data = this._reviewsBySession.get(sessionResource.toString());
+		if (!data) {
+			return;
+		}
+
+		const state = data.state.get();
+		if (state.kind !== CodeReviewStateKind.Result) {
+			return;
+		}
+
+		const updated = state.comments.map(c => c.id === commentId ? { ...c, body: newBody } : c);
+		data.state.set({ kind: CodeReviewStateKind.Result, version: state.version, reviewCount: state.reviewCount, comments: updated, didProduceComments: state.didProduceComments }, undefined);
 		this._saveToStorage();
 	}
 
@@ -419,7 +455,7 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 			}
 
 			if (result.type === 'error') {
-				data.state.set({ kind: CodeReviewStateKind.Error, version, reason: result.reason ?? 'Unknown error' }, undefined);
+				data.state.set({ kind: CodeReviewStateKind.Error, version, reviewCount: currentState.reviewCount, reason: result.reason ?? 'Unknown error' }, undefined);
 				return;
 			}
 
@@ -435,14 +471,14 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 				}));
 
 				transaction(tx => {
-					data.state.set({ kind: CodeReviewStateKind.Result, version, comments }, tx);
+					data.state.set({ kind: CodeReviewStateKind.Result, version, reviewCount: currentState.reviewCount, comments, didProduceComments: comments.length > 0 }, tx);
 				});
 				this._saveToStorage();
 			}
 		} catch (err) {
 			const currentState = data.state.get();
 			if (currentState.kind === CodeReviewStateKind.Loading && currentState.version === version) {
-				data.state.set({ kind: CodeReviewStateKind.Error, version, reason: String(err) }, undefined);
+				data.state.set({ kind: CodeReviewStateKind.Error, version, reviewCount: currentState.reviewCount, reason: String(err) }, undefined);
 			}
 		}
 	}
@@ -466,10 +502,10 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 					suggestion: c.suggestion,
 				}));
 				const data = this._getOrCreateData(URI.parse(key));
-				data.state.set({ kind: CodeReviewStateKind.Result, version: review.version, comments }, undefined);
+				data.state.set({ kind: CodeReviewStateKind.Result, version: review.version, reviewCount: review.reviewCount ?? 1, comments, didProduceComments: review.didProduceComments ?? comments.length > 0 }, undefined);
 			}
 		} catch {
-			// Corrupted storage data — ignore
+			// Corrupted storage data - ignore
 		}
 	}
 
@@ -480,6 +516,8 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 			if (state.kind === CodeReviewStateKind.Result) {
 				stored[key] = {
 					version: state.version,
+					reviewCount: state.reviewCount,
+					didProduceComments: state.didProduceComments,
 					comments: state.comments.map(c => ({
 						id: c.id,
 						uri: c.uri.toJSON(),
@@ -501,9 +539,10 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 	}
 
 	private _registerSessionListeners(): void {
-		// Clean up when a session is archived
-		this._register(this._agentSessionsService.onDidChangeSessionArchivedState(session => {
-			if (session.isArchived()) {
+		// Clean up when sessions change (archived/removed sessions, stale review versions)
+		this._register(this._sessionsManagementService.onDidChangeSessions(e => {
+			// Clean up reviews for removed/archived sessions
+			for (const session of [...e.removed, ...e.changed.filter(s => s.isArchived.get())]) {
 				const key = session.resource.toString();
 				const data = this._reviewsBySession.get(key);
 				if (data) {
@@ -511,10 +550,8 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 					this._saveToStorage();
 				}
 			}
-		}));
 
-		// Clean up when session changes make a review version outdated
-		this._register(this._agentSessionsService.model.onDidChangeSessions(() => {
+			// Check for stale review versions when sessions change
 			let changed = false;
 			for (const [key, data] of this._reviewsBySession) {
 				const state = data.state.get();
@@ -522,25 +559,26 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 					continue;
 				}
 
-				const session = this._agentSessionsService.getSession(URI.parse(key));
+				const session = this._sessionsManagementService.getSession(URI.parse(key));
 				if (!session) {
-					// Session no longer exists — clean up
+					// Session no longer exists - clean up
 					data.state.set({ kind: CodeReviewStateKind.Idle }, undefined);
 					changed = true;
 					continue;
 				}
 
-				if (!(session.changes instanceof Array) || session.changes.length === 0) {
-					// Session has no file-level changes — clean up
+				const changes = session.changes.get();
+				if (changes.length === 0) {
+					// Session has no file-level changes - clean up
 					data.state.set({ kind: CodeReviewStateKind.Idle }, undefined);
 					changed = true;
 					continue;
 				}
 
-				const files = getCodeReviewFilesFromSessionChanges(session.changes);
+				const files = getCodeReviewFilesFromSessionChanges(changes);
 				const currentVersion = getCodeReviewVersion(files);
 				if (state.version !== currentVersion) {
-					// Version mismatch — review is stale
+					// Version mismatch - review is stale
 					data.state.set({ kind: CodeReviewStateKind.Idle }, undefined);
 					changed = true;
 				}
@@ -578,6 +616,26 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 		}
 	}
 
+	markPRReviewCommentConverted(sessionResource: URI, commentId: string): void {
+		const key = sessionResource.toString();
+		let converted = this._convertedPRCommentsBySession.get(key);
+		if (!converted) {
+			converted = new Set();
+			this._convertedPRCommentsBySession.set(key, converted);
+		}
+		converted.add(commentId);
+
+		// Immediately filter the comment from the observable PR review state
+		const data = this._prReviewBySession.get(key);
+		if (data) {
+			const currentState = data.state.get();
+			if (currentState.kind === PRReviewStateKind.Loaded) {
+				const filtered = currentState.comments.filter(c => c.id !== commentId);
+				data.state.set({ kind: PRReviewStateKind.Loaded, comments: filtered }, undefined);
+			}
+		}
+	}
+
 	private _getOrCreatePRReviewData(sessionResource: URI): IPRSessionReviewData {
 		const key = sessionResource.toString();
 		let data = this._prReviewBySession.get(key);
@@ -611,12 +669,17 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 		// Watch the PR model's review threads and map to local state
 		data.disposables.add(autorun(reader => {
 			const threads = prModel.reviewThreads.read(reader);
+			const converted = this._convertedPRCommentsBySession.get(sessionResource.toString());
 			const comments: IPRReviewComment[] = [];
 
 			for (const thread of threads) {
 				if (thread.isResolved) {
 					continue;
 				}
+				const threadId = String(thread.id);
+				if (converted?.has(threadId)) {
+					continue;
+				}
 				const fileUri = this._sessionsManagementService.resolveSessionFileUri(sessionResource, thread.path);
 				if (!fileUri) {
 					continue;
@@ -645,6 +708,7 @@ export class CodeReviewService extends Disposable implements ICodeReviewService
 
 	private _disposePRReview(sessionResource: URI): void {
 		const key = sessionResource.toString();
+		this._convertedPRCommentsBySession.delete(key);
 		const data = this._prReviewBySession.get(key);
 		if (data) {
 			data.disposables.dispose();
diff --git a/src/vs/sessions/contrib/codeReview/test/browser/codeReviewService.test.ts b/src/vs/sessions/contrib/codeReview/test/browser/codeReviewService.test.ts
index 193a55925b2..6cfbc692a91 100644
--- a/src/vs/sessions/contrib/codeReview/test/browser/codeReviewService.test.ts
+++ b/src/vs/sessions/contrib/codeReview/test/browser/codeReviewService.test.ts
@@ -6,7 +6,7 @@
 import assert from 'assert';
 import { URI } from '../../../../../base/common/uri.js';
 import { Range } from '../../../../../editor/common/core/range.js';
-import { observableValue } from '../../../../../base/common/observable.js';
+import { IObservable, observableValue } from '../../../../../base/common/observable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
@@ -15,12 +15,12 @@ import { Emitter, Event } from '../../../../../base/common/event.js';
 import { mock } from '../../../../../base/test/common/mock.js';
 import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 import { InMemoryStorageService, IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
-import { IAgentSession, IAgentSessionsModel } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
-import { IChatSessionFileChange2 } from '../../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { IAgentSessionsService } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { CodeReviewService, CodeReviewStateKind, getCodeReviewFilesFromSessionChanges, getCodeReviewVersion, ICodeReviewService } from '../../browser/codeReviewService.js';
+import { IChatSessionFileChange, IChatSessionFileChange2 } from '../../../../../workbench/contrib/chat/common/chatSessionsService.js';
 import { IGitHubService } from '../../../github/browser/githubService.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../../sessions/browser/sessionsManagementService.js';
+import { ISessionsManagementService } from '../../../sessions/browser/sessionsManagementService.js';
+import { ISessionData } from '../../../sessions/common/sessionData.js';
+import { ISessionsChangeEvent } from '../../../sessions/browser/sessionsProvider.js';
+import { ICodeReviewService, CodeReviewService, CodeReviewStateKind, getCodeReviewFilesFromSessionChanges, getCodeReviewVersion } from '../../browser/codeReviewService.js';
 
 suite('CodeReviewService', () => {
 
@@ -29,7 +29,7 @@ suite('CodeReviewService', () => {
 	let service: ICodeReviewService;
 	let commandService: MockCommandService;
 	let storageService: InMemoryStorageService;
-	let agentSessionsService: MockAgentSessionsService;
+	let sessionsManagement: MockSessionsManagementService;
 
 	let session: URI;
 	let fileA: URI;
@@ -99,53 +99,47 @@ suite('CodeReviewService', () => {
 		}
 	}
 
-	class MockAgentSessionsService {
-		declare readonly _serviceBrand: undefined;
+	class MockSessionsManagementService extends mock<ISessionsManagementService>() {
+		private readonly _onDidChangeSessions: Emitter<ISessionsChangeEvent>;
+		override readonly onDidChangeSessions: Event<ISessionsChangeEvent>;
+		override readonly activeSession: IObservable<ISessionData | undefined>;
 
-		private readonly _onDidChangeSessionArchivedState: Emitter<IAgentSession>;
-		readonly onDidChangeSessionArchivedState: Event<IAgentSession>;
-		private readonly _onDidChangeSessions: Emitter<void>;
-		readonly model: IAgentSessionsModel;
-		private readonly _sessions = new Map<string, IAgentSession>();
+		private readonly _sessions = new Map<string, ISessionData>();
 
 		constructor(disposables: DisposableStore) {
-			this._onDidChangeSessionArchivedState = disposables.add(new Emitter<IAgentSession>());
-			this.onDidChangeSessionArchivedState = this._onDidChangeSessionArchivedState.event;
-			this._onDidChangeSessions = disposables.add(new Emitter<void>());
-			this.model = {
-				onWillResolve: Event.None,
-				onDidResolve: Event.None,
-				onDidChangeSessions: this._onDidChangeSessions.event,
-				onDidChangeSessionArchivedState: this._onDidChangeSessionArchivedState.event,
-				resolved: true,
-				sessions: [],
-				getSession: (resource: URI) => this._sessions.get(resource.toString()),
-				resolve: async () => { },
-			};
+			super();
+			this._onDidChangeSessions = disposables.add(new Emitter<ISessionsChangeEvent>());
+			this.onDidChangeSessions = this._onDidChangeSessions.event;
+			this.activeSession = observableValue<ISessionData | undefined>('test.activeSession', undefined);
 		}
 
-		getSession(resource: URI): IAgentSession | undefined {
+		override getSession(resource: URI): ISessionData | undefined {
 			return this._sessions.get(resource.toString());
 		}
 
-		setSession(resource: URI, changes?: readonly IChatSessionFileChange2[], archived = false): IAgentSession {
-			let _archived = archived;
-			const session = {
+		addSession(resource: URI, changes?: readonly IChatSessionFileChange2[], archived = false): ISessionData {
+			const changesObs = observableValue<readonly IChatSessionFileChange[]>('test.changes',
+				(changes ?? []).map(c => ({ modifiedUri: c.modifiedUri ?? c.uri, originalUri: c.originalUri, insertions: c.insertions, deletions: c.deletions }))
+			);
+			const isArchivedObs = observableValue<boolean>('test.isArchived', archived);
+			const sessionData: ISessionData = {
+				sessionId: `test:${resource.toString()}`,
 				resource,
-				changes,
-				isArchived: () => _archived,
-				setArchived: (v: boolean) => { _archived = v; },
-				isRead: () => true,
-				setRead: () => { },
-			} as unknown as IAgentSession;
-			this._sessions.set(resource.toString(), session);
-			return session;
+				changes: changesObs,
+				isArchived: isArchivedObs,
+			} as unknown as ISessionData;
+			this._sessions.set(resource.toString(), sessionData);
+			return sessionData;
 		}
 
 		updateSessionChanges(resource: URI, changes: readonly IChatSessionFileChange2[] | undefined): void {
-			const session = this._sessions.get(resource.toString()) as Record<string, unknown> | undefined;
+			const session = this._sessions.get(resource.toString());
 			if (session) {
-				session.changes = changes;
+				const obs = session.changes as ReturnType<typeof observableValue<readonly IChatSessionFileChange[]>>;
+				obs.set(
+					(changes ?? []).map(c => ({ modifiedUri: c.modifiedUri ?? c.uri, originalUri: c.originalUri, insertions: c.insertions, deletions: c.deletions })),
+					undefined
+				);
 			}
 		}
 
@@ -153,12 +147,24 @@ suite('CodeReviewService', () => {
 			this._sessions.delete(resource.toString());
 		}
 
-		fireSessionArchivedState(session: IAgentSession): void {
-			this._onDidChangeSessionArchivedState.fire(session);
+		override getSessions(): ISessionData[] {
+			return [...this._sessions.values()];
 		}
 
-		fireSessionsChanged(): void {
-			this._onDidChangeSessions.fire();
+		override getGitHubContextForSession(): undefined {
+			return undefined;
+		}
+
+		override resolveSessionFileUri(): undefined {
+			return undefined;
+		}
+
+		fireSessionsChanged(event?: Partial<ISessionsChangeEvent>): void {
+			this._onDidChangeSessions.fire({
+				added: event?.added ?? [],
+				removed: event?.removed ?? [],
+				changed: event?.changed ?? [],
+			});
 		}
 	}
 
@@ -169,16 +175,13 @@ suite('CodeReviewService', () => {
 		instantiationService.stub(ICommandService, commandService);
 		instantiationService.stub(ILogService, new NullLogService());
 		instantiationService.stub(IGitHubService, new class extends mock<IGitHubService>() { }());
-		instantiationService.stub(ISessionsManagementService, new class extends mock<ISessionsManagementService>() {
-			override readonly activeSession = observableValue<IActiveSessionItem | undefined>('test.activeSession', undefined);
-		}());
+
+		sessionsManagement = new MockSessionsManagementService(store);
+		instantiationService.stub(ISessionsManagementService, sessionsManagement);
 
 		storageService = store.add(new InMemoryStorageService());
 		instantiationService.stub(IStorageService, storageService);
 
-		agentSessionsService = new MockAgentSessionsService(store);
-		instantiationService.stub(IAgentSessionsService, agentSessionsService);
-
 		service = store.add(instantiationService.createInstance(CodeReviewService));
 		session = URI.parse('test://session/1');
 		fileA = URI.parse('file:///a.ts');
@@ -247,6 +250,7 @@ suite('CodeReviewService', () => {
 		assert.strictEqual(state.kind, CodeReviewStateKind.Loading);
 		if (state.kind === CodeReviewStateKind.Loading) {
 			assert.strictEqual(state.version, 'v1');
+			assert.strictEqual(state.reviewCount, 1);
 		}
 
 		// Resolve to avoid leaking
@@ -299,6 +303,7 @@ suite('CodeReviewService', () => {
 		assert.strictEqual(state.kind, CodeReviewStateKind.Result);
 		if (state.kind === CodeReviewStateKind.Result) {
 			assert.strictEqual(state.version, 'v1');
+			assert.strictEqual(state.reviewCount, 1);
 			assert.strictEqual(state.comments.length, 2);
 			assert.strictEqual(state.comments[0].body, 'Bug found');
 			assert.strictEqual(state.comments[0].kind, 'bug');
@@ -318,6 +323,7 @@ suite('CodeReviewService', () => {
 		assert.strictEqual(state.kind, CodeReviewStateKind.Error);
 		if (state.kind === CodeReviewStateKind.Error) {
 			assert.strictEqual(state.version, 'v1');
+			assert.strictEqual(state.reviewCount, 1);
 			assert.strictEqual(state.reason, 'Auth failed');
 		}
 	});
@@ -352,6 +358,7 @@ suite('CodeReviewService', () => {
 		const state = service.getReviewState(session).get();
 		assert.strictEqual(state.kind, CodeReviewStateKind.Error);
 		if (state.kind === CodeReviewStateKind.Error) {
+			assert.strictEqual(state.reviewCount, 1);
 			assert.ok(state.reason.includes('Network error'));
 		}
 	});
@@ -370,8 +377,8 @@ suite('CodeReviewService', () => {
 		commandService.resolveExecution({ type: 'success', comments: [] });
 	});
 
-	test('requestReview is a no-op when result exists for the same version', async () => {
-		commandService.result = { type: 'success', comments: [] };
+	test('requestReview is a no-op when unresolved comments exist for the same version', async () => {
+		commandService.result = { type: 'success', comments: [{ uri: fileA, range: new Range(1, 1, 1, 1), body: 'comment' }] };
 		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
 		await tick();
 
@@ -381,6 +388,71 @@ suite('CodeReviewService', () => {
 		// Should still have the result
 		const state = service.getReviewState(session).get();
 		assert.strictEqual(state.kind, CodeReviewStateKind.Result);
+		if (state.kind === CodeReviewStateKind.Result) {
+			assert.strictEqual(state.comments.length, 1);
+		}
+	});
+
+	test('requestReview reruns when previous result for the same version had no comments', async () => {
+		commandService.result = { type: 'success', comments: [] };
+		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+		await tick();
+
+		commandService.deferNextExecution();
+		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+
+		const state = service.getReviewState(session).get();
+		assert.strictEqual(state.kind, CodeReviewStateKind.Loading);
+
+		commandService.resolveExecution({ type: 'success', comments: [] });
+		await tick();
+	});
+
+	test('requestReview reruns when all comments for the same version were removed', async () => {
+		commandService.result = { type: 'success', comments: [{ uri: fileA, range: new Range(1, 1, 1, 1), body: 'comment' }] };
+		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+		await tick();
+
+		const initialState = service.getReviewState(session).get();
+		assert.strictEqual(initialState.kind, CodeReviewStateKind.Result);
+		if (initialState.kind !== CodeReviewStateKind.Result) {
+			return;
+		}
+
+		service.removeComment(session, initialState.comments[0].id);
+
+		commandService.deferNextExecution();
+		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+
+		const state = service.getReviewState(session).get();
+		assert.strictEqual(state.kind, CodeReviewStateKind.Loading);
+
+		commandService.resolveExecution({ type: 'success', comments: [] });
+		await tick();
+	});
+
+	test('requestReview is a no-op after five reviews for the same version', async () => {
+		commandService.result = { type: 'success', comments: [] };
+
+		for (let i = 0; i < 5; i++) {
+			service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+			await tick();
+		}
+
+		const stateBefore = service.getReviewState(session).get();
+		assert.strictEqual(stateBefore.kind, CodeReviewStateKind.Result);
+		if (stateBefore.kind === CodeReviewStateKind.Result) {
+			assert.strictEqual(stateBefore.reviewCount, 5);
+		}
+
+		commandService.deferNextExecution();
+		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+
+		const stateAfter = service.getReviewState(session).get();
+		assert.strictEqual(stateAfter.kind, CodeReviewStateKind.Result);
+		if (stateAfter.kind === CodeReviewStateKind.Result) {
+			assert.strictEqual(stateAfter.reviewCount, 5);
+		}
 	});
 
 	test('requestReview for a new version replaces loading state', async () => {
@@ -757,6 +829,7 @@ suite('CodeReviewService', () => {
 		const reviewData = stored[session.toString()];
 		assert.ok(reviewData);
 		assert.strictEqual(reviewData.version, 'v1');
+		assert.strictEqual(reviewData.reviewCount, 1);
 		assert.strictEqual(reviewData.comments.length, 1);
 		assert.strictEqual(reviewData.comments[0].body, 'Persisted comment');
 	});
@@ -775,6 +848,7 @@ suite('CodeReviewService', () => {
 		assert.strictEqual(state.kind, CodeReviewStateKind.Result);
 		if (state.kind === CodeReviewStateKind.Result) {
 			assert.strictEqual(state.version, 'v1');
+			assert.strictEqual(state.reviewCount, 1);
 			assert.strictEqual(state.comments.length, 1);
 			assert.strictEqual(state.comments[0].body, 'Restored comment');
 			assert.strictEqual(state.comments[0].uri.toString(), fileA.toString());
@@ -862,20 +936,26 @@ suite('CodeReviewService', () => {
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Result);
 
-		const mockSession = agentSessionsService.setSession(session, undefined, true);
-		agentSessionsService.fireSessionArchivedState(mockSession);
+		const mockSession = sessionsManagement.addSession(session, undefined, true);
+		sessionsManagement.fireSessionsChanged({ changed: [mockSession] });
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Idle);
 		assert.strictEqual(storageService.get('codeReview.reviews', StorageScope.WORKSPACE), undefined);
 	});
 
 	test('non-archived session change does not clean up review', async () => {
+		const changes: IChatSessionFileChange2[] = [
+			{ uri: fileA, modifiedUri: fileA, insertions: 1, deletions: 0 },
+		];
+		const files = getCodeReviewFilesFromSessionChanges(changes);
+		const version = getCodeReviewVersion(files);
+
 		commandService.result = { type: 'success', comments: [{ uri: fileA, range: new Range(1, 1, 1, 1), body: 'comment' }] };
-		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
+		service.requestReview(session, version, files);
 		await tick();
 
-		const mockSession = agentSessionsService.setSession(session, undefined, false);
-		agentSessionsService.fireSessionArchivedState(mockSession);
+		const mockSession = sessionsManagement.addSession(session, changes, false);
+		sessionsManagement.fireSessionsChanged({ changed: [mockSession] });
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Result);
 	});
@@ -884,7 +964,7 @@ suite('CodeReviewService', () => {
 		const changes: IChatSessionFileChange2[] = [
 			{ uri: fileA, modifiedUri: fileA, insertions: 1, deletions: 0 },
 		];
-		agentSessionsService.setSession(session, changes);
+		sessionsManagement.addSession(session, changes);
 
 		const files = getCodeReviewFilesFromSessionChanges(changes);
 		const version = getCodeReviewVersion(files);
@@ -899,8 +979,8 @@ suite('CodeReviewService', () => {
 			{ uri: fileA, modifiedUri: fileA, insertions: 1, deletions: 0 },
 			{ uri: fileB, modifiedUri: fileB, insertions: 2, deletions: 0 },
 		];
-		agentSessionsService.updateSessionChanges(session, newChanges);
-		agentSessionsService.fireSessionsChanged();
+		sessionsManagement.updateSessionChanges(session, newChanges);
+		sessionsManagement.fireSessionsChanged();
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Idle);
 		assert.strictEqual(storageService.get('codeReview.reviews', StorageScope.WORKSPACE), undefined);
@@ -913,13 +993,13 @@ suite('CodeReviewService', () => {
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Result);
 
-		agentSessionsService.fireSessionsChanged();
+		sessionsManagement.fireSessionsChanged();
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Idle);
 	});
 
 	test('session with no changes has review cleaned up', async () => {
-		agentSessionsService.setSession(session, [
+		sessionsManagement.addSession(session, [
 			{ uri: fileA, modifiedUri: fileA, insertions: 1, deletions: 0 },
 		]);
 
@@ -927,8 +1007,8 @@ suite('CodeReviewService', () => {
 		service.requestReview(session, 'v1', [{ currentUri: fileA }]);
 		await tick();
 
-		agentSessionsService.updateSessionChanges(session, undefined);
-		agentSessionsService.fireSessionsChanged();
+		sessionsManagement.updateSessionChanges(session, undefined);
+		sessionsManagement.fireSessionsChanged();
 
 		assert.strictEqual(service.getReviewState(session).get().kind, CodeReviewStateKind.Idle);
 	});
@@ -937,7 +1017,7 @@ suite('CodeReviewService', () => {
 		const changes: IChatSessionFileChange2[] = [
 			{ uri: fileA, modifiedUri: fileA, insertions: 1, deletions: 0 },
 		];
-		agentSessionsService.setSession(session, changes);
+		sessionsManagement.addSession(session, changes);
 
 		const files = getCodeReviewFilesFromSessionChanges(changes);
 		const version = getCodeReviewVersion(files);
@@ -946,7 +1026,7 @@ suite('CodeReviewService', () => {
 		service.requestReview(session, version, files);
 		await tick();
 
-		agentSessionsService.fireSessionsChanged();
+		sessionsManagement.fireSessionsChanged();
 
 		const state = service.getReviewState(session).get();
 		assert.strictEqual(state.kind, CodeReviewStateKind.Result);
diff --git a/src/vs/sessions/contrib/configuration/browser/configuration.contribution.ts b/src/vs/sessions/contrib/configuration/browser/configuration.contribution.ts
index 22e2a3bd28d..04711b328a9 100644
--- a/src/vs/sessions/contrib/configuration/browser/configuration.contribution.ts
+++ b/src/vs/sessions/contrib/configuration/browser/configuration.contribution.ts
@@ -8,6 +8,8 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultConfigurations([{
 	overrides: {
+		'breadcrumbs.enabled': false,
+
 		'chat.experimentalSessionsWindowOverride': true,
 		'chat.hookFilesLocations': {
 			'.claude/settings.local.json': false,
@@ -20,15 +22,18 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultCon
 		'chat.implicitContext.suggestedContext': false,
 		'chat.implicitContext.enabled': { 'panel': 'never' },
 		'chat.tools.terminal.enableAutoApprove': true,
-		'github.copilot.chat.githubMcpServer.enabled': true,
-
-		'breadcrumbs.enabled': false,
 
 		'diffEditor.hideUnchangedRegions.enabled': true,
 
 		'extensions.ignoreRecommendations': true,
 
 		'files.autoSave': 'afterDelay',
+		'files.watcherExclude': {
+			'**/.git/objects/**': true,
+			'**/.git/subtree-cache/**': true,
+			'**/node_modules/*/**': true /* TODO@bpasero see if this helps improve perf */,
+			'**/.hg/store/**': true
+		},
 
 		'git.autofetch': true,
 		'git.branchRandomName.enable': true,
@@ -39,15 +44,20 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultCon
 			'markdown': true,
 			'plaintext': true,
 		},
-
 		'github.copilot.chat.claudeCode.enabled': true,
 		'github.copilot.chat.cli.branchSupport.enabled': true,
-		'github.copilot.chat.languageContext.typescript.enabled': true,
+		'github.copilot.chat.cli.isolationOption.enabled': false,
 		'github.copilot.chat.cli.mcp.enabled': true,
+		'github.copilot.chat.githubMcpServer.enabled': true,
+		'github.copilot.chat.languageContext.typescript.enabled': true,
 
 		'inlineChat.affordance': 'editor',
 		'inlineChat.renderMode': 'hover',
 
+		'search.quickOpen.includeHistory': false,
+
+		'task.notifyWindowOnTaskCompletion': -1,
+
 		'terminal.integrated.initialHint': false,
 
 		'workbench.editor.doubleClickTabToToggleEditorGroupSizes': 'maximize',
@@ -56,9 +66,9 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultCon
 		'workbench.tips.enabled': false,
 		'workbench.layoutControl.type': 'toggles',
 		'workbench.editor.useModal': 'all',
+		'workbench.editor.modalMinWidth': 600,
 		'workbench.panel.showLabels': false,
-		'workbench.colorTheme': 'Experimental Dark',
-		'search.quickOpen.includeHistory': false,
+		'workbench.colorTheme': 'VS Code Dark',
 
 		'window.menuStyle': 'custom',
 		'window.dialogStyle': 'custom',
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts
new file mode 100644
index 00000000000..cab7f1583ae
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { CopilotCLISession } from './copilotChatSessionsProvider.js';
+
+const FILTER_THRESHOLD = 10;
+
+interface IBranchItem {
+	readonly name: string;
+}
+
+/**
+ * A widget for selecting a git branch.
+ * Reads branch list and selected branch from the active {@link CopilotCLISession},
+ * which is the source of truth for branch state.
+ */
+export class BranchPicker extends Disposable {
+
+	private readonly _renderDisposables = this._register(new DisposableStore());
+	private _slotElement: HTMLElement | undefined;
+	private _triggerElement: HTMLElement | undefined;
+
+	constructor(
+		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		this._register(autorun(reader => {
+			const session = this.sessionsManagementService.activeSession.read(reader);
+			if (session instanceof CopilotCLISession) {
+				session.loading.read(reader);
+				session.branches.read(reader);
+				session.branchesLoading.read(reader);
+				session.branchObservable.read(reader);
+				session.isolationModeObservable.read(reader);
+			}
+			this._updateTriggerLabel();
+		}));
+	}
+
+	private _getSession(): CopilotCLISession | undefined {
+		const session = this.sessionsManagementService.activeSession.get();
+		return session instanceof CopilotCLISession ? session : undefined;
+	}
+
+	render(container: HTMLElement): void {
+		this._renderDisposables.clear();
+
+		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
+		this._slotElement = slot;
+		this._renderDisposables.add({ dispose: () => slot.remove() });
+
+		const trigger = dom.append(slot, dom.$('a.action-label'));
+		trigger.tabIndex = 0;
+		trigger.role = 'button';
+		this._triggerElement = trigger;
+		this._updateTriggerLabel();
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
+			dom.EventHelper.stop(e, true);
+			this.showPicker();
+		}));
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				dom.EventHelper.stop(e, true);
+				this.showPicker();
+			}
+		}));
+	}
+
+	showPicker(): void {
+		const session = this._getSession();
+		const branches = session?.branches.get() ?? [];
+		if (!this._triggerElement || this.actionWidgetService.isVisible || branches.length === 0 || session?.isolationMode === 'workspace') {
+			return;
+		}
+
+		const selectedBranch = session?.branch;
+		const items: IActionListItem<IBranchItem>[] = branches.map(branch => ({
+			kind: ActionListItemKind.Action,
+			label: branch,
+			group: { title: '', icon: Codicon.gitBranch },
+			item: { name: branch, checked: branch === selectedBranch || undefined },
+		}));
+
+		const triggerElement = this._triggerElement;
+		const delegate: IActionListDelegate<IBranchItem> = {
+			onSelect: (item) => {
+				this.actionWidgetService.hide();
+				session?.setBranch(item.name);
+			},
+			onHide: () => { triggerElement.focus(); },
+		};
+
+		const totalActions = items.filter(i => i.kind === ActionListItemKind.Action).length;
+
+		this.actionWidgetService.show<IBranchItem>(
+			'branchPicker',
+			false,
+			items,
+			delegate,
+			this._triggerElement,
+			undefined,
+			[],
+			{
+				getAriaLabel: (item) => item.label ?? '',
+				getWidgetAriaLabel: () => localize('branchPicker.ariaLabel', "Branch Picker"),
+			},
+			totalActions > FILTER_THRESHOLD ? { showFilter: true, filterPlaceholder: localize('branchPicker.filter', "Filter branches...") } : undefined,
+		);
+	}
+
+	private _updateTriggerLabel(): void {
+		if (!this._triggerElement) {
+			return;
+		}
+		dom.clearNode(this._triggerElement);
+
+		const session = this._getSession();
+		const branches = session?.branches.get() ?? [];
+		const isLoading = session?.branchesLoading.get() ?? false;
+		const isDisabled = session?.isolationMode === 'workspace' || branches.length === 0;
+		const label = session?.branch ?? localize('branchPicker.select', "Branch");
+
+		dom.append(this._triggerElement, renderIcon(Codicon.gitBranch));
+		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
+		labelSpan.textContent = label;
+		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
+
+		this._slotElement?.classList.toggle('disabled', isLoading || isDisabled);
+		this._triggerElement.setAttribute('aria-disabled', String(isLoading || isDisabled));
+		this._triggerElement.tabIndex = (isLoading || isDisabled) ? -1 : 0;
+	}
+}
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessions.contribution.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessions.contribution.ts
new file mode 100644
index 00000000000..5e28b9a81a1
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessions.contribution.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { CopilotChatSessionsProvider } from '../../copilotChatSessions/browser/copilotChatSessionsProvider.js';
+import '../../copilotChatSessions/browser/copilotChatSessionsActions.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
+
+/**
+ * Registers the {@link CopilotChatSessionsProvider} as a sessions provider.
+ */
+class DefaultSessionsProviderContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'sessions.defaultSessionsProvider';
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ISessionsProvidersService sessionsProvidersService: ISessionsProvidersService,
+	) {
+		super();
+		const provider = this._register(instantiationService.createInstance(CopilotChatSessionsProvider));
+		this._register(sessionsProvidersService.registerProvider(provider));
+	}
+}
+
+registerWorkbenchContribution2(DefaultSessionsProviderContribution.ID, DefaultSessionsProviderContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsActions.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsActions.ts
new file mode 100644
index 00000000000..90e130963ca
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsActions.ts
@@ -0,0 +1,373 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IReader, autorun, observableValue } from '../../../../base/common/observable.js';
+import { localize2 } from '../../../../nls.js';
+import { Action2, registerAction2, MenuId, MenuRegistry, isIMenuItem } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { BaseActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
+import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../../../workbench/contrib/chat/common/languageModels.js';
+import { IModelPickerDelegate } from '../../../../workbench/contrib/chat/browser/widget/input/modelPickerActionItem.js';
+import { IChatInputPickerOptions } from '../../../../workbench/contrib/chat/browser/widget/input/chatInputPickerActionItem.js';
+import { EnhancedModelPickerActionItem } from '../../../../workbench/contrib/chat/browser/widget/input/modelPickerActionItem2.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IContextKeyService, ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Menus } from '../../../browser/menus.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
+import { SessionItemContextMenuId } from '../../sessions/browser/views/sessionsList.js';
+import { ISessionData } from '../../sessions/common/sessionData.js';
+import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { CopilotCLISession, COPILOT_PROVIDER_ID } from './copilotChatSessionsProvider.js';
+import { COPILOT_CLI_SESSION_TYPE, COPILOT_CLOUD_SESSION_TYPE } from '../../sessions/browser/sessionTypes.js';
+import { IsolationPicker } from './isolationPicker.js';
+import { BranchPicker } from './branchPicker.js';
+import { ModePicker } from './modePicker.js';
+import { CloudModelPicker } from './modelPicker.js';
+import { NewChatPermissionPicker } from '../../chat/browser/newChatPermissionPicker.js';
+
+const ActiveSessionHasGitRepositoryContext = new RawContextKey<boolean>('activeSessionHasGitRepository', false);
+const IsActiveSessionCopilotCLI = ContextKeyExpr.equals('activeSessionType', COPILOT_CLI_SESSION_TYPE);
+const IsActiveSessionCopilotCloud = ContextKeyExpr.equals('activeSessionType', COPILOT_CLOUD_SESSION_TYPE);
+const IsActiveCopilotChatSessionProvider = ContextKeyExpr.equals('activeSessionProviderId', COPILOT_PROVIDER_ID);
+const IsActiveSessionCopilotChatCLI = ContextKeyExpr.and(IsActiveSessionCopilotCLI, IsActiveCopilotChatSessionProvider);
+const IsActiveSessionCopilotChatCloud = ContextKeyExpr.and(IsActiveSessionCopilotCloud, IsActiveCopilotChatSessionProvider);
+
+// -- Actions --
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'sessions.defaultCopilot.isolationPicker',
+			title: localize2('isolationPicker', "Isolation Mode"),
+			f1: false,
+			menu: [{
+				id: Menus.NewSessionRepositoryConfig,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyExpr.and(
+					IsActiveSessionCopilotChatCLI,
+					ContextKeyExpr.equals('config.github.copilot.chat.cli.isolationOption.enabled', true),
+				),
+			}],
+		});
+	}
+	override async run(): Promise<void> { /* handled by action view item */ }
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'sessions.defaultCopilot.branchPicker',
+			title: localize2('branchPicker', "Branch"),
+			f1: false,
+			precondition: ActiveSessionHasGitRepositoryContext,
+			menu: [{
+				id: Menus.NewSessionRepositoryConfig,
+				group: 'navigation',
+				order: 2,
+				when: IsActiveSessionCopilotChatCLI,
+			}],
+		});
+	}
+	override async run(): Promise<void> { /* handled by action view item */ }
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'sessions.defaultCopilot.modePicker',
+			title: localize2('modePicker', "Mode"),
+			f1: false,
+			menu: [{
+				id: Menus.NewSessionConfig,
+				group: 'navigation',
+				order: 0,
+				when: IsActiveSessionCopilotChatCLI,
+			}],
+		});
+	}
+	override async run(): Promise<void> { /* handled by action view item */ }
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'sessions.defaultCopilot.localModelPicker',
+			title: localize2('localModelPicker', "Model"),
+			f1: false,
+			menu: [{
+				id: Menus.NewSessionConfig,
+				group: 'navigation',
+				order: 1,
+				when: IsActiveSessionCopilotChatCLI,
+			}],
+		});
+	}
+	override async run(): Promise<void> { /* handled by action view item */ }
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'sessions.defaultCopilot.cloudModelPicker',
+			title: localize2('cloudModelPicker', "Model"),
+			f1: false,
+			menu: [{
+				id: Menus.NewSessionConfig,
+				group: 'navigation',
+				order: 1,
+				when: IsActiveSessionCopilotChatCloud,
+			}],
+		});
+	}
+	override async run(): Promise<void> { /* handled by action view item */ }
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'sessions.defaultCopilot.permissionPicker',
+			title: localize2('permissionPicker', "Permissions"),
+			f1: false,
+			menu: [{
+				id: Menus.NewSessionControl,
+				group: 'navigation',
+				order: 1,
+				when: IsActiveSessionCopilotChatCLI,
+			}],
+		});
+	}
+	override async run(): Promise<void> { /* handled by action view item */ }
+});
+
+// -- Helper --
+
+/**
+ * Wraps a standalone picker widget as a {@link BaseActionViewItem}
+ * so it can be rendered by a {@link MenuWorkbenchToolBar}.
+ */
+class PickerActionViewItem extends BaseActionViewItem {
+	constructor(private readonly picker: { render(container: HTMLElement): void; dispose(): void }) {
+		super(undefined, { id: '', label: '', enabled: true, class: undefined, tooltip: '', run: () => { } });
+	}
+
+	override render(container: HTMLElement): void {
+		this.picker.render(container);
+	}
+
+	override dispose(): void {
+		this.picker.dispose();
+		super.dispose();
+	}
+}
+
+// -- Action View Item Registrations --
+
+class CopilotPickerActionViewItemContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.copilotPickerActionViewItems';
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ILanguageModelsService languageModelsService: ILanguageModelsService,
+		@ISessionsManagementService sessionsManagementService: ISessionsManagementService,
+		@ISessionsProvidersService sessionsProvidersService: ISessionsProvidersService,
+		@IStorageService storageService: IStorageService,
+	) {
+		super();
+
+		this._register(actionViewItemService.register(
+			Menus.NewSessionRepositoryConfig, 'sessions.defaultCopilot.isolationPicker',
+			() => {
+				const picker = instantiationService.createInstance(IsolationPicker);
+				return new PickerActionViewItem(picker);
+			},
+		));
+		this._register(actionViewItemService.register(
+			Menus.NewSessionRepositoryConfig, 'sessions.defaultCopilot.branchPicker',
+			() => {
+				const picker = instantiationService.createInstance(BranchPicker);
+				return new PickerActionViewItem(picker);
+			},
+		));
+		this._register(actionViewItemService.register(
+			Menus.NewSessionConfig, 'sessions.defaultCopilot.modePicker',
+			() => {
+				const picker = instantiationService.createInstance(ModePicker);
+				return new PickerActionViewItem(picker);
+			},
+		));
+		this._register(actionViewItemService.register(
+			Menus.NewSessionConfig, 'sessions.defaultCopilot.localModelPicker',
+			() => {
+				const currentModel = observableValue<ILanguageModelChatMetadataAndIdentifier | undefined>('currentModel', undefined);
+				const delegate: IModelPickerDelegate = {
+					currentModel,
+					setModel: (model: ILanguageModelChatMetadataAndIdentifier) => {
+						currentModel.set(model, undefined);
+						storageService.store('sessions.localModelPicker.selectedModelId', model.identifier, StorageScope.PROFILE, StorageTarget.MACHINE);
+						const session = sessionsManagementService.activeSession.get();
+						if (session) {
+							const provider = sessionsProvidersService.getProviders().find(p => p.id === session.providerId);
+							provider?.setModel(session.sessionId, model.identifier);
+						}
+					},
+					getModels: () => getAvailableModels(languageModelsService),
+					useGroupedModelPicker: () => true,
+					showManageModelsAction: () => false,
+					showUnavailableFeatured: () => false,
+					showFeatured: () => true,
+				};
+				const pickerOptions: IChatInputPickerOptions = {
+					hideChevrons: observableValue('hideChevrons', false),
+					hoverPosition: { hoverPosition: HoverPosition.ABOVE },
+				};
+				const action = { id: 'sessions.modelPicker', label: '', enabled: true, class: undefined, tooltip: '', run: () => { } };
+				const modelPicker = instantiationService.createInstance(EnhancedModelPickerActionItem, action, delegate, pickerOptions);
+
+				// Initialize with remembered model or first available model
+				const rememberedModelId = storageService.get('sessions.localModelPicker.selectedModelId', StorageScope.PROFILE);
+				const initModel = () => {
+					const models = getAvailableModels(languageModelsService);
+					modelPicker.setEnabled(models.length > 0);
+					if (!currentModel.get() && models.length > 0) {
+						const remembered = rememberedModelId ? models.find(m => m.identifier === rememberedModelId) : undefined;
+						currentModel.set(remembered ?? models[0], undefined);
+					}
+				};
+				initModel();
+				this._register(languageModelsService.onDidChangeLanguageModels(() => initModel()));
+
+				return modelPicker;
+			},
+		));
+		this._register(actionViewItemService.register(
+			Menus.NewSessionConfig, 'sessions.defaultCopilot.cloudModelPicker',
+			() => {
+				const picker = instantiationService.createInstance(CloudModelPicker);
+				return new PickerActionViewItem(picker);
+			},
+		));
+		this._register(actionViewItemService.register(
+			Menus.NewSessionControl, 'sessions.defaultCopilot.permissionPicker',
+			() => {
+				const picker = instantiationService.createInstance(NewChatPermissionPicker);
+				return new PickerActionViewItem(picker);
+			},
+		));
+	}
+}
+
+function getAvailableModels(languageModelsService: ILanguageModelsService): ILanguageModelChatMetadataAndIdentifier[] {
+	return languageModelsService.getLanguageModelIds()
+		.map(id => {
+			const metadata = languageModelsService.lookupLanguageModel(id);
+			return metadata ? { metadata, identifier: id } : undefined;
+		})
+		.filter((m): m is ILanguageModelChatMetadataAndIdentifier => !!m && m.metadata.targetChatSessionType === AgentSessionProviders.Background);
+}
+
+// -- Context Key Contribution --
+
+class CopilotActiveSessionContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.copilotActiveSession';
+
+	constructor(
+		@ISessionsManagementService sessionsManagementService: ISessionsManagementService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		const hasRepositoryKey = ActiveSessionHasGitRepositoryContext.bindTo(contextKeyService);
+
+		this._register(autorun((reader: IReader) => {
+			const session = sessionsManagementService.activeSession.read(reader);
+			if (session instanceof CopilotCLISession) {
+				const isLoading = session.loading.read(reader);
+				hasRepositoryKey.set(!isLoading && !!session.gitRepository);
+			} else {
+				hasRepositoryKey.set(false);
+			}
+		}));
+	}
+}
+
+registerWorkbenchContribution2(CopilotPickerActionViewItemContribution.ID, CopilotPickerActionViewItemContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(CopilotActiveSessionContribution.ID, CopilotActiveSessionContribution, WorkbenchPhase.AfterRestored);
+
+/**
+ * Bridges extension-contributed context menu actions from {@link MenuId.AgentSessionsContext}
+ * to {@link SessionItemContextMenuId} for the new sessions view.
+ * Registers wrapper commands that resolve {@link ISessionData} → {@link IAgentSession}
+ * and forward to the original command with marshalled context.
+ */
+class CopilotSessionContextMenuBridge extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'copilotChatSessions.contextMenuBridge';
+
+	private readonly _bridgedIds = new Set<string>();
+
+	constructor(
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@ICommandService private readonly commandService: ICommandService,
+	) {
+		super();
+		this._bridgeItems();
+		this._register(MenuRegistry.onDidChangeMenu(menuIds => {
+			if (menuIds.has(MenuId.AgentSessionsContext)) {
+				this._bridgeItems();
+			}
+		}));
+	}
+
+	private _bridgeItems(): void {
+		const items = MenuRegistry.getMenuItems(MenuId.AgentSessionsContext).filter(isIMenuItem);
+		for (const item of items) {
+			const commandId = item.command.id;
+			if (!commandId.startsWith('github.copilot.')) {
+				continue;
+			}
+			if (this._bridgedIds.has(commandId)) {
+				continue;
+			}
+			this._bridgedIds.add(commandId);
+
+			const wrapperId = `sessionsViewPane.bridge.${commandId}`;
+			this._register(CommandsRegistry.registerCommand(wrapperId, (accessor, sessionData?: ISessionData) => {
+				if (!sessionData) {
+					return;
+				}
+				const agentSession = this.agentSessionsService.getSession(sessionData.resource);
+				if (!agentSession) {
+					return;
+				}
+				return this.commandService.executeCommand(commandId, {
+					session: agentSession,
+					sessions: [agentSession],
+					$mid: MarshalledId.AgentSessionContext,
+				});
+			}));
+
+			const providerWhen = ContextKeyExpr.equals('chatSessionProviderId', COPILOT_PROVIDER_ID);
+			this._register(MenuRegistry.appendMenuItem(SessionItemContextMenuId, {
+				command: { ...item.command, id: wrapperId },
+				group: item.group,
+				order: item.order,
+				when: item.when ? ContextKeyExpr.and(providerWhen, item.when) : providerWhen,
+			}));
+		}
+	}
+}
+
+registerWorkbenchContribution2(CopilotSessionContextMenuBridge.ID, CopilotSessionContextMenuBridge, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts
new file mode 100644
index 00000000000..db4d0379855
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts
@@ -0,0 +1,1178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
+import { themeColorFromId, ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IAgentSession } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { getRepositoryName } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.js';
+import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { AgentSessionProviders, AgentSessionTarget } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
+import { IChatService, IChatSendRequestOptions } from '../../../../workbench/contrib/chat/common/chatService/chatService.js';
+import { ChatSessionStatus, IChatSessionFileChange, IChatSessionsService, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { ISessionData, ISessionPullRequest, ISessionRepository, ISessionWorkspace, SessionStatus, GITHUB_REMOTE_FILE_SCHEME } from '../../sessions/common/sessionData.js';
+import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel } from '../../../../workbench/contrib/chat/common/constants.js';
+import { basename } from '../../../../base/common/resources.js';
+import { ISendRequestOptions, ISessionsBrowseAction, ISessionsChangeEvent, ISessionsProvider, ISessionType } from '../../sessions/browser/sessionsProvider.js';
+import { CopilotCLISessionType, CopilotCloudSessionType } from '../../sessions/browser/sessionTypes.js';
+import { ISessionOptionGroup } from '../../chat/browser/newSession.js';
+import { IsolationMode } from './isolationPicker.js';
+import { ChatViewPaneTarget, IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
+import { ILanguageModelToolsService } from '../../../../workbench/contrib/chat/common/tools/languageModelToolsService.js';
+import { isBuiltinChatMode, IChatMode } from '../../../../workbench/contrib/chat/common/chatModes.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ILanguageModelsService } from '../../../../workbench/contrib/chat/common/languageModels.js';
+import { IGitService, IGitRepository } from '../../../../workbench/contrib/git/common/gitService.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IChatRequestVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
+import { localize } from '../../../../nls.js';
+
+const OPEN_REPO_COMMAND = 'github.copilot.chat.cloudSessions.openRepository';
+
+/** Provider ID for the Copilot Chat Sessions provider. */
+export const COPILOT_PROVIDER_ID = 'default-copilot';
+
+
+const REPOSITORY_OPTION_ID = 'repository';
+const BRANCH_OPTION_ID = 'branch';
+const ISOLATION_OPTION_ID = 'isolation';
+const AGENT_OPTION_ID = 'agent';
+
+/**
+ * Provider-specific observable fields on new Copilot sessions.
+ * Used by pickers and contributions that need to read/write provider-internal state.
+ */
+export interface ICopilotNewSessionData extends ISessionData {
+	readonly permissionLevel: IObservable<ChatPermissionLevel>;
+	readonly branchObservable: IObservable<string | undefined>;
+	readonly isolationModeObservable: IObservable<string | undefined>;
+}
+
+/**
+ * Local new session for Background agent sessions.
+ * Implements {@link ISessionData} (session facade) and provides
+ * pre-send configuration methods for the new-session flow.
+ */
+export class CopilotCLISession extends Disposable implements ISessionData {
+
+	static readonly COPILOT_WORKTREE_PATTERN = 'copilot-worktree-';
+
+	// -- ISessionData fields --
+
+	readonly sessionId: string;
+	readonly providerId: string;
+	readonly sessionType: string;
+	readonly icon: ThemeIcon;
+	readonly createdAt: Date;
+
+	private readonly _title = observableValue(this, '');
+	readonly title: IObservable<string> = this._title;
+
+	private readonly _updatedAt = observableValue(this, new Date());
+	readonly updatedAt: IObservable<Date> = this._updatedAt;
+
+	private readonly _status = observableValue(this, SessionStatus.Untitled);
+	readonly status: IObservable<SessionStatus> = this._status;
+
+	private readonly _permissionLevel = observableValue(this, ChatPermissionLevel.Default);
+	readonly permissionLevel: IObservable<ChatPermissionLevel> = this._permissionLevel;
+
+	private readonly _workspaceData = observableValue<ISessionWorkspace | undefined>(this, undefined);
+	readonly workspace: IObservable<ISessionWorkspace | undefined> = this._workspaceData;
+
+	private readonly _branchObservable = observableValue<string | undefined>(this, undefined);
+	readonly branchObservable: IObservable<string | undefined> = this._branchObservable;
+
+	private readonly _isolationModeObservable = observableValue<string | undefined>(this, 'worktree');
+	readonly isolationModeObservable: IObservable<string | undefined> = this._isolationModeObservable;
+
+	readonly changes: IObservable<readonly IChatSessionFileChange[]> = observableValue<readonly IChatSessionFileChange[]>(this, []);
+
+	private readonly _modelIdObservable = observableValue<string | undefined>(this, undefined);
+	readonly modelId: IObservable<string | undefined> = this._modelIdObservable;
+
+	private readonly _modeObservable = observableValue<{ readonly id: string; readonly kind: string } | undefined>(this, undefined);
+	readonly mode: IObservable<{ readonly id: string; readonly kind: string } | undefined> = this._modeObservable;
+
+	private readonly _loading = observableValue(this, true);
+	readonly loading: IObservable<boolean> = this._loading;
+
+	readonly isArchived: IObservable<boolean> = observableValue(this, false);
+	readonly isRead: IObservable<boolean> = observableValue(this, true);
+	readonly description: IObservable<string | undefined> = observableValue(this, undefined);
+	readonly lastTurnEnd: IObservable<Date | undefined> = observableValue(this, undefined);
+	readonly pullRequest: IObservable<ISessionPullRequest | undefined> = observableValue(this, undefined);
+
+	private _gitRepository: IGitRepository | undefined;
+	private readonly _loadBranchesCts = this._register(new MutableDisposable<CancellationTokenSource>());
+
+	// -- Branch state --
+
+	private readonly _branches = observableValue<readonly string[]>(this, []);
+	readonly branches: IObservable<readonly string[]> = this._branches;
+
+	private readonly _branchesLoading = observableValue(this, false);
+	readonly branchesLoading: IObservable<boolean> = this._branchesLoading;
+
+	private _defaultBranch: string | undefined;
+
+	// -- New session configuration fields --
+
+	private _repoUri: URI | undefined;
+	private _isolationMode: IsolationMode;
+	private _branch: string | undefined;
+	private _modelId: string | undefined;
+	private _mode: IChatMode | undefined;
+	private _query: string | undefined;
+	private _attachedContext: IChatRequestVariableEntry[] | undefined;
+
+	readonly target = AgentSessionProviders.Background;
+	readonly selectedOptions = new Map<string, IChatSessionProviderOptionItem>();
+
+	get isolationMode(): IsolationMode { return this._isolationMode; }
+	get branch(): string | undefined { return this._branch; }
+	get selectedModelId(): string | undefined { return this._modelId; }
+	get chatMode(): IChatMode | undefined { return this._mode; }
+	get query(): string | undefined { return this._query; }
+	get attachedContext(): IChatRequestVariableEntry[] | undefined { return this._attachedContext; }
+	get gitRepository(): IGitRepository | undefined { return this._gitRepository; }
+	get disabled(): boolean {
+		if (!this._repoUri) {
+			return true;
+		}
+		if (this._isolationMode === 'worktree' && !this._branch) {
+			return true;
+		}
+		return false;
+	}
+
+	constructor(
+		readonly resource: URI,
+		readonly sessionWorkspace: ISessionWorkspace,
+		providerId: string,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IGitService private readonly gitService: IGitService,
+	) {
+		super();
+		this.sessionId = `${providerId}:${resource.toString()}`;
+		this.providerId = providerId;
+		this.sessionType = AgentSessionProviders.Background;
+		this.icon = CopilotCLISessionType.icon;
+		this.createdAt = new Date();
+
+		const repoUri = sessionWorkspace.repositories[0]?.uri;
+		if (repoUri) {
+			this._repoUri = repoUri;
+			this.setOption(REPOSITORY_OPTION_ID, repoUri.fsPath);
+		}
+
+		// Set ISessionData workspace observable
+		this._workspaceData.set(sessionWorkspace, undefined);
+
+		this._isolationMode = 'worktree';
+		this.setOption(ISOLATION_OPTION_ID, 'worktree');
+
+		// Resolve git repository asynchronously
+		this._resolveGitRepository();
+	}
+
+	private async _resolveGitRepository(): Promise<void> {
+		const repoUri = this.sessionWorkspace.repositories[0]?.uri;
+		if (repoUri) {
+			try {
+				this._gitRepository = await this.gitService.openRepository(repoUri);
+			} catch {
+				// No git repository available
+			}
+		}
+		this._loading.set(false, undefined);
+
+		if (this._gitRepository) {
+			this._loadBranches();
+		}
+	}
+
+	private _loadBranches(): void {
+		const repo = this._gitRepository;
+		if (!repo) {
+			return;
+		}
+
+		this._loadBranchesCts.value?.cancel();
+		const cts = this._loadBranchesCts.value = new CancellationTokenSource();
+
+		this._branchesLoading.set(true, undefined);
+
+		repo.getRefs({ pattern: 'refs/heads' }, cts.token).then(refs => {
+			if (cts.token.isCancellationRequested) {
+				return;
+			}
+			const branches = refs
+				.map(r => r.name)
+				.filter((name): name is string => !!name)
+				.filter(name => !name.includes(CopilotCLISession.COPILOT_WORKTREE_PATTERN));
+
+			const defaultBranch = branches.find(b => b === repo.state.get().HEAD?.name)
+				?? branches.find(b => b === 'main')
+				?? branches.find(b => b === 'master')
+				?? branches[0];
+
+			this._defaultBranch = defaultBranch;
+
+			transaction(tx => {
+				this._branches.set(branches, tx);
+				this._branchesLoading.set(false, tx);
+			});
+
+			if (defaultBranch && !this._branch) {
+				this.setBranch(defaultBranch);
+			}
+		}).catch(() => {
+			if (!cts.token.isCancellationRequested) {
+				transaction(tx => {
+					this._branches.set([], tx);
+					this._branchesLoading.set(false, tx);
+				});
+			}
+		});
+	}
+
+	setIsolationMode(mode: IsolationMode): void {
+		if (this._isolationMode !== mode) {
+			this._isolationMode = mode;
+			this._isolationModeObservable.set(mode, undefined);
+			this.setOption(ISOLATION_OPTION_ID, mode);
+
+			if (mode === 'workspace' && this._defaultBranch) {
+				this.setBranch(this._defaultBranch);
+			}
+		}
+	}
+
+	setBranch(branch: string | undefined): void {
+		if (this._branch !== branch) {
+			this._branch = branch;
+			this._branchObservable.set(branch, undefined);
+			this.setOption(BRANCH_OPTION_ID, branch ?? '');
+		}
+	}
+
+	setModelId(modelId: string | undefined): void {
+		this._modelId = modelId;
+		this._modelIdObservable.set(modelId, undefined);
+	}
+
+	setModeById(modeId: string, modeKind: string): void {
+		this._modeObservable.set({ id: modeId, kind: modeKind }, undefined);
+	}
+
+	setPermissionLevel(level: ChatPermissionLevel): void {
+		this._permissionLevel.set(level, undefined);
+	}
+
+	setMode(mode: IChatMode | undefined): void {
+		if (this._mode?.id !== mode?.id) {
+			this._mode = mode;
+			const modeName = mode?.isBuiltin ? undefined : mode?.name.get();
+			this.setOption(AGENT_OPTION_ID, modeName ?? '');
+		}
+	}
+
+	setOption(optionId: string, value: IChatSessionProviderOptionItem | string): void {
+		if (typeof value === 'string') {
+			this.selectedOptions.set(optionId, { id: value, name: value });
+		} else {
+			this.selectedOptions.set(optionId, value);
+		}
+		this.chatSessionsService.setSessionOption(this.resource, optionId, value);
+	}
+
+	update(session: ISessionData): void {
+		this._workspaceData.set(session.workspace.get(), undefined);
+	}
+}
+
+function isModelOptionGroup(group: IChatSessionProviderOptionGroup): boolean {
+	if (group.id === 'models') {
+		return true;
+	}
+	const nameLower = group.name.toLowerCase();
+	return nameLower === 'model' || nameLower === 'models';
+}
+
+function isRepositoriesOptionGroup(group: IChatSessionProviderOptionGroup): boolean {
+	return group.id === 'repositories';
+}
+
+/**
+ * Remote new session for Cloud agent sessions.
+ * Implements {@link ISessionData} (session facade) and provides
+ * pre-send configuration methods for the new-session flow.
+ */
+export class RemoteNewSession extends Disposable implements ISessionData {
+
+	// -- ISessionData fields --
+
+	readonly sessionId: string;
+	readonly providerId: string;
+	readonly sessionType: string;
+	readonly icon: ThemeIcon;
+	readonly createdAt: Date;
+
+	private readonly _title = observableValue(this, '');
+	readonly title: IObservable<string> = this._title;
+
+	private readonly _updatedAt = observableValue(this, new Date());
+	readonly updatedAt: IObservable<Date> = this._updatedAt;
+
+	private readonly _status = observableValue(this, SessionStatus.Untitled);
+	readonly status: IObservable<SessionStatus> = this._status;
+
+	private readonly _permissionLevel = observableValue(this, ChatPermissionLevel.Default);
+	readonly permissionLevel: IObservable<ChatPermissionLevel> = this._permissionLevel;
+
+	private readonly _workspaceData = observableValue<ISessionWorkspace | undefined>(this, undefined);
+	readonly workspace: IObservable<ISessionWorkspace | undefined> = this._workspaceData;
+
+	readonly changes: IObservable<readonly IChatSessionFileChange[]> = observableValue<readonly IChatSessionFileChange[]>(this, []);
+
+	private readonly _modelIdObservable = observableValue<string | undefined>(this, undefined);
+	readonly modelId: IObservable<string | undefined> = this._modelIdObservable;
+
+	readonly mode: IObservable<{ readonly id: string; readonly kind: string } | undefined> = observableValue(this, undefined);
+
+	readonly loading: IObservable<boolean> = observableValue(this, false);
+
+	readonly isArchived: IObservable<boolean> = observableValue(this, false);
+	readonly isRead: IObservable<boolean> = observableValue(this, true);
+	readonly description: IObservable<string | undefined> = observableValue(this, undefined);
+	readonly lastTurnEnd: IObservable<Date | undefined> = observableValue(this, undefined);
+	readonly pullRequest: IObservable<ISessionPullRequest | undefined> = observableValue(this, undefined);
+
+	readonly _hasGitRepo = observableValue(this, false);
+	readonly hasGitRepo: IObservable<boolean> = this._hasGitRepo;
+
+	// -- New session configuration fields --
+
+	private _repoUri: URI | undefined;
+	private _project: ISessionWorkspace | undefined;
+	private _modelId: string | undefined;
+	private _query: string | undefined;
+	private _attachedContext: IChatRequestVariableEntry[] | undefined;
+
+	private readonly _onDidChangeOptionGroups = this._register(new Emitter<void>());
+	readonly onDidChangeOptionGroups: Event<void> = this._onDidChangeOptionGroups.event;
+
+	readonly selectedOptions = new Map<string, IChatSessionProviderOptionItem>();
+
+	get project(): ISessionWorkspace | undefined { return this._project; }
+	get isolationMode(): undefined { return undefined; }
+	get branch(): string | undefined { return undefined; }
+	get selectedModelId(): string | undefined { return this._modelId; }
+	get chatMode(): IChatMode | undefined { return undefined; }
+	get query(): string | undefined { return this._query; }
+	get attachedContext(): IChatRequestVariableEntry[] | undefined { return this._attachedContext; }
+	get disabled(): boolean {
+		return !this._repoUri && !this.selectedOptions.has('repositories');
+	}
+
+	private readonly _whenClauseKeys = new Set<string>();
+
+	constructor(
+		readonly resource: URI,
+		readonly sessionWorkspace: ISessionWorkspace,
+		readonly target: AgentSessionTarget,
+		providerId: string,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+		this.sessionId = `${providerId}:${resource.toString()}`;
+		this.providerId = providerId;
+		this.sessionType = target;
+		this.icon = CopilotCloudSessionType.icon;
+		this.createdAt = new Date();
+
+		this._updateWhenClauseKeys();
+		this._register(this.chatSessionsService.onDidChangeOptionGroups(() => {
+			this._updateWhenClauseKeys();
+			this._onDidChangeOptionGroups.fire();
+		}));
+		this._register(this.contextKeyService.onDidChangeContext(e => {
+			if (this._whenClauseKeys.size > 0 && e.affectsSome(this._whenClauseKeys)) {
+				this._onDidChangeOptionGroups.fire();
+			}
+		}));
+
+		// Set workspace data
+		this._workspaceData.set(sessionWorkspace, undefined);
+		this._repoUri = sessionWorkspace.repositories[0]?.uri;
+		if (this._repoUri) {
+			const id = this._repoUri.path.substring(1);
+			this.setOption('repositories', { id, name: id });
+		}
+
+	}
+
+	// -- New session configuration methods --
+
+	setIsolationMode(_mode: IsolationMode): void {
+		// No-op for remote sessions
+	}
+
+	setBranch(_branch: string | undefined): void {
+		// No-op for remote sessions
+	}
+
+	setModelId(modelId: string | undefined): void {
+		this._modelId = modelId;
+	}
+
+	setMode(_mode: IChatMode | undefined): void {
+		// Intentionally a no-op: remote sessions do not support client-side mode selection.
+	}
+
+	setOption(optionId: string, value: IChatSessionProviderOptionItem | string): void {
+		if (typeof value !== 'string') {
+			this.selectedOptions.set(optionId, value);
+		}
+		this.chatSessionsService.setSessionOption(this.resource, optionId, value);
+	}
+
+	// --- Option group accessors ---
+
+	getModelOptionGroup(): ISessionOptionGroup | undefined {
+		const groups = this._getOptionGroups();
+		if (!groups) {
+			return undefined;
+		}
+		const group = groups.find(g => isModelOptionGroup(g));
+		if (!group) {
+			return undefined;
+		}
+		return { group, value: this._getValueForGroup(group) };
+	}
+
+	getOtherOptionGroups(): ISessionOptionGroup[] {
+		const groups = this._getOptionGroups();
+		if (!groups) {
+			return [];
+		}
+		return groups
+			.filter(g => !isModelOptionGroup(g) && !isRepositoriesOptionGroup(g) && this._isOptionGroupVisible(g))
+			.map(g => ({ group: g, value: this._getValueForGroup(g) }));
+	}
+
+	getOptionValue(groupId: string): IChatSessionProviderOptionItem | undefined {
+		return this.selectedOptions.get(groupId);
+	}
+
+	setOptionValue(groupId: string, value: IChatSessionProviderOptionItem): void {
+		this.setOption(groupId, value);
+	}
+
+	// --- Internals ---
+
+	private _getOptionGroups(): IChatSessionProviderOptionGroup[] | undefined {
+		return this.chatSessionsService.getOptionGroupsForSessionType(this.target);
+	}
+
+	private _isOptionGroupVisible(group: IChatSessionProviderOptionGroup): boolean {
+		if (!group.when) {
+			return true;
+		}
+		const expr = ContextKeyExpr.deserialize(group.when);
+		return !expr || this.contextKeyService.contextMatchesRules(expr);
+	}
+
+	private _updateWhenClauseKeys(): void {
+		this._whenClauseKeys.clear();
+		const groups = this._getOptionGroups();
+		if (!groups) {
+			return;
+		}
+		for (const group of groups) {
+			if (group.when) {
+				const expr = ContextKeyExpr.deserialize(group.when);
+				if (expr) {
+					for (const key of expr.keys()) {
+						this._whenClauseKeys.add(key);
+					}
+				}
+			}
+		}
+	}
+
+	private _getValueForGroup(group: IChatSessionProviderOptionGroup): IChatSessionProviderOptionItem | undefined {
+		const selected = this.selectedOptions.get(group.id);
+		if (selected) {
+			return selected;
+		}
+		// Check for extension-set session option
+		const sessionOption = this.chatSessionsService.getSessionOption(this.resource, group.id);
+		if (sessionOption && typeof sessionOption !== 'string') {
+			return sessionOption;
+		}
+		if (typeof sessionOption === 'string') {
+			const item = group.items.find(i => i.id === sessionOption.trim());
+			if (item) {
+				return item;
+			}
+		}
+		// Default to first item marked as default, or first item
+		return group.items.find(i => i.default === true) ?? group.items[0];
+	}
+
+	update(session: ISessionData): void { }
+}
+
+/**
+ * Maps the existing {@link ChatSessionStatus} to the new {@link SessionStatus}.
+ */
+function toSessionStatus(status: ChatSessionStatus): SessionStatus {
+	switch (status) {
+		case ChatSessionStatus.InProgress:
+			return SessionStatus.InProgress;
+		case ChatSessionStatus.NeedsInput:
+			return SessionStatus.NeedsInput;
+		case ChatSessionStatus.Completed:
+			return SessionStatus.Completed;
+		case ChatSessionStatus.Failed:
+			return SessionStatus.Error;
+	}
+}
+
+/**
+ * Adapts an existing {@link IAgentSession} from the chat layer into the new {@link ISessionData} facade.
+ */
+class AgentSessionAdapter implements ISessionData {
+
+	readonly sessionId: string;
+	readonly resource: URI;
+	readonly providerId: string;
+	readonly sessionType: string;
+	readonly icon: ThemeIcon;
+	readonly createdAt: Date;
+
+	private readonly _workspace: ReturnType<typeof observableValue<ISessionWorkspace | undefined>>;
+	readonly workspace: IObservable<ISessionWorkspace | undefined>;
+
+	private readonly _title: ReturnType<typeof observableValue<string>>;
+	readonly title: IObservable<string>;
+
+	private readonly _updatedAt: ReturnType<typeof observableValue<Date>>;
+	readonly updatedAt: IObservable<Date>;
+
+	private readonly _status: ReturnType<typeof observableValue<SessionStatus>>;
+	readonly status: IObservable<SessionStatus>;
+
+	private readonly _changes: ReturnType<typeof observableValue<readonly IChatSessionFileChange[]>>;
+	readonly changes: IObservable<readonly IChatSessionFileChange[]>;
+
+	readonly modelId: IObservable<string | undefined>;
+	readonly mode: IObservable<{ readonly id: string; readonly kind: string } | undefined>;
+	readonly loading: IObservable<boolean>;
+
+	private readonly _isArchived: ReturnType<typeof observableValue<boolean>>;
+	readonly isArchived: IObservable<boolean>;
+
+	private readonly _isRead: ReturnType<typeof observableValue<boolean>>;
+	readonly isRead: IObservable<boolean>;
+
+	private readonly _description: ReturnType<typeof observableValue<string | undefined>>;
+	readonly description: IObservable<string | undefined>;
+
+	private readonly _lastTurnEnd: ReturnType<typeof observableValue<Date | undefined>>;
+	readonly lastTurnEnd: IObservable<Date | undefined>;
+
+	private readonly _pullRequest: ReturnType<typeof observableValue<ISessionPullRequest | undefined>>;
+	readonly pullRequest: IObservable<ISessionPullRequest | undefined>;
+
+	constructor(
+		session: IAgentSession,
+		providerId: string,
+	) {
+		this.sessionId = `${providerId}:${session.resource.toString()}`;
+		this.resource = session.resource;
+		this.providerId = providerId;
+		this.sessionType = session.providerType;
+		this.icon = session.icon;
+		this.createdAt = new Date(session.timing.created);
+		this._workspace = observableValue(this, this._buildWorkspace(session));
+		this.workspace = this._workspace;
+
+		this._title = observableValue(this, session.label);
+		this.title = this._title;
+
+		const updatedTime = session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created;
+		this._updatedAt = observableValue(this, new Date(updatedTime));
+		this.updatedAt = this._updatedAt;
+
+		this._status = observableValue(this, toSessionStatus(session.status));
+		this.status = this._status;
+
+		this._changes = observableValue<readonly IChatSessionFileChange[]>(this, this._extractChanges(session));
+		this.changes = this._changes;
+
+		this.modelId = observableValue(this, undefined);
+		this.mode = observableValue(this, undefined);
+		this.loading = observableValue(this, false);
+
+		this._isArchived = observableValue(this, session.isArchived());
+		this.isArchived = this._isArchived;
+		this._isRead = observableValue(this, session.isRead());
+		this.isRead = this._isRead;
+		this._description = observableValue(this, this._extractDescription(session));
+		this.description = this._description;
+		this._lastTurnEnd = observableValue(this, session.timing.lastRequestEnded ? new Date(session.timing.lastRequestEnded) : undefined);
+		this.lastTurnEnd = this._lastTurnEnd;
+		this._pullRequest = observableValue(this, this._extractPullRequest(session));
+		this.pullRequest = this._pullRequest;
+	}
+
+	/**
+	 * Update reactive properties from a refreshed agent session.
+	 */
+	update(session: IAgentSession): void {
+		transaction(tx => {
+			this._title.set(session.label, tx);
+			const updatedTime = session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created;
+			this._updatedAt.set(new Date(updatedTime), tx);
+			this._status.set(toSessionStatus(session.status), tx);
+			this._changes.set(this._extractChanges(session), tx);
+			this._isArchived.set(session.isArchived(), tx);
+			this._isRead.set(session.isRead(), tx);
+			this._description.set(this._extractDescription(session), tx);
+			this._lastTurnEnd.set(session.timing.lastRequestEnded ? new Date(session.timing.lastRequestEnded) : undefined, tx);
+			this._pullRequest.set(this._extractPullRequest(session), tx);
+		});
+	}
+
+	private _extractDescription(session: IAgentSession): string | undefined {
+		if (!session.description) {
+			return undefined;
+		}
+		return typeof session.description === 'string' ? session.description : session.description.value;
+	}
+
+	private _extractPullRequest(session: IAgentSession): ISessionPullRequest | undefined {
+		const uri = this._extractPullRequestUri(session);
+		if (!uri) {
+			return undefined;
+		}
+		const icon = this._extractPullRequestStateIcon(session);
+		return { uri, icon: icon };
+	}
+
+	private _extractPullRequestStateIcon(session: IAgentSession): ThemeIcon | undefined {
+		const metadata = session.metadata;
+		const state = metadata?.pullRequestState;
+		if (state) {
+			switch (state) {
+				case 'merged':
+					return { ...Codicon.gitPullRequestDone, color: themeColorFromId('charts.purple') };
+				case 'closed':
+					return { ...Codicon.gitPullRequestClosed, color: themeColorFromId('charts.red') };
+				case 'draft':
+					return { ...Codicon.gitPullRequestDraft, color: themeColorFromId('descriptionForeground') };
+				default:
+					return { ...Codicon.gitPullRequest, color: themeColorFromId('charts.green') };
+			}
+		}
+		return undefined;
+	}
+
+	private _extractPullRequestUri(session: IAgentSession): URI | undefined {
+		const metadata = session.metadata;
+		if (!metadata) {
+			return undefined;
+		}
+
+		const url = metadata.pullRequestUrl as string | undefined;
+		if (url) {
+			try {
+				return URI.parse(url);
+			} catch {
+				// fall through
+			}
+		}
+
+		// Construct from pullRequestNumber + owner/repo
+		const prNumber = metadata.pullRequestNumber as number | undefined;
+		if (typeof prNumber === 'number') {
+			const owner = metadata.owner as string | undefined;
+			const name = metadata.name as string | undefined;
+			if (owner && name) {
+				return URI.parse(`https://github.com/${owner}/${name}/pull/${prNumber}`);
+			}
+		}
+
+		return undefined;
+	}
+
+	private _extractChanges(session: IAgentSession): readonly IChatSessionFileChange[] {
+		if (!session.changes) {
+			return [];
+		}
+		if (Array.isArray(session.changes)) {
+			return session.changes as IChatSessionFileChange[];
+		}
+		// Summary object — create a synthetic entry for total insertions/deletions
+		const summary = session.changes as { readonly files: number; readonly insertions: number; readonly deletions: number };
+		if (summary.insertions > 0 || summary.deletions > 0) {
+			return [{
+				modifiedUri: URI.parse('summary://changes'),
+				insertions: summary.insertions,
+				deletions: summary.deletions,
+			}];
+		}
+		return [];
+	}
+
+	private _buildWorkspace(session: IAgentSession): ISessionWorkspace | undefined {
+		const [repoUri, worktreeUri, branchName, baseBranchProtected] = this._extractRepositoryFromMetadata(session);
+
+		const repository: ISessionRepository = {
+			uri: repoUri ?? URI.parse('unknown://'),
+			workingDirectory: worktreeUri,
+			detail: branchName,
+			baseBranchProtected,
+		};
+
+		return {
+			label: getRepositoryName(session) ?? basename(repository.uri),
+			icon: repoUri?.scheme === GITHUB_REMOTE_FILE_SCHEME ? Codicon.repo : Codicon.folder,
+			repositories: [repository],
+			requiresWorkspaceTrust: session.providerType !== AgentSessionProviders.Cloud,
+		};
+	}
+
+	/**
+	 * Extract repository/worktree information from session metadata.
+	 * Mirrors the logic in sessionsManagementService.getRepositoryFromMetadata().
+	 */
+	private _extractRepositoryFromMetadata(session: IAgentSession): [URI | undefined, URI | undefined, string | undefined, boolean | undefined] {
+		const metadata = session.metadata;
+		if (!metadata) {
+			return [undefined, undefined, undefined, undefined];
+		}
+
+		if (session.providerType === AgentSessionProviders.Cloud) {
+			const branch = typeof metadata.branch === 'string' ? metadata.branch : 'HEAD';
+			const repositoryUri = URI.from({
+				scheme: GITHUB_REMOTE_FILE_SCHEME,
+				authority: 'github',
+				path: `/${metadata.owner}/${metadata.name}/${encodeURIComponent(branch)}`
+			});
+			return [repositoryUri, undefined, undefined, undefined];
+		}
+
+		// Background/CLI sessions: check workingDirectoryPath first
+		const workingDirectoryPath = metadata?.workingDirectoryPath as string | undefined;
+		if (workingDirectoryPath) {
+			return [URI.file(workingDirectoryPath), undefined, undefined, undefined];
+		}
+
+		// Fall back to repositoryPath + worktreePath
+		const repositoryPath = metadata?.repositoryPath as string | undefined;
+		const repositoryPathUri = typeof repositoryPath === 'string' ? URI.file(repositoryPath) : undefined;
+
+		const worktreePath = metadata?.worktreePath as string | undefined;
+		const worktreePathUri = typeof worktreePath === 'string' ? URI.file(worktreePath) : undefined;
+
+		const worktreeBranchName = metadata?.branchName as string | undefined;
+		const worktreeBaseBranchProtected = metadata?.baseBranchProtected as boolean | undefined;
+
+		return [
+			URI.isUri(repositoryPathUri) ? repositoryPathUri : undefined,
+			URI.isUri(worktreePathUri) ? worktreePathUri : undefined,
+			worktreeBranchName,
+			worktreeBaseBranchProtected,
+		];
+	}
+}
+
+/**
+ * Default sessions provider for Copilot CLI and Cloud session types.
+ * Wraps the existing session infrastructure into the extensible provider model.
+ */
+export class CopilotChatSessionsProvider extends Disposable implements ISessionsProvider {
+
+	readonly id = COPILOT_PROVIDER_ID;
+	readonly label = localize('copilotChatSessionsProvider', "Copilot Chat");
+	readonly icon = Codicon.copilot;
+	readonly sessionTypes: readonly ISessionType[] = [CopilotCLISessionType, CopilotCloudSessionType];
+
+	private readonly _onDidChangeSessions = this._register(new Emitter<ISessionsChangeEvent>());
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent> = this._onDidChangeSessions.event;
+
+	/** Cache of adapted sessions, keyed by resource URI string. */
+	private readonly _sessionCache = new Map<string, AgentSessionAdapter>();
+
+	readonly browseActions: readonly ISessionsBrowseAction[];
+
+	constructor(
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IFileDialogService private readonly fileDialogService: IFileDialogService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
+	) {
+		super();
+
+		this.browseActions = [
+			{
+				label: localize('folders', "Folders"),
+				icon: Codicon.folderOpened,
+				providerId: this.id,
+				execute: () => this._browseForFolder(),
+			},
+			{
+				label: localize('repositories', "Repositories"),
+				icon: Codicon.repo,
+				providerId: this.id,
+				execute: () => this._browseForRepo(),
+			},
+		];
+
+		// Forward session changes from the underlying model
+		this._register(this.agentSessionsService.model.onDidChangeSessions(() => {
+			this._refreshSessionCache();
+		}));
+	}
+
+	// -- Workspaces --
+
+	// -- Sessions --
+
+	getSessionTypes(session: ISessionData): ISessionType[] {
+		if (session instanceof CopilotCLISession) {
+			return [CopilotCLISessionType];
+		}
+		if (session instanceof RemoteNewSession) {
+			return [CopilotCloudSessionType];
+		}
+		return [];
+	}
+
+	getSessions(): ISessionData[] {
+		this._ensureSessionCache();
+		return Array.from(this._sessionCache.values());
+	}
+
+	// -- Session Lifecycle --
+
+	private _currentNewSession: (CopilotCLISession | RemoteNewSession) | undefined;
+
+	createNewSession(workspace: ISessionWorkspace): ISessionData {
+		const workspaceUri = workspace.repositories[0]?.uri;
+		if (!workspaceUri) {
+			throw new Error('Workspace has no repository URI');
+		}
+
+		if (this._currentNewSession) {
+			this._currentNewSession.dispose();
+			this._currentNewSession = undefined;
+		}
+
+		if (workspaceUri.scheme === GITHUB_REMOTE_FILE_SCHEME) {
+			const resource = URI.from({ scheme: AgentSessionProviders.Cloud, path: `/untitled-${generateUuid()}` });
+			const session = this.instantiationService.createInstance(RemoteNewSession, resource, workspace, AgentSessionProviders.Cloud, this.id);
+			this._currentNewSession = session;
+			return session;
+		}
+
+		const resource = URI.from({ scheme: AgentSessionProviders.Background, path: `/untitled-${generateUuid()}` });
+		const session = this.instantiationService.createInstance(CopilotCLISession, resource, workspace, this.id);
+		this._currentNewSession = session;
+		return session;
+	}
+
+	setSessionType(sessionId: string, type: ISessionType): ISessionData {
+		throw new Error('Session type cannot be changed');
+	}
+
+	setModel(sessionId: string, modelId: string): void {
+		if (this._currentNewSession?.sessionId === sessionId) {
+			this._currentNewSession.setModelId(modelId);
+		}
+	}
+
+	// -- Session Actions --
+
+	async archiveSession(sessionId: string): Promise<void> {
+		const agentSession = this._findAgentSession(sessionId);
+		if (agentSession) {
+			agentSession.setArchived(true);
+		}
+	}
+
+	async unarchiveSession(sessionId: string): Promise<void> {
+		const agentSession = this._findAgentSession(sessionId);
+		if (agentSession) {
+			agentSession.setArchived(false);
+		}
+	}
+
+	async deleteSession(sessionId: string): Promise<void> {
+		const agentSession = this._findAgentSession(sessionId);
+		if (agentSession) {
+			await this.chatService.removeHistoryEntry(agentSession.resource);
+			this._refreshSessionCache();
+		}
+	}
+
+	async renameSession(sessionId: string, title: string): Promise<void> {
+		const agentSession = this._findAgentSession(sessionId);
+		if (agentSession) {
+			this.chatService.setChatSessionTitle(agentSession.resource, title);
+		}
+	}
+
+	setRead(sessionId: string, read: boolean): void {
+		const agentSession = this._findAgentSession(sessionId);
+		if (agentSession) {
+			agentSession.setRead(read);
+		}
+	}
+
+	// -- Send --
+
+	async sendRequest(sessionId: string, options: ISendRequestOptions): Promise<ISessionData> {
+		const session = this._currentNewSession;
+		if (!session || session.sessionId !== sessionId) {
+			throw new Error(`Session '${sessionId}' not found or not a new session`);
+		}
+
+		const { query, attachedContext } = options;
+
+		const contribution = this.chatSessionsService.getChatSessionContribution(session.target);
+
+		// Resolve mode
+		const modeKind = session.chatMode?.kind ?? ChatModeKind.Agent;
+		const modeIsBuiltin = session.chatMode ? isBuiltinChatMode(session.chatMode) : true;
+		const modeId: 'ask' | 'agent' | 'edit' | 'custom' | undefined = modeIsBuiltin ? modeKind : 'custom';
+
+		const rawModeInstructions = session.chatMode?.modeInstructions?.get();
+		const modeInstructions = rawModeInstructions ? {
+			name: session.chatMode!.name.get(),
+			content: rawModeInstructions.content,
+			toolReferences: this.toolsService.toToolReferences(rawModeInstructions.toolReferences),
+			metadata: rawModeInstructions.metadata,
+		} : undefined;
+
+		const permissionLevel = session.permissionLevel.get();
+
+		const sendOptions: IChatSendRequestOptions = {
+			location: ChatAgentLocation.Chat,
+			userSelectedModelId: session.selectedModelId,
+			modeInfo: {
+				kind: modeKind,
+				isBuiltin: modeIsBuiltin,
+				modeInstructions,
+				modeId,
+				applyCodeBlockSuggestionId: undefined,
+				permissionLevel,
+			},
+			agentIdSilent: contribution?.type,
+			attachedContext,
+		};
+
+		// Open chat widget and set permission level
+		await this.chatSessionsService.getOrCreateChatSession(session.resource, CancellationToken.None);
+		const chatWidget = await this.chatWidgetService.openSession(session.resource, ChatViewPaneTarget);
+		if (!chatWidget) {
+			throw new Error('[DefaultCopilotProvider] Failed to open chat widget');
+		}
+
+		if (permissionLevel) {
+			chatWidget.input.setPermissionLevel(permissionLevel);
+		}
+
+		// Load session model with selected options
+		const modelRef = await this.chatService.acquireOrLoadSession(session.resource, ChatAgentLocation.Chat, CancellationToken.None);
+		if (modelRef) {
+			const model = modelRef.object;
+			if (session.selectedModelId) {
+				const languageModel = this.languageModelsService.lookupLanguageModel(session.selectedModelId);
+				if (languageModel) {
+					model.inputModel.setState({ selectedModel: { identifier: session.selectedModelId, metadata: languageModel } });
+				}
+			}
+			if (session.chatMode) {
+				model.inputModel.setState({ mode: { id: session.chatMode.id, kind: session.chatMode.kind } });
+			}
+			if (session.selectedOptions.size > 0) {
+				const contributedSession = model.contributedChatSession;
+				if (contributedSession) {
+					model.setContributedChatSession({ ...contributedSession, initialSessionOptions: session.selectedOptions });
+				}
+			}
+			modelRef.dispose();
+		}
+
+		const existingSessions = new ResourceSet([...this._sessionCache.values()].map(s => s.resource));
+
+		// Send request
+		const result = await this.chatService.sendRequest(session.resource, query, sendOptions);
+		if (result.kind === 'rejected') {
+			throw new Error(`[DefaultCopilotProvider] sendRequest rejected: ${result.reason}`);
+		}
+
+		// Wait for the agent session to appear
+		const createdSession = await this._waitForNewAgentSession(session.target, existingSessions);
+		this._currentNewSession?.dispose();
+		this._currentNewSession = undefined;
+		return createdSession;
+	}
+
+	private async _waitForNewAgentSession(target: AgentSessionTarget, existingSessions: ResourceSet): Promise<ISessionData> {
+		const found = [...this._sessionCache.values()].find(s => s.sessionType === target && !existingSessions.has(s.resource));
+		if (found) {
+			return found;
+		}
+		return new Promise<ISessionData>(resolve => {
+			const listener = this.onDidChangeSessions((e) => {
+				const s = e.added.find(s => s.sessionType === target && !existingSessions.has(s.resource));
+				if (s) {
+					listener.dispose();
+					resolve(s);
+				}
+			});
+		});
+	}
+
+	// -- Private --
+
+	private async _browseForFolder(): Promise<ISessionWorkspace | undefined> {
+		const result = await this.fileDialogService.showOpenDialog({
+			canSelectFolders: true,
+			canSelectFiles: false,
+			canSelectMany: false,
+		});
+		if (result?.length) {
+			const uri = result[0];
+			return {
+				label: this._labelFromUri(uri),
+				icon: this._iconFromUri(uri),
+				repositories: [{ uri, workingDirectory: undefined, detail: undefined, baseBranchProtected: undefined }],
+				requiresWorkspaceTrust: true
+			};
+		}
+		return undefined;
+	}
+
+	private async _browseForRepo(): Promise<ISessionWorkspace | undefined> {
+		const repoId = await this.commandService.executeCommand<string>(OPEN_REPO_COMMAND);
+		if (repoId) {
+			const uri = URI.from({ scheme: GITHUB_REMOTE_FILE_SCHEME, authority: 'github', path: `/${repoId}/HEAD` });
+			return {
+				label: this._labelFromUri(uri),
+				icon: this._iconFromUri(uri),
+				repositories: [{ uri, workingDirectory: undefined, detail: undefined, baseBranchProtected: undefined }],
+				requiresWorkspaceTrust: false,
+			};
+		}
+		return undefined;
+	}
+
+	resolveWorkspace(repositoryUri: URI): ISessionWorkspace {
+		return {
+			label: this._labelFromUri(repositoryUri),
+			icon: this._iconFromUri(repositoryUri),
+			repositories: [{ uri: repositoryUri, workingDirectory: undefined, detail: undefined, baseBranchProtected: undefined }],
+			requiresWorkspaceTrust: repositoryUri.scheme !== GITHUB_REMOTE_FILE_SCHEME
+		};
+	}
+
+	private _labelFromUri(uri: URI): string {
+		if (uri.scheme === GITHUB_REMOTE_FILE_SCHEME) {
+			return uri.path.substring(1).replace(/\/HEAD$/, '');
+		}
+		return basename(uri);
+	}
+
+	private _iconFromUri(uri: URI): ThemeIcon {
+		if (uri.scheme === GITHUB_REMOTE_FILE_SCHEME) {
+			return Codicon.repo;
+		}
+		return Codicon.folder;
+	}
+
+	private _ensureSessionCache(): void {
+		if (this._sessionCache.size > 0) {
+			return;
+		}
+		this._refreshSessionCache();
+	}
+
+	private _refreshSessionCache(): void {
+		const currentKeys = new Set<string>();
+		const added: ISessionData[] = [];
+		const changed: ISessionData[] = [];
+
+		for (const session of this.agentSessionsService.model.sessions) {
+			if (session.resource.toString() === this._currentNewSession?.resource.toString()) {
+				this._currentNewSession.update(new AgentSessionAdapter(session, this.id));
+				continue;
+			}
+
+			if (session.providerType !== AgentSessionProviders.Background
+				&& session.providerType !== AgentSessionProviders.Cloud) {
+				continue;
+			}
+
+			const key = session.resource.toString();
+			currentKeys.add(key);
+
+			const existing = this._sessionCache.get(key);
+			if (existing) {
+				existing.update(session);
+				changed.push(existing);
+			} else {
+				const adapter = new AgentSessionAdapter(session, this.id);
+				this._sessionCache.set(key, adapter);
+				added.push(adapter);
+			}
+		}
+
+		const removed: ISessionData[] = [];
+		for (const [key, adapter] of this._sessionCache) {
+			if (!currentKeys.has(key)) {
+				this._sessionCache.delete(key);
+				removed.push(adapter);
+			}
+		}
+
+		if (added.length > 0 || removed.length > 0 || changed.length > 0) {
+			this._onDidChangeSessions.fire({ added, removed, changed });
+		}
+	}
+
+	private _findAgentSession(sessionId: string): IAgentSession | undefined {
+		const adapter = this._sessionCache.get(this._localIdFromSessionId(sessionId));
+		if (!adapter) {
+			return undefined;
+		}
+		return this.agentSessionsService.getSession(adapter.resource);
+	}
+
+	private _localIdFromSessionId(sessionId: string): string {
+		const prefix = `${this.id}:`;
+		return sessionId.startsWith(prefix) ? sessionId.substring(prefix.length) : sessionId;
+	}
+}
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/isolationPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/isolationPicker.ts
new file mode 100644
index 00000000000..95851d81da5
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/isolationPicker.ts
@@ -0,0 +1,193 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { localize } from '../../../../nls.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { CopilotCLISession } from './copilotChatSessionsProvider.js';
+
+export type IsolationMode = 'worktree' | 'workspace';
+
+/**
+ * A self-contained widget for selecting the isolation mode.
+ *
+ * Options:
+ * - **Worktree** (`worktree`) — run in a git worktree
+ * - **Folder** (`workspace`) — run directly in the folder
+ *
+ * Only visible when isolation option is enabled, project has a git repo,
+ * and the target is CLI.
+ *
+ * Emits `onDidChange` with the selected `IsolationMode` when the user picks an option.
+ */
+export class IsolationPicker extends Disposable {
+
+	private _hasGitRepo = false;
+	private _isolationOptionEnabled: boolean;
+
+	private readonly _renderDisposables = this._register(new DisposableStore());
+	private _slotElement: HTMLElement | undefined;
+	private _triggerElement: HTMLElement | undefined;
+
+	constructor(
+		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+	) {
+		super();
+		this._isolationOptionEnabled = this.configurationService.getValue<boolean>('github.copilot.chat.cli.isolationOption.enabled') !== false;
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('github.copilot.chat.cli.isolationOption.enabled')) {
+				this._isolationOptionEnabled = this.configurationService.getValue<boolean>('github.copilot.chat.cli.isolationOption.enabled') !== false;
+				if (!this._isolationOptionEnabled) {
+					this._setModeOnSession('worktree');
+				}
+				this._updateTriggerLabel();
+			}
+		}));
+
+		this._register(autorun(reader => {
+			const session = this.sessionsManagementService.activeSession.read(reader);
+			if (session instanceof CopilotCLISession) {
+				const isLoading = session.loading.read(reader);
+				this._hasGitRepo = !isLoading && !!session.gitRepository;
+				// Read isolation mode from session — session is the source of truth
+				session.isolationModeObservable.read(reader);
+			} else {
+				this._hasGitRepo = false;
+			}
+			this._updateTriggerLabel();
+		}));
+	}
+
+	private _getSessionIsolationMode(): IsolationMode {
+		const session = this.sessionsManagementService.activeSession.get();
+		return session instanceof CopilotCLISession ? session.isolationMode : 'worktree';
+	}
+
+	render(container: HTMLElement): void {
+		this._renderDisposables.clear();
+
+		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
+		this._renderDisposables.add({ dispose: () => slot.remove() });
+		this._slotElement = slot;
+
+		const trigger = dom.append(slot, dom.$('a.action-label'));
+		trigger.tabIndex = 0;
+		trigger.role = 'button';
+		this._triggerElement = trigger;
+		this._updateTriggerLabel();
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
+			dom.EventHelper.stop(e, true);
+			this._showPicker();
+		}));
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				dom.EventHelper.stop(e, true);
+				this._showPicker();
+			}
+		}));
+	}
+
+	private _showPicker(): void {
+		if (!this._triggerElement || this.actionWidgetService.isVisible) {
+			return;
+		}
+
+		if (!this._hasGitRepo || !this._isolationOptionEnabled) {
+			return;
+		}
+
+		const items: IActionListItem<IsolationMode>[] = [
+			{
+				kind: ActionListItemKind.Action,
+				label: localize('isolationMode.worktree', "Worktree"),
+				group: { title: '', icon: Codicon.worktree },
+				item: 'worktree',
+			},
+			{
+				kind: ActionListItemKind.Action,
+				label: localize('isolationMode.folder', "Folder"),
+				group: { title: '', icon: Codicon.folder },
+				item: 'workspace',
+			},
+		];
+
+		const triggerElement = this._triggerElement;
+		const delegate: IActionListDelegate<IsolationMode> = {
+			onSelect: (mode) => {
+				this.actionWidgetService.hide();
+				this._setModeOnSession(mode);
+			},
+			onHide: () => { triggerElement.focus(); },
+		};
+
+		this.actionWidgetService.show<IsolationMode>(
+			'isolationPicker',
+			false,
+			items,
+			delegate,
+			this._triggerElement,
+			undefined,
+			[],
+			{
+				getAriaLabel: (item) => item.label ?? '',
+				getWidgetAriaLabel: () => localize('isolationPicker.ariaLabel', "Isolation Mode"),
+			},
+		);
+	}
+
+	private _setModeOnSession(mode: IsolationMode): void {
+		const session = this.sessionsManagementService.activeSession.get();
+		if (!(session instanceof CopilotCLISession)) {
+			throw new Error('IsolationPicker requires a CopilotCLISession');
+		}
+		session.setIsolationMode(mode);
+	}
+
+	private _updateTriggerLabel(): void {
+		if (!this._triggerElement) {
+			return;
+		}
+
+		dom.clearNode(this._triggerElement);
+
+		const isolationMode = this._getSessionIsolationMode();
+		let modeIcon;
+		let modeLabel: string;
+
+		switch (isolationMode) {
+			case 'workspace':
+				modeIcon = Codicon.folder;
+				modeLabel = localize('isolationMode.folder', "Folder");
+				break;
+			case 'worktree':
+			default:
+				modeIcon = Codicon.worktree;
+				modeLabel = localize('isolationMode.worktree', "Worktree");
+				break;
+		}
+
+		dom.append(this._triggerElement, renderIcon(modeIcon));
+		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
+		labelSpan.textContent = modeLabel;
+		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
+
+		const isDisabled = !this._hasGitRepo;
+		this._slotElement?.classList.toggle('disabled', isDisabled);
+		this._triggerElement.setAttribute('aria-disabled', String(isDisabled));
+		this._triggerElement.tabIndex = isDisabled ? -1 : 0;
+	}
+}
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/modePicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/modePicker.ts
new file mode 100644
index 00000000000..2dd210c9d03
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/modePicker.ts
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ChatMode, IChatMode, IChatModeService } from '../../../../workbench/contrib/chat/common/chatModes.js';
+import { IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Target } from '../../../../workbench/contrib/chat/common/promptSyntax/promptTypes.js';
+import { AICustomizationManagementCommands } from '../../../../workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { CopilotCLISession } from './copilotChatSessionsProvider.js';
+
+interface IModePickerItem {
+	readonly kind: 'mode';
+	readonly mode: IChatMode;
+}
+
+interface IConfigurePickerItem {
+	readonly kind: 'configure';
+}
+
+type ModePickerItem = IModePickerItem | IConfigurePickerItem;
+
+/**
+ * A self-contained widget for selecting a chat mode (Agent, custom agents)
+ * for local/Background sessions. Shows only modes whose target matches
+ * the Background session type's customAgentTarget.
+ */
+export class ModePicker extends Disposable {
+
+	private readonly _onDidChange = this._register(new Emitter<IChatMode>());
+	readonly onDidChange: Event<IChatMode> = this._onDidChange.event;
+
+	private _triggerElement: HTMLElement | undefined;
+	private _slotElement: HTMLElement | undefined;
+	private readonly _renderDisposables = this._register(new DisposableStore());
+
+	private _selectedMode: IChatMode = ChatMode.Agent;
+
+	get selectedMode(): IChatMode {
+		return this._selectedMode;
+	}
+
+	constructor(
+		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
+		@IChatModeService private readonly chatModeService: IChatModeService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ICommandService private readonly commandService: ICommandService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		this._register(this.chatModeService.onDidChangeChatModes(() => {
+			// Refresh the trigger label when available chat modes change
+			if (this._triggerElement) {
+				this._updateTriggerLabel();
+			}
+		}));
+	}
+
+	/**
+	 * Resets the selected mode back to the default Agent mode.
+	 */
+	reset(): void {
+		this._selectedMode = ChatMode.Agent;
+		this._updateTriggerLabel();
+	}
+
+	/**
+	 * Renders the mode picker trigger button into the given container.
+	 */
+	render(container: HTMLElement): HTMLElement {
+		this._renderDisposables.clear();
+
+		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
+		this._slotElement = slot;
+		this._renderDisposables.add({ dispose: () => slot.remove() });
+
+		const trigger = dom.append(slot, dom.$('a.action-label'));
+		trigger.tabIndex = 0;
+		trigger.role = 'button';
+		trigger.setAttribute('aria-label', localize('sessions.modePicker.ariaLabel', "Select chat mode"));
+		this._triggerElement = trigger;
+
+		this._updateTriggerLabel();
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
+			dom.EventHelper.stop(e, true);
+			this._showPicker();
+		}));
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				dom.EventHelper.stop(e, true);
+				this._showPicker();
+			}
+		}));
+
+		return slot;
+	}
+
+	private _getAvailableModes(): IChatMode[] {
+		const customAgentTarget = this.chatSessionsService.getCustomAgentTargetForSessionType(AgentSessionProviders.Background);
+		const effectiveTarget = customAgentTarget && customAgentTarget !== Target.Undefined ? customAgentTarget : Target.GitHubCopilot;
+		const modes = this.chatModeService.getModes();
+
+		// Always include the default Agent mode
+		const result: IChatMode[] = [ChatMode.Agent];
+
+		// Add custom modes matching the target and visible to users
+		for (const mode of modes.custom) {
+			const target = mode.target.get();
+			if (target === effectiveTarget || target === Target.Undefined) {
+				const visibility = mode.visibility?.get();
+				if (visibility && !visibility.userInvocable) {
+					continue;
+				}
+				result.push(mode);
+			}
+		}
+
+		return result;
+	}
+
+	private _showPicker(): void {
+		if (!this._triggerElement || this.actionWidgetService.isVisible) {
+			return;
+		}
+
+		const modes = this._getAvailableModes();
+
+		const items = this._buildItems(modes);
+
+		const triggerElement = this._triggerElement;
+		const delegate: IActionListDelegate<ModePickerItem> = {
+			onSelect: (item) => {
+				this.actionWidgetService.hide();
+				if (item.kind === 'mode') {
+					this._selectMode(item.mode);
+				} else {
+					this.commandService.executeCommand(AICustomizationManagementCommands.OpenEditor);
+				}
+			},
+			onHide: () => { triggerElement.focus(); },
+		};
+
+		this.actionWidgetService.show<ModePickerItem>(
+			'localModePicker',
+			false,
+			items,
+			delegate,
+			this._triggerElement,
+			undefined,
+			[],
+			{
+				getAriaLabel: (item) => item.label ?? '',
+				getWidgetAriaLabel: () => localize('modePicker.ariaLabel', "Mode Picker"),
+			},
+		);
+	}
+
+	private _buildItems(modes: IChatMode[]): IActionListItem<ModePickerItem>[] {
+		const items: IActionListItem<ModePickerItem>[] = [];
+
+		// Default Agent mode
+		const agentMode = modes[0];
+		items.push({
+			kind: ActionListItemKind.Action,
+			label: agentMode.label.get(),
+			group: { title: '', icon: this._selectedMode.id === agentMode.id ? Codicon.check : Codicon.blank },
+			item: { kind: 'mode', mode: agentMode },
+		});
+
+		// Custom modes (with separator if any exist)
+		const customModes = modes.slice(1);
+		if (customModes.length > 0) {
+			items.push({ kind: ActionListItemKind.Separator, label: '' });
+			for (const mode of customModes) {
+				items.push({
+					kind: ActionListItemKind.Action,
+					label: mode.label.get(),
+					group: { title: '', icon: this._selectedMode.id === mode.id ? Codicon.check : Codicon.blank },
+					item: { kind: 'mode', mode },
+				});
+			}
+		}
+
+		// Configure Custom Agents action
+		items.push({ kind: ActionListItemKind.Separator, label: '' });
+		items.push({
+			kind: ActionListItemKind.Action,
+			label: localize('configureCustomAgents', "Configure Custom Agents..."),
+			group: { title: '', icon: Codicon.blank },
+			item: { kind: 'configure' },
+		});
+
+		return items;
+	}
+
+	private _selectMode(mode: IChatMode): void {
+		this._selectedMode = mode;
+		this._updateTriggerLabel();
+		this._onDidChange.fire(mode);
+
+		const session = this.sessionsManagementService.activeSession.get();
+		if (session instanceof CopilotCLISession) {
+			session.setMode(mode);
+		}
+	}
+
+	private _updateTriggerLabel(): void {
+		if (!this._triggerElement) {
+			return;
+		}
+
+		dom.clearNode(this._triggerElement);
+
+		const icon = this._selectedMode.icon.get();
+		if (icon) {
+			dom.append(this._triggerElement, renderIcon(icon));
+		}
+
+		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
+		labelSpan.textContent = this._selectedMode.label.get();
+		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
+
+		const modes = this._getAvailableModes();
+		this._slotElement?.classList.toggle('disabled', modes.length <= 1);
+	}
+}
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/modelPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/modelPicker.ts
new file mode 100644
index 00000000000..798cb575ac4
--- /dev/null
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/modelPicker.ts
@@ -0,0 +1,212 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IChatSessionProviderOptionItem, IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { RemoteNewSession } from './copilotChatSessionsProvider.js';
+
+const FILTER_THRESHOLD = 10;
+
+interface IModelItem {
+	readonly id: string;
+	readonly name: string;
+	readonly description?: string;
+}
+
+/**
+ * A self-contained widget for selecting a model in cloud sessions.
+ * Reads the model option group from the {@link RemoteNewSession} and
+ * renders an action list dropdown with the available models.
+ */
+export class CloudModelPicker extends Disposable {
+
+	private readonly _onDidChange = this._register(new Emitter<IChatSessionProviderOptionItem>());
+	readonly onDidChange: Event<IChatSessionProviderOptionItem> = this._onDidChange.event;
+
+	private _triggerElement: HTMLElement | undefined;
+	private _slotElement: HTMLElement | undefined;
+	private readonly _renderDisposables = this._register(new DisposableStore());
+	private readonly _sessionDisposables = this._register(new DisposableStore());
+
+	private _session: RemoteNewSession | undefined;
+	private _selectedModel: IModelItem | undefined;
+	private _models: IModelItem[] = [];
+
+	get selectedModel(): IModelItem | undefined {
+		return this._selectedModel;
+	}
+
+	constructor(
+		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
+		@ISessionsManagementService sessionsManagementService: ISessionsManagementService,
+		@IChatSessionsService chatSessionsService: IChatSessionsService,
+	) {
+		super();
+
+		this._register(autorun(reader => {
+			const session = sessionsManagementService.activeSession.read(reader);
+			if (session instanceof RemoteNewSession) {
+				this._setSession(session);
+			}
+		}));
+
+		// Also listen directly for option group changes from the extension host,
+		// in case they arrive before the RemoteNewSession relays the event.
+		this._register(chatSessionsService.onDidChangeOptionGroups(() => {
+			if (this._session) {
+				this._loadModels(this._session);
+			}
+		}));
+	}
+
+	private _setSession(session: RemoteNewSession): void {
+		this._session = session;
+		this._sessionDisposables.clear();
+		this._loadModels(session);
+
+		// Sync selected model to the new session
+		if (this._selectedModel) {
+			session.setModelId(this._selectedModel.id);
+			session.setOptionValue('models', { id: this._selectedModel.id, name: this._selectedModel.name });
+		}
+
+		// Re-load models when option groups change
+		this._sessionDisposables.add(session.onDidChangeOptionGroups(() => {
+			this._loadModels(session);
+		}));
+	}
+
+	/**
+	 * Renders the model picker trigger button into the given container.
+	 */
+	render(container: HTMLElement): HTMLElement {
+		this._renderDisposables.clear();
+
+		const slot = dom.append(container, dom.$('.sessions-chat-picker-slot'));
+		this._slotElement = slot;
+		this._renderDisposables.add({ dispose: () => slot.remove() });
+
+		const trigger = dom.append(slot, dom.$('a.action-label'));
+		trigger.tabIndex = 0;
+		trigger.role = 'button';
+		this._triggerElement = trigger;
+
+		this._updateTriggerLabel();
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.CLICK, (e) => {
+			dom.EventHelper.stop(e, true);
+			this._showPicker();
+		}));
+
+		this._renderDisposables.add(dom.addDisposableListener(trigger, dom.EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				dom.EventHelper.stop(e, true);
+				this._showPicker();
+			}
+		}));
+
+		return slot;
+	}
+
+	private _loadModels(session: RemoteNewSession): void {
+		const modelOption = session.getModelOptionGroup();
+		if (modelOption?.group.items.length) {
+			this._models = modelOption.group.items.map(item => ({
+				id: item.id,
+				name: item.name,
+				description: item.description,
+			}));
+
+			// Select the session's current value, or the default, or the first
+			if (!this._selectedModel || !this._models.some(m => m.id === this._selectedModel!.id)) {
+				const value = modelOption.value;
+				this._selectedModel = value
+					? { id: value.id, name: value.name, description: value.description }
+					: this._models[0];
+			}
+		} else {
+			this._models = [];
+		}
+		this._updateTriggerLabel();
+	}
+
+	private _showPicker(): void {
+		if (!this._triggerElement || this.actionWidgetService.isVisible || this._models.length === 0) {
+			return;
+		}
+
+		const items = this._buildItems();
+		const showFilter = items.filter(i => i.kind === ActionListItemKind.Action).length > FILTER_THRESHOLD;
+
+		const triggerElement = this._triggerElement;
+		const delegate: IActionListDelegate<IModelItem> = {
+			onSelect: (item) => {
+				this.actionWidgetService.hide();
+				this._selectModel(item);
+			},
+			onHide: () => { triggerElement.focus(); },
+		};
+
+		this.actionWidgetService.show<IModelItem>(
+			'remoteModelPicker',
+			false,
+			items,
+			delegate,
+			this._triggerElement,
+			undefined,
+			[],
+			{
+				getAriaLabel: (item) => item.label ?? '',
+				getWidgetAriaLabel: () => localize('modelPicker.ariaLabel', "Model Picker"),
+			},
+			showFilter ? { showFilter: true, filterPlaceholder: localize('modelPicker.filter', "Filter models...") } : undefined,
+		);
+	}
+
+	private _buildItems(): IActionListItem<IModelItem>[] {
+		return this._models.map(model => ({
+			kind: ActionListItemKind.Action,
+			label: model.name,
+			group: { title: '', icon: this._selectedModel?.id === model.id ? Codicon.check : Codicon.blank },
+			item: model,
+		}));
+	}
+
+	private _selectModel(item: IModelItem): void {
+		this._selectedModel = item;
+		this._updateTriggerLabel();
+
+		if (this._session) {
+			this._session.setModelId(item.id);
+			this._session.setOptionValue('models', { id: item.id, name: item.name });
+		}
+		this._onDidChange.fire({ id: item.id, name: item.name, description: item.description });
+	}
+
+	private _updateTriggerLabel(): void {
+		if (!this._triggerElement) {
+			return;
+		}
+
+		dom.clearNode(this._triggerElement);
+		const label = this._selectedModel?.name ?? localize('modelPicker.auto', "Auto");
+
+		const labelSpan = dom.append(this._triggerElement, dom.$('span.sessions-chat-dropdown-label'));
+		labelSpan.textContent = label;
+		dom.append(this._triggerElement, renderIcon(Codicon.chevronDown));
+
+		this._slotElement?.classList.toggle('disabled', this._models.length === 0);
+		this._triggerElement.setAttribute('aria-disabled', String(this._models.length === 0));
+	}
+}
diff --git a/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.contribution.ts b/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.contribution.ts
index 1d67b91d1b4..94d04b05221 100644
--- a/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.contribution.ts
+++ b/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.contribution.ts
@@ -7,7 +7,8 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
-import { GitHubFileSystemProvider, GITHUB_REMOTE_FILE_SCHEME } from './githubFileSystemProvider.js';
+import { GITHUB_REMOTE_FILE_SCHEME } from '../../sessions/common/sessionData.js';
+import { GitHubFileSystemProvider } from './githubFileSystemProvider.js';
 
 // --- View registration is currently disabled in favor of the "Add Context" picker.
 // The Files view will be re-enabled once we finalize the sessions auxiliary bar layout.
diff --git a/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.ts b/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.ts
index 4861f7d9df1..07c84810bd4 100644
--- a/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.ts
+++ b/src/vs/sessions/contrib/fileTreeView/browser/fileTreeView.ts
@@ -42,8 +42,9 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { ISessionsManagementService, IActiveSessionItem } from '../../sessions/browser/sessionsManagementService.js';
-import { GITHUB_REMOTE_FILE_SCHEME, getGitHubRemoteFileDisplayName } from './githubFileSystemProvider.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionData, GITHUB_REMOTE_FILE_SCHEME } from '../../sessions/common/sessionData.js';
+import { getGitHubRemoteFileDisplayName } from './githubFileSystemProvider.js';
 import { basename } from '../../../../base/common/path.js';
 import { isEqual } from '../../../../base/common/resources.js';
 
@@ -235,24 +236,27 @@ export class FileTreeViewPane extends ViewPane {
 
 	/**
 	 * Determines the root URI for the file tree based on the active session type.
-	 * Tries multiple data sources: IActiveSessionItem fields, agent session model metadata,
+	 * Tries multiple data sources: ISessionData workspace, agent session model metadata,
 	 * and file change URIs as a last resort.
 	 */
-	private resolveTreeRoot(activeSession: IActiveSessionItem | undefined): URI | undefined {
+	private resolveTreeRoot(activeSession: ISessionData | undefined): URI | undefined {
 		if (!activeSession) {
 			return undefined;
 		}
 
 		const sessionType = getChatSessionType(activeSession.resource);
+		const repo = activeSession.workspace.get()?.repositories[0];
+		const worktree = repo?.workingDirectory;
+		const repository = repo?.uri;
 
-		// 1. Try the direct worktree/repository fields from IActiveSessionItem
-		if (activeSession.worktree) {
-			this.logService.info(`[FileTreeView] Using worktree: ${activeSession.worktree.toString()}`);
-			return activeSession.worktree;
+		// 1. Try the direct worktree/repository fields from workspace
+		if (worktree) {
+			this.logService.info(`[FileTreeView] Using worktree: ${worktree.toString()}`);
+			return worktree;
 		}
-		if (activeSession.repository && activeSession.repository.scheme === 'file') {
-			this.logService.info(`[FileTreeView] Using repository: ${activeSession.repository.toString()}`);
-			return activeSession.repository;
+		if (repository && repository.scheme === 'file') {
+			this.logService.info(`[FileTreeView] Using repository: ${repository.toString()}`);
+			return repository;
 		}
 
 		// 2. Query the agent session model directly for metadata
@@ -294,8 +298,8 @@ export class FileTreeViewPane extends ViewPane {
 		}
 
 		// 4. Try to parse the repository URI as a GitHub URL
-		if (activeSession.repository) {
-			const repoStr = activeSession.repository.toString();
+		if (repository) {
+			const repoStr = repository.toString();
 			const parsed = this.parseGitHubUrl(repoStr);
 			if (parsed) {
 				this.logService.info(`[FileTreeView] Parsed repository URI as GitHub: ${parsed.owner}/${parsed.repo}`);
diff --git a/src/vs/sessions/contrib/fileTreeView/browser/githubFileSystemProvider.ts b/src/vs/sessions/contrib/fileTreeView/browser/githubFileSystemProvider.ts
index 5f6d33c46a3..41966d8b595 100644
--- a/src/vs/sessions/contrib/fileTreeView/browser/githubFileSystemProvider.ts
+++ b/src/vs/sessions/contrib/fileTreeView/browser/githubFileSystemProvider.ts
@@ -11,8 +11,7 @@ import { IRequestService, asJson } from '../../../../platform/request/common/req
 import { IAuthenticationService } from '../../../../workbench/services/authentication/common/authentication.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-
-export const GITHUB_REMOTE_FILE_SCHEME = 'github-remote-file';
+import { GITHUB_REMOTE_FILE_SCHEME } from '../../sessions/common/sessionData.js';
 
 /**
  * Derives a display name from a github-remote-file URI.
@@ -189,6 +188,7 @@ export class GitHubFileSystemProvider extends Disposable implements IFileSystemP
 				'Accept': 'application/vnd.github.v3+json',
 				'User-Agent': 'VSCode-SessionRepoFS',
 			},
+			callSite: 'githubFileSystemProvider.fetchTree'
 		}, CancellationToken.None);
 
 		// Cache 404s so we don't keep re-fetching missing trees
@@ -299,6 +299,7 @@ export class GitHubFileSystemProvider extends Disposable implements IFileSystemP
 				'Accept': 'application/vnd.github.v3+json',
 				'User-Agent': 'VSCode-SessionRepoFS',
 			},
+			callSite: 'githubFileSystemProvider.readFile'
 		}, CancellationToken.None);
 
 		const data = await asJson<{ content: string; encoding: string }>(response);
diff --git a/src/vs/sessions/contrib/git/browser/git.contribution.ts b/src/vs/sessions/contrib/git/browser/git.contribution.ts
deleted file mode 100644
index 9aaaac7acb3..00000000000
--- a/src/vs/sessions/contrib/git/browser/git.contribution.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, observableValue } from '../../../../base/common/observable.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { localize } from '../../../../nls.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
-import { CHAT_CATEGORY } from '../../../../workbench/contrib/chat/browser/actions/chatActions.js';
-import { IGitService } from '../../../../workbench/contrib/git/common/gitService.js';
-import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
-
-const hasGitSyncChangesContextKey = new RawContextKey<boolean>('agentSessionHasGitSyncChanges', false, {
-	type: 'boolean',
-	description: localize('agentSessionHasGitSyncChanges', "True when the active agent session worktree has ahead or behind commits relative to its upstream.")
-});
-
-class GitSyncContribution extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'sessions.contrib.gitSync';
-
-	private readonly _syncActionDisposable = this._register(new MutableDisposable());
-	private readonly _gitRepoDisposables = this._register(new DisposableStore());
-	private readonly _isSyncing = observableValue<boolean>(this, false);
-
-	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@ISessionsManagementService private readonly sessionManagementService: ISessionsManagementService,
-		@IGitService private readonly gitService: IGitService,
-	) {
-		super();
-
-		const contextKey = hasGitSyncChangesContextKey.bindTo(this.contextKeyService);
-
-		this._register(autorun(reader => {
-			const activeSession = this.sessionManagementService.activeSession.read(reader);
-			this._gitRepoDisposables.clear();
-
-			const worktreeUri = activeSession ? this.sessionManagementService.getActiveSession()?.worktree : undefined;
-			if (!worktreeUri) {
-				this._syncActionDisposable.clear();
-				contextKey.set(false);
-				return;
-			}
-
-			const repoDisposables = this._gitRepoDisposables.add(new DisposableStore());
-			this.gitService.openRepository(worktreeUri).then(repository => {
-				if (repoDisposables.isDisposed) {
-					return;
-				}
-				if (!repository) {
-					this._syncActionDisposable.clear();
-					contextKey.set(false);
-					return;
-				}
-				repoDisposables.add(autorun(innerReader => {
-					const state = repository.state.read(innerReader);
-					const isSyncing = this._isSyncing.read(innerReader);
-					const head = state.HEAD;
-					if (!head?.upstream) {
-						this._syncActionDisposable.clear();
-						contextKey.set(false);
-						return;
-					}
-					const ahead = head.ahead ?? 0;
-					const behind = head.behind ?? 0;
-					const hasSyncChanges = ahead > 0 || behind > 0;
-					contextKey.set(hasSyncChanges);
-					this._syncActionDisposable.clear();
-					this._syncActionDisposable.value = registerSyncAction(behind, ahead, isSyncing, (syncing) => {
-						this._isSyncing.set(syncing, undefined);
-					});
-				}));
-			});
-		}));
-	}
-}
-
-function registerSyncAction(behind: number, ahead: number, isSyncing: boolean, setSyncing: (syncing: boolean) => void): IDisposable {
-	if (behind === 0 && ahead === 0) {
-		return Disposable.None;
-	}
-	let title = '';
-	if (behind > 0) {
-		title += `${behind}↓ `;
-	}
-	if (ahead > 0) {
-		title += `${ahead}↑`;
-	}
-
-	const icon = isSyncing ? ThemeIcon.modify(Codicon.sync, 'spin') : Codicon.sync;
-
-	class SynchronizeChangesAction extends Action2 {
-		static readonly ID = 'chatEditing.synchronizeChanges';
-
-		constructor() {
-			super({
-				id: SynchronizeChangesAction.ID,
-				title,
-				tooltip: localize('synchronizeChanges', "Synchronize Changes with Git (Behind {0}, Ahead {1})", behind, ahead),
-				icon,
-				category: CHAT_CATEGORY,
-				menu: [
-					{
-						id: MenuId.ChatEditingSessionChangesToolbar,
-						group: 'navigation',
-						order: 5,
-						when: hasGitSyncChangesContextKey,
-					},
-				],
-			});
-		}
-
-		override async run(accessor: ServicesAccessor): Promise<void> {
-			const commandService = accessor.get(ICommandService);
-			const sessionManagementService = accessor.get(ISessionsManagementService);
-			const worktreeUri = sessionManagementService.getActiveSession()?.worktree;
-			setSyncing(true);
-			try {
-				await commandService.executeCommand('git.sync', worktreeUri);
-			} finally {
-				setSyncing(false);
-			}
-		}
-	}
-	return registerAction2(SynchronizeChangesAction);
-}
-
-registerWorkbenchContribution2(GitSyncContribution.ID, GitSyncContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/sessions/contrib/github/browser/fetchers/githubPRCIFetcher.ts b/src/vs/sessions/contrib/github/browser/fetchers/githubPRCIFetcher.ts
index d667c6a3a3e..c212fa79443 100644
--- a/src/vs/sessions/contrib/github/browser/fetchers/githubPRCIFetcher.ts
+++ b/src/vs/sessions/contrib/github/browser/fetchers/githubPRCIFetcher.ts
@@ -63,6 +63,7 @@ export class GitHubPRCIFetcher {
 		const data = await this._apiClient.request<IGitHubCheckRunsListResponse>(
 			'GET',
 			`/repos/${e(owner)}/${e(repo)}/commits/${e(ref)}/check-runs`,
+			'githubApi.getCheckRuns'
 		);
 		return data.check_runs.map(mapCheckRun);
 	}
@@ -85,6 +86,7 @@ export class GitHubPRCIFetcher {
 			detail = await this._apiClient.request<IGitHubCheckRunDetailResponse>(
 				'GET',
 				`/repos/${e(owner)}/${e(repo)}/check-runs/${checkRunId}`,
+				'githubApi.getCheckRunAnnotations'
 			);
 			const output = detail.output;
 			if (output.title) {
@@ -105,6 +107,7 @@ export class GitHubPRCIFetcher {
 			const annotations = await this._apiClient.request<readonly IGitHubCheckRunAnnotationResponse[]>(
 				'GET',
 				`/repos/${e(owner)}/${e(repo)}/check-runs/${checkRunId}/annotations`,
+				'githubApi.getCheckRunAnnotations.annotations'
 			);
 			if (annotations.length > 0) {
 				sections.push(
diff --git a/src/vs/sessions/contrib/github/browser/fetchers/githubPRFetcher.ts b/src/vs/sessions/contrib/github/browser/fetchers/githubPRFetcher.ts
index 5711a3d9ff8..a958e59e4c0 100644
--- a/src/vs/sessions/contrib/github/browser/fetchers/githubPRFetcher.ts
+++ b/src/vs/sessions/contrib/github/browser/fetchers/githubPRFetcher.ts
@@ -24,7 +24,7 @@ interface IGitHubPRResponse {
 	readonly state: 'open' | 'closed';
 	readonly draft: boolean;
 	readonly user: { readonly login: string; readonly avatar_url: string };
-	readonly head: { readonly ref: string };
+	readonly head: { readonly ref: string; readonly sha: string };
 	readonly base: { readonly ref: string };
 	readonly created_at: string;
 	readonly updated_at: string;
@@ -162,14 +162,15 @@ export class GitHubPRFetcher {
 		const data = await this._apiClient.request<IGitHubPRResponse>(
 			'GET',
 			`/repos/${e(owner)}/${e(repo)}/pulls/${prNumber}`,
+			'githubApi.getPullRequest'
 		);
 		return mapPullRequest(data);
 	}
 
 	async getMergeability(owner: string, repo: string, prNumber: number): Promise<IGitHubPullRequestMergeability> {
 		const [pr, reviews] = await Promise.all([
-			this._apiClient.request<IGitHubPRResponse>('GET', `/repos/${e(owner)}/${e(repo)}/pulls/${prNumber}`),
-			this._apiClient.request<readonly IGitHubReviewResponse[]>('GET', `/repos/${e(owner)}/${e(repo)}/pulls/${prNumber}/reviews`),
+			this._apiClient.request<IGitHubPRResponse>('GET', `/repos/${e(owner)}/${e(repo)}/pulls/${prNumber}`, 'githubApi.getMergeability.pr'),
+			this._apiClient.request<readonly IGitHubReviewResponse[]>('GET', `/repos/${e(owner)}/${e(repo)}/pulls/${prNumber}/reviews`, 'githubApi.getMergeability.reviews'),
 		]);
 
 		const blockers: IMergeBlocker[] = [];
@@ -218,6 +219,7 @@ export class GitHubPRFetcher {
 	async getReviewThreads(owner: string, repo: string, prNumber: number): Promise<IGitHubPRReviewThread[]> {
 		const data = await this._apiClient.graphql<IGitHubGraphQLPullRequestReviewThreadsResponse>(
 			GET_REVIEW_THREADS_QUERY,
+			'githubApi.getReviewThreads',
 			{ owner, repo, prNumber },
 		);
 
@@ -239,6 +241,7 @@ export class GitHubPRFetcher {
 		const data = await this._apiClient.request<IGitHubReviewCommentResponse>(
 			'POST',
 			`/repos/${e(owner)}/${e(repo)}/pulls/${prNumber}/comments`,
+			'githubApi.postReviewComment',
 			{ body, in_reply_to: inReplyTo },
 		);
 		return mapReviewComment(data);
@@ -253,6 +256,7 @@ export class GitHubPRFetcher {
 		const data = await this._apiClient.request<IGitHubIssueCommentResponse>(
 			'POST',
 			`/repos/${e(owner)}/${e(repo)}/issues/${prNumber}/comments`,
+			'githubApi.postIssueComment',
 			{ body },
 		);
 		return {
@@ -271,6 +275,7 @@ export class GitHubPRFetcher {
 	async resolveThread(_owner: string, _repo: string, threadId: string): Promise<void> {
 		const data = await this._apiClient.graphql<IGitHubGraphQLResolveReviewThreadResponse>(
 			RESOLVE_REVIEW_THREAD_MUTATION,
+			'githubApi.resolveThread',
 			{ threadId },
 		);
 
@@ -307,6 +312,7 @@ function mapPullRequest(data: IGitHubPRResponse): IGitHubPullRequest {
 		state,
 		author: mapUser(data.user),
 		headRef: data.head.ref,
+		headSha: data.head.sha,
 		baseRef: data.base.ref,
 		isDraft: data.draft,
 		createdAt: data.created_at,
diff --git a/src/vs/sessions/contrib/github/browser/fetchers/githubRepositoryFetcher.ts b/src/vs/sessions/contrib/github/browser/fetchers/githubRepositoryFetcher.ts
index 2b57fbd3db3..5e4a90dfa90 100644
--- a/src/vs/sessions/contrib/github/browser/fetchers/githubRepositoryFetcher.ts
+++ b/src/vs/sessions/contrib/github/browser/fetchers/githubRepositoryFetcher.ts
@@ -29,6 +29,7 @@ export class GitHubRepositoryFetcher {
 		const data = await this._apiClient.request<IGitHubRepoResponse>(
 			'GET',
 			`/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`,
+			'githubApi.getRepository'
 		);
 		return {
 			owner: data.owner.login,
diff --git a/src/vs/sessions/contrib/github/browser/github.contribution.ts b/src/vs/sessions/contrib/github/browser/github.contribution.ts
index af80df37852..1ade1c3ae83 100644
--- a/src/vs/sessions/contrib/github/browser/github.contribution.ts
+++ b/src/vs/sessions/contrib/github/browser/github.contribution.ts
@@ -3,7 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 import { GitHubService, IGitHubService } from './githubService.js';
 
+/**
+ * Immediately refreshes PR data when the active session changes so that
+ * CI checks and PR state are up-to-date without waiting for the next
+ * polling cycle.
+ */
+class GitHubActiveSessionRefreshContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'sessions.contrib.githubActiveSessionRefresh';
+
+	private _lastSessionResource: URI | undefined;
+
+	constructor(
+		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
+		@IGitHubService private readonly _gitHubService: IGitHubService,
+	) {
+		super();
+
+		this._register(autorun(reader => {
+			const session = this._sessionsManagementService.activeSession.read(reader);
+			if (!session) {
+				this._lastSessionResource = undefined;
+				return;
+			}
+			if (this._lastSessionResource?.toString() === session.resource.toString()) {
+				return;
+			}
+			this._lastSessionResource = session.resource;
+			const context = this._sessionsManagementService.getGitHubContextForSession(session.resource);
+			if (!context || context.prNumber === undefined) {
+				return;
+			}
+			const prModel = this._gitHubService.getPullRequest(context.owner, context.repo, context.prNumber);
+			prModel.refresh();
+		}));
+	}
+}
+
 registerSingleton(IGitHubService, GitHubService, InstantiationType.Delayed);
+registerWorkbenchContribution2(GitHubActiveSessionRefreshContribution.ID, GitHubActiveSessionRefreshContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/sessions/contrib/github/browser/githubApiClient.ts b/src/vs/sessions/contrib/github/browser/githubApiClient.ts
index e5279b02196..ba6e1f3fc51 100644
--- a/src/vs/sessions/contrib/github/browser/githubApiClient.ts
+++ b/src/vs/sessions/contrib/github/browser/githubApiClient.ts
@@ -50,16 +50,17 @@ export class GitHubApiClient extends Disposable {
 		super();
 	}
 
-	async request<T>(method: string, path: string, body?: unknown): Promise<T> {
-		return this._request<T>(method, `${GITHUB_API_BASE}${path}`, path, 'application/vnd.github.v3+json', body);
+	async request<T>(method: string, path: string, callSite: string, body?: unknown): Promise<T> {
+		return this._request<T>(method, `${GITHUB_API_BASE}${path}`, path, 'application/vnd.github.v3+json', callSite, body);
 	}
 
-	async graphql<T>(query: string, variables?: Record<string, unknown>): Promise<T> {
+	async graphql<T>(query: string, callSite: string, variables?: Record<string, unknown>): Promise<T> {
 		const response = await this._request<IGitHubGraphQLResponse<T>>(
 			'POST',
 			GITHUB_GRAPHQL_ENDPOINT,
 			'/graphql',
 			'application/vnd.github+json',
+			callSite,
 			{ query, variables },
 		);
 
@@ -78,7 +79,7 @@ export class GitHubApiClient extends Disposable {
 		return response.data;
 	}
 
-	private async _request<T>(method: string, url: string, pathForLogging: string, accept: string, body?: unknown): Promise<T> {
+	private async _request<T>(method: string, url: string, pathForLogging: string, accept: string, callSite: string, body?: unknown): Promise<T> {
 		const token = await this._getAuthToken();
 
 		this._logService.trace(`${LOG_PREFIX} ${method} ${pathForLogging}`);
@@ -93,6 +94,7 @@ export class GitHubApiClient extends Disposable {
 				...(body !== undefined ? { 'Content-Type': 'application/json' } : {}),
 			},
 			data: body !== undefined ? JSON.stringify(body) : undefined,
+			callSite
 		}, CancellationToken.None);
 
 		const rateLimitRemaining = parseRateLimitHeader(response.res.headers?.['x-ratelimit-remaining']);
diff --git a/src/vs/sessions/contrib/github/common/types.ts b/src/vs/sessions/contrib/github/common/types.ts
index bc447c21c90..88044e60c33 100644
--- a/src/vs/sessions/contrib/github/common/types.ts
+++ b/src/vs/sessions/contrib/github/common/types.ts
@@ -50,6 +50,7 @@ export interface IGitHubPullRequest {
 	readonly state: GitHubPullRequestState;
 	readonly author: IGitHubUser;
 	readonly headRef: string;
+	readonly headSha: string;
 	readonly baseRef: string;
 	readonly isDraft: boolean;
 	readonly createdAt: string;
diff --git a/src/vs/sessions/contrib/github/test/browser/githubFetchers.test.ts b/src/vs/sessions/contrib/github/test/browser/githubFetchers.test.ts
index baa4318b991..db4a8b5d883 100644
--- a/src/vs/sessions/contrib/github/test/browser/githubFetchers.test.ts
+++ b/src/vs/sessions/contrib/github/test/browser/githubFetchers.test.ts
@@ -29,7 +29,7 @@ class MockApiClient {
 		this._nextResponse = undefined;
 	}
 
-	async request<T>(_method: string, _path: string, _body?: unknown): Promise<T> {
+	async request<T>(_method: string, _path: string, _callSite: string, _body?: unknown): Promise<T> {
 		this.requestCalls.push({ method: _method, path: _path, body: _body });
 		if (this._nextError) {
 			throw this._nextError;
@@ -37,7 +37,7 @@ class MockApiClient {
 		return this._nextResponse as T;
 	}
 
-	async graphql<T>(query: string, variables?: Record<string, unknown>): Promise<T> {
+	async graphql<T>(query: string, _callSite: string, variables?: Record<string, unknown>): Promise<T> {
 		this.graphqlCalls.push({ query, variables });
 		if (this._nextError) {
 			throw this._nextError;
diff --git a/src/vs/sessions/contrib/github/test/browser/githubModels.test.ts b/src/vs/sessions/contrib/github/test/browser/githubModels.test.ts
index 24ce18ead0b..8f45b6b5ad1 100644
--- a/src/vs/sessions/contrib/github/test/browser/githubModels.test.ts
+++ b/src/vs/sessions/contrib/github/test/browser/githubModels.test.ts
@@ -242,6 +242,7 @@ function makePR(): IGitHubPullRequest {
 		state: GitHubPullRequestState.Open,
 		author: { login: 'author', avatarUrl: '' },
 		headRef: 'feature',
+		headSha: 'abc123',
 		baseRef: 'main',
 		isDraft: false,
 		createdAt: '2024-01-01T00:00:00Z',
diff --git a/src/vs/sessions/contrib/github/test/browser/githubService.test.ts b/src/vs/sessions/contrib/github/test/browser/githubService.test.ts
index 71f6e64130a..d743eefdadd 100644
--- a/src/vs/sessions/contrib/github/test/browser/githubService.test.ts
+++ b/src/vs/sessions/contrib/github/test/browser/githubService.test.ts
@@ -10,8 +10,7 @@ import { NullLogService, ILogService } from '../../../../../platform/log/common/
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { GitHubService } from '../../browser/githubService.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { GITHUB_REMOTE_FILE_SCHEME } from '../../../fileTreeView/browser/githubFileSystemProvider.js';
-import { IActiveSessionItem } from '../../../sessions/browser/sessionsManagementService.js';
+import { GITHUB_REMOTE_FILE_SCHEME } from '../../../sessions/common/sessionData.js';
 
 suite('GitHubService', () => {
 
@@ -79,15 +78,9 @@ suite('getGitHubContext', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	function makeSession(overrides: Partial<IActiveSessionItem>): IActiveSessionItem {
+	function makeSession(overrides: { repository?: URI }): { repository: URI | undefined } {
 		return {
-			resource: URI.parse('test://session/1'),
-			isUntitled: false,
-			label: 'Test Session',
 			repository: undefined,
-			worktree: undefined,
-			worktreeBranchName: undefined,
-			providerType: 'copilot-cloud-agent',
 			...overrides,
 		};
 	}
diff --git a/src/vs/sessions/contrib/remoteAgentHost/ARCHITECTURE.md b/src/vs/sessions/contrib/remoteAgentHost/ARCHITECTURE.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHost.contribution.ts b/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHost.contribution.ts
new file mode 100644
index 00000000000..2c14cad621a
--- /dev/null
+++ b/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHost.contribution.ts
@@ -0,0 +1,434 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { AgentHostFileSystemProvider } from '../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
+import { AGENT_HOST_LABEL_FORMATTER, AGENT_HOST_SCHEME, agentHostAuthority } from '../../../../platform/agentHost/common/agentHostUri.js';
+import { type AgentProvider, type IAgentConnection } from '../../../../platform/agentHost/common/agentService.js';
+import { IRemoteAgentHostConnectionInfo, IRemoteAgentHostService, RemoteAgentHostsEnabledSettingId, RemoteAgentHostsSettingId } from '../../../../platform/agentHost/common/remoteAgentHostService.js';
+import { isSessionAction } from '../../../../platform/agentHost/common/state/sessionActions.js';
+import { SessionClientState } from '../../../../platform/agentHost/common/state/sessionClientState.js';
+import { ROOT_STATE_URI, type IAgentInfo, type IRootState } from '../../../../platform/agentHost/common/state/sessionState.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { resolveTokenForResource } from '../../../../workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.js';
+import { AgentHostLanguageModelProvider } from '../../../../workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.js';
+import { AgentHostSessionHandler } from '../../../../workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.js';
+import { AgentHostSessionListController } from '../../../../workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.js';
+import { LoggingAgentConnection } from '../../../../workbench/contrib/chat/browser/agentSessions/agentHost/loggingAgentConnection.js';
+import { AgentSessionTarget } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
+import { IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { ILanguageModelsService } from '../../../../workbench/contrib/chat/common/languageModels.js';
+import { IAuthenticationService } from '../../../../workbench/services/authentication/common/authentication.js';
+import { ISessionsManagementService } from '../../../contrib/sessions/browser/sessionsManagementService.js';
+import { ISessionsProvidersService } from '../../sessions/browser/sessionsProvidersService.js';
+import { RemoteAgentHostSessionsProvider } from './remoteAgentHostSessionsProvider.js';
+
+/**
+ * Given a sanitized URI authority, resolves the corresponding agent host
+ * session target string by looking up the matching connection.
+ *
+ * Returns `undefined` if no connection matches the authority.
+ */
+export function getRemoteAgentHostSessionTarget(
+	connections: readonly IRemoteAgentHostConnectionInfo[],
+	authority: string,
+): AgentSessionTarget | undefined {
+	for (const conn of connections) {
+		if (agentHostAuthority(conn.address) === authority) {
+			return `remote-${agentHostAuthority(conn.address)}-copilot`;
+		}
+	}
+	return undefined;
+}
+
+/** Per-connection state bundle, disposed when a connection is removed. */
+class ConnectionState extends Disposable {
+	readonly store = this._register(new DisposableStore());
+	readonly clientState: SessionClientState;
+	readonly agents = this._register(new DisposableMap<AgentProvider, DisposableStore>());
+	readonly modelProviders = new Map<AgentProvider, AgentHostLanguageModelProvider>();
+	readonly loggedConnection: LoggingAgentConnection;
+
+	constructor(
+		clientId: string,
+		readonly name: string | undefined,
+		logService: ILogService,
+		loggedConnection: LoggingAgentConnection,
+	) {
+		super();
+		this.clientState = this.store.add(new SessionClientState(clientId, logService));
+		this.loggedConnection = this.store.add(loggedConnection);
+	}
+}
+
+/**
+ * Discovers available agents from each connected remote agent host and
+ * dynamically registers each one as a chat session type with its own
+ * session handler, list controller, and language model provider.
+ *
+ * Uses the same unified {@link AgentHostSessionHandler} and
+ * {@link AgentHostSessionListController} as the local agent host,
+ * obtaining per-connection {@link IAgentConnection} instances from
+ * {@link IRemoteAgentHostService.getConnection}.
+ */
+export class RemoteAgentHostContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'sessions.contrib.remoteAgentHostContribution';
+
+	/** Per-connection state: client state + per-agent registrations. */
+	private readonly _connections = this._register(new DisposableMap<string, ConnectionState>());
+
+	/** Maps sanitized authority strings back to original addresses. */
+	private readonly _fsProvider: AgentHostFileSystemProvider;
+
+	constructor(
+		@IRemoteAgentHostService private readonly _remoteAgentHostService: IRemoteAgentHostService,
+		@IChatSessionsService private readonly _chatSessionsService: IChatSessionsService,
+		@ILanguageModelsService private readonly _languageModelsService: ILanguageModelsService,
+		@ILogService private readonly _logService: ILogService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
+		@IDefaultAccountService private readonly _defaultAccountService: IDefaultAccountService,
+		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
+		@IFileService private readonly _fileService: IFileService,
+		@ISessionsProvidersService private readonly _sessionsProvidersService: ISessionsProvidersService,
+		@ILabelService private readonly _labelService: ILabelService,
+	) {
+		super();
+
+		// Register a single read-only filesystem provider for all remote agent
+		// hosts. Individual connections are identified by the URI authority.
+		this._fsProvider = this._register(new AgentHostFileSystemProvider());
+		this._register(this._fileService.registerProvider(AGENT_HOST_SCHEME, this._fsProvider));
+
+		// Display agent-host URIs with the original file path
+		this._register(this._labelService.registerFormatter(AGENT_HOST_LABEL_FORMATTER));
+
+		// Reconcile when connections change (added/removed/reconnected)
+		this._register(this._remoteAgentHostService.onDidChangeConnections(() => {
+			this._reconcileConnections();
+		}));
+
+		// Push auth token whenever the default account or sessions change
+		this._register(this._defaultAccountService.onDidChangeDefaultAccount(() => this._authenticateAllConnections()));
+		this._register(this._authenticationService.onDidChangeSessions(() => this._authenticateAllConnections()));
+
+		// Initial setup for already-connected remotes
+		this._reconcileConnections();
+	}
+
+	private _reconcileConnections(): void {
+		const currentAddresses = new Set(this._remoteAgentHostService.connections.map(c => c.address));
+
+		// Remove connections no longer present
+		for (const [address] of this._connections) {
+			if (!currentAddresses.has(address)) {
+				this._logService.info(`[RemoteAgentHost] Removing contribution for ${address}`);
+				this._connections.deleteAndDispose(address);
+			}
+		}
+
+		// Add or update connections
+		for (const connectionInfo of this._remoteAgentHostService.connections) {
+			const existing = this._connections.get(connectionInfo.address);
+			if (existing) {
+				// If the name changed, tear down and re-register with new name
+				if (existing.name !== connectionInfo.name) {
+					this._logService.info(`[RemoteAgentHost] Name changed for ${connectionInfo.address}: ${existing.name} -> ${connectionInfo.name}`);
+					this._connections.deleteAndDispose(connectionInfo.address);
+					this._setupConnection(connectionInfo.address, connectionInfo.name);
+				}
+			} else {
+				this._setupConnection(connectionInfo.address, connectionInfo.name);
+			}
+		}
+	}
+
+	private _setupConnection(address: string, name: string | undefined): void {
+		const connection = this._remoteAgentHostService.getConnection(address);
+		if (!connection) {
+			return;
+		}
+
+		const sanitized = agentHostAuthority(address);
+		const channelId = `agentHostIpc.remote.${sanitized}`;
+		const channelLabel = `Agent Host (${name || address})`;
+		const loggedConnection = this._instantiationService.createInstance(LoggingAgentConnection, connection, channelId, channelLabel);
+		const connState = new ConnectionState(connection.clientId, name, this._logService, loggedConnection);
+		this._connections.set(address, connState);
+		const store = connState.store;
+
+		// Track authority -> connection mapping for FS provider routing
+		const authority = agentHostAuthority(address);
+		store.add(this._fsProvider.registerAuthority(authority, connection));
+
+		// Forward non-session actions to client state
+		store.add(loggedConnection.onDidAction(envelope => {
+			if (!isSessionAction(envelope.action)) {
+				connState.clientState.receiveEnvelope(envelope);
+			}
+		}));
+
+		// Forward notifications to client state
+		store.add(loggedConnection.onDidNotification(n => {
+			connState.clientState.receiveNotification(n);
+		}));
+
+		// React to root state changes (agent discovery)
+		store.add(connState.clientState.onDidChangeRootState(rootState => {
+			this._handleRootStateChange(address, loggedConnection, rootState);
+		}));
+
+		// Subscribe to root state
+		loggedConnection.subscribe(URI.parse(ROOT_STATE_URI)).then(snapshot => {
+			if (store.isDisposed) {
+				return;
+			}
+			connState.clientState.handleSnapshot(ROOT_STATE_URI, snapshot.state, snapshot.fromSeq);
+		}).catch(err => {
+			this._logService.error(`[RemoteAgentHost] Failed to subscribe to root state for ${address}`, err);
+			loggedConnection.logError('subscribe(root)', err);
+		});
+
+		// Authenticate with this new connection
+		this._authenticateWithConnection(loggedConnection);
+	}
+
+	private _handleRootStateChange(address: string, loggedConnection: LoggingAgentConnection, rootState: IRootState): void {
+		const connState = this._connections.get(address);
+		if (!connState) {
+			return;
+		}
+
+		const incoming = new Set(rootState.agents.map(a => a.provider));
+
+		// Remove agents no longer present
+		for (const [provider] of connState.agents) {
+			if (!incoming.has(provider)) {
+				connState.agents.deleteAndDispose(provider);
+				connState.modelProviders.delete(provider);
+			}
+		}
+
+		// Register new agents, push model updates to existing ones
+		for (const agent of rootState.agents) {
+			if (!connState.agents.has(agent.provider)) {
+				this._registerAgent(address, loggedConnection, agent, connState.name);
+			} else {
+				const modelProvider = connState.modelProviders.get(agent.provider);
+				modelProvider?.updateModels(agent.models);
+			}
+		}
+	}
+
+	private _registerAgent(address: string, loggedConnection: LoggingAgentConnection, agent: IAgentInfo, configuredName: string | undefined): void {
+		// Only register copilot agents; other provider types are not supported
+		if (agent.provider !== 'copilot') {
+			this._logService.warn(`[RemoteAgentHost] Ignoring unsupported agent provider '${agent.provider}' from ${address}`);
+			return;
+		}
+
+		const connState = this._connections.get(address);
+		if (!connState) {
+			return;
+		}
+
+		const agentStore = new DisposableStore();
+		connState.agents.set(agent.provider, agentStore);
+		connState.store.add(agentStore);
+
+		const sanitized = agentHostAuthority(address);
+		const sessionType = `remote-${sanitized}-${agent.provider}`;
+		const agentId = sessionType;
+		const vendor = sessionType;
+
+		const displayName = configuredName || `${agent.displayName} (${address})`;
+
+		// Per-agent working directory cache, scoped to the agent store lifetime
+		const sessionWorkingDirs = new Map<string, string>();
+		agentStore.add(toDisposable(() => sessionWorkingDirs.clear()));
+
+		// Capture the working directory from the active session for new sessions
+		const resolveWorkingDirectory = (resourceKey: string): string | undefined => {
+			const cached = sessionWorkingDirs.get(resourceKey);
+			if (cached) {
+				return cached;
+			}
+			const activeSession = this._sessionsManagementService.activeSession.get();
+			const repoUri = activeSession?.workspace.get()?.repositories[0]?.uri;
+			if (repoUri) {
+				// The repository URI's path is the remote filesystem path
+				// (set via agentHostRemotePath in the folder picker callback)
+				const dir = repoUri.path;
+				sessionWorkingDirs.set(resourceKey, dir);
+				return dir;
+			}
+			return undefined;
+		};
+
+		// Chat session contribution
+		agentStore.add(this._chatSessionsService.registerChatSessionContribution({
+			type: sessionType,
+			name: agentId,
+			displayName,
+			description: agent.description,
+			canDelegate: true,
+			requiresCustomModels: true,
+			supportsDelegation: false,
+		}));
+
+		// Register as a sessions provider
+		const sessionsProvider = this._instantiationService.createInstance(
+			RemoteAgentHostSessionsProvider, address, configuredName, agent.provider);
+		agentStore.add(sessionsProvider);
+		agentStore.add(this._sessionsProvidersService.registerProvider(sessionsProvider));
+
+		// Session list controller (unified)
+		const listController = agentStore.add(this._instantiationService.createInstance(
+			AgentHostSessionListController, sessionType, agent.provider, loggedConnection, displayName));
+		agentStore.add(this._chatSessionsService.registerChatSessionItemController(sessionType, listController));
+
+		// Session handler (unified)
+		const sessionHandler = agentStore.add(this._instantiationService.createInstance(
+			AgentHostSessionHandler, {
+			provider: agent.provider,
+			agentId,
+			sessionType,
+			fullName: displayName,
+			description: agent.description,
+			connection: loggedConnection,
+			connectionAuthority: sanitized,
+			extensionId: 'vscode.remote-agent-host',
+			extensionDisplayName: 'Remote Agent Host',
+			resolveWorkingDirectory,
+			resolveAuthentication: () => this._resolveAuthenticationInteractively(loggedConnection),
+		}));
+		agentStore.add(this._chatSessionsService.registerChatSessionContentProvider(sessionType, sessionHandler));
+
+		// Language model provider
+		const vendorDescriptor = { vendor, displayName, configuration: undefined, managementCommand: undefined, when: undefined };
+		this._languageModelsService.deltaLanguageModelChatProviderDescriptors([vendorDescriptor], []);
+		agentStore.add(toDisposable(() => this._languageModelsService.deltaLanguageModelChatProviderDescriptors([], [vendorDescriptor])));
+		const modelProvider = agentStore.add(new AgentHostLanguageModelProvider(sessionType, vendor));
+		modelProvider.updateModels(agent.models);
+		connState.modelProviders.set(agent.provider, modelProvider);
+		agentStore.add(toDisposable(() => connState.modelProviders.delete(agent.provider)));
+		agentStore.add(this._languageModelsService.registerLanguageModelProvider(vendor, modelProvider));
+
+		this._logService.info(`[RemoteAgentHost] Registered agent ${agent.provider} from ${address} as ${sessionType}`);
+	}
+
+	private _authenticateAllConnections(): void {
+		for (const [, connState] of this._connections) {
+			this._authenticateWithConnection(connState.loggedConnection);
+		}
+	}
+
+	/**
+	 * Discover auth requirements from the connection's resource metadata
+	 * and authenticate using matching tokens resolved via the standard
+	 * VS Code authentication service (same flow as MCP auth).
+	 */
+	private async _authenticateWithConnection(loggedConnection: LoggingAgentConnection): Promise<void> {
+		try {
+			const metadata = await loggedConnection.getResourceMetadata();
+			for (const resource of metadata.resources) {
+				const resourceUri = URI.parse(resource.resource);
+				const token = await this._resolveTokenForResource(resourceUri, resource.authorization_servers ?? [], resource.scopes_supported ?? []);
+				if (token) {
+					this._logService.info(`[RemoteAgentHost] Authenticating for resource: ${resource.resource}`);
+					await loggedConnection.authenticate({ resource: resource.resource, token });
+				} else {
+					this._logService.info(`[RemoteAgentHost] No token resolved for resource: ${resource.resource}`);
+				}
+			}
+		} catch (err) {
+			this._logService.error('[RemoteAgentHost] Failed to authenticate with connection', err);
+			loggedConnection.logError('authenticateWithConnection', err);
+		}
+	}
+
+	/**
+	 * Resolve a bearer token for a set of authorization servers using the
+	 * standard VS Code authentication service provider resolution.
+	 */
+	private _resolveTokenForResource(resourceServer: URI, authorizationServers: readonly string[], scopes: readonly string[]): Promise<string | undefined> {
+		return resolveTokenForResource(resourceServer, authorizationServers, scopes, this._authenticationService, this._logService, '[RemoteAgentHost]');
+	}
+
+	/**
+	 * Interactively prompt the user to authenticate when the server requires it.
+	 * Returns true if authentication succeeded.
+	 */
+	private async _resolveAuthenticationInteractively(loggedConnection: LoggingAgentConnection): Promise<boolean> {
+		try {
+			const metadata = await loggedConnection.getResourceMetadata();
+			for (const resource of metadata.resources) {
+				for (const server of resource.authorization_servers ?? []) {
+					const serverUri = URI.parse(server);
+					const resourceUri = URI.parse(resource.resource);
+					const providerId = await this._authenticationService.getOrActivateProviderIdForServer(serverUri, resourceUri);
+					if (!providerId) {
+						continue;
+					}
+
+					const scopes = [...(resource.scopes_supported ?? [])];
+					const session = await this._authenticationService.createSession(providerId, scopes, {
+						activateImmediate: true,
+						authorizationServer: serverUri,
+					});
+
+					await loggedConnection.authenticate({
+						resource: resource.resource,
+						token: session.accessToken,
+					});
+					this._logService.info(`[RemoteAgentHost] Interactive authentication succeeded for ${resource.resource}`);
+					return true;
+				}
+			}
+		} catch (err) {
+			this._logService.error('[RemoteAgentHost] Interactive authentication failed', err);
+			loggedConnection.logError('resolveAuthenticationInteractively', err);
+		}
+		return false;
+	}
+}
+
+registerWorkbenchContribution2(RemoteAgentHostContribution.ID, RemoteAgentHostContribution, WorkbenchPhase.AfterRestored);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	properties: {
+		[RemoteAgentHostsEnabledSettingId]: {
+			type: 'boolean',
+			description: nls.localize('chat.remoteAgentHosts.enabled', "Enable connecting to remote agent hosts."),
+			default: false,
+			tags: ['experimental'],
+		},
+		[RemoteAgentHostsSettingId]: {
+			type: 'array',
+			items: {
+				type: 'object',
+				properties: {
+					address: { type: 'string', description: nls.localize('chat.remoteAgentHosts.address', "The address of the remote agent host (e.g. \"localhost:3000\").") },
+					name: { type: 'string', description: nls.localize('chat.remoteAgentHosts.name', "A display name for this remote agent host.") },
+					connectionToken: { type: 'string', description: nls.localize('chat.remoteAgentHosts.connectionToken', "An optional connection token for authenticating with the remote agent host.") },
+				},
+				required: ['address', 'name'],
+			},
+			description: nls.localize('chat.remoteAgentHosts', "A list of remote agent host addresses to connect to (e.g. \"localhost:3000\")."),
+			default: [],
+			tags: ['experimental', 'advanced'],
+		},
+	},
+});
diff --git a/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostPicker.ts b/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostPicker.ts
new file mode 100644
index 00000000000..f0ba5aa080c
--- /dev/null
+++ b/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostPicker.ts
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { agentHostUri } from '../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
+import { AGENT_HOST_SCHEME, agentHostAuthority } from '../../../../platform/agentHost/common/agentHostUri.js';
+import { IParsedRemoteAgentHostInput, IRemoteAgentHostService, parseRemoteAgentHostInput, RemoteAgentHostInputValidationError } from '../../../../platform/agentHost/common/remoteAgentHostService.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+
+interface IRemoteAgentHostPickItem extends IQuickPickItem {
+	readonly remoteType: 'existing' | 'add';
+	readonly address?: string;
+	readonly defaultDirectory?: string;
+}
+
+const removeButton: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.close),
+	tooltip: localize('removeRemote', "Remove Remote"),
+};
+
+/**
+ * Drives the "Browse Remotes" flow: lets the user pick an existing configured
+ * remote or add a new one, then opens a folder-picker on that remote.
+ *
+ * Returns the selected folder URI, or `undefined` if the user cancelled.
+ */
+export async function pickRemoteAgentHostFolder(
+	accessor: ServicesAccessor,
+): Promise<URI | undefined> {
+	const remoteAgentHostService = accessor.get(IRemoteAgentHostService);
+	const quickInputService = accessor.get(IQuickInputService);
+	const fileDialogService = accessor.get(IFileDialogService);
+	const notificationService = accessor.get(INotificationService);
+
+	let selectedAddress: string | undefined;
+	let selectedName: string | undefined;
+	let defaultDirectory: string | undefined;
+
+	const configuredEntries = remoteAgentHostService.configuredEntries;
+	if (configuredEntries.length > 0) {
+		const picks: IRemoteAgentHostPickItem[] = configuredEntries.map(entry => {
+			const connection = remoteAgentHostService.connections.find(c => c.address === entry.address);
+			return {
+				remoteType: 'existing' as const,
+				label: entry.name,
+				description: entry.address,
+				address: entry.address,
+				defaultDirectory: connection?.defaultDirectory,
+				buttons: [removeButton],
+			};
+		});
+		picks.push({
+			remoteType: 'add',
+			label: localize('addRemote', "Add Remote..."),
+			description: localize('addRemoteDescription', "Connect to a new remote agent host"),
+		});
+
+		const picked = await quickInputService.pick(picks, {
+			title: localize('selectRemote', "Select Remote"),
+			placeHolder: localize('selectRemotePlaceholder', "Choose a remote agent host or add a new one"),
+			matchOnDescription: true,
+			onDidTriggerItemButton: async context => {
+				if (context.button === removeButton && context.item.address) {
+					try {
+						await remoteAgentHostService.removeRemoteAgentHost(context.item.address);
+						context.removeItem();
+					} catch {
+						notificationService.error(localize('removeRemoteFailed', "Failed to remove remote agent host {0}.", context.item.address));
+					}
+				}
+			},
+		});
+		if (!picked) {
+			return undefined;
+		}
+
+		if (picked.remoteType === 'existing') {
+			const configuredEntry = configuredEntries.find(e => e.address === picked.address);
+			if (!configuredEntry) {
+				return undefined;
+			}
+			try {
+				const connection = await remoteAgentHostService.addRemoteAgentHost(configuredEntry);
+				selectedAddress = connection.address;
+				selectedName = connection.name;
+				defaultDirectory = connection.defaultDirectory;
+			} catch {
+				notificationService.error(localize('connectRemoteFailed', "Failed to connect to remote agent host {0}.", configuredEntry.address));
+				return undefined;
+			}
+		} else {
+			const addedRemote = await promptToAddRemoteAgentHost(remoteAgentHostService, quickInputService, notificationService);
+			if (!addedRemote) {
+				return undefined;
+			}
+			selectedAddress = addedRemote.address;
+			selectedName = addedRemote.name;
+			defaultDirectory = addedRemote.defaultDirectory;
+		}
+	} else {
+		const addedRemote = await promptToAddRemoteAgentHost(remoteAgentHostService, quickInputService, notificationService);
+		if (!addedRemote) {
+			return undefined;
+		}
+		selectedAddress = addedRemote.address;
+		selectedName = addedRemote.name;
+		defaultDirectory = addedRemote.defaultDirectory;
+	}
+
+	if (!selectedAddress || !selectedName) {
+		return undefined;
+	}
+
+	return pickFolderOnRemote(selectedAddress, selectedName, defaultDirectory, fileDialogService);
+}
+
+async function promptToAddRemoteAgentHost(
+	remoteAgentHostService: IRemoteAgentHostService,
+	quickInputService: IQuickInputService,
+	notificationService: INotificationService,
+): Promise<{ readonly address: string; readonly name: string; readonly defaultDirectory?: string } | undefined> {
+	const parsed = await promptForRemoteAddress(quickInputService);
+	if (!parsed) {
+		return undefined;
+	}
+
+	const name = await promptForRemoteName(quickInputService, parsed.suggestedName);
+	if (!name) {
+		return undefined;
+	}
+
+	try {
+		const connection = await remoteAgentHostService.addRemoteAgentHost({
+			address: parsed.address,
+			name,
+			connectionToken: parsed.connectionToken,
+		});
+		return {
+			address: connection.address,
+			name: connection.name,
+			defaultDirectory: connection.defaultDirectory,
+		};
+	} catch {
+		notificationService.error(localize('addRemoteFailed', "Failed to connect to remote agent host {0}.", parsed.address));
+		return undefined;
+	}
+}
+
+async function promptForRemoteAddress(quickInputService: IQuickInputService): Promise<IParsedRemoteAgentHostInput | undefined> {
+	const value = await quickInputService.input({
+		title: localize('addRemoteTitle', "Add Remote"),
+		prompt: localize('addRemotePrompt', "Paste a host, host:port, or WebSocket URL. Example: {0}", 'ws://127.0.0.1:8089'),
+		placeHolder: 'ws://127.0.0.1:8080?tkn=abc-123',
+		ignoreFocusLost: true,
+		validateInput: async value => {
+			const result = parseRemoteAgentHostInput(value);
+			if (result.error === RemoteAgentHostInputValidationError.Empty) {
+				return localize('addRemoteValidationEmpty', "Enter a remote agent host address.");
+			}
+			if (result.error === RemoteAgentHostInputValidationError.Invalid) {
+				return localize('addRemoteValidationInvalid', "Enter a valid host, host:port, or WebSocket URL.");
+			}
+			return undefined;
+		},
+	});
+	if (!value) {
+		return undefined;
+	}
+	const result = parseRemoteAgentHostInput(value);
+	return result.parsed;
+}
+
+async function promptForRemoteName(quickInputService: IQuickInputService, defaultName: string): Promise<string | undefined> {
+	const value = await quickInputService.input({
+		title: localize('nameRemoteTitle', "Name Remote"),
+		prompt: localize('nameRemotePrompt', "Enter a display name for this remote agent host."),
+		placeHolder: localize('nameRemotePlaceholder', "My Remote"),
+		value: defaultName,
+		valueSelection: [0, defaultName.length],
+		ignoreFocusLost: true,
+		validateInput: async value => value.trim() ? undefined : localize('nameRemoteValidationEmpty', "Enter a name for this remote agent host."),
+	});
+	return value?.trim() || undefined;
+}
+
+async function pickFolderOnRemote(
+	selectedAddress: string,
+	selectedName: string,
+	defaultDirectory: string | undefined,
+	fileDialogService: IFileDialogService,
+): Promise<URI | undefined> {
+	const authority = agentHostAuthority(selectedAddress);
+	const defaultUri = defaultDirectory
+		? agentHostUri(authority, defaultDirectory)
+		: agentHostUri(authority, '/');
+
+	try {
+		const selected = await fileDialogService.showOpenDialog({
+			canSelectFiles: false,
+			canSelectFolders: true,
+			canSelectMany: false,
+			title: localize('selectRemoteFolder', "Select Folder on {0}", selectedName),
+			availableFileSystems: [AGENT_HOST_SCHEME],
+			defaultUri,
+		});
+		return selected?.[0];
+	} catch {
+		// dialog was cancelled or failed
+		return undefined;
+	}
+}
diff --git a/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts b/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts
new file mode 100644
index 00000000000..e964d6a41d3
--- /dev/null
+++ b/src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts
@@ -0,0 +1,188 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { localize } from '../../../../nls.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ISessionData, ISessionWorkspace, SessionStatus } from '../../sessions/common/sessionData.js';
+import { ISendRequestOptions, ISessionsBrowseAction, ISessionsChangeEvent, ISessionsProvider, ISessionType } from '../../sessions/browser/sessionsProvider.js';
+import { CopilotCLISessionType } from '../../sessions/browser/sessionTypes.js';
+import { IChatSessionFileChange } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { agentHostUri } from '../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
+import { AGENT_HOST_SCHEME, agentHostAuthority } from '../../../../platform/agentHost/common/agentHostUri.js';
+
+/**
+ * A sessions provider for a single agent on a remote agent host connection.
+ * One instance is created per agent discovered on a connection.
+ */
+export class RemoteAgentHostSessionsProvider extends Disposable implements ISessionsProvider {
+
+	readonly id: string;
+	readonly label: string;
+	readonly icon: ThemeIcon = Codicon.remote;
+	readonly sessionTypes: readonly ISessionType[];
+
+	private readonly _onDidChangeSessions = this._register(new Emitter<ISessionsChangeEvent>());
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent> = this._onDidChangeSessions.event;
+
+	readonly browseActions: readonly ISessionsBrowseAction[];
+
+	constructor(
+		private readonly _address: string,
+		_connectionName: string | undefined,
+		_agentProvider: string,
+		@IFileDialogService private readonly _fileDialogService: IFileDialogService,
+	) {
+		super();
+
+		const sanitized = agentHostAuthority(_address);
+		const displayName = _connectionName || `${_agentProvider} (${_address})`;
+
+		this.id = `agenthost-${sanitized}-${_agentProvider}`;
+		this.label = displayName;
+
+		this.sessionTypes = [CopilotCLISessionType];
+
+		this.browseActions = [{
+			label: localize('folders', "Folders"),
+			icon: Codicon.remote,
+			providerId: this.id,
+			execute: () => this._browseForFolder(),
+		}];
+	}
+
+	// -- Workspaces --
+
+	resolveWorkspace(repositoryUri: URI): ISessionWorkspace {
+		return {
+			label: repositoryUri.path.split('/').pop() || repositoryUri.path,
+			icon: Codicon.remote,
+			repositories: [{ uri: repositoryUri, workingDirectory: undefined, detail: this.label, baseBranchProtected: undefined }],
+			requiresWorkspaceTrust: true
+		};
+	}
+
+	// -- Sessions --
+
+	getSessionTypes(_session: ISessionData): ISessionType[] {
+		return [...this.sessionTypes];
+	}
+
+	getSessions(): ISessionData[] {
+		// Sessions are managed by the existing AgentHostSessionListController
+		// This will be populated when the list controller is integrated
+		return [];
+	}
+
+	// -- Session Lifecycle --
+
+	createNewSession(workspace: ISessionWorkspace): ISessionData {
+		const workspaceUri = workspace.repositories[0]?.uri;
+		if (!workspaceUri) {
+			throw new Error('Workspace has no repository URI');
+		}
+		const resource = URI.from({ scheme: this.sessionTypes[0]?.id ?? 'agenthost', path: `/untitled-${generateUuid()}` });
+		// Create a minimal ISessionData for the new session
+		return {
+			sessionId: `${this.id}:${resource.toString()}`,
+			resource,
+			providerId: this.id,
+			sessionType: this.sessionTypes[0]?.id ?? 'agenthost',
+			icon: Codicon.remote,
+			createdAt: new Date(),
+			workspace: observableValue(this, {
+				label: workspaceUri.path.split('/').pop() || workspaceUri.path,
+				icon: Codicon.remote,
+				repositories: [{ uri: workspaceUri, workingDirectory: undefined, detail: this.label, baseBranchProtected: undefined }],
+				requiresWorkspaceTrust: true
+			}),
+			title: observableValue(this, ''),
+			updatedAt: observableValue(this, new Date()),
+			status: observableValue(this, SessionStatus.Untitled),
+			changes: observableValue<readonly IChatSessionFileChange[]>(this, []),
+			modelId: observableValue(this, undefined),
+			mode: observableValue(this, undefined),
+			loading: observableValue(this, false),
+			isArchived: observableValue(this, false),
+			isRead: observableValue(this, true),
+			description: observableValue(this, undefined),
+			lastTurnEnd: observableValue(this, undefined),
+			pullRequest: observableValue(this, undefined),
+
+		};
+	}
+
+	setSessionType(_sessionId: string, _type: ISessionType): ISessionData {
+		throw new Error('Remote agent host sessions do not support changing session type');
+	}
+
+	setModel(_sessionId: string, _modelId: string): void {
+		// No-op for remote agent host sessions
+	}
+
+	// -- Session Actions --
+
+	async archiveSession(_sessionId: string): Promise<void> {
+		// Agent host sessions don't support archiving
+	}
+
+	async unarchiveSession(_sessionId: string): Promise<void> {
+		// Agent host sessions don't support unarchiving
+	}
+
+	async deleteSession(_sessionId: string): Promise<void> {
+		// Agent host sessions don't support deletion
+	}
+
+	async renameSession(_sessionId: string, _title: string): Promise<void> {
+		// Agent host sessions don't support renaming
+	}
+
+	setRead(_sessionId: string, _read: boolean): void {
+		// Agent host sessions don't track read state
+	}
+
+	async sendRequest(_sessionId: string, sendOptions: ISendRequestOptions): Promise<ISessionData> {
+		// Agent host session send is handled separately
+		throw new Error('Remote agent host sessions do not support sending requests through the sessions provider');
+	}
+
+	// -- Private --
+
+	private async _browseForFolder(): Promise<ISessionWorkspace | undefined> {
+		const authority = agentHostAuthority(this._address);
+		const defaultUri = agentHostUri(authority, '/');
+
+		try {
+			const selected = await this._fileDialogService.showOpenDialog({
+				canSelectFiles: false,
+				canSelectFolders: true,
+				canSelectMany: false,
+				title: localize('selectRemoteFolder', "Select Folder on {0}", this.label),
+				availableFileSystems: [AGENT_HOST_SCHEME],
+				defaultUri,
+			});
+			if (selected?.[0]) {
+				const uri = selected[0];
+				const label = uri.path.split('/').pop() || uri.path;
+				return {
+					label,
+					icon: Codicon.remote,
+					repositories: [{ uri, workingDirectory: undefined, detail: this.label, baseBranchProtected: undefined }],
+					requiresWorkspaceTrust: true
+				};
+			}
+		} catch {
+			// dialog was cancelled or failed
+		}
+		return undefined;
+	}
+}
diff --git a/src/vs/sessions/contrib/sessions/browser/aiCustomizationShortcutsWidget.ts b/src/vs/sessions/contrib/sessions/browser/aiCustomizationShortcutsWidget.ts
index 58c814528b3..fe6f55d5fa0 100644
--- a/src/vs/sessions/contrib/sessions/browser/aiCustomizationShortcutsWidget.ts
+++ b/src/vs/sessions/contrib/sessions/browser/aiCustomizationShortcutsWidget.ts
@@ -76,7 +76,7 @@ export class AICustomizationShortcutsWidget extends Disposable {
 		}));
 		headerButton.element.classList.add('customization-link-button', 'sidebar-action-button');
 		headerButton.element.setAttribute('aria-expanded', String(!isCollapsed));
-		headerButton.label = localize('customizations', "CUSTOMIZATIONS");
+		headerButton.label = localize('customizations', "Customizations");
 
 		const chevronContainer = DOM.append(headerButton.element, $('span.customization-link-counts'));
 		const chevron = DOM.append(chevronContainer, $('.ai-customization-chevron'));
diff --git a/src/vs/sessions/contrib/sessions/browser/customizationsToolbar.contribution.ts b/src/vs/sessions/contrib/sessions/browser/customizationsToolbar.contribution.ts
index 07c6cf93903..d8c4b413b2c 100644
--- a/src/vs/sessions/contrib/sessions/browser/customizationsToolbar.contribution.ts
+++ b/src/vs/sessions/contrib/sessions/browser/customizationsToolbar.contribution.ts
@@ -31,7 +31,7 @@ import { ISessionsManagementService } from './sessionsManagementService.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { getSourceCounts, getSourceCountsTotal } from './customizationCounts.js';
-import { IEditorService, MODAL_GROUP } from '../../../../workbench/services/editor/common/editorService.js';
+import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
 import { IAICustomizationWorkspaceService } from '../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js';
 import { IAgentPluginService } from '../../../../workbench/contrib/chat/common/plugins/agentPluginService.js';
 
@@ -248,7 +248,7 @@ export class CustomizationsToolbarContribution extends Disposable implements IWo
 				async run(accessor: ServicesAccessor): Promise<void> {
 					const editorService = accessor.get(IEditorService);
 					const input = AICustomizationManagementEditorInput.getOrCreate();
-					const editor = await editorService.openEditor(input, { pinned: true }, MODAL_GROUP);
+					const editor = await editorService.openEditor(input, { pinned: true });
 					if (editor instanceof AICustomizationManagementEditor) {
 						editor.selectSectionById(config.section);
 					}
diff --git a/src/vs/sessions/contrib/sessions/browser/media/customizationsToolbar.css b/src/vs/sessions/contrib/sessions/browser/media/customizationsToolbar.css
index bc08fc25eb5..5525dc5a758 100644
--- a/src/vs/sessions/contrib/sessions/browser/media/customizationsToolbar.css
+++ b/src/vs/sessions/contrib/sessions/browser/media/customizationsToolbar.css
@@ -7,8 +7,9 @@
 	display: flex;
 	flex-direction: column;
 	flex-shrink: 0;
-	border-top: 1px solid var(--vscode-widget-border);
-	padding: 6px;
+	border-top: 1px solid var(--vscode-panel-border, transparent);
+	margin: 0 12px;
+	padding: 6px 0;
 }
 
 /* Make the toolbar, action bar, and items fill full width and stack vertically */
@@ -85,6 +86,11 @@
 	position: relative;
 }
 
+/* Customizations header label uses heavier weight */
+.ai-customization-toolbar .ai-customization-header .customization-link-button {
+	font-weight: 500;
+}
+
 /* Counts - floating right inside the button */
 .ai-customization-toolbar .customization-link-counts {
 	position: absolute;
diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
new file mode 100644
index 00000000000..27a1c391413
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
@@ -0,0 +1,373 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.sessions-list-control {
+	flex: 1 1 auto;
+	height: 100%;
+	min-height: 0;
+
+	.pane-body & .monaco-scrollable-element {
+		padding: 0 6px;
+	}
+
+	.monaco-list-row {
+		border-radius: 6px;
+	}
+
+	.monaco-list-row .force-no-twistie {
+		display: none !important;
+	}
+
+	.monaco-list-row.selected .session-details-row {
+		color: unset;
+	}
+
+	.monaco-list:focus .monaco-list-row.selected .session-details-row {
+		.session-diff {
+
+			.session-diff-added,
+			.session-diff-removed {
+				color: unset;
+			}
+		}
+	}
+
+	.monaco-list-row.selected .session-title {
+		color: unset;
+	}
+
+	.monaco-list:not(:focus) .monaco-list-row.selected .session-details-row {
+		color: var(--vscode-descriptionForeground);
+	}
+
+	.monaco-list-row .session-title-toolbar {
+		position: relative;
+		height: 16px;
+		display: none;
+
+		.monaco-toolbar {
+			position: relative;
+			right: 0;
+			top: 0;
+		}
+	}
+
+	.monaco-list-row .session-pinned-indicator {
+		display: none;
+		height: 16px;
+		align-items: center;
+		color: var(--vscode-descriptionForeground);
+		font-size: 12px;
+		pointer-events: none;
+
+		&.visible {
+			display: flex;
+		}
+	}
+
+	.monaco-list-row:hover,
+	.monaco-list-row.focused:not(.selected) {
+		.session-pinned-indicator {
+			display: none;
+		}
+
+		.session-title-toolbar {
+			display: block;
+		}
+
+		.session-title {
+			margin-right: 8px;
+		}
+	}
+}
+
+/* Session Item */
+
+.session-item {
+	display: flex;
+	flex-direction: row;
+	height: 100%;
+	box-sizing: border-box;
+	padding: 8px 6px;
+
+	&.archived {
+		color: var(--vscode-descriptionForeground);
+	}
+
+	.session-main,
+	.session-title-row,
+	.session-details-row {
+		flex: 1;
+		min-width: 0;
+	}
+
+	.session-icon {
+		display: flex;
+		align-items: flex-start;
+		line-height: 17px;
+
+		> .codicon {
+			flex-shrink: 0;
+			font-size: 12px;
+			height: 16px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		&.session-icon-active > .codicon {
+			color: var(--vscode-textLink-foreground);
+		}
+
+		&.session-icon-pulse > .codicon {
+			color: var(--vscode-list-warningForeground);
+			animation: session-needs-input-pulse 2s ease-in-out infinite;
+		}
+
+		@media (prefers-reduced-motion: reduce) {
+			&.session-icon-pulse > .codicon {
+				animation: none;
+			}
+		}
+
+		&.session-icon-unread > .codicon {
+			color: var(--vscode-textLink-foreground);
+		}
+
+		&.session-icon-error > .codicon {
+			color: var(--vscode-errorForeground);
+		}
+
+		/* Small dot for read sessions — subtle indicator */
+		> .codicon.codicon-circle-small-filled {
+			color: var(--vscode-agentSessionReadIndicator-foreground);
+		}
+	}
+
+	.session-main {
+		padding-left: 6px;
+	}
+
+	.session-title-row,
+	.session-details-row {
+		display: flex;
+		align-items: center;
+	}
+
+	.session-title-row {
+		line-height: 17px;
+		padding-bottom: 4px;
+	}
+
+	.session-details-row {
+		gap: 4px;
+		font-size: 12px;
+		line-height: 15px;
+		max-height: 15px;
+		color: var(--vscode-descriptionForeground);
+
+		.session-details-icon {
+			display: flex;
+			align-items: center;
+
+			> .codicon {
+				font-size: 12px;
+			}
+		}
+
+		.session-diff {
+			font-variant-numeric: tabular-nums;
+			overflow: hidden;
+			display: flex;
+			gap: 4px;
+
+			.session-diff-added {
+				color: var(--vscode-chat-linesAddedForeground);
+			}
+
+			.session-diff-removed {
+				color: var(--vscode-chat-linesRemovedForeground);
+			}
+		}
+
+		.session-badge {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+
+		.session-separator {
+			display: none;
+
+			&.has-separator {
+				display: inline;
+
+				&::before {
+					content: '\00B7';
+				}
+			}
+		}
+	}
+
+	.session-title,
+	.session-description {
+		/* push other items to the end */
+		flex: 1;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.session-description:empty {
+		display: none;
+	}
+
+	.session-title {
+		font-size: 13px;
+	}
+
+	.session-time {
+		display: flex;
+		align-items: center;
+		font-variant-numeric: tabular-nums;
+		white-space: nowrap;
+	}
+
+	.session-approval-row {
+		display: none;
+		align-items: flex-end;
+		gap: 8px;
+		margin-top: 4px;
+		padding: 4px 8px;
+		box-sizing: border-box;
+		border: 1px solid var(--vscode-contrastBorder, var(--vscode-widget-border, transparent));
+		border-radius: 4px;
+		background-color: var(--vscode-editor-background);
+		color: var(--vscode-editor-foreground);
+
+		&.visible {
+			display: flex;
+		}
+
+		.session-approval-label {
+			flex: 1;
+			overflow: hidden;
+			min-width: 0;
+
+			& > .rendered-markdown,
+			& > .rendered-markdown > .code,
+			& > .rendered-markdown > .code > span {
+				display: block;
+				overflow: hidden;
+			}
+
+			.monaco-tokenized-source {
+				display: block;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				font-size: 12px;
+			}
+		}
+
+		.session-approval-button {
+			flex-shrink: 0;
+
+			.monaco-button {
+				padding: 2px 10px;
+				font-size: 12px;
+				white-space: nowrap;
+			}
+		}
+	}
+}
+
+/* Show More */
+
+.session-show-more {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 0 6px;
+	font-size: 11px;
+	color: var(--vscode-descriptionForeground);
+	min-height: 26px;
+	cursor: pointer;
+
+	.session-show-more-label {
+		padding: 0 6px;
+		flex-shrink: 0;
+		white-space: nowrap;
+	}
+
+	/* Lines on both sides of the text */
+	&::before,
+	&::after {
+		content: '';
+		flex: 1;
+		height: 1px;
+		background: var(--vscode-widget-border, var(--vscode-contrastBorder));
+	}
+}
+
+.monaco-list-row:hover .session-show-more:hover {
+	color: var(--vscode-foreground);
+}
+
+/* Section Header */
+
+.session-section {
+	display: flex;
+	align-items: center;
+	font-size: 11px;
+	font-weight: 500;
+	color: var(--vscode-descriptionForeground);
+	text-transform: uppercase;
+	/* align with session item padding */
+	padding: 0 6px;
+
+	.session-section-label {
+		flex: 1;
+	}
+
+	.session-section-count {
+		opacity: 0.7;
+		margin-right: 4px;
+	}
+
+	.session-section-toolbar {
+		margin-left: auto;
+		display: none;
+	}
+}
+
+.monaco-list-row:hover .session-section .session-section-toolbar,
+.monaco-list-row.focused .session-section .session-section-toolbar {
+	display: block;
+}
+
+.sessions-list-control {
+
+	.monaco-list:focus .monaco-list-row.focused.selected .session-section-label,
+	.monaco-list:focus .monaco-list-row.selected .session-section-label {
+		color: var(--vscode-list-activeSelectionForeground);
+	}
+
+	.monaco-list:not(:focus) .monaco-list-row.selected .session-section-label {
+		color: var(--vscode-list-inactiveSelectionForeground);
+	}
+}
+
+@keyframes session-needs-input-pulse {
+
+	0%,
+	100% {
+		opacity: 1;
+	}
+
+	50% {
+		opacity: 0.4;
+	}
+}
diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsTitleBarWidget.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsTitleBarWidget.css
index b9f14273091..a8d1a3310c3 100644
--- a/src/vs/sessions/contrib/sessions/browser/media/sessionsTitleBarWidget.css
+++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsTitleBarWidget.css
@@ -11,7 +11,7 @@
 	flex-wrap: nowrap;
 	align-items: center;
 	justify-content: flex-start;
-	padding: 0 10px;
+	padding-left: 16px;
 	height: 22px;
 	border-radius: 4px;
 	-webkit-app-region: no-drag;
@@ -77,18 +77,50 @@
 	flex-shrink: 0;
 }
 
-/* Changes summary */
-.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-changes {
+/* Provider label (shown for untitled sessions) */
+.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-provider {
 	display: flex;
 	align-items: center;
 	flex-shrink: 0;
+	opacity: 0.7;
+}
+
+/* Provider label (shown for untitled sessions) */
+.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-provider {
+	display: flex;
+	align-items: center;
+	flex-shrink: 0;
+	opacity: 0.7;
+}
+
+/* Session count widget (tasklist icon + unread count, left of pill) */
+.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-count {
+	display: flex;
+	align-items: center;
 	gap: 3px;
+	flex-shrink: 0;
+	cursor: pointer;
+	padding: 0 4px;
+	height: 22px;
+	border: none;
+	border-radius: 4px;
+	background: transparent;
+	color: inherit;
+	font: inherit;
+	outline: none;
 }
 
-.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-changes-added {
-	color: var(--vscode-gitDecoration-addedResourceForeground);
+.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-count:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
 }
 
-.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-changes-removed {
-	color: var(--vscode-gitDecoration-deletedResourceForeground);
+.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-count .codicon {
+	font-size: 16px;
 }
+
+.command-center .agent-sessions-titlebar-container .agent-sessions-titlebar-count-label {
+	font-size: 12px;
+	font-variant-numeric: tabular-nums;
+	line-height: 16px;
+}
+
diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsViewPane.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsViewPane.css
index 1666be70127..f2f6f71e1be 100644
--- a/src/vs/sessions/contrib/sessions/browser/media/sessionsViewPane.css
+++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsViewPane.css
@@ -40,6 +40,7 @@
 		flex: 1;
 		overflow: hidden;
 		min-height: 0;
+		margin-bottom: 12px;
 	}
 
 	.agent-sessions-header {
@@ -73,7 +74,7 @@
 	}
 
 	.agent-sessions-new-button-container {
-		padding: 6px 12px 8px 12px;
+		padding: 8px 12px;
 	}
 
 	.agent-sessions-new-button-container .monaco-button {
@@ -93,10 +94,46 @@
 	.agent-sessions-control-container {
 		flex: 1;
 		overflow: hidden;
-
-		/* Override section header padding to align with dot indicators */
-		.agent-session-section {
-			padding-left: 12px;
-		}
+	}
+}
+
+/* Sessions-app-specific overrides for the agent sessions viewer.
+ * These styles only apply within the agent-sessions-workbench context. */
+
+.agent-sessions-workbench {
+
+	/*
+	 * Show-more / show-less: content always rendered, list row height
+	 * controls visibility (1px = clipped, 26px = visible).
+	 * Height animation is driven by JS (requestAnimationFrame) since
+	 * the virtualized list uses absolute positioning.
+	 */
+	.agent-session-show-more {
+		justify-content: center;
+		align-items: center;
+		padding: 0 6px;
+		font-size: 11px;
+		color: var(--vscode-descriptionForeground);
+		min-height: 26px;
+
+		.agent-session-show-more-label {
+			padding: 0 6px;
+			flex-shrink: 0;
+			white-space: nowrap;
+		}
+
+		/* Lines on both sides of the text as flex items */
+		&::before,
+		&::after {
+			content: '';
+			flex: 1;
+			height: 1px;
+			background: var(--vscode-widget-border, var(--vscode-contrastBorder));
+		}
+	}
+
+	/* Brighter text on direct hover */
+	.monaco-list-row:hover .agent-session-show-more:hover {
+		color: var(--vscode-foreground);
 	}
 }
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionTypes.ts b/src/vs/sessions/contrib/sessions/browser/sessionTypes.ts
new file mode 100644
index 00000000000..fd421679546
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/sessionTypes.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../base/common/codicons.js';
+import { localize } from '../../../../nls.js';
+import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
+import { ISessionType } from './sessionsProvider.js';
+
+/** Session type ID for local Copilot CLI sessions. */
+export const COPILOT_CLI_SESSION_TYPE = AgentSessionProviders.Background;
+
+/** Session type ID for Copilot Cloud sessions. */
+export const COPILOT_CLOUD_SESSION_TYPE = AgentSessionProviders.Cloud;
+
+/** Copilot CLI session type — local background agent running in a Git worktree. */
+export const CopilotCLISessionType: ISessionType = {
+	id: COPILOT_CLI_SESSION_TYPE,
+	label: localize('copilotCLI', "Copilot CLI"),
+	icon: Codicon.copilot,
+};
+
+/** Copilot Cloud session type - cloud-hosted agent. */
+export const CopilotCloudSessionType: ISessionType = {
+	id: COPILOT_CLOUD_SESSION_TYPE,
+	label: localize('copilotCloud', "Cloud"),
+	icon: Codicon.cloud,
+};
diff --git a/src/vs/sessions/contrib/sessions/browser/sessions.contribution.ts b/src/vs/sessions/contrib/sessions/browser/sessions.contribution.ts
index 52bd4417115..25e9f725a62 100644
--- a/src/vs/sessions/contrib/sessions/browser/sessions.contribution.ts
+++ b/src/vs/sessions/contrib/sessions/browser/sessions.contribution.ts
@@ -12,9 +12,10 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { ViewPaneContainer } from '../../../../workbench/browser/parts/views/viewPaneContainer.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { SessionsTitleBarContribution } from './sessionsTitleBarWidget.js';
-import { AgenticSessionsViewPane, SessionsViewId } from './sessionsViewPane.js';
 import { SessionsManagementService, ISessionsManagementService } from './sessionsManagementService.js';
+import { SessionsTitleBarContribution } from './sessionsTitleBarWidget.js';
+import { SessionsView, SessionsViewId } from './views/sessionsView.js';
+import './views/sessionsViewActions.js';
 
 const agentSessionsViewIcon = registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, localize('agentSessionsViewIcon', 'Icon for Agent Sessions View'));
 const AGENT_SESSIONS_VIEW_TITLE = localize2('agentSessions.view.label', "Sessions");
@@ -31,19 +32,21 @@ const agentSessionsViewContainer: ViewContainer = Registry.as<IViewContainersReg
 	windowVisibility: WindowVisibility.Sessions
 }, ViewContainerLocation.Sidebar, { isDefault: true });
 
-const agentSessionsViewDescriptor: IViewDescriptor = {
+const sessionsViewPaneDescriptor: IViewDescriptor = {
 	id: SessionsViewId,
 	containerIcon: agentSessionsViewIcon,
 	containerTitle: AGENT_SESSIONS_VIEW_TITLE.value,
 	singleViewPaneContainerTitle: AGENT_SESSIONS_VIEW_TITLE.value,
 	name: AGENT_SESSIONS_VIEW_TITLE,
-	canToggleVisibility: false,
+	canToggleVisibility: true,
 	canMoveView: false,
-	ctorDescriptor: new SyncDescriptor(AgenticSessionsViewPane),
+	ctorDescriptor: new SyncDescriptor(SessionsView),
 	windowVisibility: WindowVisibility.Sessions
 };
 
-Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews([agentSessionsViewDescriptor], agentSessionsViewContainer);
+Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews([sessionsViewPaneDescriptor], agentSessionsViewContainer);
+
+registerSingleton(ISessionsManagementService, SessionsManagementService, InstantiationType.Delayed);
 
 registerWorkbenchContribution2(SessionsTitleBarContribution.ID, SessionsTitleBarContribution, WorkbenchPhase.AfterRestored);
 
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts b/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts
index 63ff340cf77..670b3b8cfcb 100644
--- a/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts
+++ b/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts
@@ -3,78 +3,109 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IObservable, observableValue } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
-import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ISessionOpenOptions, openSession as openSessionDefault } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsOpener.js';
-import { ChatViewPaneTarget, IChatWidget, IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
-import { IChatSessionProviderOptionItem, IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
-import { IChatService, IChatSendRequestOptions } from '../../../../workbench/contrib/chat/common/chatService/chatService.js';
-import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel } from '../../../../workbench/contrib/chat/common/constants.js';
 import { IAgentSession, isAgentSession } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
 import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { INewSession, LocalNewSession, RemoteNewSession } from '../../chat/browser/newSession.js';
-import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
-import { isBuiltinChatMode } from '../../../../workbench/contrib/chat/common/chatModes.js';
-import { ILanguageModelsService } from '../../../../workbench/contrib/chat/common/languageModels.js';
-import { ILanguageModelToolsService } from '../../../../workbench/contrib/chat/common/tools/languageModelToolsService.js';
-import { GITHUB_REMOTE_FILE_SCHEME } from '../../fileTreeView/browser/githubFileSystemProvider.js';
+import { ISessionsProvidersService } from './sessionsProvidersService.js';
+import { ISessionType, ISendRequestOptions, ISessionsChangeEvent } from './sessionsProvider.js';
+import { ISessionData, ISessionWorkspace, GITHUB_REMOTE_FILE_SCHEME } from '../common/sessionData.js';
 import { IGitHubSessionContext } from '../../github/common/types.js';
-import { ResourceSet } from '../../../../base/common/map.js';
+import { ChatViewPaneTarget, IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+
+/**
+ * Configuration properties available on new/pending sessions.
+ * Not part of the public {@link ISessionData} contract but present on
+ * concrete session implementations (CopilotCLISession, RemoteNewSession, AgentHostNewSession).
+ */
 
 export const IsNewChatSessionContext = new RawContextKey<boolean>('isNewChatSession', true);
 
 /**
- * True when the active session uses the Background provider type (copilotcli).
- * Used to gate actions that require a local worktree (run script, open in VS Code, terminal).
+ * The provider ID of the active session (e.g., 'default-copilot', 'agenthost-hostA').
  */
+export const ActiveSessionProviderIdContext = new RawContextKey<string>('activeSessionProviderId', '', localize('activeSessionProviderId', "The provider ID of the active session"));
+
+/**
+ * The session type of the active session (e.g., 'copilotcli', 'cloud').
+ */
+export const ActiveSessionTypeContext = new RawContextKey<string>('activeSessionType', '', localize('activeSessionType', "The session type of the active session"));
+
 export const IsActiveSessionBackgroundProviderContext = new RawContextKey<boolean>('isActiveSessionBackgroundProvider', false, localize('isActiveSessionBackgroundProvider', "Whether the active session uses the background agent provider"));
 
 //#region Active Session Service
 
 const LAST_SELECTED_SESSION_KEY = 'agentSessions.lastSelectedSession';
+const ACTIVE_PROVIDER_KEY = 'sessions.activeProviderId';
 
 /**
  * An active session item extends IChatSessionItem with repository information.
  * - For agent session items: repository is the workingDirectory from metadata
  * - For new sessions: repository comes from the session option with id 'repository'
  */
-export interface IActiveSessionItem {
-	readonly resource: URI;
-	readonly isUntitled: boolean;
-	readonly label: string | undefined;
-	readonly repository: URI | undefined;
-	readonly worktree: URI | undefined;
-	readonly worktreeBranchName: string | undefined;
-	readonly providerType: string;
-}
-
 export interface ISessionsManagementService {
 	readonly _serviceBrand: undefined;
 
-	/**
-	 * Observable for the currently active session.
-	 */
-	readonly activeSession: IObservable<IActiveSessionItem | undefined>;
+	// -- Sessions --
 
 	/**
-	 * Returns the currently active session, if any.
+	 * Get all sessions from all registered providers.
 	 */
-	getActiveSession(): IActiveSessionItem | undefined;
+	getSessions(): ISessionData[];
+
+	/**
+	 * Get a session by its resource URI.
+	 */
+	getSession(resource: URI): ISessionData | undefined;
+
+	/**
+	 * Get all session types from all registered providers.
+	 */
+	getAllSessionTypes(): ISessionType[];
+
+	/**
+	 * Fires when available session types change (providers added/removed).
+	 */
+	readonly onDidChangeSessionTypes: Event<void>;
+
+	/**
+	 * Fires when sessions change across any provider.
+	 */
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent>;
+
+	// -- Active Session --
+
+	/**
+	 * Observable for the currently active session as {@link ISessionData}.
+	 */
+	readonly activeSession: IObservable<ISessionData | undefined>;
+
+	/**
+	 * Observable for the currently active sessions provider ID.
+	 * When only one provider exists, it is selected automatically.
+	 */
+	readonly activeProviderId: IObservable<string | undefined>;
+
+	/**
+	 * Set the active sessions provider by ID.
+	 */
+	setActiveProvider(providerId: string): void;
 
 	/**
 	 * Select an existing session as the active session.
 	 * Sets `isNewChatSession` context to false and opens the session.
 	 */
-	openSession(sessionResource: URI, openOptions?: ISessionOpenOptions): Promise<void>;
+	openSession(sessionResource: URI): Promise<void>;
 
 	/**
 	 * Switch to the new-session view.
@@ -83,28 +114,39 @@ export interface ISessionsManagementService {
 	openNewSessionView(): void;
 
 	/**
-	 * Create a pending session object for the given target type.
-	 * Local sessions collect options locally; remote sessions notify the extension.
+	 * Returns the repository URI for the given session, if available.
 	 */
-	createNewSessionForTarget(target: AgentSessionProviders, sessionResource: URI, defaultRepoUri?: URI): Promise<INewSession>;
+	getSessionRepositoryUri(session: IAgentSession): URI | undefined;
 
 	/**
-	 * Open a new session, apply options, and send the initial request.
-	 * Looks up the session by resource URI and builds send options from it.
+	 * Create a new session for the given workspace.
+	 * Delegates to the provider identified by providerId.
 	 */
-	sendRequestForNewSession(sessionResource: URI, options?: { permissionLevel?: ChatPermissionLevel }): Promise<void>;
+	createNewSession(providerId: string, workspace: ISessionWorkspace): ISessionData;
+
+	/**
+	 * Send the initial request for a session.
+	 */
+	sendRequest(session: ISessionData, options: ISendRequestOptions): Promise<void>;
+
+	/**
+	 * Update the session type for a new session.
+	 * The provider may recreate the session object.
+	 * If the session is the active session, the active session data is updated.
+	 */
+	setSessionType(session: ISessionData, type: ISessionType): Promise<void>;
 
 	/**
 	 * Commit files in a worktree and refresh the agent sessions model
 	 * so the Changes view reflects the update.
 	 */
-	commitWorktreeFiles(session: IActiveSessionItem, fileUris: URI[]): Promise<void>;
+	commitWorktreeFiles(session: ISessionData, fileUris: URI[]): Promise<void>;
 
 	/**
 	 * Derive a GitHub context (owner, repo, prNumber) from an active session.
 	 * Returns `undefined` if the session is not associated with a GitHub repository.
 	 */
-	getGitHubContext(session: IActiveSessionItem): IGitHubSessionContext | undefined;
+	getGitHubContext(session: ISessionData): IGitHubSessionContext | undefined;
 
 	/**
 	 * Derive a GitHub context from a session resource URI.
@@ -116,6 +158,19 @@ export interface ISessionsManagementService {
 	 * Resolve a relative file path to a full URI based on the session's repository/worktree.
 	 */
 	resolveSessionFileUri(sessionResource: URI, relativePath: string): URI | undefined;
+
+	// -- Session Actions --
+
+	/** Archive a session. */
+	archiveSession(session: ISessionData): Promise<void>;
+	/** Unarchive a session. */
+	unarchiveSession(session: ISessionData): Promise<void>;
+	/** Delete a session. */
+	deleteSession(session: ISessionData): Promise<void>;
+	/** Rename a session. */
+	renameSession(session: ISessionData, title: string): Promise<void>;
+	/** Mark a session as read or unread. */
+	setRead(session: ISessionData, read: boolean): void;
 }
 
 export const ISessionsManagementService = createDecorator<ISessionsManagementService>('sessionsManagementService');
@@ -124,34 +179,43 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _activeSession = observableValue<IActiveSessionItem | undefined>(this, undefined);
-	readonly activeSession: IObservable<IActiveSessionItem | undefined> = this._activeSession;
-	private readonly _newActiveSessionDisposables = this._register(new DisposableStore());
+	private readonly _onDidChangeSessions = this._register(new Emitter<ISessionsChangeEvent>());
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent> = this._onDidChangeSessions.event;
 
-	private readonly _newSession = this._register(new MutableDisposable<INewSession>());
+	private readonly _onDidChangeSessionTypes = this._register(new Emitter<void>());
+	readonly onDidChangeSessionTypes: Event<void> = this._onDidChangeSessionTypes.event;
+
+	private _sessionTypes: readonly ISessionType[] = [];
+
+	private readonly _activeSession = observableValue<ISessionData | undefined>(this, undefined);
+	readonly activeSession: IObservable<ISessionData | undefined> = this._activeSession;
+	private readonly _newSessionObservable = observableValue<ISessionData | undefined>(this, undefined);
+	readonly newSession: IObservable<ISessionData | undefined> = this._newSessionObservable;
+	private readonly _activeProviderId = observableValue<string | undefined>(this, undefined);
+	readonly activeProviderId: IObservable<string | undefined> = this._activeProviderId;
 	private lastSelectedSession: URI | undefined;
 	private readonly isNewChatSessionContext: IContextKey<boolean>;
+	private readonly _activeSessionProviderId: IContextKey<string>;
+	private readonly _activeSessionType: IContextKey<string>;
 	private readonly _isBackgroundProvider: IContextKey<boolean>;
 
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IChatService private readonly chatService: IChatService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ICommandService private readonly commandService: ICommandService,
-		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
-		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 	) {
 		super();
 
 		// Bind context key to active session state.
 		// isNewSession is false when there are any established sessions in the model.
 		this.isNewChatSessionContext = IsNewChatSessionContext.bindTo(contextKeyService);
+		this._activeSessionProviderId = ActiveSessionProviderIdContext.bindTo(contextKeyService);
+		this._activeSessionType = ActiveSessionTypeContext.bindTo(contextKeyService);
 		this._isBackgroundProvider = IsActiveSessionBackgroundProviderContext.bindTo(contextKeyService);
 
 		// Load last selected session
@@ -160,55 +224,76 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		// Save on shutdown
 		this._register(this.storageService.onWillSaveState(() => this.saveLastSelectedSession()));
 
-		// Update active session when the agent sessions model changes (e.g., metadata updates with worktree/repository info)
-		this._register(this.agentSessionsService.model.onDidChangeSessions(() => this.refreshActiveSessionFromModel()));
+		// Forward session change events from providers and update active session
+		this._register(this.sessionsProvidersService.onDidChangeSessions(e => this.onDidChangeSessionsFromSessionsProviders(e)));
 
-		// Clear active session if the active session gets archived
-		this._register(this.agentSessionsService.model.onDidChangeSessionArchivedState(e => {
-			if (e.isArchived()) {
-				const currentActive = this._activeSession.get();
-				if (currentActive && currentActive.resource.toString() === e.resource.toString()) {
-					this.openNewSessionView();
-				}
-			}
+		// Restore or auto-select active provider
+		this._initActiveProvider();
+		this._register(this.sessionsProvidersService.onDidChangeProviders(() => {
+			this._initActiveProvider();
+			this._updateSessionTypes();
 		}));
 	}
 
-	private refreshActiveSessionFromModel(): void {
+	private _initActiveProvider(): void {
+		const providers = this.sessionsProvidersService.getProviders();
+		if (providers.length === 0) {
+			return;
+		}
+
+		// If already set and still valid, keep it
+		const current = this._activeProviderId.get();
+		if (current && providers.some(p => p.id === current)) {
+			return;
+		}
+
+		// Try to restore from storage
+		const stored = this.storageService.get(ACTIVE_PROVIDER_KEY, StorageScope.PROFILE);
+		if (stored && providers.some(p => p.id === stored)) {
+			this._activeProviderId.set(stored, undefined);
+			return;
+		}
+
+		// Auto-select the first (or only) provider
+		this._activeProviderId.set(providers[0].id, undefined);
+	}
+
+	setActiveProvider(providerId: string): void {
+		this._activeProviderId.set(providerId, undefined);
+		this.storageService.store(ACTIVE_PROVIDER_KEY, providerId, StorageScope.PROFILE, StorageTarget.MACHINE);
+	}
+
+	private onDidChangeSessionsFromSessionsProviders(e: ISessionsChangeEvent): void {
+		this._onDidChangeSessions.fire(e);
 		const currentActive = this._activeSession.get();
 		if (!currentActive) {
 			return;
 		}
 
-		if (currentActive.isUntitled) {
-			return;
+		if (e.removed.length) {
+			if (e.removed.some(r => r.sessionId === currentActive.sessionId)) {
+				this.openNewSessionView();
+				return;
+			}
 		}
 
-		const agentSession = this.agentSessionsService.model.getSession(currentActive.resource);
-		if (agentSession) {
-			this.setActiveSession(agentSession);
-		} else {
-			this.showNextSession();
+		if (e.changed.length) {
+			const updated = e.changed.find(s => s.sessionId === currentActive.sessionId);
+			if (updated?.isArchived.get()) {
+				this.openNewSessionView();
+				return;
+			}
+			if (updated) {
+				this._activeSession.set(updated, undefined);
+				return;
+			}
 		}
 	}
 
-	private showNextSession(): void {
-		const sessions = this.agentSessionsService.model.sessions
-			.filter(s => !s.isArchived())
-			.sort((a, b) => (b.timing.lastRequestEnded ?? b.timing.created) - (a.timing.lastRequestEnded ?? a.timing.created));
-
-		if (sessions.length > 0) {
-			this.setActiveSession(sessions[0]);
-			this.instantiationService.invokeFunction(openSessionDefault, sessions[0]);
-		} else {
-			this.openNewSessionView();
-		}
-	}
-
-	private getRepositoryFromMetadata(session: IAgentSession): [URI | undefined, URI | undefined, string | undefined] {
+	private getRepositoryFromMetadata(session: IAgentSession): [URI | undefined, URI | undefined, string | undefined, boolean | undefined] {
 		const metadata = session.metadata;
 		if (!metadata) {
-			return [undefined, undefined, undefined];
+			return [undefined, undefined, undefined, undefined];
 		}
 
 		if (session.providerType === AgentSessionProviders.Cloud) {
@@ -219,12 +304,12 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 				authority: 'github',
 				path: `/${metadata.owner}/${metadata.name}/${encodeURIComponent(branch)}`
 			});
-			return [repositoryUri, undefined, undefined];
+			return [repositoryUri, undefined, undefined, undefined];
 		}
 
 		const workingDirectoryPath = metadata?.workingDirectoryPath as string | undefined;
 		if (workingDirectoryPath) {
-			return [URI.file(workingDirectoryPath), undefined, undefined];
+			return [URI.file(workingDirectoryPath), undefined, undefined, undefined];
 		}
 
 		const repositoryPath = metadata?.repositoryPath as string | undefined;
@@ -234,216 +319,115 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		const worktreePathUri = typeof worktreePath === 'string' ? URI.file(worktreePath) : undefined;
 
 		const worktreeBranchName = metadata?.branchName as string | undefined;
+		const worktreeBaseBranchProtected = metadata?.baseBranchProtected as boolean | undefined;
 
 		return [
 			URI.isUri(repositoryPathUri) ? repositoryPathUri : undefined,
 			URI.isUri(worktreePathUri) ? worktreePathUri : undefined,
-			worktreeBranchName];
+			worktreeBranchName,
+			worktreeBaseBranchProtected];
 	}
 
-	getActiveSession(): IActiveSessionItem | undefined {
-		return this._activeSession.get();
+	getSessions(): ISessionData[] {
+		return this.sessionsProvidersService.getSessions();
 	}
 
-	async openSession(sessionResource: URI, openOptions?: ISessionOpenOptions): Promise<void> {
-		const existingSession = this.agentSessionsService.model.getSession(sessionResource);
-		if (!existingSession) {
+	getSession(resource: URI): ISessionData | undefined {
+		return this.sessionsProvidersService.getSessions().find(s => this.uriIdentityService.extUri.isEqual(s.resource, resource));
+	}
+
+	getAllSessionTypes(): ISessionType[] {
+		return [...this._sessionTypes];
+	}
+
+	private _collectSessionTypes(): ISessionType[] {
+		const types: ISessionType[] = [];
+		const seen = new Set<string>();
+		for (const provider of this.sessionsProvidersService.getProviders()) {
+			for (const type of provider.sessionTypes) {
+				if (!seen.has(type.id)) {
+					seen.add(type.id);
+					types.push(type);
+				}
+			}
+		}
+		return types;
+	}
+
+	private _updateSessionTypes(): void {
+		const newTypes = this._collectSessionTypes();
+		const oldIds = new Set(this._sessionTypes.map(t => t.id));
+		const newIds = new Set(newTypes.map(t => t.id));
+		if (oldIds.size !== newIds.size || [...oldIds].some(id => !newIds.has(id))) {
+			this._sessionTypes = newTypes;
+			this._onDidChangeSessionTypes.fire();
+		}
+	}
+
+	async openSession(sessionResource: URI): Promise<void> {
+		const sessionData = this.getSession(sessionResource);
+		if (!sessionData) {
+			this.logService.warn(`[SessionsManagement] openSession: session not found: ${sessionResource.toString()}`);
 			throw new Error(`Session with resource ${sessionResource.toString()} not found`);
 		}
+		this.logService.info(`[SessionsManagement] openSession: ${sessionResource.toString()} provider=${sessionData.providerId}`);
 		this.isNewChatSessionContext.set(false);
-		this.setActiveSession(existingSession);
-		await this.instantiationService.invokeFunction(openSessionDefault, existingSession, openOptions);
+		this.setActiveSession(sessionData);
+
+		await this.chatWidgetService.openSession(sessionResource, ChatViewPaneTarget);
 	}
 
-	async createNewSessionForTarget(target: AgentSessionProviders, sessionResource: URI, defaultRepoUri?: URI): Promise<INewSession> {
+	createNewSession(providerId: string, workspace: ISessionWorkspace): ISessionData {
 		if (!this.isNewChatSessionContext.get()) {
 			this.isNewChatSessionContext.set(true);
 		}
 
-		let newSession: INewSession;
-		if (target === AgentSessionProviders.Background) {
-			newSession = this.instantiationService.createInstance(LocalNewSession, sessionResource, defaultRepoUri);
-		} else {
-			newSession = this.instantiationService.createInstance(RemoteNewSession, sessionResource, target);
+		const provider = this.sessionsProvidersService.getProviders().find(p => p.id === providerId);
+		if (!provider) {
+			throw new Error(`Sessions provider '${providerId}' not found`);
 		}
-		this._newSession.value = newSession;
-		this.setActiveSession(newSession);
-		return newSession;
+
+		const sessionData = provider.createNewSession(workspace);
+
+		this._newSessionObservable.set(sessionData, undefined);
+		this.setActiveSession(sessionData);
+		this._activeSession.set(sessionData, undefined);
+		return sessionData;
 	}
 
-	async sendRequestForNewSession(sessionResource: URI, options?: { permissionLevel?: ChatPermissionLevel }): Promise<void> {
-		const session = this._newSession.value;
-		if (!session) {
-			this.logService.error(`[SessionsManagementService] No new session found for resource: ${sessionResource.toString()}`);
-			return;
+	async setSessionType(session: ISessionData, type: ISessionType): Promise<void> {
+		const provider = this.sessionsProvidersService.getProviders().find(p => p.id === session.providerId);
+		if (!provider) {
+			throw new Error(`Sessions provider '${session.providerId}' not found`);
 		}
 
-		if (!this.uriIdentityService.extUri.isEqual(sessionResource, session.resource)) {
-			this.logService.error(`[SessionsManagementService] Session resource mismatch. Expected: ${session.resource.toString()}, received: ${sessionResource.toString()}`);
-			return;
+		const updatedSession = provider.setSessionType(session.sessionId, type);
+
+		const activeSession = this._activeSession.get();
+		if (activeSession && activeSession.sessionId === session.sessionId) {
+			this._newSessionObservable.set(updatedSession, undefined);
+			this._activeSession.set(updatedSession, undefined);
 		}
-
-		const query = session.query;
-		if (!query) {
-			this.logService.error('[SessionsManagementService] No query set on session');
-			return;
-		}
-
-		const contribution = this.chatSessionsService.getChatSessionContribution(session.target);
-
-		// Resolve mode from session's modeId (falls back to Agent)
-		const modeKind = session.mode?.kind ?? ChatModeKind.Agent;
-		const modeIsBuiltin = session.mode ? isBuiltinChatMode(session.mode) : true;
-		const modeId: 'ask' | 'agent' | 'edit' | 'custom' | undefined = modeIsBuiltin ? modeKind : 'custom';
-
-		const rawModeInstructions = session.mode?.modeInstructions?.get();
-		const modeInstructions = rawModeInstructions ? {
-			name: session.mode!.name.get(),
-			content: rawModeInstructions.content,
-			toolReferences: this.toolsService.toToolReferences(rawModeInstructions.toolReferences),
-			metadata: rawModeInstructions.metadata,
-		} : undefined;
-
-		const sendOptions: IChatSendRequestOptions = {
-			location: ChatAgentLocation.Chat,
-			userSelectedModelId: session.modelId,
-			modeInfo: {
-				kind: modeKind,
-				isBuiltin: modeIsBuiltin,
-				modeInstructions,
-				modeId,
-				applyCodeBlockSuggestionId: undefined,
-				permissionLevel: options?.permissionLevel ?? ChatPermissionLevel.Default,
-			},
-			agentIdSilent: contribution?.type,
-			attachedContext: session.attachedContext,
-		};
-
-		await this.chatSessionsService.getOrCreateChatSession(session.resource, CancellationToken.None);
-		await this.doSendRequestForNewSession(session, query, sendOptions, session.selectedOptions);
-
-		// Clean up the session after sending (setter disposes the previous value)
-		this._newSession.value = undefined;
 	}
 
-	private async doSendRequestForNewSession(session: INewSession, query: string, sendOptions: IChatSendRequestOptions, selectedOptions?: ReadonlyMap<string, IChatSessionProviderOptionItem>): Promise<void> {
-		// 1. Open the session - loads the model and shows the ChatViewPane
-		const chatWidget = await this.openNewSession(session);
-		const permissionLevel = sendOptions.modeInfo?.permissionLevel;
-		if (permissionLevel) {
-			chatWidget.input.setPermissionLevel(permissionLevel);
-		}
-
-		// 2. Load the session to apply selected options and have it ready when the view opens
-		await this.loadNewSession(session, selectedOptions);
-
-		//3. Send the initial request to kick off the session creation on the extension side
-		const existingResources = new ResourceSet(this.agentSessionsService.model.sessions.map(s => s.resource));
-		const result = await this.chatService.sendRequest(session.resource, query, sendOptions);
-		if (result.kind === 'rejected') {
-			this.logService.error(`[ActiveSessionService] sendRequest rejected: ${result.reason}`);
-			return;
-		}
-
-		// 4. This is just a heuristic to wait for the extension to create the session before trying to find the session associated with the chat widget, which is what we want to set as active.
-		// This allows to set the active session to the new session immediately instead of waiting for the chat widget to open, which results in a smoother user experience
-		const probableNewSession = await this.loadProbableNewAgentSession(session, existingResources);
-		this.setActiveSession(probableNewSession);
-
-		// 5. Wait for the real new session to appear in the chat widget
-		const newSession = await this.loadNewAgentSession(chatWidget, session);
-		this.setActiveSession(newSession);
-	}
-
-	private async openNewSession(session: INewSession): Promise<IChatWidget> {
+	async sendRequest(session: ISessionData, options: ISendRequestOptions): Promise<void> {
 		this.isNewChatSessionContext.set(false);
-		const sessionResource = session.resource;
-		const chatWidget = await this.chatWidgetService.openSession(sessionResource, ChatViewPaneTarget);
-		if (!chatWidget) {
-			throw new Error(`Failed to open chat session for resource ${sessionResource.toString()}`);
-		}
-		return chatWidget;
-	}
 
-	private async loadNewSession(session: INewSession, selectedOptions?: ReadonlyMap<string, IChatSessionProviderOptionItem>): Promise<void> {
-		const modelRef = await this.chatService.acquireOrLoadSession(session.resource, ChatAgentLocation.Chat, CancellationToken.None);
-		if (modelRef) {
-			const model = modelRef.object;
-
-			// Set the selected model on the input model so the model picker reflects it
-			if (session.modelId) {
-				const languageModel = this.languageModelsService.lookupLanguageModel(session.modelId);
-				if (languageModel) {
-					model.inputModel.setState({
-						selectedModel: { identifier: session.modelId, metadata: languageModel }
-					});
-				}
-			}
-
-			// Set the selected mode on the input model so the mode picker reflects it
-			if (session.mode) {
-				model.inputModel.setState({
-					mode: { id: session.mode.id, kind: session.mode.kind }
-				});
-			}
-
-			// Apply selected options (repository, branch, etc.) to the contributed session
-			if (selectedOptions && selectedOptions.size > 0) {
-				const contributedSession = model.contributedChatSession;
-				if (contributedSession) {
-					const initialSessionOptions = [...selectedOptions.entries()].map(
-						([optionId, value]) => ({ optionId, value })
-					);
-					model.setContributedChatSession({
-						...contributedSession,
-						initialSessionOptions,
-					});
-				}
-			}
-			modelRef.dispose();
+		const provider = this.sessionsProvidersService.getProviders().find(p => p.id === session.providerId);
+		if (!provider) {
+			throw new Error(`Sessions provider '${session.providerId}' not found`);
 		}
-	}
 
-	private async loadProbableNewAgentSession(session: INewSession, existingSessions: ResourceSet): Promise<IAgentSession> {
-		const probableNewSession = this.agentSessionsService.model.sessions.find(s => s.providerType === session.target && !existingSessions.has(s.resource));
-		if (probableNewSession) {
-			return probableNewSession;
-		}
-		let listener: IDisposable | undefined;
-		try {
-			return await new Promise<IAgentSession>(resolve => {
-				listener = this.agentSessionsService.model.onDidChangeSessions(() => {
-					const s = this.agentSessionsService.model.sessions.find(s => s.providerType === session.target && !existingSessions.has(s.resource));
-					if (s) {
-						listener?.dispose();
-						resolve(s);
-					}
-				});
-			});
-		} finally {
-			listener?.dispose();
-		}
-	}
+		// Delegate to the provider
+		const result = await provider.sendRequest(session.sessionId, options);
 
-	private async loadNewAgentSession(chatWidget: IChatWidget, session: INewSession): Promise<IAgentSession> {
-		const newSession = this.agentSessionsService.model.sessions.find(s => s.providerType === session.target && this.uriIdentityService.extUri.isEqual(s.resource, chatWidget.viewModel?.sessionResource));
-		if (newSession) {
-			return newSession;
-		}
-		let listener: IDisposable | undefined;
-		try {
-			return await new Promise<IAgentSession>(resolve => {
-				listener = chatWidget.onDidChangeViewModel(() => {
-					const s = this.agentSessionsService.model.sessions.find(s => s.providerType === session.target && this.uriIdentityService.extUri.isEqual(s.resource, chatWidget.viewModel?.sessionResource));
-					if (s) {
-						listener?.dispose();
-						resolve(s);
-					}
-				});
-			});
-		} finally {
-			listener?.dispose();
+		// Set the new agent session as active
+		if (result) {
+			this._activeSession.set(result, undefined);
 		}
+
+		// Clean up
+		this._newSessionObservable.set(undefined, undefined);
 	}
 
 	openNewSessionView(): void {
@@ -455,86 +439,32 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		this.isNewChatSessionContext.set(true);
 	}
 
-	private setActiveSession(session: IAgentSession | INewSession | undefined): void {
-		let activeSessionItem: IActiveSessionItem | undefined;
-		if (session) {
-			if (isAgentSession(session)) {
-				this.lastSelectedSession = session.resource;
-				const [repository, worktree, worktreeBranchName] = this.getRepositoryFromMetadata(session);
-				activeSessionItem = {
-					isUntitled: false,
-					label: session.label,
-					resource: session.resource,
-					repository: repository,
-					worktree,
-					worktreeBranchName: worktreeBranchName,
-					providerType: session.providerType,
-				};
-			} else {
-				activeSessionItem = {
-					isUntitled: true,
-					label: undefined,
-					resource: session.resource,
-					repository: session.repoUri,
-					worktree: undefined,
-					worktreeBranchName: undefined,
-					providerType: session.target,
-				};
-				this._newActiveSessionDisposables.clear();
-				this._newActiveSessionDisposables.add(session.onDidChange(e => {
-					if (e === 'repoUri') {
-						this.doSetActiveSession({
-							isUntitled: true,
-							label: undefined,
-							resource: session.resource,
-							repository: session.repoUri,
-							worktree: undefined,
-							worktreeBranchName: undefined,
-							providerType: session.target,
-						});
-					}
-				}));
-			}
-		}
-
-		this.doSetActiveSession(activeSessionItem);
+	getSessionRepositoryUri(session: IAgentSession): URI | undefined {
+		const [repositoryUri] = this.getRepositoryFromMetadata(session);
+		return repositoryUri;
 	}
 
-	private doSetActiveSession(activeSessionItem: IActiveSessionItem | undefined): void {
-		if (this.equalsSessionItem(this._activeSession.get(), activeSessionItem)) {
-			return;
+	private setActiveSession(session: ISessionData | undefined): void {
+		// Update context keys from session data
+		this._activeSessionProviderId.set(session?.providerId ?? '');
+		this._activeSessionType.set(session?.sessionType ?? '');
+		this._isBackgroundProvider.set(session?.sessionType === AgentSessionProviders.Background);
+
+		if (session && isAgentSession(session)) {
+			this.lastSelectedSession = session.resource;
 		}
 
-		if (activeSessionItem) {
-			this.logService.info(`[ActiveSessionService] Active session changed: ${activeSessionItem.resource.toString()}`);
-			this.logService.trace(`[ActiveSessionService] Active session details: ${JSON.stringify(activeSessionItem)}`);
+		if (session) {
+			this.logService.info(`[ActiveSessionService] Active session changed: ${session.resource.toString()}`);
 		} else {
 			this.logService.trace('[ActiveSessionService] Active session cleared');
 		}
 
-		this._isBackgroundProvider.set(activeSessionItem?.providerType === AgentSessionProviders.Background);
-		this._activeSession.set(activeSessionItem, undefined);
+		this._activeSession.set(session, undefined);
 	}
 
-	private equalsSessionItem(a: IActiveSessionItem | undefined, b: IActiveSessionItem | undefined): boolean {
-		if (a === b) {
-			return true;
-		}
-		if (!a || !b) {
-			return false;
-		}
-		return (
-			a.label === b.label &&
-			a.resource.toString() === b.resource.toString() &&
-			a.repository?.toString() === b.repository?.toString() &&
-			a.worktree?.toString() === b.worktree?.toString() &&
-			a.worktreeBranchName === b.worktreeBranchName &&
-			a.providerType === b.providerType
-		);
-	}
-
-	async commitWorktreeFiles(session: IActiveSessionItem, fileUris: URI[]): Promise<void> {
-		const worktreeUri = session.worktree;
+	async commitWorktreeFiles(session: ISessionData, fileUris: URI[]): Promise<void> {
+		const worktreeUri = session.workspace.get()?.repositories[0]?.workingDirectory;
 		if (!worktreeUri) {
 			throw new Error('Cannot commit worktree files: active session has no associated worktree');
 		}
@@ -547,9 +477,9 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		await this.agentSessionsService.model.resolve(AgentSessionProviders.Background);
 	}
 
-	getGitHubContext(session: IActiveSessionItem): IGitHubSessionContext | undefined {
+	getGitHubContext(session: ISessionData): IGitHubSessionContext | undefined {
 		// 1. Try parsing a github-remote-file URI (Cloud sessions)
-		const repoUri = session.repository;
+		const repoUri = session.workspace.get()?.repositories[0]?.uri;
 		if (repoUri && repoUri.scheme === GITHUB_REMOTE_FILE_SCHEME) {
 			const parts = repoUri.path.split('/').filter(Boolean);
 			if (parts.length >= 2) {
@@ -593,20 +523,25 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 	}
 
 	getGitHubContextForSession(sessionResource: URI): IGitHubSessionContext | undefined {
+		// Try finding the ISessionData first (preferred path)
+		const sessionData = this.sessionsProvidersService.getSessions().find(s => s.resource.toString() === sessionResource.toString());
+		if (sessionData) {
+			return this.getGitHubContext(sessionData);
+		}
+
+		// Fallback: construct context directly from agent session metadata
 		const agentSession = this.agentSessionsService.model.getSession(sessionResource);
 		if (!agentSession) {
 			return undefined;
 		}
-		const [repository, worktree] = this.getRepositoryFromMetadata(agentSession);
-		return this.getGitHubContext({
-			resource: sessionResource,
-			isUntitled: false,
-			label: agentSession.label,
-			repository,
-			worktree,
-			worktreeBranchName: undefined,
-			providerType: agentSession.providerType,
-		});
+		const [repository] = this.getRepositoryFromMetadata(agentSession);
+		if (repository && repository.scheme === GITHUB_REMOTE_FILE_SCHEME) {
+			const parts = repository.path.split('/').filter(Boolean);
+			if (parts.length >= 2) {
+				return { owner: decodeURIComponent(parts[0]), repo: decodeURIComponent(parts[1]), prNumber: undefined };
+			}
+		}
+		return undefined;
 	}
 
 	resolveSessionFileUri(sessionResource: URI, relativePath: string): URI | undefined {
@@ -622,26 +557,14 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 		return URI.joinPath(baseUri, relativePath);
 	}
 
-	private _parsePRNumberFromSession(session: IActiveSessionItem): number | undefined {
-		const agentSession = this.agentSessionsService.model.getSession(session.resource);
-		const metadata = agentSession?.metadata;
-		if (!metadata) {
-			return undefined;
-		}
-
-		// Direct prNumber field
-		if (typeof metadata.pullRequestNumber === 'number') {
-			return metadata.pullRequestNumber as number;
-		}
-
-		// Parse from pullRequestUrl: https://github.com/{owner}/{repo}/pull/{number}
-		if (typeof metadata.pullRequestUrl === 'string') {
-			const match = /\/pull\/(\d+)/.exec(metadata.pullRequestUrl as string);
+	private _parsePRNumberFromSession(session: ISessionData): number | undefined {
+		const prUri = session.pullRequest.get()?.uri;
+		if (prUri) {
+			const match = /\/pull\/(\d+)/.exec(prUri.path);
 			if (match) {
 				return parseInt(match[1], 10);
 			}
 		}
-
 		return undefined;
 	}
 
@@ -663,6 +586,30 @@ export class SessionsManagementService extends Disposable implements ISessionsMa
 			this.storageService.store(LAST_SELECTED_SESSION_KEY, this.lastSelectedSession.toString(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		}
 	}
+
+	// -- Session Actions --
+
+	async archiveSession(session: ISessionData): Promise<void> {
+		await this.sessionsProvidersService.archiveSession(session.sessionId);
+	}
+
+	async unarchiveSession(session: ISessionData): Promise<void> {
+		await this.sessionsProvidersService.unarchiveSession(session.sessionId);
+	}
+
+	async deleteSession(session: ISessionData): Promise<void> {
+		// Clear the chat widget before removing from storage
+		await this.chatWidgetService.getWidgetBySessionResource(session.resource)?.clear();
+		await this.sessionsProvidersService.deleteSession(session.sessionId);
+	}
+
+	async renameSession(session: ISessionData, title: string): Promise<void> {
+		await this.sessionsProvidersService.renameSession(session.sessionId, title);
+	}
+
+	setRead(session: ISessionData, read: boolean): void {
+		this.sessionsProvidersService.setRead(session.sessionId, read);
+	}
 }
 
 //#endregion
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsProvider.ts b/src/vs/sessions/contrib/sessions/browser/sessionsProvider.ts
new file mode 100644
index 00000000000..6bbf24b9ad3
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/sessionsProvider.ts
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ISessionData, ISessionWorkspace } from '../common/sessionData.js';
+import { IChatRequestVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
+
+/**
+ * A platform-level session type identifying an agent backend.
+ * Lightweight label — says nothing about where it runs or how it's configured.
+ */
+export interface ISessionType {
+	/** Unique identifier (e.g., 'copilot-cli', 'copilot-cloud', 'claude-code'). */
+	readonly id: string;
+	/** Display label (e.g., 'Copilot CLI', 'Cloud'). */
+	readonly label: string;
+	/** Icon for this session type. */
+	readonly icon: ThemeIcon;
+}
+
+/**
+ * A browse action contributed by a sessions provider.
+ * Shown in the workspace picker (e.g., "Browse Folders...", "Browse Repositories...").
+ */
+export interface ISessionsBrowseAction {
+	/** Display label for the browse action. */
+	readonly label: string;
+	/** Icon for the browse action. */
+	readonly icon: ThemeIcon;
+	/** The provider that owns this action. */
+	readonly providerId: string;
+	/** Execute the browse action and return the selected workspace, or undefined if cancelled. */
+	execute(): Promise<ISessionWorkspace | undefined>;
+}
+
+/**
+ * Event fired when sessions change within a provider.
+ */
+export interface ISessionsChangeEvent {
+	readonly added: readonly ISessionData[];
+	readonly removed: readonly ISessionData[];
+	readonly changed: readonly ISessionData[];
+}
+
+/**
+ * Options for sending a request to a session.
+ */
+export interface ISendRequestOptions {
+	/** The query text to send. */
+	readonly query: string;
+	/** Optional attached context entries. */
+	readonly attachedContext?: IChatRequestVariableEntry[];
+}
+
+/**
+ * A sessions provider encapsulates a compute environment.
+ * It owns workspace discovery, session creation, session listing, and picker contributions.
+ *
+ * One provider can serve multiple session types. Multiple provider instances can
+ * serve the same session type (e.g., one per remote agent host).
+ */
+export interface ISessionsProvider {
+	/** Unique provider instance ID (e.g., 'default-copilot', 'agenthost-hostA'). */
+	readonly id: string;
+	/** Display label for this provider. */
+	readonly label: string;
+	/** Icon for this provider. */
+	readonly icon: ThemeIcon;
+	/** Session types this provider supports. */
+	readonly sessionTypes: readonly ISessionType[];
+
+	// -- Workspaces --
+
+	/** Browse actions shown in the workspace picker. */
+	readonly browseActions: readonly ISessionsBrowseAction[];
+	/** Resolve a repository URI to a session workspace with label and icon. */
+	resolveWorkspace(repositoryUri: URI): ISessionWorkspace;
+
+	// -- Sessions (existing) --
+
+	/** Returns all sessions owned by this provider. */
+	getSessions(): ISessionData[];
+	/** Fires when sessions are added, removed, or changed. */
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent>;
+
+	// -- Session Management --
+
+	/** Create a new session for the given workspace. */
+	createNewSession(workspace: ISessionWorkspace): ISessionData;
+	/** Update the session type for a session. */
+	setSessionType(sessionId: string, type: ISessionType): ISessionData;
+	/** Returns session types available for the given session. */
+	getSessionTypes(session: ISessionData): ISessionType[];
+	/** Rename a session. */
+	renameSession(sessionId: string, title: string): Promise<void>;
+	/** Set the model for a session. */
+	setModel(sessionId: string, modelId: string): void;
+	/** Archive a session. */
+	archiveSession(sessionId: string): Promise<void>;
+	/** Unarchive a session. */
+	unarchiveSession(sessionId: string): Promise<void>;
+	/** Delete a session. */
+	deleteSession(sessionId: string): Promise<void>;
+	/** Mark a session as read or unread. */
+	setRead(sessionId: string, read: boolean): void;
+
+	// -- Send --
+
+	/** Send the initial request for a new session. Returns the created session data. */
+	sendRequest(sessionId: string, options: ISendRequestOptions): Promise<ISessionData>;
+}
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsProvidersService.ts b/src/vs/sessions/contrib/sessions/browser/sessionsProvidersService.ts
new file mode 100644
index 00000000000..b76aa6b4f79
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/sessionsProvidersService.ts
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ISessionData, ISessionWorkspace } from '../common/sessionData.js';
+import { ISessionsChangeEvent, ISessionsProvider, ISessionType } from './sessionsProvider.js';
+import { URI } from '../../../../base/common/uri.js';
+
+export const ISessionsProvidersService = createDecorator<ISessionsProvidersService>('sessionsProvidersService');
+
+/**
+ * Central service that aggregates sessions across all registered providers.
+ * Owns the provider registry, unified session list, active session tracking,
+ * and routes session actions to the correct provider.
+ */
+export interface ISessionsProvidersService {
+	readonly _serviceBrand: undefined;
+
+	// -- Provider Registry --
+
+	/** Register a sessions provider. Returns a disposable to unregister. */
+	registerProvider(provider: ISessionsProvider): IDisposable;
+	/** Get all registered providers. */
+	getProviders(): ISessionsProvider[];
+	/** Fires when providers are added or removed. */
+	readonly onDidChangeProviders: Event<void>;
+
+	// -- Session Types --
+
+	/** Get available session types for a provider. */
+	getSessionTypesForProvider(providerId: string): ISessionType[];
+	/** Get available session types for a session from its provider. */
+	getSessionTypes(session: ISessionData): ISessionType[];
+
+	// -- Aggregated Sessions --
+
+	/** Get all sessions from all providers. */
+	getSessions(): ISessionData[];
+	/** Get a session by its globally unique ID. */
+	getSession(sessionId: string): ISessionData | undefined;
+	/** Fires when sessions change across any provider. */
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent>;
+
+	// -- Session Actions (routed to the correct provider via sessionId) --
+
+	/** Archive a session. */
+	archiveSession(sessionId: string): Promise<void>;
+	/** Unarchive a session. */
+	unarchiveSession(sessionId: string): Promise<void>;
+	/** Delete a session. */
+	deleteSession(sessionId: string): Promise<void>;
+	/** Rename a session. */
+	renameSession(sessionId: string, title: string): Promise<void>;
+	/** Mark a session as read or unread. */
+	setRead(sessionId: string, read: boolean): void;
+	/** Resolve a repository URI to a session workspace using the given provider. */
+	resolveWorkspace(providerId: string, repositoryUri: URI): ISessionWorkspace | undefined;
+}
+
+/**
+ * Separator used to construct globally unique session IDs: `${providerId}:${localId}`.
+ */
+const SESSION_ID_SEPARATOR = ':';
+
+export class SessionsProvidersService extends Disposable implements ISessionsProvidersService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _providers = new Map<string, { provider: ISessionsProvider; disposables: DisposableStore }>();
+
+	private readonly _onDidChangeProviders = this._register(new Emitter<void>());
+	readonly onDidChangeProviders: Event<void> = this._onDidChangeProviders.event;
+
+	private readonly _onDidChangeSessions = this._register(new Emitter<ISessionsChangeEvent>());
+	readonly onDidChangeSessions: Event<ISessionsChangeEvent> = this._onDidChangeSessions.event;
+
+	// -- Provider Registry --
+
+	registerProvider(provider: ISessionsProvider): IDisposable {
+		if (this._providers.has(provider.id)) {
+			throw new Error(`Sessions provider '${provider.id}' is already registered.`);
+		}
+
+		const disposables = new DisposableStore();
+
+		// Forward session change events from this provider
+		disposables.add(provider.onDidChangeSessions(e => {
+			this._onDidChangeSessions.fire(e);
+		}));
+
+		this._providers.set(provider.id, { provider, disposables });
+		this._onDidChangeProviders.fire();
+
+		return toDisposable(() => {
+			const entry = this._providers.get(provider.id);
+			if (entry) {
+				entry.disposables.dispose();
+				this._providers.delete(provider.id);
+				this._onDidChangeProviders.fire();
+			}
+		});
+	}
+
+	getProviders(): ISessionsProvider[] {
+		return Array.from(this._providers.values(), e => e.provider);
+	}
+
+	// -- Session Types --
+
+	getSessionTypesForProvider(providerId: string): ISessionType[] {
+		const entry = this._providers.get(providerId);
+		if (!entry) {
+			return [];
+		}
+		return [...entry.provider.sessionTypes];
+	}
+
+	getSessionTypes(session: ISessionData): ISessionType[] {
+		const entry = this._providers.get(session.providerId);
+		if (!entry) {
+			return [];
+		}
+		return entry.provider.getSessionTypes(session);
+	}
+
+	// -- Aggregated Sessions --
+
+	getSessions(): ISessionData[] {
+		const sessions: ISessionData[] = [];
+		for (const { provider } of this._providers.values()) {
+			sessions.push(...provider.getSessions());
+		}
+		return sessions;
+	}
+
+	getSession(sessionId: string): ISessionData | undefined {
+		const { provider } = this._resolveProvider(sessionId);
+		if (!provider) {
+			return undefined;
+		}
+		return provider.getSessions().find(s => s.sessionId === sessionId);
+	}
+
+	// -- Session Actions --
+
+	async archiveSession(sessionId: string): Promise<void> {
+		const { provider } = this._resolveProvider(sessionId);
+		if (provider) {
+			await provider.archiveSession(sessionId);
+		}
+	}
+
+	async unarchiveSession(sessionId: string): Promise<void> {
+		const { provider } = this._resolveProvider(sessionId);
+		if (provider) {
+			await provider.unarchiveSession(sessionId);
+		}
+	}
+
+	async deleteSession(sessionId: string): Promise<void> {
+		const { provider } = this._resolveProvider(sessionId);
+		if (provider) {
+			await provider.deleteSession(sessionId);
+		}
+	}
+
+	async renameSession(sessionId: string, title: string): Promise<void> {
+		const { provider } = this._resolveProvider(sessionId);
+		if (provider) {
+			await provider.renameSession(sessionId, title);
+		}
+	}
+
+	setRead(sessionId: string, read: boolean): void {
+		const { provider } = this._resolveProvider(sessionId);
+		if (provider) {
+			provider.setRead(sessionId, read);
+		}
+	}
+
+	resolveWorkspace(providerId: string, repositoryUri: URI): ISessionWorkspace | undefined {
+		const entry = this._providers.get(providerId);
+		return entry?.provider.resolveWorkspace(repositoryUri);
+	}
+
+	// -- Private Helpers --
+
+	/**
+	 * Extract provider ID from a globally unique session ID and look up the provider.
+	 */
+	private _resolveProvider(sessionId: string): { provider: ISessionsProvider | undefined; localId: string } {
+		const separatorIndex = sessionId.indexOf(SESSION_ID_SEPARATOR);
+		if (separatorIndex === -1) {
+			return { provider: undefined, localId: sessionId };
+		}
+		const providerId = sessionId.substring(0, separatorIndex);
+		const localId = sessionId.substring(separatorIndex + 1);
+		const entry = this._providers.get(providerId);
+		return { provider: entry?.provider, localId };
+	}
+}
+
+registerSingleton(ISessionsProvidersService, SessionsProvidersService, InstantiationType.Delayed);
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsTitleBarWidget.ts b/src/vs/sessions/contrib/sessions/browser/sessionsTitleBarWidget.ts
index 08ae2d0a1e0..78288c27897 100644
--- a/src/vs/sessions/contrib/sessions/browser/sessionsTitleBarWidget.ts
+++ b/src/vs/sessions/contrib/sessions/browser/sessionsTitleBarWidget.ts
@@ -19,8 +19,9 @@ import { IMenuService, MenuId, MenuRegistry, SubmenuItemAction } from '../../../
 import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ChatContextKeys } from '../../../../workbench/contrib/chat/common/actions/chatContextKeys.js';
-import { IMarshalledAgentSessionContext, getAgentChangesSummary, hasValidDiff } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { IMarshalledAgentSessionContext } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
 import { IChatSessionsService } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../workbench/services/layout/browser/layoutService.js';
 import { Menus } from '../../../browser/menus.js';
 import { IWorkbenchContribution } from '../../../../workbench/common/contributions.js';
 import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
@@ -32,11 +33,11 @@ import { AgentSessionsPicker } from '../../../../workbench/contrib/chat/browser/
 import { autorun } from '../../../../base/common/observable.js';
 import { IChatService } from '../../../../workbench/contrib/chat/common/chatService/chatService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderIcon } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { basename } from '../../../../base/common/resources.js';
 import { IsAuxiliaryWindowContext } from '../../../../workbench/common/contextkeys.js';
 import { SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
+import { ISessionsProvidersService } from './sessionsProvidersService.js';
+import { SessionStatus } from '../common/sessionData.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 /**
  * Sessions Title Bar Widget - renders the active chat session title
@@ -76,19 +77,33 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 		@IMenuService private readonly menuService: IMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 	) {
 		super(undefined, action, options);
 
-		// Re-render when the active session changes
+
+		// Re-render when the active session, its data, or the active provider changes
 		this._register(autorun(reader => {
-			const activeSession = this.activeSessionService.activeSession.read(reader);
-			this._trackModelTitleChanges(activeSession?.resource);
+			const sessionData = this.activeSessionService.activeSession.read(reader);
+			this._trackModelTitleChanges(sessionData?.resource);
+			if (sessionData) {
+				sessionData.title.read(reader);
+				sessionData.status.read(reader);
+			}
+			this.activeSessionService.activeProviderId.read(reader);
 			this._lastRenderState = undefined;
 			this._render();
 		}));
 
 		// Re-render when sessions data changes (e.g., changes info updated)
-		this._register(this.agentSessionsService.model.onDidChangeSessions(() => {
+		this._register(this.activeSessionService.onDidChangeSessions(() => {
+			this._lastRenderState = undefined;
+			this._render();
+		}));
+
+		// Re-render when providers change (affects provider picker visibility)
+		this._register(this.sessionsProvidersService.onDidChangeProviders(() => {
 			this._lastRenderState = undefined;
 			this._render();
 		}));
@@ -128,10 +143,9 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 			const label = this._getActiveSessionLabel();
 			const icon = this._getActiveSessionIcon();
 			const repoLabel = this._getRepositoryLabel();
-			const changesSummary = this._getChangesSummary();
-
+			const unreadCount = this._countUnreadSessions();
 			// Build a render-state key from all displayed data
-			const renderState = `${icon?.id ?? ''}|${label}|${repoLabel ?? ''}|${changesSummary?.insertions ?? ''}|${changesSummary?.deletions ?? ''}`;
+			const renderState = `${icon?.id ?? ''}|${label}|${repoLabel ?? ''}|${unreadCount}`;
 
 			// Skip re-render if state hasn't changed
 			if (this._lastRenderState === renderState) {
@@ -176,28 +190,9 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 				centerGroup.appendChild(repoEl);
 			}
 
-			// Changes summary shown next to the repo
-			if (changesSummary) {
-				const separator2 = $('span.agent-sessions-titlebar-separator');
-				separator2.textContent = '\u00B7';
-				centerGroup.appendChild(separator2);
-
-				const changesEl = $('span.agent-sessions-titlebar-changes');
-
-				const addedEl = $('span.agent-sessions-titlebar-changes-added');
-				addedEl.textContent = `+${changesSummary.insertions}`;
-				changesEl.appendChild(addedEl);
-
-				const removedEl = $('span.agent-sessions-titlebar-changes-removed');
-				removedEl.textContent = `-${changesSummary.deletions}`;
-				changesEl.appendChild(removedEl);
-
-				centerGroup.appendChild(changesEl);
-			}
-
 			sessionPill.appendChild(centerGroup);
 
-			// Click handler on pill - show sessions picker
+			// Click handler on pill
 			this._dynamicDisposables.add(addDisposableListener(sessionPill, EventType.MOUSE_DOWN, (e) => {
 				e.preventDefault();
 				e.stopPropagation();
@@ -215,6 +210,37 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 
 			this._container.appendChild(sessionPill);
 
+			// Session count widget (to the left of the pill) — toggles sidebar
+			const countWidget = $('button.agent-sessions-titlebar-count') as HTMLButtonElement;
+			countWidget.type = 'button';
+			countWidget.tabIndex = 0;
+			const countIcon = $(ThemeIcon.asCSSSelector(Codicon.tasklist));
+			countWidget.appendChild(countIcon);
+			if (unreadCount > 0) {
+				const countLabel = $('span.agent-sessions-titlebar-count-label');
+				countLabel.textContent = `${unreadCount}`;
+				countWidget.appendChild(countLabel);
+				countWidget.setAttribute('aria-label', localize('showSidebarUnread', "Show Side Bar, {0} unread session(s)", unreadCount));
+			} else {
+				countWidget.setAttribute('aria-label', localize('showSidebar', "Show Side Bar"));
+			}
+			// Hide when sidebar is visible (only shown when sidebar is hidden)
+			const updateVisibility = () => {
+				countWidget.style.display = this.layoutService.isVisible(Parts.SIDEBAR_PART) ? 'none' : '';
+			};
+			updateVisibility();
+			this._dynamicDisposables.add(this.layoutService.onDidChangePartVisibility(e => {
+				if (e.partId === Parts.SIDEBAR_PART) {
+					updateVisibility();
+				}
+			}));
+			this._dynamicDisposables.add(addDisposableListener(countWidget, EventType.CLICK, (e) => {
+				e.preventDefault();
+				e.stopPropagation();
+				this.layoutService.setPartHidden(false, Parts.SIDEBAR_PART);
+			}));
+			this._container.insertBefore(countWidget, sessionPill);
+
 			// Hover
 			this._dynamicDisposables.add(this.hoverService.setupManagedHover(
 				getDefaultHoverDelegate('mouse'),
@@ -263,49 +289,21 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 	 * Get the label of the active chat session.
 	 */
 	private _getActiveSessionLabel(): string {
-		const activeSession = this.activeSessionService.getActiveSession();
-		const label = activeSession?.label;
-		if (label) {
-			return label; // prefer session label to support renamed sessions
+		const sessionData = this.activeSessionService.activeSession.get();
+		if (sessionData) {
+			return sessionData.title.get() || localize('agentSessions.newSession', "New Session");
 		}
-
-		if (activeSession) {
-			const activeModel = this.chatService.getSession(activeSession.resource);
-			if (activeModel?.title) {
-				return activeModel.title; // fall back to chat model title if available
-			}
-		}
-
 		return localize('agentSessions.newSession', "New Session");
 	}
 
 	/**
-	 * Get the icon for the active session's kind/provider.
+	 * Get the icon for the active session's type.
 	 */
 	private _getActiveSessionIcon(): ThemeIcon | undefined {
-		const activeSession = this.activeSessionService.getActiveSession();
-		if (!activeSession) {
-			return undefined;
+		const sessionData = this.activeSessionService.activeSession.get();
+		if (sessionData) {
+			return sessionData.icon;
 		}
-
-		// Try to get icon from the agent session model (has provider-resolved icon)
-		const agentSession = this.agentSessionsService.getSession(activeSession.resource);
-		if (agentSession) {
-			// For background sessions, distinguish worktree vs folder based on metadata
-			if (agentSession.providerType === AgentSessionProviders.Background) {
-				const hasWorktree = typeof agentSession.metadata?.worktreePath === 'string';
-				return hasWorktree ? Codicon.worktree : Codicon.folder;
-			}
-
-			return agentSession.icon;
-		}
-
-		// Fall back to provider icon from the resource
-		const provider = getAgentSessionProvider(activeSession.resource);
-		if (provider !== undefined) {
-			return getAgentSessionProviderIcon(provider);
-		}
-
 		return undefined;
 	}
 
@@ -313,26 +311,33 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 	 * Get the repository label for the active session.
 	 */
 	private _getRepositoryLabel(): string | undefined {
-		const activeSession = this.activeSessionService.getActiveSession();
-		if (!activeSession) {
-			return undefined;
+		const sessionData = this.activeSessionService.activeSession.get();
+		if (sessionData) {
+			const workspace = sessionData.workspace.get();
+			if (workspace) {
+				return workspace.label;
+			}
 		}
+		return undefined;
+	}
 
-		const uri = activeSession.repository;
-		if (!uri) {
-			return undefined;
+	private _countUnreadSessions(): number {
+		let unread = 0;
+		for (const session of this.activeSessionService.getSessions()) {
+			if (!session.isArchived.get() && session.status.get() === SessionStatus.Completed && !session.isRead.get()) {
+				unread++;
+			}
 		}
-
-		return basename(uri);
+		return unread;
 	}
 
 	private _showContextMenu(e: MouseEvent): void {
-		const activeSession = this.activeSessionService.getActiveSession();
-		if (!activeSession) {
+		const sessionData = this.activeSessionService.activeSession.get();
+		if (!sessionData) {
 			return;
 		}
 
-		const agentSession = this.agentSessionsService.getSession(activeSession.resource);
+		const agentSession = this.agentSessionsService.getSession(sessionData.resource);
 		if (!agentSession) {
 			return;
 		}
@@ -341,6 +346,7 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 
 		const contextOverlay: Array<[string, boolean | string]> = [
 			[ChatContextKeys.isArchivedAgentSession.key, agentSession.isArchived()],
+			[ChatContextKeys.isPinnedAgentSession.key, agentSession.isPinned()],
 			[ChatContextKeys.isReadAgentSession.key, agentSession.isRead()],
 			[ChatContextKeys.agentSessionType.key, agentSession.providerType],
 		];
@@ -362,27 +368,9 @@ export class SessionsTitleBarWidget extends BaseActionViewItem {
 		menu.dispose();
 	}
 
-	/**
-	 * Get the changes summary for the active session.
-	 */
-	private _getChangesSummary(): { insertions: number; deletions: number } | undefined {
-		const activeSession = this.activeSessionService.getActiveSession();
-		if (!activeSession) {
-			return undefined;
-		}
-
-		const agentSession = this.agentSessionsService.getSession(activeSession.resource);
-		const changes = agentSession?.changes;
-		if (!changes || !hasValidDiff(changes)) {
-			return undefined;
-		}
-
-		return getAgentChangesSummary(changes);
-	}
-
 	private _showSessionsPicker(): void {
 		const picker = this.instantiationService.createInstance(AgentSessionsPicker, undefined, {
-			overrideSessionOpen: (session, openOptions) => this.activeSessionService.openSession(session.resource, openOptions)
+			overrideSessionOpen: (session, openOptions) => this.activeSessionService.openSession(session.resource)
 		});
 		picker.pickAgentSession();
 	}
diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsViewPane.ts b/src/vs/sessions/contrib/sessions/browser/sessionsViewPane.ts
deleted file mode 100644
index cb9a8794025..00000000000
--- a/src/vs/sessions/contrib/sessions/browser/sessionsViewPane.ts
+++ /dev/null
@@ -1,373 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import './media/sessionsViewPane.css';
-import * as DOM from '../../../../base/browser/dom.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
-import { autorun } from '../../../../base/common/observable.js';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { EditorsVisibleContext } from '../../../../workbench/common/contextkeys.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { IViewPaneOptions, IViewPaneLocationColors, ViewPane } from '../../../../workbench/browser/parts/views/viewPane.js';
-import { IViewDescriptorService, ViewContainerLocation } from '../../../../workbench/common/views.js';
-import { sessionsSidebarBackground } from '../../../common/theme.js';
-import { SessionsCategories } from '../../../common/categories.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { AgentSessionsControl } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsControl.js';
-import { AgentSessionsFilter, AgentSessionsGrouping } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.js';
-import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { ISessionsManagementService, IsNewChatSessionContext } from './sessionsManagementService.js';
-import { Action2, ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { IWorkbenchLayoutService } from '../../../../workbench/services/layout/browser/layoutService.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
-import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ACTION_ID_NEW_CHAT } from '../../../../workbench/contrib/chat/browser/actions/chatActions.js';
-import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
-import { AICustomizationShortcutsWidget } from './aiCustomizationShortcutsWidget.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { IHostService } from '../../../../workbench/services/host/browser/host.js';
-
-const $ = DOM.$;
-export const SessionsViewId = 'agentic.workbench.view.sessionsView';
-const SessionsViewFilterSubMenu = new MenuId('AgentSessionsViewFilterSubMenu');
-const IsGroupedByRepositoryContext = new RawContextKey<boolean>('sessionsView.isGroupedByRepository', false);
-const GROUPING_STORAGE_KEY = 'agentSessions.grouping';
-
-export class AgenticSessionsViewPane extends ViewPane {
-
-	private viewPaneContainer: HTMLElement | undefined;
-	private sessionsControlContainer: HTMLElement | undefined;
-	sessionsControl: AgentSessionsControl | undefined;
-	private currentGrouping: AgentSessionsGrouping = AgentSessionsGrouping.Date;
-	private isGroupedByRepoKey: ReturnType<typeof IsGroupedByRepositoryContext.bindTo> | undefined;
-
-	constructor(
-		options: IViewPaneOptions,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IOpenerService openerService: IOpenerService,
-		@IThemeService themeService: IThemeService,
-		@IHoverService hoverService: IHoverService,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@ISessionsManagementService private readonly activeSessionService: ISessionsManagementService,
-		@IHostService private readonly hostService: IHostService,
-		@IStorageService private readonly storageService: IStorageService,
-	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
-
-		// Restore persisted grouping
-		const stored = this.storageService.get(GROUPING_STORAGE_KEY, StorageScope.PROFILE);
-		if (stored && Object.values(AgentSessionsGrouping).includes(stored as AgentSessionsGrouping)) {
-			this.currentGrouping = stored as AgentSessionsGrouping;
-		}
-	}
-
-	protected override renderBody(parent: HTMLElement): void {
-		super.renderBody(parent);
-
-		this.viewPaneContainer = parent;
-		this.viewPaneContainer.classList.add('agent-sessions-viewpane');
-
-		this.createControls(parent);
-	}
-
-	protected override getLocationBasedColors(): IViewPaneLocationColors {
-		const colors = super.getLocationBasedColors();
-		return {
-			...colors,
-			background: sessionsSidebarBackground,
-			listOverrideStyles: {
-				...colors.listOverrideStyles,
-				listBackground: sessionsSidebarBackground,
-			}
-		};
-	}
-
-	private createControls(parent: HTMLElement): void {
-		const sessionsContainer = DOM.append(parent, $('.agent-sessions-container'));
-
-		// Track grouping state via context key for the toggle button
-		const isGroupedByRepoKey = this.isGroupedByRepoKey = IsGroupedByRepositoryContext.bindTo(this.contextKeyService);
-		isGroupedByRepoKey.set(this.currentGrouping === AgentSessionsGrouping.Repository);
-
-		// Sessions Filter (actions go to view title bar via menu registration)
-		const sessionsFilter = this._register(this.instantiationService.createInstance(AgentSessionsFilter, {
-			filterMenuId: SessionsViewFilterSubMenu,
-			groupResults: () => this.currentGrouping,
-			allowedProviders: [AgentSessionProviders.Background, AgentSessionProviders.Cloud],
-			providerLabelOverrides: new Map([
-				[AgentSessionProviders.Background, localize('chat.session.providerLabel.local', "Local")],
-			]),
-		}));
-
-		// Sessions section (top, fills available space)
-		const sessionsSection = DOM.append(sessionsContainer, $('.agent-sessions-section'));
-
-		// Sessions content container
-		const sessionsContent = DOM.append(sessionsSection, $('.agent-sessions-content'));
-
-		// New Session Button
-		const newSessionButtonContainer = DOM.append(sessionsContent, $('.agent-sessions-new-button-container'));
-		const newSessionButton = this._register(new Button(newSessionButtonContainer, { ...defaultButtonStyles, secondary: true }));
-		newSessionButton.label = localize('newSession', "New Session");
-		this._register(newSessionButton.onDidClick(() => this.activeSessionService.openNewSessionView()));
-
-		// Keybinding hint inside the button
-		const keybinding = this.keybindingService.lookupKeybinding(ACTION_ID_NEW_CHAT);
-		if (keybinding) {
-			const keybindingHint = DOM.append(newSessionButton.element, $('span.new-session-keybinding-hint'));
-			keybindingHint.textContent = keybinding.getLabel() ?? '';
-		}
-
-		// Sessions Control
-		this.sessionsControlContainer = DOM.append(sessionsContent, $('.agent-sessions-control-container'));
-		const sessionsControl = this.sessionsControl = this._register(this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, {
-			source: 'agentSessionsViewPane',
-			filter: sessionsFilter,
-			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
-			disableHover: true,
-			showIsolationIcon: true,
-			enableApprovalRow: true,
-			getHoverPosition: () => this.getSessionHoverPosition(),
-			trackActiveEditorSession: () => true,
-			collapseOlderSections: () => true,
-			overrideSessionOpen: (resource, openOptions) => this.activeSessionService.openSession(resource, openOptions),
-		}));
-		this._register(this.onDidChangeBodyVisibility(visible => sessionsControl.setVisible(visible)));
-
-		// Refresh sessions when window gets focus to compensate for missing events
-		this._register(this.hostService.onDidChangeFocus(hasFocus => {
-			if (hasFocus) {
-				sessionsControl.refresh();
-			}
-		}));
-
-		// Listen to tree updates and restore selection if nothing is selected
-		this._register(sessionsControl.onDidUpdate(() => {
-			if (!sessionsControl.hasFocusOrSelection()) {
-				this.restoreLastSelectedSession();
-			}
-		}));
-
-		// When the active session changes, select it in the tree
-		this._register(autorun(reader => {
-			const activeSession = this.activeSessionService.activeSession.read(reader);
-			if (activeSession) {
-				if (!sessionsControl.reveal(activeSession.resource)) {
-					sessionsControl.clearFocus();
-				}
-			} else {
-				sessionsControl.clearFocus(); // clear selection when a new session is created
-			}
-		}));
-
-		// AI Customization toolbar (bottom, fixed height)
-		this._register(this.instantiationService.createInstance(AICustomizationShortcutsWidget, sessionsContainer, {
-			onDidToggleCollapse: () => {
-				if (this.viewPaneContainer) {
-					const { offsetHeight, offsetWidth } = this.viewPaneContainer;
-					this.layoutBody(offsetHeight, offsetWidth);
-				}
-			},
-		}));
-	}
-
-	private restoreLastSelectedSession(): void {
-		const activeSession = this.activeSessionService.getActiveSession();
-		if (activeSession && this.sessionsControl) {
-			this.sessionsControl.reveal(activeSession.resource);
-		}
-	}
-
-	private getSessionHoverPosition(): HoverPosition {
-		const viewLocation = this.viewDescriptorService.getViewLocationById(this.id);
-		const sideBarPosition = this.layoutService.getSideBarPosition();
-
-		return {
-			[ViewContainerLocation.Sidebar]: sideBarPosition === 0 ? HoverPosition.RIGHT : HoverPosition.LEFT,
-			[ViewContainerLocation.AuxiliaryBar]: sideBarPosition === 0 ? HoverPosition.LEFT : HoverPosition.RIGHT,
-			[ViewContainerLocation.ChatBar]: HoverPosition.RIGHT,
-			[ViewContainerLocation.Panel]: HoverPosition.ABOVE
-		}[viewLocation ?? ViewContainerLocation.AuxiliaryBar];
-	}
-
-	protected override layoutBody(height: number, width: number): void {
-		super.layoutBody(height, width);
-
-		if (!this.sessionsControl || !this.sessionsControlContainer) {
-			return;
-		}
-
-		this.sessionsControl.layout(this.sessionsControlContainer.offsetHeight, width);
-	}
-
-	override focus(): void {
-		super.focus();
-
-		this.sessionsControl?.focus();
-	}
-
-	refresh(): void {
-		this.sessionsControl?.refresh();
-	}
-
-	openFind(): void {
-		this.sessionsControl?.openFind();
-	}
-
-	toggleGroupByRepository(): void {
-		if (this.currentGrouping === AgentSessionsGrouping.Repository) {
-			this.currentGrouping = AgentSessionsGrouping.Date;
-		} else {
-			this.currentGrouping = AgentSessionsGrouping.Repository;
-		}
-
-		this.storageService.store(GROUPING_STORAGE_KEY, this.currentGrouping, StorageScope.PROFILE, StorageTarget.USER);
-		this.isGroupedByRepoKey?.set(this.currentGrouping === AgentSessionsGrouping.Repository);
-		this.sessionsControl?.update();
-	}
-}
-
-// Register Cmd+N / Ctrl+N keybinding for new session in the agent sessions window
-KeybindingsRegistry.registerKeybindingRule({
-	id: ACTION_ID_NEW_CHAT,
-	weight: KeybindingWeight.WorkbenchContrib + 1,
-	primary: KeyMod.CtrlCmd | KeyCode.KeyN,
-});
-
-const CLOSE_SESSION_COMMAND_ID = 'agentSession.close';
-registerAction2(class CloseSessionAction extends Action2 {
-	constructor() {
-		super({
-			id: CLOSE_SESSION_COMMAND_ID,
-			title: localize2('closeSession', "Close Session"),
-			f1: true,
-			precondition: ContextKeyExpr.and(IsNewChatSessionContext.negate(), EditorsVisibleContext.negate()),
-			category: SessionsCategories.Sessions,
-		});
-	}
-	override async run(accessor: ServicesAccessor) {
-		const sessionsService = accessor.get(ISessionsManagementService);
-		await sessionsService.openNewSessionView();
-	}
-});
-
-// Register Cmd+W / Ctrl+W to close the current session and navigate to the new-session view,
-// mirroring how Cmd+W closes the active editor in the normal workbench.
-KeybindingsRegistry.registerKeybindingRule({
-	id: CLOSE_SESSION_COMMAND_ID,
-	weight: KeybindingWeight.WorkbenchContrib + 1,
-	when: ContextKeyExpr.and(IsNewChatSessionContext.negate(), EditorsVisibleContext.negate()),
-	primary: KeyMod.CtrlCmd | KeyCode.KeyW,
-	win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KeyW] },
-});
-
-MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-	submenu: SessionsViewFilterSubMenu,
-	title: localize2('filterAgentSessions', "Filter Sessions"),
-	group: 'navigation',
-	order: 3,
-	icon: Codicon.filter,
-	when: ContextKeyExpr.equals('view', SessionsViewId)
-} satisfies ISubmenuItem);
-
-registerAction2(class GroupByRepositoryAction extends Action2 {
-	constructor() {
-		super({
-			id: 'sessionsView.groupByRepository',
-			title: localize2('groupByRepository', "Group by Repository"),
-			icon: Codicon.repo,
-			category: SessionsCategories.Sessions,
-			menu: [{
-				id: MenuId.ViewTitle,
-				group: 'navigation',
-				order: 1,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('view', SessionsViewId), IsGroupedByRepositoryContext.negate()),
-			}]
-		});
-	}
-
-	override run(accessor: ServicesAccessor) {
-		const viewsService = accessor.get(IViewsService);
-		const view = viewsService.getViewWithId<AgenticSessionsViewPane>(SessionsViewId);
-		view?.toggleGroupByRepository();
-	}
-});
-
-registerAction2(class GroupByDateAction extends Action2 {
-	constructor() {
-		super({
-			id: 'sessionsView.groupByDate',
-			title: localize2('groupByDate', "Group by Date"),
-			icon: Codicon.history,
-			category: SessionsCategories.Sessions,
-			menu: [{
-				id: MenuId.ViewTitle,
-				group: 'navigation',
-				order: 1,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('view', SessionsViewId), IsGroupedByRepositoryContext),
-			}]
-		});
-	}
-
-	override run(accessor: ServicesAccessor) {
-		const viewsService = accessor.get(IViewsService);
-		const view = viewsService.getViewWithId<AgenticSessionsViewPane>(SessionsViewId);
-		view?.toggleGroupByRepository();
-	}
-});
-
-registerAction2(class RefreshAgentSessionsViewerAction extends Action2 {
-	constructor() {
-		super({
-			id: 'sessionsView.refresh',
-			title: localize2('refresh', "Refresh Sessions"),
-			icon: Codicon.refresh,
-			f1: true,
-			category: SessionsCategories.Sessions,
-		});
-	}
-	override run(accessor: ServicesAccessor) {
-		const viewsService = accessor.get(IViewsService);
-		const view = viewsService.getViewWithId<AgenticSessionsViewPane>(SessionsViewId);
-		return view?.sessionsControl?.refresh();
-	}
-});
-
-registerAction2(class FindAgentSessionInViewerAction extends Action2 {
-
-	constructor() {
-		super({
-			id: 'sessionsView.find',
-			title: localize2('find', "Find Session"),
-			icon: Codicon.search,
-			menu: [{
-				id: MenuId.ViewTitle,
-				group: 'navigation',
-				order: 2,
-				when: ContextKeyExpr.equals('view', SessionsViewId),
-			}]
-		});
-	}
-
-	override run(accessor: ServicesAccessor) {
-		const viewsService = accessor.get(IViewsService);
-		const view = viewsService.getViewWithId<AgenticSessionsViewPane>(SessionsViewId);
-		return view?.sessionsControl?.openFind();
-	}
-});
diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
new file mode 100644
index 00000000000..b4c5b190064
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
@@ -0,0 +1,1233 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import '../media/sessionsList.css';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { IListStyles } from '../../../../../base/browser/ui/list/listWidget.js';
+import { IObjectTreeElement, ITreeNode, ITreeRenderer, ITreeContextMenuEvent, ObjectTreeElementCollapseState } from '../../../../../base/browser/ui/tree/tree.js';
+import { RenderIndentGuides, TreeFindMode } from '../../../../../base/browser/ui/tree/abstractTree.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { autorun } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { fromNow } from '../../../../../base/common/date.js';
+import { localize } from '../../../../../nls.js';
+import { MenuId, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js';
+import { IStyleOverride, defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { asCssVariable } from '../../../../../platform/theme/common/colorUtils.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { GITHUB_REMOTE_FILE_SCHEME, ISessionData, ISessionWorkspace, SessionStatus } from '../../common/sessionData.js';
+import { ISessionsProvidersService } from '../sessionsProvidersService.js';
+import { AgentSessionApprovalModel } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessionApprovalModel.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import { Separator } from '../../../../../base/common/actions.js';
+import { AgentSessionProviders } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
+
+const $ = DOM.$;
+
+export const SessionItemToolbarMenuId = new MenuId('SessionItemToolbar');
+export const SessionItemContextMenuId = new MenuId('SessionItemContextMenu');
+export const SessionSectionToolbarMenuId = new MenuId('SessionSectionToolbar');
+export const IsSessionPinnedContext = new RawContextKey<boolean>('sessionItem.isPinned', false);
+export const IsSessionArchivedContext = new RawContextKey<boolean>('sessionItem.isArchived', false);
+export const IsSessionReadContext = new RawContextKey<boolean>('sessionItem.isRead', true);
+export const SessionSectionTypeContext = new RawContextKey<string>('sessionSection.type', '');
+
+//#region Types
+
+export enum SessionsGrouping {
+	Workspace = 'workspace',
+	Date = 'date',
+}
+
+export enum SessionsSorting {
+	Created = 'created',
+	Updated = 'updated',
+}
+
+export interface ISessionSection {
+	readonly id: string;
+	readonly label: string;
+	readonly sessions: ISessionData[];
+}
+
+export interface ISessionShowMore {
+	readonly showMore: true;
+	readonly sectionLabel: string;
+	readonly remainingCount: number;
+}
+
+export type SessionListItem = ISessionData | ISessionSection | ISessionShowMore;
+
+function isSessionSection(item: SessionListItem): item is ISessionSection {
+	return 'sessions' in item && Array.isArray((item as ISessionSection).sessions);
+}
+
+function isSessionShowMore(item: SessionListItem): item is ISessionShowMore {
+	return 'showMore' in item && (item as ISessionShowMore).showMore === true;
+}
+
+//#endregion
+
+//#region Tree Delegate
+
+class SessionsTreeDelegate implements IListVirtualDelegate<SessionListItem> {
+	private static readonly ITEM_HEIGHT = 54;
+	private static readonly SECTION_HEIGHT = 26;
+	private static readonly SHOW_MORE_HEIGHT = 26;
+
+	constructor(private readonly _approvalModel?: AgentSessionApprovalModel) { }
+
+	getHeight(element: SessionListItem): number {
+		if (isSessionSection(element)) {
+			return SessionsTreeDelegate.SECTION_HEIGHT;
+		}
+		if (isSessionShowMore(element)) {
+			return SessionsTreeDelegate.SHOW_MORE_HEIGHT;
+		}
+
+		let height = SessionsTreeDelegate.ITEM_HEIGHT;
+		if (this._approvalModel) {
+			const approval = this._approvalModel.getApproval(element.resource).get();
+			if (approval) {
+				height += SessionItemRenderer.getApprovalRowHeight(approval.label);
+			}
+		}
+		return height;
+	}
+
+	hasDynamicHeight(element: SessionListItem): boolean {
+		return !!this._approvalModel && !isSessionSection(element) && !isSessionShowMore(element);
+	}
+
+	getTemplateId(element: SessionListItem): string {
+		if (isSessionSection(element)) {
+			return SessionSectionRenderer.TEMPLATE_ID;
+		}
+		if (isSessionShowMore(element)) {
+			return SessionShowMoreRenderer.TEMPLATE_ID;
+		}
+		return SessionItemRenderer.TEMPLATE_ID;
+	}
+}
+
+//#endregion
+
+//#region Session Item Renderer
+
+interface ISessionItemTemplate {
+	readonly container: HTMLElement;
+	readonly iconContainer: HTMLElement;
+	readonly title: HTMLElement;
+	readonly pinnedIndicator: HTMLElement;
+	readonly titleToolbar: MenuWorkbenchToolBar;
+	readonly detailsRow: HTMLElement;
+	readonly approvalRow: HTMLElement;
+	readonly approvalLabel: HTMLElement;
+	readonly approvalButtonContainer: HTMLElement;
+	readonly contextKeyService: IContextKeyService;
+	readonly disposables: DisposableStore;
+	readonly elementDisposables: DisposableStore;
+}
+
+class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore, ISessionItemTemplate> {
+	static readonly TEMPLATE_ID = 'session-item';
+	readonly templateId = SessionItemRenderer.TEMPLATE_ID;
+
+	private static readonly APPROVAL_ROW_MAX_LINES = 3;
+	private static readonly _APPROVAL_ROW_LINE_HEIGHT = 18;
+	private static readonly _APPROVAL_ROW_OVERHEAD = 14;
+
+	static getApprovalRowHeight(label: string): number {
+		const lineCount = Math.min(label.split(/\\r?\\n/).length, SessionItemRenderer.APPROVAL_ROW_MAX_LINES);
+		return lineCount * SessionItemRenderer._APPROVAL_ROW_LINE_HEIGHT + SessionItemRenderer._APPROVAL_ROW_OVERHEAD;
+	}
+
+	private readonly _onDidChangeItemHeight = new Emitter<ISessionData>();
+	readonly onDidChangeItemHeight: Event<ISessionData> = this._onDidChangeItemHeight.event;
+
+	constructor(
+		private readonly options: { grouping: () => SessionsGrouping; sorting: () => SessionsSorting; isPinned: (session: ISessionData) => boolean },
+		private readonly approvalModel: AgentSessionApprovalModel | undefined,
+		private readonly instantiationService: IInstantiationService,
+		private readonly contextKeyService: IContextKeyService,
+		private readonly markdownRendererService: IMarkdownRendererService,
+	) { }
+
+	renderTemplate(container: HTMLElement): ISessionItemTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+
+		container.classList.add('session-item');
+
+		const iconContainer = DOM.append(container, $('.session-icon'));
+		const mainCol = DOM.append(container, $('.session-main'));
+		const titleRow = DOM.append(mainCol, $('.session-title-row'));
+		const title = DOM.append(titleRow, $('.session-title'));
+		const pinnedIndicator = DOM.append(titleRow, $('.session-pinned-indicator'));
+		const titleToolbarContainer = DOM.append(titleRow, $('.session-title-toolbar'));
+		const detailsRow = DOM.append(mainCol, $('.session-details-row'));
+
+		// Approval row
+		const approvalRow = DOM.append(mainCol, $('.session-approval-row'));
+		const approvalLabel = DOM.append(approvalRow, $('span.session-approval-label'));
+		const approvalButtonContainer = DOM.append(approvalRow, $('.session-approval-button'));
+
+		const contextKeyService = disposables.add(this.contextKeyService.createScoped(container));
+		const scopedInstantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+		const titleToolbar = disposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, titleToolbarContainer, SessionItemToolbarMenuId, {
+			menuOptions: { shouldForwardArgs: true },
+		}));
+
+		return { container, iconContainer, title, pinnedIndicator, titleToolbar, detailsRow, approvalRow, approvalLabel, approvalButtonContainer, contextKeyService, disposables, elementDisposables };
+	}
+
+	renderElement(node: ITreeNode<SessionListItem, FuzzyScore>, _index: number, template: ISessionItemTemplate): void {
+		const element = node.element;
+		if (isSessionSection(element) || isSessionShowMore(element)) {
+			return;
+		}
+		this.renderSession(element, template);
+	}
+
+	private renderSession(element: ISessionData, template: ISessionItemTemplate): void {
+		template.elementDisposables.clear();
+
+		// Toolbar context
+		template.titleToolbar.context = element;
+
+		// Context key: isPinned
+		const isPinned = this.options.isPinned(element);
+		IsSessionPinnedContext.bindTo(template.contextKeyService).set(isPinned);
+		IsSessionArchivedContext.bindTo(template.contextKeyService).set(element.isArchived.get());
+
+		// Pinned indicator — inline pin icon, hidden on hover when toolbar shows
+		template.pinnedIndicator.className = 'session-pinned-indicator ' + ThemeIcon.asClassName(Codicon.pinned);
+		template.pinnedIndicator.classList.toggle('visible', isPinned);
+		IsSessionReadContext.bindTo(template.contextKeyService).set(element.isRead.get());
+
+		// Archived styling — reactive
+		template.elementDisposables.add(autorun(reader => {
+			template.container.classList.toggle('archived', element.isArchived.read(reader));
+		}));
+
+
+		// Icon — reactive based on status, read state, and PR
+		template.elementDisposables.add(autorun(reader => {
+			const sessionStatus = element.status.read(reader);
+			const isRead = element.isRead.read(reader);
+			const isArchived = element.isArchived.read(reader);
+			const pullRequest = element.pullRequest.read(reader);
+			DOM.clearNode(template.iconContainer);
+			const hasPrIcon = !!pullRequest;
+			const icon = pullRequest?.icon ? pullRequest.icon : this.getStatusIcon(sessionStatus, isRead, isArchived);
+			const iconSpan = DOM.append(template.iconContainer, $(`span${ThemeIcon.asCSSSelector(icon)}`));
+			iconSpan.style.color = icon.color ? asCssVariable(icon.color.id) : '';
+			template.iconContainer.classList.toggle('session-icon-pulse', !hasPrIcon && sessionStatus === SessionStatus.NeedsInput);
+			template.iconContainer.classList.toggle('session-icon-active', !hasPrIcon && sessionStatus === SessionStatus.InProgress);
+			template.iconContainer.classList.toggle('session-icon-error', !hasPrIcon && sessionStatus === SessionStatus.Error);
+			template.iconContainer.classList.toggle('session-icon-unread', !hasPrIcon && !isRead && !isArchived && sessionStatus !== SessionStatus.InProgress && sessionStatus !== SessionStatus.NeedsInput && sessionStatus !== SessionStatus.Error);
+		}));
+
+		// Title — reactive
+		template.elementDisposables.add(autorun(reader => {
+			const titleText = element.title.read(reader);
+			template.title.textContent = titleText;
+		}));
+
+		// Details row — reactive: badge · diff stats · time
+		const timeDisposable = template.elementDisposables.add(new MutableDisposable());
+		template.elementDisposables.add(autorun(reader => {
+			const sessionStatus = element.status.read(reader);
+			const changes = element.changes.read(reader);
+			const workspace = element.workspace.read(reader);
+			const description = element.description.read(reader);
+			const timeDate = this.options.sorting() === SessionsSorting.Updated ? element.updatedAt.read(reader) : element.createdAt;
+
+			// Clear and rebuild details row
+			DOM.clearNode(template.detailsRow);
+			const parts: HTMLElement[] = [];
+
+			// Session type icon in details row
+			// Disabling background icon - hacky but couldn't figure out how to do it from the new provider
+			if (element.sessionType !== AgentSessionProviders.Background) {
+				const typeIconEl = DOM.append(template.detailsRow, $('span.session-details-icon'));
+				DOM.append(typeIconEl, $(`span${ThemeIcon.asCSSSelector(element.icon)}`));
+				parts.push(typeIconEl);
+			}
+
+			// Workspace badge — show when not grouped by workspace,
+			// or when the session is pinned/archived (their section headers
+			// don't carry the workspace name)
+			if (workspace && (
+				this.options.grouping() !== SessionsGrouping.Workspace ||
+				this.options.isPinned(element) ||
+				element.isArchived.read(reader)
+			)) {
+				const badgeLabel = this.getWorkspaceBadgeLabel(workspace);
+				if (badgeLabel) {
+					const badgeEl = DOM.append(template.detailsRow, $('span.session-badge'));
+					badgeEl.textContent = badgeLabel;
+					parts.push(badgeEl);
+				}
+			}
+
+			// Diff stats
+			if (changes.length > 0 && sessionStatus !== SessionStatus.InProgress) {
+				let insertions = 0;
+				let deletions = 0;
+				for (const change of changes) {
+					insertions += change.insertions;
+					deletions += change.deletions;
+				}
+				if (insertions > 0 || deletions > 0) {
+					if (parts.length > 0) {
+						DOM.append(template.detailsRow, $('span.session-separator.has-separator'));
+					}
+					const diffEl = DOM.append(template.detailsRow, $('span.session-diff'));
+					DOM.append(diffEl, $('span.session-diff-added')).textContent = `+${insertions}`;
+					DOM.append(diffEl, $('span')).textContent = ' ';
+					DOM.append(diffEl, $('span.session-diff-removed')).textContent = `-${deletions}`;
+					parts.push(diffEl);
+				}
+			}
+
+			// Status description
+			if (sessionStatus === SessionStatus.InProgress) {
+				if (parts.length > 0) {
+					DOM.append(template.detailsRow, $('span.session-separator.has-separator'));
+				}
+				const statusEl = DOM.append(template.detailsRow, $('span.session-description'));
+				statusEl.textContent = description ?? localize('working', "Working...");
+				parts.push(statusEl);
+			} else if (sessionStatus === SessionStatus.NeedsInput) {
+				if (parts.length > 0) {
+					DOM.append(template.detailsRow, $('span.session-separator.has-separator'));
+				}
+				const statusEl = DOM.append(template.detailsRow, $('span.session-description'));
+				statusEl.textContent = description ?? localize('needsInput', "Input needed");
+				parts.push(statusEl);
+			} else if (sessionStatus === SessionStatus.Error) {
+				if (parts.length > 0) {
+					DOM.append(template.detailsRow, $('span.session-separator.has-separator'));
+				}
+				const statusEl = DOM.append(template.detailsRow, $('span.session-description'));
+				statusEl.textContent = localize('failed', "Failed");
+				parts.push(statusEl);
+			}
+
+			// Timestamp — always visible
+			if (parts.length > 0) {
+				DOM.append(template.detailsRow, $('span.session-separator.has-separator'));
+			}
+			const timeEl = DOM.append(template.detailsRow, $('span.session-time'));
+			const formatTime = () => {
+				const seconds = Math.round((Date.now() - timeDate.getTime()) / 1000);
+				return seconds < 60 ? localize('secondsDuration', "now") : fromNow(timeDate, true);
+			};
+			timeEl.textContent = formatTime();
+			const targetWindow = DOM.getWindow(timeEl);
+			const interval = targetWindow.setInterval(() => {
+				timeEl.textContent = formatTime();
+			}, 60_000);
+			timeDisposable.value = toDisposable(() => targetWindow.clearInterval(interval));
+		}));
+
+		// Approval row — reactive
+		if (this.approvalModel) {
+			this.renderApprovalRow(element, template);
+		}
+	}
+
+	private renderApprovalRow(element: ISessionData, template: ISessionItemTemplate): void {
+		if (!this.approvalModel) {
+			return;
+		}
+
+		const approvalModel = this.approvalModel;
+		const initialInfo = approvalModel.getApproval(element.resource).get();
+		let wasVisible = !!initialInfo;
+		template.approvalRow.classList.toggle('visible', wasVisible);
+
+		const buttonStore = template.elementDisposables.add(new DisposableStore());
+
+		template.elementDisposables.add(autorun(reader => {
+			buttonStore.clear();
+
+			const info = approvalModel.getApproval(element.resource).read(reader);
+			const visible = !!info;
+
+			template.approvalRow.classList.toggle('visible', visible);
+
+			if (info) {
+				// Render up to 3 lines as separate code blocks
+				const lines = info.label.split('\n');
+				const maxLines = SessionItemRenderer.APPROVAL_ROW_MAX_LINES;
+				const visibleLines = lines.slice(0, maxLines);
+				if (lines.length > maxLines) {
+					visibleLines[maxLines - 1] = `${visibleLines[maxLines - 1]} \u2026`;
+				}
+				const langId = info.languageId ?? 'json';
+				const labelContent = new MarkdownString();
+				for (const line of visibleLines) {
+					labelContent.appendCodeblock(langId, line);
+				}
+
+				template.approvalLabel.textContent = '';
+				buttonStore.add(this.markdownRendererService.render(labelContent, {}, template.approvalLabel));
+
+				template.approvalButtonContainer.textContent = '';
+				const button = buttonStore.add(new Button(template.approvalButtonContainer, {
+					title: localize('allowActionOnce', "Allow once"),
+					secondary: true,
+					...defaultButtonStyles
+				}));
+				button.label = localize('allowAction', "Allow");
+				buttonStore.add(button.onDidClick(() => info.confirm()));
+			}
+
+			if (wasVisible !== visible) {
+				wasVisible = visible;
+				this._onDidChangeItemHeight.fire(element);
+			}
+		}));
+	}
+
+	private getStatusIcon(status: SessionStatus, isRead: boolean, isArchived: boolean): ThemeIcon {
+		switch (status) {
+			case SessionStatus.InProgress: return Codicon.sessionInProgress;
+			case SessionStatus.NeedsInput: return Codicon.circleFilled;
+			case SessionStatus.Error: return Codicon.error;
+			default:
+				if (!isRead && !isArchived) {
+					return Codicon.circleFilled;
+				}
+				// Status-only: show small dot for read sessions
+				return Codicon.circleSmallFilled;
+		}
+	}
+
+	private getWorkspaceBadgeLabel(workspace: ISessionWorkspace): string | undefined {
+		// For GitHub remote sessions, extract owner/name from the repository URI path
+		const repo = workspace.repositories[0];
+		if (repo?.uri.scheme === GITHUB_REMOTE_FILE_SCHEME) {
+			const parts = repo.uri.path.split('/').filter(Boolean);
+			if (parts.length >= 2) {
+				return `${parts[0]}/${parts[1]}`;
+			}
+		}
+
+		return workspace.label;
+	}
+
+
+
+	disposeElement(node: ITreeNode<SessionListItem, FuzzyScore>, _index: number, template: ISessionItemTemplate): void {
+		template.elementDisposables.clear();
+	}
+
+	disposeTemplate(template: ISessionItemTemplate): void {
+		template.disposables.dispose();
+	}
+}
+
+//#endregion
+
+//#region Section Header Renderer
+
+interface ISessionSectionTemplate {
+	readonly container: HTMLElement;
+	readonly label: HTMLElement;
+	readonly count: HTMLElement;
+	readonly toolbar: MenuWorkbenchToolBar;
+	readonly contextKeyService: IContextKeyService;
+	readonly disposables: DisposableStore;
+}
+
+class SessionSectionRenderer implements ITreeRenderer<SessionListItem, FuzzyScore, ISessionSectionTemplate> {
+	static readonly TEMPLATE_ID = 'session-section';
+	readonly templateId = SessionSectionRenderer.TEMPLATE_ID;
+
+	constructor(
+		private readonly hideSectionCount: boolean,
+		private readonly instantiationService: IInstantiationService,
+		private readonly contextKeyService: IContextKeyService,
+	) { }
+
+	renderTemplate(container: HTMLElement): ISessionSectionTemplate {
+		const disposables = new DisposableStore();
+
+		container.classList.add('session-section');
+		const label = DOM.append(container, $('span.session-section-label'));
+		const count = DOM.append(container, $('span.session-section-count'));
+		const toolbarContainer = DOM.append(container, $('.session-section-toolbar'));
+
+		const contextKeyService = disposables.add(this.contextKeyService.createScoped(container));
+		const scopedInstantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+		const toolbar = disposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarContainer, SessionSectionToolbarMenuId, {
+			menuOptions: { shouldForwardArgs: true },
+		}));
+
+		return { container, label, count, toolbar, contextKeyService, disposables };
+	}
+
+	renderElement(node: ITreeNode<SessionListItem, FuzzyScore>, _index: number, template: ISessionSectionTemplate): void {
+		const element = node.element;
+		if (!isSessionSection(element)) {
+			return;
+		}
+		template.label.textContent = element.label;
+		if (this.hideSectionCount) {
+			template.count.textContent = '';
+			template.count.style.display = 'none';
+		} else {
+			template.count.textContent = String(element.sessions.length);
+			template.count.style.display = '';
+		}
+
+		// Set context key for section type so toolbar actions can use when clauses
+		const sectionType = element.id.startsWith('workspace:') ? 'workspace' : element.id;
+		SessionSectionTypeContext.bindTo(template.contextKeyService).set(sectionType);
+		template.toolbar.context = element;
+	}
+
+	disposeTemplate(template: ISessionSectionTemplate): void {
+		template.disposables.dispose();
+	}
+}
+
+//#endregion
+
+//#region Show More Renderer
+
+class SessionShowMoreRenderer implements ITreeRenderer<SessionListItem, FuzzyScore, HTMLElement> {
+	static readonly TEMPLATE_ID = 'session-show-more';
+	readonly templateId = SessionShowMoreRenderer.TEMPLATE_ID;
+
+	renderTemplate(container: HTMLElement): HTMLElement {
+		container.classList.add('session-show-more');
+		return DOM.append(container, $('span.session-show-more-label'));
+	}
+
+	renderElement(node: ITreeNode<SessionListItem, FuzzyScore>, _index: number, template: HTMLElement): void {
+		const element = node.element;
+		if (!isSessionShowMore(element)) {
+			return;
+		}
+		template.textContent = localize('showMoreCompact', "+{0} more", element.remainingCount);
+	}
+
+	disposeTemplate(_template: HTMLElement): void { }
+}
+
+//#region Accessibility
+
+class SessionsAccessibilityProvider {
+	getWidgetAriaLabel(): string {
+		return localize('sessionsList', "Sessions");
+	}
+
+	getAriaLabel(element: SessionListItem): string | null {
+		if (isSessionSection(element)) {
+			return `${element.label}, ${element.sessions.length}`;
+		}
+		if (isSessionShowMore(element)) {
+			return localize('showMoreAria', "Show {0} more sessions", element.remainingCount);
+		}
+		return element.title.get();
+	}
+}
+
+//#endregion
+
+//#region Sessions List Control
+
+export interface ISessionsListControlOptions {
+	readonly overrideStyles?: IStyleOverride<IListStyles>;
+	readonly grouping: () => SessionsGrouping;
+	readonly sorting: () => SessionsSorting;
+	onSessionOpen(resource: URI): void;
+}
+
+/**
+ * @deprecated Use {@link ISessionsListControlOptions} instead.
+ */
+export type ISessionsListOptions = ISessionsListControlOptions;
+
+export interface ISessionsList {
+	readonly element: HTMLElement;
+	readonly onDidUpdate: Event<void>;
+	refresh(): void;
+	reveal(sessionResource: URI): boolean;
+	clearFocus(): void;
+	hasFocusOrSelection(): boolean;
+	setVisible(visible: boolean): void;
+	layout(height: number, width: number): void;
+	focus(): void;
+	update(expandAll?: boolean): void;
+	openFind(): void;
+	resetSectionCollapseState(): void;
+	pinSession(session: ISessionData): void;
+	unpinSession(session: ISessionData): void;
+	isSessionPinned(session: ISessionData): boolean;
+	setSessionTypeExcluded(sessionTypeId: string, excluded: boolean): void;
+	isSessionTypeExcluded(sessionTypeId: string): boolean;
+	setStatusExcluded(status: SessionStatus, excluded: boolean): void;
+	isStatusExcluded(status: SessionStatus): boolean;
+	setExcludeArchived(exclude: boolean): void;
+	isExcludeArchived(): boolean;
+	setExcludeRead(exclude: boolean): void;
+	isExcludeRead(): boolean;
+	resetFilters(): void;
+	setWorkspaceGroupCapped(capped: boolean): void;
+	isWorkspaceGroupCapped(): boolean;
+}
+
+export class SessionsList extends Disposable implements ISessionsList {
+
+	private static readonly SECTION_COLLAPSE_STATE_KEY = 'sessionsListControl.sectionCollapseState';
+	private static readonly PINNED_SESSIONS_KEY = 'sessionsListControl.pinnedSessions';
+	private static readonly EXCLUDED_TYPES_KEY = 'sessionsListControl.excludedSessionTypes';
+	private static readonly EXCLUDED_STATUSES_KEY = 'sessionsListControl.excludedStatuses';
+	private static readonly EXCLUDE_ARCHIVED_KEY = 'sessionsListControl.excludeArchived';
+	private static readonly EXCLUDE_READ_KEY = 'sessionsListControl.excludeRead';
+	private static readonly WORKSPACE_GROUP_CAPPED_KEY = 'sessionsListControl.workspaceGroupCapped';
+	private static readonly WORKSPACE_GROUP_LIMIT = 5;
+
+	private readonly listContainer: HTMLElement;
+	private readonly tree: WorkbenchObjectTree<SessionListItem, FuzzyScore>;
+	private sessions: ISessionData[] = [];
+	private visible = true;
+	private readonly pinnedSessionIds: Set<string>;
+	private readonly excludedSessionTypes: Set<string>;
+	private readonly excludedStatuses: Set<SessionStatus>;
+	private _excludeArchived: boolean;
+	private _excludeRead: boolean;
+	private workspaceGroupCapped: boolean;
+	private readonly expandedWorkspaceGroups = new Set<string>();
+
+	private readonly _onDidUpdate = this._register(new Emitter<void>());
+	readonly onDidUpdate: Event<void> = this._onDidUpdate.event;
+
+	get element(): HTMLElement { return this.listContainer; }
+
+	constructor(
+		container: HTMLElement,
+		private readonly options: ISessionsListControlOptions,
+		@ISessionsProvidersService private readonly sessionsProvidersService: ISessionsProvidersService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+	) {
+		super();
+
+		// Load pinned sessions from storage
+		this.pinnedSessionIds = this.loadPinnedSessions();
+
+		// Load excluded session types from storage
+		this.excludedSessionTypes = this.loadExcludedSessionTypes();
+
+		// Load excluded statuses from storage
+		this.excludedStatuses = this.loadExcludedStatuses();
+
+		// Load archived/read filter state
+		this._excludeArchived = this.storageService.getBoolean(SessionsList.EXCLUDE_ARCHIVED_KEY, StorageScope.PROFILE, true);
+		this._excludeRead = this.storageService.getBoolean(SessionsList.EXCLUDE_READ_KEY, StorageScope.PROFILE, false);
+		this.workspaceGroupCapped = this.storageService.getBoolean(SessionsList.WORKSPACE_GROUP_CAPPED_KEY, StorageScope.PROFILE, true);
+
+		this.listContainer = DOM.append(container, $('.sessions-list-control'));
+
+		const approvalModel = this._register(instantiationService.createInstance(AgentSessionApprovalModel));
+		const markdownRendererService = instantiationService.invokeFunction(accessor => accessor.get(IMarkdownRendererService));
+		const sessionRenderer = new SessionItemRenderer(
+			{ grouping: this.options.grouping, sorting: this.options.sorting, isPinned: s => this.isSessionPinned(s) },
+			approvalModel,
+			instantiationService,
+			contextKeyService,
+			markdownRendererService,
+		);
+
+		const showMoreRenderer = new SessionShowMoreRenderer();
+
+		this.tree = this._register(instantiationService.createInstance(
+			WorkbenchObjectTree<SessionListItem, FuzzyScore>,
+			'SessionsListTree',
+			this.listContainer,
+			new SessionsTreeDelegate(approvalModel),
+			[
+				sessionRenderer,
+				new SessionSectionRenderer(true /* hideSectionCount */, instantiationService, contextKeyService),
+				showMoreRenderer,
+			],
+			{
+				accessibilityProvider: new SessionsAccessibilityProvider(),
+				identityProvider: {
+					getId: (element: SessionListItem) => {
+						if (isSessionSection(element)) {
+							return `section:${element.id}`;
+						}
+						if (isSessionShowMore(element)) {
+							return `show-more:${element.sectionLabel}`;
+						}
+						return element.resource.toString();
+					}
+				},
+				horizontalScrolling: false,
+				multipleSelectionSupport: true,
+				indent: 0,
+				findWidgetEnabled: true,
+				defaultFindMode: TreeFindMode.Filter,
+				keyboardNavigationLabelProvider: {
+					getKeyboardNavigationLabel: (element: SessionListItem) => {
+						if (isSessionSection(element)) {
+							return element.label;
+						}
+						if (isSessionShowMore(element)) {
+							return element.sectionLabel;
+						}
+						return element.title.get();
+					}
+				},
+				overrideStyles: this.options.overrideStyles,
+				renderIndentGuides: RenderIndentGuides.None,
+				twistieAdditionalCssClass: () => 'force-no-twistie',
+			}
+		));
+
+		this._register(this.tree.onDidOpen(e => {
+			const element = e.element;
+			if (!element) {
+				return;
+			}
+			if (isSessionShowMore(element)) {
+				this.expandedWorkspaceGroups.add(element.sectionLabel);
+				this.update();
+				return;
+			}
+			if (!isSessionSection(element)) {
+				this.options.onSessionOpen(element.resource);
+			}
+		}));
+
+		this._register(sessionRenderer.onDidChangeItemHeight(session => {
+			if (this.tree.hasElement(session)) {
+				this.tree.updateElementHeight(session, undefined);
+			}
+		}));
+
+		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
+
+		this._register(this.tree.onDidChangeCollapseState(e => {
+			const element = e.node.element;
+			if (element && isSessionSection(element)) {
+				this.saveSectionCollapseState(element.id, e.node.collapsed);
+			}
+		}));
+
+		this._register(this.sessionsProvidersService.onDidChangeSessions(() => {
+			if (this.visible) {
+				this.refresh();
+			}
+		}));
+
+		this.refresh();
+	}
+
+	refresh(): void {
+		this.sessions = this.sessionsProvidersService.getSessions();
+		this.update();
+	}
+
+	update(expandAll?: boolean): void {
+		// Filter by session type and status
+		let filtered = this.sessions;
+		if (this.excludedSessionTypes.size > 0) {
+			filtered = filtered.filter(s => !this.excludedSessionTypes.has(s.sessionType));
+		}
+		if (this.excludedStatuses.size > 0) {
+			filtered = filtered.filter(s => !this.excludedStatuses.has(s.status.get()));
+		}
+		if (this._excludeArchived) {
+			filtered = filtered.filter(s => !s.isArchived.get());
+		}
+		if (this._excludeRead) {
+			filtered = filtered.filter(s => !s.isRead.get());
+		}
+
+		const sorted = this.sortSessions(filtered);
+
+		// Separate pinned and archived sessions (archived always wins over pinned)
+		const pinned: ISessionData[] = [];
+		const archived: ISessionData[] = [];
+		const regular: ISessionData[] = [];
+		for (const session of sorted) {
+			if (session.isArchived.get()) {
+				archived.push(session);
+			} else if (this.isSessionPinned(session)) {
+				pinned.push(session);
+			} else {
+				regular.push(session);
+			}
+		}
+
+		const grouping = this.options.grouping();
+		const sections: ISessionSection[] = [];
+
+		// Group remaining non-archived sessions
+		const grouped = grouping === SessionsGrouping.Workspace
+			? this.groupByWorkspace(regular)
+			: this.groupByDate(regular);
+		sections.push(...grouped);
+
+		// Add archived section at the bottom
+		if (archived.length > 0) {
+			sections.push({ id: 'archived', label: localize('archived', "Archived"), sessions: archived });
+		}
+
+		const hasTodaySessions = sections.some(s => s.id === 'today' && s.sessions.length > 0);
+
+		// Pinned sessions appear flat at the top (no section header)
+		const children: IObjectTreeElement<SessionListItem>[] = [
+			...pinned.map(session => ({ element: session as SessionListItem })),
+		];
+
+		children.push(...sections.map(section => {
+			const isWorkspaceGroup = grouping === SessionsGrouping.Workspace
+				&& section.id !== 'archived';
+			const isCapped = isWorkspaceGroup && this.workspaceGroupCapped
+				&& !this.expandedWorkspaceGroups.has(section.label)
+				&& section.sessions.length > SessionsList.WORKSPACE_GROUP_LIMIT;
+
+			let sectionChildren: IObjectTreeElement<SessionListItem>[];
+			if (isCapped) {
+				const visible = section.sessions.slice(0, SessionsList.WORKSPACE_GROUP_LIMIT);
+				const remainingCount = section.sessions.length - SessionsList.WORKSPACE_GROUP_LIMIT;
+				sectionChildren = [
+					...visible.map(session => ({ element: session as SessionListItem })),
+					{ element: { showMore: true as const, sectionLabel: section.label, remainingCount } },
+				];
+			} else {
+				sectionChildren = section.sessions.map(session => ({ element: session as SessionListItem }));
+			}
+
+			// Default collapse state for older time sections
+			let defaultCollapsed: boolean | ObjectTreeElementCollapseState = ObjectTreeElementCollapseState.PreserveOrExpanded;
+			if (grouping === SessionsGrouping.Date && hasTodaySessions) {
+				const olderSections = ['yesterday', 'thisWeek', 'older', 'archived'];
+				if (olderSections.includes(section.id)) {
+					defaultCollapsed = ObjectTreeElementCollapseState.PreserveOrCollapsed;
+				}
+			}
+			if (section.id === 'archived') {
+				defaultCollapsed = ObjectTreeElementCollapseState.PreserveOrCollapsed;
+			}
+
+			return {
+				element: section as SessionListItem,
+				collapsible: true,
+				collapsed: this.getSavedCollapseState(section.id) ?? defaultCollapsed,
+				children: sectionChildren,
+			};
+		}));
+
+		this.tree.setChildren(null, children);
+		this._onDidUpdate.fire();
+	}
+
+	reveal(sessionResource: URI): boolean {
+		const resourceStr = sessionResource.toString();
+		for (const session of this.sessions) {
+			if (session.resource.toString() === resourceStr) {
+				if (this.tree.hasElement(session)) {
+					if (this.tree.getRelativeTop(session) === null) {
+						this.tree.reveal(session, 0.5);
+					}
+					this.tree.setFocus([session]);
+					this.tree.setSelection([session]);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	clearFocus(): void {
+		this.tree.setFocus([]);
+		this.tree.setSelection([]);
+	}
+
+	hasFocusOrSelection(): boolean {
+		return this.tree.getFocus().length > 0 || this.tree.getSelection().length > 0;
+	}
+
+	setVisible(visible: boolean): void {
+		if (this.visible === visible) {
+			return;
+		}
+		this.visible = visible;
+		if (this.visible) {
+			this.refresh();
+		}
+	}
+
+	layout(height: number, width: number): void {
+		this.tree.layout(height, width);
+	}
+
+	focus(): void {
+		this.tree.domFocus();
+	}
+
+	openFind(): void {
+		this.tree.openFind();
+	}
+
+	// Context menu
+
+	private onContextMenu(e: ITreeContextMenuEvent<SessionListItem | null>): void {
+		const element = e.element;
+		if (!element || isSessionSection(element) || isSessionShowMore(element)) {
+			return;
+		}
+
+		const contextOverlay: [string, boolean | string][] = [
+			[IsSessionPinnedContext.key, this.isSessionPinned(element)],
+			[IsSessionArchivedContext.key, element.isArchived.get()],
+			[IsSessionReadContext.key, element.isRead.get()],
+			['chatSessionType', element.sessionType],
+			['chatSessionProviderId', element.providerId],
+		];
+
+		const menu = this.menuService.createMenu(SessionItemContextMenuId, this.contextKeyService.createOverlay(contextOverlay));
+
+		this.contextMenuService.showContextMenu({
+			getActions: () => Separator.join(...menu.getActions({ arg: element, shouldForwardArgs: true }).map(([, actions]) => actions)),
+			getAnchor: () => e.anchor,
+			getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id) ?? undefined,
+		});
+
+		menu.dispose();
+	}
+
+	resetSectionCollapseState(): void {
+		this.storageService.remove(SessionsList.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+	}
+
+	// -- Pinning --
+
+	pinSession(session: ISessionData): void {
+		this.pinnedSessionIds.add(session.sessionId);
+		this.savePinnedSessions();
+		this.update();
+	}
+
+	unpinSession(session: ISessionData): void {
+		this.pinnedSessionIds.delete(session.sessionId);
+		this.savePinnedSessions();
+		this.update();
+	}
+
+	isSessionPinned(session: ISessionData): boolean {
+		return this.pinnedSessionIds.has(session.sessionId);
+	}
+
+	private loadPinnedSessions(): Set<string> {
+		const raw = this.storageService.get(SessionsList.PINNED_SESSIONS_KEY, StorageScope.PROFILE);
+		if (raw) {
+			try {
+				const arr = JSON.parse(raw);
+				if (Array.isArray(arr)) {
+					return new Set(arr);
+				}
+			} catch {
+				// ignore corrupt data
+			}
+		}
+		return new Set();
+	}
+
+	private savePinnedSessions(): void {
+		if (this.pinnedSessionIds.size === 0) {
+			this.storageService.remove(SessionsList.PINNED_SESSIONS_KEY, StorageScope.PROFILE);
+		} else {
+			this.storageService.store(SessionsList.PINNED_SESSIONS_KEY, JSON.stringify([...this.pinnedSessionIds]), StorageScope.PROFILE, StorageTarget.USER);
+		}
+	}
+
+	// -- Session type filtering --
+
+	setSessionTypeExcluded(sessionTypeId: string, excluded: boolean): void {
+		if (excluded) {
+			this.excludedSessionTypes.add(sessionTypeId);
+		} else {
+			this.excludedSessionTypes.delete(sessionTypeId);
+		}
+		this.saveExcludedSessionTypes();
+		this.update();
+	}
+
+	isSessionTypeExcluded(sessionTypeId: string): boolean {
+		return this.excludedSessionTypes.has(sessionTypeId);
+	}
+
+	private loadExcludedSessionTypes(): Set<string> {
+		const raw = this.storageService.get(SessionsList.EXCLUDED_TYPES_KEY, StorageScope.PROFILE);
+		if (raw) {
+			try {
+				const arr = JSON.parse(raw);
+				if (Array.isArray(arr)) {
+					return new Set(arr);
+				}
+			} catch {
+				// ignore corrupt data
+			}
+		}
+		return new Set();
+	}
+
+	private saveExcludedSessionTypes(): void {
+		if (this.excludedSessionTypes.size === 0) {
+			this.storageService.remove(SessionsList.EXCLUDED_TYPES_KEY, StorageScope.PROFILE);
+		} else {
+			this.storageService.store(SessionsList.EXCLUDED_TYPES_KEY, JSON.stringify([...this.excludedSessionTypes]), StorageScope.PROFILE, StorageTarget.USER);
+		}
+	}
+
+	// -- Status filtering --
+
+	setStatusExcluded(status: SessionStatus, excluded: boolean): void {
+		if (excluded) {
+			this.excludedStatuses.add(status);
+		} else {
+			this.excludedStatuses.delete(status);
+		}
+		this.saveExcludedStatuses();
+		this.update();
+	}
+
+	isStatusExcluded(status: SessionStatus): boolean {
+		return this.excludedStatuses.has(status);
+	}
+
+	private loadExcludedStatuses(): Set<SessionStatus> {
+		const raw = this.storageService.get(SessionsList.EXCLUDED_STATUSES_KEY, StorageScope.PROFILE);
+		if (raw) {
+			try {
+				const arr = JSON.parse(raw);
+				if (Array.isArray(arr)) {
+					return new Set(arr);
+				}
+			} catch {
+				// ignore corrupt data
+			}
+		}
+		return new Set();
+	}
+
+	private saveExcludedStatuses(): void {
+		if (this.excludedStatuses.size === 0) {
+			this.storageService.remove(SessionsList.EXCLUDED_STATUSES_KEY, StorageScope.PROFILE);
+		} else {
+			this.storageService.store(SessionsList.EXCLUDED_STATUSES_KEY, JSON.stringify([...this.excludedStatuses]), StorageScope.PROFILE, StorageTarget.USER);
+		}
+	}
+
+	// -- Archived / Read filtering --
+
+	setExcludeArchived(exclude: boolean): void {
+		this._excludeArchived = exclude;
+		this.storageService.store(SessionsList.EXCLUDE_ARCHIVED_KEY, exclude, StorageScope.PROFILE, StorageTarget.USER);
+		this.update();
+	}
+
+	isExcludeArchived(): boolean {
+		return this._excludeArchived;
+	}
+
+	setExcludeRead(exclude: boolean): void {
+		this._excludeRead = exclude;
+		this.storageService.store(SessionsList.EXCLUDE_READ_KEY, exclude, StorageScope.PROFILE, StorageTarget.USER);
+		this.update();
+	}
+
+	isExcludeRead(): boolean {
+		return this._excludeRead;
+	}
+
+	resetFilters(): void {
+		this.excludedSessionTypes.clear();
+		this.saveExcludedSessionTypes();
+		this.excludedStatuses.clear();
+		this.saveExcludedStatuses();
+		this._excludeArchived = true;
+		this.storageService.store(SessionsList.EXCLUDE_ARCHIVED_KEY, true, StorageScope.PROFILE, StorageTarget.USER);
+		this._excludeRead = false;
+		this.storageService.store(SessionsList.EXCLUDE_READ_KEY, false, StorageScope.PROFILE, StorageTarget.USER);
+		this.workspaceGroupCapped = true;
+		this.storageService.store(SessionsList.WORKSPACE_GROUP_CAPPED_KEY, true, StorageScope.PROFILE, StorageTarget.USER);
+		this.expandedWorkspaceGroups.clear();
+		this.update();
+	}
+
+	// Workspace group capping
+
+	setWorkspaceGroupCapped(capped: boolean): void {
+		this.workspaceGroupCapped = capped;
+		this.storageService.store(SessionsList.WORKSPACE_GROUP_CAPPED_KEY, capped, StorageScope.PROFILE, StorageTarget.USER);
+		if (capped) {
+			this.expandedWorkspaceGroups.clear();
+		}
+		this.update();
+	}
+
+	isWorkspaceGroupCapped(): boolean {
+		return this.workspaceGroupCapped;
+	}
+
+	// -- Section collapse persistence --
+
+	private getSavedCollapseState(sectionId: string): boolean | undefined {
+		const raw = this.storageService.get(SessionsList.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+		if (raw) {
+			try {
+				const state: Record<string, boolean> = JSON.parse(raw);
+				if (typeof state[sectionId] === 'boolean') {
+					return state[sectionId];
+				}
+			} catch {
+				// ignore corrupt data
+			}
+		}
+		return undefined;
+	}
+
+	private saveSectionCollapseState(sectionId: string, collapsed: boolean): void {
+		let state: Record<string, boolean> = {};
+		const raw = this.storageService.get(SessionsList.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+		if (raw) {
+			try {
+				const parsed = JSON.parse(raw);
+				if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+					state = parsed;
+				}
+			} catch {
+				// ignore corrupt data
+			}
+		}
+		state[sectionId] = collapsed;
+		this.storageService.store(SessionsList.SECTION_COLLAPSE_STATE_KEY, JSON.stringify(state), StorageScope.PROFILE, StorageTarget.USER);
+	}
+
+	// -- Sorting --
+
+	private sortSessions(sessions: ISessionData[]): ISessionData[] {
+		return sortSessions(sessions, this.options.sorting());
+	}
+
+	// -- Grouping --
+
+	private groupByWorkspace(sessions: ISessionData[]): ISessionSection[] {
+		return groupByWorkspace(sessions);
+	}
+
+	private groupByDate(sessions: ISessionData[]): ISessionSection[] {
+		return groupByDate(sessions, this.options.sorting());
+	}
+}
+
+//#endregion
+
+//#region Sorting & Grouping Helpers
+
+export function sortSessions(sessions: ISessionData[], sorting: SessionsSorting): ISessionData[] {
+	return [...sessions].sort((a, b) => {
+		if (sorting === SessionsSorting.Updated) {
+			return b.updatedAt.get().getTime() - a.updatedAt.get().getTime();
+		}
+		return b.createdAt.getTime() - a.createdAt.getTime();
+	});
+}
+
+export function groupByWorkspace(sessions: ISessionData[]): ISessionSection[] {
+	const groups = new Map<string, ISessionData[]>();
+	for (const session of sessions) {
+		const workspace = session.workspace.get();
+		const label = workspace?.label ?? localize('noWorkspace', "No Workspace");
+		let group = groups.get(label);
+		if (!group) {
+			group = [];
+			groups.set(label, group);
+		}
+		group.push(session);
+	}
+
+	const order = [...groups.keys()].sort((a, b) => a.localeCompare(b));
+
+	return order.map(label => ({
+		id: `workspace:${label}`,
+		label,
+		sessions: groups.get(label)!,
+	}));
+}
+
+export function groupByDate(sessions: ISessionData[], sorting: SessionsSorting): ISessionSection[] {
+	const now = new Date();
+	const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+	const startOfYesterday = startOfToday - 86_400_000;
+	const startOfWeek = startOfToday - 7 * 86_400_000;
+
+	const today: ISessionData[] = [];
+	const yesterday: ISessionData[] = [];
+	const week: ISessionData[] = [];
+	const older: ISessionData[] = [];
+
+	for (const session of sessions) {
+		const time = sorting === SessionsSorting.Updated
+			? session.updatedAt.get().getTime()
+			: session.createdAt.getTime();
+
+		if (time >= startOfToday) {
+			today.push(session);
+		} else if (time >= startOfYesterday) {
+			yesterday.push(session);
+		} else if (time >= startOfWeek) {
+			week.push(session);
+		} else {
+			older.push(session);
+		}
+	}
+
+	const sections: ISessionSection[] = [];
+	const addGroup = (id: string, label: string, groupSessions: ISessionData[]) => {
+		if (groupSessions.length > 0) {
+			sections.push({ id, label, sessions: groupSessions });
+		}
+	};
+
+	addGroup('today', localize('today', "Today"), today);
+	addGroup('yesterday', localize('yesterday', "Yesterday"), yesterday);
+	addGroup('thisWeek', localize('lastSevenDays', "Last 7 Days"), week);
+	addGroup('older', localize('older', "Older"), older);
+
+	return sections;
+}
+
+//#endregion
diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsView.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsView.ts
new file mode 100644
index 00000000000..283ff456dee
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsView.ts
@@ -0,0 +1,388 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import '../media/sessionsViewPane.css';
+import * as DOM from '../../../../../base/browser/dom.js';
+import { autorun } from '../../../../../base/common/observable.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IViewPaneOptions, IViewPaneLocationColors, ViewPane } from '../../../../../workbench/browser/parts/views/viewPane.js';
+import { IViewDescriptorService } from '../../../../../workbench/common/views.js';
+import { sessionsSidebarBackground } from '../../../../common/theme.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { localize } from '../../../../../nls.js';
+import { SessionsList, SessionsGrouping, SessionsSorting } from './sessionsList.js';
+import { SessionStatus } from '../../common/sessionData.js';
+import { ISessionsManagementService } from '../sessionsManagementService.js';
+import { AICustomizationShortcutsWidget } from '../aiCustomizationShortcutsWidget.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IHostService } from '../../../../../workbench/services/host/browser/host.js';
+
+const $ = DOM.$;
+export const SessionsViewId = 'sessions.workbench.view.sessionsView';
+const ACTION_ID_NEW_SESSION = 'workbench.action.chat.newChat';
+const GROUPING_STORAGE_KEY = 'sessionsViewPane.grouping';
+const SORTING_STORAGE_KEY = 'sessionsViewPane.sorting';
+
+export const SessionsViewFilterSubMenu = new MenuId('SessionsViewPaneFilterSubMenu');
+export const SessionsViewFilterOptionsSubMenu = new MenuId('SessionsViewPaneFilterOptionsSubMenu');
+export const SessionsViewGroupingContext = new RawContextKey<string>('sessionsViewPane.grouping', SessionsGrouping.Workspace);
+export const SessionsViewSortingContext = new RawContextKey<string>('sessionsViewPane.sorting', SessionsSorting.Created);
+export const IsWorkspaceGroupCappedContext = new RawContextKey<boolean>('sessionsViewPane.workspaceGroupCapped', true);
+
+export class SessionsView extends ViewPane {
+
+	private viewPaneContainer: HTMLElement | undefined;
+	private sessionsControlContainer: HTMLElement | undefined;
+	sessionsControl: SessionsList | undefined;
+	private currentGrouping: SessionsGrouping = SessionsGrouping.Workspace;
+	private currentSorting: SessionsSorting = SessionsSorting.Created;
+	private groupingContextKey: IContextKey | undefined;
+	private sortingContextKey: IContextKey | undefined;
+	private readonly filterContextKeys = new Map<string, { key: IContextKey<boolean>; getDefault: () => boolean }>();
+
+	constructor(
+		options: IViewPaneOptions,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IOpenerService openerService: IOpenerService,
+		@IThemeService themeService: IThemeService,
+		@IHoverService hoverService: IHoverService,
+		@ISessionsManagementService private readonly sessionsManagementService: ISessionsManagementService,
+		@IHostService private readonly hostService: IHostService,
+		@IStorageService private readonly storageService: IStorageService,
+	) {
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
+
+		// Restore persisted grouping
+		const storedGrouping = this.storageService.get(GROUPING_STORAGE_KEY, StorageScope.PROFILE);
+		if (storedGrouping && Object.values(SessionsGrouping).includes(storedGrouping as SessionsGrouping)) {
+			this.currentGrouping = storedGrouping as SessionsGrouping;
+		}
+
+		// Restore persisted sorting
+		const storedSorting = this.storageService.get(SORTING_STORAGE_KEY, StorageScope.PROFILE);
+		if (storedSorting && Object.values(SessionsSorting).includes(storedSorting as SessionsSorting)) {
+			this.currentSorting = storedSorting as SessionsSorting;
+		}
+
+		// Ensure context keys reflect restored state immediately
+		this.groupingContextKey = SessionsViewGroupingContext.bindTo(contextKeyService);
+		this.groupingContextKey.set(this.currentGrouping);
+		this.sortingContextKey = SessionsViewSortingContext.bindTo(contextKeyService);
+		this.sortingContextKey.set(this.currentSorting);
+	}
+
+	protected override renderBody(parent: HTMLElement): void {
+		super.renderBody(parent);
+
+		this.viewPaneContainer = parent;
+		this.viewPaneContainer.classList.add('agent-sessions-viewpane');
+
+		this.createControls(parent);
+	}
+
+	protected override getLocationBasedColors(): IViewPaneLocationColors {
+		const colors = super.getLocationBasedColors();
+		return {
+			...colors,
+			background: sessionsSidebarBackground,
+			listOverrideStyles: {
+				...colors.listOverrideStyles,
+				listBackground: sessionsSidebarBackground,
+			}
+		};
+	}
+
+	private createControls(parent: HTMLElement): void {
+		const sessionsContainer = DOM.append(parent, $('.agent-sessions-container'));
+
+		// Sessions section (top, fills available space)
+		const sessionsSection = DOM.append(sessionsContainer, $('.agent-sessions-section'));
+
+		// Sessions content container
+		const sessionsContent = DOM.append(sessionsSection, $('.agent-sessions-content'));
+
+		// New Session Button
+		const newSessionButtonContainer = DOM.append(sessionsContent, $('.agent-sessions-new-button-container'));
+		const newSessionButton = this._register(new Button(newSessionButtonContainer, { ...defaultButtonStyles, secondary: true }));
+		newSessionButton.label = localize('newSession', "New Session");
+		this._register(newSessionButton.onDidClick(() => this.sessionsManagementService.openNewSessionView()));
+
+		// Keybinding hint inside the button
+		const keybinding = this.keybindingService.lookupKeybinding(ACTION_ID_NEW_SESSION);
+		if (keybinding) {
+			const keybindingHint = DOM.append(newSessionButton.element, $('span.new-session-keybinding-hint'));
+			keybindingHint.textContent = keybinding.getLabel() ?? '';
+		}
+
+		// Sessions List Control
+		this.sessionsControlContainer = DOM.append(sessionsContent, $('.agent-sessions-control-container'));
+		const sessionsControl = this.sessionsControl = this._register(this.instantiationService.createInstance(SessionsList, this.sessionsControlContainer, {
+			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+			grouping: () => this.currentGrouping,
+			sorting: () => this.currentSorting,
+			onSessionOpen: (resource) => this.sessionsManagementService.openSession(resource),
+		}));
+		this._register(this.onDidChangeBodyVisibility(visible => sessionsControl.setVisible(visible)));
+
+		// Register session type filter actions (re-register when session types change)
+		this.registerSessionTypeFilters(sessionsControl);
+		this._register(this.sessionsManagementService.onDidChangeSessionTypes(() => {
+			this.registerSessionTypeFilters(sessionsControl);
+		}));
+
+		// Register status filter actions (static set, registered once)
+		this.registerStatusFilters(sessionsControl);
+
+		// Refresh sessions when window gets focus to compensate for missing events
+		this._register(this.hostService.onDidChangeFocus(hasFocus => {
+			if (hasFocus) {
+				sessionsControl.refresh();
+			}
+		}));
+
+		// Listen to list updates and restore selection if nothing is selected
+		this._register(sessionsControl.onDidUpdate(() => {
+			if (!sessionsControl.hasFocusOrSelection()) {
+				this.restoreLastSelectedSession();
+			}
+		}));
+
+		// When the active session changes, select it in the list
+		this._register(autorun(reader => {
+			const activeSession = this.sessionsManagementService.activeSession.read(reader);
+			if (activeSession) {
+				if (!sessionsControl.reveal(activeSession.resource)) {
+					sessionsControl.clearFocus();
+				}
+			} else {
+				sessionsControl.clearFocus();
+			}
+		}));
+
+		// AI Customization toolbar (bottom, fixed height)
+		this._register(this.instantiationService.createInstance(AICustomizationShortcutsWidget, sessionsContainer, {
+			onDidToggleCollapse: () => {
+				if (this.viewPaneContainer) {
+					const { offsetHeight, offsetWidth } = this.viewPaneContainer;
+					this.layoutBody(offsetHeight, offsetWidth);
+				}
+			},
+		}));
+	}
+
+	private restoreLastSelectedSession(): void {
+		const activeSession = this.sessionsManagementService.activeSession.get();
+		if (activeSession && this.sessionsControl) {
+			this.sessionsControl.reveal(activeSession.resource);
+		}
+	}
+
+	private readonly registeredFilterTypeIds = new Set<string>();
+
+	private registerSessionTypeFilters(sessionsControl: SessionsList): void {
+		const sessionTypes = this.sessionsManagementService.getAllSessionTypes();
+		for (let i = 0; i < sessionTypes.length; i++) {
+			const type = sessionTypes[i];
+
+			// Skip if already registered (action IDs are global and can't be re-registered)
+			if (this.registeredFilterTypeIds.has(type.id)) {
+				continue;
+			}
+			this.registeredFilterTypeIds.add(type.id);
+
+			const contextKey = new RawContextKey<boolean>(`sessionsViewPane.filterType.${type.id}`, !sessionsControl.isSessionTypeExcluded(type.id));
+			const contextKeyInstance = contextKey.bindTo(this.scopedContextKeyService);
+			this.filterContextKeys.set(contextKey.key, { key: contextKeyInstance, getDefault: () => true });
+
+			this._register(registerAction2(class extends Action2 {
+				constructor() {
+					super({
+						id: `sessionsViewPane.filterType.${type.id}`,
+						title: type.label,
+						toggled: ContextKeyExpr.equals(contextKey.key, true),
+						menu: [{
+							id: SessionsViewFilterOptionsSubMenu,
+							group: '1_types',
+							order: i,
+						}]
+					});
+				}
+				override run() {
+					const isExcluded = sessionsControl.isSessionTypeExcluded(type.id);
+					sessionsControl.setSessionTypeExcluded(type.id, !isExcluded);
+					contextKeyInstance.set(isExcluded); // was excluded, now included (toggle)
+				}
+			}));
+		}
+	}
+
+	private registerStatusFilters(sessionsControl: SessionsList): void {
+		const statusFilters: { status: SessionStatus; label: string }[] = [
+			{ status: SessionStatus.Completed, label: localize('statusCompleted', "Completed") },
+			{ status: SessionStatus.InProgress, label: localize('statusInProgress', "In Progress") },
+			{ status: SessionStatus.NeedsInput, label: localize('statusNeedsInput', "Input Needed") },
+			{ status: SessionStatus.Error, label: localize('statusFailed', "Failed") },
+		];
+		for (let i = 0; i < statusFilters.length; i++) {
+			const { status, label } = statusFilters[i];
+			const contextKey = new RawContextKey<boolean>(`sessionsViewPane.filterStatus.${status}`, !sessionsControl.isStatusExcluded(status));
+			const contextKeyInstance = contextKey.bindTo(this.scopedContextKeyService);
+			this.filterContextKeys.set(contextKey.key, { key: contextKeyInstance, getDefault: () => true });
+
+			this._register(registerAction2(class extends Action2 {
+				constructor() {
+					super({
+						id: `sessionsViewPane.filterStatus.${status}`,
+						title: label,
+						toggled: ContextKeyExpr.equals(contextKey.key, true),
+						menu: [{
+							id: SessionsViewFilterOptionsSubMenu,
+							group: '2_status',
+							order: i,
+						}]
+					});
+				}
+				override run() {
+					const isExcluded = sessionsControl.isStatusExcluded(status);
+					sessionsControl.setStatusExcluded(status, !isExcluded);
+					contextKeyInstance.set(isExcluded);
+				}
+			}));
+		}
+
+		// Archived toggle
+		const archivedContextKey = new RawContextKey<boolean>('sessionsViewPane.filter.showArchived', !sessionsControl.isExcludeArchived());
+		const archivedContextKeyInstance = archivedContextKey.bindTo(this.scopedContextKeyService);
+		this.filterContextKeys.set(archivedContextKey.key, { key: archivedContextKeyInstance, getDefault: () => false });
+
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'sessionsViewPane.filterArchived',
+					title: localize('filterArchived', "Archived"),
+					toggled: ContextKeyExpr.equals(archivedContextKey.key, true),
+					menu: [{
+						id: SessionsViewFilterOptionsSubMenu,
+						group: '3_props',
+						order: 0,
+					}]
+				});
+			}
+			override run() {
+				const excluding = sessionsControl.isExcludeArchived();
+				sessionsControl.setExcludeArchived(!excluding);
+				archivedContextKeyInstance.set(excluding); // was excluding → now showing
+			}
+		}));
+
+		// Read toggle
+		const readContextKey = new RawContextKey<boolean>('sessionsViewPane.filter.showRead', !sessionsControl.isExcludeRead());
+		const readContextKeyInstance = readContextKey.bindTo(this.scopedContextKeyService);
+		this.filterContextKeys.set(readContextKey.key, { key: readContextKeyInstance, getDefault: () => true });
+
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'sessionsViewPane.filterRead',
+					title: localize('filterRead', "Read"),
+					toggled: ContextKeyExpr.equals(readContextKey.key, true),
+					menu: [{
+						id: SessionsViewFilterOptionsSubMenu,
+						group: '3_props',
+						order: 1,
+					}]
+				});
+			}
+			override run() {
+				const excluding = sessionsControl.isExcludeRead();
+				sessionsControl.setExcludeRead(!excluding);
+				readContextKeyInstance.set(excluding);
+			}
+		}));
+
+		// Reset filter action
+		const filterContextKeys = this.filterContextKeys;
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'sessionsViewPane.resetFilters',
+					title: localize('resetFilters', "Reset"),
+					menu: [{
+						id: SessionsViewFilterOptionsSubMenu,
+						group: '4_reset',
+						order: 0,
+					}]
+				});
+			}
+			override run() {
+				sessionsControl.resetFilters();
+				for (const { key, getDefault } of filterContextKeys.values()) {
+					key.set(getDefault());
+				}
+			}
+		}));
+	}
+
+	protected override layoutBody(height: number, width: number): void {
+		super.layoutBody(height, width);
+
+		if (!this.sessionsControl || !this.sessionsControlContainer) {
+			return;
+		}
+
+		this.sessionsControl.layout(this.sessionsControlContainer.offsetHeight, width);
+	}
+
+	override focus(): void {
+		super.focus();
+
+		this.sessionsControl?.focus();
+	}
+
+	refresh(): void {
+		this.sessionsControl?.refresh();
+	}
+
+	openFind(): void {
+		this.sessionsControl?.openFind();
+	}
+
+	setGrouping(grouping: SessionsGrouping): void {
+		if (this.currentGrouping === grouping) {
+			return;
+		}
+
+		this.currentGrouping = grouping;
+		this.storageService.store(GROUPING_STORAGE_KEY, this.currentGrouping, StorageScope.PROFILE, StorageTarget.USER);
+		this.groupingContextKey?.set(this.currentGrouping);
+		this.sessionsControl?.resetSectionCollapseState();
+		this.sessionsControl?.update(true);
+	}
+
+	setSorting(sorting: SessionsSorting): void {
+		if (this.currentSorting === sorting) {
+			return;
+		}
+
+		this.currentSorting = sorting;
+		this.storageService.store(SORTING_STORAGE_KEY, this.currentSorting, StorageScope.PROFILE, StorageTarget.USER);
+		this.sortingContextKey?.set(this.currentSorting);
+		this.sessionsControl?.update();
+	}
+}
diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts
new file mode 100644
index 00000000000..89f104c1bcd
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts
@@ -0,0 +1,628 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IViewsService } from '../../../../../workbench/services/views/common/viewsService.js';
+import { EditorsVisibleContext, IsAuxiliaryWindowContext } from '../../../../../workbench/common/contextkeys.js';
+import { IChatWidgetService } from '../../../../../workbench/contrib/chat/browser/chat.js';
+import { AUX_WINDOW_GROUP } from '../../../../../workbench/services/editor/common/editorService.js';
+import { SessionsCategories } from '../../../../common/categories.js';
+import { SessionItemToolbarMenuId, SessionItemContextMenuId, SessionSectionToolbarMenuId, SessionSectionTypeContext, IsSessionPinnedContext, IsSessionArchivedContext, IsSessionReadContext, SessionsGrouping, SessionsSorting, ISessionSection } from './sessionsList.js';
+import { ISessionsManagementService, IsNewChatSessionContext } from '../sessionsManagementService.js';
+import { ISessionData, SessionStatus } from '../../common/sessionData.js';
+import { IsWorkspaceGroupCappedContext, SessionsViewFilterOptionsSubMenu, SessionsViewFilterSubMenu, SessionsViewGroupingContext, SessionsViewId, SessionsView, SessionsViewSortingContext } from './sessionsView.js';
+import { SessionsViewId as NewChatViewId, NewChatViewPane } from '../../../chat/browser/newChatViewPane.js';
+import { Menus } from '../../../../browser/menus.js';
+import { SessionsWelcomeVisibleContext } from '../../../../common/contextkeys.js';
+
+//  Constants
+
+const ACTION_ID_NEW_SESSION = 'workbench.action.chat.newChat';
+//  Keybindings
+
+KeybindingsRegistry.registerKeybindingRule({
+	id: ACTION_ID_NEW_SESSION,
+	weight: KeybindingWeight.WorkbenchContrib + 1,
+	primary: KeyMod.CtrlCmd | KeyCode.KeyN,
+});
+
+const CLOSE_SESSION_COMMAND_ID = 'sessionsViewPane.closeSession';
+registerAction2(class CloseSessionAction extends Action2 {
+	constructor() {
+		super({
+			id: CLOSE_SESSION_COMMAND_ID,
+			title: localize2('closeSession', "Close Session"),
+			f1: true,
+			precondition: ContextKeyExpr.and(IsNewChatSessionContext.negate(), EditorsVisibleContext.negate()),
+			category: SessionsCategories.Sessions,
+		});
+	}
+	override async run(accessor: ServicesAccessor) {
+		const sessionsService = accessor.get(ISessionsManagementService);
+		sessionsService.openNewSessionView();
+	}
+});
+
+KeybindingsRegistry.registerKeybindingRule({
+	id: CLOSE_SESSION_COMMAND_ID,
+	weight: KeybindingWeight.WorkbenchContrib + 1,
+	when: ContextKeyExpr.and(IsNewChatSessionContext.negate(), EditorsVisibleContext.negate()),
+	primary: KeyMod.CtrlCmd | KeyCode.KeyW,
+	win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KeyW] },
+});
+
+//  View Title Menu
+
+MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
+	submenu: SessionsViewFilterSubMenu,
+	title: localize2('filterSessions', "Filter Sessions"),
+	group: 'navigation',
+	order: 3,
+	icon: Codicon.settings,
+	when: ContextKeyExpr.equals('view', SessionsViewId)
+});
+
+MenuRegistry.appendMenuItem(SessionsViewFilterSubMenu, {
+	submenu: SessionsViewFilterOptionsSubMenu,
+	title: localize2('filter', "Filter"),
+	group: '0_filter',
+	order: 0,
+});
+
+//  Sort / Group Actions
+
+registerAction2(class SortByCreatedAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.sortByCreated',
+			title: localize2('sortByCreated', "Sort by Created"),
+			category: SessionsCategories.Sessions,
+			toggled: ContextKeyExpr.equals(SessionsViewSortingContext.key, SessionsSorting.Created),
+			menu: [{ id: SessionsViewFilterSubMenu, group: '1_sort', order: 0 }]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.setSorting(SessionsSorting.Created);
+	}
+});
+
+registerAction2(class SortByUpdatedAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.sortByUpdated',
+			title: localize2('sortByUpdated', "Sort by Updated"),
+			category: SessionsCategories.Sessions,
+			toggled: ContextKeyExpr.equals(SessionsViewSortingContext.key, SessionsSorting.Updated),
+			menu: [{ id: SessionsViewFilterSubMenu, group: '1_sort', order: 1 }]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.setSorting(SessionsSorting.Updated);
+	}
+});
+
+registerAction2(class GroupByWorkspaceAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.groupByWorkspace',
+			title: localize2('groupByWorkspace', "Group by Workspace"),
+			category: SessionsCategories.Sessions,
+			toggled: ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Workspace),
+			menu: [{ id: SessionsViewFilterSubMenu, group: '2_group', order: 0 }]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.setGrouping(SessionsGrouping.Workspace);
+	}
+});
+
+registerAction2(class GroupByTimeAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.groupByTime',
+			title: localize2('groupByTime', "Group by Time"),
+			category: SessionsCategories.Sessions,
+			toggled: ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Date),
+			menu: [{ id: SessionsViewFilterSubMenu, group: '2_group', order: 1 }]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.setGrouping(SessionsGrouping.Date);
+	}
+});
+
+//  Workspace Group Capping
+
+registerAction2(class ShowRecentWorkspaceSessionsAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.showRecentSessions',
+			title: localize2('showRecentSessions', "Show Recent Sessions"),
+			category: SessionsCategories.Sessions,
+			toggled: IsWorkspaceGroupCappedContext,
+			menu: [{
+				id: SessionsViewFilterSubMenu,
+				group: '3_cap',
+				order: 0,
+				when: ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Workspace),
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.sessionsControl?.setWorkspaceGroupCapped(true);
+		IsWorkspaceGroupCappedContext.bindTo(accessor.get(IContextKeyService)).set(true);
+	}
+});
+
+registerAction2(class ShowAllWorkspaceSessionsAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.showAllSessions',
+			title: localize2('showAllSessions', "Show All Sessions"),
+			category: SessionsCategories.Sessions,
+			toggled: IsWorkspaceGroupCappedContext.negate(),
+			menu: [{
+				id: SessionsViewFilterSubMenu,
+				group: '3_cap',
+				order: 1,
+				when: ContextKeyExpr.equals(SessionsViewGroupingContext.key, SessionsGrouping.Workspace),
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.sessionsControl?.setWorkspaceGroupCapped(false);
+		IsWorkspaceGroupCappedContext.bindTo(accessor.get(IContextKeyService)).set(false);
+	}
+});
+
+//  View Toolbar Actions
+
+registerAction2(class RefreshSessionsAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.refresh',
+			title: localize2('refresh', "Refresh Sessions"),
+			icon: Codicon.refresh,
+			f1: true,
+			category: SessionsCategories.Sessions,
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		return view?.sessionsControl?.refresh();
+	}
+});
+
+registerAction2(class FindSessionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.find',
+			title: localize2('find', "Find Session"),
+			icon: Codicon.search,
+			category: SessionsCategories.Sessions,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 2,
+				when: ContextKeyExpr.equals('view', SessionsViewId),
+			}]
+		});
+	}
+	override run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		return view?.openFind();
+	}
+});
+
+//  Section Actions
+
+registerAction2(class NewSessionForWorkspaceAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsView.sectionNewSession',
+			title: localize2('newSessionForWorkspace', "New Session"),
+			icon: Codicon.newSession,
+			menu: [{
+				id: SessionSectionToolbarMenuId,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.equals(SessionSectionTypeContext.key, 'workspace'),
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor, context?: ISessionSection): Promise<void> {
+		if (!context || !context.sessions || context.sessions.length === 0) {
+			return;
+		}
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		const viewsService = accessor.get(IViewsService);
+		sessionsManagementService.openNewSessionView();
+		const view = await viewsService.openView<NewChatViewPane>(NewChatViewId, true);
+		const workspace = context.sessions[0].workspace.get();
+		if (view && workspace) {
+			view.selectWorkspace({ providerId: context.sessions[0].providerId, workspace });
+		}
+	}
+});
+
+const ConfirmArchiveStorageKey = 'sessions.confirmArchive';
+
+registerAction2(class ArchiveSectionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsView.sectionArchive',
+			title: localize2('archiveSection', "Archive All"),
+			icon: Codicon.archive,
+			menu: [{
+				id: SessionSectionToolbarMenuId,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyExpr.notEquals(SessionSectionTypeContext.key, 'archived'),
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor, context?: ISessionSection): Promise<void> {
+		if (!context || !context.sessions || context.sessions.length === 0) {
+			return;
+		}
+
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		const dialogService = accessor.get(IDialogService);
+		const storageService = accessor.get(IStorageService);
+
+		const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
+		if (!skipConfirmation) {
+			const confirmed = await dialogService.confirm({
+				message: context.sessions.length === 1
+					? localize('archiveSectionSessions.confirmSingle', "Are you sure you want to archive 1 session from '{0}'?", context.label)
+					: localize('archiveSectionSessions.confirm', "Are you sure you want to archive {0} sessions from '{1}'?", context.sessions.length, context.label),
+				detail: localize('archiveSectionSessions.detail', "You can unarchive sessions later if needed from the sessions view."),
+				primaryButton: localize('archiveSectionSessions.archive', "Archive All"),
+				checkbox: {
+					label: localize('doNotAskAgain', "Do not ask me again")
+				}
+			});
+
+			if (!confirmed.confirmed) {
+				return;
+			}
+
+			if (confirmed.checkboxChecked) {
+				storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+			}
+		}
+
+		for (const session of context.sessions) {
+			await sessionsManagementService.archiveSession(session);
+		}
+	}
+});
+
+registerAction2(class UnarchiveSectionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsView.sectionUnarchive',
+			title: localize2('unarchiveSection', "Unarchive All"),
+			icon: Codicon.unarchive,
+			menu: [{
+				id: SessionSectionToolbarMenuId,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyExpr.equals(SessionSectionTypeContext.key, 'archived'),
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor, context?: ISessionSection): Promise<void> {
+		if (!context || !context.sessions || context.sessions.length === 0) {
+			return;
+		}
+
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		const dialogService = accessor.get(IDialogService);
+		const storageService = accessor.get(IStorageService);
+
+		if (context.sessions.length > 1) {
+			const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
+			if (!skipConfirmation) {
+				const confirmed = await dialogService.confirm({
+					message: localize('unarchiveSectionSessions.confirm', "Are you sure you want to unarchive {0} sessions?", context.sessions.length),
+					primaryButton: localize('unarchiveSectionSessions.unarchive', "Unarchive All"),
+					checkbox: {
+						label: localize('doNotAskAgain2', "Do not ask me again")
+					}
+				});
+
+				if (!confirmed.confirmed) {
+					return;
+				}
+
+				if (confirmed.checkboxChecked) {
+					storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+				}
+			}
+		}
+
+		for (const session of context.sessions) {
+			await sessionsManagementService.unarchiveSession(session);
+		}
+	}
+});
+
+//  Session Item Actions
+
+registerAction2(class PinSessionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.pinSession',
+			title: localize2('pinSession', "Pin"),
+			icon: Codicon.pin,
+			menu: [{
+				id: SessionItemToolbarMenuId,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(IsSessionPinnedContext.key, false),
+					ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+				),
+			}, {
+				id: SessionItemContextMenuId,
+				group: '0_pin',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(IsSessionPinnedContext.key, false),
+					ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+				),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, context?: ISessionData): void {
+		if (!context) {
+			return;
+		}
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.sessionsControl?.pinSession(context);
+	}
+});
+
+registerAction2(class UnpinSessionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.unpinSession',
+			title: localize2('unpinSession', "Unpin"),
+			icon: Codicon.pinned,
+			menu: [{
+				id: SessionItemToolbarMenuId,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(IsSessionPinnedContext.key, true),
+					ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+				),
+			}, {
+				id: SessionItemContextMenuId,
+				group: '0_pin',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(IsSessionPinnedContext.key, true),
+					ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+				),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, context?: ISessionData): void {
+		if (!context) {
+			return;
+		}
+		const viewsService = accessor.get(IViewsService);
+		const view = viewsService.getViewWithId<SessionsView>(SessionsViewId);
+		view?.sessionsControl?.unpinSession(context);
+	}
+});
+
+registerAction2(class ArchiveSessionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.archiveSession',
+			title: localize2('archiveSession', "Archive"),
+			icon: Codicon.archive,
+			menu: [{
+				id: SessionItemToolbarMenuId,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+			}, {
+				id: SessionItemContextMenuId,
+				group: '1_edit',
+				order: 2,
+				when: ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor, context?: ISessionData): Promise<void> {
+		if (!context) {
+			return;
+		}
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		await sessionsManagementService.archiveSession(context);
+	}
+});
+
+registerAction2(class UnarchiveSessionAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.unarchiveSession',
+			title: localize2('unarchiveSession', "Unarchive"),
+			icon: Codicon.unarchive,
+			menu: [{
+				id: SessionItemToolbarMenuId,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyExpr.equals(IsSessionArchivedContext.key, true),
+			}, {
+				id: SessionItemContextMenuId,
+				group: '1_edit',
+				order: 2,
+				when: ContextKeyExpr.equals(IsSessionArchivedContext.key, true),
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor, context?: ISessionData): Promise<void> {
+		if (!context) {
+			return;
+		}
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		await sessionsManagementService.unarchiveSession(context);
+	}
+});
+
+registerAction2(class MarkSessionReadAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.markRead',
+			title: localize2('markRead', "Mark as Read"),
+			menu: [{
+				id: SessionItemContextMenuId,
+				group: '0_read',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(IsSessionReadContext.key, false),
+					ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+				),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, context?: ISessionData): void {
+		if (!context) {
+			return;
+		}
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		sessionsManagementService.setRead(context, true);
+	}
+});
+
+registerAction2(class MarkSessionUnreadAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.markUnread',
+			title: localize2('markUnread', "Mark as Unread"),
+			menu: [{
+				id: SessionItemContextMenuId,
+				group: '0_read',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(IsSessionReadContext.key, true),
+					ContextKeyExpr.equals(IsSessionArchivedContext.key, false),
+				),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, context?: ISessionData): void {
+		if (!context) {
+			return;
+		}
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		sessionsManagementService.setRead(context, false);
+	}
+});
+
+registerAction2(class OpenSessionInNewWindowAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.openInNewWindow',
+			title: localize2('openInNewWindow', "Open in New Window"),
+			menu: [{
+				id: SessionItemContextMenuId,
+				group: 'navigation',
+				order: 0,
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor, context?: ISessionData): Promise<void> {
+		if (!context) {
+			return;
+		}
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		await chatWidgetService.openSession(context.resource, AUX_WINDOW_GROUP, {
+			auxiliary: { compact: true, bounds: { width: 800, height: 640 } },
+			pinned: true
+		});
+	}
+});
+
+registerAction2(class MarkAllSessionsReadAction extends Action2 {
+	constructor() {
+		super({
+			id: 'sessionsViewPane.markAllRead',
+			title: localize2('markAllRead', "Mark All as Read"),
+			menu: [{
+				id: SessionItemContextMenuId,
+				group: '0_read',
+				order: 1,
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor): void {
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+		const sessions = sessionsManagementService.getSessions();
+		for (const session of sessions) {
+			if (!session.isArchived.get() && !session.isRead.get()) {
+				sessionsManagementService.setRead(session, true);
+			}
+		}
+	}
+});
+
+registerAction2(class MarkSessionAsDoneAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSession.markAsDone',
+			title: localize2('markAsDone', "Mark as Done"),
+			icon: Codicon.check,
+			menu: [{
+				id: Menus.CommandCenter,
+				order: 102,
+				when: ContextKeyExpr.and(
+					IsAuxiliaryWindowContext.negate(),
+					SessionsWelcomeVisibleContext.negate(),
+					IsNewChatSessionContext.negate()
+				)
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const sessionsManagementService = accessor.get(ISessionsManagementService);
+
+		const activeSession = sessionsManagementService.activeSession.get();
+		if (!activeSession || activeSession.status.get() === SessionStatus.Untitled) {
+			return;
+		}
+		sessionsManagementService.archiveSession(activeSession);
+	}
+});
diff --git a/src/vs/sessions/contrib/sessions/common/sessionData.ts b/src/vs/sessions/contrib/sessions/common/sessionData.ts
new file mode 100644
index 00000000000..4e004be8638
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/common/sessionData.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IObservable } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IChatSessionFileChange } from '../../../../workbench/contrib/chat/common/chatSessionsService.js';
+
+export const GITHUB_REMOTE_FILE_SCHEME = 'github-remote-file';
+
+/**
+ * Status of an agent session as reported by the sessions provider.
+ */
+export const enum SessionStatus {
+	/** Session has not been sent yet (new/untitled). */
+	Untitled = 0,
+	/** Agent is actively working. */
+	InProgress = 1,
+	/** Agent is waiting for user input. */
+	NeedsInput = 2,
+	/** Session has completed successfully. */
+	Completed = 3,
+	/** Session encountered an error. */
+	Error = 4,
+}
+
+/**
+ * A repository within a session workspace.
+ */
+export interface ISessionRepository {
+	/** The source repository URI. */
+	readonly uri: URI;
+	/** The working directory URI (e.g., a git worktree or checkout path). */
+	readonly workingDirectory: URI | undefined;
+	/** Provider-chosen display detail (e.g., branch name, host name). */
+	readonly detail: string | undefined;
+	/** Whether the base branch is protected (drives PR vs merge workflow). */
+	readonly baseBranchProtected: boolean | undefined;
+}
+
+/**
+ * Workspace information for a session, encapsulating one or more repositories.
+ */
+export interface ISessionWorkspace {
+	/** Display label for the workspace (e.g., "my-app", "org/repo", "host:/path"). */
+	readonly label: string;
+	/** Icon for the workspace. */
+	readonly icon: ThemeIcon;
+	/** Repositories in this workspace. */
+	readonly repositories: ISessionRepository[];
+	/** Whether the session requires workspace trust to operate. */
+	readonly requiresWorkspaceTrust: boolean;
+}
+
+/**
+ * Pull request information associated with a session.
+ */
+export interface ISessionPullRequest {
+	/** URI of the pull request. */
+	readonly uri: URI;
+	/** Icon reflecting the PR state. */
+	readonly icon?: ThemeIcon;
+}
+
+/**
+ * The common session interface exposed by sessions providers.
+ * Self-contained facade — components should not reach back to underlying
+ * services to resolve additional data.
+ */
+export interface ISessionData {
+	/** Globally unique session ID (`providerId:localId`). */
+	readonly sessionId: string;
+	/** Resource URI identifying this session. */
+	readonly resource: URI;
+	/** ID of the provider that owns this session. */
+	readonly providerId: string;
+	/** Session type ID (e.g., 'copilot-cli', 'copilot-cloud'). */
+	readonly sessionType: string;
+	/** Icon for this session. */
+	readonly icon: ThemeIcon;
+	/** When the session was created. */
+	readonly createdAt: Date;
+	/** Workspace this session operates on. */
+	readonly workspace: IObservable<ISessionWorkspace | undefined>;
+
+	// Reactive properties
+
+	/** Session display title (changes when auto-titled or renamed). */
+	readonly title: IObservable<string>;
+	/** When the session was last updated. */
+	readonly updatedAt: IObservable<Date>;
+	/** Current session status. */
+	readonly status: IObservable<SessionStatus>;
+	/** File changes produced by the session. */
+	readonly changes: IObservable<readonly IChatSessionFileChange[]>;
+	/** Currently selected model identifier. */
+	readonly modelId: IObservable<string | undefined>;
+	/** Currently selected mode identifier and kind. */
+	readonly mode: IObservable<{ readonly id: string; readonly kind: string } | undefined>;
+	/** Whether the session is still initializing (e.g., resolving git repository). */
+	readonly loading: IObservable<boolean>;
+	/** Whether the session is archived. */
+	readonly isArchived: IObservable<boolean>;
+	/** Whether the session has been read. */
+	readonly isRead: IObservable<boolean>;
+	/** Status description shown while the session is active (e.g., current agent action). */
+	readonly description: IObservable<string | undefined>;
+	/** Timestamp of when the last agent turn ended, if any. */
+	readonly lastTurnEnd: IObservable<Date | undefined>;
+	/** Pull request associated with this session, if any. */
+	readonly pullRequest: IObservable<ISessionPullRequest | undefined>;
+}
diff --git a/src/vs/sessions/contrib/sessions/common/sessionsProvider.ts b/src/vs/sessions/contrib/sessions/common/sessionsProvider.ts
new file mode 100644
index 00000000000..a4a092d8349
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/common/sessionsProvider.ts
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
diff --git a/src/vs/sessions/contrib/sessions/common/sessionsProvidersService.ts b/src/vs/sessions/contrib/sessions/common/sessionsProvidersService.ts
new file mode 100644
index 00000000000..a4a092d8349
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/common/sessionsProvidersService.ts
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
diff --git a/src/vs/sessions/contrib/sessions/test/browser/aiCustomizationShortcutsWidget.fixture.ts b/src/vs/sessions/contrib/sessions/test/browser/aiCustomizationShortcutsWidget.fixture.ts
index 0f4a7bf7a28..40f6cbce356 100644
--- a/src/vs/sessions/contrib/sessions/test/browser/aiCustomizationShortcutsWidget.fixture.ts
+++ b/src/vs/sessions/contrib/sessions/test/browser/aiCustomizationShortcutsWidget.fixture.ts
@@ -23,7 +23,8 @@ import { IAgentPluginService } from '../../../../../workbench/contrib/chat/commo
 import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from '../../../../../workbench/test/browser/componentFixtures/fixtureUtils.js';
 import { AICustomizationShortcutsWidget } from '../../browser/aiCustomizationShortcutsWidget.js';
 import { CUSTOMIZATION_ITEMS, CustomizationLinkViewItem } from '../../browser/customizationsToolbar.contribution.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../browser/sessionsManagementService.js';
+import { ISessionsManagementService } from '../../browser/sessionsManagementService.js';
+import { ISessionData } from '../../common/sessionData.js';
 import { Menus } from '../../../../browser/menus.js';
 
 // Ensure color registrations are loaded
@@ -200,7 +201,7 @@ function renderWidget(ctx: ComponentFixtureContext, options?: { mcpServerCount?:
 				override readonly onDidChangeLanguageModels = Event.None;
 			}());
 			reg.defineInstance(ISessionsManagementService, new class extends mock<ISessionsManagementService>() {
-				override readonly activeSession = observableValue<IActiveSessionItem | undefined>('activeSession', undefined);
+				override readonly activeSession = observableValue<ISessionData | undefined>('activeSession', undefined);
 			}());
 			reg.defineInstance(IFileService, new class extends mock<IFileService>() {
 				override readonly onDidFilesChange = Event.None;
diff --git a/src/vs/sessions/contrib/sessions/test/browser/sessionsList.test.ts b/src/vs/sessions/contrib/sessions/test/browser/sessionsList.test.ts
new file mode 100644
index 00000000000..3e31fb87135
--- /dev/null
+++ b/src/vs/sessions/contrib/sessions/test/browser/sessionsList.test.ts
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ISessionData, SessionStatus } from '../../common/sessionData.js';
+import { groupByWorkspace, sortSessions, SessionsSorting } from '../../browser/views/sessionsList.js';
+
+function createSession(id: string, opts: {
+	workspaceLabel?: string;
+	createdAt?: Date;
+	updatedAt?: Date;
+	isArchived?: boolean;
+}): ISessionData {
+	const createdAt = opts.createdAt ?? new Date();
+	const updatedAt = opts.updatedAt ?? createdAt;
+	return {
+		sessionId: id,
+		resource: URI.parse(`session://${id}`),
+		providerId: 'test',
+		sessionType: 'test',
+		icon: Codicon.account,
+		createdAt,
+		workspace: observableValue(`workspace-${id}`, opts.workspaceLabel ? {
+			label: opts.workspaceLabel,
+			icon: Codicon.folder,
+			repositories: [],
+			requiresWorkspaceTrust: false,
+		} : undefined),
+		title: observableValue(`title-${id}`, id),
+		updatedAt: observableValue(`updatedAt-${id}`, updatedAt),
+		status: observableValue(`status-${id}`, SessionStatus.Completed),
+		changes: observableValue(`changes-${id}`, []),
+		modelId: observableValue(`modelId-${id}`, undefined),
+		mode: observableValue(`mode-${id}`, undefined),
+		loading: observableValue(`loading-${id}`, false),
+		isArchived: observableValue(`isArchived-${id}`, opts.isArchived ?? false),
+		isRead: observableValue(`isRead-${id}`, true),
+		description: observableValue(`description-${id}`, undefined),
+		lastTurnEnd: observableValue(`lastTurnEnd-${id}`, undefined),
+		pullRequest: observableValue(`pullRequest-${id}`, undefined),
+	};
+}
+
+suite('Sessions - SessionsList Helpers', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('groupByWorkspace', () => {
+
+		test('groups are sorted alphabetically regardless of insertion order', () => {
+			const sessions = [
+				createSession('1', { workspaceLabel: 'Zebra' }),
+				createSession('2', { workspaceLabel: 'Apple' }),
+				createSession('3', { workspaceLabel: 'Mango' }),
+			];
+
+			const groups = groupByWorkspace(sessions);
+
+			assert.deepStrictEqual(groups.map(g => g.label), ['Apple', 'Mango', 'Zebra']);
+		});
+
+		test('sessions without workspace are grouped under "No Workspace"', () => {
+			const sessions = [
+				createSession('1', { workspaceLabel: 'Beta' }),
+				createSession('2', {}),
+				createSession('3', { workspaceLabel: 'Alpha' }),
+			];
+
+			const groups = groupByWorkspace(sessions);
+
+			assert.deepStrictEqual(groups.map(g => g.label), ['Alpha', 'Beta', 'No Workspace']);
+		});
+
+		test('multiple sessions in same workspace are grouped together', () => {
+			const sessions = [
+				createSession('1', { workspaceLabel: 'Repo-B' }),
+				createSession('2', { workspaceLabel: 'Repo-A' }),
+				createSession('3', { workspaceLabel: 'Repo-B' }),
+			];
+
+			const groups = groupByWorkspace(sessions);
+
+			assert.deepStrictEqual(groups.map(g => g.label), ['Repo-A', 'Repo-B']);
+			assert.strictEqual(groups[0].sessions.length, 1);
+			assert.strictEqual(groups[1].sessions.length, 2);
+		});
+
+		test('group ids are prefixed with workspace:', () => {
+			const sessions = [
+				createSession('1', { workspaceLabel: 'MyProject' }),
+			];
+
+			const groups = groupByWorkspace(sessions);
+
+			assert.strictEqual(groups[0].id, 'workspace:MyProject');
+		});
+	});
+
+	suite('sortSessions', () => {
+
+		test('sorts by createdAt descending when sorting is Created', () => {
+			const sessions = [
+				createSession('old', { createdAt: new Date('2024-01-01') }),
+				createSession('new', { createdAt: new Date('2024-06-01') }),
+				createSession('mid', { createdAt: new Date('2024-03-01') }),
+			];
+
+			const sorted = sortSessions(sessions, SessionsSorting.Created);
+
+			assert.deepStrictEqual(sorted.map(s => s.sessionId), ['new', 'mid', 'old']);
+		});
+
+		test('sorts by updatedAt descending when sorting is Updated', () => {
+			const sessions = [
+				createSession('a', { createdAt: new Date('2024-06-01'), updatedAt: new Date('2024-07-01') }),
+				createSession('b', { createdAt: new Date('2024-01-01'), updatedAt: new Date('2024-09-01') }),
+				createSession('c', { createdAt: new Date('2024-03-01'), updatedAt: new Date('2024-08-01') }),
+			];
+
+			const sorted = sortSessions(sessions, SessionsSorting.Updated);
+
+			assert.deepStrictEqual(sorted.map(s => s.sessionId), ['b', 'c', 'a']);
+		});
+	});
+});
diff --git a/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContribution.ts b/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContribution.ts
index 0469553aa77..d248d4c7005 100644
--- a/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContribution.ts
+++ b/src/vs/sessions/contrib/terminal/browser/sessionsTerminalContribution.ts
@@ -8,33 +8,37 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
-import { localize2 } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IWorkbenchContribution, getWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
-import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
 import { ITerminalInstance, ITerminalService } from '../../../../workbench/contrib/terminal/browser/terminal.js';
 import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
 import { IPathService } from '../../../../workbench/services/path/common/pathService.js';
 import { Menus } from '../../../browser/menus.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionData } from '../../sessions/common/sessionData.js';
 import { IsAuxiliaryWindowContext } from '../../../../workbench/common/contextkeys.js';
-import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
 import { IViewsService } from '../../../../workbench/services/views/common/viewsService.js';
 import { TERMINAL_VIEW_ID } from '../../../../workbench/contrib/terminal/common/terminal.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../workbench/services/layout/browser/layoutService.js';
+
+const SessionsTerminalViewVisibleContext = new RawContextKey<boolean>('sessionsTerminalViewVisible', false);
 
 /**
  * Returns the cwd URI for the given session: worktree or repository path for
  * background sessions only. Returns `undefined` for non-background sessions
  * (Cloud, Local, etc.) which have no local worktree, or when no path is available.
  */
-function getSessionCwd(session: IActiveSessionItem | undefined): URI | undefined {
-	if (session?.providerType !== AgentSessionProviders.Background) {
+function getSessionCwd(session: ISessionData | undefined): URI | undefined {
+	if (session?.sessionType !== AgentSessionProviders.Background) {
 		return undefined;
 	}
-	return session.worktree ?? session.repository;
+	const repo = session.workspace.get()?.repositories[0];
+	return repo?.workingDirectory ?? repo?.uri;
 }
 
 /**
@@ -52,12 +56,23 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 	constructor(
 		@ISessionsManagementService private readonly _sessionsManagementService: ISessionsManagementService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
-		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
 		@ILogService private readonly _logService: ILogService,
 		@IPathService private readonly _pathService: IPathService,
+		@IViewsService viewsService: IViewsService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
 		super();
 
+		// Track whether the terminal view is visible so the titlebar toggle
+		// button shows the correct checked state.
+		const terminalViewVisible = SessionsTerminalViewVisibleContext.bindTo(contextKeyService);
+		terminalViewVisible.set(viewsService.isViewVisible(TERMINAL_VIEW_ID));
+		this._register(viewsService.onDidChangeViewVisibility(e => {
+			if (e.id === TERMINAL_VIEW_ID) {
+				terminalViewVisible.set(e.visible);
+			}
+		}));
+
 		// React to active session changes — use worktree/repo for background sessions, home dir otherwise
 		this._register(autorun(reader => {
 			const session = this._sessionsManagementService.activeSession.read(reader);
@@ -71,19 +86,23 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 			if (instance.shellLaunchConfig.attachPersistentProcess && this._activeKey) {
 				instance.getInitialCwd().then(cwd => {
 					if (cwd.toLowerCase() !== this._activeKey) {
-						this._terminalService.moveToBackground(instance);
-						this._logService.trace(`[SessionsTerminal] Hid restored terminal ${instance.instanceId} (cwd: ${cwd})`);
+						const availableInstance = this._getAvailableTerminal(instance, `hide restored terminal for ${cwd}`);
+						if (!availableInstance) {
+							return;
+						}
+						this._terminalService.moveToBackground(availableInstance);
+						this._logService.trace(`[SessionsTerminal] Hid restored terminal ${availableInstance.instanceId} (cwd: ${cwd})`);
 					}
 				});
 			}
 		}));
 
-		// When a session is archived, close all terminals for its worktree
-		this._register(this._agentSessionsService.model.onDidChangeSessionArchivedState(session => {
-			if (session.isArchived()) {
-				const worktreePath = session.metadata?.worktreePath as string | undefined;
-				if (worktreePath) {
-					this._closeTerminalsForPath(URI.file(worktreePath).fsPath);
+		// When a session is archived or removed, close all terminals for its worktree
+		this._register(this._sessionsManagementService.onDidChangeSessions(e => {
+			for (const session of [...e.removed, ...e.changed.filter(s => s.isArchived.get())]) {
+				const worktreeUri = session.workspace.get()?.repositories[0]?.workingDirectory;
+				if (worktreeUri) {
+					this._closeTerminalsForPath(worktreeUri.fsPath);
 				}
 			}
 		}));
@@ -99,9 +118,18 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 		let existing = await this._findTerminalsForKey(key);
 
 		if (existing.length === 0) {
-			existing = [await this._terminalService.createTerminal({ config: { cwd } })];
-			this._terminalService.setActiveInstance(existing[0]);
-			this._logService.trace(`[SessionsTerminal] Created terminal ${existing[0].instanceId} for ${cwd.fsPath}`);
+			try {
+				const createdInstance = this._getAvailableTerminal(await this._terminalService.createTerminal({ config: { cwd } }), `activate created terminal for ${cwd.fsPath}`);
+				if (!createdInstance) {
+					return [];
+				}
+				existing = [createdInstance];
+				this._terminalService.setActiveInstance(createdInstance);
+				this._logService.trace(`[SessionsTerminal] Created terminal ${createdInstance.instanceId} for ${cwd.fsPath}`);
+			} catch (e) {
+				this._logService.trace(`[SessionsTerminal] Cannot create terminal for ${cwd.fsPath}: ${e}`);
+				return [];
+			}
 		}
 
 		if (focus) {
@@ -111,7 +139,7 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 		return existing;
 	}
 
-	private async _onActiveSessionChanged(session: IActiveSessionItem | undefined): Promise<void> {
+	private async _onActiveSessionChanged(session: ISessionData | undefined): Promise<void> {
 		if (!session) {
 			return;
 		}
@@ -154,6 +182,15 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 		return result;
 	}
 
+	private _getAvailableTerminal(instance: ITerminalInstance, action: string): ITerminalInstance | undefined {
+		const currentInstance = this._terminalService.getInstanceFromId(instance.instanceId);
+		if (!currentInstance || currentInstance.isDisposed) {
+			this._logService.trace(`[SessionsTerminal] Cannot ${action}; terminal ${instance.instanceId} is no longer available`);
+			return undefined;
+		}
+		return currentInstance;
+	}
+
 	/**
 	 * Shows background terminals whose initial cwd matches the active key and
 	 * hides foreground terminals whose initial cwd does not match.
@@ -169,22 +206,32 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 			} catch {
 				continue;
 			}
+			const currentInstance = this._getAvailableTerminal(instance, `update visibility for ${cwd}`);
+			if (!currentInstance) {
+				continue;
+			}
 
-			const isForeground = this._terminalService.foregroundInstances.includes(instance);
-			const isForceVisible = forceForegroundTerminalIds.includes(instance.instanceId);
+			const isForeground = this._terminalService.foregroundInstances.includes(currentInstance);
+			const isForceVisible = forceForegroundTerminalIds.includes(currentInstance.instanceId);
 			const belongsToActiveSession = cwd === activeKey;
 			if ((belongsToActiveSession || isForceVisible) && !isForeground) {
-				toShow.push(instance);
+				toShow.push(currentInstance);
 			} else if (!belongsToActiveSession && !isForceVisible && isForeground) {
-				toHide.push(instance);
+				toHide.push(currentInstance);
 			}
 		}
 
 		for (const instance of toShow) {
-			await this._terminalService.showBackgroundTerminal(instance, true);
+			const availableInstance = this._getAvailableTerminal(instance, 'show background terminal');
+			if (availableInstance) {
+				await this._terminalService.showBackgroundTerminal(availableInstance, true);
+			}
 		}
 		for (const instance of toHide) {
-			this._terminalService.moveToBackground(instance);
+			const availableInstance = this._getAvailableTerminal(instance, 'move terminal to background');
+			if (availableInstance) {
+				this._terminalService.moveToBackground(availableInstance);
+			}
 		}
 
 		// Set the terminal with the most recent command as active
@@ -210,8 +257,12 @@ export class SessionsTerminalContribution extends Disposable implements IWorkben
 			try {
 				const cwd = (await instance.getInitialCwd()).toLowerCase();
 				if (cwd === key) {
-					this._terminalService.safeDisposeTerminal(instance);
-					this._logService.trace(`[SessionsTerminal] Closed archived terminal ${instance.instanceId}`);
+					const availableInstance = this._getAvailableTerminal(instance, `close archived terminal for ${fsPath}`);
+					if (!availableInstance) {
+						continue;
+					}
+					this._terminalService.safeDisposeTerminal(availableInstance);
+					this._logService.trace(`[SessionsTerminal] Closed archived terminal ${availableInstance.instanceId}`);
 				}
 			} catch {
 				// ignore
@@ -249,6 +300,10 @@ class OpenSessionInTerminalAction extends Action2 {
 			id: 'agentSession.openInTerminal',
 			title: localize2('openInTerminal', "Open Terminal"),
 			icon: Codicon.terminal,
+			toggled: {
+				condition: SessionsTerminalViewVisibleContext,
+				title: localize('hideTerminal', "Hide Terminal"),
+			},
 			menu: [{
 				id: Menus.TitleBarSessionMenu,
 				group: 'navigation',
@@ -259,10 +314,21 @@ class OpenSessionInTerminalAction extends Action2 {
 	}
 
 	override async run(_accessor: ServicesAccessor): Promise<void> {
+		const layoutService = _accessor.get(IWorkbenchLayoutService);
+		const viewsService = _accessor.get(IViewsService);
+
+		// Toggle: if panel is visible and the terminal view is active, hide it.
+		// If the panel is visible but showing another view, open the terminal instead.
+		if (layoutService.isVisible(Parts.PANEL_PART)) {
+			if (viewsService.isViewVisible(TERMINAL_VIEW_ID)) {
+				layoutService.setPartHidden(true, Parts.PANEL_PART);
+				return;
+			}
+		}
+
 		const contribution = getWorkbenchContribution<SessionsTerminalContribution>(SessionsTerminalContribution.ID);
 		const sessionsManagementService = _accessor.get(ISessionsManagementService);
 		const pathService = _accessor.get(IPathService);
-		const viewsService = _accessor.get(IViewsService);
 
 		const activeSession = sessionsManagementService.activeSession.get();
 		const cwd = getSessionCwd(activeSession) ?? await pathService.userHome();
diff --git a/src/vs/sessions/contrib/terminal/test/browser/sessionsTerminalContribution.test.ts b/src/vs/sessions/contrib/terminal/test/browser/sessionsTerminalContribution.test.ts
index 0d84c3735df..a408b138ecb 100644
--- a/src/vs/sessions/contrib/terminal/test/browser/sessionsTerminalContribution.test.ts
+++ b/src/vs/sessions/contrib/terminal/test/browser/sessionsTerminalContribution.test.ts
@@ -6,7 +6,7 @@
 import assert from 'assert';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { observableValue } from '../../../../../base/common/observable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { mock } from '../../../../../base/test/common/mock.js';
@@ -14,46 +14,103 @@ import { TestInstantiationService } from '../../../../../platform/instantiation/
 import { NullLogService, ILogService } from '../../../../../platform/log/common/log.js';
 import { ITerminalInstance, ITerminalService } from '../../../../../workbench/contrib/terminal/browser/terminal.js';
 import { ITerminalCapabilityStore, ICommandDetectionCapability, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
-import { IAgentSessionsService } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { IAgentSession, IAgentSessionsModel } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js';
 import { AgentSessionProviders } from '../../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../../sessions/browser/sessionsManagementService.js';
+import { ISessionsManagementService } from '../../../sessions/browser/sessionsManagementService.js';
+import { ISessionData } from '../../../sessions/common/sessionData.js';
+import { ISessionsChangeEvent } from '../../../sessions/browser/sessionsProvider.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 import { SessionsTerminalContribution } from '../../browser/sessionsTerminalContribution.js';
 import { TestPathService } from '../../../../../workbench/test/browser/workbenchTestServices.js';
 import { IPathService } from '../../../../../workbench/services/path/common/pathService.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IViewsService } from '../../../../../workbench/services/views/common/viewsService.js';
 
 const HOME_DIR = URI.file('/home/user');
 
+class TestLogService extends NullLogService {
+	readonly traces: string[] = [];
+
+	override trace(message: string, ...args: unknown[]): void {
+		this.traces.push([message, ...args].join(' '));
+	}
+}
+
+type TestTerminalInstance = ITerminalInstance & {
+	_testCommandHistory: { timestamp: number }[];
+	_testSetDisposed(disposed: boolean): void;
+	_testSetShellLaunchConfig(shellLaunchConfig: ITerminalInstance['shellLaunchConfig']): void;
+};
+
 function makeAgentSession(opts: {
 	repository?: URI;
 	worktree?: URI;
 	providerType?: string;
 	isArchived?: boolean;
-	worktreePath?: string;
-}): IActiveSessionItem & IAgentSession {
+}): ISessionData {
+	const repo = opts.repository || opts.worktree ? {
+		uri: opts.repository ?? opts.worktree!,
+		workingDirectory: opts.worktree,
+		detail: undefined,
+		baseBranchProtected: undefined,
+	} : undefined;
 	return {
+		sessionId: 'test:session',
 		resource: URI.parse('file:///session'),
-		repository: opts.repository,
-		worktree: opts.worktree,
-		providerType: opts.providerType ?? AgentSessionProviders.Local,
-		setArchived: () => { },
-		setRead: () => { },
-		isArchived: () => opts.isArchived ?? false,
-		isRead: () => true,
-		metadata: opts.worktreePath ? { worktreePath: opts.worktreePath } : undefined,
-	} as unknown as IActiveSessionItem & IAgentSession;
+		providerId: 'test',
+		sessionType: opts.providerType ?? AgentSessionProviders.Local,
+		icon: Codicon.copilot,
+		createdAt: new Date(),
+		workspace: observableValue('test.workspace', repo ? { label: 'test', icon: Codicon.repo, repositories: [repo], requiresWorkspaceTrust: false, } : undefined),
+		title: observableValue('test.title', 'Test Session'),
+		updatedAt: observableValue('test.updatedAt', new Date()),
+		status: observableValue('test.status', 0),
+		changes: observableValue('test.changes', []),
+		modelId: observableValue('test.modelId', undefined),
+		mode: observableValue('test.mode', undefined),
+		loading: observableValue('test.loading', false),
+		isArchived: observableValue('test.isArchived', opts.isArchived ?? false),
+		isRead: observableValue('test.isRead', true),
+		lastTurnEnd: observableValue('test.lastTurnEnd', undefined),
+		description: observableValue('test.description', undefined),
+		pullRequest: observableValue('test.pullRequest', undefined),
+	};
 }
 
-function makeNonAgentSession(opts: { repository?: URI; worktree?: URI; providerType?: string }): IActiveSessionItem {
+function makeNonAgentSession(opts: { repository?: URI; worktree?: URI; providerType?: string }): ISessionData {
+	const repo = opts.repository || opts.worktree ? {
+		uri: opts.repository ?? opts.worktree!,
+		workingDirectory: opts.worktree,
+		detail: undefined,
+		baseBranchProtected: undefined,
+	} : undefined;
 	return {
-		repository: opts.repository,
-		worktree: opts.worktree,
-		providerType: opts.providerType ?? AgentSessionProviders.Local,
-	} as IActiveSessionItem;
+		sessionId: 'test:non-agent',
+		resource: URI.parse('file:///session'),
+		providerId: 'test',
+		sessionType: opts.providerType ?? AgentSessionProviders.Local,
+		icon: Codicon.copilot,
+		createdAt: new Date(),
+		workspace: observableValue('test.workspace', repo ? { label: 'test', icon: Codicon.repo, repositories: [repo], requiresWorkspaceTrust: false, } : undefined),
+		title: observableValue('test.title', 'Test Session'),
+		updatedAt: observableValue('test.updatedAt', new Date()),
+		status: observableValue('test.status', 0),
+		changes: observableValue('test.changes', []),
+		modelId: observableValue('test.modelId', undefined),
+		mode: observableValue('test.mode', undefined),
+		loading: observableValue('test.loading', false),
+		isArchived: observableValue('test.isArchived', false),
+		isRead: observableValue('test.isRead', true),
+		lastTurnEnd: observableValue('test.lastTurnEnd', undefined),
+		description: observableValue('test.description', undefined),
+		pullRequest: observableValue('test.pullRequest', undefined),
+	};
 }
 
-function makeTerminalInstance(id: number, cwd: string): ITerminalInstance & { _testCommandHistory: { timestamp: number }[] } {
+function makeTerminalInstance(id: number, cwd: string): TestTerminalInstance {
 	const commandHistory: { timestamp: number }[] = [];
+	let isDisposed = false;
+	let shellLaunchConfig: ITerminalInstance['shellLaunchConfig'] = {} as ITerminalInstance['shellLaunchConfig'];
 	const capabilities = {
 		get(cap: TerminalCapability) {
 			if (cap === TerminalCapability.CommandDetection && commandHistory.length > 0) {
@@ -65,22 +122,30 @@ function makeTerminalInstance(id: number, cwd: string): ITerminalInstance & { _t
 
 	return {
 		instanceId: id,
-		isDisposed: false,
+		get isDisposed() { return isDisposed; },
+		get shellLaunchConfig() { return shellLaunchConfig; },
 		getInitialCwd: () => Promise.resolve(cwd),
 		capabilities,
 		_testCommandHistory: commandHistory,
-	} as unknown as ITerminalInstance & { _testCommandHistory: { timestamp: number }[] };
+		_testSetDisposed(disposed: boolean) {
+			isDisposed = disposed;
+		},
+		_testSetShellLaunchConfig(value: ITerminalInstance['shellLaunchConfig']) {
+			shellLaunchConfig = value;
+		},
+	} as unknown as TestTerminalInstance;
 }
 
 function addCommandToInstance(instance: ITerminalInstance, timestamp: number): void {
-	(instance as ITerminalInstance & { _testCommandHistory: { timestamp: number }[] })._testCommandHistory.push({ timestamp });
+	(instance as TestTerminalInstance)._testCommandHistory.push({ timestamp });
 }
 
 suite('SessionsTerminalContribution', () => {
 	const store = new DisposableStore();
 	let contribution: SessionsTerminalContribution;
-	let activeSessionObs: ReturnType<typeof observableValue<IActiveSessionItem | undefined>>;
-	let onDidChangeSessionArchivedState: Emitter<IAgentSession>;
+	let activeSessionObs: ReturnType<typeof observableValue<ISessionData | undefined>>;
+	let onDidChangeSessions: Emitter<ISessionsChangeEvent>;
+	let onDidCreateInstance: Emitter<ITerminalInstance>;
 
 	let createdTerminals: { cwd: URI }[];
 	let activeInstanceSet: number[];
@@ -91,6 +156,8 @@ suite('SessionsTerminalContribution', () => {
 	let backgroundedInstances: Set<number>;
 	let moveToBackgroundCalls: number[];
 	let showBackgroundCalls: number[];
+	let disposeOnCreatePaths: Set<string>;
+	let logService: TestLogService;
 
 	setup(() => {
 		createdTerminals = [];
@@ -102,20 +169,24 @@ suite('SessionsTerminalContribution', () => {
 		backgroundedInstances = new Set();
 		moveToBackgroundCalls = [];
 		showBackgroundCalls = [];
+		disposeOnCreatePaths = new Set();
+		logService = new TestLogService();
 
 		const instantiationService = store.add(new TestInstantiationService());
 
-		activeSessionObs = observableValue('activeSession', undefined);
-		onDidChangeSessionArchivedState = store.add(new Emitter<IAgentSession>());
+		activeSessionObs = observableValue<ISessionData | undefined>('activeSession', undefined);
+		onDidChangeSessions = store.add(new Emitter<ISessionsChangeEvent>());
+		onDidCreateInstance = store.add(new Emitter<ITerminalInstance>());
 
-		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(ILogService, logService);
 
 		instantiationService.stub(ISessionsManagementService, new class extends mock<ISessionsManagementService>() {
 			override activeSession = activeSessionObs;
+			override readonly onDidChangeSessions = onDidChangeSessions.event;
 		});
 
 		instantiationService.stub(ITerminalService, new class extends mock<ITerminalService>() {
-			override onDidCreateInstance = Event.None;
+			override onDidCreateInstance = onDidCreateInstance.event;
 			override get instances(): readonly ITerminalInstance[] {
 				return [...terminalInstances.values()];
 			}
@@ -129,6 +200,10 @@ suite('SessionsTerminalContribution', () => {
 				const instance = makeTerminalInstance(id, cwdStr);
 				createdTerminals.push({ cwd: opts?.config?.cwd });
 				terminalInstances.set(id, instance);
+				if (disposeOnCreatePaths.has(cwdStr)) {
+					instance._testSetDisposed(true);
+					terminalInstances.delete(id);
+				}
 				return instance;
 			}
 			override getInstanceFromId(id: number): ITerminalInstance | undefined {
@@ -142,6 +217,7 @@ suite('SessionsTerminalContribution', () => {
 			}
 			override async safeDisposeTerminal(instance: ITerminalInstance): Promise<void> {
 				disposedInstances.push(instance);
+				(instance as TestTerminalInstance)._testSetDisposed(true);
 				terminalInstances.delete(instance.instanceId);
 				backgroundedInstances.delete(instance.instanceId);
 			}
@@ -155,14 +231,15 @@ suite('SessionsTerminalContribution', () => {
 			}
 		});
 
-		instantiationService.stub(IAgentSessionsService, new class extends mock<IAgentSessionsService>() {
-			override model = {
-				onDidChangeSessionArchivedState: onDidChangeSessionArchivedState.event,
-			} as unknown as IAgentSessionsModel;
-		});
-
 		instantiationService.stub(IPathService, new TestPathService(HOME_DIR));
 
+		instantiationService.stub(IContextKeyService, store.add(new MockContextKeyService()));
+
+		instantiationService.stub(IViewsService, new class extends mock<IViewsService>() {
+			override isViewVisible(): boolean { return false; }
+			override onDidChangeViewVisibility = store.add(new Emitter<{ id: string; visible: boolean }>()).event;
+		});
+
 		contribution = store.add(instantiationService.createInstance(SessionsTerminalContribution));
 	});
 
@@ -315,7 +392,18 @@ suite('SessionsTerminalContribution', () => {
 		assert.strictEqual(createdTerminals.length, 1, 'should match case-insensitively');
 	});
 
-	// --- onDidChangeSessionArchivedState ---
+	test('ensureTerminal does not activate a terminal disposed during creation', async () => {
+		const cwd = URI.file('/test-cwd');
+		disposeOnCreatePaths.add(cwd.fsPath);
+
+		const instances = await contribution.ensureTerminal(cwd, false);
+
+		assert.strictEqual(instances.length, 0);
+		assert.strictEqual(activeInstanceSet.length, 0);
+		assert.ok(logService.traces.some(message => message.includes(`Cannot activate created terminal for ${cwd.fsPath}; terminal 1 is no longer available`)));
+	});
+
+	// --- onDidChangeSessions (archived) ---
 
 	test('closes terminals when session is archived', async () => {
 		const worktreeUri = URI.file('/worktree');
@@ -325,9 +413,9 @@ suite('SessionsTerminalContribution', () => {
 
 		const session = makeAgentSession({
 			isArchived: true,
-			worktreePath: worktreeUri.fsPath,
+			worktree: worktreeUri,
 		});
-		onDidChangeSessionArchivedState.fire(session);
+		onDidChangeSessions.fire({ added: [], removed: [], changed: [session] });
 		await tick();
 
 		assert.strictEqual(disposedInstances.length, 1);
@@ -339,25 +427,38 @@ suite('SessionsTerminalContribution', () => {
 
 		const session = makeAgentSession({
 			isArchived: false,
-			worktreePath: worktreeUri.fsPath,
+			worktree: worktreeUri,
 		});
-		onDidChangeSessionArchivedState.fire(session);
+		onDidChangeSessions.fire({ added: [], removed: [], changed: [session] });
 		await tick();
 
 		assert.strictEqual(disposedInstances.length, 0);
 	});
 
-	test('does not close terminals when archived session has no worktreePath', async () => {
+	test('does not close terminals when archived session has no worktree', async () => {
 		const worktreeUri = URI.file('/worktree');
 		await contribution.ensureTerminal(worktreeUri, false);
 
 		const session = makeAgentSession({ isArchived: true });
-		onDidChangeSessionArchivedState.fire(session);
+		onDidChangeSessions.fire({ added: [], removed: [], changed: [session] });
 		await tick();
 
 		assert.strictEqual(disposedInstances.length, 0);
 	});
 
+	test('closes terminals when session is removed', async () => {
+		const worktreeUri = URI.file('/worktree');
+		await contribution.ensureTerminal(worktreeUri, false);
+
+		assert.strictEqual(createdTerminals.length, 1);
+
+		const session = makeAgentSession({ worktree: worktreeUri });
+		onDidChangeSessions.fire({ added: [], removed: [session], changed: [] });
+		await tick();
+
+		assert.strictEqual(disposedInstances.length, 1);
+	});
+
 	// --- switching back to previously used path reuses terminal ---
 
 	test('switching back to a previously used background path reuses the existing terminal', async () => {
@@ -451,6 +552,28 @@ suite('SessionsTerminalContribution', () => {
 		assert.ok(showBackgroundCalls.includes(existingInstance.instanceId), 'should show the existing terminal');
 	});
 
+	test('does not background a restored terminal that is disposed before cwd resolves', async () => {
+		let resolveInitialCwd: ((cwd: string) => void) | undefined;
+		const restoredInstance = makeTerminalInstance(nextInstanceId++, '/restored');
+		restoredInstance._testSetShellLaunchConfig({ attachPersistentProcess: {} as never } as ITerminalInstance['shellLaunchConfig']);
+		restoredInstance.getInitialCwd = () => new Promise<string>(resolve => {
+			resolveInitialCwd = resolve;
+		});
+		terminalInstances.set(restoredInstance.instanceId, restoredInstance);
+
+		activeSessionObs.set(makeAgentSession({ worktree: URI.file('/active'), providerType: AgentSessionProviders.Background }), undefined);
+		await tick();
+
+		onDidCreateInstance.fire(restoredInstance);
+		restoredInstance._testSetDisposed(true);
+		terminalInstances.delete(restoredInstance.instanceId);
+		resolveInitialCwd?.('/other');
+		await tick();
+
+		assert.ok(!moveToBackgroundCalls.includes(restoredInstance.instanceId), 'disposed restored terminal should not be backgrounded');
+		assert.ok(logService.traces.some(message => message.includes('Cannot hide restored terminal for /other; terminal') && message.includes('is no longer available')));
+	});
+
 	test('hides pre-existing terminal with non-matching cwd when session changes', async () => {
 		// Manually add a terminal that already exists with a different cwd
 		const otherInstance = makeTerminalInstance(nextInstanceId++, '/other/path');
diff --git a/src/vs/sessions/contrib/welcome/browser/welcome.contribution.ts b/src/vs/sessions/contrib/welcome/browser/welcome.contribution.ts
index f22ddd122c5..29634287b09 100644
--- a/src/vs/sessions/contrib/welcome/browser/welcome.contribution.ts
+++ b/src/vs/sessions/contrib/welcome/browser/welcome.contribution.ts
@@ -90,7 +90,6 @@ class SessionsWelcomeOverlay extends Disposable {
 				dialogTitle: this.chatEntitlementService.anonymous ?
 					localize('sessions.startUsingSessions', "Start using Sessions") :
 					localize('sessions.signinRequired', "Sign in to use Sessions"),
-				dialogHideSkip: true
 			});
 
 			if (success) {
@@ -125,7 +124,7 @@ class SessionsWelcomeOverlay extends Disposable {
 	}
 }
 
-class SessionsWelcomeContribution extends Disposable implements IWorkbenchContribution {
+export class SessionsWelcomeContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.sessionsWelcome';
 
@@ -170,31 +169,42 @@ class SessionsWelcomeContribution extends Disposable implements IWorkbenchContri
 		if (this._needsChatSetup()) {
 			this.showOverlay();
 		} else {
-			this.watchForRegressions();
+			this.watchEntitlementState();
 		}
 	}
 
-	private watchForRegressions(): void {
-		let wasComplete = !this._needsChatSetup();
+	/**
+	 * Watches entitlement and sentiment observables after setup has already
+	 * completed. If the user's state changes such that setup is needed again
+	 * (e.g. extension uninstalled/disabled), shows the welcome overlay.
+	 *
+	 * {@link ChatEntitlement.Unknown} is intentionally ignored here: it is
+	 * almost always a transient state caused by a stale OAuth token being
+	 * refreshed after an update. A genuine sign-out will be caught on the
+	 * next app launch via the initial {@link showOverlayIfNeeded} check.
+	 */
+	private watchEntitlementState(): void {
+		let setupComplete = !this._needsChatSetup(false);
 		this.watcherRef.value = autorun(reader => {
 			this.chatEntitlementService.sentimentObs.read(reader);
 			this.chatEntitlementService.entitlementObs.read(reader);
 
-			const needsSetup = this._needsChatSetup();
-			if (wasComplete && needsSetup) {
+			const needsSetup = this._needsChatSetup(false);
+			if (setupComplete && needsSetup) {
 				this.showOverlay();
 			}
-			wasComplete = !needsSetup;
+			setupComplete = !needsSetup;
 		});
 	}
 
-	private _needsChatSetup(): boolean {
+	private _needsChatSetup(includeUnknown: boolean = true): boolean {
 		const { sentiment, entitlement } = this.chatEntitlementService;
 		if (
 			!sentiment?.installed ||						// Extension not installed: run setup to install
 			sentiment?.disabled ||							// Extension disabled: run setup to enable
 			entitlement === ChatEntitlement.Available ||	// Entitlement available: run setup to sign up
 			(
+				includeUnknown &&
 				entitlement === ChatEntitlement.Unknown &&	// Entitlement unknown: run setup to sign in / sign up
 				!this.chatEntitlementService.anonymous		// unless anonymous access is enabled
 			)
@@ -232,7 +242,7 @@ class SessionsWelcomeContribution extends Disposable implements IWorkbenchContri
 				this.storageService.store(WELCOME_COMPLETE_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
 				overlay.dismiss();
 				this.overlayRef.clear();
-				this.watchForRegressions();
+				this.watchEntitlementState();
 			}
 		}));
 	}
diff --git a/src/vs/sessions/contrib/welcome/test/browser/welcome.contribution.test.ts b/src/vs/sessions/contrib/welcome/test/browser/welcome.contribution.test.ts
new file mode 100644
index 00000000000..7105288c548
--- /dev/null
+++ b/src/vs/sessions/contrib/welcome/test/browser/welcome.contribution.test.ts
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { Event } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ISettableObservable, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ChatEntitlement, IChatEntitlementService, IChatSentiment } from '../../../../../workbench/services/chat/common/chatEntitlementService.js';
+import { workbenchInstantiationService } from '../../../../../workbench/test/browser/workbenchTestServices.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { SessionsWelcomeVisibleContext } from '../../../../common/contextkeys.js';
+import { SessionsWelcomeContribution } from '../../browser/welcome.contribution.js';
+
+const WELCOME_COMPLETE_KEY = 'workbench.agentsession.welcomeComplete';
+
+class MockChatEntitlementService implements Partial<IChatEntitlementService> {
+
+	declare readonly _serviceBrand: undefined;
+
+	readonly onDidChangeEntitlement = Event.None;
+	readonly onDidChangeSentiment = Event.None;
+	readonly onDidChangeAnonymous = Event.None;
+	readonly onDidChangeQuotaExceeded = Event.None;
+	readonly onDidChangeQuotaRemaining = Event.None;
+
+	readonly entitlementObs: ISettableObservable<ChatEntitlement> = observableValue('entitlement', ChatEntitlement.Free);
+	readonly sentimentObs: ISettableObservable<IChatSentiment> = observableValue('sentiment', { installed: true } as IChatSentiment);
+	readonly anonymousObs: ISettableObservable<boolean> = observableValue('anonymous', false);
+
+	readonly organisations = undefined;
+	readonly isInternal = false;
+	readonly sku = undefined;
+	readonly copilotTrackingId = undefined;
+	readonly quotas = {};
+	readonly previewFeaturesDisabled = false;
+
+	get entitlement(): ChatEntitlement { return this.entitlementObs.get(); }
+	get sentiment(): IChatSentiment { return this.sentimentObs.get(); }
+	get anonymous(): boolean { return this.anonymousObs.get(); }
+
+	update(): Promise<void> { return Promise.resolve(); }
+	markAnonymousRateLimited(): void { }
+}
+
+suite('SessionsWelcomeContribution', () => {
+
+	const disposables = new DisposableStore();
+	let instantiationService: TestInstantiationService;
+	let mockEntitlementService: MockChatEntitlementService;
+
+	setup(() => {
+		instantiationService = workbenchInstantiationService(undefined, disposables);
+		mockEntitlementService = new MockChatEntitlementService();
+		instantiationService.stub(IChatEntitlementService, mockEntitlementService as unknown as IChatEntitlementService);
+
+		// Ensure product has a defaultChatAgent so the contribution activates
+		const productService = instantiationService.get(IProductService);
+		instantiationService.stub(IProductService, {
+			...productService,
+			defaultChatAgent: { ...productService.defaultChatAgent, chatExtensionId: 'test.chat' }
+		} as IProductService);
+	});
+
+	teardown(() => {
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function markReturningUser(): void {
+		const storageService = instantiationService.get(IStorageService);
+		storageService.store(WELCOME_COMPLETE_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+
+	function isOverlayVisible(): boolean {
+		const contextKeyService = instantiationService.get(IContextKeyService);
+		return SessionsWelcomeVisibleContext.getValue(contextKeyService) === true;
+	}
+
+	test('first launch shows overlay', () => {
+		// First launch with no entitlement — should show overlay
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Unknown, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: false } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+		assert.strictEqual(isOverlayVisible(), true);
+	});
+
+	test('returning user with valid entitlement does not show overlay', () => {
+		markReturningUser();
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+		assert.strictEqual(isOverlayVisible(), false);
+	});
+
+	test('returning user: transient Unknown entitlement does NOT show overlay', () => {
+		markReturningUser();
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Free, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: true } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+		assert.strictEqual(isOverlayVisible(), false, 'should not show initially');
+
+		// Simulate transient Unknown (stale token → 401)
+		transaction(tx => {
+			mockEntitlementService.entitlementObs.set(ChatEntitlement.Unknown, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), false, 'should NOT show overlay for transient Unknown');
+
+		// Simulate recovery (token refreshed → entitlement restored)
+		transaction(tx => {
+			mockEntitlementService.entitlementObs.set(ChatEntitlement.Free, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), false, 'should remain hidden after recovery');
+	});
+
+	test('returning user: transient Unresolved entitlement does NOT show overlay', () => {
+		markReturningUser();
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Pro, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: true } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+
+		// Simulate Unresolved (intermediate state during account resolution)
+		transaction(tx => {
+			mockEntitlementService.entitlementObs.set(ChatEntitlement.Unresolved, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), false, 'should NOT show overlay for Unresolved');
+	});
+
+	test('returning user: extension uninstalled DOES show overlay', () => {
+		markReturningUser();
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Free, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: true } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+		assert.strictEqual(isOverlayVisible(), false, 'should not show initially');
+
+		// Simulate extension being uninstalled
+		transaction(tx => {
+			mockEntitlementService.sentimentObs.set({ installed: false } as IChatSentiment, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), true, 'should show overlay when extension is uninstalled');
+	});
+
+	test('returning user: extension disabled DOES show overlay', () => {
+		markReturningUser();
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Free, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: true } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+
+		// Simulate extension being disabled
+		transaction(tx => {
+			mockEntitlementService.sentimentObs.set({ installed: true, disabled: true } as IChatSentiment, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), true, 'should show overlay when extension is disabled');
+	});
+
+	test('overlay dismisses when setup completes', () => {
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Unknown, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: false } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+		assert.strictEqual(isOverlayVisible(), true, 'should show on first launch');
+
+		// Simulate completing setup
+		transaction(tx => {
+			mockEntitlementService.entitlementObs.set(ChatEntitlement.Free, tx);
+			mockEntitlementService.sentimentObs.set({ installed: true } as IChatSentiment, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), false, 'should dismiss after setup completes');
+	});
+
+	test('returning user: entitlement going to Available DOES show overlay', () => {
+		markReturningUser();
+		mockEntitlementService.entitlementObs.set(ChatEntitlement.Free, undefined);
+		mockEntitlementService.sentimentObs.set({ installed: true } as IChatSentiment, undefined);
+
+		const contribution = disposables.add(instantiationService.createInstance(SessionsWelcomeContribution));
+		assert.ok(contribution);
+
+		// Available means user can sign up for free — this is a real state,
+		// not transient, so the overlay should show
+		transaction(tx => {
+			mockEntitlementService.entitlementObs.set(ChatEntitlement.Available, tx);
+		});
+
+		assert.strictEqual(isOverlayVisible(), true, 'should show overlay for Available entitlement');
+	});
+});
diff --git a/src/vs/sessions/contrib/workspace/browser/workspaceFolderManagement.ts b/src/vs/sessions/contrib/workspace/browser/workspaceFolderManagement.ts
index 15104c8280e..9f1083cef72 100644
--- a/src/vs/sessions/contrib/workspace/browser/workspaceFolderManagement.ts
+++ b/src/vs/sessions/contrib/workspace/browser/workspaceFolderManagement.ts
@@ -5,7 +5,7 @@
 
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IWorkbenchContribution } from '../../../../workbench/common/contributions.js';
-import { IActiveSessionItem, ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessions.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceEditingService } from '../../../../workbench/services/workspaces/common/workspaceEditing.js';
@@ -16,6 +16,8 @@ import { autorun } from '../../../../base/common/observable.js';
 import { IWorkspaceFolderCreationData } from '../../../../platform/workspaces/common/workspaces.js';
 import { getGitHubRemoteFileDisplayName } from '../../fileTreeView/browser/githubFileSystemProvider.js';
 import { Queue } from '../../../../base/common/async.js';
+import { AGENT_HOST_SCHEME } from '../../../../platform/agentHost/common/agentHostUri.js';
+import { ISessionData } from '../../sessions/common/sessionData.js';
 
 export class WorkspaceFolderManagementContribution extends Disposable implements IWorkbenchContribution {
 
@@ -32,11 +34,12 @@ export class WorkspaceFolderManagementContribution extends Disposable implements
 		super();
 		this._register(autorun(reader => {
 			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			activeSession?.workspace.read(reader);
 			this.queue.queue(() => this.updateWorkspaceFoldersForSession(activeSession));
 		}));
 	}
 
-	private async updateWorkspaceFoldersForSession(session: IActiveSessionItem | undefined): Promise<void> {
+	private async updateWorkspaceFoldersForSession(session: ISessionData | undefined): Promise<void> {
 		await this.manageTrustWorkspaceForSession(session);
 		const activeSessionFolderData = this.getActiveSessionFolderData(session);
 		const currentRepo = this.workspaceContextService.getWorkspace().folders[0]?.uri;
@@ -60,26 +63,38 @@ export class WorkspaceFolderManagementContribution extends Disposable implements
 		await this.workspaceEditingService.updateFolders(0, 1, [activeSessionFolderData], true);
 	}
 
-	private getActiveSessionFolderData(session: IActiveSessionItem | undefined): IWorkspaceFolderCreationData | undefined {
+	private getActiveSessionFolderData(session: ISessionData | undefined): IWorkspaceFolderCreationData | undefined {
 		if (!session) {
 			return undefined;
 		}
 
-		if (session.worktree) {
+		const workspace = session.workspace.get();
+		const repo = workspace?.repositories[0];
+		const repository = repo?.uri;
+		const worktree = repo?.workingDirectory;
+		const branchName = repo?.detail;
+
+		if (worktree) {
 			return {
-				uri: session.worktree,
-				name: session.repository ? `${this.uriIdentityService.extUri.basename(session.repository)} (${session.worktreeBranchName ?? this.uriIdentityService.extUri.basename(session.worktree)})` : this.uriIdentityService.extUri.basename(session.worktree)
+				uri: worktree,
+				name: repository ? `${this.uriIdentityService.extUri.basename(repository)} (${branchName ?? this.uriIdentityService.extUri.basename(worktree)})` : this.uriIdentityService.extUri.basename(worktree)
 			};
 		}
 
-		if (session.repository) {
-			if (session.providerType === AgentSessionProviders.Background) {
-				return { uri: session.repository };
+		if (repository) {
+			// Remote agent host sessions use a read-only FS provider that
+			// should not be added as a workspace folder.
+			if (repository.scheme === AGENT_HOST_SCHEME) {
+				return undefined;
 			}
-			if (session.providerType === AgentSessionProviders.Cloud) {
+
+			if (session.sessionType === AgentSessionProviders.Background) {
+				return { uri: repository };
+			}
+			if (session.sessionType === AgentSessionProviders.Cloud) {
 				return {
-					uri: session.repository,
-					name: getGitHubRemoteFileDisplayName(session.repository),
+					uri: repository,
+					name: getGitHubRemoteFileDisplayName(repository),
 				};
 			}
 		}
@@ -87,17 +102,22 @@ export class WorkspaceFolderManagementContribution extends Disposable implements
 		return undefined;
 	}
 
-	private async manageTrustWorkspaceForSession(session: IActiveSessionItem | undefined): Promise<void> {
-		if (session?.providerType !== AgentSessionProviders.Background) {
+	private async manageTrustWorkspaceForSession(session: ISessionData | undefined): Promise<void> {
+		if (session?.sessionType !== AgentSessionProviders.Background) {
 			return;
 		}
 
-		if (!session.repository || !session.worktree) {
+		const workspace = session.workspace.get();
+		const repo = workspace?.repositories[0];
+		const repository = repo?.uri;
+		const worktree = repo?.workingDirectory;
+
+		if (!repository || !worktree) {
 			return;
 		}
 
-		if (!this.isUriTrusted(session.worktree)) {
-			await this.workspaceTrustManagementService.setUrisTrust([session.worktree], true);
+		if (!this.isUriTrusted(worktree)) {
+			await this.workspaceTrustManagementService.setUrisTrust([worktree], true);
 		}
 	}
 
diff --git a/src/vs/sessions/electron-browser/parts/titlebarPart.ts b/src/vs/sessions/electron-browser/parts/titlebarPart.ts
index b72a879cb7d..5c2692372ff 100644
--- a/src/vs/sessions/electron-browser/parts/titlebarPart.ts
+++ b/src/vs/sessions/electron-browser/parts/titlebarPart.ts
@@ -10,6 +10,7 @@ import { IContextKeyService } from '../../../platform/contextkey/common/contextk
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { INativeHostService } from '../../../platform/native/common/native.js';
+import { IProductService } from '../../../platform/product/common/productService.js';
 import { IStorageService } from '../../../platform/storage/common/storage.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
 import { useWindowControlsOverlay } from '../../../platform/window/common/window.js';
@@ -20,6 +21,7 @@ import { IAuxiliaryTitlebarPart } from '../../../workbench/browser/parts/titleba
 import { IEditorGroupsContainer } from '../../../workbench/services/editor/common/editorGroupsService.js';
 import { CodeWindow, mainWindow } from '../../../base/browser/window.js';
 import { TitlebarPart, TitleService } from '../../browser/parts/titlebarPart.js';
+import { isMacintosh } from '../../../base/common/platform.js';
 
 export class NativeTitlebarPart extends TitlebarPart {
 
@@ -37,6 +39,7 @@ export class NativeTitlebarPart extends TitlebarPart {
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IHostService hostService: IHostService,
+		@IProductService private readonly productService: IProductService,
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 	) {
 		super(id, targetWindow, contextMenuService, configurationService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService);
@@ -44,6 +47,24 @@ export class NativeTitlebarPart extends TitlebarPart {
 		this.handleWindowsAlwaysOnTop(targetWindow.vscodeWindowId, contextKeyService);
 	}
 
+	protected override createContentArea(parent: HTMLElement): HTMLElement {
+
+		// Workaround for macOS/Electron bug where the window does not
+		// appear in the "Windows" menu if the first `document.title`
+		// matches the BrowserWindow's initial title.
+		// See: https://github.com/microsoft/vscode/issues/191288
+		if (isMacintosh) {
+			const window = getWindow(this.element);
+			const nativeTitle = this.productService.nameLong;
+			if (!window.document.title || window.document.title === nativeTitle) {
+				window.document.title = `${nativeTitle} \u200b`;
+			}
+			window.document.title = nativeTitle;
+		}
+
+		return super.createContentArea(parent);
+	}
+
 	private async handleWindowsAlwaysOnTop(targetWindowId: number, contextKeyService: IContextKeyService): Promise<void> {
 		const isWindowAlwaysOnTopContext = IsWindowAlwaysOnTopContext.bindTo(contextKeyService);
 
@@ -107,9 +128,10 @@ class MainNativeTitlebarPart extends NativeTitlebarPart {
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IHostService hostService: IHostService,
+		@IProductService productService: IProductService,
 		@INativeHostService nativeHostService: INativeHostService,
 	) {
-		super(Parts.TITLEBAR_PART, mainWindow, contextMenuService, configurationService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, nativeHostService);
+		super(Parts.TITLEBAR_PART, mainWindow, contextMenuService, configurationService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, productService, nativeHostService);
 	}
 }
 
@@ -130,10 +152,11 @@ class AuxiliaryNativeTitlebarPart extends NativeTitlebarPart implements IAuxilia
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IHostService hostService: IHostService,
+		@IProductService productService: IProductService,
 		@INativeHostService nativeHostService: INativeHostService,
 	) {
 		const id = AuxiliaryNativeTitlebarPart.COUNTER++;
-		super(`workbench.parts.auxiliaryTitle.${id}`, getWindow(container), contextMenuService, configurationService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, nativeHostService);
+		super(`workbench.parts.auxiliaryTitle.${id}`, getWindow(container), contextMenuService, configurationService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, productService, nativeHostService);
 	}
 
 	override get preventZoom(): boolean {
diff --git a/src/vs/sessions/prompts/act-on-feedback.prompt.md b/src/vs/sessions/prompts/act-on-feedback.prompt.md
new file mode 100644
index 00000000000..29ef4622505
--- /dev/null
+++ b/src/vs/sessions/prompts/act-on-feedback.prompt.md
@@ -0,0 +1,11 @@
+---
+description: Act on user feedback attached to the current session
+---
+<!-- Customize this prompt and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
+
+The user has provided feedback on the current session's changes. Their feedback comments have been attached to this message.
+
+1. Review all attached feedback comments carefully
+2. Understand the intent behind each piece of feedback
+3. Make the requested changes to address the feedback
+4. Verify your changes are consistent with the rest of the codebase
diff --git a/src/vs/sessions/prompts/create-draft-pr.prompt.md b/src/vs/sessions/prompts/create-draft-pr.prompt.md
index 4def295b9fc..c2529a264d4 100644
--- a/src/vs/sessions/prompts/create-draft-pr.prompt.md
+++ b/src/vs/sessions/prompts/create-draft-pr.prompt.md
@@ -5,7 +5,9 @@ description: Create a draft pull request for the current session
 
 Use the GitHub MCP server to create a draft pull request — do NOT use the `gh` CLI.
 
-1. Review all changes in the current session
-2. Write a clear, concise PR title with a short area prefix (e.g. "sessions: …", "editor: …")
-3. Write a description covering what changed, why, and anything reviewers should know
-4. Create the draft pull request
+1. Run the compile and hygiene tasks (fixing any errors)
+2. If there are any uncommitted changes, use the `/commit` skill to commit them
+3. Review all changes in the current session
+4. Write a clear, concise PR title with a short area prefix (e.g. "sessions: …", "editor: …")
+5. Write a description covering what changed, why, and anything reviewers should know
+6. Create the draft pull request
diff --git a/src/vs/sessions/prompts/create-pr.prompt.md b/src/vs/sessions/prompts/create-pr.prompt.md
index 02208021e3a..4991f4ff582 100644
--- a/src/vs/sessions/prompts/create-pr.prompt.md
+++ b/src/vs/sessions/prompts/create-pr.prompt.md
@@ -6,7 +6,8 @@ description: Create a pull request for the current session
 Use the GitHub MCP server to create a pull request — do NOT use the `gh` CLI.
 
 1. Run the compile and hygiene tasks (fixing any errors)
-2. Review all changes in the current session
-3. Write a clear, concise PR title with a short area prefix (e.g. "sessions: …", "editor: …")
-4. Write a description covering what changed, why, and anything reviewers should know
-5. Create the pull request
+2. If there are any uncommitted changes, use the `/commit` skill to commit them
+3. Review all changes in the current session
+4. Write a clear, concise PR title with a short area prefix (e.g. "sessions: …", "editor: …")
+5. Write a description covering what changed, why, and anything reviewers should know
+6. Create the pull request
diff --git a/src/vs/sessions/prompts/generate-run-commands.prompt.md b/src/vs/sessions/prompts/generate-run-commands.prompt.md
new file mode 100644
index 00000000000..e1744cf92c3
--- /dev/null
+++ b/src/vs/sessions/prompts/generate-run-commands.prompt.md
@@ -0,0 +1,50 @@
+---
+description: Generate or modify run commands for the current session
+---
+<!-- Customize this prompt and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
+
+Help the user set up run commands for the current Agent Session workspace. Run commands appear in the session's Run button in the title bar.
+
+## Understanding the task schema
+
+A run command is a `tasks.json` task with:
+- `"inSessions": true` — required: makes the task appear in the Sessions run button
+- `"runOptions": { "runOn": "worktreeCreated" }` — optional: auto-runs the task whenever a new worktree is created (use for setup/install commands)
+
+```json
+{
+  "tasks": [
+    {
+      "label": "Install dependencies",
+      "type": "shell",
+      "command": "npm install",
+      "inSessions": true,
+      "runOptions": { "runOn": "worktreeCreated" }
+    },
+    {
+      "label": "Start dev server",
+      "type": "shell",
+      "command": "npm run dev",
+      "inSessions": true
+    }
+  ]
+}
+```
+
+## Decision logic
+
+**First, read the existing `.vscode/tasks.json`** to check for existing run commands (`inSessions: true` tasks).
+
+**If run commands already exist:** treat this as a modify request — ask the user what they'd like to change (add, remove, or update a command).
+
+**If no run commands exist:** try to infer the right commands from the workspace:
+- Check `package.json`, `Makefile`, `pyproject.toml`, `Cargo.toml`, `go.mod`, `.nvmrc`, or other project files to understand the stack and common commands.
+- If it's clear what the setup command is (e.g., `npm install`, `pip install -r requirements.txt`), add it with `"runOptions": { "runOn": "worktreeCreated" }` — no need to ask.
+- If it's clear what the primary run/dev command is (e.g., `npm run dev`, `cargo run`), add it with just `"inSessions": true`.
+- **Only ask the user** if the commands are ambiguous (e.g., multiple equally valid options, no recognizable project structure, or the project uses a non-standard setup).
+
+## Writing the file
+
+Always write to `.vscode/tasks.json` in the workspace root. If the file already exists, merge — do not overwrite unrelated tasks.
+
+After writing, briefly confirm what was added and how to trigger it from the Run button.
diff --git a/src/vs/sessions/prompts/merge-changes.prompt.md b/src/vs/sessions/prompts/merge-changes.prompt.md
new file mode 100644
index 00000000000..065cb18ad18
--- /dev/null
+++ b/src/vs/sessions/prompts/merge-changes.prompt.md
@@ -0,0 +1,10 @@
+---
+description: Merge changes from the topic branch to the merge base branch
+---
+<!-- Customize this prompt and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
+
+Merge changes from the topic branch to the merge base branch.
+The context block appended to the prompt contains the source and target branch information.
+
+1. If there are any uncommitted changes, use the `/commit` skill to commit them
+2. Merge the topic branch into the merge base branch. If there are any merge conflicts, resolve them and commit the merge. When in doubt on how to resolve a merge conflict, ask the user for guidance on how to proceed
diff --git a/src/vs/sessions/prompts/update-pr.prompt.md b/src/vs/sessions/prompts/update-pr.prompt.md
new file mode 100644
index 00000000000..22ecf6ccf52
--- /dev/null
+++ b/src/vs/sessions/prompts/update-pr.prompt.md
@@ -0,0 +1,13 @@
+---
+description: Update the pull request for the current session
+---
+<!-- Customize this prompt and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
+
+Update the existing pull request for the current session.
+The context block appended to the prompt contains the pull request information.
+
+1. Check whether the pull request has any commits that are not yet present on the current branch (incoming changes). If there are any incoming changes, pull them into the current branch and resolve any merge conflicts
+2. Run the compile and hygiene tasks (fixing any errors)
+3. If there are any uncommitted changes, use the `/commit` skill to commit them
+4. If the outgoing changes introduce significant changes to the pull request, update the pull request title and description to reflect those changes
+5. Update the pull request with the new commits and information
diff --git a/src/vs/sessions/services/title/browser/titleService.ts b/src/vs/sessions/services/title/browser/titleService.ts
new file mode 100644
index 00000000000..b04868f061e
--- /dev/null
+++ b/src/vs/sessions/services/title/browser/titleService.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ITitleService } from '../../../../workbench/services/title/browser/titleService.js';
+import { TitleService } from '../../../browser/parts/titlebarPart.js';
+
+registerSingleton(ITitleService, TitleService, InstantiationType.Eager);
diff --git a/src/vs/sessions/electron-browser/titleService.ts b/src/vs/sessions/services/title/electron-browser/titleService.ts
similarity index 59%
rename from src/vs/sessions/electron-browser/titleService.ts
rename to src/vs/sessions/services/title/electron-browser/titleService.ts
index 9ffc7a93650..070b1eb7bc4 100644
--- a/src/vs/sessions/electron-browser/titleService.ts
+++ b/src/vs/sessions/services/title/electron-browser/titleService.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { InstantiationType, registerSingleton } from '../../platform/instantiation/common/extensions.js';
-import { ITitleService } from '../../workbench/services/title/browser/titleService.js';
-import { NativeTitleService } from './parts/titlebarPart.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ITitleService } from '../../../../workbench/services/title/browser/titleService.js';
+import { NativeTitleService } from '../../../electron-browser/parts/titlebarPart.js';
 
 registerSingleton(ITitleService, NativeTitleService, InstantiationType.Eager);
diff --git a/src/vs/sessions/sessions.common.main.ts b/src/vs/sessions/sessions.common.main.ts
index e4be5c11daf..046d6d2d945 100644
--- a/src/vs/sessions/sessions.common.main.ts
+++ b/src/vs/sessions/sessions.common.main.ts
@@ -212,6 +212,7 @@ import '../workbench/contrib/chat/browser/chat.contribution.js';
 import '../workbench/contrib/mcp/browser/mcp.contribution.js';
 import '../workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.js';
 import '../workbench/contrib/chat/browser/contextContrib/chatContext.contribution.js';
+import '../workbench/contrib/imageCarousel/browser/imageCarousel.contribution.js';
 
 // Interactive
 import '../workbench/contrib/interactive/browser/interactive.contribution.js';
@@ -442,3 +443,31 @@ import '../workbench/contrib/editTelemetry/browser/editTelemetry.contribution.js
 import '../workbench/contrib/opener/browser/opener.contribution.js';
 
 //#endregion
+
+//#region --- sessions contributions
+
+import './browser/paneCompositePartService.js';
+import './browser/layoutActions.js';
+
+import './contrib/accountMenu/browser/account.contribution.js';
+import './contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.js';
+import './contrib/chat/browser/chat.contribution.js';
+import './contrib/chat/browser/customizationsDebugLog.contribution.js';
+import './contrib/copilotChatSessions/browser/copilotChatSessions.contribution.js';
+import './contrib/sessions/browser/sessions.contribution.js';
+import './contrib/sessions/browser/customizationsToolbar.contribution.js';
+import './contrib/changes/browser/changesView.contribution.js';
+import './contrib/codeReview/browser/codeReview.contributions.js';
+import './contrib/files/browser/files.contribution.js';
+import './contrib/github/browser/github.contribution.js';
+import './contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.js';
+import './contrib/fileTreeView/browser/fileTreeView.contribution.js'; // view registration disabled; filesystem provider still needed
+import './contrib/configuration/browser/configuration.contribution.js';
+
+import './contrib/terminal/browser/sessionsTerminalContribution.js';
+import './contrib/logs/browser/logs.contribution.js';
+import './contrib/chatDebug/browser/chatDebug.contribution.js';
+import './contrib/workspace/browser/workspace.contribution.js';
+import './contrib/welcome/browser/welcome.contribution.js';
+
+//#endregion
diff --git a/src/vs/sessions/sessions.desktop.main.ts b/src/vs/sessions/sessions.desktop.main.ts
index f8f88d37215..3f566196d8e 100644
--- a/src/vs/sessions/sessions.desktop.main.ts
+++ b/src/vs/sessions/sessions.desktop.main.ts
@@ -42,7 +42,7 @@ import '../workbench/services/update/electron-browser/updateService.js';
 import '../workbench/services/url/electron-browser/urlService.js';
 import '../workbench/services/lifecycle/electron-browser/lifecycleService.js';
 import '../workbench/services/host/electron-browser/nativeHostService.js';
-import './electron-browser/titleService.js';
+import './services/title/electron-browser/titleService.js';
 import '../platform/meteredConnection/electron-browser/meteredConnectionService.js';
 import '../workbench/services/request/electron-browser/requestService.js';
 import '../workbench/services/clipboard/electron-browser/clipboardService.js';
@@ -196,28 +196,10 @@ import '../workbench/contrib/policyExport/electron-browser/policyExport.contribu
 
 //#region --- sessions contributions
 
-import './browser/paneCompositePartService.js';
-import './browser/layoutActions.js';
-
-import './contrib/accountMenu/browser/account.contribution.js';
-import './contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.js';
-import './contrib/chat/browser/chat.contribution.js';
-import './contrib/chat/browser/customizationsDebugLog.contribution.js';
-import './contrib/sessions/browser/sessions.contribution.js';
-import './contrib/sessions/browser/customizationsToolbar.contribution.js';
-import './contrib/changes/browser/changesView.contribution.js';
-import './contrib/codeReview/browser/codeReview.contributions.js';
-import './contrib/files/browser/files.contribution.js';
-import './contrib/git/browser/git.contribution.js';
-import './contrib/github/browser/github.contribution.js';
-import './contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.js';
-import './contrib/fileTreeView/browser/fileTreeView.contribution.js'; // view registration disabled; filesystem provider still needed
-import './contrib/configuration/browser/configuration.contribution.js';
-
-import './contrib/terminal/browser/sessionsTerminalContribution.js';
-import './contrib/logs/browser/logs.contribution.js';
-import './contrib/workspace/browser/workspace.contribution.js';
-import './contrib/welcome/browser/welcome.contribution.js';
+// Remote Agent Host
+import '../platform/agentHost/electron-browser/agentHostService.js';
+import '../platform/agentHost/electron-browser/remoteAgentHostService.js';
+import './contrib/remoteAgentHost/browser/remoteAgentHost.contribution.js';
 
 //#endregion
 
diff --git a/src/vs/sessions/sessions.web.main.ts b/src/vs/sessions/sessions.web.main.ts
index 9a335e542f8..705e2eb7f85 100644
--- a/src/vs/sessions/sessions.web.main.ts
+++ b/src/vs/sessions/sessions.web.main.ts
@@ -90,8 +90,7 @@ import { UserDataAutoSyncService } from '../platform/userDataSync/common/userDat
 import { AccessibilityService } from '../platform/accessibility/browser/accessibilityService.js';
 import { ICustomEndpointTelemetryService } from '../platform/telemetry/common/telemetry.js';
 import { NullEndpointTelemetryService } from '../platform/telemetry/common/telemetryUtils.js';
-import { ITitleService } from '../workbench/services/title/browser/titleService.js';
-import { BrowserTitleService } from '../workbench/browser/parts/titlebar/titlebarPart.js';
+import './services/title/browser/titleService.js';
 import { ITimerService, TimerService } from '../workbench/services/timer/browser/timerService.js';
 import { IDiagnosticsService, NullDiagnosticsService } from '../platform/diagnostics/common/diagnostics.js';
 import { ILanguagePackService } from '../platform/languagePacks/common/languagePacks.js';
@@ -100,6 +99,7 @@ import { IWebContentExtractorService, NullWebContentExtractorService, ISharedWeb
 import { IMcpGalleryManifestService } from '../platform/mcp/common/mcpGalleryManifest.js';
 import { WorkbenchMcpGalleryManifestService } from '../workbench/services/mcp/browser/mcpGalleryManifestService.js';
 import { UserDataSyncResourceProviderService } from '../platform/userDataSync/common/userDataSyncResourceProvider.js';
+import { IRemoteAgentHostService, NullRemoteAgentHostService } from '../platform/agentHost/common/remoteAgentHostService.js';
 
 registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed);
 registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Delayed);
@@ -111,7 +111,6 @@ registerSingleton(IUserDataSyncAccountService, UserDataSyncAccountService, Insta
 registerSingleton(IUserDataSyncService, UserDataSyncService, InstantiationType.Delayed);
 registerSingleton(IUserDataSyncResourceProviderService, UserDataSyncResourceProviderService, InstantiationType.Delayed);
 registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService, InstantiationType.Eager);
-registerSingleton(ITitleService, BrowserTitleService, InstantiationType.Eager);
 registerSingleton(IExtensionTipsService, ExtensionTipsService, InstantiationType.Delayed);
 registerSingleton(ITimerService, TimerService, InstantiationType.Delayed);
 registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, InstantiationType.Delayed);
@@ -120,6 +119,7 @@ registerSingleton(ILanguagePackService, WebLanguagePacksService, InstantiationTy
 registerSingleton(IWebContentExtractorService, NullWebContentExtractorService, InstantiationType.Delayed);
 registerSingleton(ISharedWebContentExtractorService, NullSharedWebContentExtractorService, InstantiationType.Delayed);
 registerSingleton(IMcpGalleryManifestService, WorkbenchMcpGalleryManifestService, InstantiationType.Delayed);
+registerSingleton(IRemoteAgentHostService, NullRemoteAgentHostService, InstantiationType.Delayed);
 
 //#endregion
 
@@ -143,25 +143,6 @@ import '../workbench/contrib/issue/browser/issue.contribution.js';
 import '../workbench/contrib/splash/browser/splash.contribution.js';
 import '../workbench/contrib/remote/browser/remoteStartEntry.contribution.js';
 import '../workbench/contrib/processExplorer/browser/processExplorer.web.contribution.js';
-
-//#endregion
-
-
-//#region --- sessions contributions (same as desktop — these are all browser-safe)
-
-import './browser/paneCompositePartService.js';
-import './browser/layoutActions.js';
-
-import './contrib/accountMenu/browser/account.contribution.js';
-import './contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.js';
-import './contrib/chat/browser/chat.contribution.js';
-import './contrib/sessions/browser/sessions.contribution.js';
-import './contrib/sessions/browser/customizationsToolbar.contribution.js';
-import './contrib/changes/browser/changesView.contribution.js';
-import './contrib/codeReview/browser/codeReview.contributions.js';
-import './contrib/github/browser/github.contribution.js';
-import './contrib/fileTreeView/browser/fileTreeView.contribution.js';
-import './contrib/configuration/browser/configuration.contribution.js';
-import './contrib/welcome/browser/welcome.contribution.js';
+import '../workbench/contrib/browserView/browser/browserView.contribution.js';
 
 //#endregion
diff --git a/src/vs/sessions/skills/commit/SKILL.md b/src/vs/sessions/skills/commit/SKILL.md
new file mode 100644
index 00000000000..2bd73ac44c9
--- /dev/null
+++ b/src/vs/sessions/skills/commit/SKILL.md
@@ -0,0 +1,80 @@
+---
+name: commit
+description: Commit staged or unstaged changes with an AI-generated commit message that matches the repository's existing commit style. Use when the user asks to 'commit', 'commit changes', 'create a commit', 'save my work', or 'check in code'.
+---
+<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
+
+# Commit Changes
+
+Help the user commit code changes with a well-crafted commit message derived from the diff, following the conventions already established in the repository.
+
+## Guidelines
+
+- **Never amend existing commits** without asking.
+- **Never force-push or push** without explicit user approval.
+- **Never skip pre-commit hooks** (do not use `--no-verify`).
+- **Never skip signing commits** (do not use `--no-gpg-sign`).
+- **Never revert, reset, or discard user changes** unless the user explicitly asked for that.
+- Check for obvious secrets or generated artifacts that should not be committed. If something looks risky - ask the user.
+- When in doubt about staging, convention, or message content — ask the user.
+
+## Workflow
+
+### 1. Discover the repository's commit convention
+
+Run the following to sample recent commits and the user's own commits:
+
+```
+# Recent repo commits (for overall style)
+git log --oneline -20
+
+# User's recent commits (for personal style)
+git log --oneline --author="$(git config user.name)" -10
+```
+
+Analyse the output to determine the commit message convention used in the repository (e.g. Conventional Commits, Gitmoji, ticket-prefixed, free-form). All generated messages **must** follow the detected convention.
+
+### 2. Check repository status
+
+```
+git status --short
+```
+
+- If there are **no changes** (working tree clean, nothing staged), inform the user and stop.
+- If there are **staged changes**, proceed with those and do not stage any unstaged changes.
+- If there are **only unstaged changes**, stage everything (`git add -A`), and proceed with those.
+
+### 3. Generate the commit message
+
+Obtain the full diff of what will be committed:
+
+```bash
+git diff --cached --stat
+git diff --cached
+```
+
+Using the diff and the commit convention detected in step 1, draft a commit message with:
+
+- A **subject line** (≤ 72 characters) that summarises the change, following the repository's convention.
+- An optional **body** that explains *why* the change was made, only when the diff is non-trivial.
+- Reference issue/ticket numbers when they appear in branch names or related context.
+- Focus on the intent of the change, not a file-by-file inventory.
+
+### 4. Commit
+
+Construct the `git commit` command with the generated message.
+
+Execute the commit:
+
+```
+git commit -m "<subject>" -m "<body>"
+```
+
+### 5. Confirm
+
+After the commit:
+
+- Run `git status --short` to confirm the commit completed.
+- Run `git log --oneline -1` to show the new commit.
+- If pre-commit hooks changed files or blocked the commit, summarize exactly what happened.
+- If hooks rewrote files after the commit attempt, do not amend automatically. Tell the user what changed and ask whether they want you to stage and commit those follow-up edits.
diff --git a/src/vs/sessions/skills/update-skills/SKILL.md b/src/vs/sessions/skills/update-skills/SKILL.md
new file mode 100644
index 00000000000..56dad1140f2
--- /dev/null
+++ b/src/vs/sessions/skills/update-skills/SKILL.md
@@ -0,0 +1,114 @@
+---
+name: update-skills
+description: Create or update repository skills and instructions when major learnings are discovered during a session. Use when the user says "learn!", when a significant pattern or pitfall is identified, or when reusable domain knowledge should be captured for future sessions.
+---
+<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. -->
+
+# Update Skills & Instructions
+
+When a major repository learning is discovered — a recurring pattern, a non-obvious pitfall, a crucial architectural constraint, or domain knowledge that would save future sessions significant time — capture it as a skill or instruction so it persists across sessions.
+
+## When to Use
+
+- The user explicitly says **"learn!"** or asks to capture a learning
+- You discover a significant pattern or constraint that cost meaningful debugging time
+- You identify reusable domain knowledge that isn't documented anywhere in the repo
+- A correction from the user reveals a general principle worth preserving
+
+## Decision: Skill vs Instruction vs Learning
+
+**Add a learning to an existing instruction** when:
+- The insight is small (1-4 sentences) and fits naturally into an existing instruction file
+- It refines or extends an existing guideline
+- Follow the pattern in `.github/instructions/learnings.instructions.md`
+
+**Create or update a skill** (`.github/skills/{name}/SKILL.md` or `.agents/skills/{name}/SKILL.md`) when:
+- The knowledge is substantial (multi-step procedure, detailed guidelines, or rich examples)
+- It covers a distinct domain area (e.g., "how to debug X", "patterns for Y")
+- Future sessions should be able to invoke it by name
+
+**Create or update an instruction** (`.github/instructions/{name}.instructions.md`) when:
+- The rule should apply automatically based on file patterns (`applyTo`) or globally
+- It's a coding convention, architectural constraint, or process rule
+- It doesn't need to be invoked on demand
+
+## Procedure
+
+### 1. Identify the Learning
+
+Reflect on what went wrong or what was discovered:
+- What was the problem or unexpected behavior?
+- Why was it a problem? (root cause, not symptoms)
+- How was it fixed or what's the correct approach?
+- Can it be generalized beyond this specific instance?
+
+### 2. Check for Existing Files
+
+Before creating new files, search for existing skills and instructions that might be the right home:
+
+```
+# Check existing skills
+ls .github/skills/ .agents/skills/ 2>/dev/null
+
+# Check existing instructions
+ls .github/instructions/ 2>/dev/null
+
+# Search for related content
+grep -r "related-keyword" .github/skills/ .github/instructions/ .agents/skills/
+```
+
+### 3a. Add to Existing File
+
+If an appropriate file exists, add the learning to its `## Learnings` section (create the section if it doesn't exist). Each learning should be 1-4 sentences.
+
+### 3b. Create a New Skill
+
+If the knowledge warrants a standalone skill:
+
+1. Choose the location:
+   - `.github/skills/{name}/SKILL.md` for project-level skills (committed to repo)
+   - `.agents/skills/{name}/SKILL.md` for agent-specific skills
+2. Create the directory and SKILL.md with frontmatter:
+
+```markdown
+---
+name: {skill-name}
+description: {One-line description of when and why to use this skill.}
+---
+
+# {Skill Title}
+
+{Body with guidelines, procedures, examples, and learnings.}
+```
+
+3. The `name` field **must match** the parent folder name exactly.
+4. Include concrete examples — skills with examples are far more useful than abstract rules.
+
+### 3c. Create a New Instruction
+
+If the knowledge should apply automatically:
+
+```markdown
+---
+description: {When these instructions should be loaded}
+applyTo: '{glob pattern}' # optional — auto-load when matching files are attached
+---
+
+{Content of the instruction.}
+```
+
+### 4. Quality Checks
+
+Before saving:
+- Is the learning **general enough** to help future sessions, not just this one?
+- Is it **specific enough** to be actionable, not just a vague principle?
+- Does it include a **concrete example** of right vs wrong?
+- Does it avoid duplicating knowledge already captured elsewhere?
+- Is the description clear enough that the agent will know **when** to invoke/apply it?
+
+### 5. Inform the User
+
+After creating or updating the file:
+- Summarize what was captured and where
+- Explain why this location was chosen
+- Note if any existing content was updated vs new content created
diff --git a/src/vs/sessions/test/e2e/README.md b/src/vs/sessions/test/e2e/README.md
index a2b6cce5d3f..347d0660da9 100644
--- a/src/vs/sessions/test/e2e/README.md
+++ b/src/vs/sessions/test/e2e/README.md
@@ -21,6 +21,8 @@ runs through the real code paths.
 | Chat agents (`copilotcli`, etc.) | Canned keyword-matched responses with `textEdit` progress items | No real LLM backend |
 | `mock-fs://` FileSystemProvider | `InMemoryFileSystemProvider` registered directly in the workbench (not extension host) | Must be available before any service tries to resolve workspace files |
 | GitHub authentication | Always-signed-in mock provider (extension) | No real OAuth flow |
+| Code Review command | Returns canned review comments per file (extension) | No real Copilot AI review |
+| PR commands (Create/Open/Merge) | No-op handlers that log and show info messages (extension) | No real GitHub API |
 
 ### What's Real (Everything Else)
 
@@ -39,6 +41,10 @@ exercise the actual code paths:
   observations
 - **Menu actions** — "Create PR", "Accept", "Reject" buttons appear based on
   real context key state
+- **`CodeReviewService`** — Orchestrates review requests, processes results from
+  the mock `github.copilot.chat.codeReview.run` command, and stores comments
+- **`CodeReviewToolbarContribution`** — Shows the Code Review button in the
+  Changes view toolbar based on real context key state
 
 ### Data Flow
 
@@ -57,6 +63,26 @@ User types message → Chat Widget → ChatService
 The mock agent is the **only** point where canned data enters the system.
 Everything downstream uses real service implementations.
 
+### Code Review & PR Button Flow
+
+```
+Code Review button clicked → sessions.codeReview.run (core action)
+  → CodeReviewService.requestReview()
+    → commandService.executeCommand('chat.internal.codeReview.run')
+      → Bridge forwards to 'github.copilot.chat.codeReview.run'
+        → Mock extension returns canned comments
+          → CodeReviewService stores results, updates observable state
+            → CodeReviewToolbarContribution updates button icon/badge
+
+Create PR button clicked → github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR
+  → Mock extension logs and shows info message
+```
+
+The PR buttons (Create PR, Open PR, Merge) are contributed via the mock
+extension's `package.json` menus, gated by `chatSessionType == copilotcli`.
+The `chatSessionType` context key is derived from the session URI scheme
+(`getChatSessionType()`), which returns `copilotcli` for mock sessions.
+
 ### Why the FileSystem Provider Is Registered in the Workbench
 
 The `mock-fs://` `InMemoryFileSystemProvider` is registered directly on
diff --git a/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/extension.js b/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/extension.js
index 42991694ae3..461ffb8207d 100644
--- a/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/extension.js
+++ b/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/extension.js
@@ -10,7 +10,9 @@
 /**
  * Mock extension for Sessions E2E testing.
  *
- * Provides a fake GitHub authentication provider (skips sign-in).
+ * Provides:
+ * - A fake GitHub authentication provider (skips sign-in)
+ * - Mock command handlers for Code Review, Create PR, Open PR, and Merge
  *
  * The mock-fs:// FileSystemProvider and chat agents are registered
  * directly in the workbench (web.test.ts), not here.
@@ -31,6 +33,9 @@ function activate(context) {
 	// 1. Mock GitHub Authentication Provider
 	context.subscriptions.push(registerMockAuth(vscode));
 
+	// 2. Mock command handlers for Code Review and PR actions
+	context.subscriptions.push(...registerMockCommands(vscode));
+
 	// Note: The mock-fs:// FileSystemProvider is registered directly in the
 	// workbench (web.test.ts → registerMockFileSystemProvider) so it is
 	// available before any service tries to resolve workspace files.
@@ -82,6 +87,88 @@ function registerMockAuth(vscode) {
 	});
 }
 
+// ---------------------------------------------------------------------------
+// Mock Command Handlers (Code Review + PR Actions)
+// ---------------------------------------------------------------------------
+
+/**
+ * Registers mock command handlers that stand in for the real GitHub Copilot
+ * extension commands. These allow the Code Review and Create PR buttons to
+ * function in the e2e test environment.
+ *
+ * @param {typeof import('vscode')} vscode
+ * @returns {import('vscode').Disposable[]}
+ */
+function registerMockCommands(vscode) {
+	const disposables = [];
+
+	// Mock create PR — simulates successful PR creation
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Create PR invoked');
+			vscode.window.showInformationMessage('Mock: Pull request created successfully');
+		}
+	));
+
+	// Mock open PR — simulates opening a PR URL
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.openPullRequestCopilotCLIAgentSession.openPR',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Open PR invoked');
+			vscode.window.showInformationMessage('Mock: Opening pull request');
+		}
+	));
+
+	// Mock merge — simulates merging changes
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.mergeCopilotCLIAgentSessionChanges.merge',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Merge invoked');
+			vscode.window.showInformationMessage('Mock: Changes merged successfully');
+		}
+	));
+
+	// Mock merge and sync — simulates merging and syncing
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.mergeCopilotCLIAgentSessionChanges.mergeAndSync',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Merge and Sync invoked');
+			vscode.window.showInformationMessage('Mock: Changes merged and synced successfully');
+		}
+	));
+
+	// Mock apply changes — simulates applying session changes
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.applyCopilotCLIAgentSessionChanges.apply',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Apply Changes invoked');
+			vscode.window.showInformationMessage('Mock: Changes applied successfully');
+		}
+	));
+
+	// Mock checkout PR reroute — simulates checkout PR flow
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.checkoutPullRequestReroute',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Checkout PR Reroute invoked');
+			vscode.window.showInformationMessage('Mock: Checking out pull request');
+		}
+	));
+
+	// Mock update changes — simulates updating session changes
+	disposables.push(vscode.commands.registerCommand(
+		'github.copilot.chat.updateCopilotCLIAgentSessionChanges.update',
+		() => {
+			console.log('[sessions-e2e-mock] Mock Update Changes invoked');
+			vscode.window.showInformationMessage('Mock: Changes updated successfully',);
+		}
+	));
+
+	console.log('[sessions-e2e-mock] Registered mock Code Review and PR command handlers');
+	return disposables;
+}
+
 // ---------------------------------------------------------------------------
 // Exports
 // ---------------------------------------------------------------------------
diff --git a/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/package.json b/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/package.json
index a073ad0542d..fa02ea6068b 100644
--- a/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/package.json
+++ b/src/vs/sessions/test/e2e/extensions/sessions-e2e-mock/package.json
@@ -10,6 +10,7 @@
 	"extensionKind": ["ui", "workspace"],
 	"browser": "./extension.js",
 	"activationEvents": ["*"],
+	"enabledApiProposals": ["chatSessionsProvider"],
 	"capabilities": {
 		"virtualWorkspaces": true,
 		"untrustedWorkspaces": {
@@ -22,6 +23,88 @@
 				"id": "github",
 				"label": "GitHub (Mock)"
 			}
-		]
+		],
+		"commands": [
+			{
+				"command": "github.copilot.chat.applyCopilotCLIAgentSessionChanges.apply",
+				"title": "Apply Changes",
+				"icon": "$(check)"
+			},
+			{
+				"command": "github.copilot.chat.checkoutPullRequestReroute",
+				"title": "Checkout Pull Request",
+				"icon": "$(git-pull-request)"
+			},
+			{
+				"command": "github.copilot.chat.openPullRequestCopilotCLIAgentSession.openPR",
+				"title": "Open Pull Request",
+				"icon": "$(link-external)"
+			},
+			{
+				"command": "github.copilot.chat.mergeCopilotCLIAgentSessionChanges.merge",
+				"title": "Merge",
+				"icon": "$(git-merge)"
+			},
+			{
+				"command": "github.copilot.chat.mergeCopilotCLIAgentSessionChanges.mergeAndSync",
+				"title": "Merge and Sync",
+				"icon": "$(git-merge)"
+			},
+			{
+				"command": "github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR",
+				"title": "Create Pull Request",
+				"icon": "$(git-pull-request-create)"
+			},
+			{
+				"command": "github.copilot.chat.updateCopilotCLIAgentSessionChanges.update",
+				"title": "Update",
+				"icon": "$(cloud-upload)"
+			},
+			{
+				"command": "github.copilot.chat.codeReview.run",
+				"title": "Run Code Review"
+			}
+		],
+		"menus": {
+			"chat/input/editing/sessionToolbar": [
+				{
+					"command": "github.copilot.chat.applyCopilotCLIAgentSessionChanges.apply",
+					"when": "chatSessionType == copilotcli && workbenchState != empty && !isSessionsWindow",
+					"group": "navigation@0"
+				},
+				{
+					"command": "github.copilot.chat.checkoutPullRequestReroute",
+					"when": "chatSessionType == copilot-cloud-agent && !github.vscode-pull-request-github.activated && gitOpenRepositoryCount != 0",
+					"group": "navigation@0"
+				},
+				{
+					"command": "github.copilot.chat.openPullRequestCopilotCLIAgentSession.openPR",
+					"when": "chatSessionType == copilotcli && isSessionsWindow && sessions.hasOpenPullRequest",
+					"group": "navigation@1"
+				}
+			],
+			"chat/input/editing/sessionApplyActions": [
+				{
+					"command": "github.copilot.chat.mergeCopilotCLIAgentSessionChanges.merge",
+					"when": "chatSessionType == copilotcli && isSessionsWindow && !sessions.isMergeBaseBranchProtected",
+					"group": "merge@1"
+				},
+				{
+					"command": "github.copilot.chat.mergeCopilotCLIAgentSessionChanges.mergeAndSync",
+					"when": "chatSessionType == copilotcli && isSessionsWindow && !sessions.isMergeBaseBranchProtected",
+					"group": "merge@2"
+				},
+				{
+					"command": "github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR",
+					"when": "chatSessionType == copilotcli && isSessionsWindow && sessions.isMergeBaseBranchProtected && !sessions.hasOpenPullRequest",
+					"group": "pull_request@1"
+				},
+				{
+					"command": "github.copilot.chat.updateCopilotCLIAgentSessionChanges.update",
+					"when": "chatSessionType == copilotcli && isSessionsWindow",
+					"group": "update@1"
+				}
+			]
+		}
 	}
 }
diff --git a/src/vs/sessions/test/e2e/scenarios/02-chat-with-changes.scenario.md b/src/vs/sessions/test/e2e/scenarios/02-chat-with-changes.scenario.md
index 3e25a5c3399..efe11056b87 100644
--- a/src/vs/sessions/test/e2e/scenarios/02-chat-with-changes.scenario.md
+++ b/src/vs/sessions/test/e2e/scenarios/02-chat-with-changes.scenario.md
@@ -4,8 +4,7 @@
 1. Type "build the project" in the chat input
 2. Press Enter to submit
 3. Verify there is a response in the chat
-4. Toggle the secondary side bar
-5. Verify the changes view shows modified files
-6. Click on "index.ts" in the changes list
-7. Verify a diff editor opens with the modified content
-8. Press Escape to close the diff editor
+4. Verify the changes view shows modified files
+5. Click on "index.ts" in the changes list
+6. Verify a diff editor opens with the modified content
+7. Press Escape to close the diff editor
diff --git a/src/vs/sessions/test/e2e/scenarios/03-session-in-sidebar.scenario.md b/src/vs/sessions/test/e2e/scenarios/03-session-in-sidebar.scenario.md
index aededc6ae0b..a69c0ad39a0 100644
--- a/src/vs/sessions/test/e2e/scenarios/03-session-in-sidebar.scenario.md
+++ b/src/vs/sessions/test/e2e/scenarios/03-session-in-sidebar.scenario.md
@@ -4,6 +4,5 @@
 1. Type "fix the bug" in the chat input
 2. Press Enter to submit
 3. Verify the session appears in the sessions list
-4. Toggle the secondary side bar
-5. Verify the changes view shows the modified file
+4. Verify the changes view shows the modified file
 
diff --git a/src/vs/sessions/test/e2e/scenarios/04-local-cloud-toggle.scenario.md b/src/vs/sessions/test/e2e/scenarios/04-local-cloud-toggle.scenario.md
deleted file mode 100644
index a45b41ea663..00000000000
--- a/src/vs/sessions/test/e2e/scenarios/04-local-cloud-toggle.scenario.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Scenario: Switch between Local and Cloud mode
-
-## Steps
-1. Click button "Cloud"
-2. Write "hello world" and hit enter
-3. Make sure "Pick Repository" picker opens
-4. Press escape key
-5. Click on button "Local"
-6. Clear chat
diff --git a/src/vs/sessions/test/e2e/scenarios/05-navigate-sessions.scenario.md b/src/vs/sessions/test/e2e/scenarios/04-navigate-sessions.scenario.md
similarity index 100%
rename from src/vs/sessions/test/e2e/scenarios/05-navigate-sessions.scenario.md
rename to src/vs/sessions/test/e2e/scenarios/04-navigate-sessions.scenario.md
diff --git a/src/vs/sessions/test/e2e/scenarios/05-full-workflow.scenario.md b/src/vs/sessions/test/e2e/scenarios/05-full-workflow.scenario.md
new file mode 100644
index 00000000000..5192a847cee
--- /dev/null
+++ b/src/vs/sessions/test/e2e/scenarios/05-full-workflow.scenario.md
@@ -0,0 +1,24 @@
+# Scenario: Full workflow
+
+## Steps
+1. Type "build the project" in the chat input
+2. Press Enter to submit
+3. Verify there is a response in the chat
+4. Verify the changes view shows "CHANGES"
+5. Verify "package.json" is visible in the changes list
+6. Verify "build.ts" is visible in the changes list
+7. Verify "index.ts" is visible in the changes list
+8. Click on "index.ts" in the changes list
+9. Verify a diff editor opens with modified content
+10. Press Escape to close the diff editor
+11. Verify "Merge" button is visible in changes view header
+12. Verify the "Open Terminal" button is visible
+13. Click the "Open Terminal" button
+14. Verify the terminal panel becomes visible
+15. Verify the terminal tab shows "session-1" in its label
+16. Click "New Session" to create a new session
+17. Type "fix the bug" in the chat input
+18. Press Enter to submit
+19. Verify the terminal tab label changes to show "session-2"
+20. Click back on the first session in the sessions list
+21. Verify the terminal tab label changes back to show "session-1"
diff --git a/src/vs/sessions/test/e2e/scenarios/generated/02-chat-with-changes.commands.json b/src/vs/sessions/test/e2e/scenarios/generated/02-chat-with-changes.commands.json
index a28fabe6689..766adbd709d 100644
--- a/src/vs/sessions/test/e2e/scenarios/generated/02-chat-with-changes.commands.json
+++ b/src/vs/sessions/test/e2e/scenarios/generated/02-chat-with-changes.commands.json
@@ -23,12 +23,6 @@
 				"# ASSERT_VISIBLE: I'll help you build the project. Here are the changes:"
 			]
 		},
-		{
-			"description": "Toggle the secondary side bar",
-			"commands": [
-				"click button \"Toggle Secondary Side Bar\""
-			]
-		},
 		{
 			"description": "Verify the changes view shows modified files",
 			"commands": [
diff --git a/src/vs/sessions/test/e2e/scenarios/generated/03-session-in-sidebar.commands.json b/src/vs/sessions/test/e2e/scenarios/generated/03-session-in-sidebar.commands.json
index 0013dbc8921..994ad5868d7 100644
--- a/src/vs/sessions/test/e2e/scenarios/generated/03-session-in-sidebar.commands.json
+++ b/src/vs/sessions/test/e2e/scenarios/generated/03-session-in-sidebar.commands.json
@@ -23,12 +23,6 @@
 				"# ASSERT_VISIBLE: fix the bug"
 			]
 		},
-		{
-			"description": "Toggle the secondary side bar",
-			"commands": [
-				"click button \"Toggle Secondary Side Bar\""
-			]
-		},
 		{
 			"description": "Verify the changes view shows the modified file",
 			"commands": [
diff --git a/src/vs/sessions/test/e2e/scenarios/generated/04-local-cloud-toggle.commands.json b/src/vs/sessions/test/e2e/scenarios/generated/04-local-cloud-toggle.commands.json
deleted file mode 100644
index dd3d499af9d..00000000000
--- a/src/vs/sessions/test/e2e/scenarios/generated/04-local-cloud-toggle.commands.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"scenario": "Scenario: Switch between Local and Cloud mode",
-	"generatedAt": "2026-03-06T04:35:09.018Z",
-	"steps": [
-		{
-			"description": "Click button \"Cloud\"",
-			"commands": [
-				"click button \"Cloud\""
-			]
-		},
-		{
-			"description": "Write \"hello world\" and hit enter",
-			"commands": [
-				"click textbox \"Chat input\"",
-				"type \"hello world\"",
-				"press Enter"
-			]
-		},
-		{
-			"description": "Make sure \"Pick Repository\" picker opens",
-			"commands": [
-				"# ASSERT_VISIBLE: Pick Repository",
-				"click listbox \"Repository Picker\""
-			]
-		},
-		{
-			"description": "Press escape key",
-			"commands": [
-				"press Escape"
-			]
-		},
-		{
-			"description": "Click on button \"Local\"",
-			"commands": [
-				"click button \"Local\""
-			]
-		},
-		{
-			"description": "Clear chat",
-			"commands": [
-				"click textbox \"Chat input\"",
-				"press Meta+A",
-				"press Backspace"
-			]
-		}
-	]
-}
diff --git a/src/vs/sessions/test/e2e/scenarios/generated/05-navigate-sessions.commands.json b/src/vs/sessions/test/e2e/scenarios/generated/04-navigate-sessions.commands.json
similarity index 100%
rename from src/vs/sessions/test/e2e/scenarios/generated/05-navigate-sessions.commands.json
rename to src/vs/sessions/test/e2e/scenarios/generated/04-navigate-sessions.commands.json
diff --git a/src/vs/sessions/test/e2e/scenarios/generated/05-full-workflow.commands.json b/src/vs/sessions/test/e2e/scenarios/generated/05-full-workflow.commands.json
new file mode 100644
index 00000000000..150294bf940
--- /dev/null
+++ b/src/vs/sessions/test/e2e/scenarios/generated/05-full-workflow.commands.json
@@ -0,0 +1,134 @@
+{
+	"scenario": "Scenario: Full workflow",
+	"generatedAt": "2026-03-12T22:48:50.725Z",
+	"steps": [
+		{
+			"description": "Type \"build the project\" in the chat input",
+			"commands": [
+				"click textbox \"Chat input\"",
+				"type \"build the project\""
+			]
+		},
+		{
+			"description": "Press Enter to submit",
+			"commands": [
+				"press Enter"
+			]
+		},
+		{
+			"description": "Verify there is a response in the chat",
+			"commands": [
+				"# ASSERT_VISIBLE: I'll help you build the project. Here are the changes:"
+			]
+		},
+		{
+			"description": "Verify the changes view shows \"CHANGES\" with a badge",
+			"commands": [
+				"# ASSERT_VISIBLE: Changes"
+			]
+		},
+		{
+			"description": "Verify \"package.json\" is visible in the changes list",
+			"commands": [
+				"# ASSERT_VISIBLE: package.json"
+			]
+		},
+		{
+			"description": "Verify \"build.ts\" is visible in the changes list",
+			"commands": [
+				"# ASSERT_VISIBLE: build.ts"
+			]
+		},
+		{
+			"description": "Verify \"index.ts\" is visible in the changes list",
+			"commands": [
+				"# ASSERT_VISIBLE: index.ts"
+			]
+		},
+		{
+			"description": "Click on \"index.ts\" in the changes list",
+			"commands": [
+				"click treeitem \"index.ts\""
+			]
+		},
+		{
+			"description": "Verify a diff editor opens with modified content",
+			"commands": [
+				"# ASSERT_VISIBLE: index.ts"
+			]
+		},
+		{
+			"description": "Press Escape to close the diff editor",
+			"commands": [
+				"press Escape"
+			]
+		},
+		{
+			"description": "Verify \"Merge\" button is visible in changes view header",
+			"commands": [
+				"# ASSERT_VISIBLE: Merge"
+			]
+		},
+		{
+			"description": "Verify the \"Open Terminal\" button is visible",
+			"commands": [
+				"# ASSERT_VISIBLE: Open Terminal"
+			]
+		},
+		{
+			"description": "Click the \"Open Terminal\" button",
+			"commands": [
+				"click button \"Open Terminal\""
+			]
+		},
+		{
+			"description": "Verify the terminal panel becomes visible",
+			"commands": [
+				"# ASSERT_VISIBLE: Terminal"
+			]
+		},
+		{
+			"description": "Verify the terminal tab shows \"session-1\" in its label",
+			"commands": [
+				"# ASSERT_VISIBLE: bash - session-1"
+			]
+		},
+		{
+			"description": "Click \"New Session\" to create a new session",
+			"commands": [
+				"click button \"New Session\""
+			]
+		},
+		{
+			"description": "Type \"fix the bug\" in the chat input",
+			"commands": [
+				"click textbox \"Chat input\"",
+				"type \"fix the bug\""
+			]
+		},
+		{
+			"description": "Press Enter to submit",
+			"commands": [
+				"press Enter"
+			]
+		},
+		{
+			"description": "Verify the terminal tab label changes to show \"session-2\"",
+			"commands": [
+				"# ASSERT_VISIBLE: bash - session-2"
+			]
+		},
+		{
+			"description": "Click back on the first session in the sessions list",
+			"commands": [
+				"click listitem \"build the project\""
+			]
+		},
+		{
+			"description": "Verify the terminal tab label changes back to show \"session-1\"",
+			"commands": [
+				"# ASSERT_VISIBLE: bash - session-1"
+			]
+		}
+	]
+}
diff --git a/src/vs/sessions/test/web.test.ts b/src/vs/sessions/test/web.test.ts
index 77c7a39df77..a51964460dc 100644
--- a/src/vs/sessions/test/web.test.ts
+++ b/src/vs/sessions/test/web.test.ts
@@ -22,11 +22,20 @@ import { URI } from '../../base/common/uri.js';
 import { Disposable } from '../../base/common/lifecycle.js';
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../workbench/common/contributions.js';
 import { IChatProgress } from '../../workbench/contrib/chat/common/chatService/chatService.js';
-import { IChatSessionsService, IChatSessionItem, IChatSessionFileChange, ChatSessionStatus, IChatSessionHistoryItem } from '../../workbench/contrib/chat/common/chatSessionsService.js';
+import { IChatSessionsService, IChatSessionItem, IChatSessionFileChange, ChatSessionStatus, IChatSessionHistoryItem, IChatSessionItemsDelta } from '../../workbench/contrib/chat/common/chatSessionsService.js';
 import { IGitService, IGitExtensionDelegate, IGitRepository } from '../../workbench/contrib/git/common/gitService.js';
 import { IFileService } from '../../platform/files/common/files.js';
+import { ITerminalService } from '../../workbench/contrib/terminal/browser/terminal.js';
+import { ITerminalBackend, ITerminalBackendRegistry, IProcessReadyEvent, IProcessProperty, ProcessPropertyType, TerminalExtensions, ITerminalProcessOptions, IShellLaunchConfig } from '../../platform/terminal/common/terminal.js';
+import { IProcessEnvironment } from '../../base/common/platform.js';
+import { Registry } from '../../platform/registry/common/platform.js';
 import { InMemoryFileSystemProvider } from '../../platform/files/common/inMemoryFilesystemProvider.js';
 import { VSBuffer } from '../../base/common/buffer.js';
+import { SyncDescriptor } from '../../platform/instantiation/common/descriptors.js';
+import { getSingletonServiceDescriptors } from '../../platform/instantiation/common/extensions.js';
+import { ServiceIdentifier } from '../../platform/instantiation/common/instantiation.js';
+import { IWorkbench } from '../../workbench/browser/web.api.js';
+import { isEqual } from '../../base/common/resources.js';
 
 /**
  * Mock files pre-seeded in the in-memory file system. These match the
@@ -228,19 +237,20 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 	static readonly ID = 'sessions.test.mockChatAgent';
 
 	private readonly _sessionItems: IChatSessionItem[] = [];
-	private readonly _itemsChangedEmitter = new Emitter<void>();
+	private readonly _itemsChangedEmitter = new Emitter<IChatSessionItemsDelta>();
 	private readonly _sessionHistory = new Map<string, IChatSessionHistoryItem[]>();
+	private _worktreeCounter = 0;
 
 	constructor(
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IStorageService private readonly storageService: IStorageService,
 		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ITerminalService private readonly terminalService: ITerminalService,
 	) {
 		super();
 		this._register(this._itemsChangedEmitter);
 		this.registerMockAgents();
 		this.registerMockSessionProvider();
-		this.preseedFolder();
+		this.registerMockTerminalBackend();
 	}
 
 	/**
@@ -272,23 +282,29 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 		}));
 
 		// Add or update session in list
-		const existing = this._sessionItems.find(s => s.resource.toString() === key);
-		if (existing) {
-			existing.timing.lastRequestStarted = now;
-			existing.timing.lastRequestEnded = now;
+		const existingIndex = this._sessionItems.findIndex(s => isEqual(s.resource, resource));
+		let addedOrUpdated = existingIndex !== -1 ? { ...this._sessionItems[existingIndex] } : undefined;
+		if (addedOrUpdated) {
+			addedOrUpdated.timing = { ...addedOrUpdated.timing, lastRequestStarted: now, lastRequestEnded: now };
 			if (changes) {
-				existing.changes = changes;
+				addedOrUpdated.changes = changes;
 			}
+			this._sessionItems[existingIndex] = addedOrUpdated;
 		} else {
-			this._sessionItems.push({
+			addedOrUpdated = {
 				resource,
 				label: message.slice(0, 50) || 'Mock Session',
 				status: ChatSessionStatus.Completed,
 				timing: { created: now, lastRequestStarted: now, lastRequestEnded: now },
+				metadata: { worktreePath: `/mock-worktrees/session-${++this._worktreeCounter}` },
 				...(changes ? { changes } : {}),
-			});
+			};
+			this._sessionItems.push(addedOrUpdated);
+		}
+
+		if (addedOrUpdated) {
+			this._itemsChangedEmitter.fire({ addedOrUpdated: [addedOrUpdated] });
 		}
-		this._itemsChangedEmitter.fire();
 	}
 
 	private registerMockAgents(): void {
@@ -306,7 +322,7 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 				extensionVersion: '0.0.1',
 				extensionPublisherId: 'vscode',
 				extensionDisplayName: 'Sessions E2E Mock',
-				isDefault: true,
+				isDefault: agentId === 'copilotcli',
 				metadata: {},
 				slashCommands: [],
 				locations: [ChatAgentLocation.Chat],
@@ -329,7 +345,7 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 					// ChatEditingService computes actual diffs
 					if (response.fileEdits) {
 						emitFileEdits(response.fileEdits, progress);
-						console.log(`[Sessions Web Test] Emitted ${response.fileEdits.length} file edits`);
+						console.log(`[Sessions Web Test] Emitted ${response.fileEdits.length} file edits OK`);
 					}
 
 					self.addSessionItem(request.sessionResource, request.message, response.text, response.fileEdits);
@@ -354,7 +370,12 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 				this._register(this.chatSessionsService.registerChatSessionContentProvider(scheme, {
 					async provideChatSessionContent(sessionResource, _token) {
 						const key = sessionResource.toString();
-						const history = self._sessionHistory.get(key) ?? [];
+						// Ensure the history array is stored in _sessionHistory so
+						// addSessionItem pushes into the SAME reference returned here.
+						if (!self._sessionHistory.has(key)) {
+							self._sessionHistory.set(key, []);
+						}
+						const history = self._sessionHistory.get(key)!;
 						console.log(`[Sessions Web Test] Opening session ${key} (${history.length} history items)`);
 						const disposeEmitter = new Emitter<void>();
 						const isComplete = observableValue('isComplete', history.length > 0);
@@ -380,11 +401,15 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 					},
 				}));
 
-				// Register an item controller so sessions appear in the sidebar list
-				const items = this._sessionItems;
+				// Register an item controller so sessions appear in the sidebar list.
+				// Only copilotcli (Background) sessions need real items — the
+				// copilot-cloud-agent controller must return an empty array to
+				// prevent it from overwriting sessions with the wrong providerType
+				// during a full model resolve.
+				const controllerItems = scheme === 'copilotcli' ? this._sessionItems : [];
 				this._register(this.chatSessionsService.registerChatSessionItemController(scheme, {
 					onDidChangeChatSessionItems: this._itemsChangedEmitter.event,
-					get items() { return items; },
+					get items() { return controllerItems; },
 					async refresh() { /* in-memory, no-op */ },
 				}));
 
@@ -395,11 +420,94 @@ class MockChatAgentContribution extends Disposable implements IWorkbenchContribu
 		}
 	}
 
-	private preseedFolder(): void {
-		const mockFolderUri = URI.from({ scheme: 'mock-fs', authority: 'mock-repo', path: '/mock-repo' }).toString();
-		this.storageService.store('agentSessions.lastPickedFolder', mockFolderUri, StorageScope.PROFILE, StorageTarget.MACHINE);
-		console.log(`[Sessions Web Test] Pre-seeded folder: ${mockFolderUri}`);
+	private registerMockTerminalBackend(): void {
+		const terminalService = this.terminalService;
+		const backend = this.createMockTerminalBackend();
+		Registry.as<ITerminalBackendRegistry>(TerminalExtensions.Backend).registerTerminalBackend(backend);
+		terminalService.registerProcessSupport(true);
+		console.log('[Sessions Web Test] Registered mock terminal backend');
 	}
+
+	private createMockTerminalBackend(): ITerminalBackend {
+		return {
+			remoteAuthority: undefined,
+			isVirtualProcess: false,
+			isResponsive: true,
+			whenReady: Promise.resolve(),
+			setReady: () => { },
+			onDidRequestDetach: Event.None,
+			attachToProcess: async () => { throw new Error('Not supported'); },
+			attachToRevivedProcess: async () => { throw new Error('Not supported'); },
+			listProcesses: async () => [],
+			getProfiles: async () => [],
+			getDefaultProfile: async () => undefined,
+			getDefaultSystemShell: async () => '/bin/mock-shell',
+			getShellEnvironment: async () => ({}),
+			setTerminalLayoutInfo: async () => { },
+			getTerminalLayoutInfo: async () => undefined,
+			reduceConnectionGraceTime: () => { },
+			requestDetachInstance: () => { },
+			acceptDetachInstanceReply: () => { },
+			persistTerminalState: () => { },
+			createProcess: async (_shellLaunchConfig: IShellLaunchConfig, _cwd: string | URI, _cols: number, _rows: number, _unicodeVersion: string, _env: IProcessEnvironment, _options: ITerminalProcessOptions, _shouldPersist: boolean) => {
+				const onProcessData = new Emitter<string>();
+				const onProcessReady = new Emitter<IProcessReadyEvent>();
+				const onProcessExit = new Emitter<number | undefined>();
+				const onDidChangeHasChildProcesses = new Emitter<boolean>();
+				const onDidChangeProperty = new Emitter<IProcessProperty<ProcessPropertyType>>();
+
+				// Resolve cwd from createProcess arg or shellLaunchConfig
+				const rawCwd = _cwd || _shellLaunchConfig.cwd;
+				const cwd = !rawCwd ? '/' : typeof rawCwd === 'string' ? rawCwd : rawCwd.path;
+				console.log(`[Sessions Web Test] Mock terminal createProcess cwd: '${cwd}' (raw _cwd: '${_cwd}', slc.cwd: '${_shellLaunchConfig.cwd}')`);
+
+				// Fire ready after a microtask so the terminal service can wire up listeners
+				setTimeout(() => {
+					onProcessReady.fire({ pid: 1, cwd, windowsPty: undefined });
+				}, 0);
+
+				return {
+					id: 0,
+					shouldPersist: false,
+					onProcessData: onProcessData.event,
+					onProcessReady: onProcessReady.event,
+					onDidChangeHasChildProcesses: onDidChangeHasChildProcesses.event,
+					onDidChangeProperty: onDidChangeProperty.event,
+					onProcessExit: onProcessExit.event,
+					start: async () => undefined,
+					shutdown: async () => { },
+					input: async () => { },
+					resize: () => { },
+					clearBuffer: () => { },
+					acknowledgeDataEvent: () => { },
+					setUnicodeVersion: async () => { },
+					getInitialCwd: async () => cwd,
+					getCwd: async () => cwd,
+					getLatency: async () => [],
+					processBinary: async () => { },
+					refreshProperty: async (property: ProcessPropertyType) => { throw new Error(`Not supported: ${property}`); },
+					updateProperty: async () => { },
+					clearUnrespondedRequest: () => { },
+				};
+			},
+			getWslPath: async (original: string, _direction: 'unix-to-win' | 'win-to-unix') => original,
+			getEnvironment: async () => ({}),
+			getLatency: async () => [],
+			getPerformanceMarks: () => [],
+			updateTitle: async () => { },
+			updateIcon: async () => { },
+			setNextCommandId: async () => { },
+			restartPtyHost: () => { },
+			installAutoReply: async () => { },
+			uninstallAllAutoReplies: async () => { },
+			onPtyHostUnresponsive: Event.None,
+			onPtyHostResponsive: Event.None,
+			onPtyHostRestart: Event.None,
+			onPtyHostConnected: Event.None,
+		} as unknown as ITerminalBackend;
+	}
+
+
 }
 
 // Register the contribution so it runs during workbench startup
@@ -422,28 +530,66 @@ class MockGitService implements IGitService {
 
 /**
  * Test variant of SessionsBrowserMain that injects mock services
- * for E2E testing. Service overrides for entitlements and auth are set
- * in createWorkbench(). The mock chat agent is registered via a
- * workbench contribution (MockChatAgentContribution above).
+ * for E2E testing. Mock singletons are patched into the global
+ * singleton registry before `super.open()` so they take effect
+ * during both `BrowserMain.initServices()` and `Workbench.initServices()`.
+ * Original descriptors are restored when the workbench shuts down.
  */
 export class TestSessionsBrowserMain extends SessionsBrowserMain {
 
-	protected override createWorkbench(domElement: HTMLElement, serviceCollection: ServiceCollection, logService: ILogService): IBrowserMainWorkbench {
-		console.log('[Sessions Web Test] Injecting mock services');
+	private _savedDescriptors: [ServiceIdentifier<any>, SyncDescriptor<any>][] = [];
 
-		// Register mock-fs:// provider FIRST so all services can resolve workspace files
+	override async open(): Promise<IWorkbench> {
+		// Patch the global singleton registry BEFORE super.open() calls initServices().
+		// getSingletonServiceDescriptors() returns the mutable internal array, so
+		// replacing entries here ensures both BrowserMain and Workbench pick up mocks.
+		const registry = getSingletonServiceDescriptors();
+		const overrides: [ServiceIdentifier<any>, SyncDescriptor<any>][] = [
+			[IChatEntitlementService, new SyncDescriptor(MockChatEntitlementService)],
+			[IDefaultAccountService, new SyncDescriptor(MockDefaultAccountService)],
+			[IGitService, new SyncDescriptor(MockGitService)],
+		];
+		for (const [serviceId, mockDescriptor] of overrides) {
+			const idx = registry.findIndex(([id]) => id === serviceId);
+			if (idx !== -1) {
+				this._savedDescriptors.push([serviceId, registry[idx][1]]);
+				registry[idx] = [serviceId, mockDescriptor];
+			} else {
+				registry.push([serviceId, mockDescriptor]);
+			}
+		}
+
+		const workbench = await super.open();
+
+		// Restore original descriptors now that the workbench has started,
+		// so subsequent tests in the same process are not affected.
+		for (const [serviceId, original] of this._savedDescriptors) {
+			const idx = registry.findIndex(([id]) => id === serviceId);
+			if (idx !== -1) {
+				registry[idx] = [serviceId, original];
+			}
+		}
+
+		return workbench;
+	}
+
+	private preseedFolder(storageService: IStorageService): void {
+		const mockFolderUri = URI.from({ scheme: 'mock-fs', authority: 'mock-repo', path: '/mock-repo' });
+		const providerId = 'default-copilot';
+
+		// Seed recent workspaces so resolveWorkspace() can hydrate the selection
+		const recentWorkspaces = JSON.stringify([{ uri: mockFolderUri.toJSON(), providerId, checked: true }]);
+		storageService.store('sessions.recentlyPickedWorkspaces', recentWorkspaces, StorageScope.PROFILE, StorageTarget.MACHINE);
+
+		console.log(`[Sessions Web Test] Pre-seeded folder: ${mockFolderUri.toString()}`);
+	}
+
+	protected override createWorkbench(domElement: HTMLElement, serviceCollection: ServiceCollection, logService: ILogService): IBrowserMainWorkbench {
+		// Register mock-fs:// provider so all services can resolve workspace files
 		registerMockFileSystemProvider(serviceCollection);
 
-		// Override entitlement service so Sessions thinks user is signed in
-		serviceCollection.set(IChatEntitlementService, new MockChatEntitlementService());
+		this.preseedFolder(serviceCollection.get(IStorageService) as IStorageService);
 
-		// Override default account service to hide the "Sign In" button
-		serviceCollection.set(IDefaultAccountService, new MockDefaultAccountService());
-
-		// Override git service so openRepository resolves instantly (no 10s barrier wait)
-		serviceCollection.set(IGitService, new MockGitService());
-
-		console.log('[Sessions Web Test] Creating Sessions workbench with mocks');
 		return new SessionsWorkbench(domElement, undefined, serviceCollection, logService);
 	}
 }
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
index 051a9f6f85d..b8ad97532e2 100644
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
@@ -100,6 +100,7 @@ import './mainThreadChatSessions.js';
 import './mainThreadDataChannels.js';
 import './mainThreadMeteredConnection.js';
 import './mainThreadGitExtensionService.js';
+import './mainThreadBrowsers.js';
 
 export class ExtensionPoints implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/api/browser/mainThreadBrowsers.ts b/src/vs/workbench/api/browser/mainThreadBrowsers.ts
new file mode 100644
index 00000000000..2c0e0b7875b
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadBrowsers.ts
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { BrowserTabDto, ExtHostBrowsersShape, ExtHostContext, MainContext, MainThreadBrowsersShape } from '../common/extHost.protocol.js';
+import { IBrowserViewCDPService } from '../../contrib/browserView/common/browserView.js';
+import { BrowserViewUri } from '../../../platform/browserView/common/browserViewUri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { EditorGroupColumn, columnToEditorGroup } from '../../services/editor/common/editorGroupColumn.js';
+import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IEditorOptions } from '../../../platform/editor/common/editor.js';
+import { CDPRequest } from '../../../platform/browserView/common/cdp/types.js';
+import { BrowserEditorInput } from '../../contrib/browserView/common/browserEditorInput.js';
+
+@extHostNamedCustomer(MainContext.MainThreadBrowsers)
+export class MainThreadBrowsers extends Disposable implements MainThreadBrowsersShape {
+
+	private readonly _proxy: ExtHostBrowsersShape;
+
+	private readonly _cdpSessions = this._register(new DisposableMap<string, { groupId: string } & IDisposable>());
+	private readonly _knownBrowsers = this._register(new DisposableMap<string, { input: BrowserEditorInput } & IDisposable>());
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@IEditorService private readonly editorService: IEditorService,
+		@IBrowserViewCDPService private readonly cdpService: IBrowserViewCDPService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super();
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostBrowsers);
+
+		// Track open browser editors
+		this._register(this.editorService.onWillOpenEditor((e) => {
+			if (e.editor instanceof BrowserEditorInput) {
+				this._track(e.editor);
+			}
+		}));
+		this._register(this.editorService.onDidActiveEditorChange(() => this._syncActiveBrowserTab()));
+
+		// Initial sync
+		for (const input of this.editorService.editors) {
+			if (input instanceof BrowserEditorInput) {
+				this._track(input);
+			}
+		}
+		this._syncActiveBrowserTab();
+	}
+
+	// #region Browser tab open
+
+	async $openBrowserTab(url: string, viewColumn?: EditorGroupColumn, options?: IEditorOptions): Promise<BrowserTabDto> {
+		const id = generateUuid();
+		const browserUri = BrowserViewUri.forId(id);
+
+		await this.editorService.openEditor(
+			{
+				resource: browserUri,
+				options: { ...options, viewState: { url } }
+			},
+			columnToEditorGroup(this.editorGroupsService, this.configurationService, viewColumn),
+		);
+		const known = this._knownBrowsers.get(id);
+		if (!known) {
+			throw new Error('Failed to open browser tab');
+		}
+
+		return this._toDto(known.input);
+	}
+
+	// #endregion
+
+	// #region Browser tab tracking
+
+	private _lastActiveBrowserId: string | undefined = undefined;
+	private async _syncActiveBrowserTab(): Promise<void> {
+		const active = this.editorService.activeEditorPane?.input;
+		let activeId: string | undefined;
+		if (active instanceof BrowserEditorInput) {
+			this._track(active);
+			activeId = active.id;
+		}
+		if (this._lastActiveBrowserId !== activeId) {
+			this._lastActiveBrowserId = activeId;
+			this._proxy.$onDidChangeActiveBrowserTab(activeId);
+		}
+	}
+
+	private _track(input: BrowserEditorInput): void {
+		if (this._knownBrowsers.has(input.id)) {
+			return;
+		}
+		const disposables = new DisposableStore();
+
+		// Track property changes. Currently all the tracked properties are covered under the `onDidChangeLabel` event.
+		disposables.add(input.onDidChangeLabel(() => {
+			this._proxy.$onDidChangeBrowserTabState(this._toDto(input));
+		}));
+		disposables.add(input.onWillDispose(() => {
+			this._knownBrowsers.deleteAndDispose(input.id);
+		}));
+		disposables.add(toDisposable(() => {
+			this._proxy.$onDidCloseBrowserTab(input.id);
+		}));
+
+		this._knownBrowsers.set(input.id, { input, dispose: () => disposables.dispose() });
+		this._proxy.$onDidOpenBrowserTab(this._toDto(input));
+	}
+
+	private _toDto(input: BrowserEditorInput): BrowserTabDto {
+		return {
+			id: input.id,
+			url: input.url || 'about:blank',
+			title: input.getTitle(),
+			favicon: input.favicon,
+		};
+	}
+
+	// #endregion
+
+	// #region CDP session management
+
+	async $startCDPSession(sessionId: string, browserId: string): Promise<void> {
+		const known = this._knownBrowsers.get(browserId);
+		if (!known) {
+			throw new Error(`Unknown browser id: ${browserId}`);
+		}
+
+		// Before starting a session, resolve the input to ensure the underlying web contents exist and can be attached.
+		await known.input.resolve();
+
+		const groupId = await this.cdpService.createSessionGroup(browserId);
+		const disposables = new DisposableStore();
+
+		// Wire CDP messages from main process back to ext host
+		disposables.add(this.cdpService.onCDPMessage(groupId)(message => {
+			this._proxy.$onCDPSessionMessage(sessionId, message);
+		}));
+		disposables.add(this.cdpService.onDidDestroy(groupId)(() => {
+			this._cdpSessions.deleteAndDispose(sessionId);
+		}));
+		disposables.add(toDisposable(() => {
+			this.cdpService.destroySessionGroup(groupId).catch(() => { });
+			this._proxy.$onCDPSessionClosed(sessionId);
+		}));
+
+		this._cdpSessions.set(sessionId, { groupId, dispose: () => disposables.dispose() });
+	}
+
+	async $closeCDPSession(sessionId: string): Promise<void> {
+		this._cdpSessions.deleteAndDispose(sessionId);
+	}
+
+	async $sendCDPMessage(sessionId: string, message: CDPRequest): Promise<void> {
+		const session = this._cdpSessions.get(sessionId);
+		if (session) {
+			await this.cdpService.sendCDPMessage(session.groupId, message);
+		}
+	}
+
+	async $closeBrowserTab(browserId: string): Promise<void> {
+		const known = this._knownBrowsers.get(browserId);
+		if (!known) {
+			throw new Error(`Unknown browser id: ${browserId}`);
+		}
+		known.input.dispose();
+	}
+
+	// #endregion
+}
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 5924c301f0d..8ac37889384 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -34,7 +34,7 @@ import { ChatRequestAgentPart } from '../../contrib/chat/common/requestParser/ch
 import { ChatRequestParser } from '../../contrib/chat/common/requestParser/chatRequestParser.js';
 import { getDynamicVariablesForWidget, getSelectedToolAndToolSetsForWidget } from '../../contrib/chat/browser/attachments/chatVariables.js';
 import { IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatService, IChatTask, IChatTaskSerialized, IChatWarningMessage } from '../../contrib/chat/common/chatService/chatService.js';
-import { IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
+import { ChatSessionOptionsMap, IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
 import { ChatAgentLocation, ChatModeKind } from '../../contrib/chat/common/constants.js';
 import { ILanguageModelToolsService } from '../../contrib/chat/common/tools/languageModelToolsService.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -42,7 +42,7 @@ import { IExtensionService } from '../../services/extensions/common/extensions.j
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostChatAgentsShape2, ExtHostContext, IChatNotebookEditDto, IChatParticipantMetadata, IChatProgressDto, IChatSessionContextDto, ICustomAgentDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, IInstructionDto, ISkillDto, MainContext, MainThreadChatAgentsShape2 } from '../common/extHost.protocol.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
-import { getChatSessionType, isUntitledChatSession } from '../../contrib/chat/common/model/chatUri.js';
+import { isUntitledChatSession } from '../../contrib/chat/common/model/chatUri.js';
 
 interface AgentData {
 	dispose: () => void;
@@ -247,40 +247,13 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 					const contributedSession = chatSession?.contributedChatSession;
 					let chatSessionContext: IChatSessionContextDto | undefined;
 					if (contributedSession) {
-						let chatSessionResource = contributedSession.chatSessionResource;
-						let isUntitled = isUntitledChatSession(chatSessionResource);
-
-						// For new untitled sessions, invoke the controller's newChatSessionItemHandler
-						// to let the extension create a proper session item before the first request.
-						if (isUntitled) {
-							const newItem = await this._chatSessionService.createNewChatSessionItem(getChatSessionType(contributedSession.chatSessionResource), { prompt: request.message, command: request.command }, token);
-							if (newItem) {
-								chatSessionResource = newItem.resource;
-								isUntitled = false;
-
-								// Update the model's contributed session with the resolved resource
-								// so subsequent requests don't re-invoke newChatSessionItemHandler
-								// and getChatSessionFromInternalUri returns the real resource.
-								chatSession?.setContributedChatSession({
-									chatSessionResource,
-									initialSessionOptions: contributedSession.initialSessionOptions,
-								});
-
-								// Register alias so session-option lookups work with the new resource
-								this._chatSessionService.registerSessionResourceAlias(
-									contributedSession.chatSessionResource,
-									chatSessionResource
-								);
-							}
-						}
+						const chatSessionResource = contributedSession.chatSessionResource;
+						const isUntitled = isUntitledChatSession(chatSessionResource);
 
 						chatSessionContext = {
 							chatSessionResource,
 							isUntitled,
-							initialSessionOptions: contributedSession.initialSessionOptions?.map(o => ({
-								optionId: o.optionId,
-								value: typeof o.value === 'string' ? o.value : o.value.id,
-							})),
+							initialSessionOptions: ChatSessionOptionsMap.toStrValueArray(contributedSession.initialSessionOptions),
 						};
 					}
 					return await this._proxy.$invokeAgent(handle, request, {
diff --git a/src/vs/workbench/api/browser/mainThreadChatDebug.ts b/src/vs/workbench/api/browser/mainThreadChatDebug.ts
index 8daa3270c4a..c28ac56be4d 100644
--- a/src/vs/workbench/api/browser/mainThreadChatDebug.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatDebug.ts
@@ -6,10 +6,10 @@
 import { Disposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { ChatDebugLogLevel, IChatDebugEvent, IChatDebugService } from '../../contrib/chat/common/chatDebugService.js';
+import { ChatDebugHookResult, ChatDebugLogLevel, IChatDebugEvent, IChatDebugResolvedEventContent, IChatDebugService } from '../../contrib/chat/common/chatDebugService.js';
 import { IChatService } from '../../contrib/chat/common/chatService/chatService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
-import { ExtHostChatDebugShape, ExtHostContext, IChatDebugEventDto, MainContext, MainThreadChatDebugShape } from '../common/extHost.protocol.js';
+import { ExtHostChatDebugShape, ExtHostContext, IChatDebugEventDto, IChatDebugResolvedEventContentDto, MainContext, MainThreadChatDebugShape } from '../common/extHost.protocol.js';
 import { Proxied } from '../../services/extensions/common/proxyIdentifier.js';
 
 @extHostNamedCustomer(MainContext.MainThreadChatDebug)
@@ -51,7 +51,8 @@ export class MainThreadChatDebug extends Disposable implements MainThreadChatDeb
 				return dtos?.map(dto => this._reviveEvent(dto, sessionResource));
 			},
 			resolveChatDebugLogEvent: async (eventId, token) => {
-				return this._proxy.$resolveChatDebugLogEvent(handle, eventId, token);
+				const dto = await this._proxy.$resolveChatDebugLogEvent(handle, eventId, token);
+				return dto ? this._reviveResolvedContent(dto) : undefined;
 			},
 			provideChatDebugLogExport: async (sessionResource, token) => {
 				// Gather core events and session title to pass to the extension.
@@ -185,4 +186,56 @@ export class MainThreadChatDebug extends Disposable implements MainThreadChatDeb
 				};
 		}
 	}
+
+	private _reviveResolvedContent(dto: IChatDebugResolvedEventContentDto): IChatDebugResolvedEventContent {
+		switch (dto.kind) {
+			case 'text':
+				return { kind: 'text', value: dto.value };
+			case 'message':
+				return {
+					kind: 'message',
+					type: dto.type,
+					message: dto.message,
+					sections: dto.sections,
+				};
+			case 'toolCall':
+				return {
+					kind: 'toolCall',
+					toolName: dto.toolName,
+					result: dto.result,
+					durationInMillis: dto.durationInMillis,
+					input: dto.input,
+					output: dto.output,
+				};
+			case 'modelTurn':
+				return {
+					kind: 'modelTurn',
+					requestName: dto.requestName,
+					model: dto.model,
+					status: dto.status,
+					durationInMillis: dto.durationInMillis,
+					inputTokens: dto.inputTokens,
+					outputTokens: dto.outputTokens,
+					cachedTokens: dto.cachedTokens,
+					totalTokens: dto.totalTokens,
+					errorMessage: dto.errorMessage,
+					sections: dto.sections,
+				};
+			case 'hook':
+				return {
+					kind: 'hook',
+					hookType: dto.hookType,
+					command: dto.command,
+					result: dto.result === 'success' ? ChatDebugHookResult.Success
+						: dto.result === 'error' ? ChatDebugHookResult.Error
+							: dto.result === 'nonBlockingError' ? ChatDebugHookResult.NonBlockingError
+								: undefined,
+					durationInMillis: dto.durationInMillis,
+					input: dto.input,
+					output: dto.output,
+					exitCode: dto.exitCode,
+					errorMessage: dto.errorMessage,
+				};
+		}
+	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadChatSessions.ts b/src/vs/workbench/api/browser/mainThreadChatSessions.ts
index dd3b219228f..bf3a76983f0 100644
--- a/src/vs/workbench/api/browser/mainThreadChatSessions.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatSessions.ts
@@ -5,6 +5,7 @@
 
 import { raceCancellationError } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Codicon } from '../../../base/common/codicons.js';
 import { Emitter } from '../../../base/common/event.js';
 import { IMarkdownString, MarkdownString } from '../../../base/common/htmlContent.js';
 import { Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
@@ -12,9 +13,12 @@ import { ResourceMap } from '../../../base/common/map.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { autorun, IObservable, observableValue } from '../../../base/common/observable.js';
 import { isEqual } from '../../../base/common/resources.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { hasValidDiff, IAgentSession } from '../../contrib/chat/browser/agentSessions/agentSessionsModel.js';
 import { IAgentSessionsService } from '../../contrib/chat/browser/agentSessions/agentSessionsService.js';
@@ -24,17 +28,21 @@ import { ChatEditorInput } from '../../contrib/chat/browser/widgetHosts/editor/c
 import { IChatRequestVariableEntry } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
 import { awaitStatsForSession } from '../../contrib/chat/common/chat.js';
 import { IChatContentInlineReference, IChatProgress, IChatService, ResponseModelState } from '../../contrib/chat/common/chatService/chatService.js';
-import { ChatSessionStatus, IChatNewSessionRequest, IChatSession, IChatSessionContentProvider, IChatSessionHistoryItem, IChatSessionItem, IChatSessionItemController, IChatSessionProviderOptionItem, IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
-import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
+import { ChatSessionOptionsMap, ChatSessionStatus, IChatNewSessionRequest, IChatSession, IChatSessionContentProvider, IChatSessionCustomizationsProvider, IChatSessionHistoryItem, IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta, IChatSessionProviderOptionItem, IChatSessionRequestHistoryItem, IChatSessionsService, ReadonlyChatSessionOptionsMap } from '../../contrib/chat/common/chatSessionsService.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../contrib/chat/common/constants.js';
 import { IChatModel } from '../../contrib/chat/common/model/chatModel.js';
 import { isUntitledChatSession } from '../../contrib/chat/common/model/chatUri.js';
 import { IChatAgentRequest } from '../../contrib/chat/common/participants/chatAgents.js';
+import { IChatDebugService } from '../../contrib/chat/common/chatDebugService.js';
+import { ICustomizationHarnessService, IHarnessDescriptor } from '../../contrib/chat/common/customizationHarnessService.js';
+import { PromptsStorage } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { IChatArtifactsService } from '../../contrib/chat/common/tools/chatArtifactsService.js';
 import { IChatTodoListService } from '../../contrib/chat/common/tools/chatTodoListService.js';
 import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
-import { ExtHostChatSessionsShape, ExtHostContext, IChatProgressDto, IChatSessionHistoryItemDto, IChatSessionItemsChange, MainContext, MainThreadChatSessionsShape } from '../common/extHost.protocol.js';
+import { ChatSessionContentContextDto, ExtHostChatSessionsShape, ExtHostContext, IChatProgressDto, IChatSessionHistoryItemDto, IChatSessionItemsChange, IChatSessionRequestHistoryItemDto, MainContext, MainThreadChatSessionsShape } from '../common/extHost.protocol.js';
 
 export class ObservableChatSession extends Disposable implements IChatSession {
 
@@ -42,9 +50,9 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 	readonly providerHandle: number;
 	readonly history: Array<IChatSessionHistoryItem>;
 	title?: string;
-	private _options?: Record<string, string | IChatSessionProviderOptionItem>;
-	public get options(): Record<string, string | IChatSessionProviderOptionItem> | undefined {
-		return this._options;
+	private _options?: ChatSessionOptionsMap;
+	public get options(): ReadonlyChatSessionOptionsMap | undefined {
+		return this._options ? new Map(this._options) : undefined;
 	}
 	private readonly _progressObservable = observableValue<IChatProgress[]>(this, []);
 	private readonly _isCompleteObservable = observableValue<boolean>(this, false);
@@ -66,6 +74,7 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 		history: any[],
 		token: CancellationToken
 	) => Promise<void>;
+	forkSession?: (request: IChatSessionRequestHistoryItem | undefined, token: CancellationToken) => Promise<IChatSessionItem>;
 
 	private readonly _proxy: ExtHostChatSessionsShape;
 	private readonly _providerHandle: number;
@@ -98,21 +107,21 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 		this._dialogService = dialogService;
 	}
 
-	initialize(token: CancellationToken): Promise<void> {
+	initialize(token: CancellationToken, context: ChatSessionContentContextDto): Promise<void> {
 		if (!this._initializationPromise) {
-			this._initializationPromise = this._doInitializeContent(token);
+			this._initializationPromise = this._doInitializeContent(token, context);
 		}
 		return this._initializationPromise;
 	}
 
-	private async _doInitializeContent(token: CancellationToken): Promise<void> {
+	private async _doInitializeContent(token: CancellationToken, context: ChatSessionContentContextDto): Promise<void> {
 		try {
 			const sessionContent = await raceCancellationError(
-				this._proxy.$provideChatSessionContent(this._providerHandle, this.sessionResource, token),
+				this._proxy.$provideChatSessionContent(this._providerHandle, this.sessionResource, context, token),
 				token
 			);
 
-			this._options = sessionContent.options;
+			this._options = sessionContent.options ? ChatSessionOptionsMap.fromRecord(sessionContent.options) : undefined;
 			this.title = sessionContent.title;
 			this.history.length = 0;
 			this.history.push(...sessionContent.history.map((turn: IChatSessionHistoryItemDto) => {
@@ -133,7 +142,8 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 						variableData: variables ? { variables } : undefined,
 						id: turn.id,
 						modelId: turn.modelId,
-					};
+						modeInstructions: turn.modeInstructions ? revive(turn.modeInstructions) : undefined,
+					} satisfies IChatSessionRequestHistoryItem;
 				}
 
 				return {
@@ -238,6 +248,13 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 				};
 			}
 
+			if (sessionContent.hasForkHandler && !this.forkSession) {
+				this.forkSession = async (request: IChatSessionRequestHistoryItem | undefined, token: CancellationToken) => {
+					const result = await this._proxy.$forkChatSession(this._providerHandle, this.sessionResource, request ? this.toRequestDto(request) : undefined, token);
+					return revive(result) as IChatSessionItem;
+				};
+			}
+
 			this._isInitialized = true;
 
 			// Process any pending progress chunks
@@ -306,6 +323,19 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 		}
 	}
 
+	private toRequestDto(request: IChatSessionRequestHistoryItem): IChatSessionRequestHistoryItemDto {
+		return {
+			type: 'request',
+			id: request.id,
+			prompt: request.prompt,
+			participant: request.participant,
+			command: request.command,
+			variableData: undefined,
+			modelId: request.modelId,
+			modeInstructions: request.modeInstructions,
+		};
+	}
+
 	override dispose(): void {
 		this._onWillDispose.fire();
 		this._onWillDispose.dispose();
@@ -329,16 +359,26 @@ class MainThreadChatSessionItemController extends Disposable implements IChatSes
 	private readonly _proxy: ExtHostChatSessionsShape;
 	private readonly _handle: number;
 
-	private readonly _onDidChangeChatSessionItems = this._register(new Emitter<void>());
+	private readonly _onDidChangeChatSessionItems = this._register(new Emitter<IChatSessionItemsDelta>());
 	public readonly onDidChangeChatSessionItems = this._onDidChangeChatSessionItems.event;
 
 	constructor(
 		proxy: ExtHostChatSessionsShape,
-		handle: number
+		chatSessionType: string,
+		handle: number,
+		@IChatService chatService: IChatService,
+		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
 		this._proxy = proxy;
 		this._handle = handle;
+
+		this._register(chatService.registerChatModelChangeListeners(chatSessionType, (sessionResource) => {
+			const item = this._items.get(sessionResource);
+			if (item) {
+				this._onDidChangeChatSessionItems.fire({ addedOrUpdated: [item] });
+			}
+		}));
 	}
 
 	private readonly _items = new ResourceMap<IChatSessionItem>();
@@ -351,7 +391,11 @@ class MainThreadChatSessionItemController extends Disposable implements IChatSes
 	}
 
 	async newChatSessionItem(request: IChatNewSessionRequest, token: CancellationToken): Promise<IChatSessionItem | undefined> {
-		const dto = await raceCancellationError(this._proxy.$newChatSessionItem(this._handle, request, token), token);
+		const dto = await raceCancellationError(this._proxy.$newChatSessionItem(this._handle, {
+			prompt: request.prompt,
+			command: request.command,
+			initialSessionOptions: request.initialSessionOptions ? ChatSessionOptionsMap.toStrValueArray(request.initialSessionOptions) : undefined,
+		}, token), token);
 		if (!dto) {
 			return undefined;
 		}
@@ -361,29 +405,32 @@ class MainThreadChatSessionItemController extends Disposable implements IChatSes
 			changes: revive(dto.changes),
 		};
 		this._items.set(item.resource, item);
-		this._onDidChangeChatSessionItems.fire();
+		this._onDidChangeChatSessionItems.fire({
+			addedOrUpdated: [item],
+		});
 		return item;
 	}
 
 	acceptChange(change: { readonly addedOrUpdated: readonly IChatSessionItem[]; readonly removed: readonly URI[] }): void {
 		for (const item of change.addedOrUpdated) {
-			warnOnUntitledSessionResource(item.resource);
+			warnOnUntitledSessionResource(item.resource, this._logService);
 			this._items.set(item.resource, item);
 		}
 		for (const uri of change.removed) {
 			this._items.delete(uri);
 		}
-		this._onDidChangeChatSessionItems.fire();
+		this._onDidChangeChatSessionItems.fire({
+			addedOrUpdated: change.addedOrUpdated,
+			removed: change.removed,
+		});
 	}
 
 	addOrUpdateItem(item: IChatSessionItem): void {
-		warnOnUntitledSessionResource(item.resource);
+		warnOnUntitledSessionResource(item.resource, this._logService);
 		this._items.set(item.resource, item);
-		this._onDidChangeChatSessionItems.fire();
-	}
-
-	fireOnDidChangeChatSessionItems(): void {
-		this._onDidChangeChatSessionItems.fire();
+		this._onDidChangeChatSessionItems.fire({
+			addedOrUpdated: [item],
+		});
 	}
 }
 
@@ -395,6 +442,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		readonly controller: MainThreadChatSessionItemController;
 	}>());
 	private readonly _contentProvidersRegistrations = this._register(new DisposableMap<number>());
+	private readonly _customizationsProviderRegistrations = new Map<number, { chatSessionType: string; emitter: Emitter<void>; dispose: () => void }>();
 	private readonly _sessionTypeToHandle = new Map<string, number>();
 
 	private readonly _activeSessions = new ResourceMap<ObservableChatSession>();
@@ -409,21 +457,26 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		@IChatService private readonly _chatService: IChatService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 		@IChatTodoListService private readonly _chatTodoListService: IChatTodoListService,
+		@IChatArtifactsService private readonly _chatArtifactsService: IChatArtifactsService,
+		@IChatDebugService private readonly _chatDebugService: IChatDebugService,
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@ILogService private readonly _logService: ILogService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ICustomizationHarnessService private readonly _harnessService: ICustomizationHarnessService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
 
 		this._proxy = this._extHostContext.getProxy(ExtHostContext.ExtHostChatSessions);
 
-		this._register(this._chatSessionsService.onRequestNotifyExtension(({ sessionResource, updates, waitUntil }) => {
-			warnOnUntitledSessionResource(sessionResource);
+		this._register(this._chatSessionsService.onDidChangeSessionOptions(({ sessionResource, updates }) => {
+			warnOnUntitledSessionResource(sessionResource, this._logService);
 			const handle = this._getHandleForSessionType(sessionResource.scheme);
-			this._logService.trace(`[MainThreadChatSessions] onRequestNotifyExtension received: scheme '${sessionResource.scheme}', handle ${handle}, ${updates.length} update(s)`);
+			this._logService.trace(`[MainThreadChatSessions] onRequestNotifyExtension received: scheme '${sessionResource.scheme}', handle ${handle}, ${updates.size} update(s)`);
 			if (handle !== undefined) {
-				waitUntil(this.notifyOptionsChange(handle, sessionResource, updates));
+				this.notifyOptionsChange(handle, sessionResource, updates);
 			} else {
 				this._logService.warn(`[MainThreadChatSessions] Cannot notify option change for scheme '${sessionResource.scheme}': no provider registered. Registered schemes: [${Array.from(this._sessionTypeToHandle.keys()).join(', ')}]`);
 			}
@@ -432,7 +485,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		this._register(this._agentSessionsService.model.onDidChangeSessionArchivedState(session => {
 			for (const [handle, { chatSessionType }] of this._itemControllerRegistrations) {
 				if (chatSessionType === session.providerType) {
-					warnOnUntitledSessionResource(session.resource);
+					warnOnUntitledSessionResource(session.resource, this._logService);
 					this._proxy.$onDidChangeChatSessionItemState(handle, session.resource, session.isArchived());
 				}
 			}
@@ -446,7 +499,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 	$registerChatSessionItemController(handle: number, chatSessionType: string): void {
 		const disposables = new DisposableStore();
 
-		const controller = disposables.add(new MainThreadChatSessionItemController(this._proxy, handle));
+		const controller = disposables.add(this._instantiationService.createInstance(MainThreadChatSessionItemController, this._proxy, chatSessionType, handle));
 		disposables.add(this._chatSessionsService.registerChatSessionItemController(chatSessionType, controller));
 
 		this._itemControllerRegistrations.set(handle, {
@@ -454,11 +507,6 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 			controller,
 			dispose: () => disposables.dispose(),
 		});
-
-		disposables.add(this._chatService.registerChatModelChangeListeners(
-			chatSessionType,
-			() => controller.fireOnDidChangeChatSessionItems()
-		));
 	}
 
 	private getController(handle: number): MainThreadChatSessionItemController {
@@ -469,11 +517,6 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		return registration.controller;
 	}
 
-	$onDidChangeChatSessionItems(handle: number): void {
-		const controller = this.getController(handle);
-		controller.fireOnDidChangeChatSessionItems();
-	}
-
 	private async _resolveSessionItem(item: Dto<IChatSessionItem>): Promise<IChatSessionItem> {
 		const uri = URI.revive(item.resource);
 		const model = this._chatService.getSession(uri);
@@ -482,7 +525,8 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		}
 
 		// We can still get stats if there is no model or if fetching from model failed
-		if (!item.changes || !model) {
+		let changes = revive<typeof item.changes>(item.changes);
+		if (!changes || !model) {
 			const stats = (await this._chatService.getMetadataForSession(uri))?.stats;
 			const diffs: IAgentSession['changes'] = {
 				files: stats?.fileCount || 0,
@@ -490,13 +534,13 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 				deletions: stats?.removed || 0
 			};
 			if (hasValidDiff(diffs)) {
-				item.changes = diffs;
+				changes = diffs;
 			}
 		}
 
 		return {
 			...item,
-			changes: revive(item.changes),
+			changes,
 			resource: uri,
 			iconPath: item.iconPath,
 			tooltip: item.tooltip ? this._reviveTooltip(item.tooltip) : undefined,
@@ -519,10 +563,10 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		controller.addOrUpdateItem(resolvedItem);
 	}
 
-	$onDidChangeChatSessionOptions(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{ optionId: string; value: string }>): void {
+	$onDidChangeChatSessionOptions(handle: number, sessionResourceComponents: UriComponents, updates: Record<string, string | IChatSessionProviderOptionItem>): void {
 		const sessionResource = URI.revive(sessionResourceComponents);
-		warnOnUntitledSessionResource(sessionResource);
-		this._chatSessionsService.notifySessionOptionsChange(sessionResource, updates);
+		warnOnUntitledSessionResource(sessionResource, this._logService);
+		this._chatSessionsService.updateSessionOptions(sessionResource, ChatSessionOptionsMap.fromRecord(updates));
 	}
 
 	async $onDidCommitChatSessionItem(handle: number, originalComponents: UriComponents, modifiedCompoennts: UriComponents): Promise<void> {
@@ -545,6 +589,21 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 			// Migrate todos from old session to new session
 			this._chatTodoListService.migrateTodos(originalResource, modifiedResource);
 
+			// Migrate artifacts from old session to new session
+			this._chatArtifactsService.getArtifacts(originalResource).migrate(this._chatArtifactsService.getArtifacts(modifiedResource));
+
+			// Eagerly invoke debug providers for Copilot CLI sessions so the real
+			// session appears in the debug panel immediately after the untitled →
+			// real swap. Without this, the untitled session is filtered out (it
+			// only has a "Load Hooks" event) and the real session has no events
+			// until someone navigates to it — which can't happen because it's
+			// not listed.
+			if (chatSessionType === 'copilotcli') {
+				// Fire-and-forget: don't block the editor swap. Errors are
+				// handled internally by invokeProviders via onUnexpectedError.
+				this._chatDebugService.invokeProviders(modifiedResource).catch(() => { /* handled internally */ });
+			}
+
 			// Find the group containing the original editor
 			const originalGroup =
 				this.editorGroupService.groups.find(group => group.editors.some(editor => isEqual(editor.resource, originalResource)))
@@ -575,6 +634,9 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 						options,
 					},
 				}], originalGroup);
+
+				// Re-send queued requests from the original session on the committed session
+				this._resendPendingRequests(originalResource, modifiedResource);
 				return;
 			}
 
@@ -595,24 +657,36 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 				const ref = await this._chatService.acquireOrLoadSession(modifiedResource, ChatAgentLocation.Chat, CancellationToken.None);
 				ref?.dispose();
 			}
+
+			// Re-send queued requests from the original session on the committed session
+			this._resendPendingRequests(originalResource, modifiedResource);
 		} finally {
 			originalModel?.dispose();
 		}
 	}
 
+	/**
+	 * Re-sends pending and in-flight requests from the original session on the committed session.
+	 */
+	private _resendPendingRequests(originalResource: URI, modifiedResource: URI): void {
+		this._chatService.migrateRequests(originalResource, modifiedResource);
+	}
+
 	private async handleSessionModelOverrides(model: IChatModel, session: Dto<IChatSessionItem>): Promise<Dto<IChatSessionItem>> {
-		// Override desciription if there's an in-progress count
+		const outgoingSession = { ...session };
+
+		// Override description if there's an in-progress count
 		const inProgress = model.getRequests().filter(r => r.response && !r.response.isComplete);
 		if (inProgress.length) {
-			session.description = this._chatSessionsService.getInProgressSessionDescription(model);
+			outgoingSession.description = this._chatSessionsService.getInProgressSessionDescription(model);
 		}
 
 		// Override changes
 		// TODO: @osortega we don't really use statistics anymore, we need to clarify that in the API
-		if (!(session.changes instanceof Array)) {
+		if (!(outgoingSession.changes instanceof Array)) {
 			const modelStats = await awaitStatsForSession(model);
 			if (modelStats) {
-				session.changes = {
+				outgoingSession.changes = {
 					files: modelStats.fileCount,
 					insertions: modelStats.added,
 					deletions: modelStats.removed
@@ -622,14 +696,14 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 		// Override status if the models needs input
 		if (model.lastRequest?.response?.state === ResponseModelState.NeedsInput) {
-			session.status = ChatSessionStatus.NeedsInput;
+			outgoingSession.status = ChatSessionStatus.NeedsInput;
 		}
 
-		return session;
+		return outgoingSession;
 	}
 
 	private async _provideChatSessionContent(providerHandle: number, sessionResource: URI, token: CancellationToken): Promise<IChatSession> {
-		warnOnUntitledSessionResource(sessionResource);
+		warnOnUntitledSessionResource(sessionResource, this._logService);
 
 		let session = this._activeSessions.get(sessionResource);
 
@@ -651,11 +725,14 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		}
 
 		try {
-			await session.initialize(token);
+			const initialSessionOptions = this._chatSessionsService.getSessionOptions(sessionResource);
+			await session.initialize(token, {
+				initialSessionOptions: initialSessionOptions ? [...initialSessionOptions].map(([optionId, value]) => ({ optionId, value: typeof value === 'string' ? value : value?.id })) : undefined,
+			});
 			if (session.options) {
 				for (const [_, handle] of this._sessionTypeToHandle) {
 					if (handle === providerHandle) {
-						for (const [optionId, value] of Object.entries(session.options)) {
+						for (const [optionId, value] of session.options) {
 							this._chatSessionsService.setSessionOption(sessionResource, optionId, value);
 						}
 						break;
@@ -720,7 +797,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 	$handleProgressComplete(handle: number, sessionResource: UriComponents, requestId: string) {
 		const resource = URI.revive(sessionResource);
-		warnOnUntitledSessionResource(resource);
+		warnOnUntitledSessionResource(resource, this._logService);
 
 		const observableSession = this._activeSessions.get(resource);
 		if (!observableSession) {
@@ -764,11 +841,73 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 				this._chatSessionsService.setOptionGroupsForSessionType(chatSessionScheme, handle, groupsWithCallbacks);
 			}
 			if (options?.newSessionOptions) {
-				this._chatSessionsService.setNewSessionOptionsForSessionType(chatSessionScheme, options.newSessionOptions);
+				this._chatSessionsService.setNewSessionOptionsForSessionType(chatSessionScheme, ChatSessionOptionsMap.fromRecord(options.newSessionOptions));
 			}
 		}).catch(err => this._logService.error('Error fetching chat session options', err));
 	}
 
+	$registerChatSessionCustomizationsProvider(handle: number, chatSessionType: string): void {
+		// Kill switch: when disabled, ignore all extension customizations providers
+		if (!this._configurationService.getValue<boolean>(ChatConfiguration.CustomizationsProviderApi)) {
+			return;
+		}
+
+		const disposables = new DisposableStore();
+		const emitter = disposables.add(new Emitter<void>());
+
+		const provider: IChatSessionCustomizationsProvider = {
+			onDidChangeCustomizations: emitter.event,
+			provideCustomizations: (token) => {
+				return this._proxy.$provideChatSessionCustomizations(handle, token).then(groups => {
+					if (!groups) { return undefined; }
+					return groups.map(g => ({
+						...g,
+						items: g.items.map(item => ({
+							...item,
+							uri: URI.revive(item.uri),
+						})),
+					}));
+				});
+			},
+		};
+
+		disposables.add(this._chatSessionsService.registerCustomizationsProvider(chatSessionType, provider));
+
+		// Register as a harness so it appears in the harness picker
+		const contribution = this._chatSessionsService.getChatSessionContribution(chatSessionType);
+		if (contribution) {
+			const icon = ThemeIcon.isThemeIcon(contribution.icon)
+				? contribution.icon
+				: ThemeIcon.fromId(Codicon.copilot.id);
+			const filter = { sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.extension, PromptsStorage.plugin] };
+			const harnessDescriptor: IHarnessDescriptor = {
+				id: chatSessionType,
+				label: contribution.displayName ?? chatSessionType,
+				icon,
+				hideGenerateButton: true,
+				getStorageSourceFilter: () => filter,
+			};
+			disposables.add(this._harnessService.registerContributedHarness(harnessDescriptor));
+		}
+
+		this._customizationsProviderRegistrations.set(handle, { chatSessionType, emitter, dispose: () => disposables.dispose() });
+	}
+
+	$unregisterChatSessionCustomizationsProvider(handle: number): void {
+		const reg = this._customizationsProviderRegistrations.get(handle);
+		if (reg) {
+			reg.dispose();
+			this._customizationsProviderRegistrations.delete(handle);
+		}
+	}
+
+	$onDidChangeChatSessionCustomizations(handle: number): void {
+		const reg = this._customizationsProviderRegistrations.get(handle);
+		if (reg) {
+			reg.emitter.fire();
+		}
+	}
+
 	override dispose(): void {
 		for (const session of this._activeSessions.values()) {
 			session.dispose();
@@ -780,6 +919,11 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		}
 		this._sessionDisposables.clear();
 
+		for (const reg of this._customizationsProviderRegistrations.values()) {
+			reg.dispose();
+		}
+		this._customizationsProviderRegistrations.clear();
+
 		super.dispose();
 	}
 
@@ -804,10 +948,10 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 	/**
 	 * Notify the extension about option changes for a session
 	 */
-	async notifyOptionsChange(handle: number, sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem | undefined }>): Promise<void> {
+	async notifyOptionsChange(handle: number, sessionResource: URI, updates: ReadonlyMap<string, string | IChatSessionProviderOptionItem | undefined>): Promise<void> {
 		this._logService.trace(`[MainThreadChatSessions] notifyOptionsChange: starting proxy call for handle ${handle}, sessionResource ${sessionResource}`);
 		try {
-			await this._proxy.$provideHandleOptionsChange(handle, sessionResource, updates, CancellationToken.None);
+			await this._proxy.$provideHandleOptionsChange(handle, sessionResource, Object.fromEntries(updates), CancellationToken.None);
 			this._logService.trace(`[MainThreadChatSessions] notifyOptionsChange: proxy call completed for handle ${handle}, sessionResource ${sessionResource}`);
 		} catch (error) {
 			this._logService.error(`[MainThreadChatSessions] notifyOptionsChange: error for handle ${handle}, sessionResource ${sessionResource}:`, error);
@@ -815,8 +959,8 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 	}
 }
 
-function warnOnUntitledSessionResource(resource: URI): void {
+function warnOnUntitledSessionResource(resource: URI, logService: ILogService): void {
 	if (isUntitledChatSession(resource)) {
-		console.trace(`[MainThreadChatSessions] untitled-style sessionResource detected ${resource.toString()}`);
+		logService.warn(`[MainThreadChatSessions] untitled-style sessionResource detected ${resource.toString()}`);
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadDownloadService.ts b/src/vs/workbench/api/browser/mainThreadDownloadService.ts
index 33d4e7989ae..0b2cda8e6d6 100644
--- a/src/vs/workbench/api/browser/mainThreadDownloadService.ts
+++ b/src/vs/workbench/api/browser/mainThreadDownloadService.ts
@@ -20,7 +20,7 @@ export class MainThreadDownloadService extends Disposable implements MainThreadD
 	}
 
 	$download(uri: UriComponents, to: UriComponents): Promise<void> {
-		return this.downloadService.download(URI.revive(uri), URI.revive(to));
+		return this.downloadService.download(URI.revive(uri), URI.revive(to), 'mainThreadDownloadService.download');
 	}
 
 }
diff --git a/src/vs/workbench/api/browser/mainThreadGitExtensionService.ts b/src/vs/workbench/api/browser/mainThreadGitExtensionService.ts
index e9579b0a3ec..15774eafe5f 100644
--- a/src/vs/workbench/api/browser/mainThreadGitExtensionService.ts
+++ b/src/vs/workbench/api/browser/mainThreadGitExtensionService.ts
@@ -165,6 +165,16 @@ export class MainThreadGitExtensionService extends Disposable implements MainThr
 		return result.map(toGitDiffChange);
 	}
 
+	async diffBetweenWithStats2(root: URI, ref: string, path?: string): Promise<GitDiffChange[]> {
+		const handle = this._repositoryHandles.get(root);
+		if (handle === undefined) {
+			return [];
+		}
+
+		const result = await this._proxy.$diffBetweenWithStats2(handle, ref, path);
+		return result.map(toGitDiffChange);
+	}
+
 	async $onDidChangeRepository(handle: number): Promise<void> {
 		const repository = this._repositories.get(handle);
 		if (!repository) {
diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index f71ccdba8fe..f36df0c7f7b 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -18,7 +18,7 @@ import { IDialogService, IPromptButton } from '../../../platform/dialogs/common/
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { LogLevel } from '../../../platform/log/common/log.js';
 import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
-import { IMcpGatewayResult, IWorkbenchMcpGatewayService } from '../../contrib/mcp/common/mcpGatewayService.js';
+import { IWorkbenchMcpGatewayService } from '../../contrib/mcp/common/mcpGatewayService.js';
 import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
 import { extensionPrefixedIdentifier, McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch, McpServerTransportType, McpServerTrust, UserInteractionRequiredError } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
@@ -46,7 +46,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		servers: ISettableObservable<readonly McpServerDefinition[]>;
 		dispose(): void;
 	}>());
-	private readonly _gateways = this._register(new DisposableMap<string, IMcpGatewayResult>());
+	private readonly _gateways = this._register(new DisposableMap<string, DisposableStore>());
 
 	constructor(
 		private readonly _extHostContext: IExtHostContext,
@@ -401,7 +401,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		this._telemetryService.publicLog2<IAuthMetadataSource, McpAuthSetupClassification>('mcp/authSetup', data);
 	}
 
-	async $startMcpGateway(): Promise<{ address: URI; gatewayId: string } | undefined> {
+	async $startMcpGateway(): Promise<{ servers: { label: string; address: URI }[]; gatewayId: string } | undefined> {
 		const result = await this._mcpGatewayService.createGateway(this._extHostContext.extensionHostKind === ExtensionHostKind.Remote);
 		if (!result) {
 			return undefined;
@@ -413,10 +413,15 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		}
 
 		const gatewayId = generateUuid();
-		this._gateways.set(gatewayId, result);
+		const store = new DisposableStore();
+		store.add(result);
+		store.add(result.onDidChangeServers(servers => {
+			this._proxy.$onDidChangeGatewayServers(gatewayId, servers.map(s => ({ label: s.label, address: s.address })));
+		}));
+		this._gateways.set(gatewayId, store);
 
 		return {
-			address: result.address,
+			servers: result.servers.map(s => ({ label: s.label, address: s.address })),
 			gatewayId,
 		};
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index b756baf6d6a..d147675ff99 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -5,7 +5,7 @@
 
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { isCancellationError } from '../../../base/common/errors.js';
-import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
 import { isNative } from '../../../base/common/platform.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
@@ -32,9 +32,8 @@ import { revive } from '../../../base/common/marshalling.js';
 import { ITextFileService } from '../../services/textfile/common/textfiles.js';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
-export class MainThreadWorkspace implements MainThreadWorkspaceShape {
+export class MainThreadWorkspace extends Disposable implements MainThreadWorkspaceShape {
 
-	private readonly _toDispose = new DisposableStore();
 	private readonly _activeCancelTokens: { [id: number]: CancellationTokenSource } = Object.create(null);
 	private readonly _proxy: ExtHostWorkspaceShape;
 	private readonly _queryBuilder: QueryBuilder;
@@ -57,6 +56,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
 	) {
+		super();
 		this._queryBuilder = this._instantiationService.createInstance(QueryBuilder);
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace);
 		const workspace = this._contextService.getWorkspace();
@@ -67,14 +67,14 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		} else {
 			this._contextService.getCompleteWorkspace().then(workspace => this._proxy.$initializeWorkspace(this.getWorkspaceData(workspace), this.isWorkspaceTrusted()));
 		}
-		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
-		this._contextService.onDidChangeWorkbenchState(this._onDidChangeWorkspace, this, this._toDispose);
-		this._workspaceTrustManagementService.onDidChangeTrust(this._onDidGrantWorkspaceTrust, this, this._toDispose);
-		this._workspaceTrustManagementService.onDidChangeTrustedFolders(this._onDidChangeWorkspaceTrustedFolders, this, this._toDispose);
+		this._register(this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this));
+		this._register(this._contextService.onDidChangeWorkbenchState(this._onDidChangeWorkspace, this));
+		this._register(this._workspaceTrustManagementService.onDidChangeTrust(this._onDidGrantWorkspaceTrust, this));
+		this._register(this._workspaceTrustManagementService.onDidChangeTrustedFolders(this._onDidChangeWorkspaceTrustedFolders, this));
 	}
 
-	dispose(): void {
-		this._toDispose.dispose();
+	override dispose(): void {
+		super.dispose();
 
 		for (const requestId in this._activeCancelTokens) {
 			const tokenSource = this._activeCancelTokens[requestId];
@@ -270,7 +270,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	}
 
 	// --- edit sessions ---
-	private registeredEditSessionProviders = new Map<number, IDisposable>();
+	private registeredEditSessionProviders = this._register(new DisposableMap<number, IDisposable>());
 
 	$registerEditSessionIdentityProvider(handle: number, scheme: string) {
 		const disposable = this._editSessionIdentityService.registerEditSessionIdentityProvider({
@@ -284,17 +284,14 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		});
 
 		this.registeredEditSessionProviders.set(handle, disposable);
-		this._toDispose.add(disposable);
 	}
 
 	$unregisterEditSessionIdentityProvider(handle: number) {
-		const disposable = this.registeredEditSessionProviders.get(handle);
-		disposable?.dispose();
-		this.registeredEditSessionProviders.delete(handle);
+		this.registeredEditSessionProviders.deleteAndDispose(handle);
 	}
 
 	// --- canonical uri identities ---
-	private registeredCanonicalUriProviders = new Map<number, IDisposable>();
+	private registeredCanonicalUriProviders = this._register(new DisposableMap<number, IDisposable>());
 
 	$registerCanonicalUriProvider(handle: number, scheme: string) {
 		const disposable = this._canonicalUriService.registerCanonicalUriProvider({
@@ -309,13 +306,10 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		});
 
 		this.registeredCanonicalUriProviders.set(handle, disposable);
-		this._toDispose.add(disposable);
 	}
 
 	$unregisterCanonicalUriProvider(handle: number) {
-		const disposable = this.registeredCanonicalUriProviders.get(handle);
-		disposable?.dispose();
-		this.registeredCanonicalUriProviders.delete(handle);
+		this.registeredCanonicalUriProviders.deleteAndDispose(handle);
 	}
 
 	// --- encodings
diff --git a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts
index 4da1f68eeb1..c8d1765a7ab 100644
--- a/src/vs/workbench/api/browser/statusBarExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/statusBarExtensionPoint.ts
@@ -199,7 +199,7 @@ const statusBarItemSchema = {
 		},
 		text: {
 			type: 'string',
-			description: localize('text', 'The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like \'Hello $(globe)!\'')
+			description: localize('text', 'The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like \'Hello {0}!\'', '$(globe)')
 		},
 		tooltip: {
 			type: 'string',
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 5e575c728d0..f751b3135ab 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -92,6 +92,7 @@ import { IExtHostSearch } from './extHostSearch.js';
 import { IExtHostSecretState } from './extHostSecretState.js';
 import { ExtHostShare } from './extHostShare.js';
 import { ExtHostSpeech } from './extHostSpeech.js';
+import { ExtHostBrowsers } from './extHostBrowsers.js';
 import { ExtHostStatusBar } from './extHostStatusBar.js';
 import { IExtHostStorage } from './extHostStorage.js';
 import { IExtensionStoragePaths } from './extHostStoragePaths.js';
@@ -247,6 +248,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, new ExtHostStatusBar(rpcProtocol, extHostCommands.converter));
 	const extHostSpeech = rpcProtocol.set(ExtHostContext.ExtHostSpeech, new ExtHostSpeech(rpcProtocol));
 	const extHostEmbeddings = rpcProtocol.set(ExtHostContext.ExtHostEmbeddings, new ExtHostEmbeddings(rpcProtocol));
+	const extHostBrowsers = rpcProtocol.set(ExtHostContext.ExtHostBrowsers, new ExtHostBrowsers(rpcProtocol));
 
 	rpcProtocol.set(ExtHostContext.ExtHostMcp, accessor.get(IExtHostMpcService));
 
@@ -1058,6 +1060,34 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
 				return _asExtensionEvent(extHostChatAgents2.onDidChangeActiveChatPanelSessionResource)(listeners, thisArgs, disposables);
 			},
+			get browserTabs() {
+				checkProposedApiEnabled(extension, 'browser');
+				return extHostBrowsers.browserTabs;
+			},
+			onDidOpenBrowserTab(listener, thisArg?, disposables?) {
+				checkProposedApiEnabled(extension, 'browser');
+				return _asExtensionEvent(extHostBrowsers.onDidOpenBrowserTab)(listener, thisArg, disposables);
+			},
+			onDidCloseBrowserTab(listener, thisArg?, disposables?) {
+				checkProposedApiEnabled(extension, 'browser');
+				return _asExtensionEvent(extHostBrowsers.onDidCloseBrowserTab)(listener, thisArg, disposables);
+			},
+			get activeBrowserTab() {
+				checkProposedApiEnabled(extension, 'browser');
+				return extHostBrowsers.activeBrowserTab;
+			},
+			onDidChangeActiveBrowserTab(listener, thisArg?, disposables?) {
+				checkProposedApiEnabled(extension, 'browser');
+				return _asExtensionEvent(extHostBrowsers.onDidChangeActiveBrowserTab)(listener, thisArg, disposables);
+			},
+			onDidChangeBrowserTabState(listener, thisArg?, disposables?) {
+				checkProposedApiEnabled(extension, 'browser');
+				return _asExtensionEvent(extHostBrowsers.onDidChangeBrowserTabState)(listener, thisArg, disposables);
+			},
+			openBrowserTab(url: string, options?: vscode.BrowserTabShowOptions) {
+				checkProposedApiEnabled(extension, 'browser');
+				return extHostBrowsers.openBrowserTab(url, options);
+			},
 		};
 
 		// namespace: workspace
@@ -1634,6 +1664,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatSessionsProvider');
 				return extHostChatSessions.createChatSessionItemController(extension, chatSessionType, refreshHandler);
 			},
+			registerChatSessionCustomizationsProvider(chatSessionType: string, provider: vscode.ChatSessionCustomizationsProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatSessionsProvider');
+				return extHostChatSessions.registerChatSessionCustomizationsProvider(extension, chatSessionType, provider);
+			},
 			registerChatSessionContentProvider(scheme: string, provider: vscode.ChatSessionContentProvider, chatParticipant: vscode.ChatParticipant, capabilities?: vscode.ChatSessionCapabilities) {
 				checkProposedApiEnabled(extension, 'chatSessionsProvider');
 				return extHostChatSessions.registerChatSessionContentProvider(extension, scheme, chatParticipant, provider, capabilities);
@@ -1945,6 +1979,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			TaskGroup: extHostTypes.TaskGroup,
 			TaskPanelKind: extHostTypes.TaskPanelKind,
 			TaskRevealKind: extHostTypes.TaskRevealKind,
+			TaskRunOn: extHostTypes.TaskRunOn,
 			TaskScope: extHostTypes.TaskScope,
 			TerminalLink: extHostTypes.TerminalLink,
 			TerminalQuickFixTerminalCommand: extHostTypes.TerminalQuickFixCommand,
@@ -2094,8 +2129,11 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatToolInvocationPart: extHostTypes.ChatToolInvocationPart,
 			ChatLocation: extHostTypes.ChatLocation,
 			ChatSessionStatus: extHostTypes.ChatSessionStatus,
+			ChatSessionCustomizationType: extHostTypes.ChatSessionCustomizationType,
+			ChatSessionCustomizationStorageLocation: extHostTypes.ChatSessionCustomizationStorageLocation,
 			ChatDebugLogLevel: extHostTypes.ChatDebugLogLevel,
 			ChatDebugToolCallResult: extHostTypes.ChatDebugToolCallResult,
+			ChatDebugHookResult: extHostTypes.ChatDebugHookResult,
 			ChatDebugToolCallEvent: extHostTypes.ChatDebugToolCallEvent,
 			ChatDebugModelTurnEvent: extHostTypes.ChatDebugModelTurnEvent,
 			ChatDebugGenericEvent: extHostTypes.ChatDebugGenericEvent,
@@ -2108,6 +2146,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatDebugEventMessageContent: extHostTypes.ChatDebugEventMessageContent,
 			ChatDebugEventToolCallContent: extHostTypes.ChatDebugEventToolCallContent,
 			ChatDebugEventModelTurnContent: extHostTypes.ChatDebugEventModelTurnContent,
+			ChatDebugEventHookContent: extHostTypes.ChatDebugEventHookContent,
 			ChatRequestEditorData: extHostTypes.ChatRequestEditorData,
 			ChatRequestNotebookData: extHostTypes.ChatRequestNotebookData,
 			ChatReferenceBinaryData: extHostTypes.ChatReferenceBinaryData,
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index c276b416244..14ba2e52d72 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -34,6 +34,7 @@ import { IAccessibilityInformation } from '../../../platform/accessibility/commo
 import { ILocalizedString } from '../../../platform/action/common/action.js';
 import { ConfigurationTarget, IConfigurationChange, IConfigurationData, IConfigurationOverrides } from '../../../platform/configuration/common/configuration.js';
 import { ConfigurationScope } from '../../../platform/configuration/common/configurationRegistry.js';
+import { IEditorOptions } from '../../../platform/editor/common/editor.js';
 import { IExtensionIdWithVersion } from '../../../platform/extensionManagement/common/extensionStorage.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import * as files from '../../../platform/files/common/files.js';
@@ -57,12 +58,12 @@ import { CallHierarchyItem } from '../../contrib/callHierarchy/common/callHierar
 import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from '../../contrib/chat/common/participants/chatAgents.js';
 import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common/editing/chatCodeMapperService.js';
 import { IChatContextItem } from '../../contrib/chat/common/contextContrib/chatContext.js';
-import { IChatProgressHistoryResponseContent, IChatRequestVariableData } from '../../contrib/chat/common/model/chatModel.js';
+import { IChatProgressHistoryResponseContent, IChatRequestModeInstructions, IChatRequestVariableData } from '../../contrib/chat/common/model/chatModel.js';
 import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatExternalEditsDto, IChatFollowup, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService/chatService.js';
-import { IChatNewSessionRequest, IChatSessionItem, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../contrib/chat/common/chatSessionsService.js';
+import { IChatSessionItem, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../contrib/chat/common/chatSessionsService.js';
 import { IChatRequestVariableValue } from '../../contrib/chat/common/attachments/chatVariables.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
-import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from '../../contrib/chat/common/languageModels.js';
+import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatRequestOptions, ILanguageModelChatSelector } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IStreamedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolInvocationStreamContext, IToolProgressStep, IToolResult, ToolDataSource } from '../../contrib/chat/common/tools/languageModelToolsService.js';
 import { IPromptFileContext, IPromptFileResource } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
@@ -99,6 +100,7 @@ import { IExtHostDocumentSaveDelegate } from './extHostDocumentData.js';
 import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
 import * as tasks from './shared/tasks.js';
 import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
+import { CDPEvent, CDPRequest, CDPResponse } from '../../../platform/browserView/common/cdp/types.js';
 
 export type IconPathDto =
 	| UriComponents
@@ -1351,6 +1353,30 @@ export interface ExtHostSpeechShape {
 	$cancelKeywordRecognitionSession(session: number): Promise<void>;
 }
 
+export interface BrowserTabDto {
+	id: string;
+	url: string;
+	title: string;
+	favicon: string | undefined;
+}
+
+export interface MainThreadBrowsersShape extends IDisposable {
+	$openBrowserTab(url: string, viewColumn?: EditorGroupColumn, options?: IEditorOptions): Promise<BrowserTabDto>;
+	$closeBrowserTab(browserId: string): Promise<void>;
+	$startCDPSession(sessionId: string, browserId: string): Promise<void>;
+	$closeCDPSession(sessionId: string): Promise<void>;
+	$sendCDPMessage(sessionId: string, message: CDPRequest): Promise<void>;
+}
+
+export interface ExtHostBrowsersShape {
+	$onDidOpenBrowserTab(browser: BrowserTabDto): void;
+	$onDidCloseBrowserTab(browserId: string): void;
+	$onDidChangeActiveBrowserTab(browserId: string | undefined): void;
+	$onDidChangeBrowserTabState(browser: BrowserTabDto): void;
+	$onCDPSessionMessage(sessionId: string, message: CDPResponse | CDPEvent): void;
+	$onCDPSessionClosed(sessionId: string): void;
+}
+
 export interface MainThreadLanguageModelsShape extends IDisposable {
 	$registerLanguageModelProvider(vendor: string): void;
 	$onLMProviderChange(vendor: string): void;
@@ -1368,7 +1394,7 @@ export interface MainThreadLanguageModelsShape extends IDisposable {
 export interface ExtHostLanguageModelsShape {
 	$provideLanguageModelChatInfo(vendor: string, options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
 	$updateModelAccesslist(data: { from: ExtensionIdentifier; to: ExtensionIdentifier; enabled: boolean }[]): void;
-	$startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: { [name: string]: any }, token: CancellationToken): Promise<void>;
+	$startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
 	$acceptResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
 	$acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
 	$provideTokenLength(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
@@ -1497,7 +1523,19 @@ export interface IChatDebugEventModelTurnContentDto {
 	readonly sections?: readonly IChatDebugMessageSectionDto[];
 }
 
-export type IChatDebugResolvedEventContentDto = IChatDebugEventTextContentDto | IChatDebugEventMessageContentDto | IChatDebugEventToolCallContentDto | IChatDebugEventModelTurnContentDto;
+export interface IChatDebugEventHookContentDto {
+	readonly kind: 'hook';
+	readonly hookType: string;
+	readonly command?: string;
+	readonly result?: 'success' | 'error' | 'nonBlockingError';
+	readonly durationInMillis?: number;
+	readonly input?: string;
+	readonly output?: string;
+	readonly exitCode?: number;
+	readonly errorMessage?: string;
+}
+
+export type IChatDebugResolvedEventContentDto = IChatDebugEventTextContentDto | IChatDebugEventMessageContentDto | IChatDebugEventToolCallContentDto | IChatDebugEventModelTurnContentDto | IChatDebugEventHookContentDto;
 
 export interface ExtHostChatDebugShape {
 	$provideChatDebugLog(handle: number, sessionResource: UriComponents, token: CancellationToken): Promise<IChatDebugEventDto[] | undefined>;
@@ -3399,6 +3437,7 @@ export interface ExtHostMcpShape {
 	$sendMessage(id: number, message: string): void;
 	$waitForInitialCollectionProviders(): Promise<void>;
 	$onDidChangeMcpServerDefinitions(servers: McpServerDefinition.Serialized[]): void;
+	$onDidChangeGatewayServers(gatewayId: string, servers: { label: string; address: UriComponents }[]): void;
 }
 
 export interface IMcpAuthenticationDetails {
@@ -3439,7 +3478,7 @@ export interface MainThreadMcpShape {
 	$getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, options?: IMcpAuthenticationOptions): Promise<string | undefined>;
 	$getTokenForProviderId(id: number, providerId: string, scopes: string[], options?: IMcpAuthenticationOptions): Promise<string | undefined>;
 	$logMcpAuthSetup(data: IAuthMetadataSource): void;
-	$startMcpGateway(): Promise<{ address: UriComponents; gatewayId: string } | undefined>;
+	$startMcpGateway(): Promise<{ servers: { label: string; address: UriComponents }[]; gatewayId: string } | undefined>;
 	$disposeMcpGateway(gatewayId: string): void;
 }
 
@@ -3545,29 +3584,35 @@ export type IChatSessionHistoryItemDto = {
 	command?: string;
 	variableData?: Dto<IChatRequestVariableData>;
 	modelId?: string;
+	modeInstructions?: Dto<IChatRequestModeInstructions>;
 } | {
 	type: 'response';
 	parts: IChatProgressDto[];
 	participant: string;
 };
 
-export interface ChatSessionOptionUpdateDto {
-	readonly optionId: string;
-	readonly value: string | IChatSessionProviderOptionItem | undefined;
+export type IChatSessionRequestHistoryItemDto = Extract<IChatSessionHistoryItemDto, { type: 'request' }>;
+
+
+
+export interface ChatSessionContentContextDto {
+	readonly initialSessionOptions?: ReadonlyArray<{ optionId: string; value: string }>;
 }
 
-export interface ChatSessionOptionUpdateDto2 {
-	readonly optionId: string;
-	readonly value: string | IChatSessionProviderOptionItem;
+export interface IChatNewSessionRequestDto {
+	readonly prompt: string;
+	readonly command?: string;
+
+	readonly initialSessionOptions?: ReadonlyArray<{ optionId: string; value: string }>;
 }
 
-export interface ChatSessionDto {
-	id: string;
+export interface IChatSessionDto {
 	resource: UriComponents;
 	title?: string;
 	history: Array<IChatSessionHistoryItemDto>;
 	hasActiveResponseCallback: boolean;
 	hasRequestHandler: boolean;
+	hasForkHandler: boolean;
 	supportsInterruption: boolean;
 	options?: Record<string, string | IChatSessionProviderOptionItem>;
 }
@@ -3582,18 +3627,36 @@ export interface IChatSessionItemsChange {
 	readonly removed: readonly UriComponents[];
 }
 
+export interface IChatSessionCustomizationItemDto {
+	readonly label: string;
+	readonly description?: string;
+	readonly uri: UriComponents;
+	readonly storageLocation: number;
+	readonly icon?: ThemeIcon;
+}
+
+export interface IChatSessionCustomizationItemGroupDto {
+	readonly id: string;
+	readonly items: IChatSessionCustomizationItemDto[];
+	readonly commands?: ICommandDto[];
+	readonly itemCommands?: ICommandDto[];
+}
+
 export interface MainThreadChatSessionsShape extends IDisposable {
 	$registerChatSessionItemController(controllerHandle: number, chatSessionType: string): void;
 	$unregisterChatSessionItemController(controllerHandle: number): void;
 	$updateChatSessionItems(controllerHandle: number, change: IChatSessionItemsChange): Promise<void>;
 	$addOrUpdateChatSessionItem(controllerHandle: number, item: Dto<IChatSessionItem>): Promise<void>;
-	$onDidChangeChatSessionItems(controllerHandle: number): void;
 	$onDidCommitChatSessionItem(controllerHandle: number, original: UriComponents, modified: UriComponents): void;
 	$registerChatSessionContentProvider(handle: number, chatSessionScheme: string): void;
 	$unregisterChatSessionContentProvider(handle: number): void;
-	$onDidChangeChatSessionOptions(handle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto2>): void;
+	$onDidChangeChatSessionOptions(handle: number, sessionResource: UriComponents, updates: Record<string, string | IChatSessionProviderOptionItem>): void;
 	$onDidChangeChatSessionProviderOptions(handle: number): void;
 
+	$registerChatSessionCustomizationsProvider(handle: number, chatSessionType: string): void;
+	$unregisterChatSessionCustomizationsProvider(handle: number): void;
+	$onDidChangeChatSessionCustomizations(handle: number): void;
+
 	$handleProgressChunk(handle: number, sessionResource: UriComponents, requestId: string, chunks: (IChatProgressDto | [IChatProgressDto, number])[]): Promise<void>;
 	$handleAnchorResolve(handle: number, sessionResource: UriComponents, requestId: string, requestHandle: string, anchor: Dto<IChatContentInlineReference>): void;
 	$handleProgressComplete(handle: number, sessionResource: UriComponents, requestId: string): void;
@@ -3602,15 +3665,17 @@ export interface MainThreadChatSessionsShape extends IDisposable {
 export interface ExtHostChatSessionsShape {
 	$refreshChatSessionItems(providerHandle: number, token: CancellationToken): Promise<void>;
 	$onDidChangeChatSessionItemState(providerHandle: number, sessionResource: UriComponents, archived: boolean): void;
-	$newChatSessionItem(controllerHandle: number, request: IChatNewSessionRequest, token: CancellationToken): Promise<Dto<IChatSessionItem> | undefined>;
+	$newChatSessionItem(controllerHandle: number, request: IChatNewSessionRequestDto, token: CancellationToken): Promise<Dto<IChatSessionItem> | undefined>;
 
-	$provideChatSessionContent(providerHandle: number, sessionResource: UriComponents, token: CancellationToken): Promise<ChatSessionDto>;
+	$provideChatSessionContent(providerHandle: number, sessionResource: UriComponents, context: ChatSessionContentContextDto, token: CancellationToken): Promise<IChatSessionDto>;
 	$interruptChatSessionActiveResponse(providerHandle: number, sessionResource: UriComponents, requestId: string): Promise<void>;
 	$disposeChatSessionContent(providerHandle: number, sessionResource: UriComponents): Promise<void>;
 	$invokeChatSessionRequestHandler(providerHandle: number, sessionResource: UriComponents, request: IChatAgentRequest, history: any[], token: CancellationToken): Promise<IChatAgentResult>;
 	$provideChatSessionProviderOptions(providerHandle: number, token: CancellationToken): Promise<IChatSessionProviderOptions | undefined>;
 	$invokeOptionGroupSearch(providerHandle: number, optionGroupId: string, query: string, token: CancellationToken): Promise<IChatSessionProviderOptionItem[]>;
-	$provideHandleOptionsChange(providerHandle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto>, token: CancellationToken): Promise<void>;
+	$provideHandleOptionsChange(providerHandle: number, sessionResource: UriComponents, updates: Record<string, string | IChatSessionProviderOptionItem | undefined>, token: CancellationToken): Promise<void>;
+	$forkChatSession(providerHandle: number, sessionResource: UriComponents, request: IChatSessionRequestHistoryItemDto | undefined, token: CancellationToken): Promise<Dto<IChatSessionItem>>;
+	$provideChatSessionCustomizations(handle: number, token: CancellationToken): Promise<IChatSessionCustomizationItemGroupDto[] | undefined>;
 }
 
 export interface GitRefQueryDto {
@@ -3680,6 +3745,7 @@ export interface ExtHostGitExtensionShape {
 	$getRefs(handle: number, query: GitRefQueryDto, token?: CancellationToken): Promise<GitRefDto[]>;
 	$getRepositoryState(handle: number): Promise<GitRepositoryStateDto | undefined>;
 	$diffBetweenWithStats(handle: number, ref1: string, ref2: string, path?: string): Promise<GitDiffChangeDto[]>;
+	$diffBetweenWithStats2(handle: number, ref: string, path?: string): Promise<GitDiffChangeDto[]>;
 }
 
 // --- proxy identifiers
@@ -3766,6 +3832,7 @@ export const MainContext = {
 	MainThreadChatOutputRenderer: createProxyIdentifier<MainThreadChatOutputRendererShape>('MainThreadChatOutputRenderer'),
 	MainThreadChatContext: createProxyIdentifier<MainThreadChatContextShape>('MainThreadChatContext'),
 	MainThreadChatDebug: createProxyIdentifier<MainThreadChatDebugShape>('MainThreadChatDebug'),
+	MainThreadBrowsers: createProxyIdentifier<MainThreadBrowsersShape>('MainThreadBrowsers'),
 };
 
 export const ExtHostContext = {
@@ -3846,4 +3913,5 @@ export const ExtHostContext = {
 	ExtHostDataChannels: createProxyIdentifier<ExtHostDataChannelsShape>('ExtHostDataChannels'),
 	ExtHostChatSessions: createProxyIdentifier<ExtHostChatSessionsShape>('ExtHostChatSessions'),
 	ExtHostGitExtension: createProxyIdentifier<ExtHostGitExtensionShape>('ExtHostGitExtension'),
+	ExtHostBrowsers: createProxyIdentifier<ExtHostBrowsersShape>('ExtHostBrowsers'),
 };
diff --git a/src/vs/workbench/api/common/extHostBrowsers.ts b/src/vs/workbench/api/common/extHostBrowsers.ts
new file mode 100644
index 00000000000..bbb360c2705
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostBrowsers.ts
@@ -0,0 +1,268 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { Codicon } from '../../../base/common/codicons.js';
+import type * as vscode from 'vscode';
+import { BrowserTabDto, ExtHostBrowsersShape, IMainContext, MainContext, MainThreadBrowsersShape } from './extHost.protocol.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import * as extHostTypes from './extHostTypes.js';
+import * as typeConverters from './extHostTypeConverters.js';
+import { CDPEvent, CDPRequest, CDPResponse } from '../../../platform/browserView/common/cdp/types.js';
+
+// #region Internal browser tab object
+
+class ExtHostBrowserTab {
+	private _url: string;
+	private _title: string;
+	private _favicon: string | undefined;
+
+	readonly value: vscode.BrowserTab;
+
+	constructor(
+		readonly id: string,
+		private readonly _proxy: MainThreadBrowsersShape,
+		private readonly _sessions: DisposableMap<string, ExtHostBrowserCDPSession>,
+		data: BrowserTabDto,
+	) {
+		this._url = data.url;
+		this._title = data.title;
+		this._favicon = data.favicon;
+
+		const that = this;
+		this.value = {
+			get url(): string { return that._url; },
+			get title(): string { return that._title; },
+			get icon(): vscode.IconPath {
+				return that._favicon
+					? URI.parse(that._favicon)
+					: new extHostTypes.ThemeIcon(Codicon.globe.id) as vscode.ThemeIcon;
+			},
+			startCDPSession(): Promise<vscode.BrowserCDPSession> {
+				return that._startCDPSession();
+			},
+			close(): Promise<void> {
+				return that._close();
+			}
+		};
+	}
+
+	update(data: BrowserTabDto): boolean {
+		let changed = false;
+		if (data.url !== this._url) {
+			this._url = data.url;
+			changed = true;
+		}
+		if (data.title !== this._title) {
+			this._title = data.title;
+			changed = true;
+		}
+		if (data.favicon !== this._favicon) {
+			this._favicon = data.favicon;
+			changed = true;
+		}
+		return changed;
+	}
+
+	private async _startCDPSession(): Promise<vscode.BrowserCDPSession> {
+		const sessionId = generateUuid();
+		await this._proxy.$startCDPSession(sessionId, this.id);
+		const session = new ExtHostBrowserCDPSession(sessionId, this._proxy);
+		this._sessions.set(sessionId, session);
+		return session.value;
+	}
+
+	private async _close(): Promise<void> {
+		await this._proxy.$closeBrowserTab(this.id);
+	}
+}
+
+// #endregion
+
+// #region CDP Session
+
+class ExtHostBrowserCDPSession {
+	private readonly _onDidReceiveMessage = new Emitter<unknown>();
+	private readonly _onDidClose = new Emitter<void>();
+
+	private _closed = false;
+
+	readonly value: vscode.BrowserCDPSession;
+
+	constructor(
+		readonly id: string,
+		private readonly _proxy: MainThreadBrowsersShape,
+	) {
+		const that = this;
+		this.value = {
+			get onDidReceiveMessage(): Event<unknown> { return that._onDidReceiveMessage.event; },
+			get onDidClose(): Event<void> { return that._onDidClose.event; },
+			sendMessage(message: unknown): Promise<void> {
+				return that._sendMessage(message as CDPRequest);
+			},
+			close(): Promise<void> {
+				return that._close();
+			}
+		};
+	}
+
+	dispose(): void {
+		this._onDidReceiveMessage.dispose();
+		this._onDidClose.dispose();
+	}
+
+	private async _sendMessage(message: CDPRequest): Promise<void> {
+		if (this._closed) {
+			throw new Error('Session is closed');
+		}
+		if (!message || typeof message !== 'object') {
+			throw new Error('Message must be an object');
+		}
+		if (typeof message.id !== 'number') {
+			throw new Error('Message must have a numeric id');
+		}
+		if (typeof message.method !== 'string') {
+			throw new Error('Message must have a method string');
+		}
+		if (message.params !== undefined && typeof message.params !== 'object') {
+			throw new Error('Message params must be an object');
+		}
+		if (message.sessionId !== undefined && typeof message.sessionId !== 'string') {
+			throw new Error('Message sessionId must be a string');
+		}
+		await this._proxy.$sendCDPMessage(this.id, { id: message.id, method: message.method, params: message.params, sessionId: message.sessionId });
+	}
+
+	private async _close(): Promise<void> {
+		this._closed = true;
+		await this._proxy.$closeCDPSession(this.id);
+	}
+
+	// Called from main thread
+	_acceptMessage(message: unknown): void {
+		this._onDidReceiveMessage.fire(message);
+	}
+
+	_acceptClosed(): void {
+		this._closed = true;
+		this._onDidClose.fire();
+	}
+}
+
+// #endregion
+
+export class ExtHostBrowsers extends Disposable implements ExtHostBrowsersShape {
+	private readonly _proxy: MainThreadBrowsersShape;
+	private readonly _browserTabs = new Map<string, ExtHostBrowserTab>();
+	private readonly _sessions = this._register(new DisposableMap<string, ExtHostBrowserCDPSession>());
+
+	private _activeBrowserTabId: string | undefined;
+
+	private readonly _onDidOpenBrowserTab = this._register(new Emitter<vscode.BrowserTab>());
+	readonly onDidOpenBrowserTab: Event<vscode.BrowserTab> = this._onDidOpenBrowserTab.event;
+
+	private readonly _onDidCloseBrowserTab = this._register(new Emitter<vscode.BrowserTab>());
+	readonly onDidCloseBrowserTab: Event<vscode.BrowserTab> = this._onDidCloseBrowserTab.event;
+
+	private readonly _onDidChangeActiveBrowserTab = this._register(new Emitter<vscode.BrowserTab | undefined>());
+	readonly onDidChangeActiveBrowserTab: Event<vscode.BrowserTab | undefined> = this._onDidChangeActiveBrowserTab.event;
+
+	private readonly _onDidChangeBrowserTabState = this._register(new Emitter<vscode.BrowserTab>());
+	readonly onDidChangeBrowserTabState: Event<vscode.BrowserTab> = this._onDidChangeBrowserTabState.event;
+
+	constructor(mainContext: IMainContext) {
+		super();
+		this._proxy = mainContext.getProxy(MainContext.MainThreadBrowsers);
+	}
+
+	// #region Public API (called from extension code)
+
+	get browserTabs(): readonly vscode.BrowserTab[] {
+		return [...this._browserTabs.values()].map(t => t.value);
+	}
+
+	get activeBrowserTab(): vscode.BrowserTab | undefined {
+		if (this._activeBrowserTabId) {
+			return this._browserTabs.get(this._activeBrowserTabId)?.value;
+		}
+		return undefined;
+	}
+
+	async openBrowserTab(url: string, options?: vscode.BrowserTabShowOptions): Promise<vscode.BrowserTab> {
+		const viewColumn = typeConverters.ViewColumn.from(options?.viewColumn);
+		const dto = await this._proxy.$openBrowserTab(url, viewColumn, {
+			preserveFocus: options?.preserveFocus,
+			inactive: options?.background,
+		});
+
+		return this._getOrCreateTab(dto).value;
+	}
+
+	// #endregion
+
+	// #region Internal helpers
+
+	private _getOrCreateTab(dto: BrowserTabDto): ExtHostBrowserTab {
+		let tab = this._browserTabs.get(dto.id);
+		if (!tab) {
+			tab = new ExtHostBrowserTab(dto.id, this._proxy, this._sessions, dto);
+			this._browserTabs.set(dto.id, tab);
+			this._onDidOpenBrowserTab.fire(tab.value);
+		} else {
+			tab.update(dto);
+		}
+		return tab;
+	}
+
+	// #endregion
+
+	// #region Main thread callbacks
+
+	$onDidOpenBrowserTab(dto: BrowserTabDto): void {
+		this._getOrCreateTab(dto);
+	}
+
+	$onDidCloseBrowserTab(browserId: string): void {
+		const tab = this._browserTabs.get(browserId);
+		if (tab) {
+			this._browserTabs.delete(browserId);
+			if (this._activeBrowserTabId === browserId) {
+				this._activeBrowserTabId = undefined;
+			}
+			this._onDidCloseBrowserTab.fire(tab.value);
+		}
+	}
+
+	$onDidChangeActiveBrowserTab(browserId: string | undefined): void {
+		this._activeBrowserTabId = browserId;
+		this._onDidChangeActiveBrowserTab.fire(this.activeBrowserTab);
+	}
+
+	$onDidChangeBrowserTabState(data: BrowserTabDto): void {
+		const tab = this._browserTabs.get(data.id);
+		if (tab && tab.update(data)) {
+			this._onDidChangeBrowserTabState.fire(tab.value);
+		}
+	}
+
+	$onCDPSessionMessage(sessionId: string, message: CDPResponse | CDPEvent): void {
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session._acceptMessage(message);
+		}
+	}
+
+	$onCDPSessionClosed(sessionId: string): void {
+		const session = this._sessions.get(sessionId);
+		if (session) {
+			session._acceptClosed();
+			this._sessions.deleteAndDispose(sessionId);
+		}
+	}
+
+	// #endregion
+}
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index d91ae3ce3f0..f67a043941f 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -675,6 +675,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			request,
 			location,
 			model,
+			request.modelConfiguration,
 			this.getDiagnosticsWhenEnabled(detector.extension),
 			tools,
 			detector.extension,
@@ -776,6 +777,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				request,
 				location,
 				model,
+				request.modelConfiguration,
 				this.getDiagnosticsWhenEnabled(agent.extension),
 				tools,
 				agent.extension,
@@ -906,7 +908,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			}
 
 			const editedFileEvents = isProposedApiEnabled(extension, 'chatParticipantPrivate') ? h.request.editedFileEvents : undefined;
-			const turn = new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences, editedFileEvents, h.request.requestId);
+			const modeInstructions2 = isProposedApiEnabled(extension, 'chatParticipantPrivate') && h.request.modeInstructions ? typeConvert.ChatRequestModeInstructions.to(h.request.modeInstructions) : undefined;
+			const turn = new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences, editedFileEvents, h.request.requestId, undefined, modeInstructions2);
 			res.push(turn);
 
 			// RESPONSE turn
@@ -1046,7 +1049,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		}
 
 		const history = await this.prepareHistoryTurns(agent.extension, agent.id, { history: context });
-		return await agent.provideTitle({ history, yieldRequested: false }, token);
+		const sessionResource = context[0]?.request.sessionResource ? URI.revive(context[0].request.sessionResource) : undefined;
+		return await agent.provideTitle({ history, sessionResource, yieldRequested: false }, token);
 	}
 
 	async $provideChatSummary(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined> {
@@ -1056,7 +1060,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		}
 
 		const history = await this.prepareHistoryTurns(agent.extension, agent.id, { history: context });
-		return await agent.provideSummary({ history, yieldRequested: false }, token);
+		const sessionResource = context[0]?.request.sessionResource ? URI.revive(context[0].request.sessionResource) : undefined;
+		return await agent.provideSummary({ history, sessionResource, yieldRequested: false }, token);
 	}
 }
 
diff --git a/src/vs/workbench/api/common/extHostChatDebug.ts b/src/vs/workbench/api/common/extHostChatDebug.ts
index 44cccc60a61..8e84cccaf35 100644
--- a/src/vs/workbench/api/common/extHostChatDebug.ts
+++ b/src/vs/workbench/api/common/extHostChatDebug.ts
@@ -10,7 +10,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { ExtHostChatDebugShape, IChatDebugEventDto, IChatDebugResolvedEventContentDto, MainContext, MainThreadChatDebugShape } from './extHost.protocol.js';
-import { ChatDebugGenericEvent, ChatDebugLogLevel, ChatDebugMessageContentType, ChatDebugMessageSection, ChatDebugModelTurnEvent, ChatDebugSubagentInvocationEvent, ChatDebugSubagentStatus, ChatDebugToolCallEvent, ChatDebugToolCallResult, ChatDebugUserMessageEvent, ChatDebugAgentResponseEvent } from './extHostTypes.js';
+import { ChatDebugGenericEvent, ChatDebugHookResult, ChatDebugLogLevel, ChatDebugMessageContentType, ChatDebugMessageSection, ChatDebugModelTurnEvent, ChatDebugSubagentInvocationEvent, ChatDebugSubagentStatus, ChatDebugToolCallEvent, ChatDebugToolCallResult, ChatDebugUserMessageEvent, ChatDebugAgentResponseEvent, ChatDebugEventHookContent } from './extHostTypes.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 
 export class ExtHostChatDebug extends Disposable implements ExtHostChatDebugShape {
@@ -293,6 +293,23 @@ export class ExtHostChatDebug extends Disposable implements ExtHostChatDebugShap
 					sections: mt.sections?.map(s => ({ name: s.name, content: s.content })),
 				};
 			}
+			case 'hookContent': {
+				const hk = result as unknown as ChatDebugEventHookContent;
+				return {
+					kind: 'hook',
+					hookType: hk.hookType,
+					command: hk.command,
+					result: hk.result === ChatDebugHookResult.Success ? 'success'
+						: hk.result === ChatDebugHookResult.Error ? 'error'
+							: hk.result === ChatDebugHookResult.NonBlockingError ? 'nonBlockingError'
+								: undefined,
+					durationInMillis: hk.durationInMillis,
+					input: hk.input,
+					output: hk.output,
+					exitCode: hk.exitCode,
+					errorMessage: hk.errorMessage,
+				};
+			}
 			default:
 				return undefined;
 		}
diff --git a/src/vs/workbench/api/common/extHostChatSessions.ts b/src/vs/workbench/api/common/extHostChatSessions.ts
index ac1a6843d4e..4106b566013 100644
--- a/src/vs/workbench/api/common/extHostChatSessions.ts
+++ b/src/vs/workbench/api/common/extHostChatSessions.ts
@@ -18,11 +18,11 @@ import { SymbolKind, SymbolKinds } from '../../../editor/common/languages.js';
 import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
-import { IChatNewSessionRequest, IChatSessionProviderOptionItem } from '../../contrib/chat/common/chatSessionsService.js';
+import { IChatSessionProviderOptionItem } from '../../contrib/chat/common/chatSessionsService.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/participants/chatAgents.js';
 import { Proxied } from '../../services/extensions/common/proxyIdentifier.js';
-import { ChatSessionDto, ExtHostChatSessionsShape, IChatAgentProgressShape, IChatSessionProviderOptions, MainContext, MainThreadChatSessionsShape } from './extHost.protocol.js';
+import { ChatSessionContentContextDto, IChatSessionDto, ExtHostChatSessionsShape, IChatAgentProgressShape, IChatSessionRequestHistoryItemDto, IChatSessionProviderOptions, MainContext, MainThreadChatSessionsShape, IChatNewSessionRequestDto, IChatSessionCustomizationItemGroupDto } from './extHost.protocol.js';
 import { ChatAgentResponseStream } from './extHostChatAgents2.js';
 import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
 import { ExtHostLanguageModels } from './extHostLanguageModels.js';
@@ -303,8 +303,6 @@ class ExtHostChatSession {
 }
 
 export class ExtHostChatSessions extends Disposable implements ExtHostChatSessionsShape {
-	private static _sessionHandlePool = 0;
-
 	private readonly _proxy: Proxied<MainThreadChatSessionsShape>;
 
 	private _itemControllerHandlePool = 0;
@@ -333,6 +331,9 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 	 */
 	private readonly _providerOptionGroups = new Map<number, readonly vscode.ChatSessionProviderOptionGroup[]>();
 
+	private _customizationsHandlePool = 0;
+	private readonly _customizationsProviders = new Map<number, { provider: vscode.ChatSessionCustomizationsProvider; chatSessionType: string; disposable: DisposableStore }>();
+
 	constructor(
 		private readonly commands: ExtHostCommands,
 		private readonly _languageModels: ExtHostLanguageModels,
@@ -423,6 +424,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 
 		let isDisposed = false;
 		let newChatSessionItemHandler: vscode.ChatSessionItemController['newChatSessionItemHandler'];
+		let forkHandler: vscode.ChatSessionItemController['forkHandler'];
 		const onDidChangeChatSessionItemStateEmitter = disposables.add(new Emitter<vscode.ChatSessionItem>());
 
 		const collection = new ChatSessionItemCollectionImpl(controllerHandle, this._proxy);
@@ -454,6 +456,8 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 			},
 			get newChatSessionItemHandler() { return newChatSessionItemHandler; },
 			set newChatSessionItemHandler(handler: vscode.ChatSessionItemController['newChatSessionItemHandler']) { newChatSessionItemHandler = handler; },
+			get forkHandler() { return forkHandler; },
+			set forkHandler(handler: vscode.ChatSessionItemController['forkHandler']) { forkHandler = handler; },
 			dispose: () => {
 				isDisposed = true;
 				disposables.dispose();
@@ -482,7 +486,11 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 
 		if (provider.onDidChangeChatSessionOptions) {
 			disposables.add(provider.onDidChangeChatSessionOptions(evt => {
-				this._proxy.$onDidChangeChatSessionOptions(handle, evt.resource, evt.updates);
+				const updates: Record<string, string | IChatSessionProviderOptionItem> = Object.create(null);
+				for (const update of evt.updates) {
+					updates[update.optionId] = update.value;
+				}
+				this._proxy.$onDidChangeChatSessionOptions(handle, evt.resource, updates);
 			}));
 		}
 
@@ -499,7 +507,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		});
 	}
 
-	async $provideChatSessionContent(handle: number, sessionResourceComponents: UriComponents, token: CancellationToken): Promise<ChatSessionDto> {
+	async $provideChatSessionContent(handle: number, sessionResourceComponents: UriComponents, context: ChatSessionContentContextDto, token: CancellationToken): Promise<IChatSessionDto> {
 		const provider = this._chatSessionContentProviders.get(handle);
 		if (!provider) {
 			throw new Error(`No provider for handle ${handle}`);
@@ -507,13 +515,16 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 
 		const sessionResource = URI.revive(sessionResourceComponents);
 
-		const session = await provider.provider.provideChatSessionContent(sessionResource, token);
+		const session = await provider.provider.provideChatSessionContent(sessionResource, token, {
+			sessionOptions: context?.initialSessionOptions ?? []
+		});
 		if (token.isCancellationRequested) {
 			throw new CancellationError();
 		}
 
+		const controllerData = this.getChatSessionItemController(sessionResource.scheme);
+
 		const sessionDisposables = new DisposableStore();
-		const sessionId = ExtHostChatSessions._sessionHandlePool++;
 		const id = sessionResource.toString();
 		const chatSession = new ExtHostChatSession(session, provider.extension, {
 			sessionResource,
@@ -543,11 +554,11 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		}
 		const { capabilities } = provider;
 		return {
-			id: sessionId + '',
 			resource: URI.revive(sessionResource),
 			title: session.title,
 			hasActiveResponseCallback: !!session.activeResponseCallback,
 			hasRequestHandler: !!session.requestHandler,
+			hasForkHandler: !!controllerData?.controller.forkHandler || !!session.forkHandler,
 			supportsInterruption: !!capabilities?.supportsInterruptions,
 			options: session.options,
 			history: session.history.map(turn => {
@@ -560,7 +571,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		};
 	}
 
-	async $provideHandleOptionsChange(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem | undefined }>, token: CancellationToken): Promise<void> {
+	async $provideHandleOptionsChange(handle: number, sessionResourceComponents: UriComponents, updates: Record<string, string | IChatSessionProviderOptionItem | undefined>, token: CancellationToken): Promise<void> {
 		const sessionResource = URI.revive(sessionResourceComponents);
 		const provider = this._chatSessionContentProviders.get(handle);
 		if (!provider) {
@@ -574,11 +585,11 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		}
 
 		try {
-			const updatesToSend = updates.map(update => ({
-				optionId: update.optionId,
-				value: update.value === undefined ? undefined : (typeof update.value === 'string' ? update.value : update.value.id)
+			const updatesToSend = Object.entries(updates).map(([optionId, value]) => ({
+				optionId,
+				value: value === undefined ? undefined : (typeof value === 'string' ? value : value.id)
 			}));
-			await provider.provider.provideHandleOptionsChange(sessionResource, updatesToSend, token);
+			provider.provider.provideHandleOptionsChange(sessionResource, updatesToSend, token);
 		} catch (error) {
 			this._logService.error(`Error calling provideHandleOptionsChange for handle ${handle}, sessionResource ${sessionResource}:`, error);
 		}
@@ -638,7 +649,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 			return {};
 		}
 
-		const chatRequest = typeConvert.ChatAgentRequest.to(request, undefined, await this.getModelForRequest(request, entry.sessionObj.extension), [], new Map(), entry.sessionObj.extension, this._logService);
+		const chatRequest = typeConvert.ChatAgentRequest.to(request, undefined, await this.getModelForRequest(request, entry.sessionObj.extension), request.modelConfiguration, [], new Map(), entry.sessionObj.extension, this._logService);
 
 		const stream = entry.sessionObj.getActiveRequestStream(request);
 		await entry.sessionObj.session.requestHandler(chatRequest, { history, yieldRequested: false }, stream.apiObject, token);
@@ -647,6 +658,57 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		return {};
 	}
 
+	async $forkChatSession(handle: number, sessionResourceComponents: UriComponents, request: IChatSessionRequestHistoryItemDto | undefined, token: CancellationToken): Promise<ReturnType<typeof typeConvert.ChatSessionItem.from>> {
+		const sessionResource = URI.revive(sessionResourceComponents);
+		const entry = this._extHostChatSessions.get(sessionResource);
+		if (!entry) {
+			throw new Error(`No chat session found for resource ${sessionResource.toString()}`);
+		}
+
+		const requestTurn = this.convertRequestDtoToRequestTurn(request);
+
+		const controllerData = this.getChatSessionItemController(sessionResource.scheme);
+		if (controllerData?.controller.forkHandler) {
+			const item = await controllerData.controller.forkHandler(sessionResource, requestTurn, token);
+			return typeConvert.ChatSessionItem.from(item);
+		}
+
+		if (!entry.sessionObj.session.forkHandler) {
+			throw new Error(`No fork handler for session ${sessionResource.toString()}`);
+		}
+
+		const item = await entry.sessionObj.session.forkHandler(sessionResource, requestTurn, token);
+		return typeConvert.ChatSessionItem.from(item);
+	}
+
+	private convertRequestDtoToRequestTurn(request: IChatSessionRequestHistoryItemDto | undefined): extHostTypes.ChatRequestTurn | undefined {
+		if (!request) {
+			return undefined;
+		}
+
+		return new extHostTypes.ChatRequestTurn(
+			request.prompt,
+			request.command,
+			[],
+			request.participant,
+			[],
+			undefined,
+			request.id,
+			request.modelId,
+			typeConvert.ChatRequestModeInstructions.to(request.modeInstructions),
+		);
+	}
+
+	private getChatSessionItemController(chatSessionType: string) {
+		for (const controllerData of this._chatSessionItemControllers.values()) {
+			if (controllerData.chatSessionType === chatSessionType) {
+				return controllerData;
+			}
+		}
+
+		return undefined;
+	}
+
 	private async getModelForRequest(request: IChatAgentRequest, extension: IExtensionDescription): Promise<vscode.LanguageModelChat> {
 		let model: vscode.LanguageModelChat | undefined;
 		if (request.userSelectedModelId) {
@@ -672,6 +734,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 			command: turn.command,
 			variableData: variables.length > 0 ? { variables } : undefined,
 			modelId: turn.modelId,
+			modeInstructions: typeConvert.ChatRequestModeInstructions.from(turn.modeInstructions2),
 		};
 	}
 
@@ -773,7 +836,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		await controllerData.controller.refreshHandler(token);
 	}
 
-	async $newChatSessionItem(handle: number, request: IChatNewSessionRequest, token: CancellationToken): Promise<ReturnType<typeof typeConvert.ChatSessionItem.from> | undefined> {
+	async $newChatSessionItem(handle: number, request: IChatNewSessionRequestDto, token: CancellationToken): Promise<ReturnType<typeof typeConvert.ChatSessionItem.from> | undefined> {
 		const controllerData = this._chatSessionItemControllers.get(handle);
 		if (!controllerData) {
 			this._logService.warn(`No controller found for handle ${handle}`);
@@ -785,7 +848,13 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 			return undefined;
 		}
 
-		const item = await handler({ request: { prompt: request.prompt, command: request.command } }, token);
+		const item = await handler({
+			request: {
+				prompt: request.prompt,
+				command: request.command
+			},
+			sessionOptions: request.initialSessionOptions ?? [],
+		}, token);
 		if (!item) {
 			return undefined;
 		}
@@ -810,4 +879,44 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		item.archived = archived;
 		controllerData.onDidChangeChatSessionItemStateEmitter.fire(item);
 	}
+
+	registerChatSessionCustomizationsProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionCustomizationsProvider): vscode.Disposable {
+		const handle = this._customizationsHandlePool++;
+		const disposables = new DisposableStore();
+
+		this._customizationsProviders.set(handle, { provider, chatSessionType, disposable: disposables });
+
+		if (provider.onDidChangeCustomizations) {
+			disposables.add(provider.onDidChangeCustomizations(() => {
+				this._proxy.$onDidChangeChatSessionCustomizations(handle);
+			}));
+		}
+
+		this._proxy.$registerChatSessionCustomizationsProvider(handle, chatSessionType);
+
+		disposables.add(toDisposable(() => {
+			this._customizationsProviders.delete(handle);
+			this._proxy.$unregisterChatSessionCustomizationsProvider(handle);
+		}));
+
+		return disposables;
+	}
+
+	async $provideChatSessionCustomizations(handle: number, token: CancellationToken): Promise<IChatSessionCustomizationItemGroupDto[] | undefined> {
+		const entry = this._customizationsProviders.get(handle);
+		if (!entry) {
+			return undefined;
+		}
+		try {
+			const result = await entry.provider.provideCustomizations(token);
+			if (!result) {
+				return undefined;
+			}
+			return result.map(g => typeConvert.ChatSessionCustomizations.fromGroup(g));
+		} catch (err) {
+			this._logService.error(`[ExtHostChatSessions] provideCustomizations failed:`, err);
+			return undefined;
+		}
+	}
+
 }
diff --git a/src/vs/workbench/api/common/extHostGitExtensionService.ts b/src/vs/workbench/api/common/extHostGitExtensionService.ts
index 4d1dd2e2acb..a0f7ec43df1 100644
--- a/src/vs/workbench/api/common/extHostGitExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostGitExtensionService.ts
@@ -95,6 +95,7 @@ interface Repository {
 	getBranchBase(name: string): Promise<Branch | undefined>;
 	getRefs(query: GitRefQuery, token?: vscode.CancellationToken): Promise<GitRef[]>;
 	diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<DiffChange[]>;
+	diffBetweenWithStats2(ref: string, path?: string): Promise<DiffChange[]>;
 	isBranchProtected(branch?: Branch): boolean;
 }
 
@@ -326,6 +327,24 @@ export class ExtHostGitExtensionService extends Disposable implements IExtHostGi
 		}
 	}
 
+	async $diffBetweenWithStats2(handle: number, ref: string, path?: string): Promise<GitDiffChangeDto[]> {
+		const repository = this._repositories.get(handle);
+		if (!repository) {
+			return [];
+		}
+
+		try {
+			const changes = await repository.diffBetweenWithStats2(ref, path);
+			return changes.map(c => ({
+				...toGitChangeDto(c),
+				insertions: c.insertions,
+				deletions: c.deletions,
+			}));
+		} catch {
+			return [];
+		}
+	}
+
 	private async _ensureGitApi(): Promise<GitExtensionAPI | undefined> {
 		if (this._gitApi) {
 			return this._gitApi;
diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index cf52a6f3e30..535fa978f24 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -12,6 +12,7 @@ import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { IPreparedToolInvocation, IStreamedToolInvocation, isToolInvocationContext, IToolInvocation, IToolInvocationContext, IToolInvocationPreparationContext, IToolInvocationStreamContext, IToolResult, ToolInvocationPresentation } from '../../contrib/chat/common/tools/languageModelToolsService.js';
+import { computeCombinationKey } from '../../contrib/chat/common/tools/languageModelToolsConfirmationService.js';
 import { ExtensionEditToolId, InternalEditToolId } from '../../contrib/chat/common/tools/builtinTools/editFileTool.js';
 import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/builtinTools/tools.js';
 import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
@@ -304,10 +305,22 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 				checkProposedApiEnabled(item.extension, 'chatParticipantPrivate');
 			}
 
+			if (result.confirmationMessages?.approveCombination !== undefined) {
+				checkProposedApiEnabled(item.extension, 'toolInvocationApproveCombination');
+			}
+
+			const approveCombinationLabel = result.confirmationMessages?.approveCombination
+				? typeConvert.MarkdownString.fromStrict(result.confirmationMessages.approveCombination)
+				: undefined;
+			const approveCombinationKey = approveCombinationLabel
+				? await computeCombinationKey(toolId, context.parameters)
+				: undefined;
+
 			return {
 				confirmationMessages: result.confirmationMessages ? {
 					title: typeof result.confirmationMessages.title === 'string' ? result.confirmationMessages.title : typeConvert.MarkdownString.from(result.confirmationMessages.title),
 					message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : typeConvert.MarkdownString.from(result.confirmationMessages.message),
+					approveCombination: approveCombinationLabel && approveCombinationKey ? { label: approveCombinationLabel, key: approveCombinationKey } : undefined,
 				} : undefined,
 				invocationMessage: typeConvert.MarkdownString.fromStrict(result.invocationMessage),
 				pastTenseMessage: typeConvert.MarkdownString.fromStrict(result.pastTenseMessage),
diff --git a/src/vs/workbench/api/common/extHostLanguageModels.ts b/src/vs/workbench/api/common/extHostLanguageModels.ts
index cc76961ab15..9d2d8bc68c6 100644
--- a/src/vs/workbench/api/common/extHostLanguageModels.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModels.ts
@@ -11,13 +11,14 @@ import { SerializedError, transformErrorForSerialization, transformErrorFromSeri
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IJSONSchema } from '../../../base/common/jsonSchema.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { Progress } from '../../../platform/progress/common/progress.js';
-import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from '../../contrib/chat/common/languageModels.js';
+import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatRequestOptions } from '../../contrib/chat/common/languageModels.js';
 import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/widget/input/modelPickerWidget.js';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
@@ -229,6 +230,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 					isUserSelectable: m.isUserSelectable,
 					statusIcon: m.statusIcon,
 					targetChatSessionType: m.targetChatSessionType,
+					configurationSchema: m.configurationSchema as IJSONSchema | undefined,
 					modelPickerCategory: m.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
 					capabilities: m.capabilities ? {
 						vision: m.capabilities.imageInput,
@@ -258,7 +260,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 		return modelMetadataAndIdentifier;
 	}
 
-	async $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<void> {
+	async $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<void> {
 		const knownModel = this._localModels.get(modelId);
 		if (!knownModel) {
 			throw new Error('Model not found');
@@ -320,7 +322,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 				knownModel.info,
 				messages.value.map(typeConvert.LanguageModelChatMessage2.to),
 				// todo@connor4312: move `core` -> `undefined` after 1.111 Insiders is out
-				{ ...options, modelOptions: options.modelOptions ?? {}, requestInitiator: from ? ExtensionIdentifier.toKey(from) : 'core', toolMode: options.toolMode ?? extHostTypes.LanguageModelChatToolMode.Auto },
+				{ ...options, modelOptions: options.modelOptions ?? {}, modelConfiguration: options.configuration, requestInitiator: from ? ExtensionIdentifier.toKey(from) : 'core', toolMode: options.toolMode ?? extHostTypes.LanguageModelChatToolMode.Auto },
 				progress,
 				token
 			);
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 27e6c334d6b..1554db1996b 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -41,7 +41,7 @@ export interface IExtHostMpcService extends ExtHostMcpShape {
 	/** Returns all MCP server definitions known to the editor. */
 	readonly mcpServerDefinitions: readonly vscode.McpServerDefinition[];
 
-	/** Starts an MCP gateway that exposes MCP servers via an HTTP endpoint. */
+	/** Starts an MCP gateway that exposes MCP servers via HTTP endpoints. */
 	startMcpGateway(): Promise<vscode.McpGateway | undefined>;
 }
 
@@ -80,6 +80,12 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 	readonly onDidChangeMcpServerDefinitions: Event<void> = this._onDidChangeMcpServerDefinitions.event;
 	private _mcpServerDefinitions: readonly vscode.McpServerDefinition[] = [];
 
+	// Active gateways with their server emitters for dynamic updates
+	private readonly _activeGateways = new Map<string, {
+		servers: vscode.McpGatewayServer[];
+		onDidChangeServers: Emitter<readonly vscode.McpGatewayServer[]>;
+	}>();
+
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
 		@ILogService protected readonly _logService: ILogService,
@@ -264,16 +270,41 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 			return undefined;
 		}
 
-		const address = URI.revive(result.address);
 		const gatewayId = result.gatewayId;
+		const servers: vscode.McpGatewayServer[] = result.servers.map(s => ({
+			label: s.label,
+			address: URI.revive(s.address),
+		}));
+		const onDidChangeServers = new Emitter<readonly vscode.McpGatewayServer[]>();
+
+		this._activeGateways.set(gatewayId, { servers, onDidChangeServers });
 
 		return {
-			address,
+			get servers() { return servers; },
+			onDidChangeServers: onDidChangeServers.event,
 			dispose: () => {
+				this._activeGateways.delete(gatewayId);
+				onDidChangeServers.dispose();
 				this._proxy.$disposeMcpGateway(gatewayId);
 			}
 		};
 	}
+
+	/** Called by main thread to notify that a gateway's server set has changed. */
+	$onDidChangeGatewayServers(gatewayId: string, newServers: { label: string; address: UriComponents }[]): void {
+		const gateway = this._activeGateways.get(gatewayId);
+		if (!gateway) {
+			return;
+		}
+
+		const servers: vscode.McpGatewayServer[] = newServers.map(s => ({
+			label: s.label,
+			address: URI.revive(s.address),
+		}));
+		gateway.servers.length = 0;
+		gateway.servers.push(...servers);
+		gateway.onDidChangeServers.fire(servers);
+	}
 }
 
 const enum HttpMode {
diff --git a/src/vs/workbench/api/common/extHostTask.ts b/src/vs/workbench/api/common/extHostTask.ts
index 5bf476c980a..7191d7b5ac3 100644
--- a/src/vs/workbench/api/common/extHostTask.ts
+++ b/src/vs/workbench/api/common/extHostTask.ts
@@ -332,6 +332,9 @@ export namespace TaskDTO {
 		if (value.presentationOptions) {
 			result.presentationOptions = TaskPresentationOptionsDTO.to(value.presentationOptions)!;
 		}
+		if (value.runOptions) {
+			result.runOptions = value.runOptions;
+		}
 		if (value._id) {
 			result._id = value._id;
 		}
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index b50811f7715..a526f4df323 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -25,6 +25,7 @@ import { Promises } from '../../../base/common/async.js';
 import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
 import { TerminalCompletionList, TerminalQuickFix, ViewColumn } from './extHostTypeConverters.js';
 import { IExtHostCommands } from './extHostCommands.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { ISerializedTerminalInstanceContext } from '../../contrib/terminal/common/terminal.js';
 import { isWindows } from '../../../base/common/platform.js';
@@ -1268,19 +1269,33 @@ class ScopedEnvironmentVariableCollection implements IEnvironmentVariableCollect
 }
 
 export class WorkerExtHostTerminalService extends BaseExtHostTerminalService {
+
+	private readonly _hasRemoteAuthority: boolean;
+
 	constructor(
 		@IExtHostCommands extHostCommands: IExtHostCommands,
-		@IExtHostRpcService extHostRpc: IExtHostRpcService
+		@IExtHostRpcService extHostRpc: IExtHostRpcService,
+		@IExtHostInitDataService initData: IExtHostInitDataService
 	) {
 		super(false, extHostCommands, extHostRpc);
+		this._hasRemoteAuthority = !!initData.remote.authority;
 	}
 
 	public createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal {
-		throw new NotSupportedError();
+		if (!this._hasRemoteAuthority) {
+			throw new NotSupportedError();
+		}
+		return this.createTerminalFromOptions({ name, shellPath, shellArgs });
 	}
 
 	public createTerminalFromOptions(options: vscode.TerminalOptions, internalOptions?: ITerminalInternalOptions): vscode.Terminal {
-		throw new NotSupportedError();
+		if (!this._hasRemoteAuthority) {
+			throw new NotSupportedError();
+		}
+		const terminal = new ExtHostTerminal(this._proxy, generateUuid(), options, options.name);
+		this._terminals.push(terminal);
+		terminal.create(options, this._serializeParentTerminal(options, internalOptions));
+		return terminal.value;
 	}
 }
 
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 9cab6521333..5b90e57544b 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -6,6 +6,7 @@
 import type * as vscode from 'vscode';
 import { asArray, coalesce, isNonEmptyArray } from '../../../base/common/arrays.js';
 import { VSBuffer, encodeBase64 } from '../../../base/common/buffer.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
 import { IDataTransferFile, IDataTransferItem, UriList } from '../../../base/common/dataTransfer.js';
 import { createSingleCallFunction } from '../../../base/common/functional.js';
 import * as htmlContent from '../../../base/common/htmlContent.js';
@@ -3403,7 +3404,7 @@ export namespace ChatResponsePart {
 }
 
 export namespace ChatAgentRequest {
-	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][], tools: Map<vscode.LanguageModelToolInformation, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest {
+	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, modelConfiguration: IStringDictionary<unknown> | undefined, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][], tools: Map<vscode.LanguageModelToolInformation, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest {
 
 		const toolReferences: IChatRequestVariableEntry[] = [];
 		const variableReferences: IChatRequestVariableEntry[] = [];
@@ -3438,6 +3439,7 @@ export namespace ChatAgentRequest {
 			toolInvocationToken: Object.freeze<IToolInvocationContext>({ sessionResource: request.sessionResource }) as never,
 			tools,
 			model,
+			modelConfiguration,
 			editedFileEvents: request.editedFileEvents,
 			modeInstructions: request.modeInstructions?.content,
 			modeInstructions2: ChatRequestModeInstructions.to(request.modeInstructions),
@@ -3605,13 +3607,33 @@ namespace ChatLanguageModelToolReferences {
 }
 
 export namespace ChatRequestModeInstructions {
-	export function to(mode: IChatRequestModeInstructions | undefined): vscode.ChatRequestModeInstructions | undefined {
+	export function to(mode: IChatRequestModeInstructions | Dto<IChatRequestModeInstructions> | undefined): vscode.ChatRequestModeInstructions | undefined {
 		if (mode) {
 			return {
 				uri: URI.revive(mode.uri),
 				name: mode.name,
 				content: mode.content,
-				toolReferences: ChatLanguageModelToolReferences.to(mode.toolReferences),
+				toolReferences: ChatLanguageModelToolReferences.to(revive(mode.toolReferences)),
+				metadata: mode.metadata,
+				isBuiltin: mode.isBuiltin,
+			};
+		}
+		return undefined;
+	}
+
+	export function from(mode: vscode.ChatRequestModeInstructions | undefined): IChatRequestModeInstructions | undefined {
+		if (mode) {
+			return {
+				uri: mode.uri,
+				name: mode.name,
+				content: mode.content,
+				toolReferences: mode.toolReferences?.map(ref => ({
+					kind: 'tool' as const,
+					id: ref.name,
+					name: ref.name,
+					value: undefined,
+					range: ref.range ? { start: ref.range[0], endExclusive: ref.range[1] } : undefined,
+				})) ?? [],
 				metadata: mode.metadata,
 				isBuiltin: mode.isBuiltin,
 			};
@@ -3664,6 +3686,8 @@ export namespace ChatAgentResult {
 				return new types.LanguageModelThinkingPart(value.value, value.id, value.metadata);
 			} else if (value.$mid === MarshalledId.LanguageModelPromptTsxPart) {
 				return new types.LanguageModelPromptTsxPart(value.value);
+			} else if (value.$mid === MarshalledId.LanguageModelDataPart) {
+				return new types.LanguageModelDataPart(value.data, value.mimeType, value.audience);
 			}
 
 			return undefined;
@@ -4184,3 +4208,33 @@ export namespace ChatSessionItem {
 		};
 	}
 }
+
+export namespace ChatSessionCustomizations {
+	function commandFrom(cmd: vscode.Command): extHostProtocol.ICommandDto {
+		return {
+			id: cmd.command,
+			title: cmd.title,
+			tooltip: cmd.tooltip,
+			arguments: cmd.arguments,
+		};
+	}
+
+	export function fromItem(item: vscode.ChatSessionCustomizationItem): extHostProtocol.IChatSessionCustomizationItemDto {
+		return {
+			label: item.label,
+			description: item.description,
+			uri: item.uri,
+			storageLocation: item.storageLocation,
+			icon: item.icon ? { id: item.icon.id, color: item.icon.color } : undefined,
+		};
+	}
+
+	export function fromGroup(group: vscode.ChatSessionCustomizationItemGroup): extHostProtocol.IChatSessionCustomizationItemGroupDto {
+		return {
+			id: group.id,
+			items: group.items.map(fromItem),
+			commands: group.commands?.map(commandFrom),
+			itemCommands: group.itemCommands?.map(commandFrom),
+		};
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index bd97ee3ffbb..035939abe0c 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -1275,6 +1275,12 @@ export enum TaskScope {
 	Workspace = 2
 }
 
+export enum TaskRunOn {
+	Default = 1,
+	FolderOpen = 2,
+	WorktreeCreated = 3,
+}
+
 export class CustomExecution implements vscode.CustomExecution {
 	private _callback: (resolvedDefinition: vscode.TaskDefinition) => Thenable<vscode.Pseudoterminal>;
 	constructor(callback: (resolvedDefinition: vscode.TaskDefinition) => Thenable<vscode.Pseudoterminal>) {
@@ -3524,6 +3530,7 @@ export class ChatRequestTurn implements vscode.ChatRequestTurn2 {
 		readonly editedFileEvents?: vscode.ChatRequestEditedFileEvent[],
 		readonly id?: string,
 		readonly modelId?: string,
+		readonly modeInstructions2?: vscode.ChatRequestModeInstructions,
 	) { }
 }
 
@@ -3561,6 +3568,23 @@ export enum ChatSessionStatus {
 	NeedsInput = 3
 }
 
+export enum ChatSessionCustomizationType {
+	Agents = 'agents',
+	Skills = 'skills',
+	AgentInstructions = 'agentInstructions',
+	ContextInstructions = 'contextInstructions',
+	OnDemandInstructions = 'onDemandInstructions',
+	Prompts = 'prompts',
+}
+
+export enum ChatSessionCustomizationStorageLocation {
+	Workspace = 1,
+	User = 2,
+	Extension = 3,
+	Plugin = 4,
+	BuiltIn = 5,
+}
+
 export enum ChatDebugLogLevel {
 	Trace = 0,
 	Info = 1,
@@ -3573,6 +3597,12 @@ export enum ChatDebugToolCallResult {
 	Error = 1
 }
 
+export enum ChatDebugHookResult {
+	Success = 0,
+	Error = 1,
+	NonBlockingError = 2
+}
+
 export class ChatDebugToolCallEvent {
 	readonly _kind = 'toolCall';
 	id?: string;
@@ -3750,6 +3780,22 @@ export class ChatDebugEventModelTurnContent {
 	}
 }
 
+export class ChatDebugEventHookContent {
+	readonly _kind = 'hookContent';
+	hookType: string;
+	command?: string;
+	result?: ChatDebugHookResult;
+	durationInMillis?: number;
+	input?: string;
+	output?: string;
+	exitCode?: number;
+	errorMessage?: string;
+
+	constructor(hookType: string) {
+		this.hookType = hookType;
+	}
+}
+
 export class ChatSessionChangedFile {
 	constructor(public readonly modifiedUri: vscode.Uri, public readonly insertions: number, public readonly deletions: number, public readonly originalUri?: vscode.Uri) { }
 }
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index 3b01c6c8ac6..24bb32c2327 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -524,6 +524,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 				disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
 				maxResults: options.maxResults,
 				excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
+				ignoreGlobCase: options.caseInsensitive,
 				_reason: 'startFileSearch',
 				shouldGlobSearch: query.type === 'include' ? undefined : true,
 			};
@@ -597,6 +598,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 					disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
 					fileEncoding: options.encoding,
 					maxResults: options.maxResults,
+					ignoreGlobCase: options.caseInsensitive,
 					previewOptions: options.previewOptions ? {
 						matchLines: options.previewOptions?.numMatchLines ?? 100,
 						charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
diff --git a/src/vs/workbench/api/common/shared/tasks.ts b/src/vs/workbench/api/common/shared/tasks.ts
index a7e46e70ff8..e6ec0ec0987 100644
--- a/src/vs/workbench/api/common/shared/tasks.ts
+++ b/src/vs/workbench/api/common/shared/tasks.ts
@@ -26,6 +26,7 @@ export interface ITaskPresentationOptionsDTO {
 
 export interface IRunOptionsDTO {
 	reevaluateOnRerun?: boolean;
+	runOn?: number;
 }
 
 export interface IExecutionOptionsDTO {
diff --git a/src/vs/workbench/api/node/proxyResolver.ts b/src/vs/workbench/api/node/proxyResolver.ts
index 48be8437039..acc7d93e4c7 100644
--- a/src/vs/workbench/api/node/proxyResolver.ts
+++ b/src/vs/workbench/api/node/proxyResolver.ts
@@ -52,6 +52,7 @@ export function connectProxyResolver(
 		getProxySupport: () => getExtHostConfigValue<ProxySupportSetting>(configProvider, isRemote, 'http.proxySupport') || 'off',
 		getNoProxyConfig: () => getExtHostConfigValue<string[]>(configProvider, isRemote, 'http.noProxy') || [],
 		isAdditionalFetchSupportEnabled: () => getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.fetchAdditionalSupport', true),
+		isWebSocketPatchEnabled: () => getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.webSocketAdditionalSupport', true),
 		addCertificatesV1: () => certSettingV1(configProvider, isRemote),
 		addCertificatesV2: () => certSettingV2(configProvider, isRemote),
 		loadSystemCertificatesFromNode: () => getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.systemCertificatesNode', systemCertificatesNodeDefault),
@@ -106,11 +107,13 @@ export function connectProxyResolver(
 				promises.push(Promise.resolve(https.globalAgent.testCertificates as string[]));
 			}
 			const result = (await Promise.all(promises)).flat();
+			const nodeSystemCertErrors = collectNodeSystemCertErrors(useNodeSystemCerts, extHostLogService);
 			mainThreadTelemetry.$publicLog2<AdditionalCertificatesEvent, AdditionalCertificatesClassification>('additionalCertificates', {
 				count: result.length,
 				isRemote,
 				loadLocalCertificates,
 				useNodeSystemCerts,
+				nodeSystemCertErrors,
 			});
 			return result;
 		},
@@ -122,6 +125,7 @@ export function connectProxyResolver(
 	target.resolveProxyURL = resolveProxyURL;
 
 	patchGlobalFetch(params, configProvider, mainThreadTelemetry, initData, resolveProxyURL, disposables);
+	patchGlobalWebSocket(params, resolveProxyURL);
 
 	const lookup = createPatchedModules(params, resolveProxyWithRequest);
 	return configureModuleLoading(extensionService, lookup);
@@ -204,6 +208,16 @@ function patchGlobalFetch(params: ProxyAgentParams, configProvider: ExtHostConfi
 	}
 }
 
+function patchGlobalWebSocket(params: ProxyAgentParams, resolveProxyURL: (url: string) => Promise<string | undefined>) {
+	// eslint-disable-next-line local/code-no-any-casts
+	if (!(globalThis as any).__vscodeOriginalWebSocket) {
+		const originalWebSocket = globalThis.WebSocket;
+		// eslint-disable-next-line local/code-no-any-casts
+		(globalThis as any).__vscodeOriginalWebSocket = originalWebSocket;
+		globalThis.WebSocket = proxyAgent.createWebSocketPatch(params, originalWebSocket, resolveProxyURL);
+	}
+}
+
 function monitorResponseProperties(mainThreadTelemetry: MainThreadTelemetryShape, response: Response, urlString: string) {
 	const originalUrl = response.url;
 	Object.defineProperty(response, 'url', {
@@ -271,6 +285,7 @@ type AdditionalCertificatesClassification = {
 	isRemote: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether this is a remote extension host' };
 	loadLocalCertificates: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether local certificates are loaded' };
 	useNodeSystemCerts: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether Node.js system certificates are used' };
+	nodeSystemCertErrors: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Summary of certificate loading errors from tls.getSystemCACertificatesErrors() or a sentinel string when unavailable/disabled' };
 };
 
 type AdditionalCertificatesEvent = {
@@ -278,8 +293,84 @@ type AdditionalCertificatesEvent = {
 	isRemote: boolean;
 	loadLocalCertificates: boolean;
 	useNodeSystemCerts: boolean;
+	nodeSystemCertErrors: string;
 };
 
+function collectNodeSystemCertErrors(useNodeSystemCerts: boolean, logService: ILogService): string {
+	if (!useNodeSystemCerts) {
+		const result = 'Not using Node.js system certificates';
+		logService.debug(`ProxyResolver#collectNodeSystemCertErrors: ${result}`);
+		return result;
+	}
+	// eslint-disable-next-line local/code-no-any-casts
+	if (typeof (tls as any).getSystemCACertificatesErrors !== 'function') {
+		const result = 'tls.getSystemCACertificatesErrors is not available';
+		logService.debug(`ProxyResolver#collectNodeSystemCertErrors: ${result}`);
+		return result;
+	}
+	try {
+		// eslint-disable-next-line local/code-no-any-casts
+		const errors = (tls as any).getSystemCACertificatesErrors();
+		if (!errors || typeof errors !== 'object') {
+			const result = 'tls.getSystemCACertificatesErrors() did not return an object';
+			logService.debug(`ProxyResolver#collectNodeSystemCertErrors: ${result}`);
+			return result;
+		}
+		const counts = new Map<string, { error: string; count: number; code: number | string }>();
+		for (const [category, entries] of Object.entries(errors)) {
+			if (Array.isArray(entries)) {
+				for (const entry of entries as { errorMessage?: string; errorCode?: number }[]) {
+					const code = entry.errorCode ?? 'missing code';
+					const error = `${category}: ${sanitizeCertErrorMessage(entry.errorMessage ?? 'missing message')}`;
+					const key = `${error} (${code})`;
+					const existing = counts.get(key);
+					if (existing) {
+						existing.count++;
+					} else {
+						counts.set(key, { error, code, count: 1 });
+					}
+				}
+			}
+		}
+		const result = JSON.stringify([...counts.values()].sort((a, b) => b.count - a.count));
+		logService.trace(`ProxyResolver#collectNodeSystemCertErrors: ${result}`);
+		return result;
+	} catch (err) {
+		logService.debug('ProxyResolver#collectNodeSystemCertErrors: Failed to get certificate errors', err);
+		return `Error: ${err instanceof Error ? err.message : String(err)}`;
+	}
+}
+
+// Sanitize known error messages to avoid false-positive redaction by the
+// telemetry scrubbing regex in telemetryUtils.ts (the Generic Secret pattern
+// matches "key", "sig", "signature" followed by a non-alphanumeric character).
+// Source strings from Node.js RecordCertError() and OpenSSL's x509_err.c / asn1_err.c.
+const certErrorReplacements: [string, string][] = [
+	// Node.js RecordCertError:
+	['key usage flags', 'k usage flags'],
+	// x509_err.c:
+	['check dh key', 'check dh k'],
+	['key type mismatch', 'k type mismatch'],
+	['key values mismatch', 'k values mismatch'],
+	['public key decode error', 'public k decode error'],
+	['public key encode error', 'public k encode error'],
+	['unable to get certs public key', 'unable to get certs public k'],
+	['unknown key type', 'unknown k type'],
+	// asn1_err.c:
+	['key type not supported', 'k type not supported'],
+	['public key type', 'public k type'],
+	['sig parse error', 's parse error'],
+	['sig invalid mime type', 's invalid mime type'],
+	['sig content type', 's content type'],
+	['signature algorithm', 's algorithm'],
+];
+function sanitizeCertErrorMessage(message: string): string {
+	for (const [search, replacement] of certErrorReplacements) {
+		message = message.replaceAll(search, replacement);
+	}
+	return message;
+}
+
 type ProxyResolveStatsClassification = {
 	owner: 'chrmarti';
 	comment: 'Performance statistics for proxy resolution';
diff --git a/src/vs/workbench/api/test/browser/extHostBrowsers.test.ts b/src/vs/workbench/api/test/browser/extHostBrowsers.test.ts
new file mode 100644
index 00000000000..c27dab06c97
--- /dev/null
+++ b/src/vs/workbench/api/test/browser/extHostBrowsers.test.ts
@@ -0,0 +1,424 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as vscode from 'vscode';
+import assert from 'assert';
+import { mock } from '../../../../base/test/common/mock.js';
+import { BrowserTabDto, MainThreadBrowsersShape } from '../../common/extHost.protocol.js';
+import { ExtHostBrowsers } from '../../common/extHostBrowsers.js';
+import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+suite('ExtHostBrowsers', () => {
+
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	const defaultDto: BrowserTabDto = {
+		id: 'browser-1',
+		url: 'https://example.com',
+		title: 'Example',
+		favicon: undefined,
+	};
+
+	function createDto(overrides?: Partial<BrowserTabDto>): BrowserTabDto {
+		return { ...defaultDto, ...overrides };
+	}
+
+	function createExtHostBrowsers(overrides?: Partial<MainThreadBrowsersShape>): ExtHostBrowsers {
+		const proxy = new class extends mock<MainThreadBrowsersShape>() {
+			override $openBrowserTab(): Promise<BrowserTabDto> { return Promise.resolve(createDto()); }
+			override $startCDPSession(): Promise<void> { return Promise.resolve(); }
+			override $closeCDPSession(): Promise<void> { return Promise.resolve(); }
+			override $sendCDPMessage(): Promise<void> { return Promise.resolve(); }
+			override $closeBrowserTab(): Promise<void> { return Promise.resolve(); }
+		};
+		if (overrides) {
+			Object.assign(proxy, overrides);
+		}
+		return store.add(new ExtHostBrowsers(SingleProxyRPCProtocol(proxy)));
+	}
+
+	// #region browserTabs
+
+	test('browserTabs populates from $onDidOpenBrowserTab', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://one.com', title: 'One' }));
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b2', url: 'https://two.com', title: 'Two' }));
+
+		const tabs = extHost.browserTabs;
+		assert.strictEqual(tabs.length, 2);
+		assert.strictEqual(tabs[0].url, 'https://one.com');
+		assert.strictEqual(tabs[1].url, 'https://two.com');
+	});
+
+	test('browserTabs returns a snapshot, not a live array', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const snapshot1 = extHost.browserTabs;
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b2' }));
+		const snapshot2 = extHost.browserTabs;
+
+		assert.notStrictEqual(snapshot1, snapshot2);
+		assert.strictEqual(snapshot1.length, 1);
+		assert.strictEqual(snapshot2.length, 2);
+	});
+
+	// #endregion
+
+	// #region activeBrowserTab
+
+	test('activeBrowserTab updates via $onDidChangeActiveBrowserTab', () => {
+		const extHost = createExtHostBrowsers();
+		const dto = createDto({ id: 'b1', url: 'https://active.com' });
+		extHost.$onDidOpenBrowserTab(dto);
+		extHost.$onDidChangeActiveBrowserTab('b1');
+
+		assert.strictEqual(extHost.activeBrowserTab?.url, 'https://active.com');
+	});
+
+	test('activeBrowserTab becomes undefined when cleared', () => {
+		const extHost = createExtHostBrowsers();
+		const dto = createDto({ id: 'b1' });
+		extHost.$onDidOpenBrowserTab(dto);
+		extHost.$onDidChangeActiveBrowserTab('b1');
+		assert.ok(extHost.activeBrowserTab);
+
+		extHost.$onDidChangeActiveBrowserTab(undefined);
+		assert.strictEqual(extHost.activeBrowserTab, undefined);
+	});
+
+	test('$onDidChangeActiveBrowserTab with unknown tab returns undefined', () => {
+		const extHost = createExtHostBrowsers();
+
+		extHost.$onDidChangeActiveBrowserTab('non-existent');
+
+		assert.strictEqual(extHost.activeBrowserTab, undefined);
+	});
+
+	// #endregion
+
+	// #region openBrowserTab
+
+	test('openBrowserTab returns a BrowserTab with correct properties', async () => {
+		const dto = createDto({ id: 'opened', url: 'https://opened.com', title: 'Opened' });
+		const extHost = createExtHostBrowsers({
+			$openBrowserTab: () => Promise.resolve(dto),
+		});
+
+		const tab = await extHost.openBrowserTab('https://opened.com');
+		assert.strictEqual(tab.url, 'https://opened.com');
+		assert.strictEqual(tab.title, 'Opened');
+	});
+
+	test('openBrowserTab fires onDidOpenBrowserTab for new tabs', async () => {
+		const extHost = createExtHostBrowsers({
+			$openBrowserTab: () => Promise.resolve(createDto({ id: 'new-tab' })),
+		});
+		const opened: vscode.BrowserTab[] = [];
+		store.add(extHost.onDidOpenBrowserTab(tab => opened.push(tab)));
+
+		await extHost.openBrowserTab('https://example.com');
+
+		assert.strictEqual(opened.length, 1);
+		assert.strictEqual(opened[0].url, 'https://example.com');
+	});
+
+	test('openBrowserTab reuses existing tab when IDs match', async () => {
+		const extHost = createExtHostBrowsers({
+			$openBrowserTab: () => Promise.resolve(createDto({ id: 'same', url: 'https://updated.com' })),
+		});
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'same', url: 'https://original.com' }));
+		const tab = await extHost.openBrowserTab('https://updated.com');
+
+		assert.strictEqual(extHost.browserTabs.length, 1);
+		assert.strictEqual(tab.url, 'https://updated.com');
+	});
+
+	test('openBrowserTab forwards options to proxy', async () => {
+		let capturedViewColumn: number | undefined;
+		let capturedOptions: { preserveFocus?: boolean; inactive?: boolean } | undefined;
+		const extHost = createExtHostBrowsers({
+			$openBrowserTab: (_url: string, viewColumn?: number, options?: { preserveFocus?: boolean; inactive?: boolean }) => {
+				capturedViewColumn = viewColumn;
+				capturedOptions = options;
+				return Promise.resolve(createDto({ id: 'opts' }));
+			},
+		});
+
+		await extHost.openBrowserTab('https://example.com', { viewColumn: 2, preserveFocus: true, background: true });
+
+		// ViewColumn.from converts API viewColumn (1-based) to EditorGroupColumn (0-based)
+		assert.strictEqual(capturedViewColumn, 1);
+		assert.strictEqual(capturedOptions?.preserveFocus, true);
+		assert.strictEqual(capturedOptions?.inactive, true);
+	});
+
+	// #endregion
+
+	// #region $onDidOpenBrowserTab
+
+	test('$onDidOpenBrowserTab fires event', () => {
+		const extHost = createExtHostBrowsers();
+		const opened: vscode.BrowserTab[] = [];
+		store.add(extHost.onDidOpenBrowserTab(tab => opened.push(tab)));
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://opened.com' }));
+
+		assert.strictEqual(opened.length, 1);
+		assert.strictEqual(opened[0].url, 'https://opened.com');
+	});
+
+	// #endregion
+
+	// #region $onDidCloseBrowserTab
+
+	test('$onDidCloseBrowserTab removes tab and fires event', () => {
+		const extHost = createExtHostBrowsers();
+		const changes: vscode.BrowserTab[] = [];
+		store.add(extHost.onDidChangeBrowserTabState(tab => changes.push(tab)));
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://old.com' }));
+		extHost.$onDidChangeBrowserTabState(createDto({ id: 'b1', url: 'https://new.com' }));
+
+		assert.strictEqual(changes.length, 1);
+		assert.strictEqual(changes[0].url, 'https://new.com');
+	});
+
+	test('$onDidChangeBrowserTabState does not fire when data is unchanged', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://example.com', title: 'Old Title' }));
+
+		extHost.$onDidChangeBrowserTabState(createDto({ id: 'b1', url: 'https://example.com', title: 'New Title' }));
+
+		assert.strictEqual(extHost.browserTabs[0].url, 'https://example.com');
+		assert.strictEqual(extHost.browserTabs[0].title, 'New Title');
+	});
+
+	// #endregion
+
+	// #region $onDidChangeActiveBrowserTab event
+
+	test('$onDidChangeActiveBrowserTab fires event', () => {
+		const extHost = createExtHostBrowsers();
+		const activeChanges: (string | undefined)[] = [];
+		store.add(extHost.onDidChangeActiveBrowserTab(tab => activeChanges.push(tab?.url)));
+
+		const dto = createDto({ id: 'b1' });
+		extHost.$onDidOpenBrowserTab(dto);
+		extHost.$onDidChangeActiveBrowserTab('b1');
+		extHost.$onDidChangeActiveBrowserTab(undefined);
+
+		assert.deepStrictEqual(activeChanges, ['https://example.com', undefined]);
+	});
+
+	// #endregion
+
+	// #region BrowserTab icon
+
+	test('icon is globe ThemeIcon when no favicon', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', favicon: undefined }));
+
+		assert.strictEqual((extHost.browserTabs[0].icon as { id: string }).id, 'globe');
+	});
+
+	test('icon is URI when favicon is provided', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', favicon: 'https://example.com/favicon.ico' }));
+
+		assert.strictEqual(String(extHost.browserTabs[0].icon), 'https://example.com/favicon.ico');
+	});
+
+	test('icon updates when favicon changes', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', favicon: undefined }));
+		assert.strictEqual((extHost.browserTabs[0].icon as { id: string }).id, 'globe');
+
+		extHost.$onDidChangeBrowserTabState(createDto({ id: 'b1', favicon: 'https://example.com/new.ico' }));
+		assert.strictEqual(String(extHost.browserTabs[0].icon), 'https://example.com/new.ico');
+	});
+
+	test('icon reverts to globe when favicon is cleared', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', favicon: 'https://example.com/icon.ico' }));
+		assert.strictEqual(String(extHost.browserTabs[0].icon), 'https://example.com/icon.ico');
+
+		extHost.$onDidChangeBrowserTabState(createDto({ id: 'b1', favicon: undefined }));
+		assert.strictEqual((extHost.browserTabs[0].icon as { id: string }).id, 'globe');
+	});
+
+	// #endregion
+
+	// #region BrowserTab readonly properties
+
+	test('tab properties are not directly writable', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://example.com', title: 'Title' }));
+		const tab = extHost.browserTabs[0];
+
+		// Attempting to assign to getter-only properties should either throw or be silently ignored
+		assert.throws(() => { (tab as unknown as Record<string, unknown>).url = 'https://hacked.com'; });
+		assert.throws(() => { (tab as unknown as Record<string, unknown>).title = 'Hacked'; });
+		assert.strictEqual(tab.url, 'https://example.com');
+		assert.strictEqual(tab.title, 'Title');
+	});
+
+	test('startCDPSession calls $startCDPSession on proxy', async () => {
+		let capturedBrowserId: string | undefined;
+		const extHost = createExtHostBrowsers({
+			$startCDPSession: (_sessionId: string, browserId: string) => {
+				capturedBrowserId = browserId;
+				return Promise.resolve();
+			},
+		});
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const session = await extHost.browserTabs[0].startCDPSession();
+
+		assert.ok(session);
+		assert.strictEqual(capturedBrowserId, 'b1');
+	});
+
+	test('sendMessage validates message structure', async () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const session = await extHost.browserTabs[0].startCDPSession();
+
+		// Valid message succeeds
+		await session.sendMessage({ id: 1, method: 'Page.enable' });
+
+		// Invalid messages are rejected
+		await assert.rejects(Promise.resolve().then(() => session.sendMessage(null as never)), /must be an object/);
+		await assert.rejects(Promise.resolve().then(() => session.sendMessage({ method: 'Foo' } as never)), /numeric id/);
+		await assert.rejects(Promise.resolve().then(() => session.sendMessage({ id: 1 } as never)), /method string/);
+	});
+
+	test('sendMessage forwards valid message to proxy', async () => {
+		const sentMessages: unknown[] = [];
+		const extHost = createExtHostBrowsers({
+			$sendCDPMessage: (_sid: string, message: unknown) => {
+				sentMessages.push(message);
+				return Promise.resolve();
+			},
+		});
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const session = await extHost.browserTabs[0].startCDPSession();
+		await session.sendMessage({ id: 1, method: 'Page.enable', params: {} });
+
+		assert.strictEqual(sentMessages.length, 1);
+		assert.deepStrictEqual(sentMessages[0], { id: 1, method: 'Page.enable', params: {}, sessionId: undefined });
+	});
+
+	test('sendMessage rejects after session is closed', async () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const session = await extHost.browserTabs[0].startCDPSession();
+
+		await session.close();
+		await assert.rejects(Promise.resolve().then(() => session.sendMessage({ id: 1, method: 'Foo' })), /closed/);
+	});
+
+	test('$onCDPSessionMessage delivers to correct session', async () => {
+		const capturedIds: string[] = [];
+		const extHost = createExtHostBrowsers({
+			$startCDPSession: (sessionId: string) => {
+				capturedIds.push(sessionId);
+				return Promise.resolve();
+			},
+		});
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const session1 = await extHost.browserTabs[0].startCDPSession();
+		const session2 = await extHost.browserTabs[0].startCDPSession();
+
+		const received1: unknown[] = [];
+		const received2: unknown[] = [];
+		store.add(session1.onDidReceiveMessage(m => received1.push(m)));
+		store.add(session2.onDidReceiveMessage(m => received2.push(m)));
+
+		extHost.$onCDPSessionMessage(capturedIds[1], { id: 1, result: { data: 'hello' } });
+
+		assert.deepStrictEqual(received1, []);
+		assert.deepStrictEqual(received2, [{ id: 1, result: { data: 'hello' } }]);
+	});
+
+	test('$onCDPSessionClosed fires onDidClose', async () => {
+		const capturedIds: string[] = [];
+		const extHost = createExtHostBrowsers({
+			$startCDPSession: (sessionId: string) => {
+				capturedIds.push(sessionId);
+				return Promise.resolve();
+			},
+		});
+
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1' }));
+		const session = await extHost.browserTabs[0].startCDPSession();
+
+		let closeFired = false;
+		store.add(session.onDidClose(() => { closeFired = true; }));
+
+		extHost.$onCDPSessionClosed(capturedIds[0]);
+		assert.ok(closeFired);
+	});
+
+	// #endregion
+
+	// #region Reference stability
+
+	test('tab object reference is stable across updates', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://old.com', title: 'Old' }));
+		const tabBefore = extHost.browserTabs[0];
+
+		extHost.$onDidChangeBrowserTabState(createDto({ id: 'b1', url: 'https://new.com', title: 'New' }));
+		const tabAfter = extHost.browserTabs[0];
+
+		assert.strictEqual(tabBefore, tabAfter);
+		assert.strictEqual(tabAfter.url, 'https://new.com');
+	});
+
+	test('openBrowserTab returns same reference as browserTabs entry', async () => {
+		const extHost = createExtHostBrowsers({
+			$openBrowserTab: () => Promise.resolve(createDto({ id: 'ref-test' })),
+		});
+
+		const returned = await extHost.openBrowserTab('https://example.com');
+		const fromArray = extHost.browserTabs[0];
+
+		assert.strictEqual(returned, fromArray);
+	});
+
+	// #endregion
+
+	// #region Multiple tabs tracked independently
+
+	test('closing one tab does not affect others', () => {
+		const extHost = createExtHostBrowsers();
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b1', url: 'https://one.com' }));
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b2', url: 'https://two.com' }));
+		extHost.$onDidOpenBrowserTab(createDto({ id: 'b3', url: 'https://three.com' }));
+
+		extHost.$onDidCloseBrowserTab('b2');
+
+		assert.strictEqual(extHost.browserTabs.length, 2);
+		assert.deepStrictEqual(extHost.browserTabs.map(t => t.url), ['https://one.com', 'https://three.com']);
+	});
+
+	test('closing active tab clears activeBrowserTab', () => {
+		const extHost = createExtHostBrowsers();
+		const dto = createDto({ id: 'b1' });
+		extHost.$onDidOpenBrowserTab(dto);
+		extHost.$onDidChangeActiveBrowserTab('b1');
+		assert.ok(extHost.activeBrowserTab);
+
+		extHost.$onDidCloseBrowserTab('b1');
+		assert.strictEqual(extHost.activeBrowserTab, undefined);
+	});
+
+	// #endregion
+});
diff --git a/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
index 09190276e41..fd22da56829 100644
--- a/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
@@ -883,6 +883,25 @@ suite('ExtHostWorkspace', function () {
 			});
 		});
 
+		test('caseInsensitive', () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.ignoreGlobCase, true);
+					return Promise.resolve(null);
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			return ws.findFiles2([''], { caseInsensitive: true }, new ExtensionIdentifier('test')).then(() => {
+				assert(mainThreadCalled, 'mainThreadCalled');
+			});
+		});
+
 		// todo: add tests with multiple filePatterns and excludes
 
 	});
@@ -1096,6 +1115,24 @@ suite('ExtHostWorkspace', function () {
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
 
+		test('caseInsensitive', async () => {
+			const root = '/project/foo';
+			const rpcProtocol = new TestRPCProtocol();
+
+			let mainThreadCalled = false;
+			rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
+				override async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+					mainThreadCalled = true;
+					assert.strictEqual(options.ignoreGlobCase, true);
+					return null;
+				}
+			});
+
+			const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService());
+			await (ws.findTextInFiles2({ pattern: 'foo' }, { caseInsensitive: true }, new ExtensionIdentifier('test'))).complete;
+			assert(mainThreadCalled, 'mainThreadCalled');
+		});
+
 		// TODO: test multiple includes/excludess
 	});
 });
diff --git a/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts b/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts
index 2e31054aa64..d29e9f1715a 100644
--- a/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts
@@ -5,9 +5,13 @@
 
 import assert from 'assert';
 import * as sinon from 'sinon';
+import type * as vscode from 'vscode';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { URI } from '../../../../base/common/uri.js';
+import { asSinonMethodStub } from '../../../../base/test/common/sinonUtils.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
@@ -15,26 +19,32 @@ import { ContextKeyService } from '../../../../platform/contextkey/browser/conte
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
 import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
+import { IAgentSessionsModel } from '../../../contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { ChatSessionsService } from '../../../contrib/chat/browser/chatSessions/chatSessions.contribution.js';
-import { IChatAgentRequest } from '../../../contrib/chat/common/participants/chatAgents.js';
 import { IChatProgress, IChatProgressMessage, IChatService } from '../../../contrib/chat/common/chatService/chatService.js';
-import { IChatSessionProviderOptionGroup, IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
-import { LocalChatSessionUri } from '../../../contrib/chat/common/model/chatUri.js';
+import { IChatSessionProviderOptionGroup, IChatSessionRequestHistoryItem, IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
 import { ChatAgentLocation } from '../../../contrib/chat/common/constants.js';
+import { LocalChatSessionUri } from '../../../contrib/chat/common/model/chatUri.js';
+import { IChatAgentRequest, IChatAgentResult } from '../../../contrib/chat/common/participants/chatAgents.js';
+import { MockChatService } from '../../../contrib/chat/test/common/chatService/mockChatService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtHostContext } from '../../../services/extensions/common/extHostCustomers.js';
 import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IExtensionService, nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { mock, TestExtensionService } from '../../../test/common/workbenchTestServices.js';
 import { MainThreadChatSessions, ObservableChatSession } from '../../browser/mainThreadChatSessions.js';
-import { ExtHostChatSessionsShape, IChatProgressDto, IChatSessionProviderOptions } from '../../common/extHost.protocol.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
-import { MockChatService } from '../../../contrib/chat/test/common/chatService/mockChatService.js';
-import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { IAgentSessionsModel } from '../../../contrib/chat/browser/agentSessions/agentSessionsModel.js';
-import { Event } from '../../../../base/common/event.js';
+import { ExtHostChatSessionsShape, IChatProgressDto, IChatSessionDto, IChatSessionProviderOptions, IChatSessionRequestHistoryItemDto } from '../../common/extHost.protocol.js';
+import { IExtHostAuthentication } from '../../common/extHostAuthentication.js';
+import { ExtHostChatSessions } from '../../common/extHostChatSessions.js';
+import { ExtHostCommands } from '../../common/extHostCommands.js';
+import { ExtHostLanguageModels } from '../../common/extHostLanguageModels.js';
+import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
+import * as extHostTypes from '../../common/extHostTypes.js';
+import { AnyCallRPCProtocol } from '../common/testRPCProtocol.js';
 
 suite('ObservableChatSession', function () {
 	let disposables: DisposableStore;
@@ -63,6 +73,8 @@ suite('ObservableChatSession', function () {
 			$refreshChatSessionItems: sinon.stub(),
 			$onDidChangeChatSessionItemState: sinon.stub(),
 			$newChatSessionItem: sinon.stub().resolves(undefined),
+			$forkChatSession: sinon.stub().resolves(undefined),
+			$provideChatSessionCustomizations: sinon.stub().resolves(undefined),
 		};
 	});
 
@@ -79,21 +91,25 @@ suite('ObservableChatSession', function () {
 		history?: any[];
 		hasActiveResponseCallback?: boolean;
 		hasRequestHandler?: boolean;
-	} = {}) {
+		hasForkHandler?: boolean;
+	} = {}): IChatSessionDto {
+		const id = options.id || 'test-id';
 		return {
-			id: options.id || 'test-id',
+			resource: LocalChatSessionUri.forSession(id),
 			title: options.title,
 			history: options.history || [],
-			hasActiveResponseCallback: options.hasActiveResponseCallback || false,
-			hasRequestHandler: options.hasRequestHandler || false
+			hasActiveResponseCallback: options.hasActiveResponseCallback ?? false,
+			hasRequestHandler: options.hasRequestHandler ?? false,
+			hasForkHandler: options.hasForkHandler ?? false,
+			supportsInterruption: false,
 		};
 	}
 
 	async function createInitializedSession(sessionContent: any, sessionId = 'test-id'): Promise<ObservableChatSession> {
 		const resource = LocalChatSessionUri.forSession(sessionId);
 		const session = new ObservableChatSession(resource, 1, proxy, logService, dialogService);
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
-		await session.initialize(CancellationToken.None);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
+		await session.initialize(CancellationToken.None, { initialSessionOptions: [] });
 		return session;
 	}
 
@@ -129,8 +145,8 @@ suite('ObservableChatSession', function () {
 
 		// Initialize the session
 		const sessionContent = createSessionContent();
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
-		await session.initialize(CancellationToken.None);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
+		await session.initialize(CancellationToken.None, { initialSessionOptions: [] });
 
 		// Now progress should be visible
 		assert.strictEqual(session.progressObs.get().length, 2);
@@ -163,6 +179,116 @@ suite('ObservableChatSession', function () {
 		assert.ok(session.requestHandler);
 	});
 
+	test('initialization revives modeInstructions in history', async function () {
+		const sessionContent = createSessionContent({
+			history: [
+				{
+					type: 'request',
+					prompt: 'Hello',
+					participant: 'test',
+					modeInstructions: {
+						uri: { $mid: MarshalledId.Uri, scheme: 'file', path: '/custom-agent' },
+						name: 'my-agent',
+						content: 'instructions',
+						toolReferences: [],
+						isBuiltin: false,
+					},
+				},
+			],
+		});
+
+		const session = disposables.add(await createInitializedSession(sessionContent));
+		const requestItem = session.history[0];
+		assert.strictEqual(requestItem.type, 'request');
+		if (requestItem.type === 'request') {
+			assert.ok(requestItem.modeInstructions);
+			assert.ok(URI.isUri(requestItem.modeInstructions.uri));
+			assert.strictEqual(requestItem.modeInstructions.name, 'my-agent');
+			assert.strictEqual(requestItem.modeInstructions.isBuiltin, false);
+		}
+	});
+
+	test('toRequestDto passes modeInstructions through', async function () {
+		const session = disposables.add(await createInitializedSession(createSessionContent({ hasForkHandler: true })));
+		assert.ok(session.forkSession);
+
+		const modeInstructions = {
+			uri: URI.parse('file:///custom-agent'),
+			name: 'my-agent',
+			content: 'agent instructions',
+			toolReferences: [],
+			isBuiltin: false,
+		};
+		const request: IChatSessionRequestHistoryItem = {
+			type: 'request',
+			id: 'req-1',
+			prompt: 'Hello with mode',
+			participant: 'participant',
+			modeInstructions,
+		};
+
+		const forkedItem = {
+			resource: URI.file('/tmp/forked.md'),
+			label: 'Forked',
+			changes: [],
+			timing: {
+				created: 123,
+				lastRequestStarted: 234,
+				lastRequestEnded: 345,
+			},
+		};
+		asSinonMethodStub(proxy.$forkChatSession).resolves(forkedItem);
+		await session.forkSession?.(request, CancellationToken.None);
+
+		const call = asSinonMethodStub(proxy.$forkChatSession).firstCall;
+		const sentDto = call.args[2] as IChatSessionRequestHistoryItemDto;
+		assert.deepStrictEqual(sentDto.modeInstructions, modeInstructions);
+	});
+
+	test('initialization sets forkSession and revives forked items', async function () {
+		const session = disposables.add(await createInitializedSession(createSessionContent({ hasForkHandler: true })));
+		assert.ok(session.forkSession);
+
+		const forkedResource = URI.file('/tmp/forked-chat.md');
+		const forkedItem = {
+			resource: forkedResource,
+			label: 'Forked Session',
+			timing: {
+				created: 123,
+				lastRequestStarted: 234,
+				lastRequestEnded: 345,
+			},
+			changes: [{
+				uri: URI.file('/tmp/changed.ts'),
+				originalUri: URI.file('/tmp/original.ts'),
+				insertions: 4,
+				deletions: 2,
+			}],
+		};
+		asSinonMethodStub(proxy.$forkChatSession).resolves(forkedItem);
+
+		const request: IChatSessionRequestHistoryItem = { type: 'request', id: 'request-1', prompt: 'Previous question', participant: 'participant' };
+		const expectedRequestDto: IChatSessionRequestHistoryItemDto = {
+			type: 'request',
+			id: 'request-1',
+			prompt: 'Previous question',
+			participant: 'participant',
+			command: undefined,
+			variableData: undefined,
+			modelId: undefined,
+			modeInstructions: undefined,
+		};
+		const result = await session.forkSession?.(request, CancellationToken.None);
+
+		assert.ok(asSinonMethodStub(proxy.$forkChatSession).calledOnceWithExactly(1, session.sessionResource, expectedRequestDto, CancellationToken.None));
+		assert.ok(result);
+		assert.ok(result.resource instanceof URI);
+		assert.ok(Array.isArray(result.changes));
+		assert.ok(result.changes[0].uri instanceof URI);
+		assert.ok(result.changes[0].originalUri instanceof URI);
+		assert.deepStrictEqual(result, forkedItem);
+	});
+
 	test('initialization sets title from session content', async function () {
 		const sessionContent = createSessionContent({
 			title: 'My Custom Title',
@@ -185,16 +311,35 @@ suite('ObservableChatSession', function () {
 		const session = disposables.add(new ObservableChatSession(resource, 1, proxy, logService, dialogService));
 
 		const sessionContent = createSessionContent();
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
-		const promise1 = session.initialize(CancellationToken.None);
-		const promise2 = session.initialize(CancellationToken.None);
+		const promise1 = session.initialize(CancellationToken.None, { initialSessionOptions: [] });
+		const promise2 = session.initialize(CancellationToken.None, { initialSessionOptions: [] });
 
 		assert.strictEqual(promise1, promise2);
 		await promise1;
 
 		// Should only call proxy once even though initialize was called twice
-		assert.ok((proxy.$provideChatSessionContent as sinon.SinonStub).calledOnce);
+		assert.ok(asSinonMethodStub(proxy.$provideChatSessionContent).calledOnce);
+	});
+
+	test('initialization forwards initial session options context', async function () {
+		const sessionId = 'test-id';
+		const resource = LocalChatSessionUri.forSession(sessionId);
+		const session = disposables.add(new ObservableChatSession(resource, 1, proxy, logService, dialogService));
+		const initialSessionOptions = [{ optionId: 'model', value: 'gpt-4.1' }];
+
+		const sessionContent = createSessionContent();
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
+
+		await session.initialize(CancellationToken.None, { initialSessionOptions });
+
+		assert.ok(asSinonMethodStub(proxy.$provideChatSessionContent).calledOnceWith(
+			1,
+			resource,
+			{ initialSessionOptions },
+			CancellationToken.None
+		));
 	});
 
 	test('progress handling works correctly after initialization', async function () {
@@ -259,7 +404,7 @@ suite('ObservableChatSession', function () {
 
 		await session.requestHandler!(request, progressCallback, [], CancellationToken.None);
 
-		assert.ok((proxy.$invokeChatSessionRequestHandler as sinon.SinonStubbedMember<typeof proxy.$invokeChatSessionRequestHandler>).calledOnceWith(1, session.sessionResource, request, [], CancellationToken.None));
+		assert.ok(asSinonMethodStub(proxy.$invokeChatSessionRequestHandler).calledOnceWith(1, session.sessionResource, request, [], CancellationToken.None));
 	});
 
 	test('request handler forwards progress updates to external callback', async function () {
@@ -278,12 +423,12 @@ suite('ObservableChatSession', function () {
 		};
 		const progressCallback = sinon.stub();
 
-		let resolveRequest: () => void;
-		const requestPromise = new Promise<void>(resolve => {
+		let resolveRequest: (value: IChatAgentResult) => void;
+		const requestPromise = new Promise<IChatAgentResult>(resolve => {
 			resolveRequest = resolve;
 		});
 
-		(proxy.$invokeChatSessionRequestHandler as sinon.SinonStub).returns(requestPromise);
+		asSinonMethodStub(proxy.$invokeChatSessionRequestHandler).returns(requestPromise);
 
 		const requestHandlerPromise = session.requestHandler!(request, progressCallback, [], CancellationToken.None);
 
@@ -301,7 +446,7 @@ suite('ObservableChatSession', function () {
 		assert.deepStrictEqual(progressCallback.secondCall.args[0], [progress2]);
 
 		// Complete the request
-		resolveRequest!();
+		resolveRequest!({});
 		await requestHandlerPromise;
 
 		assert.strictEqual(session.isCompleteObs.get(), true);
@@ -320,7 +465,7 @@ suite('ObservableChatSession', function () {
 		session.dispose();
 
 		assert.ok(disposeEventFired);
-		assert.ok((proxy.$disposeChatSessionContent as sinon.SinonStubbedMember<typeof proxy.$disposeChatSessionContent>).calledOnceWith(1, resource));
+		assert.ok(asSinonMethodStub(proxy.$disposeChatSessionContent).calledOnceWith(1, resource));
 
 		disposable.dispose();
 	});
@@ -379,6 +524,8 @@ suite('MainThreadChatSessions', function () {
 			$refreshChatSessionItems: sinon.stub(),
 			$onDidChangeChatSessionItemState: sinon.stub(),
 			$newChatSessionItem: sinon.stub().resolves(undefined),
+			$forkChatSession: sinon.stub().resolves(undefined),
+			$provideChatSessionCustomizations: sinon.stub().resolves(undefined),
 		};
 
 		const extHostContext = new class implements IExtHostContext {
@@ -438,16 +585,17 @@ suite('MainThreadChatSessions', function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [],
 			hasActiveResponseCallback: false,
-			hasRequestHandler: false
+			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
-
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 		const session1 = await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 
 		assert.ok(session1);
@@ -455,7 +603,7 @@ suite('MainThreadChatSessions', function () {
 		const session2 = await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 		assert.strictEqual(session1, session2);
 
-		assert.ok((proxy.$provideChatSessionContent as sinon.SinonStub).calledOnce);
+		assert.ok(asSinonMethodStub(proxy.$provideChatSessionContent).calledOnce);
 		mainThread.$unregisterChatSessionContentProvider(1);
 	});
 
@@ -463,17 +611,18 @@ suite('MainThreadChatSessions', function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			title: 'My Session Title',
 			history: [],
 			hasActiveResponseCallback: false,
-			hasRequestHandler: false
+			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
-
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 		const session = await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 
 		assert.strictEqual(session.title, 'My Session Title');
@@ -486,16 +635,18 @@ suite('MainThreadChatSessions', function () {
 
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [],
 			hasActiveResponseCallback: false,
-			hasRequestHandler: false
+			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
 		const session = await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None) as ObservableChatSession;
 
 		const progressDto: IChatProgressDto = { kind: 'progressMessage', content: { value: 'Test', isTrusted: false } };
@@ -511,16 +662,18 @@ suite('MainThreadChatSessions', function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [],
 			hasActiveResponseCallback: false,
-			hasRequestHandler: false
+			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
 		const session = await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None) as ObservableChatSession;
 
 		const progressDto: IChatProgressDto = { kind: 'progressMessage', content: { value: 'Test', isTrusted: false } };
@@ -536,21 +689,22 @@ suite('MainThreadChatSessions', function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'multi-turn-session',
+		const resource = URI.parse(`${sessionScheme}:/multi-turn-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [
-				{ type: 'request', prompt: 'First question' },
-				{ type: 'response', parts: [{ kind: 'progressMessage', content: { value: 'First answer', isTrusted: false } }] },
-				{ type: 'request', prompt: 'Second question' },
-				{ type: 'response', parts: [{ kind: 'progressMessage', content: { value: 'Second answer', isTrusted: false } }] }
+				{ type: 'request', prompt: 'First question', participant: 'test-participant' },
+				{ type: 'response', parts: [{ kind: 'progressMessage', content: { value: 'First answer', isTrusted: false } }], participant: 'test-participant' },
+				{ type: 'request', prompt: 'Second question', participant: 'test-participant' },
+				{ type: 'response', parts: [{ kind: 'progressMessage', content: { value: 'Second answer', isTrusted: false } }], participant: 'test-participant' }
 			],
 			hasActiveResponseCallback: false,
-			hasRequestHandler: false
+			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
-
-		const resource = URI.parse(`${sessionScheme}:/multi-turn-session`);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 		const session = await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None) as ObservableChatSession;
 
 		// Verify the session loaded correctly
@@ -586,7 +740,7 @@ suite('MainThreadChatSessions', function () {
 			items: [{ id: 'modelB', name: 'Model B' }]
 		}];
 
-		const provideOptionsStub = proxy.$provideChatSessionProviderOptions as sinon.SinonStub;
+		const provideOptionsStub = asSinonMethodStub(proxy.$provideChatSessionProviderOptions);
 		provideOptionsStub.onFirstCall().resolves({ optionGroups: optionGroups1 } as IChatSessionProviderOptions);
 		provideOptionsStub.onSecondCall().resolves({ optionGroups: optionGroups2 } as IChatSessionProviderOptions);
 
@@ -614,17 +768,18 @@ suite('MainThreadChatSessions', function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [],
 			hasActiveResponseCallback: false,
 			hasRequestHandler: false,
-			// No options provided
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
 		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 
 		// getSessionOption should return undefined for unset options
@@ -638,20 +793,22 @@ suite('MainThreadChatSessions', function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [],
 			hasActiveResponseCallback: false,
 			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 			options: {
 				'models': 'gpt-4',
 				'region': { id: 'us-east', name: 'US East' }
 			}
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
 		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 
 		// getSessionOption should return the configured values
@@ -670,35 +827,35 @@ suite('MainThreadChatSessions', function () {
 
 		mainThread.$registerChatSessionContentProvider(handle, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const sessionContent: IChatSessionDto = {
+			resource: URI.parse(`${sessionScheme}:/test-session`),
 			history: [],
 			hasActiveResponseCallback: false,
 			hasRequestHandler: false,
+			hasForkHandler: false,
+			supportsInterruption: false,
 			options: {
 				'models': 'gpt-4'
 			}
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
 		const resource = URI.parse(`${sessionScheme}:/test-session`);
 		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 
 		// Clear the stub call history
-		(proxy.$provideHandleOptionsChange as sinon.SinonStub).resetHistory();
+		asSinonMethodStub(proxy.$provideHandleOptionsChange).resetHistory();
 
 		// Simulate an option change
-		await chatSessionsService.notifySessionOptionsChange(resource, [
-			{ optionId: 'models', value: 'gpt-4-turbo' }
-		]);
+		chatSessionsService.setSessionOption(resource, 'models', 'gpt-4-turbo');
 
 		// Verify the extension was notified
-		assert.ok((proxy.$provideHandleOptionsChange as sinon.SinonStub).calledOnce);
-		const call = (proxy.$provideHandleOptionsChange as sinon.SinonStub).firstCall;
+		assert.ok(asSinonMethodStub(proxy.$provideHandleOptionsChange).calledOnce);
+		const call = asSinonMethodStub(proxy.$provideHandleOptionsChange).firstCall;
 		assert.strictEqual(call.args[0], handle);
 		assert.deepStrictEqual(call.args[1], resource);
-		assert.deepStrictEqual(call.args[2], [{ optionId: 'models', value: 'gpt-4-turbo' }]);
+		assert.deepStrictEqual(call.args[2], { models: 'gpt-4-turbo' });
 
 		mainThread.$unregisterChatSessionContentProvider(handle);
 	});
@@ -711,33 +868,34 @@ suite('MainThreadChatSessions', function () {
 		const resource = URI.parse(`${sessionScheme}:/test-session`);
 
 		// Clear any previous calls
-		(proxy.$provideHandleOptionsChange as sinon.SinonStub).resetHistory();
+		asSinonMethodStub(proxy.$provideHandleOptionsChange).resetHistory();
 
 		// Attempt to notify option change for an unregistered scheme
 		// This should not throw, but also should not call the proxy
-		await chatSessionsService.notifySessionOptionsChange(resource, [
-			{ optionId: 'models', value: 'gpt-4-turbo' }
-		]);
+		chatSessionsService.updateSessionOptions(resource, new Map([
+			['models', 'gpt-4-turbo']
+		]));
 
 		// Verify the extension was NOT notified (no provider registered)
-		assert.strictEqual((proxy.$provideHandleOptionsChange as sinon.SinonStub).callCount, 0);
+		assert.strictEqual(asSinonMethodStub(proxy.$provideHandleOptionsChange).callCount, 0);
 	});
 
 	test('setSessionOption updates option and getSessionOption reflects change', async function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
 
-		const sessionContent = {
-			id: 'test-session',
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		const sessionContent: IChatSessionDto = {
+			resource,
 			history: [],
 			hasActiveResponseCallback: false,
 			hasRequestHandler: false,
-			// Start with no options
+			hasForkHandler: false,
+			supportsInterruption: false,
 		};
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+		asSinonMethodStub(proxy.$provideChatSessionContent).resolves(sessionContent);
 
-		const resource = URI.parse(`${sessionScheme}:/test-session`);
 		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
 
 		// Initially no options set
@@ -751,41 +909,136 @@ suite('MainThreadChatSessions', function () {
 
 		mainThread.$unregisterChatSessionContentProvider(1);
 	});
+});
 
-	test('hasAnySessionOptions returns correct values', async function () {
+suite('ExtHostChatSessions', function () {
+	let disposables: DisposableStore;
+	let extHostChatSessions: ExtHostChatSessions;
+	let mainThreadChatSessionsProxy: {
+		$registerChatSessionItemController: sinon.SinonStub;
+		$unregisterChatSessionItemController: sinon.SinonStub;
+		$updateChatSessionItems: sinon.SinonStub;
+		$addOrUpdateChatSessionItem: sinon.SinonStub;
+		$onDidCommitChatSessionItem: sinon.SinonStub;
+		$registerChatSessionContentProvider: sinon.SinonStub;
+		$unregisterChatSessionContentProvider: sinon.SinonStub;
+		$onDidChangeChatSessionOptions: sinon.SinonStub;
+		$onDidChangeChatSessionProviderOptions: sinon.SinonStub;
+	};
+
+	setup(function () {
+		disposables = new DisposableStore();
+		mainThreadChatSessionsProxy = {
+			$registerChatSessionItemController: sinon.stub(),
+			$unregisterChatSessionItemController: sinon.stub(),
+			$updateChatSessionItems: sinon.stub().resolves(),
+			$addOrUpdateChatSessionItem: sinon.stub().resolves(),
+			$onDidCommitChatSessionItem: sinon.stub(),
+			$registerChatSessionContentProvider: sinon.stub(),
+			$unregisterChatSessionContentProvider: sinon.stub(),
+			$onDidChangeChatSessionOptions: sinon.stub(),
+			$onDidChangeChatSessionProviderOptions: sinon.stub(),
+		};
+
+		const rpcProtocol = AnyCallRPCProtocol(mainThreadChatSessionsProxy);
+		const commands = new ExtHostCommands(rpcProtocol, new NullLogService(), new class extends mock<IExtHostTelemetry>() { });
+		const languageModels = new ExtHostLanguageModels(rpcProtocol, new NullLogService(), new class extends mock<IExtHostAuthentication>() { });
+
+		extHostChatSessions = disposables.add(new ExtHostChatSessions(commands, languageModels, rpcProtocol, new NullLogService()));
+	});
+
+	teardown(function () {
+		disposables.dispose();
+		sinon.restore();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createContentProvider(session: vscode.ChatSession): vscode.ChatSessionContentProvider {
+		return {
+			provideChatSessionContent: async () => session,
+		};
+	}
+
+	test('advertises controller fork support when only the controller registers a fork handler', async function () {
 		const sessionScheme = 'test-session-type';
-		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
+		const sessionResource = URI.parse(`${sessionScheme}:/test-session`);
+		const controller = disposables.add(extHostChatSessions.createChatSessionItemController(nullExtensionDescription, sessionScheme, async () => { }));
+		controller.forkHandler = async resource => controller.createChatSessionItem(resource.with({ path: '/forked-session' }), 'Forked Session');
 
-		// Session with options
-		const sessionContentWithOptions = {
-			id: 'session-with-options',
+		disposables.add(extHostChatSessions.registerChatSessionContentProvider(nullExtensionDescription, sessionScheme, undefined!, createContentProvider({
 			history: [],
-			hasActiveResponseCallback: false,
-			hasRequestHandler: false,
-			options: { 'models': 'gpt-4' }
+			requestHandler: undefined,
+		})));
+
+		const session = await extHostChatSessions.$provideChatSessionContent(0, sessionResource, { initialSessionOptions: [] }, CancellationToken.None);
+
+		assert.strictEqual(session.hasForkHandler, true);
+		await extHostChatSessions.$disposeChatSessionContent(0, sessionResource);
+	});
+
+	test('prefers controller fork handler over deprecated session fork handler', async function () {
+		const sessionScheme = 'test-session-type';
+		const sessionResource = URI.parse(`${sessionScheme}:/test-session`);
+		const requestTurn = new extHostTypes.ChatRequestTurn('prompt', undefined, [], 'participant', [], undefined, 'request-1');
+		const controller = disposables.add(extHostChatSessions.createChatSessionItemController(nullExtensionDescription, sessionScheme, async () => { }));
+		const controllerItem = controller.createChatSessionItem(URI.parse(`${sessionScheme}:/forked-by-controller`), 'Forked by Controller');
+		const sessionItem = {
+			resource: URI.parse(`${sessionScheme}:/forked-by-session`),
+			label: 'Forked by Session'
 		};
 
-		// Session without options
-		const sessionContentWithoutOptions = {
-			id: 'session-without-options',
-			history: [],
-			hasActiveResponseCallback: false,
-			hasRequestHandler: false,
-		};
+		const controllerForkHandler = sinon.stub().resolves(controllerItem);
+		const deprecatedSessionForkHandler = sinon.stub().resolves(sessionItem);
+		controller.forkHandler = controllerForkHandler;
 
-		(proxy.$provideChatSessionContent as sinon.SinonStub)
-			.onFirstCall().resolves(sessionContentWithOptions)
-			.onSecondCall().resolves(sessionContentWithoutOptions);
+		disposables.add(extHostChatSessions.registerChatSessionContentProvider(nullExtensionDescription, sessionScheme, undefined!, createContentProvider({
+			history: [requestTurn],
+			requestHandler: undefined,
+			forkHandler: deprecatedSessionForkHandler,
+		})));
 
-		const resourceWithOptions = URI.parse(`${sessionScheme}:/session-with-options`);
-		const resourceWithoutOptions = URI.parse(`${sessionScheme}:/session-without-options`);
+		await extHostChatSessions.$provideChatSessionContent(0, sessionResource, { initialSessionOptions: [] }, CancellationToken.None);
+		const result = await extHostChatSessions.$forkChatSession(0, sessionResource, {
+			type: 'request',
+			id: 'request-1',
+			prompt: 'prompt',
+			participant: 'participant',
+		}, CancellationToken.None);
 
-		await chatSessionsService.getOrCreateChatSession(resourceWithOptions, CancellationToken.None);
-		await chatSessionsService.getOrCreateChatSession(resourceWithoutOptions, CancellationToken.None);
+		assert.ok(controllerForkHandler.calledOnceWithExactly(sessionResource, requestTurn, CancellationToken.None));
+		assert.strictEqual(deprecatedSessionForkHandler.callCount, 0);
+		assert.strictEqual(result.resource.toString(), controllerItem.resource.toString());
+		assert.strictEqual(result.label, controllerItem.label);
+		await extHostChatSessions.$disposeChatSessionContent(0, sessionResource);
+	});
 
-		assert.strictEqual(chatSessionsService.hasAnySessionOptions(resourceWithOptions), true);
-		assert.strictEqual(chatSessionsService.hasAnySessionOptions(resourceWithoutOptions), false);
+	test('falls back to deprecated session fork handler when no controller fork handler exists', async function () {
+		const sessionScheme = 'test-session-type';
+		const sessionResource = URI.parse(`${sessionScheme}:/test-session`);
+		const requestTurn = new extHostTypes.ChatRequestTurn('prompt', undefined, [], 'participant', [], undefined, 'request-1');
+		const deprecatedSessionForkHandler = sinon.stub().resolves({
+			resource: URI.parse(`${sessionScheme}:/forked-by-session`),
+			label: 'Forked by Session'
+		});
 
-		mainThread.$unregisterChatSessionContentProvider(1);
+		disposables.add(extHostChatSessions.registerChatSessionContentProvider(nullExtensionDescription, sessionScheme, undefined!, createContentProvider({
+			history: [requestTurn],
+			requestHandler: undefined,
+			forkHandler: deprecatedSessionForkHandler,
+		})));
+
+		await extHostChatSessions.$provideChatSessionContent(0, sessionResource, { initialSessionOptions: [] }, CancellationToken.None);
+		const result = await extHostChatSessions.$forkChatSession(0, sessionResource, {
+			type: 'request',
+			id: 'request-1',
+			prompt: 'prompt',
+			participant: 'participant',
+		}, CancellationToken.None);
+
+		assert.ok(deprecatedSessionForkHandler.calledOnceWithExactly(sessionResource, requestTurn, CancellationToken.None));
+		assert.strictEqual(result.resource.toString(), `${sessionScheme}:/forked-by-session`);
+		assert.strictEqual(result.label, 'Forked by Session');
+		await extHostChatSessions.$disposeChatSessionContent(0, sessionResource);
 	});
 });
diff --git a/src/vs/workbench/api/test/common/extHostTypeConverters.test.ts b/src/vs/workbench/api/test/common/extHostTypeConverters.test.ts
index ed0e1ceae16..d013b2adfce 100644
--- a/src/vs/workbench/api/test/common/extHostTypeConverters.test.ts
+++ b/src/vs/workbench/api/test/common/extHostTypeConverters.test.ts
@@ -7,8 +7,10 @@ import assert from 'assert';
 import { URI, UriComponents } from '../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { IconPathDto } from '../../common/extHost.protocol.js';
-import { IconPath } from '../../common/extHostTypeConverters.js';
+import { ChatRequestModeInstructions, IconPath } from '../../common/extHostTypeConverters.js';
 import { ThemeColor, ThemeIcon } from '../../common/extHostTypes.js';
+import { IChatRequestModeInstructions } from '../../../contrib/chat/common/model/chatModel.js';
+import { Dto } from '../../../services/extensions/common/proxyIdentifier.js';
 
 suite('extHostTypeConverters', function () {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -120,4 +122,125 @@ suite('extHostTypeConverters', function () {
 			});
 		});
 	});
+
+	suite('ChatRequestModeInstructions', function () {
+		test('to returns undefined for undefined input', function () {
+			assert.strictEqual(ChatRequestModeInstructions.to(undefined), undefined);
+		});
+
+		test('from returns undefined for undefined input', function () {
+			assert.strictEqual(ChatRequestModeInstructions.from(undefined), undefined);
+		});
+
+		test('to converts IChatRequestModeInstructions to API type', function () {
+			const uri = URI.parse('file:///custom-agent');
+			const input: IChatRequestModeInstructions = {
+				uri,
+				name: 'test-mode',
+				content: 'test content',
+				toolReferences: [{
+					kind: 'tool',
+					id: 'tool1',
+					name: 'tool1',
+					value: undefined,
+					range: { start: 0, endExclusive: 5 },
+				}],
+				metadata: { key: 'value' },
+				isBuiltin: false,
+			};
+
+			const result = ChatRequestModeInstructions.to(input)!;
+			assert.deepStrictEqual(result, {
+				uri,
+				name: 'test-mode',
+				content: 'test content',
+				toolReferences: [{ name: 'tool1', range: [0, 5] }],
+				metadata: { key: 'value' },
+				isBuiltin: false,
+			});
+		});
+
+		test('to handles Dto with UriComponents', function () {
+			const input: Dto<IChatRequestModeInstructions> = {
+				uri: { scheme: 'file', path: '/custom-agent' } as UriComponents,
+				name: 'test-mode',
+				content: 'test content',
+				toolReferences: [],
+				metadata: undefined,
+				isBuiltin: true,
+			};
+
+			const result = ChatRequestModeInstructions.to(input)!;
+			assert.ok(URI.isUri(result.uri));
+			assert.strictEqual(result.name, 'test-mode');
+			assert.strictEqual(result.isBuiltin, true);
+			assert.deepStrictEqual(result.toolReferences, []);
+		});
+
+		test('from converts API type to IChatRequestModeInstructions', function () {
+			const uri = URI.parse('file:///custom-agent');
+			const input = {
+				uri,
+				name: 'test-mode',
+				content: 'test content',
+				toolReferences: [{ name: 'tool1', range: [0, 5] as [number, number] }],
+				metadata: { key: 'value' },
+				isBuiltin: false,
+			};
+
+			const result = ChatRequestModeInstructions.from(input)!;
+			assert.deepStrictEqual(result, {
+				uri,
+				name: 'test-mode',
+				content: 'test content',
+				toolReferences: [{
+					kind: 'tool',
+					id: 'tool1',
+					name: 'tool1',
+					value: undefined,
+					range: { start: 0, endExclusive: 5 },
+				}],
+				metadata: { key: 'value' },
+				isBuiltin: false,
+			});
+		});
+
+		test('from handles missing toolReferences', function () {
+			const input = {
+				name: 'test-mode',
+				content: 'test content',
+			};
+
+			const result = ChatRequestModeInstructions.from(input)!;
+			assert.deepStrictEqual(result.toolReferences, []);
+		});
+
+		test('roundtrip from -> to preserves data', function () {
+			const uri = URI.parse('file:///custom-agent');
+			const apiInput = {
+				uri,
+				name: 'roundtrip-mode',
+				content: 'roundtrip content',
+				toolReferences: [
+					{ name: 'tool1' },
+					{ name: 'tool2', range: [10, 20] as [number, number] },
+				],
+				metadata: { flag: true },
+				isBuiltin: false,
+			};
+
+			const internal = ChatRequestModeInstructions.from(apiInput)!;
+			const backToApi = ChatRequestModeInstructions.to(internal)!;
+
+			assert.strictEqual(backToApi.name, apiInput.name);
+			assert.strictEqual(backToApi.content, apiInput.content);
+			assert.strictEqual(backToApi.isBuiltin, apiInput.isBuiltin);
+			assert.strictEqual(backToApi.uri?.toString(), uri.toString());
+			assert.strictEqual(backToApi.toolReferences?.length, 2);
+			assert.strictEqual(backToApi.toolReferences?.[0].name, 'tool1');
+			assert.strictEqual(backToApi.toolReferences?.[0].range, undefined);
+			assert.strictEqual(backToApi.toolReferences?.[1].name, 'tool2');
+			assert.deepStrictEqual(backToApi.toolReferences?.[1].range, [10, 20]);
+		});
+	});
 });
diff --git a/src/vs/workbench/browser/actions/quickAccessActions.ts b/src/vs/workbench/browser/actions/quickAccessActions.ts
index 35cdd20ccc3..fe18d7a076f 100644
--- a/src/vs/workbench/browser/actions/quickAccessActions.ts
+++ b/src/vs/workbench/browser/actions/quickAccessActions.ts
@@ -9,13 +9,16 @@ import { KeyMod, KeyCode } from '../../../base/common/keyCodes.js';
 import { KeybindingsRegistry, KeybindingWeight, IKeybindingRule } from '../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService, ItemActivation, QuickInputHideReason } from '../../../platform/quickinput/common/quickInput.js';
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
-import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
+import { CommandsRegistry, ICommandService } from '../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
 import { inQuickPickContext, defaultQuickAccessContext, getQuickNavigateHandler } from '../quickaccess.js';
 import { ILocalizedString } from '../../../platform/action/common/action.js';
 import { AnythingQuickAccessProviderRunOptions } from '../../../platform/quickinput/common/quickAccess.js';
 import { Codicon } from '../../../base/common/codicons.js';
 
+const UNIFIED_AGENTS_BAR_SETTING = 'chat.unifiedAgentsBar.enabled';
+
 //#region Quick access management commands and keys
 
 const globalQuickAccessKeybinding = {
@@ -53,7 +56,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: 0,
 	handler: accessor => {
 		const quickInputService = accessor.get(IQuickInputService);
-		return quickInputService.accept({ ctrlCmd: true, alt: false });
+		return quickInputService.accept({ ctrlCmd: true, alt: false, shift: false });
 	}
 });
 
@@ -161,16 +164,32 @@ registerAction2(class QuickAccessAction extends Action2 {
 		});
 	}
 
-	run(accessor: ServicesAccessor): void {
-		const quickInputService = accessor.get(IQuickInputService);
-		const providerOptions: AnythingQuickAccessProviderRunOptions = {
-			includeHelp: true,
-			from: 'commandCenter',
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const openClassicQuickAccess = (): void => {
+			const quickInputService = accessor.get(IQuickInputService);
+			const providerOptions: AnythingQuickAccessProviderRunOptions = {
+				includeHelp: true,
+				from: 'commandCenter',
+			};
+			quickInputService.quickAccess.show(undefined, {
+				preserveValue: true,
+				providerOptions
+			});
 		};
-		quickInputService.quickAccess.show(undefined, {
-			preserveValue: true,
-			providerOptions
-		});
+
+		const configurationService = accessor.get(IConfigurationService);
+		const commandService = accessor.get(ICommandService);
+		const useUnifiedQuickAccess = configurationService.getValue<boolean>(UNIFIED_AGENTS_BAR_SETTING) === true;
+		if (useUnifiedQuickAccess) {
+			try {
+				await commandService.executeCommand('workbench.action.unifiedQuickAccess');
+			} catch {
+				openClassicQuickAccess();
+			}
+			return;
+		}
+
+		openClassicQuickAccess();
 	}
 });
 
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 89f0b6d3b55..c213b29de93 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -100,7 +100,8 @@ enum LayoutClasses {
 	STATUSBAR_HIDDEN = 'nostatusbar',
 	FULLSCREEN = 'fullscreen',
 	MAXIMIZED = 'maximized',
-	WINDOW_BORDER = 'border'
+	WINDOW_BORDER = 'border',
+	NO_SHADOWS = 'no-shadows'
 }
 
 interface IPathToOpen extends IPath {
@@ -426,6 +427,11 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				this.doUpdateLayoutConfiguration();
 			}
 
+			// Shadows
+			if (e.affectsConfiguration(LayoutSettings.SHADOWS)) {
+				this.updateShadows();
+			}
+
 			// Auxiliary Sidebar
 			if (e.affectsConfiguration(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED)) {
 				const forceMaximized = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED);
@@ -588,6 +594,18 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		this.editorGroupService.whenRestored.then(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED), skipLayout));
 	}
 
+	private isShadowsDisabled(): boolean {
+		return this.configurationService.getValue<boolean>(LayoutSettings.SHADOWS) === false;
+	}
+
+	private updateShadows(): void {
+		const noShadows = this.isShadowsDisabled();
+
+		for (const container of Array.from(this.containers)) {
+			container.classList.toggle(LayoutClasses.NO_SHADOWS, noShadows);
+		}
+	}
+
 	private setSideBarPosition(position: Position): void {
 		const activityBar = this.getPart(Parts.ACTIVITYBAR_PART);
 		const sideBar = this.getPart(Parts.SIDEBAR_PART);
@@ -1857,7 +1875,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			!this.isVisible(Parts.PANEL_PART) ? LayoutClasses.PANEL_HIDDEN : undefined,
 			!this.isVisible(Parts.AUXILIARYBAR_PART) ? LayoutClasses.AUXILIARYBAR_HIDDEN : undefined,
 			!this.isVisible(Parts.STATUSBAR_PART) ? LayoutClasses.STATUSBAR_HIDDEN : undefined,
-			this.state.runtime.mainWindowFullscreen ? LayoutClasses.FULLSCREEN : undefined
+			this.state.runtime.mainWindowFullscreen ? LayoutClasses.FULLSCREEN : undefined,
+			this.isShadowsDisabled() ? LayoutClasses.NO_SHADOWS : undefined
 		]);
 	}
 
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 0d6a2da153b..1f6e583f5e0 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -67,6 +67,27 @@ body {
 	--vscode-shadow-depth-y: 0 5px 10px -4px rgba(0, 0, 0, 0.04);
 }
 
+/* Disable panel/part shadows when the setting is off (preserves floating modals, notifications, etc.) */
+.monaco-workbench.no-shadows .part.titlebar,
+.monaco-workbench.no-shadows .part.activitybar,
+.monaco-workbench.no-shadows.nosidebar .part.activitybar,
+.monaco-workbench.no-shadows.activitybar-right .part.activitybar,
+.monaco-workbench.no-shadows .part.editor .tabs-container > .tab {
+	box-shadow: none;
+}
+.monaco-workbench.no-shadows .part.editor .tabs-container > .tab:hover:not(.active),
+.monaco-workbench.no-shadows .part.editor .tabs-container > .tab.active {
+	box-shadow: none;
+}
+.monaco-workbench.no-shadows {
+	/* Use zero-offset transparent shadows instead of 'none' because these
+	 * variables are interpolated into multi-value box-shadow declarations. */
+	--vscode-shadow-active-tab: 0 0 0 0 transparent;
+	--vscode-shadow-depth-x: 0 0 0 0 transparent;
+	--vscode-shadow-depth-y: 0 0 0 0 transparent;
+	--vscode-shadow-sm: 0 0 0 0 transparent;
+}
+
 .monaco-workbench.web {
 	touch-action: none; /* Disable browser handling of all panning and zooming gestures. Removes 300ms touch delay. */
 	overscroll-behavior: none; /* Prevent bounce effect */
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index df841939212..3ba95f7f59c 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -1428,12 +1428,12 @@ function registerModalEditorCommands(): void {
 				}
 			});
 		}
-		run(accessor: ServicesAccessor): void {
+		async run(accessor: ServicesAccessor): Promise<void> {
 			const editorGroupsService = accessor.get(IEditorGroupsService);
 
 			for (const part of editorGroupsService.parts) {
 				if (isModalEditorPart(part)) {
-					part.close({ mergeAllEditorsToMainPart: true });
+					await part.close({ mergeAllEditorsToMainPart: true });
 					break;
 				}
 			}
@@ -1469,7 +1469,7 @@ function registerModalEditorCommands(): void {
 					}
 
 					auxiliaryEditorPart.activeGroup.focus();
-					part.close();
+					await part.close();
 					break;
 				}
 			}
@@ -1538,7 +1538,7 @@ function registerModalEditorCommands(): void {
 
 			for (const part of editorGroupsService.parts) {
 				if (isModalEditorPart(part)) {
-					part.close();
+					await part.close();
 					break;
 				}
 			}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 31f83c70a11..9bb098c68f8 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -237,9 +237,14 @@ export class EditorPart extends Part<IEditorPartMemento> implements IEditorPart,
 	}
 
 	readonly sideGroup: IEditorSideGroup = {
-		openEditor: (editor, options) => {
-			const [group] = this.scopedInstantiationService.invokeFunction(accessor => findGroup(accessor, { editor, options }, SIDE_GROUP));
-
+		openEditor: async (editor, options) => {
+			const findGroupResult = this.scopedInstantiationService.invokeFunction(accessor => findGroup(accessor, { editor, options }, SIDE_GROUP));
+			let group;
+			if (findGroupResult instanceof Promise) {
+				([group] = await findGroupResult);
+			} else {
+				([group] = findGroupResult);
+			}
 			return group.openEditor(editor, options);
 		}
 	};
diff --git a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
index 9f63f8390de..4c7da5f5466 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
@@ -51,6 +51,11 @@
 		inset 0 var(--vscode-shadow-depth-y);
 }
 
+/* Must appear after positional variants so source-order wins at equal specificity */
+.monaco-workbench.no-shadows.vs .part.editor::after {
+	box-shadow: none;
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container {
 	height: 100%;
 }
diff --git a/src/vs/workbench/browser/parts/editor/modalEditorPart.ts b/src/vs/workbench/browser/parts/editor/modalEditorPart.ts
index db862b6096c..d2ac7485f10 100644
--- a/src/vs/workbench/browser/parts/editor/modalEditorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/modalEditorPart.ts
@@ -27,6 +27,7 @@ import { GroupDirection, GroupsOrder, IModalEditorPart, GroupActivationReason }
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext } from '../../../common/contextkeys.js';
 import { EditorResourceAccessor, SideBySideEditor, Verbosity } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 import { ResourceLabel } from '../../labels.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
@@ -137,7 +138,7 @@ export class ModalEditorPart {
 				EventHelper.stop(e, true);
 
 				// Close modal when clicking outside the dialog
-				editorPart.close();
+				void editorPart.close();
 			}
 		}));
 
@@ -169,7 +170,11 @@ export class ModalEditorPart {
 		const resizableElement = new ResizableHTMLElement();
 		disposables.add(toDisposable(() => resizableElement.dispose()));
 		resizableElement.domNode.classList.add('modal-editor-resizable');
-		resizableElement.minSize = new Dimension(MODAL_MIN_WIDTH, MODAL_MIN_HEIGHT);
+		const configuredMinWidth = options?.minWidth ?? this.configurationService.getValue<number>('workbench.editor.modalMinWidth');
+		const effectiveMinWidth = (typeof configuredMinWidth === 'number' && Number.isFinite(configuredMinWidth) && configuredMinWidth >= MODAL_MIN_WIDTH)
+			? configuredMinWidth
+			: MODAL_MIN_WIDTH;
+		resizableElement.minSize = new Dimension(effectiveMinWidth, MODAL_MIN_HEIGHT);
 		modalElement.appendChild(resizableElement.domNode);
 
 		const shadowElement = resizableElement.domNode.appendChild($('.modal-editor-shadow'));
@@ -284,7 +289,9 @@ export class ModalEditorPart {
 
 		// Create label
 		const label = disposables.add(scopedInstantiationService.createInstance(ResourceLabel, titleElement, {}));
-		disposables.add(Event.runAndSubscribe(modalEditorService.onDidActiveEditorChange, () => {
+		const labelChangeDisposable = disposables.add(new MutableDisposable());
+		let trackedEditor: EditorInput | undefined;
+		const updateLabel = () => {
 			const activeEditor = editorPart.activeGroup.activeEditor;
 			if (activeEditor) {
 				const { labelFormat } = editorPart.partOptions;
@@ -300,10 +307,19 @@ export class ModalEditorPart {
 						extraClasses: activeEditor.getLabelExtraClasses(),
 					}
 				);
+
+				// Only (re)subscribe when the active editor changes, not on every label update
+				if (trackedEditor !== activeEditor) {
+					trackedEditor = activeEditor;
+					labelChangeDisposable.value = activeEditor.onDidChangeLabel(() => updateLabel());
+				}
 			} else {
 				label.element.clear();
+				trackedEditor = undefined;
+				labelChangeDisposable.clear();
 			}
-		}));
+		};
+		disposables.add(Event.runAndSubscribe(modalEditorService.onDidActiveEditorChange, updateLabel));
 
 		// Handle double-click on header to toggle maximize
 		disposables.add(addDisposableListener(headerElement, EventType.DBLCLICK, e => {
@@ -425,31 +441,66 @@ export class ModalEditorPart {
 		}));
 
 		disposables.add(resizableElement.onDidResize(e => {
-			const deltaWidth = e.dimension.width - resizeStartSize.width;
-			const deltaHeight = e.dimension.height - resizeStartSize.height;
 
-			// Adjust position to keep the opposite edge fixed
-			if (e.west) {
-				resizableElement.domNode.style.left = `${resizeStartLeft - deltaWidth}px`;
-			}
-			if (e.north) {
-				resizableElement.domNode.style.top = `${resizeStartTop - deltaHeight}px`;
+			// Clamp position and size to window bounds during active resize
+			// (skip on `done` — values are already correct from prior events,
+			//  and directional flags are not set on the done event)
+			if (!e.done) {
+				const containerDimension = this.layoutService.mainContainerDimension;
+				const titleBarOffset = this.layoutService.mainContainerOffset.top;
+
+				const deltaWidth = e.dimension.width - resizeStartSize.width;
+				const deltaHeight = e.dimension.height - resizeStartSize.height;
+
+				let newLeft = e.west ? resizeStartLeft - deltaWidth : resizeStartLeft;
+				let newTop = e.north ? resizeStartTop - deltaHeight : resizeStartTop;
+				let newWidth = e.dimension.width;
+				let newHeight = e.dimension.height;
+
+				if (newLeft < 0) {
+					newWidth += newLeft;
+					newLeft = 0;
+				}
+				if (newTop < titleBarOffset) {
+					newHeight += newTop - titleBarOffset;
+					newTop = titleBarOffset;
+				}
+				if (newLeft + newWidth > containerDimension.width) {
+					newWidth = containerDimension.width - newLeft;
+				}
+				if (newTop + newHeight > containerDimension.height) {
+					newHeight = containerDimension.height - newTop;
+				}
+
+				// Apply corrected size if it was clamped
+				if (newWidth !== e.dimension.width || newHeight !== e.dimension.height) {
+					resizableElement.layout(newHeight, newWidth);
+				}
+
+				// Adjust position to keep the opposite edge fixed
+				if (e.west) {
+					resizableElement.domNode.style.left = `${newLeft}px`;
+				}
+				if (e.north) {
+					resizableElement.domNode.style.top = `${newTop}px`;
+				}
 			}
 
 			// Update editor part layout during resize
-			editorPart.layout(e.dimension.width - MODAL_BORDER_SIZE, e.dimension.height - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT, 0, 0);
+			const size = resizableElement.size;
+			editorPart.layout(size.width - MODAL_BORDER_SIZE, size.height - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT, 0, 0);
 
 			if (e.done) {
 				isResizing = false;
 
 				// Check if size matches the default (from sash double-click reset)
 				const defaultSize = getDefaultSize();
-				if (e.dimension.width === defaultSize.width && e.dimension.height === defaultSize.height) {
+				if (size.width === defaultSize.width && size.height === defaultSize.height) {
 					editorPart.size = undefined;
 					editorPart.position = undefined;
 					layoutModal();
 				} else {
-					editorPart.size = new Dimension(e.dimension.width, e.dimension.height);
+					editorPart.size = new Dimension(size.width, size.height);
 					editorPart.position = {
 						left: parseFloat(resizableElement.domNode.style.left) || 0,
 						top: parseFloat(resizableElement.domNode.style.top) || 0,
@@ -737,38 +788,37 @@ class ModalEditorPartImpl extends EditorPart implements IModalEditorPart {
 			this.previousMainWindowActiveElement.focus();
 		}
 
-		this.doClose({ mergeConfirmingEditorsToMainPart: false });
+		this._onWillClose.fire();
 	}
 
 	protected override saveState(): void {
 		return; // disabled, modal editor part state is not persisted
 	}
 
-	close(options?: { mergeAllEditorsToMainPart?: boolean }): boolean {
-		return this.doClose({ ...options, mergeConfirmingEditorsToMainPart: true });
-	}
+	async close(options?: { mergeAllEditorsToMainPart?: boolean }): Promise<boolean> {
 
-	private doClose(options?: { mergeAllEditorsToMainPart?: boolean; mergeConfirmingEditorsToMainPart?: boolean }): boolean {
-		let result = true;
-		if (options?.mergeConfirmingEditorsToMainPart) {
-
-			// First close all editors that are non-confirming (unless we merge all)
-			if (!options.mergeAllEditorsToMainPart) {
-				for (const group of this.groups) {
-					group.closeAllEditors({ excludeConfirming: true });
-				}
-			}
-
-			// Then merge remaining to main part
-			result = this.mergeGroupsToMainPart();
+		// Merge all editors to main part (editors stay open, no confirmation needed)
+		if (options?.mergeAllEditorsToMainPart) {
+			const result = this.mergeGroupsToMainPart();
 			if (!result) {
-				return false; // Do not close when editors could not be merged back
+				return false;
+			}
+		}
+
+		// Close all editors in each group, leveraging the existing
+		// confirmation infrastructure for dirty editors
+		else {
+			for (const group of this.groups) {
+				const closed = await group.closeAllEditors();
+				if (!closed) {
+					return false; // user cancelled
+				}
 			}
 		}
 
 		this._onWillClose.fire();
 
-		return result;
+		return true;
 	}
 
 	private mergeGroupsToMainPart(): boolean {
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index b0befd9b02b..b56047d66e1 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -1104,7 +1104,17 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 						const label = `${editor.getName()} + ${selectedEditors.length - 1}`;
 						applyDragImage(e, tab, label);
 					} else {
-						e.dataTransfer.setDragImage(tab, 0, 0); // top left corner of dragged tab set to cursor position to make room for drop-border feedback
+						const options = this.groupsView.partOptions;
+						const isTabSticky = this.tabsModel.isSticky(tabIndex);
+						const isShrinkSizing = options.tabSizing === 'shrink' || (isTabSticky && options.pinnedTabSizing === 'shrink');
+						if (isShrinkSizing) {
+							// When tab sizing is 'shrink', the tab label may be truncated. Using the tab DOM element
+							// as a drag image can cause parts of the tab header UI to visually drag along.
+							// Instead, use a clean text-only drag image with the editor name.
+							applyDragImage(e, tab, editor.getName());
+						} else {
+							e.dataTransfer.setDragImage(tab, 0, 0); // top left corner of dragged tab set to cursor position to make room for drop-border feedback
+						}
 					}
 				}
 
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
index ee7e8a6a64a..a64eda86668 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
@@ -5,7 +5,7 @@
 
 .monaco-workbench > .notifications-center {
 	position: absolute;
-	z-index: 1000;
+	z-index: 2545; /* above modal editor backdrop (2540), below quick input (2550) and dialogs (2575) */
 	right: 7px; /* attempt to position at same location as a toast */
 	bottom: 29px; /* 22px status bar height + 7px (attempt to position at same location as a toast) */
 	display: none;
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
index 73764a1003e..d9185ce03f9 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
@@ -5,7 +5,7 @@
 
 .monaco-workbench > .notifications-toasts {
 	position: absolute;
-	z-index: 1000;
+	z-index: 2545; /* above modal editor backdrop (2540), below quick input (2550) and dialogs (2575) */
 	right: 3px;
 	bottom: 25px; /* 22px status bar height + 3px */
 	display: none;
diff --git a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
index 2f28eca7419..cdf065ca432 100644
--- a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
@@ -22,6 +22,11 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { WindowTitle } from './windowTitle.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+
+const AI_DISABLED_SETTING = 'chat.disableAIFeatures';
+const AI_CUSTOMIZATION_MENU_ENABLED_SETTING = 'chat.customizationsMenu.enabled';
+const AGENT_STATUS_ENABLED_SETTING = 'chat.agentsControl.enabled';
 
 export class CommandCenterControl {
 
@@ -86,6 +91,7 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 		@IKeybindingService private _keybindingService: IKeybindingService,
 		@IInstantiationService private _instaService: IInstantiationService,
 		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
+		@IConfigurationService private _configurationService: IConfigurationService,
 	) {
 		super(undefined, _submenu.actions.find(action => action.id === 'workbench.action.quickOpenWithModes') ?? _submenu.actions[0], options);
 		this._hoverDelegate = options.hoverDelegate ?? getDefaultHoverDelegate('mouse');
@@ -143,9 +149,21 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 							container.classList.toggle('command-center-quick-pick');
 							container.role = 'button';
 							container.setAttribute('aria-description', this.getTooltip());
+
+							// When agent control mode is 'compact', hide search icon and left-align the label
+							// Backward compat: the old boolean setting (true) and the new default (undefined) both map to compact
+							const aiFeaturesDisabled = that._configurationService.getValue<boolean>(AI_DISABLED_SETTING) === true;
+							const aiCustomizationsDisabled = that._configurationService.getValue<boolean>('disableAICustomizations') === true
+								|| that._configurationService.getValue<boolean>('workbench.disableAICustomizations') === true
+								|| that._configurationService.getValue<boolean>(AI_CUSTOMIZATION_MENU_ENABLED_SETTING) === false;
+							const forcedHidden = aiFeaturesDisabled && aiCustomizationsDisabled;
+							const agentControlValue = that._configurationService.getValue(AGENT_STATUS_ENABLED_SETTING);
+							const isCompactMode = !forcedHidden && (agentControlValue === true || agentControlValue === undefined || agentControlValue === 'compact');
+							container.classList.toggle('compact-mode', isCompactMode);
+
 							const action = this.action;
 
-							// icon (search)
+							// icon (search) - hidden in compact mode
 							const searchIcon = document.createElement('span');
 							searchIcon.ariaHidden = 'true';
 							searchIcon.className = action.class ?? '';
@@ -156,7 +174,11 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 							const labelElement = document.createElement('span');
 							labelElement.classList.add('search-label');
 							labelElement.textContent = label;
-							reset(container, searchIcon, labelElement);
+							if (isCompactMode) {
+								reset(container, labelElement);
+							} else {
+								reset(container, searchIcon, labelElement);
+							}
 
 							const hover = this._store.add(that._hoverService.setupManagedHover(that._hoverDelegate, container, this.getTooltip()));
 
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index a2c1090f9d1..7a255b58d0f 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -148,7 +148,7 @@
 }
 
 .monaco-workbench .part.titlebar.inactive > * {
-	opacity: 0.3;
+	opacity: 0.6;
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label,
@@ -173,11 +173,10 @@
 	border: 1px solid var(--vscode-commandCenter-border);
 	overflow: hidden;
 	margin: 0 6px;
-	border-radius: var(--vscode-cornerRadius-large);
+	border-radius: var(--vscode-cornerRadius-medium);
 	height: 22px;
 	width: 38vw;
 	max-width: 600px;
-	box-shadow: inset var(--vscode-shadow-sm);
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center .action-item.command-center-quick-pick {
@@ -204,6 +203,25 @@
 	text-overflow: ellipsis;
 }
 
+/* Compact mode: left-aligned label, no icon, full width */
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center .action-item.command-center-quick-pick.compact-mode {
+	margin: auto auto auto 0;
+	padding-left: 8px;
+	flex: 1;
+}
+
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:has(.compact-mode) > .monaco-toolbar > .monaco-action-bar > .actions-container {
+	margin: 0;
+}
+
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:has(.compact-mode) > .monaco-toolbar {
+	flex: 1;
+}
+
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:has(.compact-mode) > .monaco-toolbar > .monaco-action-bar {
+	width: 100%;
+}
+
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center.multiple {
 	justify-content: flex-start;
 	padding: 0 12px;
@@ -379,6 +397,17 @@
 	color: white;
 }
 
+/* Center-Adjacent Toolbar (e.g., update indicator) */
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .center-adjacent-toolbar-container {
+	z-index: 2500;
+	-webkit-app-region: no-drag;
+	margin-right: auto;
+}
+
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .center-adjacent-toolbar-container.has-no-actions {
+	display: none;
+}
+
 /* Action Tool Bar Controls */
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .action-toolbar-container {
 	display: none;
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 98895a33a4a..a7b85c157ae 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -31,7 +31,7 @@ import { IHostService } from '../../../services/host/browser/host.js';
 import { WindowTitle } from './windowTitle.js';
 import { CommandCenterControl } from './commandCenterControl.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from '../../../common/activity.js';
 import { AccountsActivityActionViewItem, isAccountsActionVisible, SimpleAccountActivityActionViewItem, SimpleGlobalActivityActionViewItem } from '../globalCompositeBar.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
@@ -268,6 +268,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	private readonly actionToolBarDisposable = this._register(new DisposableStore());
 	private readonly editorActionsChangeDisposable = this._register(new DisposableStore());
 	private actionToolBarElement!: HTMLElement;
+	private readonly centerAdjacentToolBarDisposable = this._register(new DisposableStore());
 
 	private globalToolbarMenu: IMenu | undefined;
 	private layoutToolbarMenu: IMenu | undefined;
@@ -476,6 +477,20 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 		this.title = append(this.centerContent, $('div.window-title'));
 		this.createTitle();
 
+		// Center-Adjacent Toolbar (e.g., update indicator)
+		if (hasCustomTitlebar(this.configurationService, this.titleBarStyle)) {
+			const centerAdjacentToolBarElement = append(this.rightContent, $('div.center-adjacent-toolbar-container'));
+			this.centerAdjacentToolBarDisposable.add(this.instantiationService.createInstance(MenuWorkbenchToolBar, centerAdjacentToolBarElement, MenuId.TitleBarAdjacentCenter, {
+				contextMenu: MenuId.TitleBarContext,
+				hiddenItemStrategy: HiddenItemStrategy.NoHide,
+				toolbarOptions: {
+					primaryGroup: () => true,
+				},
+				actionViewItemProvider: (action, options) => createActionViewItem(this.instantiationService, action, options),
+				hoverDelegate: this.hoverDelegate
+			}));
+		}
+
 		// Create Toolbar Actions
 		if (hasCustomTitlebar(this.configurationService, this.titleBarStyle)) {
 			this.actionToolBarElement = append(this.rightContent, $('div.action-toolbar-container'));
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 058693c7cfd..ae3425dec08 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -365,6 +365,13 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 					mode: 'auto'
 				}
 			},
+			'workbench.editor.modalMinWidth': {
+				'type': 'number',
+				'description': localize('modalMinWidth', "Controls the minimum width of modal editor overlays in pixels."),
+				'default': 400,
+				'minimum': 0,
+				'multipleOf': 1
+			},
 			'workbench.editor.swipeToNavigate': {
 				'type': 'boolean',
 				'description': localize('swipeToNavigate', "Navigate between open files using three-finger swipe horizontally. Note that System Preferences > Trackpad > More Gestures > 'Swipe between pages' must be set to 'Swipe with two or three fingers'."),
@@ -784,6 +791,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'default': true,
 				'description': localize('tips.enabled', "When enabled, will show the watermark tips when no editor is open.")
 			},
+			[LayoutSettings.SHADOWS]: {
+				'type': 'boolean',
+				'default': true,
+				'description': localize('shadows', "Controls whether shadow effects are shown around the side panels and other workbench elements.")
+			},
 		}
 	});
 
@@ -1056,16 +1068,3 @@ Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
 			return result;
 		}
 	}]);
-
-Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
-	.registerConfigurationMigrations([{
-		key: 'workbench.editor.useModal', migrateFn: (value: unknown) => {
-			const result: ConfigurationKeyValuePairs = [];
-			if (value === 'default') {
-				result.push(['workbench.editor.useModal', { value: 'some' }]);
-			} else if (value === 'on') {
-				result.push(['workbench.editor.useModal', { value: 'all' }]);
-			}
-			return result;
-		}
-	}]);
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index e02204c16c4..65ef6b48d66 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -855,7 +855,13 @@ export const enum EditorInputCapabilities {
 	 * Signals that the editor should be revealed when being
 	 * opened if it is already opened in any editor group.
 	 */
-	ForceReveal = 1 << 10
+	ForceReveal = 1 << 10,
+
+	/**
+	 * Signals that the editor must be opened in a modal editor
+	 * part, overriding the `workbench.editor.useModal` setting.
+	 */
+	RequiresModal = 1 << 11
 }
 
 export type IUntypedEditorInput = IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput | IResourceDiffEditorInput | IResourceMultiDiffEditorInput | IResourceSideBySideEditorInput | IResourceMergeEditorInput;
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index 6870246190f..8881c154f60 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -53,7 +53,9 @@ import { AccessibilityVerbositySettingId, AccessibilityWorkbenchSettingId, acces
 import { resolveContentAndKeybindingItems } from './accessibleViewKeybindingResolver.js';
 
 const enum DIMENSIONS {
-	MAX_WIDTH = 600
+	MAX_WIDTH = 900,
+	WIDTH_RATIO = 0.75,
+	MAX_HEIGHT_RATIO = 0.6
 }
 
 export type AccesibleViewContentProvider = AccessibleContentProvider | ExtensionContentProvider;
@@ -291,7 +293,7 @@ export class AccessibleView extends Disposable {
 		}
 		provider.onOpen?.();
 		const delegate: IContextViewDelegate = {
-			getAnchor: () => { return { x: (getActiveWindow().innerWidth / 2) - ((Math.min(this._layoutService.activeContainerDimension.width * 0.62 /* golden cut */, DIMENSIONS.MAX_WIDTH)) / 2), y: this._layoutService.activeContainerOffset.quickPickTop }; },
+			getAnchor: () => { return { x: (getActiveWindow().innerWidth / 2) - ((Math.min(this._layoutService.activeContainerDimension.width * DIMENSIONS.WIDTH_RATIO, DIMENSIONS.MAX_WIDTH)) / 2), y: this._layoutService.activeContainerOffset.quickPickTop }; },
 			render: (container) => {
 				this._viewContainer = container;
 				this._viewContainer.classList.add('accessible-view-container');
@@ -741,9 +743,9 @@ export class AccessibleView extends Disposable {
 
 	private _layout(): void {
 		const dimension = this._layoutService.activeContainerDimension;
-		const maxHeight = dimension.height && dimension.height * .4;
+		const maxHeight = dimension.height && dimension.height * DIMENSIONS.MAX_HEIGHT_RATIO;
 		const height = Math.min(maxHeight, this._editorWidget.getContentHeight());
-		const width = Math.min(dimension.width * 0.62 /* golden cut */, DIMENSIONS.MAX_WIDTH);
+		const width = Math.min(dimension.width * DIMENSIONS.WIDTH_RATIO, DIMENSIONS.MAX_WIDTH);
 		this._editorWidget.layout({ width, height });
 	}
 
diff --git a/src/vs/workbench/contrib/browserView/browser/browserView.contribution.ts b/src/vs/workbench/contrib/browserView/browser/browserView.contribution.ts
new file mode 100644
index 00000000000..a16c153f57e
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/browser/browserView.contribution.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { IBrowserViewWorkbenchService, IBrowserViewCDPService, IBrowserViewModel } from '../common/browserView.js';
+import { Event } from '../../../../base/common/event.js';
+import { CDPEvent, CDPRequest, CDPResponse } from '../../../../platform/browserView/common/cdp/types.js';
+
+class WebBrowserViewWorkbenchService implements IBrowserViewWorkbenchService {
+	declare readonly _serviceBrand: undefined;
+
+	async getOrCreateBrowserViewModel(_id: string): Promise<IBrowserViewModel> {
+		throw new Error('Integrated Browser is not available in web.');
+	}
+
+	async getBrowserViewModel(_id: string): Promise<IBrowserViewModel> {
+		throw new Error('Integrated Browser is not available in web.');
+	}
+
+	async clearGlobalStorage(): Promise<void> { }
+	async clearWorkspaceStorage(): Promise<void> { }
+}
+
+class WebBrowserViewCDPService implements IBrowserViewCDPService {
+	declare readonly _serviceBrand: undefined;
+
+	async createSessionGroup(_browserId: string): Promise<string> {
+		throw new Error('Integrated Browser is not available in web.');
+	}
+
+	async destroySessionGroup(_groupId: string): Promise<void> { }
+
+	async sendCDPMessage(_groupId: string, _message: CDPRequest): Promise<void> { }
+
+	onCDPMessage(_groupId: string): Event<CDPResponse | CDPEvent> {
+		return Event.None;
+	}
+
+	onDidDestroy(_groupId: string): Event<void> {
+		return Event.None;
+	}
+}
+
+registerSingleton(IBrowserViewWorkbenchService, WebBrowserViewWorkbenchService, InstantiationType.Delayed);
+registerSingleton(IBrowserViewCDPService, WebBrowserViewCDPService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserEditorInput.ts b/src/vs/workbench/contrib/browserView/common/browserEditorInput.ts
similarity index 86%
rename from src/vs/workbench/contrib/browserView/electron-browser/browserEditorInput.ts
rename to src/vs/workbench/contrib/browserView/common/browserEditorInput.ts
index 9a7f53e85ed..d8e0c816df7 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/browserEditorInput.ts
+++ b/src/vs/workbench/contrib/browserView/common/browserEditorInput.ts
@@ -9,6 +9,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { IBrowserEditorViewState } from './browserView.js';
 import { EditorInputCapabilities, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -18,7 +19,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IBrowserViewWorkbenchService, IBrowserViewModel } from '../common/browserView.js';
 import { hasKey } from '../../../../base/common/types.js';
 import { ILifecycleService, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
-import { BrowserEditor } from './browserEditor.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { logBrowserOpen } from '../../../../platform/browserView/common/browserViewTelemetry.js';
 
@@ -39,19 +39,17 @@ const MAX_TITLE_LENGTH = 30;
 /**
  * JSON-serializable type used during browser state serialization/deserialization
  */
-export interface IBrowserEditorInputData {
+export interface IBrowserEditorInputData extends IBrowserEditorViewState {
 	readonly id: string;
-	readonly url?: string;
-	readonly title?: string;
-	readonly favicon?: string;
 }
 
 export class BrowserEditorInput extends EditorInput {
 	static readonly ID = 'workbench.editorinputs.browser';
+	static readonly EDITOR_ID = 'workbench.editor.browser';
 	private static readonly DEFAULT_LABEL = localize('browser.editorLabel', "Browser");
 
 	private readonly _id: string;
-	private readonly _initialData: IBrowserEditorInputData;
+	private _initialData: IBrowserEditorInputData;
 	private _model: IBrowserViewModel | undefined;
 	private _modelPromise: Promise<IBrowserViewModel> | undefined;
 
@@ -84,6 +82,34 @@ export class BrowserEditorInput extends EditorInput {
 		return this._id;
 	}
 
+	get url(): string | undefined {
+		// Use model URL if available, otherwise fall back to initial data
+		return this._model ? this._model.url : this._initialData.url;
+	}
+
+	get title(): string | undefined {
+		// Use model title if available, otherwise fall back to initial data
+		return this._model ? this._model.title : this._initialData.title;
+	}
+
+	get favicon(): string | undefined {
+		// Use model favicon if available, otherwise fall back to initial data
+		return this._model ? this._model.favicon : this._initialData.favicon;
+	}
+
+	navigate(url: string): void {
+		if (this._model) {
+			void this._model.loadURL(url);
+		} else {
+			// If the model isn't created yet, update the initial data so that the URL is correct when the model is created
+			this._initialData = {
+				id: this._id,
+				url
+			};
+			this._onDidChangeLabel.fire();
+		}
+	}
+
 	override async resolve(): Promise<IBrowserViewModel> {
 		if (!this._model && !this._modelPromise) {
 			this._modelPromise = (async () => {
@@ -122,7 +148,7 @@ export class BrowserEditorInput extends EditorInput {
 	}
 
 	override get editorId(): string {
-		return BrowserEditor.ID;
+		return BrowserEditorInput.EDITOR_ID;
 	}
 
 	override get capabilities(): EditorInputCapabilities {
@@ -134,8 +160,7 @@ export class BrowserEditorInput extends EditorInput {
 			return this._resourceBeforeDisposal;
 		}
 
-		const url = this._model?.url ?? this._initialData.url ?? '';
-		return BrowserViewUri.forUrl(url, this._id);
+		return BrowserViewUri.forId(this._id);
 	}
 
 	override getIcon(): ThemeIcon | URI | undefined {
@@ -182,8 +207,7 @@ export class BrowserEditorInput extends EditorInput {
 	}
 
 	override getDescription(): string | undefined {
-		// Use model URL if available, otherwise fall back to initial data
-		return this._model ? this._model.url : this._initialData.url;
+		return this.url;
 	}
 
 	override canReopen(): boolean {
@@ -217,20 +241,25 @@ export class BrowserEditorInput extends EditorInput {
 	override copy(): EditorInput {
 		logBrowserOpen(this.telemetryService, 'copyToNewWindow');
 
-		const currentUrl = this._model?.url ?? this._initialData.url;
 		return this.instantiationService.createInstance(BrowserEditorInput, {
 			id: generateUuid(),
-			url: currentUrl,
-			title: this._model?.title ?? this._initialData.title,
-			favicon: this._model?.favicon ?? this._initialData.favicon
+			url: this.url,
+			title: this.title,
+			favicon: this.favicon
 		});
 	}
 
 	override toUntyped(): IUntypedEditorInput {
+		const viewState: IBrowserEditorViewState = {
+			url: this.url,
+			title: this.title,
+			favicon: this.favicon
+		};
 		return {
 			resource: this.resource,
 			options: {
-				override: BrowserEditorInput.ID
+				override: BrowserEditorInput.EDITOR_ID,
+				viewState
 			}
 		};
 	}
@@ -250,9 +279,9 @@ export class BrowserEditorInput extends EditorInput {
 	serialize(): IBrowserEditorInputData {
 		return {
 			id: this._id,
-			url: this._model ? this._model.url : this._initialData.url,
-			title: this._model ? this._model.title : this._initialData.title,
-			favicon: this._model ? this._model.favicon : this._initialData.favicon
+			url: this.url,
+			title: this.title,
+			favicon: this.favicon
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/browserView/common/browserView.ts b/src/vs/workbench/contrib/browserView/common/browserView.ts
index 743993c796f..8f9cfa3f96b 100644
--- a/src/vs/workbench/contrib/browserView/common/browserView.ts
+++ b/src/vs/workbench/contrib/browserView/common/browserView.ts
@@ -7,6 +7,7 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CDPEvent, CDPRequest, CDPResponse } from '../../../../platform/browserView/common/cdp/types.js';
 import { IPlaywrightService } from '../../../../platform/browserView/common/playwrightService.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@@ -27,13 +28,26 @@ import {
 	IBrowserViewCaptureScreenshotOptions,
 	IBrowserViewFindInPageOptions,
 	IBrowserViewFindInPageResult,
-	IBrowserViewVisibilityEvent
+	IBrowserViewVisibilityEvent,
+	IBrowserViewCertificateError,
+	browserZoomDefaultIndex,
+	browserZoomFactors
 } from '../../../../platform/browserView/common/browserView.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { isLocalhostAuthority } from '../../../../platform/url/common/trustedDomains.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IBrowserZoomService } from './browserZoomService.js';
+
+/** Extracts the host from a URL string for zoom tracking purposes. */
+function parseZoomHost(url: string): string | undefined {
+	const parsed = URL.parse(url);
+	if (!parsed?.host || (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')) {
+		return undefined;
+	}
+	return parsed.host;
+}
 
 type IntegratedBrowserNavigationEvent = {
 	navigationType: 'urlInput' | 'goBack' | 'goForward' | 'reload';
@@ -60,6 +74,15 @@ type IntegratedBrowserShareWithAgentClassification = {
 	comment: 'Tracks user choices around sharing browser content with agents';
 };
 
+/**
+ * View state stored in editor options when opening a browser view.
+ */
+export interface IBrowserEditorViewState {
+	readonly url?: string;
+	readonly title?: string;
+	readonly favicon?: string;
+}
+
 export const IBrowserViewWorkbenchService = createDecorator<IBrowserViewWorkbenchService>('browserViewWorkbenchService');
 
 /**
@@ -95,6 +118,36 @@ export interface IBrowserViewWorkbenchService {
 	clearWorkspaceStorage(): Promise<void>;
 }
 
+export const IBrowserViewCDPService = createDecorator<IBrowserViewCDPService>('browserViewCDPService');
+
+/**
+ * Workbench-level service for managing CDP (Chrome DevTools Protocol) sessions
+ * against browser views. Handles group lifecycle and window ID resolution.
+ */
+export interface IBrowserViewCDPService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Create a new CDP group for a browser view.
+	 * The window ID is resolved from the editor group containing the browser.
+	 * @param browserId The browser view identifier.
+	 * @returns The ID of the newly created group.
+	 */
+	createSessionGroup(browserId: string): Promise<string>;
+
+	/** Destroy a CDP group. */
+	destroySessionGroup(groupId: string): Promise<void>;
+
+	/** Send a CDP message to a group. */
+	sendCDPMessage(groupId: string, message: CDPRequest): Promise<void>;
+
+	/** Fires when a CDP message is received. */
+	onCDPMessage(groupId: string): Event<CDPResponse | CDPEvent>;
+
+	/** Fires when a CDP group is destroyed. */
+	onDidDestroy(groupId: string): Event<void>;
+}
+
 
 /**
  * A browser view model that represents a single browser view instance in the workbench.
@@ -113,11 +166,15 @@ export interface IBrowserViewModel extends IDisposable {
 	readonly isDevToolsOpen: boolean;
 	readonly canGoForward: boolean;
 	readonly error: IBrowserViewLoadError | undefined;
+	readonly certificateError: IBrowserViewCertificateError | undefined;
 	readonly storageScope: BrowserViewStorageScope;
 	readonly sharedWithAgent: boolean;
 	readonly zoomFactor: number;
+	readonly canZoomIn: boolean;
+	readonly canZoomOut: boolean;
 
 	readonly onDidChangeSharedWithAgent: Event<boolean>;
+	readonly onDidChangeZoom: Event<void>;
 	readonly onDidNavigate: Event<IBrowserViewNavigationEvent>;
 	readonly onDidChangeLoadingState: Event<IBrowserViewLoadingEvent>;
 	readonly onDidChangeFocus: Event<IBrowserViewFocusEvent>;
@@ -141,13 +198,17 @@ export interface IBrowserViewModel extends IDisposable {
 	reload(hard?: boolean): Promise<void>;
 	toggleDevTools(): Promise<void>;
 	captureScreenshot(options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer>;
-	dispatchKeyEvent(keyEvent: IBrowserViewKeyDownEvent): Promise<void>;
 	focus(): Promise<void>;
 	findInPage(text: string, options?: IBrowserViewFindInPageOptions): Promise<void>;
 	stopFindInPage(keepSelection?: boolean): Promise<void>;
 	getSelectedText(): Promise<string>;
 	clearStorage(): Promise<void>;
 	setSharedWithAgent(shared: boolean): Promise<void>;
+	trustCertificate(host: string, fingerprint: string): Promise<void>;
+	untrustCertificate(host: string, fingerprint: string): Promise<void>;
+	zoomIn(): Promise<void>;
+	zoomOut(): Promise<void>;
+	resetZoom(): Promise<void>;
 }
 
 export class BrowserViewModel extends Disposable implements IBrowserViewModel {
@@ -162,13 +223,19 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 	private _canGoBack: boolean = false;
 	private _canGoForward: boolean = false;
 	private _error: IBrowserViewLoadError | undefined = undefined;
+	private _certificateError: IBrowserViewCertificateError | undefined = undefined;
 	private _storageScope: BrowserViewStorageScope = BrowserViewStorageScope.Ephemeral;
+	private _isEphemeral: boolean = false;
+	private _zoomHost: string | undefined = undefined;
 	private _sharedWithAgent: boolean = false;
-	private _zoomFactor: number = 1;
+	private _browserZoomIndex: number = browserZoomDefaultIndex;
 
 	private readonly _onDidChangeSharedWithAgent = this._register(new Emitter<boolean>());
 	readonly onDidChangeSharedWithAgent: Event<boolean> = this._onDidChangeSharedWithAgent.event;
 
+	private readonly _onDidChangeZoom = this._register(new Emitter<void>());
+	readonly onDidChangeZoom: Event<void> = this._onDidChangeZoom.event;
+
 	private readonly _onWillDispose = this._register(new Emitter<void>());
 	readonly onWillDispose: Event<void> = this._onWillDispose.event;
 
@@ -182,6 +249,7 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		@IPlaywrightService private readonly playwrightService: IPlaywrightService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IStorageService private readonly storageService: IStorageService,
+		@IBrowserZoomService private readonly zoomService: IBrowserZoomService,
 	) {
 		super();
 	}
@@ -197,9 +265,12 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 	get canGoForward(): boolean { return this._canGoForward; }
 	get screenshot(): VSBuffer | undefined { return this._screenshot; }
 	get error(): IBrowserViewLoadError | undefined { return this._error; }
+	get certificateError(): IBrowserViewCertificateError | undefined { return this._certificateError; }
 	get storageScope(): BrowserViewStorageScope { return this._storageScope; }
 	get sharedWithAgent(): boolean { return this._sharedWithAgent; }
-	get zoomFactor(): number { return this._zoomFactor; }
+	get zoomFactor(): number { return browserZoomFactors[this._browserZoomIndex]; }
+	get canZoomIn(): boolean { return this._browserZoomIndex < browserZoomFactors.length - 1; }
+	get canZoomOut(): boolean { return this._browserZoomIndex > 0; }
 
 	get onDidNavigate(): Event<IBrowserViewNavigationEvent> {
 		return this.browserViewService.onDynamicDidNavigate(this.id);
@@ -280,9 +351,29 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		this._screenshot = state.lastScreenshot;
 		this._favicon = state.lastFavicon;
 		this._error = state.lastError;
+		this._certificateError = state.certificateError;
 		this._storageScope = state.storageScope;
 		this._sharedWithAgent = await this.playwrightService.isPageTracked(this.id);
-		this._zoomFactor = state.zoomFactor;
+		this._browserZoomIndex = state.browserZoomIndex;
+
+		this._isEphemeral = this._storageScope === BrowserViewStorageScope.Ephemeral;
+		this._zoomHost = parseZoomHost(this._url);
+
+		const effectiveZoomIndex = this.zoomService.getEffectiveZoomIndex(this._zoomHost, this._isEphemeral);
+		if (effectiveZoomIndex !== this._browserZoomIndex) {
+			await this.setBrowserZoomIndex(effectiveZoomIndex);
+		}
+
+		this._register(this.zoomService.onDidChangeZoom(({ host, isEphemeralChange }) => {
+			if (isEphemeralChange && !this._isEphemeral) {
+				return;
+			}
+			if (host === undefined || host === this._zoomHost) {
+				void this.setBrowserZoomIndex(
+					this.zoomService.getEffectiveZoomIndex(this._zoomHost, this._isEphemeral)
+				);
+			}
+		}));
 
 		// Set up state synchronization
 
@@ -292,10 +383,19 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 				this._favicon = undefined;
 			}
 
+			this._zoomHost = parseZoomHost(e.url);
 			this._url = e.url;
 			this._title = e.title;
 			this._canGoBack = e.canGoBack;
 			this._canGoForward = e.canGoForward;
+			this._certificateError = e.certificateError;
+
+			// Always forceApply because Chromium resets zoom on cross-origin navigation,
+			// and an origin change may not correspond to a host change (e.g. http→https).
+			void this.setBrowserZoomIndex(
+				this.zoomService.getEffectiveZoomIndex(this._zoomHost, this._isEphemeral),
+				true
+			);
 		}));
 
 		this._register(this.onDidChangeLoadingState(e => {
@@ -329,7 +429,6 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 	}
 
 	async layout(bounds: IBrowserViewBounds): Promise<void> {
-		this._zoomFactor = bounds.zoomFactor;
 		return this.browserViewService.layout(this.id, bounds);
 	}
 
@@ -371,10 +470,6 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		return result;
 	}
 
-	async dispatchKeyEvent(keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
-		return this.browserViewService.dispatchKeyEvent(this.id, keyEvent);
-	}
-
 	async focus(): Promise<void> {
 		return this.browserViewService.focus(this.id);
 	}
@@ -395,6 +490,57 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		return this.browserViewService.clearStorage(this.id);
 	}
 
+	async trustCertificate(host: string, fingerprint: string): Promise<void> {
+		return this.browserViewService.trustCertificate(this.id, host, fingerprint);
+	}
+
+	async untrustCertificate(host: string, fingerprint: string): Promise<void> {
+		return this.browserViewService.untrustCertificate(this.id, host, fingerprint);
+	}
+
+	/**
+	 * @param forceApply When true, the IPC call is made even if the local cached zoom index
+	 * already matches the requested value. Pass true after cross-document navigation because
+	 * Chromium resets the zoom to its per-origin default, making the cache stale.
+	 */
+	private async setBrowserZoomIndex(zoomIndex: number, forceApply = false): Promise<void> {
+		const clamped = Math.max(0, Math.min(zoomIndex, browserZoomFactors.length - 1));
+		if (!forceApply && clamped === this._browserZoomIndex) {
+			return;
+		}
+		this._browserZoomIndex = clamped;
+		await this.browserViewService.setBrowserZoomIndex(this.id, this._browserZoomIndex);
+		this._onDidChangeZoom.fire();
+	}
+
+	async zoomIn(): Promise<void> {
+		if (!this.canZoomIn) {
+			return;
+		}
+		await this.setBrowserZoomIndex(this._browserZoomIndex + 1);
+		if (this._zoomHost) {
+			this.zoomService.setHostZoomIndex(this._zoomHost, this._browserZoomIndex, this._isEphemeral);
+		}
+	}
+
+	async zoomOut(): Promise<void> {
+		if (!this.canZoomOut) {
+			return;
+		}
+		await this.setBrowserZoomIndex(this._browserZoomIndex - 1);
+		if (this._zoomHost) {
+			this.zoomService.setHostZoomIndex(this._zoomHost, this._browserZoomIndex, this._isEphemeral);
+		}
+	}
+
+	async resetZoom(): Promise<void> {
+		const defaultIndex = this.zoomService.getEffectiveZoomIndex(undefined, false);
+		await this.setBrowserZoomIndex(defaultIndex);
+		if (this._zoomHost) {
+			this.zoomService.setHostZoomIndex(this._zoomHost, defaultIndex, this._isEphemeral);
+		}
+	}
+
 	private static readonly SHARE_DONT_ASK_KEY = 'browserView.shareWithAgent.dontAskAgain';
 
 	async setSharedWithAgent(shared: boolean): Promise<void> {
diff --git a/src/vs/workbench/contrib/browserView/common/browserZoomService.ts b/src/vs/workbench/contrib/browserView/common/browserZoomService.ts
new file mode 100644
index 00000000000..c0e3cc5023a
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/common/browserZoomService.ts
@@ -0,0 +1,271 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { browserZoomDefaultIndex, browserZoomFactors } from '../../../../platform/browserView/common/browserView.js';
+import { zoomLevelToZoomFactor } from '../../../../platform/window/common/window.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+
+export const IBrowserZoomService = createDecorator<IBrowserZoomService>('browserZoomService');
+
+/** Storage key for the per-host persistent zoom map. */
+const BROWSER_ZOOM_PER_HOST_STORAGE_KEY = 'browserView.zoomPerHost';
+
+/**
+ * Special value for the default zoom level setting that instructs the browser view
+ * to dynamically match the closest zoom level to the application's current UI zoom.
+ */
+export const MATCH_WINDOW_ZOOM_LABEL = 'Match Window';
+
+export interface IBrowserZoomChangeEvent {
+	/**
+	 * The host (e.g. `"example.com"`) whose zoom changed, or `undefined`
+	 * when the global default zoom level changed.
+	 */
+	readonly host: string | undefined;
+
+	/**
+	 * Whether the change came from an ephemeral session.
+	 * - `true`  → only ephemeral views need to react.
+	 * - `false` → all views (ephemeral and non-ephemeral) for the host may be affected.
+	 */
+	readonly isEphemeralChange: boolean;
+}
+
+/**
+ * Manages two independent cascading zoom hierarchies for integrated browser views:
+ *
+ *  Normal views:    `persistent per-host override` ?? `configured default`
+ *  Ephemeral views: `ephemeral per-host override`  ?? `configured default`
+ *
+ * Ephemeral views never see persistent overrides directly. Instead, when a persistent
+ * value changes, it is copied into the ephemeral map so that ephemeral views
+ * immediately reflect the new level. Conversely, ephemeral changes never affect
+ * normal views.
+ *
+ * Per-host values that equal the current default are always removed (both persistent
+ * and ephemeral), so the view tracks the default going forward.
+ */
+export interface IBrowserZoomService {
+	readonly _serviceBrand: undefined;
+
+	/** Fired whenever the effective zoom for a host may have changed. */
+	readonly onDidChangeZoom: Event<IBrowserZoomChangeEvent>;
+
+	/**
+	 * Returns the effective zoom index for the given host and session type.
+	 * Pass `host = undefined` to obtain only the configured default zoom index.
+	 */
+	getEffectiveZoomIndex(host: string | undefined, isEphemeral: boolean): number;
+
+	/**
+	 * Set the zoom for a host.
+	 *
+	 * Non-ephemeral: persisted to storage. Also propagated into
+	 * the ephemeral map so ephemeral views immediately reflect the change.
+	 *
+	 * Ephemeral: stored in memory only, dropped on restart.
+	 *
+	 * In both cases, if the value equals the current default, the entry is removed so the
+	 * view tracks the default going forward.
+	 */
+	setHostZoomIndex(host: string, zoomIndex: number, isEphemeral: boolean): void;
+
+	/**
+	 * Notifies the service of the application's current UI zoom factor.
+	 * Must be called once on startup and again whenever the window zoom changes.
+	 * Only relevant when the default zoom level is set to `MATCH_WINDOW_LABEL`.
+	 */
+	notifyWindowZoomChanged(windowZoomFactor: number): void;
+}
+
+// ---------------------------------------------------------------------------
+// Implementation
+// ---------------------------------------------------------------------------
+
+/** Pre-computed map from percentage label (e.g. "125%") to index into browserZoomFactors. */
+const ZOOM_LABEL_TO_INDEX = new Map<string, number>(
+	browserZoomFactors.map((f, i) => [`${Math.round(f * 100)}%`, i])
+);
+
+export class BrowserZoomService extends Disposable implements IBrowserZoomService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeZoom = this._register(new Emitter<IBrowserZoomChangeEvent>());
+	readonly onDidChangeZoom: Event<IBrowserZoomChangeEvent> = this._onDidChangeZoom.event;
+
+	/**
+	 * In-memory cache of the persistent per-host map.
+	 * Backed by IStorageService.
+	 */
+	private _persistentZoomMap: Record<string, number>;
+
+	/** In-memory only; dropped on restart. */
+	private readonly _ephemeralZoomMap = new Map<string, number>();
+
+	private _windowZoomFactor: number = zoomLevelToZoomFactor(0); // default: zoom level 0 → factor 1.0
+
+	constructor(
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IStorageService private readonly storageService: IStorageService,
+	) {
+		super();
+
+		this._persistentZoomMap = this._readPersistentZoomMap();
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('workbench.browser.pageZoom')) {
+				this._onDidChangeZoom.fire({ host: undefined, isEphemeralChange: false });
+			}
+		}));
+	}
+
+	getEffectiveZoomIndex(host: string | undefined, isEphemeral: boolean): number {
+		if (host !== undefined) {
+			if (isEphemeral) {
+				const ephemeralIndex = this._ephemeralZoomMap.get(host);
+				if (ephemeralIndex !== undefined) {
+					return this._clamp(ephemeralIndex);
+				}
+			} else {
+				const persistentIndex = this._persistentZoomMap[host];
+				if (persistentIndex !== undefined) {
+					return this._clamp(persistentIndex);
+				}
+			}
+		}
+
+		return this._getDefaultZoomIndex();
+	}
+
+	setHostZoomIndex(host: string, zoomIndex: number, isEphemeral: boolean): void {
+		const clamped = this._clamp(zoomIndex);
+		const defaultIndex = this._getDefaultZoomIndex();
+		const matchesDefault = clamped === defaultIndex;
+
+		if (isEphemeral) {
+			if (matchesDefault) {
+				if (!this._ephemeralZoomMap.has(host)) {
+					return;
+				}
+				this._ephemeralZoomMap.delete(host);
+			} else {
+				if (this._ephemeralZoomMap.get(host) === clamped) {
+					return;
+				}
+				this._ephemeralZoomMap.set(host, clamped);
+			}
+			this._onDidChangeZoom.fire({ host, isEphemeralChange: true });
+		} else {
+			let persistentChanged = false;
+			if (matchesDefault) {
+				if (Object.prototype.hasOwnProperty.call(this._persistentZoomMap, host)) {
+					delete this._persistentZoomMap[host];
+					persistentChanged = true;
+				}
+			} else if (this._persistentZoomMap[host] !== clamped) {
+				this._persistentZoomMap[host] = clamped;
+				persistentChanged = true;
+			}
+
+			// Propagate to ephemeral map so ephemeral views immediately reflect the new level.
+			let ephemeralChanged = false;
+			if (matchesDefault) {
+				ephemeralChanged = this._ephemeralZoomMap.delete(host);
+			} else if (this._ephemeralZoomMap.get(host) !== clamped) {
+				this._ephemeralZoomMap.set(host, clamped);
+				ephemeralChanged = true;
+			}
+
+			if (!persistentChanged && !ephemeralChanged) {
+				return;
+			}
+			if (persistentChanged) {
+				this._writePersistentZoomMap();
+			}
+			this._onDidChangeZoom.fire({ host, isEphemeralChange: false });
+		}
+	}
+
+	notifyWindowZoomChanged(windowZoomFactor: number): void {
+		this._windowZoomFactor = windowZoomFactor;
+		const label = this.configurationService.getValue<string>('workbench.browser.pageZoom');
+		if (label === MATCH_WINDOW_ZOOM_LABEL) {
+			this._onDidChangeZoom.fire({ host: undefined, isEphemeralChange: false });
+		}
+	}
+
+	// ---------------------------------------------------------------------------
+	// Helpers
+	// ---------------------------------------------------------------------------
+
+	private _getDefaultZoomIndex(): number {
+		const label = this.configurationService.getValue<string>('workbench.browser.pageZoom');
+		if (label === MATCH_WINDOW_ZOOM_LABEL) {
+			return this._getMatchWindowZoomIndex();
+		}
+		return ZOOM_LABEL_TO_INDEX.get(label) ?? browserZoomDefaultIndex;
+	}
+
+	/**
+	 * Finds the browser zoom index whose factor is closest to the application's current UI zoom
+	 * factor, measuring distance on a log scale (since window zoom levels are powers of 1.2).
+	 */
+	private _getMatchWindowZoomIndex(): number {
+		const windowFactor = this._windowZoomFactor;
+		let bestIndex = browserZoomDefaultIndex;
+		let bestDist = Infinity;
+		for (let i = 0; i < browserZoomFactors.length; i++) {
+			const dist = Math.abs(Math.log(browserZoomFactors[i]) - Math.log(windowFactor));
+			if (dist < bestDist) {
+				bestDist = dist;
+				bestIndex = i;
+			}
+		}
+		return bestIndex;
+	}
+
+	/**
+	 * Reads the persistent per-host zoom map from storage.
+	 * The stored format is a JSON object mapping host strings to zoom indices.
+	 */
+	private _readPersistentZoomMap(): Record<string, number> {
+		const raw = this.storageService.get(BROWSER_ZOOM_PER_HOST_STORAGE_KEY, StorageScope.PROFILE);
+		if (!raw) {
+			return {};
+		}
+		try {
+			const parsed = JSON.parse(raw);
+			if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+				return {};
+			}
+			const result: Record<string, number> = {};
+			for (const [host, index] of Object.entries(parsed)) {
+				if (typeof index === 'number' && index >= 0 && index < browserZoomFactors.length) {
+					result[host] = index;
+				}
+			}
+			return result;
+		} catch {
+			return {};
+		}
+	}
+
+	private _writePersistentZoomMap(): void {
+		const hasEntries = Object.keys(this._persistentZoomMap).length > 0;
+		if (hasEntries) {
+			this.storageService.store(BROWSER_ZOOM_PER_HOST_STORAGE_KEY, JSON.stringify(this._persistentZoomMap), StorageScope.PROFILE, StorageTarget.MACHINE);
+		} else {
+			this.storageService.remove(BROWSER_ZOOM_PER_HOST_STORAGE_KEY, StorageScope.PROFILE);
+		}
+	}
+
+	private _clamp(index: number): number {
+		return Math.max(0, Math.min(Math.trunc(index), browserZoomFactors.length - 1));
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
index a3af6057701..1e60e58fcd7 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
@@ -6,72 +6,49 @@
 import './media/browser.css';
 import { localize } from '../../../../nls.js';
 import { $, addDisposableListener, Dimension, EventType, IDomPosition, registerExternalFocusChecker } from '../../../../base/browser/dom.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
+import { ButtonBar } from '../../../../base/browser/ui/button/button.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { RawContextKey, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IInstantiationService, IConstructorSignature, BrandedService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { AUX_WINDOW_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
 import { IEditorOpenContext } from '../../../common/editor.js';
-import { BrowserEditorInput } from './browserEditorInput.js';
-import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
-import { IBrowserViewModel } from '../../browserView/common/browserView.js';
+import { BrowserEditorInput } from '../common/browserEditorInput.js';
+import { IBrowserEditorViewState, IBrowserViewModel } from '../../browserView/common/browserView.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
-import { IBrowserViewKeyDownEvent, IBrowserViewNavigationEvent, IBrowserViewLoadError, BrowserNewPageLocation } from '../../../../platform/browserView/common/browserView.js';
+import { IBrowserViewKeyDownEvent, IBrowserViewNavigationEvent, IBrowserViewLoadError, IBrowserViewCertificateError, BrowserNewPageLocation } from '../../../../platform/browserView/common/browserView.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { isMacintosh, isLinux } from '../../../../base/common/platform.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { BrowserOverlayManager, BrowserOverlayType, IBrowserOverlayInfo } from './overlayManager.js';
 import { getZoomFactor, onDidChangeZoomLevel } from '../../../../base/browser/browser.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
-import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
-import { IBrowserElementsService } from '../../../services/browserElements/browser/browserElementsService.js';
-import { IChatWidgetService } from '../../chat/browser/chat.js';
 import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
-import { BrowserFindWidget, CONTEXT_BROWSER_FIND_WIDGET_FOCUSED, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE } from './browserFindWidget.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { encodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
-import { IChatRequestVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
-import { IElementAncestor, IElementData, IBrowserTargetLocator, getDisplayNameFromOuterHTML } from '../../../../platform/browserElements/common/browserElements.js';
+import { SiteInfoWidget } from './siteInfoWidget.js';
 import { logBrowserOpen } from '../../../../platform/browserView/common/browserViewTelemetry.js';
 import { URI } from '../../../../base/common/uri.js';
-import { ChatConfiguration } from '../../chat/common/constants.js';
-import { Event } from '../../../../base/common/event.js';
+import { Emitter } from '../../../../base/common/event.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 
 export const CONTEXT_BROWSER_CAN_GO_BACK = new RawContextKey<boolean>('browserCanGoBack', false, localize('browser.canGoBack', "Whether the browser can go back"));
 export const CONTEXT_BROWSER_CAN_GO_FORWARD = new RawContextKey<boolean>('browserCanGoForward', false, localize('browser.canGoForward', "Whether the browser can go forward"));
 export const CONTEXT_BROWSER_FOCUSED = new RawContextKey<boolean>('browserFocused', true, localize('browser.editorFocused', "Whether the browser editor is focused"));
-export const CONTEXT_BROWSER_STORAGE_SCOPE = new RawContextKey<string>('browserStorageScope', '', localize('browser.storageScope', "The storage scope of the current browser view"));
 export const CONTEXT_BROWSER_HAS_URL = new RawContextKey<boolean>('browserHasUrl', false, localize('browser.hasUrl', "Whether the browser has a URL loaded"));
 export const CONTEXT_BROWSER_HAS_ERROR = new RawContextKey<boolean>('browserHasError', false, localize('browser.hasError', "Whether the browser has a load error"));
-export const CONTEXT_BROWSER_DEVTOOLS_OPEN = new RawContextKey<boolean>('browserDevToolsOpen', false, localize('browser.devToolsOpen', "Whether developer tools are open for the current browser view"));
-export const CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE = new RawContextKey<boolean>('browserElementSelectionActive', false, localize('browser.elementSelectionActive', "Whether element selection is currently active"));
-
-// Re-export find widget context keys for use in actions
-export { CONTEXT_BROWSER_FIND_WIDGET_FOCUSED, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE };
-
-const canShareBrowserWithAgentContext = ContextKeyExpr.and(
-	ChatContextKeys.enabled,
-	ContextKeyExpr.has(`config.${ChatConfiguration.AgentEnabled}`),
-	ContextKeyExpr.has(`config.workbench.browser.enableChatTools`),
-)!;
-function watchForAgentSharingContextChanges(contextKeyService: IContextKeyService): Event<unknown> {
-	const agentSharingKeys = new Set(canShareBrowserWithAgentContext.keys());
-	return Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(agentSharingKeys));
-}
 
 /**
  * Get the original implementation of HTMLElement focus (without window auto-focusing)
@@ -79,17 +56,78 @@ function watchForAgentSharingContextChanges(contextKeyService: IContextKeyServic
  */
 const originalHtmlElementFocus = HTMLElement.prototype.focus;
 
+
+/**
+ * Base class for browser editor services that track the model lifecycle.
+ *
+ * Subclasses implement {@link subscribeToModel} which is called whenever a new model is set.
+ * A {@link DisposableStore} is provided that is automatically cleared when the model
+ * changes or the editor input is cleared.
+ */
+export abstract class BrowserEditorContribution extends Disposable {
+	private readonly _modelStore = this._register(new DisposableStore());
+
+	constructor(protected readonly editor: BrowserEditor) {
+		super();
+		this._register(editor.onDidChangeModel(model => {
+			this._modelStore.clear();
+			if (model) {
+				this.subscribeToModel(model, this._modelStore);
+			} else {
+				this.clear();
+			}
+		}));
+	}
+
+	/**
+	 * Called whenever the editor model changes to update state.
+	 */
+	protected subscribeToModel(_model: IBrowserViewModel, _store: DisposableStore): void { }
+
+	/**
+	 * Called when the model is cleared to reset state.
+	 */
+	clear(): void { }
+
+	/**
+	 * Optional widgets to display inside the URL bar (on the right side of the URL input,
+	 * before the actions toolbar).
+	 * Contributions can override this getter to provide widgets.
+	 */
+	get urlBarWidgets(): readonly IBrowserEditorWidgetContribution[] { return []; }
+
+	/**
+	 * Optional toolbar-like elements to insert into the editor root between the navbar and the
+	 * browser container.  Contributions can override this getter to provide elements.
+	 */
+	get toolbarElements(): readonly HTMLElement[] { return []; }
+
+	/**
+	 * Called when the editor is laid out with a new dimension.
+	 */
+	layout(_width: number): void { }
+}
+
+/**
+ * A widget that can be contributed to the browser editor URL bar.
+ */
+export interface IBrowserEditorWidgetContribution {
+	readonly element: HTMLElement;
+	/** Ordering value — lower numbers appear first (left). */
+	readonly order: number;
+}
+
 class BrowserNavigationBar extends Disposable {
 	private readonly _urlInput: HTMLInputElement;
-	private readonly _shareButton: Button;
-	private readonly _shareButtonContainer: HTMLElement;
+	private readonly _urlDisplay: HTMLElement;
+	private readonly _siteInfoWidget: SiteInfoWidget;
+	private readonly _urlBarWidgetsContainer: HTMLElement;
 
 	constructor(
 		editor: BrowserEditor,
 		container: HTMLElement,
 		instantiationService: IInstantiationService,
-		scopedContextKeyService: IContextKeyService,
-		configurationService: IConfigurationService
+		scopedContextKeyService: IContextKeyService
 	) {
 		super();
 
@@ -124,24 +162,32 @@ class BrowserNavigationBar extends Disposable {
 		// URL input container (wraps input + share toggle)
 		const urlContainer = $('.browser-url-container');
 
-		// URL input
+		// Site info widget (inside URL bar, left side, hidden by default)
+		const siteInfoContainer = $('.browser-site-info-slot');
+		this._siteInfoWidget = this._register(instantiationService.createInstance(
+			SiteInfoWidget,
+			siteInfoContainer,
+			editor
+		));
+
+		// URL input (hidden by default; shown when user clicks the display)
 		this._urlInput = $<HTMLInputElement>('input.browser-url-input');
 		this._urlInput.type = 'text';
 		this._urlInput.placeholder = localize('browser.urlPlaceholder', "Enter a URL");
+		this._urlInput.style.display = 'none';
 
-		// Share toggle button (inside URL bar, right side)
-		this._shareButtonContainer = $('.browser-share-toggle-container');
-		this._shareButton = this._register(new Button(this._shareButtonContainer, {
-			supportIcons: true,
-			title: localize('browser.shareWithAgent', "Share with Agent"),
-			small: true,
-			hoverDelegate
-		}));
-		this._shareButton.element.classList.add('browser-share-toggle');
-		this._shareButton.label = '$(agent)';
+		// URL display — shows the URL when not editing; clickable to switch to input
+		const urlInputWrapper = $('.browser-url-input-wrapper');
+		this._urlDisplay = $('span.browser-url-display');
+		this._urlDisplay.tabIndex = 0;
+		urlInputWrapper.appendChild(this._urlDisplay);
+		urlInputWrapper.appendChild(this._urlInput);
 
-		urlContainer.appendChild(this._urlInput);
-		urlContainer.appendChild(this._shareButtonContainer);
+		this._urlBarWidgetsContainer = $('.browser-url-bar-widgets');
+
+		urlContainer.appendChild(siteInfoContainer);
+		urlContainer.appendChild(urlInputWrapper);
+		urlContainer.appendChild(this._urlBarWidgetsContainer);
 
 		// Create actions toolbar (right side) with scoped context
 		const actionsContainer = $('.browser-actions-toolbar');
@@ -180,87 +226,148 @@ class BrowserNavigationBar extends Disposable {
 			this._urlInput.select();
 		}));
 
-		// Share toggle click handler
-		this._register(this._shareButton.onDidClick(() => {
-			editor.toggleShareWithAgent();
+		// Switch back to display mode when the URL bar loses focus
+		this._register(addDisposableListener(this._urlInput, EventType.BLUR, () => {
+			this._showDisplay();
 		}));
-
-		// Show share button only when chat is enabled and browser tools are enabled
-		const updateShareButtonVisibility = () => {
-			this._shareButtonContainer.style.display = scopedContextKeyService.contextMatchesRules(canShareBrowserWithAgentContext) ? '' : 'none';
-		};
-		updateShareButtonVisibility();
-		this._register(watchForAgentSharingContextChanges(scopedContextKeyService)(() => {
-			updateShareButtonVisibility();
+		this._register(addDisposableListener(this._urlDisplay, EventType.FOCUS, () => {
+			this._showInput();
 		}));
 	}
 
-	/**
-	 * Update the share toggle visual state
-	 */
-	setShared(isShared: boolean): void {
-		this._shareButton.checked = isShared;
-		this._shareButton.label = isShared
-			? localize('browser.sharingWithAgent', "Sharing with Agent") + ' $(agent)'
-			: '$(agent)';
-		this._shareButton.setTitle(isShared
-			? localize('browser.unshareWithAgent', "Stop Sharing with Agent")
-			: localize('browser.shareWithAgent', "Share with Agent"));
-	}
-
 	/**
 	 * Update the navigation bar state from a navigation event
 	 */
 	updateFromNavigationEvent(event: IBrowserViewNavigationEvent): void {
-		// URL input is updated, action enablement is handled by context keys
 		this._urlInput.value = event.url;
+		this._updateDisplay();
 	}
 
 	/**
 	 * Focus the URL input and select all text
 	 */
 	focusUrlInput(): void {
+		this._showInput();
+	}
+
+	/**
+	 * Show or hide the site info indicator
+	 */
+	setCertificateError(certError: IBrowserViewCertificateError | undefined): void {
+		this._siteInfoWidget.setCertificateError(certError);
+		this._urlInput.classList.toggle('cert-error', !!certError);
+		this._updateDisplay();
+	}
+
+	/**
+	 * Switch to input-editing mode: hide display, show and focus input.
+	 */
+	private _showInput(): void {
+		this._urlDisplay.style.display = 'none';
+		this._urlInput.style.display = '';
 		this._urlInput.select();
 		this._urlInput.focus();
 	}
 
+	/**
+	 * Add widget elements inside the URL bar, sorted by order.
+	 */
+	addUrlBarWidgets(widgets: readonly IBrowserEditorWidgetContribution[]): void {
+		const sorted = widgets.slice().sort((a, b) => a.order - b.order);
+		for (const widget of sorted) {
+			this._urlBarWidgetsContainer.appendChild(widget.element);
+		}
+	}
+
+	/**
+	 * Switch to display mode: hide the input and show the styled display.
+	 */
+	private _showDisplay(): void {
+		this._urlInput.style.display = 'none';
+		this._urlDisplay.style.display = '';
+		this._updateDisplay();
+	}
+
+	/**
+	 * Rebuild the display element's content.  When there is a cert error
+	 * and the URL starts with "https://", the protocol is rendered with
+	 * a red strikethrough; otherwise the full URL is shown plainly.
+	 */
+	private _updateDisplay(): void {
+		const url = this._urlInput.value;
+		const hasCertError = this._urlInput.classList.contains('cert-error');
+		const httpsPrefix = 'https:';
+
+		// Clear previous content
+		this._urlDisplay.textContent = '';
+		this._urlDisplay.classList.toggle('placeholder', !url);
+
+		if (hasCertError && url.startsWith(httpsPrefix)) {
+			const protocol = document.createElement('span');
+			protocol.className = 'browser-url-display-protocol-bad';
+			protocol.textContent = httpsPrefix;
+			this._urlDisplay.appendChild(protocol);
+
+			const rest = document.createElement('span');
+			rest.textContent = url.slice(httpsPrefix.length);
+			this._urlDisplay.appendChild(rest);
+		} else {
+			this._urlDisplay.textContent = url || localize('browser.urlPlaceholder', "Enter a URL");
+		}
+	}
+
 	clear(): void {
 		this._urlInput.value = '';
+		this._siteInfoWidget.setCertificateError(undefined);
+		this._updateDisplay();
 	}
 }
 
 export class BrowserEditor extends EditorPane {
-	static readonly ID = 'workbench.editor.browser';
+
+	// -- Contribution registry --------------------------------------------
+
+	private static readonly _contributions: IConstructorSignature<BrowserEditorContribution, [BrowserEditor]>[] = [];
+	static registerContribution<Services extends BrandedService[]>(ctor: { new(editor: BrowserEditor, ...services: Services): BrowserEditorContribution }): void {
+		BrowserEditor._contributions.push(ctor as IConstructorSignature<BrowserEditorContribution, [BrowserEditor]>);
+	}
+
+	private readonly _contributionInstances = new Map<IConstructorSignature<BrowserEditorContribution, [BrowserEditor]>, BrowserEditorContribution>();
+	getContribution<T extends BrowserEditorContribution, Services extends BrandedService[]>(ctor: { new(editor: BrowserEditor, ...services: Services): T }): T | undefined {
+		return this._contributionInstances.get(ctor as IConstructorSignature<BrowserEditorContribution, [BrowserEditor]>) as T | undefined;
+	}
+
+	// -- Model lifecycle ------------------------------------------------
+
+	private _model: IBrowserViewModel | undefined;
+	get model(): IBrowserViewModel | undefined { return this._model; }
+	private readonly _onDidChangeModel = this._register(new Emitter<IBrowserViewModel | undefined>());
+	readonly onDidChangeModel = this._onDidChangeModel.event;
+
+	// -- State ----------------------------------------------------------
 
 	private _overlayVisible = false;
 	private _editorVisible = false;
-	private _currentKeyDownEvent: IBrowserViewKeyDownEvent | undefined;
 
 	private _navigationBar!: BrowserNavigationBar;
 	private _browserContainerWrapper!: HTMLElement;
 	private _browserContainer!: HTMLElement;
+	get browserContainer(): HTMLElement { return this._browserContainer; }
 	private _placeholderScreenshot!: HTMLElement;
 	private _overlayPauseContainer!: HTMLElement;
 	private _overlayPauseHeading!: HTMLElement;
 	private _overlayPauseDetail!: HTMLElement;
 	private _errorContainer!: HTMLElement;
 	private _welcomeContainer!: HTMLElement;
-	private _findWidgetContainer!: HTMLElement;
-	private _findWidget!: Lazy<BrowserFindWidget>;
 	private _canGoBackContext!: IContextKey<boolean>;
 	private _canGoForwardContext!: IContextKey<boolean>;
-	private _storageScopeContext!: IContextKey<string>;
 	private _hasUrlContext!: IContextKey<boolean>;
 	private _hasErrorContext!: IContextKey<boolean>;
-	private _devToolsOpenContext!: IContextKey<boolean>;
-	private _elementSelectionActiveContext!: IContextKey<boolean>;
 
-	private _model: IBrowserViewModel | undefined;
 	private readonly _inputDisposables = this._register(new DisposableStore());
 	private overlayManager: BrowserOverlayManager | undefined;
-	private _elementSelectionCts: CancellationTokenSource | undefined;
-	private _consoleSessionCts: CancellationTokenSource | undefined;
 	private _screenshotTimeout: ReturnType<typeof setTimeout> | undefined;
+	private readonly _certActionButton = this._register(new MutableDisposable<ButtonBar>());
 
 	constructor(
 		group: IEditorGroup,
@@ -272,12 +379,9 @@ export class BrowserEditor extends EditorPane {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IBrowserElementsService private readonly browserElementsService: IBrowserElementsService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ILayoutService private readonly layoutService: ILayoutService
+		@ILayoutService private readonly layoutService: ILayoutService,
 	) {
-		super(BrowserEditor.ID, group, telemetryService, themeService, storageService);
+		super(BrowserEditorInput.EDITOR_ID, group, telemetryService, themeService, storageService);
 	}
 
 	protected override createEditor(parent: HTMLElement): void {
@@ -290,43 +394,48 @@ export class BrowserEditor extends EditorPane {
 		// Bind navigation capability context keys
 		this._canGoBackContext = CONTEXT_BROWSER_CAN_GO_BACK.bindTo(contextKeyService);
 		this._canGoForwardContext = CONTEXT_BROWSER_CAN_GO_FORWARD.bindTo(contextKeyService);
-		this._storageScopeContext = CONTEXT_BROWSER_STORAGE_SCOPE.bindTo(contextKeyService);
 		this._hasUrlContext = CONTEXT_BROWSER_HAS_URL.bindTo(contextKeyService);
 		this._hasErrorContext = CONTEXT_BROWSER_HAS_ERROR.bindTo(contextKeyService);
-		this._devToolsOpenContext = CONTEXT_BROWSER_DEVTOOLS_OPEN.bindTo(contextKeyService);
-		this._elementSelectionActiveContext = CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE.bindTo(contextKeyService);
 
 		// Currently this is always true since it is scoped to the editor container
 		CONTEXT_BROWSER_FOCUSED.bindTo(contextKeyService);
 
+		// Create a scoped instantiation service so contributions get the scoped context key service
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(
+			new ServiceCollection([IContextKeyService, contextKeyService])
+		));
+
+		// Instantiate all registered contributions
+		for (const ctor of BrowserEditor._contributions) {
+			const instance = this._register(scopedInstantiationService.createInstance(ctor, this));
+			this._contributionInstances.set(ctor, instance);
+		}
+
 		// Create root container
 		const root = $('.browser-root');
 		parent.appendChild(root);
 
-		// Create toolbar with navigation buttons and URL input
-		const toolbar = $('.browser-toolbar');
+		// Create navbar with navigation buttons and URL input
+		const navbar = $('.browser-navbar');
 
 		// Create navigation bar widget with scoped context
-		this._navigationBar = this._register(new BrowserNavigationBar(this, toolbar, this.instantiationService, contextKeyService, this.configurationService));
+		this._navigationBar = this._register(new BrowserNavigationBar(this, navbar, this.instantiationService, contextKeyService));
 
-		root.appendChild(toolbar);
+		// Inject URL bar widgets from contributions
+		const allWidgets: IBrowserEditorWidgetContribution[] = [];
+		for (const contribution of this._contributionInstances.values()) {
+			allWidgets.push(...contribution.urlBarWidgets);
+		}
+		this._navigationBar.addUrlBarWidgets(allWidgets);
 
-		// Create find widget container (between toolbar and browser container)
-		this._findWidgetContainer = $('.browser-find-widget-wrapper');
-		root.appendChild(this._findWidgetContainer);
+		root.appendChild(navbar);
 
-		// Create find widget (lazy initialization)
-		this._findWidget = new Lazy(() => {
-			const findWidget = this.instantiationService.createInstance(
-				BrowserFindWidget,
-				this._findWidgetContainer
-			);
-			if (this._model) {
-				findWidget.setModel(this._model);
+		// Collect toolbar elements from contributions (e.g. find widget container)
+		for (const contribution of this._contributionInstances.values()) {
+			for (const element of contribution.toolbarElements) {
+				root.appendChild(element);
 			}
-			return findWidget;
-		});
-		this._register(toDisposable(() => this._findWidget.rawValue?.dispose()));
+		}
 
 		// Create browser container wrapper (flex item that fills remaining space)
 		this._browserContainerWrapper = $('.browser-container-wrapper');
@@ -369,10 +478,16 @@ export class BrowserEditor extends EditorPane {
 			// When the browser container gets focus, make sure the browser view also gets focused.
 			// But only if focus was already in the workbench (and not e.g. clicking back into the workbench from the browser view).
 			if (event.relatedTarget && this._model && this.shouldShowView) {
-				void this._model.focus();
+				this.requestFocus();
 			}
 		}));
 
+		this._register(addDisposableListener(this._browserContainer, EventType.BLUR, () => {
+			// If the container becomes blurred, cancel any scheduled focus call.
+			// This can happen when e.g. a menu closes and focus shifts back to the browser, then immediately focuses another element.
+			this.cancelFocus();
+		}));
+
 		// Register external focus checker so that cross-window focus logic knows when
 		// this browser view has focus (since it's outside the normal DOM tree).
 		// Include window info so that UI like dialogs appear in the correct window.
@@ -382,6 +497,35 @@ export class BrowserEditor extends EditorPane {
 		})));
 	}
 
+	override focus(): void {
+		if (this._model?.url && !this._model.error) {
+			this.requestFocus();
+		} else {
+			this.focusUrlInput();
+		}
+	}
+
+	private _focusTimeout: ReturnType<typeof setTimeout> | undefined;
+	private requestFocus(): void {
+		this.ensureBrowserFocus();
+		if (this._focusTimeout) {
+			return;
+		}
+		this._focusTimeout = setTimeout(() => {
+			this._focusTimeout = undefined;
+			if (this._model) {
+				void this._model.focus();
+			}
+		}, 0);
+	}
+
+	private cancelFocus(): void {
+		if (this._focusTimeout) {
+			clearTimeout(this._focusTimeout);
+			this._focusTimeout = undefined;
+		}
+	}
+
 	override async setInput(input: BrowserEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
 		if (token.isCancellationRequested) {
@@ -392,52 +536,24 @@ export class BrowserEditor extends EditorPane {
 
 		// Resolve the browser view model from the input
 		const model = await input.resolve();
-		this._model = model;
+
 		if (token.isCancellationRequested || this.input !== input) {
 			return;
 		}
 
-		this._storageScopeContext.set(this._model.storageScope);
-		this._devToolsOpenContext.set(this._model.isDevToolsOpen);
-		this._updateSharingState(true);
-
-		// Update find widget with new model
-		this._findWidget.rawValue?.setModel(this._model);
-
-		// Clean up on input disposal
-		this._inputDisposables.add(input.onWillDispose(() => {
-			this._model = undefined;
-		}));
-
-		// Listen for sharing state changes on the model
-		this._inputDisposables.add(this._model.onDidChangeSharedWithAgent(() => {
-			this._updateSharingState(false);
-		}));
-		this._inputDisposables.add(watchForAgentSharingContextChanges(this.contextKeyService)(() => {
-			this._updateSharingState(false);
-		}));
+		this._model = model;
+		this._onDidChangeModel.fire(model);
 
 		// Initialize UI state and context keys from model
 		this.updateNavigationState({
 			url: this._model.url,
 			title: this._model.title,
 			canGoBack: this._model.canGoBack,
-			canGoForward: this._model.canGoForward
+			canGoForward: this._model.canGoForward,
+			certificateError: this._model.certificateError
 		});
 		this.setBackgroundImage(this._model.screenshot);
 
-		if (!options?.preserveFocus) {
-			setTimeout(() => {
-				if (this._model === model) {
-					if (this._model.url) {
-						this._browserContainer.focus();
-					} else {
-						this.focusUrlInput();
-					}
-				}
-			}, 0);
-		}
-
 		// Start / stop screenshots when the model visibility changes
 		this._inputDisposables.add(this._model.onDidChangeVisibility(() => this.doScreenshot()));
 
@@ -452,13 +568,6 @@ export class BrowserEditor extends EditorPane {
 
 			// Update navigation bar and context keys from model
 			this.updateNavigationState(navEvent);
-
-			// Ensure a console session is active while a page URL is loaded.
-			if (navEvent.url) {
-				this.startConsoleSession();
-			} else {
-				this.stopConsoleSession();
-			}
 		}));
 
 		this._inputDisposables.add(this._model.onDidChangeLoadingState(() => {
@@ -474,11 +583,7 @@ export class BrowserEditor extends EditorPane {
 			}
 		}));
 
-		this._inputDisposables.add(this._model.onDidChangeDevToolsState(e => {
-			this._devToolsOpenContext.set(e.isDevToolsOpen);
-		}));
-
-		this._inputDisposables.add(this._model.onDidRequestNewPage(({ resource, location, position }) => {
+		this._inputDisposables.add(this._model.onDidRequestNewPage(({ resource, url, location, position }) => {
 			logBrowserOpen(this.telemetryService, (() => {
 				switch (location) {
 					case BrowserNewPageLocation.Background: return 'browserLinkBackground';
@@ -488,15 +593,17 @@ export class BrowserEditor extends EditorPane {
 			})());
 
 			const targetGroup = location === BrowserNewPageLocation.NewWindow ? AUX_WINDOW_GROUP : this.group;
+			const viewState: IBrowserEditorViewState = { url };
 			this.editorService.openEditor({
-				resource: URI.from(resource),
+				resource: URI.revive(resource),
 				options: {
 					pinned: true,
 					inactive: location === BrowserNewPageLocation.Background,
 					auxiliary: {
 						bounds: position,
 						compact: true
-					}
+					},
+					viewState
 				}
 			}, targetGroup);
 		}));
@@ -505,7 +612,7 @@ export class BrowserEditor extends EditorPane {
 			this.checkOverlays();
 		}));
 
-		// Listen for zoom level changes and update browser view zoom factor
+		// Listen for workbench zoom level changes and update browser view placeholder screenshot's zoom factor
 		this._inputDisposables.add(onDidChangeZoomLevel(targetWindowId => {
 			if (targetWindowId === this.window.vscodeWindowId) {
 				// Update CSS variable for size calculations
@@ -517,11 +624,6 @@ export class BrowserEditor extends EditorPane {
 		this.layout();
 		this.updateVisibility();
 		this.doScreenshot();
-
-		// Start console log capture session if a URL is loaded
-		if (this._model.url) {
-			this.startConsoleSession();
-		}
 	}
 
 	protected override setEditorVisible(visible: boolean): void {
@@ -532,7 +634,7 @@ export class BrowserEditor extends EditorPane {
 	/**
 	 * Make the browser container the active element without moving focus from the browser view.
 	 */
-	private ensureBrowserFocus(): void {
+	ensureBrowserFocus(): void {
 		originalHtmlElementFocus.call(this._browserContainer);
 	}
 
@@ -567,7 +669,7 @@ export class BrowserEditor extends EditorPane {
 					this._browserContainer.ownerDocument.activeElement === this._browserContainer
 				) {
 					// If the editor is focused, ensure the browser view also gets focus
-					void this._model.focus();
+					this.requestFocus();
 				}
 			} else {
 				this.doScreenshot();
@@ -618,20 +720,36 @@ export class BrowserEditor extends EditorPane {
 
 		const error: IBrowserViewLoadError | undefined = this._model.error;
 		this._hasErrorContext.set(!!error);
+
+		this._navigationBar.setCertificateError(
+			this._model.certificateError ?? error?.certificateError
+		);
+
 		if (error) {
 			// Update error content
+			this._certActionButton.clear();
 
 			while (this._errorContainer.firstChild) {
 				this._errorContainer.removeChild(this._errorContainer.firstChild);
 			}
 
 			const errorContent = $('.browser-error-content');
+			const isCertError = !!error.certificateError;
+
+			const errorIcon = $('.browser-error-icon');
+			errorIcon.classList.toggle('cert-error', isCertError);
+			errorIcon.appendChild(renderIcon(isCertError ? Codicon.workspaceUntrusted : Codicon.globe));
+
 			const errorTitle = $('.browser-error-title');
-			errorTitle.textContent = localize('browser.loadErrorLabel', "Failed to Load Page");
+			errorTitle.textContent = isCertError
+				? localize('browser.certErrorLabel', "Certificate Error")
+				: localize('browser.loadErrorLabel', "Failed to Load Page");
 
 			const errorMessage = $('.browser-error-detail');
 			const errorText = $('span');
-			errorText.textContent = `${error.errorDescription} (${error.errorCode})`;
+			errorText.textContent = isCertError
+				? localize('browser.certErrorDescription', "This site's security certificate could not be verified.")
+				: `${error.errorDescription} (${error.errorCode})`;
 			errorMessage.appendChild(errorText);
 
 			const errorUrl = $('.browser-error-detail');
@@ -643,9 +761,81 @@ export class BrowserEditor extends EditorPane {
 			errorUrl.appendChild(document.createTextNode(' '));
 			errorUrl.appendChild(urlValue);
 
+			errorContent.appendChild(errorIcon);
 			errorContent.appendChild(errorTitle);
 			errorContent.appendChild(errorMessage);
+
+			// Show cert error name below description, above URL
+			if (error.certificateError) {
+				const extraWarning = $('b.browser-error-detail');
+				extraWarning.textContent = localize('browser.certErrorExtraWarning', " Your connection is not private.");
+				errorMessage.appendChild(extraWarning);
+			}
+
 			errorContent.appendChild(errorUrl);
+
+			// Show certificate details table and actions
+			if (error.certificateError) {
+				const certError = error.certificateError;
+
+				const certDetailsTable = $('.browser-cert-details-table');
+
+				const heading = $('.browser-cert-details-heading');
+				heading.textContent = localize('browser.certDetailsHeading', "Certificate Details");
+				certDetailsTable.appendChild(heading);
+
+				const addRow = (label: string, value: string) => {
+					const row = $('.browser-cert-details-row');
+					const labelEl = $('.browser-cert-details-label');
+					labelEl.textContent = label;
+					const valueEl = $('.browser-cert-details-value');
+					valueEl.textContent = value;
+					row.appendChild(labelEl);
+					row.appendChild(valueEl);
+					certDetailsTable.appendChild(row);
+				};
+
+				addRow(localize('browser.certError', "Error"), certError.error);
+				addRow(localize('browser.certIssuer', "Issuer"), certError.issuerName);
+				addRow(localize('browser.certSubject', "Subject"), certError.subjectName);
+
+				const formatDate = (epoch: number) => new Date(epoch * 1000).toLocaleDateString();
+				addRow(
+					localize('browser.certValid', "Valid"),
+					`${formatDate(certError.validStart)} - ${formatDate(certError.validExpiry)}`
+				);
+
+				addRow(localize('browser.certFingerprint', "Fingerprint"), certError.fingerprint);
+
+				errorContent.appendChild(certDetailsTable);
+
+				const actionContainer = $('.browser-cert-action');
+				actionContainer.classList.toggle('reverse', isMacintosh || isLinux);
+				const canGoBack = this._model.canGoBack;
+				const buttonBar = new ButtonBar(actionContainer);
+				this._certActionButton.value = buttonBar;
+
+				const primaryButton = buttonBar.addButton({ ...defaultButtonStyles });
+				primaryButton.label = canGoBack
+					? localize('browser.certGoBack', "Go Back")
+					: localize('browser.certCloseTab', "Close Tab");
+				primaryButton.onDidClick(() => {
+					if (canGoBack) {
+						this.goBack();
+					} else {
+						this.group?.closeEditor(this.input);
+					}
+				});
+
+				const secondaryButton = buttonBar.addButton({ ...defaultButtonStyles, secondary: true });
+				secondaryButton.label = localize('browser.certProceed', "Proceed anyway (unsafe)");
+				secondaryButton.onDidClick(() => {
+					this._model?.trustCertificate(certError.host, certError.fingerprint);
+				});
+
+				errorContent.appendChild(actionContainer);
+			}
+
 			this._errorContainer.appendChild(errorContent);
 
 			this.setBackgroundImage(undefined);
@@ -660,20 +850,16 @@ export class BrowserEditor extends EditorPane {
 		return this._model?.url;
 	}
 
-	private _updateSharingState(isInitialState: boolean): void {
-		const sharingEnabled = this.contextKeyService.contextMatchesRules(canShareBrowserWithAgentContext);
-		const isShared = sharingEnabled && !!this._model && this._model.sharedWithAgent;
-
-		this._browserContainer.classList.toggle('animate', !isInitialState);
-		this._browserContainer.classList.toggle('shared', isShared);
-		this._navigationBar.setShared(isShared);
+	getCertificateError(): IBrowserViewCertificateError | undefined {
+		return this._model?.certificateError;
 	}
 
-	toggleShareWithAgent(): void {
-		if (!this._model) {
-			return;
-		}
-		this._model.setSharedWithAgent(!this._model.sharedWithAgent);
+	/**
+	 * Revoke trust for the certificate and close this editor tab.
+	 */
+	revokeAndClose(certError: IBrowserViewCertificateError): void {
+		// This method automatically closes the browser view.
+		this._model?.untrustCertificate(certError.host, certError.fingerprint);
 	}
 
 	async navigateToUrl(url: string): Promise<void> {
@@ -717,349 +903,13 @@ export class BrowserEditor extends EditorPane {
 		return this._model?.clearStorage();
 	}
 
-	/**
-	 * Show the find widget, optionally pre-populated with selected text from the browser view
-	 */
-	async showFind(): Promise<void> {
-		// Get selected text from the browser view to pre-populate the search box.
-		const selectedText = (await this._model?.getSelectedText())?.trim();
-
-		// Only use the selected text if it doesn't contain newlines (single line selection)
-		const textToReveal = selectedText && !/[\r\n]/.test(selectedText) ? selectedText : undefined;
-		this._findWidget.value.reveal(textToReveal);
-		this._findWidget.value.layout(this._findWidgetContainer.clientWidth);
-	}
-
-	/**
-	 * Hide the find widget
-	 */
-	hideFind(): void {
-		this._findWidget.rawValue?.hide();
-	}
-
-	/**
-	 * Find the next match
-	 */
-	findNext(): void {
-		this._findWidget.rawValue?.find(false);
-	}
-
-	/**
-	 * Find the previous match
-	 */
-	findPrevious(): void {
-		this._findWidget.rawValue?.find(true);
-	}
-
-	/**
-	 * Start element selection in the browser view, wait for a user selection, and add it to chat.
-	 */
-	async addElementToChat(): Promise<void> {
-		// If selection is already active, cancel it
-		if (this._elementSelectionCts) {
-			this._elementSelectionCts.dispose(true);
-			this._elementSelectionCts = undefined;
-			this._elementSelectionActiveContext.set(false);
-			return;
-		}
-
-		// Start new selection
-		const cts = new CancellationTokenSource();
-		this._elementSelectionCts = cts;
-		this._elementSelectionActiveContext.set(true);
-
-		type IntegratedBrowserAddElementToChatStartEvent = {};
-
-		type IntegratedBrowserAddElementToChatStartClassification = {
-			owner: 'jruales';
-			comment: 'The user initiated an Add Element to Chat action in Integrated Browser.';
-		};
-
-		this.telemetryService.publicLog2<IntegratedBrowserAddElementToChatStartEvent, IntegratedBrowserAddElementToChatStartClassification>('integratedBrowser.addElementToChat.start', {});
-
-		try {
-			// Get the resource URI for this editor
-			const resourceUri = this.input?.resource;
-			if (!resourceUri) {
-				throw new Error('No resource URI found');
-			}
-
-			// Make the browser the focused view
-			this.ensureBrowserFocus();
-
-			// Create a locator - for integrated browser, use the URI scheme to identify
-			// Browser view URIs have a special scheme we can match against
-			const locator: IBrowserTargetLocator = { browserViewId: BrowserViewUri.getId(this.input.resource) };
-
-			// Start debug session for integrated browser
-			await this.browserElementsService.startDebugSession(cts.token, locator);
-
-			// Get the browser container bounds
-			const { width, height } = this._browserContainer.getBoundingClientRect();
-
-			// Get element data from user selection
-			const elementData = await this.browserElementsService.getElementData({ x: 0, y: 0, width, height }, cts.token, locator);
-			if (!elementData) {
-				throw new Error('Element data not found');
-			}
-
-			const bounds = elementData.bounds;
-			const toAttach: IChatRequestVariableEntry[] = [];
-
-			// Prepare HTML/CSS context
-			const displayName = getDisplayNameFromOuterHTML(elementData.outerHTML);
-			const attachCss = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachCSS');
-			const value = this.createElementContextValue(elementData, displayName, attachCss);
-
-			toAttach.push({
-				id: 'element-' + Date.now(),
-				name: displayName,
-				fullName: displayName,
-				value: value,
-				modelDescription: attachCss
-					? 'Structured browser element context with HTML path, attributes, and computed styles.'
-					: 'Structured browser element context with HTML path and attributes.',
-				kind: 'element',
-				icon: ThemeIcon.fromId(Codicon.layout.id),
-				ancestors: elementData.ancestors,
-				attributes: elementData.attributes,
-				computedStyles: attachCss ? elementData.computedStyles : undefined,
-				dimensions: elementData.dimensions,
-				innerText: elementData.innerText,
-			});
-
-			// Attach screenshot if enabled
-			const attachImages = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachImages');
-			if (attachImages && this._model) {
-				const screenshotBuffer = await this._model.captureScreenshot({
-					quality: 90,
-					rect: bounds
-				});
-
-				toAttach.push({
-					id: 'element-screenshot-' + Date.now(),
-					name: 'Element Screenshot',
-					fullName: 'Element Screenshot',
-					kind: 'image',
-					value: screenshotBuffer.buffer
-				});
-			}
-
-			// Attach to chat widget
-			const widget = await this.chatWidgetService.revealWidget() ?? this.chatWidgetService.lastFocusedWidget;
-			widget?.attachmentModel?.addContext(...toAttach);
-
-			type IntegratedBrowserAddElementToChatAddedEvent = {
-				attachCss: boolean;
-				attachImages: boolean;
-			};
-
-			type IntegratedBrowserAddElementToChatAddedClassification = {
-				attachCss: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachCSS was enabled.' };
-				attachImages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachImages was enabled.' };
-				owner: 'jruales';
-				comment: 'An element was successfully added to chat from Integrated Browser.';
-			};
-
-			this.telemetryService.publicLog2<IntegratedBrowserAddElementToChatAddedEvent, IntegratedBrowserAddElementToChatAddedClassification>('integratedBrowser.addElementToChat.added', {
-				attachCss,
-				attachImages
-			});
-
-		} catch (error) {
-			if (!cts.token.isCancellationRequested) {
-				this.logService.error('BrowserEditor.addElementToChat: Failed to select element', error);
-			}
-		} finally {
-			cts.dispose();
-			if (this._elementSelectionCts === cts) {
-				this._elementSelectionCts = undefined;
-				this._elementSelectionActiveContext.set(false);
-			}
-		}
-	}
-
-	/**
-	 * Grab the current console logs from the active console session and attach them to chat.
-	 */
-	async addConsoleLogsToChat(): Promise<void> {
-		const resourceUri = this.input?.resource;
-		if (!resourceUri) {
-			return;
-		}
-
-		const locator: IBrowserTargetLocator = { browserViewId: BrowserViewUri.getId(resourceUri) };
-
-		try {
-			const logs = await this.browserElementsService.getConsoleLogs(locator);
-			if (!logs) {
-				return;
-			}
-
-			const toAttach: IChatRequestVariableEntry[] = [];
-			toAttach.push({
-				id: 'console-logs-' + Date.now(),
-				name: localize('consoleLogs', 'Console Logs'),
-				fullName: localize('consoleLogs', 'Console Logs'),
-				value: logs,
-				modelDescription: 'Console logs captured from Integrated Browser.',
-				kind: 'element',
-				icon: ThemeIcon.fromId(Codicon.terminal.id),
-			});
-
-			const widget = await this.chatWidgetService.revealWidget() ?? this.chatWidgetService.lastFocusedWidget;
-			widget?.attachmentModel?.addContext(...toAttach);
-		} catch (error) {
-			this.logService.error('BrowserEditor.addConsoleLogsToChat: Failed to get console logs', error);
-		}
-	}
-
-	/**
-	 * Start a console session to capture logs from the browser view.
-	 */
-	private startConsoleSession(): void {
-		// Don't restart if already running
-		if (this._consoleSessionCts) {
-			return;
-		}
-
-		const resourceUri = this.input?.resource;
-		if (!resourceUri || !this._model?.url) {
-			return;
-		}
-
-		const cts = new CancellationTokenSource();
-		this._consoleSessionCts = cts;
-		const locator: IBrowserTargetLocator = { browserViewId: BrowserViewUri.getId(resourceUri) };
-
-		this.browserElementsService.startConsoleSession(cts.token, locator).catch(error => {
-			if (!cts.token.isCancellationRequested) {
-				this.logService.error('BrowserEditor: Failed to start console session', error);
-			}
-		});
-	}
-
-	/**
-	 * Stop the active console session.
-	 */
-	private stopConsoleSession(): void {
-		if (this._consoleSessionCts) {
-			this._consoleSessionCts.dispose(true);
-			this._consoleSessionCts = undefined;
-		}
-	}
-
-	private createElementContextValue(elementData: IElementData, displayName: string, attachCss: boolean): string {
-		const sections: string[] = [];
-		sections.push('Attached Element Context from Integrated Browser');
-		sections.push(`Element: ${displayName}`);
-
-		const htmlPath = this.formatElementPath(elementData.ancestors);
-		if (htmlPath) {
-			sections.push(`HTML Path:\n${htmlPath}`);
-		}
-
-		const attributeTable = this.formatElementMap(elementData.attributes);
-		if (attributeTable) {
-			sections.push(`Attributes:\n${attributeTable}`);
-		}
-
-		if (attachCss) {
-			const computedStyleTable = this.formatElementMap(elementData.computedStyles);
-			if (computedStyleTable) {
-				sections.push(`Computed Styles:\n${computedStyleTable}`);
-			}
-		}
-
-		if (elementData.dimensions) {
-			const { top, left, width, height } = elementData.dimensions;
-			sections.push(
-				`Dimensions:\n- top: ${Math.round(top)}px\n- left: ${Math.round(left)}px\n- width: ${Math.round(width)}px\n- height: ${Math.round(height)}px`
-			);
-		}
-
-		const innerText = elementData.innerText?.trim();
-		if (innerText) {
-			sections.push(`Inner Text:\n\`\`\`text\n${innerText}\n\`\`\``);
-		}
-
-		sections.push(`Outer HTML:\n\`\`\`html\n${elementData.outerHTML}\n\`\`\``);
-
-		if (attachCss) {
-			sections.push(`Full Computed CSS:\n\`\`\`css\n${elementData.computedStyle}\n\`\`\``);
-		}
-
-		return sections.join('\n\n');
-	}
-
-	private formatElementPath(ancestors: readonly IElementAncestor[] | undefined): string | undefined {
-		if (!ancestors || ancestors.length === 0) {
-			return undefined;
-		}
-
-		return ancestors
-			.map(ancestor => {
-				const classes = ancestor.classNames?.length ? `.${ancestor.classNames.join('.')}` : '';
-				const id = ancestor.id ? `#${ancestor.id}` : '';
-				return `${ancestor.tagName}${id}${classes}`;
-			})
-			.join(' > ');
-	}
-
-	private formatElementMap(entries: Readonly<Record<string, string>> | undefined): string | undefined {
-		if (!entries || Object.keys(entries).length === 0) {
-			return undefined;
-		}
-
-		const normalizedEntries = new Map(Object.entries(entries));
-		const lines: string[] = [];
-
-		const marginShorthand = this.createBoxShorthand(normalizedEntries, 'margin');
-		if (marginShorthand) {
-			lines.push(`- margin: ${marginShorthand}`);
-		}
-
-		const paddingShorthand = this.createBoxShorthand(normalizedEntries, 'padding');
-		if (paddingShorthand) {
-			lines.push(`- padding: ${paddingShorthand}`);
-		}
-
-		for (const [name, value] of Array.from(normalizedEntries.entries()).sort(([a], [b]) => a.localeCompare(b))) {
-			lines.push(`- ${name}: ${value}`);
-		}
-
-		return lines.join('\n');
-	}
-
-	private createBoxShorthand(entries: Map<string, string>, propertyName: 'margin' | 'padding'): string | undefined {
-		const topKey = `${propertyName}-top`;
-		const rightKey = `${propertyName}-right`;
-		const bottomKey = `${propertyName}-bottom`;
-		const leftKey = `${propertyName}-left`;
-
-		const top = entries.get(topKey);
-		const right = entries.get(rightKey);
-		const bottom = entries.get(bottomKey);
-		const left = entries.get(leftKey);
-
-		if (top === undefined || right === undefined || bottom === undefined || left === undefined) {
-			return undefined;
-		}
-
-		entries.delete(topKey);
-		entries.delete(rightKey);
-		entries.delete(bottomKey);
-		entries.delete(leftKey);
-
-		return `${top} ${right} ${bottom} ${left}`;
-	}
-
 	/**
 	 * Update navigation state and context keys
 	 */
 	private updateNavigationState(event: IBrowserViewNavigationEvent): void {
 		// Update navigation bar UI
 		this._navigationBar.updateFromNavigationEvent(event);
+		this._navigationBar.setCertificateError(event.certificateError);
 
 		// Update context keys for command enablement
 		this._canGoBackContext.set(event.canGoBack);
@@ -1137,36 +987,22 @@ export class BrowserEditor extends EditorPane {
 		}
 	}
 
-	forwardCurrentEvent(): boolean {
-		if (this._currentKeyDownEvent && this._model) {
-			void this._model.dispatchKeyEvent(this._currentKeyDownEvent);
-			return true;
-		}
-		return false;
-	}
-
 	private async handleKeyEventFromBrowserView(keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
-		this._currentKeyDownEvent = keyEvent;
-
 		try {
 			const syntheticEvent = new KeyboardEvent('keydown', keyEvent);
 			const standardEvent = new StandardKeyboardEvent(syntheticEvent);
 
-			const handled = this.keybindingService.dispatchEvent(standardEvent, this._browserContainer);
-			if (!handled) {
-				this.forwardCurrentEvent();
-			}
+			this.keybindingService.dispatchEvent(standardEvent, this._browserContainer);
 		} catch (error) {
 			this.logService.error('BrowserEditor.handleKeyEventFromBrowserView: Error dispatching key event', error);
-		} finally {
-			this._currentKeyDownEvent = undefined;
 		}
 	}
 
 	override layout(dimension?: Dimension, _position?: IDomPosition): void {
-		// Layout find widget if it exists
-		if (dimension && this._findWidget.rawValue) {
-			this._findWidget.rawValue.layout(dimension.width);
+		if (dimension) {
+			for (const contribution of this._contributionInstances.values()) {
+				contribution.layout(dimension.width);
+			}
 		}
 
 		const whenContainerStylesLoaded = this.layoutService.whenContainerStylesLoaded(this.window);
@@ -1184,7 +1020,7 @@ export class BrowserEditor extends EditorPane {
 	 * Recompute the layout of the browser container and update the model with the new bounds.
 	 * This should generally only be called via layout() to ensure that the container is ready and all necessary styles are loaded.
 	 */
-	private layoutBrowserContainer(): void {
+	layoutBrowserContainer(): void {
 		if (this._model) {
 			this.checkOverlays();
 
@@ -1206,32 +1042,18 @@ export class BrowserEditor extends EditorPane {
 	override clearInput(): void {
 		this._inputDisposables.clear();
 
-		// Cancel any active element selection
-		if (this._elementSelectionCts) {
-			this._elementSelectionCts.dispose(true);
-			this._elementSelectionCts = undefined;
-		}
-
-		// Cancel any active console session
-		this.stopConsoleSession();
-
-		// Cancel any scheduled screenshots
+		// Cancel any scheduled timers
 		this.cancelScheduledScreenshot();
-
-		// Clear find widget model
-		this._findWidget.rawValue?.setModel(undefined);
-		this._findWidget.rawValue?.hide();
+		this.cancelFocus();
 
 		void this._model?.setVisible(false);
 		this._model = undefined;
+		this._onDidChangeModel.fire(undefined);
 
 		this._canGoBackContext.reset();
 		this._canGoForwardContext.reset();
 		this._hasUrlContext.reset();
 		this._hasErrorContext.reset();
-		this._storageScopeContext.reset();
-		this._devToolsOpenContext.reset();
-		this._elementSelectionActiveContext.reset();
 
 		this._navigationBar.clear();
 		this.setBackgroundImage(undefined);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.ts
deleted file mode 100644
index a1ad809a6f3..00000000000
--- a/src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { SimpleFindWidget } from '../../codeEditor/browser/find/simpleFindWidget.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
-import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { IBrowserViewModel } from '../common/browserView.js';
-import { BrowserViewCommandId } from '../../../../platform/browserView/common/browserView.js';
-import { localize } from '../../../../nls.js';
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
-
-export const CONTEXT_BROWSER_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('browserFindWidgetVisible', false, localize('browser.findWidgetVisible', "Whether the browser find widget is visible"));
-export const CONTEXT_BROWSER_FIND_WIDGET_FOCUSED = new RawContextKey<boolean>('browserFindWidgetFocused', false, localize('browser.findWidgetFocused', "Whether the browser find widget is focused"));
-
-/**
- * Find widget for the integrated browser view.
- * Uses the SimpleFindWidget base class and communicates with the browser view model
- * to perform find operations in the rendered web page.
- */
-export class BrowserFindWidget extends SimpleFindWidget {
-	private _model: IBrowserViewModel | undefined;
-	private readonly _modelDisposables = this._register(new DisposableStore());
-	private readonly _findWidgetVisible: IContextKey<boolean>;
-	private readonly _findWidgetFocused: IContextKey<boolean>;
-	private _lastFindResult: { resultIndex: number; resultCount: number } | undefined;
-	private _hasFoundMatch = false;
-
-	constructor(
-		private readonly container: HTMLElement,
-		@IContextViewService contextViewService: IContextViewService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IHoverService hoverService: IHoverService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IAccessibilityService accessibilityService: IAccessibilityService
-	) {
-		super({
-			showCommonFindToggles: true,
-			checkImeCompletionState: true,
-			showResultCount: true,
-			enableSash: true,
-			initialWidth: 350,
-			previousMatchActionId: BrowserViewCommandId.FindPrevious,
-			nextMatchActionId: BrowserViewCommandId.FindNext,
-			closeWidgetActionId: BrowserViewCommandId.HideFind
-		}, contextViewService, contextKeyService, hoverService, keybindingService, configurationService, accessibilityService);
-
-		this._findWidgetVisible = CONTEXT_BROWSER_FIND_WIDGET_VISIBLE.bindTo(contextKeyService);
-		this._findWidgetFocused = CONTEXT_BROWSER_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
-
-		container.appendChild(this.getDomNode());
-	}
-
-	/**
-	 * Set the browser view model to use for find operations.
-	 * This should be called whenever the editor input changes.
-	 */
-	setModel(model: IBrowserViewModel | undefined): void {
-		this._modelDisposables.clear();
-		this._model = model;
-		this._lastFindResult = undefined;
-		this._hasFoundMatch = false;
-
-		if (model) {
-			this._modelDisposables.add(model.onDidFindInPage(result => {
-				this._lastFindResult = {
-					resultIndex: result.activeMatchOrdinal - 1, // Convert to 0-based index
-					resultCount: result.matches
-				};
-				this._hasFoundMatch = result.matches > 0;
-				this.updateButtons(this._hasFoundMatch);
-				this.updateResultCount();
-			}));
-
-			this._modelDisposables.add(model.onWillDispose(() => {
-				this.setModel(undefined);
-			}));
-		}
-	}
-
-	override reveal(initialInput?: string): void {
-		const wasVisible = this.isVisible();
-		super.reveal(initialInput);
-		this._findWidgetVisible.set(true);
-		this.container.classList.toggle('find-visible', true);
-
-		// Focus the find input
-		this.focusFindBox();
-
-		// If there's existing input and the widget wasn't already visible, trigger a search
-		if (this.inputValue && !wasVisible) {
-			this._onInputChanged();
-		}
-	}
-
-	override hide(): void {
-		super.hide(false);
-		this._findWidgetVisible.reset();
-		this.container.classList.toggle('find-visible', false);
-
-		// Stop find and clear highlights in the browser view
-		this._model?.stopFindInPage(true);
-		this._model?.focus();
-		this._lastFindResult = undefined;
-		this._hasFoundMatch = false;
-	}
-
-	find(previous: boolean): void {
-		const value = this.inputValue;
-		if (value && this._model) {
-			this._model.findInPage(value, {
-				forward: !previous,
-				recompute: false,
-				matchCase: this._getCaseSensitiveValue()
-			});
-		}
-	}
-
-	findFirst(): void {
-		const value = this.inputValue;
-		if (value && this._model) {
-			this._model.findInPage(value, {
-				forward: true,
-				recompute: true,
-				matchCase: this._getCaseSensitiveValue()
-			});
-		}
-	}
-
-	clear(): void {
-		if (this._model) {
-			this._model.stopFindInPage(false);
-			this._lastFindResult = undefined;
-			this._hasFoundMatch = false;
-		}
-	}
-
-	protected _onInputChanged(): boolean {
-		if (this.inputValue) {
-			this.findFirst();
-		} else if (this._model) {
-			this.clear();
-		}
-		return false;
-	}
-
-	protected async _getResultCount(): Promise<{ resultIndex: number; resultCount: number } | undefined> {
-		return this._lastFindResult;
-	}
-
-	protected _onFocusTrackerFocus(): void {
-		this._findWidgetFocused.set(true);
-	}
-
-	protected _onFocusTrackerBlur(): void {
-		this._findWidgetFocused.reset();
-	}
-
-	protected _onFindInputFocusTrackerFocus(): void {
-		// No-op
-	}
-
-	protected _onFindInputFocusTrackerBlur(): void {
-		// No-op
-	}
-}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts
index e4affa6481c..be1e6c7d1cb 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts
@@ -9,37 +9,30 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
 import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
 import { BrowserEditor } from './browserEditor.js';
-import { BrowserEditorInput, BrowserEditorSerializer } from './browserEditorInput.js';
+import { BrowserEditorInput, BrowserEditorSerializer } from '../common/browserEditorInput.js';
 import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
 import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { Schemas } from '../../../../base/common/network.js';
-import { IBrowserViewWorkbenchService } from '../common/browserView.js';
+import { IBrowserViewCDPService, IBrowserViewWorkbenchService } from '../common/browserView.js';
 import { BrowserViewWorkbenchService } from './browserViewWorkbenchService.js';
-import { BrowserViewStorageScope } from '../../../../platform/browserView/common/browserView.js';
-import { IExternalOpener, IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { isLocalhostAuthority } from '../../../../platform/url/common/trustedDomains.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { PolicyCategory } from '../../../../base/common/policy.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { URI } from '../../../../base/common/uri.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { logBrowserOpen } from '../../../../platform/browserView/common/browserViewTelemetry.js';
+import { BrowserViewCDPService } from './browserViewCDPService.js';
 
-// Register actions and browser tools
+// Register actions and browser features
 import './browserViewActions.js';
-import './tools/browserTools.contribution.js';
+import './features/browserDataStorageFeatures.js';
+import './features/browserDevToolsFeature.js';
+import './features/browserEditorChatFeatures.js';
+import './features/browserEditorZoomFeature.js';
+import './features/browserEditorFindFeature.js';
+import './features/browserTabManagementFeatures.js';
 
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
 	EditorPaneDescriptor.create(
 		BrowserEditor,
-		BrowserEditor.ID,
+		BrowserEditorInput.EDITOR_ID,
 		localize('browser.editorLabel', "Browser")
 	),
 	[
@@ -62,7 +55,7 @@ class BrowserEditorResolverContribution implements IWorkbenchContribution {
 		editorResolverService.registerEditor(
 			`${Schemas.vscodeBrowser}:/**`,
 			{
-				id: BrowserEditorInput.ID,
+				id: BrowserEditorInput.EDITOR_ID,
 				label: localize('browser.editorLabel', "Browser"),
 				priority: RegisteredEditorPriority.exclusive
 			},
@@ -78,8 +71,8 @@ class BrowserEditorResolverContribution implements IWorkbenchContribution {
 					}
 
 					const browserInput = instantiationService.createInstance(BrowserEditorInput, {
-						id: parsed.id,
-						url: parsed.url
+						...options?.viewState,
+						id: parsed.id
 					});
 
 					// Start resolving the input right away. This will create the browser view.
@@ -90,7 +83,7 @@ class BrowserEditorResolverContribution implements IWorkbenchContribution {
 						editor: browserInput,
 						options: {
 							...options,
-							pinned: !!parsed.url // pin if navigated
+							pinned: !!browserInput.url // pin if navigated
 						}
 					};
 				}
@@ -101,105 +94,5 @@ class BrowserEditorResolverContribution implements IWorkbenchContribution {
 
 registerWorkbenchContribution2(BrowserEditorResolverContribution.ID, BrowserEditorResolverContribution, WorkbenchPhase.BlockStartup);
 
-/**
- * Opens localhost URLs in the Integrated Browser when the setting is enabled.
- */
-class LocalhostLinkOpenerContribution extends Disposable implements IWorkbenchContribution, IExternalOpener {
-	static readonly ID = 'workbench.contrib.localhostLinkOpener';
-
-	constructor(
-		@IOpenerService openerService: IOpenerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IEditorService private readonly editorService: IEditorService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
-	) {
-		super();
-
-		this._register(openerService.registerExternalOpener(this));
-	}
-
-	async openExternal(href: string, _ctx: { sourceUri: URI; preferredOpenerId?: string }, _token: CancellationToken): Promise<boolean> {
-		if (!this.configurationService.getValue<boolean>('workbench.browser.openLocalhostLinks')) {
-			return false;
-		}
-
-		try {
-			const parsed = new URL(href);
-			if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
-				return false;
-			}
-			if (!isLocalhostAuthority(parsed.host)) {
-				return false;
-			}
-		} catch {
-			return false;
-		}
-
-		logBrowserOpen(this.telemetryService, 'localhostLinkOpener');
-
-		const browserUri = BrowserViewUri.forUrl(href);
-		await this.editorService.openEditor({ resource: browserUri, options: { pinned: true } });
-		return true;
-	}
-}
-
-registerWorkbenchContribution2(LocalhostLinkOpenerContribution.ID, LocalhostLinkOpenerContribution, WorkbenchPhase.BlockStartup);
-
 registerSingleton(IBrowserViewWorkbenchService, BrowserViewWorkbenchService, InstantiationType.Delayed);
-
-Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
-	...workbenchConfigurationNodeBase,
-	properties: {
-		'workbench.browser.openLocalhostLinks': {
-			type: 'boolean',
-			default: false,
-			markdownDescription: localize(
-				{ comment: ['This is the description for a setting.'], key: 'browser.openLocalhostLinks' },
-				'When enabled, localhost links from the terminal, chat, and other sources will open in the Integrated Browser instead of the system browser.'
-			)
-		},
-		'workbench.browser.enableChatTools': {
-			type: 'boolean',
-			default: false,
-			experiment: { mode: 'startup' },
-			tags: ['experimental'],
-			markdownDescription: localize(
-				{ comment: ['This is the description for a setting.'], key: 'browser.enableChatTools' },
-				'When enabled, chat agents can use browser tools to open and interact with pages in the Integrated Browser.'
-			),
-			policy: {
-				name: 'BrowserChatTools',
-				category: PolicyCategory.InteractiveSession,
-				minimumVersion: '1.110',
-				value: (policyData) => policyData.chat_preview_features_enabled === false ? false : undefined,
-				localization: {
-					description: {
-						key: 'browser.enableChatTools',
-						value: localize('browser.enableChatTools', 'When enabled, chat agents can use browser tools to open and interact with pages in the Integrated Browser.')
-					}
-				},
-			}
-		},
-		'workbench.browser.dataStorage': {
-			type: 'string',
-			enum: [
-				BrowserViewStorageScope.Global,
-				BrowserViewStorageScope.Workspace,
-				BrowserViewStorageScope.Ephemeral
-			],
-			markdownEnumDescriptions: [
-				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.global' }, 'All browser views share a single persistent session across all workspaces.'),
-				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.workspace' }, 'Browser views within the same workspace share a persistent session. If no workspace is opened, `ephemeral` storage is used.'),
-				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.ephemeral' }, 'Each browser view has its own session that is cleaned up when closed.')
-			],
-			restricted: true,
-			default: BrowserViewStorageScope.Global,
-			markdownDescription: localize(
-				{ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage' },
-				'Controls how browser data (cookies, cache, storage) is shared between browser views.\n\n**Note**: In untrusted workspaces, this setting is ignored and `ephemeral` storage is always used.'
-			),
-			scope: ConfigurationScope.WINDOW,
-			order: 100
-		}
-	}
-});
+registerSingleton(IBrowserViewCDPService, BrowserViewCDPService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts
index 5fd326273c4..eb04e8d3a73 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts
@@ -9,91 +9,23 @@ import { Action2, registerAction2, MenuId } from '../../../../platform/actions/c
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { BrowserEditor, CONTEXT_BROWSER_CAN_GO_BACK, CONTEXT_BROWSER_CAN_GO_FORWARD, CONTEXT_BROWSER_DEVTOOLS_OPEN, CONTEXT_BROWSER_FOCUSED, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_STORAGE_SCOPE, CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_FOCUSED, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE } from './browserEditor.js';
-import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
-import { IBrowserViewWorkbenchService } from '../common/browserView.js';
-import { BrowserViewCommandId, BrowserViewStorageScope } from '../../../../platform/browserView/common/browserView.js';
-import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { BrowserEditor, CONTEXT_BROWSER_CAN_GO_BACK, CONTEXT_BROWSER_CAN_GO_FORWARD, CONTEXT_BROWSER_FOCUSED, CONTEXT_BROWSER_HAS_URL } from './browserEditor.js';
+import { BrowserViewCommandId } from '../../../../platform/browserView/common/browserView.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { logBrowserOpen } from '../../../../platform/browserView/common/browserViewTelemetry.js';
+import { BrowserEditorInput } from '../common/browserEditorInput.js';
 
 // Context key expression to check if browser editor is active
-const BROWSER_EDITOR_ACTIVE = ContextKeyExpr.equals('activeEditor', BrowserEditor.ID);
+export const BROWSER_EDITOR_ACTIVE = ContextKeyExpr.equals('activeEditor', BrowserEditorInput.EDITOR_ID);
 
-const BrowserCategory = localize2('browserCategory', "Browser");
-const ActionGroupTabs = '1_tabs';
-const ActionGroupPage = '2_page';
-const ActionGroupSettings = '3_settings';
-
-interface IOpenBrowserOptions {
-	url?: string;
-	openToSide?: boolean;
-}
-
-class OpenIntegratedBrowserAction extends Action2 {
-	constructor() {
-		super({
-			id: BrowserViewCommandId.Open,
-			title: localize2('browser.openAction', "Open Integrated Browser"),
-			category: BrowserCategory,
-			f1: true
-		});
-	}
-
-	async run(accessor: ServicesAccessor, urlOrOptions?: string | IOpenBrowserOptions): Promise<void> {
-		const editorService = accessor.get(IEditorService);
-		const telemetryService = accessor.get(ITelemetryService);
-
-		// Parse arguments
-		const options = typeof urlOrOptions === 'string' ? { url: urlOrOptions } : (urlOrOptions ?? {});
-		const resource = BrowserViewUri.forUrl(options.url);
-		const group = options.openToSide ? SIDE_GROUP : ACTIVE_GROUP;
-
-		logBrowserOpen(telemetryService, options.url ? 'commandWithUrl' : 'commandWithoutUrl');
-
-		const editorPane = await editorService.openEditor({ resource }, group);
-
-		// Lock the group when opening to the side
-		if (options.openToSide && editorPane?.group) {
-			editorPane.group.lock(true);
-		}
-	}
-}
-
-class NewTabAction extends Action2 {
-	constructor() {
-		super({
-			id: BrowserViewCommandId.NewTab,
-			title: localize2('browser.newTabAction', "New Tab"),
-			category: BrowserCategory,
-			f1: true,
-			precondition: BROWSER_EDITOR_ACTIVE,
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: ActionGroupTabs,
-				order: 1,
-			},
-			// When already in a browser, Ctrl/Cmd + T opens a new tab
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over search actions
-				primary: KeyMod.CtrlCmd | KeyCode.KeyT,
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor, _browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
-		const editorService = accessor.get(IEditorService);
-		const telemetryService = accessor.get(ITelemetryService);
-		const resource = BrowserViewUri.forUrl(undefined);
-
-		logBrowserOpen(telemetryService, 'newTabCommand');
-
-		await editorService.openEditor({ resource });
-	}
+export const BrowserActionCategory = localize2('browserCategory', "Browser");
+export enum BrowserActionGroup {
+	Tabs = '1_tabs',
+	Zoom = '2_zoom',
+	Page = '3_page',
+	Settings = '4_settings'
 }
 
 class GoBackAction extends Action2 {
@@ -103,7 +35,7 @@ class GoBackAction extends Action2 {
 		super({
 			id: GoBackAction.ID,
 			title: localize2('browser.goBackAction', 'Go Back'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			icon: Codicon.arrowLeft,
 			f1: true,
 			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_CAN_GO_BACK),
@@ -135,7 +67,7 @@ class GoForwardAction extends Action2 {
 		super({
 			id: GoForwardAction.ID,
 			title: localize2('browser.goForwardAction', 'Go Forward'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			icon: Codicon.arrowRight,
 			f1: true,
 			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_CAN_GO_FORWARD),
@@ -167,7 +99,7 @@ class ReloadAction extends Action2 {
 		super({
 			id: ReloadAction.ID,
 			title: localize2('browser.reloadAction', 'Reload'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			icon: Codicon.refresh,
 			f1: true,
 			precondition: BROWSER_EDITOR_ACTIVE,
@@ -205,7 +137,7 @@ class HardReloadAction extends Action2 {
 		super({
 			id: HardReloadAction.ID,
 			title: localize2('browser.hardReloadAction', 'Hard Reload'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			icon: Codicon.refresh,
 			f1: true,
 			precondition: BROWSER_EDITOR_ACTIVE,
@@ -233,7 +165,7 @@ class FocusUrlInputAction extends Action2 {
 		super({
 			id: FocusUrlInputAction.ID,
 			title: localize2('browser.focusUrlInputAction', 'Focus URL Input'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			f1: true,
 			precondition: BROWSER_EDITOR_ACTIVE,
 			keybinding: {
@@ -250,102 +182,6 @@ class FocusUrlInputAction extends Action2 {
 	}
 }
 
-class AddElementToChatAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.AddElementToChat;
-
-	constructor() {
-		const enabled = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('config.chat.sendElementsToChat.enabled', true));
-		super({
-			id: AddElementToChatAction.ID,
-			title: localize2('browser.addElementToChatAction', 'Add Element to Chat'),
-			category: BrowserCategory,
-			icon: Codicon.inspect,
-			f1: true,
-			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate(), enabled),
-			toggled: CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE,
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: 'actions',
-				order: 1,
-				when: enabled
-			},
-			keybinding: [{
-				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over terminal
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC,
-			}, {
-				when: CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE,
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyCode.Escape
-			}]
-		});
-	}
-
-	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
-		if (browserEditor instanceof BrowserEditor) {
-			await browserEditor.addElementToChat();
-		}
-	}
-}
-
-class AddConsoleLogsToChatAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.AddConsoleLogsToChat;
-
-	constructor() {
-		const enabled = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('config.chat.sendElementsToChat.enabled', true));
-		super({
-			id: AddConsoleLogsToChatAction.ID,
-			title: localize2('browser.addConsoleLogsToChatAction', 'Add Console Logs to Chat'),
-			category: BrowserCategory,
-			icon: Codicon.output,
-			f1: true,
-			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate(), enabled),
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: 'actions',
-				order: 2,
-				when: enabled
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
-		if (browserEditor instanceof BrowserEditor) {
-			await browserEditor.addConsoleLogsToChat();
-		}
-	}
-}
-
-class ToggleDevToolsAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.ToggleDevTools;
-
-	constructor() {
-		super({
-			id: ToggleDevToolsAction.ID,
-			title: localize2('browser.toggleDevToolsAction', 'Toggle Developer Tools'),
-			category: BrowserCategory,
-			icon: Codicon.terminal,
-			f1: true,
-			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
-			toggled: ContextKeyExpr.equals(CONTEXT_BROWSER_DEVTOOLS_OPEN.key, true),
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: 'actions',
-				order: 3,
-			},
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyCode.F12
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
-		if (browserEditor instanceof BrowserEditor) {
-			await browserEditor.toggleDevTools();
-		}
-	}
-}
-
 class OpenInExternalBrowserAction extends Action2 {
 	static readonly ID = BrowserViewCommandId.OpenExternal;
 
@@ -353,14 +189,14 @@ class OpenInExternalBrowserAction extends Action2 {
 		super({
 			id: OpenInExternalBrowserAction.ID,
 			title: localize2('browser.openExternalAction', 'Open in External Browser'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			icon: Codicon.linkExternal,
 			f1: true,
 			// Note: We do allow opening in an external browser even if there is an error page shown
 			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL),
 			menu: {
 				id: MenuId.BrowserActionsToolbar,
-				group: ActionGroupPage,
+				group: BrowserActionGroup.Page,
 				order: 10
 			}
 		});
@@ -382,83 +218,6 @@ class OpenInExternalBrowserAction extends Action2 {
 	}
 }
 
-class ClearGlobalBrowserStorageAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.ClearGlobalStorage;
-
-	constructor() {
-		super({
-			id: ClearGlobalBrowserStorageAction.ID,
-			title: localize2('browser.clearGlobalStorageAction', 'Clear Storage (Global)'),
-			category: BrowserCategory,
-			icon: Codicon.clearAll,
-			f1: true,
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: ActionGroupSettings,
-				order: 1,
-				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Global)
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const browserViewWorkbenchService = accessor.get(IBrowserViewWorkbenchService);
-		await browserViewWorkbenchService.clearGlobalStorage();
-	}
-}
-
-class ClearWorkspaceBrowserStorageAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.ClearWorkspaceStorage;
-
-	constructor() {
-		super({
-			id: ClearWorkspaceBrowserStorageAction.ID,
-			title: localize2('browser.clearWorkspaceStorageAction', 'Clear Storage (Workspace)'),
-			category: BrowserCategory,
-			icon: Codicon.clearAll,
-			f1: true,
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: ActionGroupSettings,
-				order: 1,
-				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Workspace)
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const browserViewWorkbenchService = accessor.get(IBrowserViewWorkbenchService);
-		await browserViewWorkbenchService.clearWorkspaceStorage();
-	}
-}
-
-class ClearEphemeralBrowserStorageAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.ClearEphemeralStorage;
-
-	constructor() {
-		super({
-			id: ClearEphemeralBrowserStorageAction.ID,
-			title: localize2('browser.clearEphemeralStorageAction', 'Clear Storage (Ephemeral)'),
-			category: BrowserCategory,
-			icon: Codicon.clearAll,
-			f1: true,
-			precondition: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Ephemeral),
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: '3_settings',
-				order: 1,
-				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Ephemeral)
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
-		if (browserEditor instanceof BrowserEditor) {
-			await browserEditor.clearStorage();
-		}
-	}
-}
-
 class OpenBrowserSettingsAction extends Action2 {
 	static readonly ID = BrowserViewCommandId.OpenSettings;
 
@@ -466,12 +225,12 @@ class OpenBrowserSettingsAction extends Action2 {
 		super({
 			id: OpenBrowserSettingsAction.ID,
 			title: localize2('browser.openSettingsAction', 'Open Browser Settings'),
-			category: BrowserCategory,
+			category: BrowserActionCategory,
 			icon: Codicon.settingsGear,
 			f1: false,
 			menu: {
 				id: MenuId.BrowserActionsToolbar,
-				group: ActionGroupSettings,
+				group: BrowserActionGroup.Settings,
 				order: 2
 			}
 		});
@@ -483,141 +242,12 @@ class OpenBrowserSettingsAction extends Action2 {
 	}
 }
 
-// Find actions
-
-class ShowBrowserFindAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.ShowFind;
-
-	constructor() {
-		super({
-			id: ShowBrowserFindAction.ID,
-			title: localize2('browser.showFindAction', 'Find in Page'),
-			category: BrowserCategory,
-			f1: true,
-			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
-			menu: {
-				id: MenuId.BrowserActionsToolbar,
-				group: ActionGroupPage,
-				order: 1,
-			},
-			keybinding: {
-				weight: KeybindingWeight.EditorContrib,
-				primary: KeyMod.CtrlCmd | KeyCode.KeyF
-			}
-		});
-	}
-
-	run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): void {
-		if (browserEditor instanceof BrowserEditor) {
-			browserEditor.showFind();
-		}
-	}
-}
-
-class HideBrowserFindAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.HideFind;
-
-	constructor() {
-		super({
-			id: HideBrowserFindAction.ID,
-			title: localize2('browser.hideFindAction', 'Close Find Widget'),
-			category: BrowserCategory,
-			f1: false,
-			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE),
-			keybinding: {
-				weight: KeybindingWeight.EditorContrib + 5,
-				primary: KeyCode.Escape
-			}
-		});
-	}
-
-	run(accessor: ServicesAccessor): void {
-		const browserEditor = accessor.get(IEditorService).activeEditorPane;
-		if (browserEditor instanceof BrowserEditor) {
-			browserEditor.hideFind();
-		}
-	}
-}
-
-class BrowserFindNextAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.FindNext;
-
-	constructor() {
-		super({
-			id: BrowserFindNextAction.ID,
-			title: localize2('browser.findNextAction', 'Find Next'),
-			category: BrowserCategory,
-			f1: false,
-			precondition: BROWSER_EDITOR_ACTIVE,
-			keybinding: [{
-				when: CONTEXT_BROWSER_FIND_WIDGET_FOCUSED,
-				weight: KeybindingWeight.EditorContrib,
-				primary: KeyCode.Enter
-			}, {
-				when: CONTEXT_BROWSER_FIND_WIDGET_VISIBLE,
-				weight: KeybindingWeight.EditorContrib,
-				primary: KeyCode.F3,
-				mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyG }
-			}]
-		});
-	}
-
-	run(accessor: ServicesAccessor): void {
-		const browserEditor = accessor.get(IEditorService).activeEditorPane;
-		if (browserEditor instanceof BrowserEditor) {
-			browserEditor.findNext();
-		}
-	}
-}
-
-class BrowserFindPreviousAction extends Action2 {
-	static readonly ID = BrowserViewCommandId.FindPrevious;
-
-	constructor() {
-		super({
-			id: BrowserFindPreviousAction.ID,
-			title: localize2('browser.findPreviousAction', 'Find Previous'),
-			category: BrowserCategory,
-			f1: false,
-			precondition: BROWSER_EDITOR_ACTIVE,
-			keybinding: [{
-				when: CONTEXT_BROWSER_FIND_WIDGET_FOCUSED,
-				weight: KeybindingWeight.EditorContrib,
-				primary: KeyMod.Shift | KeyCode.Enter
-			}, {
-				when: CONTEXT_BROWSER_FIND_WIDGET_VISIBLE,
-				weight: KeybindingWeight.EditorContrib,
-				primary: KeyMod.Shift | KeyCode.F3,
-				mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG }
-			}]
-		});
-	}
-
-	run(accessor: ServicesAccessor): void {
-		const browserEditor = accessor.get(IEditorService).activeEditorPane;
-		if (browserEditor instanceof BrowserEditor) {
-			browserEditor.findPrevious();
-		}
-	}
-}
-
 // Register actions
-registerAction2(OpenIntegratedBrowserAction);
-registerAction2(NewTabAction);
 registerAction2(GoBackAction);
 registerAction2(GoForwardAction);
 registerAction2(ReloadAction);
 registerAction2(HardReloadAction);
+
 registerAction2(FocusUrlInputAction);
-registerAction2(AddElementToChatAction);
-registerAction2(AddConsoleLogsToChatAction);
-registerAction2(ToggleDevToolsAction);
 registerAction2(OpenInExternalBrowserAction);
-registerAction2(ClearGlobalBrowserStorageAction);
-registerAction2(ClearWorkspaceBrowserStorageAction);
-registerAction2(ClearEphemeralBrowserStorageAction);
 registerAction2(OpenBrowserSettingsAction);
-registerAction2(ShowBrowserFindAction);
-registerAction2(HideBrowserFindAction);
-registerAction2(BrowserFindNextAction);
-registerAction2(BrowserFindPreviousAction);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserViewCDPService.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserViewCDPService.ts
new file mode 100644
index 00000000000..c19563ee494
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserViewCDPService.ts
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { CDPEvent, CDPRequest, CDPResponse } from '../../../../platform/browserView/common/cdp/types.js';
+import { IBrowserViewGroupService, ipcBrowserViewGroupChannelName } from '../../../../platform/browserView/common/browserViewGroup.js';
+import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { IBrowserViewCDPService } from '../common/browserView.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+
+export class BrowserViewCDPService extends Disposable implements IBrowserViewCDPService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _groupService: IBrowserViewGroupService;
+
+	constructor(
+		@IMainProcessService mainProcessService: IMainProcessService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+	) {
+		super();
+		const channel = mainProcessService.getChannel(ipcBrowserViewGroupChannelName);
+		this._groupService = ProxyChannel.toService<IBrowserViewGroupService>(channel);
+	}
+
+	async createSessionGroup(browserId: string): Promise<string> {
+		const windowId = this._getWindowIdForBrowser(browserId);
+		const groupId = await this._groupService.createGroup(windowId);
+		await this._groupService.addViewToGroup(groupId, browserId);
+		return groupId;
+	}
+
+	async destroySessionGroup(groupId: string): Promise<void> {
+		await this._groupService.destroyGroup(groupId);
+	}
+
+	async sendCDPMessage(groupId: string, message: CDPRequest): Promise<void> {
+		await this._groupService.sendCDPMessage(groupId, message);
+	}
+
+	onCDPMessage(groupId: string): Event<CDPResponse | CDPEvent> {
+		return this._groupService.onDynamicCDPMessage(groupId);
+	}
+
+	onDidDestroy(groupId: string): Event<void> {
+		return this._groupService.onDynamicDidDestroy(groupId);
+	}
+
+	private _getWindowIdForBrowser(browserId: string): number {
+		const browserUri = BrowserViewUri.forId(browserId);
+		const editors = this.editorService.findEditors(browserUri);
+		if (editors.length > 0) {
+			const group = this.editorGroupsService.getGroup(editors[0].groupId);
+			if (group) {
+				return group.windowId;
+			}
+		}
+		// Fall back to main window
+		return this.editorGroupsService.mainPart.windowId;
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserDataStorageFeatures.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserDataStorageFeatures.ts
new file mode 100644
index 00000000000..d3ecac788fc
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserDataStorageFeatures.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../../nls.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { BrowserEditor, BrowserEditorContribution } from '../browserEditor.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../../common/configuration.js';
+import { IBrowserViewModel, IBrowserViewWorkbenchService } from '../../common/browserView.js';
+import { BrowserViewCommandId, BrowserViewStorageScope } from '../../../../../platform/browserView/common/browserView.js';
+import { IContextKey, IContextKeyService, ContextKeyExpr, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { BrowserActionCategory, BrowserActionGroup } from '../browserViewActions.js';
+import type { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+
+const CONTEXT_BROWSER_STORAGE_SCOPE = new RawContextKey<string>('browserStorageScope', '', localize('browser.storageScope', "The storage scope of the current browser view"));
+
+class BrowserEditorStorageScopeContribution extends BrowserEditorContribution {
+	private readonly _storageScopeContext: IContextKey<string>;
+
+	constructor(
+		editor: BrowserEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		super(editor);
+		this._storageScopeContext = CONTEXT_BROWSER_STORAGE_SCOPE.bindTo(contextKeyService);
+	}
+
+	protected override subscribeToModel(model: IBrowserViewModel, _store: DisposableStore): void {
+		this._storageScopeContext.set(model.storageScope);
+	}
+
+	override clear(): void {
+		this._storageScopeContext.reset();
+	}
+}
+
+BrowserEditor.registerContribution(BrowserEditorStorageScopeContribution);
+
+class ClearGlobalBrowserStorageAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.ClearGlobalStorage;
+
+	constructor() {
+		super({
+			id: ClearGlobalBrowserStorageAction.ID,
+			title: localize2('browser.clearGlobalStorageAction', 'Clear Storage (Global)'),
+			category: BrowserActionCategory,
+			icon: Codicon.clearAll,
+			f1: true,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Settings,
+				order: 1,
+				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Global)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const browserViewWorkbenchService = accessor.get(IBrowserViewWorkbenchService);
+		await browserViewWorkbenchService.clearGlobalStorage();
+	}
+}
+
+class ClearWorkspaceBrowserStorageAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.ClearWorkspaceStorage;
+
+	constructor() {
+		super({
+			id: ClearWorkspaceBrowserStorageAction.ID,
+			title: localize2('browser.clearWorkspaceStorageAction', 'Clear Storage (Workspace)'),
+			category: BrowserActionCategory,
+			icon: Codicon.clearAll,
+			f1: true,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Settings,
+				order: 1,
+				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Workspace)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const browserViewWorkbenchService = accessor.get(IBrowserViewWorkbenchService);
+		await browserViewWorkbenchService.clearWorkspaceStorage();
+	}
+}
+
+class ClearEphemeralBrowserStorageAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.ClearEphemeralStorage;
+
+	constructor() {
+		super({
+			id: ClearEphemeralBrowserStorageAction.ID,
+			title: localize2('browser.clearEphemeralStorageAction', 'Clear Storage (Ephemeral)'),
+			category: BrowserActionCategory,
+			icon: Codicon.clearAll,
+			f1: true,
+			precondition: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Ephemeral),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Settings,
+				order: 1,
+				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Ephemeral)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.clearStorage();
+		}
+	}
+}
+
+registerAction2(ClearGlobalBrowserStorageAction);
+registerAction2(ClearWorkspaceBrowserStorageAction);
+registerAction2(ClearEphemeralBrowserStorageAction);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	...workbenchConfigurationNodeBase,
+	properties: {
+		'workbench.browser.dataStorage': {
+			type: 'string',
+			enum: [
+				BrowserViewStorageScope.Global,
+				BrowserViewStorageScope.Workspace,
+				BrowserViewStorageScope.Ephemeral
+			],
+			markdownEnumDescriptions: [
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.global' }, 'All browser views share a single persistent session across all workspaces.'),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.workspace' }, 'Browser views within the same workspace share a persistent session. If no workspace is opened, `ephemeral` storage is used.'),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.ephemeral' }, 'Each browser view has its own session that is cleaned up when closed.')
+			],
+			restricted: true,
+			default: BrowserViewStorageScope.Global,
+			markdownDescription: localize(
+				{ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage' },
+				'Controls how browser data (cookies, cache, storage) is shared between browser views.\n\n**Note**: In untrusted workspaces, this setting is ignored and `ephemeral` storage is always used.'
+			),
+			scope: ConfigurationScope.WINDOW,
+			order: 100
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserDevToolsFeature.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserDevToolsFeature.ts
new file mode 100644
index 00000000000..c22809d56ee
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserDevToolsFeature.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../../nls.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { BrowserViewCommandId } from '../../../../../platform/browserView/common/browserView.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IBrowserViewModel } from '../../common/browserView.js';
+import { BrowserEditor, BrowserEditorContribution, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL } from '../browserEditor.js';
+import { BROWSER_EDITOR_ACTIVE, BrowserActionCategory } from '../browserViewActions.js';
+
+const CONTEXT_BROWSER_DEVTOOLS_OPEN = new RawContextKey<boolean>('browserDevToolsOpen', false, localize('browser.devToolsOpen', "Whether developer tools are open for the current browser view"));
+
+class BrowserEditorDevToolsContribution extends BrowserEditorContribution {
+	private readonly _devToolsOpenContext: IContextKey<boolean>;
+
+	constructor(
+		editor: BrowserEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		super(editor);
+		this._devToolsOpenContext = CONTEXT_BROWSER_DEVTOOLS_OPEN.bindTo(contextKeyService);
+	}
+
+	protected override subscribeToModel(model: IBrowserViewModel, store: DisposableStore): void {
+		this._devToolsOpenContext.set(model.isDevToolsOpen);
+		store.add(model.onDidChangeDevToolsState(e => {
+			this._devToolsOpenContext.set(e.isDevToolsOpen);
+		}));
+	}
+
+	override clear(): void {
+		this._devToolsOpenContext.reset();
+	}
+}
+
+BrowserEditor.registerContribution(BrowserEditorDevToolsContribution);
+
+class ToggleDevToolsAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.ToggleDevTools;
+
+	constructor() {
+		super({
+			id: ToggleDevToolsAction.ID,
+			title: localize2('browser.toggleDevToolsAction', 'Toggle Developer Tools'),
+			category: BrowserActionCategory,
+			icon: Codicon.terminal,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
+			toggled: ContextKeyExpr.equals(CONTEXT_BROWSER_DEVTOOLS_OPEN.key, true),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: 'actions',
+				order: 3,
+			},
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyCode.F12
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.toggleDevTools();
+		}
+	}
+}
+
+registerAction2(ToggleDevToolsAction);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorChatFeatures.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorChatFeatures.ts
new file mode 100644
index 00000000000..b44e966f2db
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorChatFeatures.ts
@@ -0,0 +1,511 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../../nls.js';
+import { $ } from '../../../../../base/browser/dom.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IContextKey, IContextKeyService, ContextKeyExpr, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Event } from '../../../../../base/common/event.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IBrowserElementsService } from '../../../../services/browserElements/browser/browserElementsService.js';
+import { IChatWidgetService } from '../../../chat/browser/chat.js';
+import { IChatRequestVariableEntry } from '../../../chat/common/attachments/chatVariableEntries.js';
+import { ChatContextKeys } from '../../../chat/common/actions/chatContextKeys.js';
+import { ChatConfiguration } from '../../../chat/common/constants.js';
+import { IElementData, IBrowserTargetLocator, getDisplayNameFromOuterHTML, createElementContextValue } from '../../../../../platform/browserElements/common/browserElements.js';
+import { BrowserViewCommandId } from '../../../../../platform/browserView/common/browserView.js';
+import { IBrowserViewModel } from '../../../browserView/common/browserView.js';
+import { BrowserEditorInput } from '../../common/browserEditorInput.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
+import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
+import { BrowserEditor, BrowserEditorContribution, IBrowserEditorWidgetContribution, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_FOCUSED } from '../browserEditor.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { PolicyCategory } from '../../../../../base/common/policy.js';
+import { workbenchConfigurationNodeBase } from '../../../../common/configuration.js';
+
+// Register tools
+import '../tools/browserTools.contribution.js';
+import { BrowserActionCategory } from '../browserViewActions.js';
+
+// Context key expression to check if browser editor is active
+const BROWSER_EDITOR_ACTIVE = ContextKeyExpr.equals('activeEditor', BrowserEditorInput.EDITOR_ID);
+const BrowserCategory = localize2('browserCategory', "Browser");
+
+const CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE = new RawContextKey<boolean>('browserElementSelectionActive', false, localize('browser.elementSelectionActive', "Whether element selection is currently active"));
+
+const canShareBrowserWithAgentContext = ContextKeyExpr.and(
+	ChatContextKeys.enabled,
+	ContextKeyExpr.has(`config.${ChatConfiguration.AgentEnabled}`),
+	ContextKeyExpr.has(`config.workbench.browser.enableChatTools`),
+)!;
+
+
+/**
+ * Contribution that manages element selection, element attachment to chat,
+ * console session lifecycle, console log attachment to chat, and agent sharing.
+ */
+export class BrowserEditorChatIntegration extends BrowserEditorContribution {
+	private _elementSelectionCts: CancellationTokenSource | undefined;
+	private readonly _elementSelectionActiveContext: IContextKey<boolean>;
+
+	// Share with Agent
+	private readonly _shareButtonContainer: HTMLElement;
+	private readonly _shareButton: Button;
+
+	constructor(
+		editor: BrowserEditor,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ILogService private readonly logService: ILogService,
+		@IBrowserElementsService private readonly browserElementsService: IBrowserElementsService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super(editor);
+		this._elementSelectionActiveContext = CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE.bindTo(contextKeyService);
+
+		// Build share toggle button
+		const hoverDelegate = this._register(instantiationService.createInstance(
+			WorkbenchHoverDelegate,
+			'element',
+			undefined,
+			{ position: { hoverPosition: HoverPosition.ABOVE } }
+		));
+
+		this._shareButtonContainer = $('.browser-share-toggle-container');
+		this._shareButton = this._register(new Button(this._shareButtonContainer, {
+			supportIcons: true,
+			title: localize('browser.shareWithAgent', "Share with Agent"),
+			small: true,
+			hoverDelegate
+		}));
+		this._shareButton.element.classList.add('browser-share-toggle');
+		this._shareButton.label = '$(agent)';
+
+		this._register(this._shareButton.onDidClick(() => {
+			this._toggleShareWithAgent();
+		}));
+
+		// Show share button only when chat is enabled and browser tools are enabled
+		const updateShareButtonVisibility = () => {
+			this._shareButtonContainer.style.display = contextKeyService.contextMatchesRules(canShareBrowserWithAgentContext) ? '' : 'none';
+		};
+		updateShareButtonVisibility();
+		const agentSharingKeys = new Set(canShareBrowserWithAgentContext.keys());
+		this._register(Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(agentSharingKeys))(() => {
+			updateShareButtonVisibility();
+		}));
+	}
+
+	override get urlBarWidgets(): readonly IBrowserEditorWidgetContribution[] {
+		return [{ element: this._shareButtonContainer, order: 100 }];
+	}
+
+	protected override subscribeToModel(model: IBrowserViewModel, store: DisposableStore): void {
+		// Start console session when a page URL is loaded
+		if (model.url) {
+			store.add(this._startConsoleSession(model.id));
+		} else {
+			store.add(Event.once(Event.filter(model.onDidNavigate, e => !!e.url))(() => {
+				store.add(this._startConsoleSession(model.id));
+			}));
+		}
+
+		// Manage sharing state
+		this._updateSharingState(true);
+		store.add(model.onDidChangeSharedWithAgent(() => {
+			this._updateSharingState(false);
+		}));
+		store.add(Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set(canShareBrowserWithAgentContext.keys())))(() => {
+			this._updateSharingState(false);
+		}));
+	}
+
+	override clear(): void {
+		if (this._elementSelectionCts) {
+			this._elementSelectionCts.dispose(true);
+			this._elementSelectionCts = undefined;
+		}
+		this._elementSelectionActiveContext.reset();
+	}
+
+	// -- Sharing -------------------------------------------------------
+
+	private _toggleShareWithAgent(): void {
+		const model = this.editor.model;
+		if (!model) {
+			return;
+		}
+		model.setSharedWithAgent(!model.sharedWithAgent);
+	}
+
+	private _updateSharingState(isInitialState: boolean): void {
+		const model = this.editor.model;
+		const sharingEnabled = this.contextKeyService.contextMatchesRules(canShareBrowserWithAgentContext);
+		const isShared = sharingEnabled && !!model && model.sharedWithAgent;
+
+		this.editor.browserContainer.classList.toggle('animate', !isInitialState);
+		this.editor.browserContainer.classList.toggle('shared', isShared);
+
+		this._shareButton.checked = isShared;
+		this._shareButton.label = isShared
+			? localize('browser.sharingWithAgent', "Sharing with Agent") + ' $(agent)'
+			: '$(agent)';
+		this._shareButton.setTitle(isShared
+			? localize('browser.unshareWithAgent', "Stop Sharing with Agent")
+			: localize('browser.shareWithAgent', "Share with Agent"));
+	}
+
+	// -- Element Selection ----------------------------------------------
+
+	/**
+	 * Start element selection in the browser view, wait for a user selection, and add it to chat.
+	 */
+	async addElementToChat(): Promise<void> {
+		// If selection is already active, cancel it
+		if (this._elementSelectionCts) {
+			this._elementSelectionCts.dispose(true);
+			this._elementSelectionCts = undefined;
+			this._elementSelectionActiveContext.set(false);
+			return;
+		}
+
+		// Start new selection
+		const cts = new CancellationTokenSource();
+		this._elementSelectionCts = cts;
+		this._elementSelectionActiveContext.set(true);
+
+		type IntegratedBrowserAddElementToChatStartEvent = {};
+
+		type IntegratedBrowserAddElementToChatStartClassification = {
+			owner: 'jruales';
+			comment: 'The user initiated an Add Element to Chat action in Integrated Browser.';
+		};
+
+		this.telemetryService.publicLog2<IntegratedBrowserAddElementToChatStartEvent, IntegratedBrowserAddElementToChatStartClassification>('integratedBrowser.addElementToChat.start', {});
+
+		try {
+			const browserViewId = this.editor.model?.id;
+			if (!browserViewId) {
+				throw new Error('No browser view ID found');
+			}
+
+			// Make the browser the focused view
+			this.editor.ensureBrowserFocus();
+
+			const locator: IBrowserTargetLocator = { browserViewId };
+
+			// Start debug session for integrated browser
+			await this.browserElementsService.startDebugSession(cts.token, locator);
+
+			// Get the browser container bounds
+			const { width, height } = this.editor.browserContainer.getBoundingClientRect();
+
+			// Get element data from user selection
+			const elementData = await this.browserElementsService.getElementData({ x: 0, y: 0, width, height }, cts.token, locator);
+			if (!elementData) {
+				throw new Error('Element data not found');
+			}
+
+			const { attachCss, attachImages } = await this._attachElementDataToChat(elementData);
+
+			type IntegratedBrowserAddElementToChatAddedEvent = {
+				attachCss: boolean;
+				attachImages: boolean;
+			};
+
+			type IntegratedBrowserAddElementToChatAddedClassification = {
+				attachCss: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachCSS was enabled.' };
+				attachImages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachImages was enabled.' };
+				owner: 'jruales';
+				comment: 'An element was successfully added to chat from Integrated Browser.';
+			};
+
+			this.telemetryService.publicLog2<IntegratedBrowserAddElementToChatAddedEvent, IntegratedBrowserAddElementToChatAddedClassification>('integratedBrowser.addElementToChat.added', {
+				attachCss,
+				attachImages
+			});
+
+		} catch (error) {
+			if (!cts.token.isCancellationRequested) {
+				this.logService.error('BrowserEditor.addElementToChat: Failed to select element', error);
+			}
+		} finally {
+			cts.dispose();
+			if (this._elementSelectionCts === cts) {
+				this._elementSelectionCts = undefined;
+				this._elementSelectionActiveContext.set(false);
+			}
+		}
+	}
+
+	/**
+	 * Accept the currently focused element during element selection and attach it to chat.
+	 */
+	async addFocusedElementToChat(): Promise<void> {
+		if (!this._elementSelectionCts) {
+			return;
+		}
+
+		const cts = this._elementSelectionCts;
+		const browserViewId = this.editor.model?.id;
+		if (!browserViewId) {
+			return;
+		}
+
+		const locator: IBrowserTargetLocator = { browserViewId };
+		const { width, height } = this.editor.browserContainer.getBoundingClientRect();
+		const elementData = await this.browserElementsService.getFocusedElementData({ x: 0, y: 0, width, height }, cts.token, locator);
+		if (!elementData) {
+			return;
+		}
+
+		await this._attachElementDataToChat(elementData);
+		cts.dispose();
+		if (this._elementSelectionCts === cts) {
+			this._elementSelectionCts = undefined;
+			this._elementSelectionActiveContext.set(false);
+		}
+	}
+
+	private async _attachElementDataToChat(elementData: IElementData): Promise<{ attachCss: boolean; attachImages: boolean }> {
+		const bounds = elementData.bounds;
+		const toAttach: IChatRequestVariableEntry[] = [];
+
+		const displayName = getDisplayNameFromOuterHTML(elementData.outerHTML);
+		const attachCss = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachCSS');
+		const value = createElementContextValue(elementData, displayName, attachCss);
+
+		toAttach.push({
+			id: 'element-' + Date.now(),
+			name: displayName,
+			fullName: displayName,
+			value: value,
+			modelDescription: attachCss
+				? 'Structured browser element context with HTML path, attributes, and computed styles.'
+				: 'Structured browser element context with HTML path and attributes.',
+			kind: 'element',
+			icon: ThemeIcon.fromId(Codicon.layout.id),
+			ancestors: elementData.ancestors,
+			attributes: elementData.attributes,
+			computedStyles: attachCss ? elementData.computedStyles : undefined,
+			dimensions: elementData.dimensions,
+			innerText: elementData.innerText,
+		});
+
+		const attachImages = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachImages');
+		const model = this.editor.model;
+		if (attachImages && model) {
+			const screenshotBuffer = await model.captureScreenshot({
+				quality: 90,
+				rect: bounds
+			});
+
+			toAttach.push({
+				id: 'element-screenshot-' + Date.now(),
+				name: 'Element Screenshot',
+				fullName: 'Element Screenshot',
+				kind: 'image',
+				value: screenshotBuffer.buffer
+			});
+		}
+
+		const widget = await this.chatWidgetService.revealWidget() ?? this.chatWidgetService.lastFocusedWidget;
+		widget?.attachmentModel?.addContext(...toAttach);
+
+		return { attachCss, attachImages };
+	}
+
+	// -- Console Logs ---------------------------------------------------
+
+	/**
+	 * Grab the current console logs from the active console session and attach them to chat.
+	 */
+	async addConsoleLogsToChat(): Promise<void> {
+		const browserViewId = this.editor.model?.id;
+		if (!browserViewId) {
+			return;
+		}
+
+		const locator: IBrowserTargetLocator = { browserViewId };
+
+		try {
+			const logs = await this.browserElementsService.getConsoleLogs(locator);
+			if (!logs) {
+				return;
+			}
+
+			const toAttach: IChatRequestVariableEntry[] = [];
+			toAttach.push({
+				id: 'console-logs-' + Date.now(),
+				name: localize('consoleLogs', 'Console Logs'),
+				fullName: localize('consoleLogs', 'Console Logs'),
+				value: logs,
+				modelDescription: 'Console logs captured from Integrated Browser.',
+				kind: 'element',
+				icon: ThemeIcon.fromId(Codicon.terminal.id),
+			});
+
+			const widget = await this.chatWidgetService.revealWidget() ?? this.chatWidgetService.lastFocusedWidget;
+			widget?.attachmentModel?.addContext(...toAttach);
+		} catch (error) {
+			this.logService.error('BrowserEditor.addConsoleLogsToChat: Failed to get console logs', error);
+		}
+	}
+
+	private _startConsoleSession(browserViewId: string): IDisposable {
+		const cts = new CancellationTokenSource();
+		const locator: IBrowserTargetLocator = { browserViewId };
+
+		this.browserElementsService.startConsoleSession(cts.token, locator).catch(error => {
+			if (!cts.token.isCancellationRequested) {
+				this.logService.error('BrowserEditor: Failed to start console session', error);
+			}
+		});
+
+		return toDisposable(() => {
+			cts.dispose(true);
+		});
+	}
+}
+
+// Register the contribution
+BrowserEditor.registerContribution(BrowserEditorChatIntegration);
+
+// -- Actions ------------------------------------------------------------
+
+class AddElementToChatAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.AddElementToChat;
+
+	constructor() {
+		const enabled = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('config.chat.sendElementsToChat.enabled', true));
+		super({
+			id: AddElementToChatAction.ID,
+			title: localize2('browser.addElementToChatAction', 'Add Element to Chat'),
+			category: BrowserCategory,
+			icon: Codicon.inspect,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate(), enabled),
+			toggled: CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: 'actions',
+				order: 1,
+				when: enabled
+			},
+			keybinding: [{
+				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over terminal
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC,
+			}, {
+				when: CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyCode.Escape
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.getContribution(BrowserEditorChatIntegration)?.addElementToChat();
+		}
+	}
+}
+
+class AddConsoleLogsToChatAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.AddConsoleLogsToChat;
+
+	constructor() {
+		const enabled = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('config.chat.sendElementsToChat.enabled', true));
+		super({
+			id: AddConsoleLogsToChatAction.ID,
+			title: localize2('browser.addConsoleLogsToChatAction', 'Add Console Logs to Chat'),
+			category: BrowserActionCategory,
+			icon: Codicon.output,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate(), enabled),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: 'actions',
+				order: 2,
+				when: enabled
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.getContribution(BrowserEditorChatIntegration)?.addConsoleLogsToChat();
+		}
+	}
+}
+
+class AddFocusedElementToChatAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.browser.addFocusedElementToChat',
+			title: localize2('browser.addFocusedElementToChat', 'Add Focused Element to Chat'),
+			category: BrowserActionCategory,
+			f1: false,
+			precondition: CONTEXT_BROWSER_FOCUSED,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib + 50,
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				when: CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.getContribution(BrowserEditorChatIntegration)?.addFocusedElementToChat();
+		}
+	}
+}
+
+registerAction2(AddElementToChatAction);
+registerAction2(AddConsoleLogsToChatAction);
+registerAction2(AddFocusedElementToChatAction);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	...workbenchConfigurationNodeBase,
+	properties: {
+		'workbench.browser.enableChatTools': {
+			type: 'boolean',
+			default: false,
+			experiment: { mode: 'startup' },
+			tags: ['experimental'],
+			markdownDescription: localize(
+				{ comment: ['This is the description for a setting.'], key: 'browser.enableChatTools' },
+				'When enabled, chat agents can use browser tools to open and interact with pages in the Integrated Browser.'
+			),
+			policy: {
+				name: 'BrowserChatTools',
+				category: PolicyCategory.InteractiveSession,
+				minimumVersion: '1.110',
+				value: (policyData) => policyData.chat_preview_features_enabled === false ? false : undefined,
+				localization: {
+					description: {
+						key: 'browser.enableChatTools',
+						value: localize('browser.enableChatTools', 'When enabled, chat agents can use browser tools to open and interact with pages in the Integrated Browser.')
+					}
+				},
+			}
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorFindFeature.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorFindFeature.ts
new file mode 100644
index 00000000000..241f78d087c
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorFindFeature.ts
@@ -0,0 +1,408 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../../nls.js';
+import { $, getWindow } from '../../../../../base/browser/dom.js';
+import { IContextKey, IContextKeyService, ContextKeyExpr, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IBrowserViewModel } from '../../common/browserView.js';
+import { BrowserViewCommandId } from '../../../../../platform/browserView/common/browserView.js';
+import { SimpleFindWidget } from '../../../codeEditor/browser/find/simpleFindWidget.js';
+import { IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { BrowserEditor, BrowserEditorContribution, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL } from '../browserEditor.js';
+import { BROWSER_EDITOR_ACTIVE, BrowserActionCategory, BrowserActionGroup } from '../browserViewActions.js';
+
+const CONTEXT_BROWSER_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('browserFindWidgetVisible', false, localize('browser.findWidgetVisible', "Whether the browser find widget is visible"));
+const CONTEXT_BROWSER_FIND_WIDGET_FOCUSED = new RawContextKey<boolean>('browserFindWidgetFocused', false, localize('browser.findWidgetFocused', "Whether the browser find widget is focused"));
+
+/**
+ * Find widget for the integrated browser view.
+ * Uses the SimpleFindWidget base class and communicates with the browser view model
+ * to perform find operations in the rendered web page.
+ */
+class BrowserFindWidget extends SimpleFindWidget {
+	private _model: IBrowserViewModel | undefined;
+	private readonly _modelDisposables = this._register(new DisposableStore());
+	private readonly _findWidgetVisible: IContextKey<boolean>;
+	private readonly _findWidgetFocused: IContextKey<boolean>;
+	private _lastFindResult: { resultIndex: number; resultCount: number } | undefined;
+	private _hasFoundMatch = false;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
+
+	constructor(
+		container: HTMLElement,
+		@IContextViewService contextViewService: IContextViewService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IHoverService hoverService: IHoverService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IAccessibilityService accessibilityService: IAccessibilityService
+	) {
+		super({
+			showCommonFindToggles: true,
+			checkImeCompletionState: true,
+			showResultCount: true,
+			enableSash: true,
+			initialWidth: 350,
+			previousMatchActionId: BrowserViewCommandId.FindPrevious,
+			nextMatchActionId: BrowserViewCommandId.FindNext,
+			closeWidgetActionId: BrowserViewCommandId.HideFind
+		}, contextViewService, contextKeyService, hoverService, keybindingService, configurationService, accessibilityService);
+
+		this._findWidgetVisible = CONTEXT_BROWSER_FIND_WIDGET_VISIBLE.bindTo(contextKeyService);
+		this._findWidgetFocused = CONTEXT_BROWSER_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
+
+		const domNode = this.getDomNode();
+		container.appendChild(domNode);
+
+		let lastHeight = domNode.offsetHeight;
+		const resizeObserver = new (getWindow(container).ResizeObserver)(() => {
+			const newHeight = domNode.offsetHeight;
+			if (newHeight !== lastHeight) {
+				lastHeight = newHeight;
+				this._onDidChangeHeight.fire();
+			}
+		});
+		resizeObserver.observe(domNode);
+		this._register(toDisposable(() => resizeObserver.disconnect()));
+	}
+
+	/**
+	 * Set the browser view model to use for find operations.
+	 * This should be called whenever the editor input changes.
+	 */
+	setModel(model: IBrowserViewModel | undefined): void {
+		this._modelDisposables.clear();
+		this._model = model;
+		this._lastFindResult = undefined;
+		this._hasFoundMatch = false;
+
+		if (model) {
+			this._modelDisposables.add(model.onDidFindInPage(result => {
+				this._lastFindResult = {
+					resultIndex: result.activeMatchOrdinal - 1, // Convert to 0-based index
+					resultCount: result.matches
+				};
+				this._hasFoundMatch = result.matches > 0;
+				this.updateButtons(this._hasFoundMatch);
+				this.updateResultCount();
+			}));
+
+			this._modelDisposables.add(model.onWillDispose(() => {
+				this.setModel(undefined);
+			}));
+		}
+	}
+
+	override reveal(initialInput?: string): void {
+		const wasVisible = this.isVisible();
+		super.reveal(initialInput);
+		this._findWidgetVisible.set(true);
+
+		// Focus the find input
+		this.focusFindBox();
+
+		// If there's existing input and the widget wasn't already visible, trigger a search
+		if (this.inputValue && !wasVisible) {
+			this._onInputChanged();
+		}
+	}
+
+	override hide(): void {
+		super.hide(false);
+		this._findWidgetVisible.reset();
+
+		// Stop find and clear highlights in the browser view
+		this._model?.stopFindInPage(true);
+		this._model?.focus();
+		this._lastFindResult = undefined;
+		this._hasFoundMatch = false;
+	}
+
+	find(previous: boolean): void {
+		const value = this.inputValue;
+		if (value && this._model) {
+			this._model.findInPage(value, {
+				forward: !previous,
+				recompute: false,
+				matchCase: this._getCaseSensitiveValue()
+			});
+		}
+	}
+
+	findFirst(): void {
+		const value = this.inputValue;
+		if (value && this._model) {
+			this._model.findInPage(value, {
+				forward: true,
+				recompute: true,
+				matchCase: this._getCaseSensitiveValue()
+			});
+		}
+	}
+
+	clear(): void {
+		if (this._model) {
+			this._model.stopFindInPage(false);
+			this._lastFindResult = undefined;
+			this._hasFoundMatch = false;
+		}
+	}
+
+	protected _onInputChanged(): boolean {
+		if (this.inputValue) {
+			this.findFirst();
+		} else if (this._model) {
+			this.clear();
+		}
+		return false;
+	}
+
+	protected async _getResultCount(): Promise<{ resultIndex: number; resultCount: number } | undefined> {
+		return this._lastFindResult;
+	}
+
+	protected _onFocusTrackerFocus(): void {
+		this._findWidgetFocused.set(true);
+	}
+
+	protected _onFocusTrackerBlur(): void {
+		this._findWidgetFocused.reset();
+	}
+
+	protected _onFindInputFocusTrackerFocus(): void {
+		// No-op
+	}
+
+	protected _onFindInputFocusTrackerBlur(): void {
+		// No-op
+	}
+}
+
+/**
+ * Browser editor contribution that manages the find-in-page widget.
+ *
+ * Creates a container just below the toolbar and lazily instantiates the
+ * {@link BrowserFindWidget}.  When the find widget's height changes the
+ * browser container is re-laid-out so that the web-contents view stays in
+ * sync.
+ */
+export class BrowserEditorFindContribution extends BrowserEditorContribution {
+	private readonly _findWidgetContainer: HTMLElement;
+	private readonly _findWidget: Lazy<BrowserFindWidget>;
+
+	constructor(
+		editor: BrowserEditor,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super(editor);
+
+		this._findWidgetContainer = $('.browser-find-widget-wrapper');
+
+		this._findWidget = new Lazy(() => {
+			const findWidget = this.instantiationService.createInstance(
+				BrowserFindWidget,
+				this._findWidgetContainer
+			);
+			if (editor.model) {
+				findWidget.setModel(editor.model);
+			}
+			findWidget.onDidChangeHeight(() => {
+				editor.layoutBrowserContainer();
+			});
+			return findWidget;
+		});
+		this._register(toDisposable(() => this._findWidget.rawValue?.dispose()));
+	}
+
+	/**
+	 * The container element to insert below the toolbar.
+	 */
+	override get toolbarElements(): readonly HTMLElement[] {
+		return [this._findWidgetContainer];
+	}
+
+	protected override subscribeToModel(model: IBrowserViewModel, _store: DisposableStore): void {
+		this._findWidget.rawValue?.setModel(model);
+	}
+
+	override clear(): void {
+		this._findWidget.rawValue?.setModel(undefined);
+		this._findWidget.rawValue?.hide();
+	}
+
+	override layout(width: number): void {
+		this._findWidget.rawValue?.layout(width);
+	}
+
+	/**
+	 * Show the find widget, optionally pre-populated with selected text from the browser view
+	 */
+	async showFind(): Promise<void> {
+		const selectedText = (await this.editor.model?.getSelectedText())?.trim();
+		const textToReveal = selectedText && !/[\r\n]/.test(selectedText) ? selectedText : undefined;
+		this._findWidget.value.reveal(textToReveal);
+		this._findWidget.value.layout(this._findWidgetContainer.clientWidth);
+	}
+
+	/**
+	 * Hide the find widget
+	 */
+	hideFind(): void {
+		this._findWidget.rawValue?.hide();
+	}
+
+	/**
+	 * Find the next match
+	 */
+	findNext(): void {
+		this._findWidget.rawValue?.find(false);
+	}
+
+	/**
+	 * Find the previous match
+	 */
+	findPrevious(): void {
+		this._findWidget.rawValue?.find(true);
+	}
+}
+
+BrowserEditor.registerContribution(BrowserEditorFindContribution);
+
+// -- Actions ----------------------------------------------------------------
+
+class ShowBrowserFindAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.ShowFind;
+
+	constructor() {
+		super({
+			id: ShowBrowserFindAction.ID,
+			title: localize2('browser.showFindAction', 'Find in Page'),
+			category: BrowserActionCategory,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Page,
+				order: 1,
+			},
+			keybinding: {
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.KeyF
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): void {
+		if (browserEditor instanceof BrowserEditor) {
+			void browserEditor.getContribution(BrowserEditorFindContribution)?.showFind();
+		}
+	}
+}
+
+class HideBrowserFindAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.HideFind;
+
+	constructor() {
+		super({
+			id: HideBrowserFindAction.ID,
+			title: localize2('browser.hideFindAction', 'Close Find Widget'),
+			category: BrowserActionCategory,
+			f1: false,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE),
+			keybinding: {
+				weight: KeybindingWeight.EditorContrib + 5,
+				primary: KeyCode.Escape
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.getContribution(BrowserEditorFindContribution)?.hideFind();
+		}
+	}
+}
+
+class BrowserFindNextAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.FindNext;
+
+	constructor() {
+		super({
+			id: BrowserFindNextAction.ID,
+			title: localize2('browser.findNextAction', 'Find Next'),
+			category: BrowserActionCategory,
+			f1: false,
+			precondition: BROWSER_EDITOR_ACTIVE,
+			keybinding: [{
+				when: CONTEXT_BROWSER_FIND_WIDGET_FOCUSED,
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyCode.Enter
+			}, {
+				when: CONTEXT_BROWSER_FIND_WIDGET_VISIBLE,
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyCode.F3,
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyG }
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.getContribution(BrowserEditorFindContribution)?.findNext();
+		}
+	}
+}
+
+class BrowserFindPreviousAction extends Action2 {
+	static readonly ID = BrowserViewCommandId.FindPrevious;
+
+	constructor() {
+		super({
+			id: BrowserFindPreviousAction.ID,
+			title: localize2('browser.findPreviousAction', 'Find Previous'),
+			category: BrowserActionCategory,
+			f1: false,
+			precondition: BROWSER_EDITOR_ACTIVE,
+			keybinding: [{
+				when: CONTEXT_BROWSER_FIND_WIDGET_FOCUSED,
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyMod.Shift | KeyCode.Enter
+			}, {
+				when: CONTEXT_BROWSER_FIND_WIDGET_VISIBLE,
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyMod.Shift | KeyCode.F3,
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG }
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.getContribution(BrowserEditorFindContribution)?.findPrevious();
+		}
+	}
+}
+
+registerAction2(ShowBrowserFindAction);
+registerAction2(HideBrowserFindAction);
+registerAction2(BrowserFindNextAction);
+registerAction2(BrowserFindPreviousAction);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorZoomFeature.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorZoomFeature.ts
new file mode 100644
index 00000000000..a527d8ab6c4
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserEditorZoomFeature.ts
@@ -0,0 +1,297 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../../nls.js';
+import { $ } from '../../../../../base/browser/dom.js';
+import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { disposableTimeout } from '../../../../../base/common/async.js';
+import { browserZoomFactors, browserZoomLabel, browserZoomAccessibilityLabel } from '../../../../../platform/browserView/common/browserView.js';
+import { IBrowserViewModel } from '../../../browserView/common/browserView.js';
+import { BrowserZoomService, IBrowserZoomService, MATCH_WINDOW_ZOOM_LABEL } from '../../../browserView/common/browserZoomService.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { BrowserEditor, BrowserEditorContribution, CONTEXT_BROWSER_HAS_ERROR, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_FOCUSED, IBrowserEditorWidgetContribution } from '../browserEditor.js';
+import { BROWSER_EDITOR_ACTIVE, BrowserActionCategory, BrowserActionGroup } from '../browserViewActions.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
+import { getZoomLevel, onDidChangeZoomLevel } from '../../../../../base/browser/browser.js';
+import { zoomLevelToZoomFactor } from '../../../../../platform/window/common/window.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { workbenchConfigurationNodeBase } from '../../../../common/configuration.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+
+const CONTEXT_BROWSER_CAN_ZOOM_IN = new RawContextKey<boolean>('browserCanZoomIn', true, localize('browser.canZoomIn', "Whether the browser can zoom in further"));
+const CONTEXT_BROWSER_CAN_ZOOM_OUT = new RawContextKey<boolean>('browserCanZoomOut', true, localize('browser.canZoomOut', "Whether the browser can zoom out further"));
+
+/**
+ * Transient zoom-level indicator that briefly appears inside the URL bar on zoom changes.
+ */
+class BrowserZoomPill extends Disposable {
+	readonly element: HTMLElement;
+	private readonly _icon: HTMLElement;
+	private readonly _label: HTMLElement;
+	private readonly _timeout = this._register(new MutableDisposable());
+
+	constructor() {
+		super();
+		this.element = $('.browser-zoom-pill');
+		// Don't announce this transient element; the zoom level is announced via IAccessibilityService.status()
+		this.element.setAttribute('aria-hidden', 'true');
+		this._icon = $('span');
+		this._label = $('span');
+		this.element.appendChild(this._icon);
+		this.element.appendChild(this._label);
+	}
+
+	/**
+	 * Briefly show the zoom level, then auto-hide after 750 ms.
+	 */
+	show(zoomLabel: string, isAtOrAboveDefault: boolean): void {
+		this._icon.className = ThemeIcon.asClassName(isAtOrAboveDefault ? Codicon.zoomIn : Codicon.zoomOut);
+		this._label.textContent = zoomLabel;
+		this.element.classList.add('visible');
+		// Reset auto-hide timer so rapid zoom actions extend the display
+		this._timeout.value = disposableTimeout(() => {
+			this.element.classList.remove('visible');
+		}, 750); // Chrome shows the zoom level for 1.5 seconds, but we show it for less because ours is non-interactive
+	}
+}
+
+/**
+ * Browser editor contribution that manages zoom context keys and the zoom pill indicator.
+ */
+export class BrowserEditorZoomSupport extends BrowserEditorContribution {
+	private readonly _zoomPill: BrowserZoomPill;
+	private readonly _canZoomInContext: IContextKey<boolean>;
+	private readonly _canZoomOutContext: IContextKey<boolean>;
+
+	constructor(
+		editor: BrowserEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IBrowserZoomService private readonly browserZoomService: IBrowserZoomService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
+	) {
+		super(editor);
+		this._canZoomInContext = CONTEXT_BROWSER_CAN_ZOOM_IN.bindTo(contextKeyService);
+		this._canZoomOutContext = CONTEXT_BROWSER_CAN_ZOOM_OUT.bindTo(contextKeyService);
+		this._zoomPill = this._register(new BrowserZoomPill());
+	}
+
+	override get urlBarWidgets(): readonly IBrowserEditorWidgetContribution[] {
+		return [{ element: this._zoomPill.element, order: 0 }];
+	}
+
+	protected override subscribeToModel(model: IBrowserViewModel, store: DisposableStore): void {
+		this._updateZoomContext(model);
+		store.add(model.onDidChangeZoom(() => {
+			this._updateZoomContext(model);
+		}));
+	}
+
+	override clear(): void {
+		this._canZoomInContext.reset();
+		this._canZoomOutContext.reset();
+	}
+
+	async zoomIn(): Promise<void> {
+		await this.editor.model?.zoomIn();
+		this._showZoomPill();
+	}
+
+	async zoomOut(): Promise<void> {
+		await this.editor.model?.zoomOut();
+		this._showZoomPill();
+	}
+
+	async resetZoom(): Promise<void> {
+		await this.editor.model?.resetZoom();
+		this._showZoomPill();
+	}
+
+	private _updateZoomContext(model: IBrowserViewModel): void {
+		this._canZoomInContext.set(model.canZoomIn);
+		this._canZoomOutContext.set(model.canZoomOut);
+	}
+
+	private _showZoomPill(): void {
+		const model = this.editor.model;
+		if (!model) {
+			return;
+		}
+		const defaultIndex = this.browserZoomService.getEffectiveZoomIndex(undefined, false);
+		const defaultFactor = browserZoomFactors[defaultIndex];
+		const currentFactor = model.zoomFactor;
+		const label = browserZoomLabel(currentFactor);
+		this._zoomPill.show(label, currentFactor >= defaultFactor);
+		// Announce the new zoom level to screen readers (polite, non-interruptive).
+		this.accessibilityService.status(browserZoomAccessibilityLabel(currentFactor));
+	}
+}
+
+// Register the contribution
+BrowserEditor.registerContribution(BrowserEditorZoomSupport);
+
+// -- Actions ------------------------------------------------------------
+
+class ZoomInAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.zoomIn';
+
+	constructor() {
+		super({
+			id: ZoomInAction.ID,
+			title: localize2('browser.zoomInAction', 'Zoom In'),
+			category: BrowserActionCategory,
+			icon: Codicon.zoomIn,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Zoom,
+				order: 1,
+				when: CONTEXT_BROWSER_CAN_ZOOM_IN,
+			},
+			keybinding: {
+				when: CONTEXT_BROWSER_FOCUSED,
+				weight: KeybindingWeight.WorkbenchContrib + 75,
+				// Same shortcuts as 'workbench.action.zoomIn'
+				primary: KeyMod.CtrlCmd | KeyCode.Equal,
+				secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Equal, KeyMod.CtrlCmd | KeyCode.NumpadAdd],
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.getContribution(BrowserEditorZoomSupport)?.zoomIn();
+		}
+	}
+}
+
+class ZoomOutAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.zoomOut';
+
+	constructor() {
+		super({
+			id: ZoomOutAction.ID,
+			title: localize2('browser.zoomOutAction', 'Zoom Out'),
+			category: BrowserActionCategory,
+			icon: Codicon.zoomOut,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Zoom,
+				order: 2,
+				when: CONTEXT_BROWSER_CAN_ZOOM_OUT,
+			},
+			keybinding: {
+				when: CONTEXT_BROWSER_FOCUSED,
+				weight: KeybindingWeight.WorkbenchContrib + 75,
+				// Same shortcuts as 'workbench.action.zoomOut'
+				primary: KeyMod.CtrlCmd | KeyCode.Minus,
+				secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Minus, KeyMod.CtrlCmd | KeyCode.NumpadSubtract],
+				linux: {
+					primary: KeyMod.CtrlCmd | KeyCode.Minus,
+					secondary: [KeyMod.CtrlCmd | KeyCode.NumpadSubtract]
+				}
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.getContribution(BrowserEditorZoomSupport)?.zoomOut();
+		}
+	}
+}
+
+class ResetZoomAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.resetZoom';
+
+	constructor() {
+		super({
+			id: ResetZoomAction.ID,
+			title: localize2('browser.resetZoomAction', 'Reset Zoom'),
+			category: BrowserActionCategory,
+			icon: Codicon.screenNormal,
+			f1: true,
+			precondition: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_HAS_URL, CONTEXT_BROWSER_HAS_ERROR.negate()),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Zoom,
+				order: 3,
+			},
+			keybinding: {
+				when: CONTEXT_BROWSER_FOCUSED,
+				weight: KeybindingWeight.WorkbenchContrib + 75,
+				// Same shortcuts as 'workbench.action.zoomReset'
+				// (note: both workbench and here use Numpad0 instead of Digit0 to avoid conflicts with keybinding to focus sidebar.)
+				primary: KeyMod.CtrlCmd | KeyCode.Numpad0,
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.getContribution(BrowserEditorZoomSupport)?.resetZoom();
+		}
+	}
+}
+
+registerAction2(ZoomInAction);
+registerAction2(ZoomOutAction);
+registerAction2(ResetZoomAction);
+
+/**
+ * Bridges the application's UI zoom level changes into IBrowserZoomService so that
+ * views using the 'Match Window' default zoom level stay in sync.
+ */
+class WindowZoomSynchronizer extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.browserView.windowZoomSynchronizer';
+
+	constructor(@IBrowserZoomService browserZoomService: IBrowserZoomService) {
+		super();
+		browserZoomService.notifyWindowZoomChanged(zoomLevelToZoomFactor(getZoomLevel(mainWindow)));
+		this._register(onDidChangeZoomLevel(() => {
+			browserZoomService.notifyWindowZoomChanged(zoomLevelToZoomFactor(getZoomLevel(mainWindow)));
+		}));
+	}
+}
+
+registerWorkbenchContribution2(WindowZoomSynchronizer.ID, WindowZoomSynchronizer, WorkbenchPhase.BlockRestore);
+
+registerSingleton(IBrowserZoomService, BrowserZoomService, InstantiationType.Delayed);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	...workbenchConfigurationNodeBase,
+	properties: {
+		'workbench.browser.pageZoom': {
+			type: 'string',
+			enum: [MATCH_WINDOW_ZOOM_LABEL, ...browserZoomFactors.map(f => `${Math.round(f * 100)}%`)],
+			markdownEnumDescriptions: [
+				localize(
+					{ comment: ['This is the description for a setting enum value.'], key: 'browser.defaultZoomLevel.matchWindow' },
+					'Matches the application\'s current UI zoom level.'
+				),
+				...browserZoomFactors.map(() => ''),
+			],
+			default: MATCH_WINDOW_ZOOM_LABEL,
+			markdownDescription: localize(
+				{ comment: ['This is the description for a setting.'], key: 'browser.pageZoom' },
+				'Default zoom level for all sites in the Integrated Browser.'
+			),
+			// Zoom can change from machine to machine, so we don't need the workspace-level nor syncing that WINDOW has.
+			scope: ConfigurationScope.MACHINE
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts b/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts
new file mode 100644
index 00000000000..1e160d8a98e
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/features/browserTabManagementFeatures.ts
@@ -0,0 +1,534 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IEditorGroupsService, GroupsOrder } from '../../../../services/editor/common/editorGroupsService.js';
+import { EditorsOrder, GroupIdentifier } from '../../../../common/editor.js';
+import { IQuickInputService, IQuickInputButton, IQuickPickItem, IQuickPickSeparator, QuickInputButtonLocation, IQuickPick } from '../../../../../platform/quickinput/common/quickInput.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { BrowserViewUri } from '../../../../../platform/browserView/common/browserViewUri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { BrowserEditorInput } from '../../common/browserEditorInput.js';
+import { BROWSER_EDITOR_ACTIVE, BrowserActionCategory, BrowserActionGroup } from '../browserViewActions.js';
+import { logBrowserOpen } from '../../../../../platform/browserView/common/browserViewTelemetry.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { BrowserViewCommandId } from '../../../../../platform/browserView/common/browserView.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../../common/configuration.js';
+import { IExternalOpener, IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { isLocalhostAuthority } from '../../../../../platform/url/common/trustedDomains.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ToggleTitleBarConfigAction } from '../../../../browser/parts/titlebar/titlebarActions.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { match } from '../../../../../base/common/glob.js';
+
+const CONTEXT_BROWSER_EDITOR_OPEN = new RawContextKey<boolean>('browserEditorOpen', false, localize('browser.editorOpen', "Whether any browser editor is currently open"));
+
+interface IBrowserQuickPickItem extends IQuickPickItem {
+	groupId: GroupIdentifier;
+	editor: BrowserEditorInput;
+}
+
+const closeButtonItem: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.close),
+	tooltip: localize('browser.closeTab', "Close")
+};
+
+const closeAllButtonItem: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.closeAll),
+	tooltip: localize('browser.closeAllTabs', "Close All"),
+	location: QuickInputButtonLocation.Inline
+};
+
+
+/**
+ * Manages a quick pick that lists all open browser tabs grouped by editor group,
+ * with close buttons, live updates, and an always-visible "New Integrated Browser Tab" entry.
+ */
+class BrowserTabQuickPick extends Disposable {
+
+	private readonly _quickPick: IQuickPick<IBrowserQuickPickItem, { useSeparators: true }>;
+	private readonly _itemListeners = this._register(new DisposableStore());
+
+	private readonly _openNewTabPick: IBrowserQuickPickItem = {
+		groupId: -1,
+		editor: undefined!,
+		label: localize('browser.openNewTab', "New Integrated Browser Tab"),
+		iconClass: ThemeIcon.asClassName(Codicon.add),
+		alwaysShow: true,
+	};
+
+	constructor(
+		@IEditorService private readonly _editorService: IEditorService,
+		@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
+		@IQuickInputService quickInputService: IQuickInputService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		super();
+
+		this._quickPick = this._register(quickInputService.createQuickPick<IBrowserQuickPickItem>({ useSeparators: true }));
+		this._quickPick.placeholder = localize('browser.quickOpenPlaceholder', "Select a browser tab or enter a URL");
+		this._quickPick.matchOnDescription = true;
+		this._quickPick.sortByLabel = false;
+		this._quickPick.buttons = [closeAllButtonItem];
+
+		this._register(this._quickPick.onDidTriggerItemButton(async ({ item }) => {
+			if (!item.editor) {
+				return;
+			}
+			const group = this._editorGroupsService.getGroup(item.groupId);
+			if (group) {
+				await group.closeEditor(item.editor, {
+					preserveFocus: true // Don't shift focus so the quickpick doesn't close
+				});
+			}
+		}));
+
+		this._register(this._quickPick.onDidTriggerButton(async () => {
+			for (const group of this._editorGroupsService.getGroups(GroupsOrder.GRID_APPEARANCE)) {
+				const browserEditors = group.editors.filter((e): e is BrowserEditorInput => e instanceof BrowserEditorInput);
+				if (browserEditors.length > 0) {
+					await group.closeEditors(browserEditors, {
+						preserveFocus: true // Don't shift focus so the quickpick doesn't close
+					});
+				}
+			}
+		}));
+
+		this._register(this._quickPick.onDidAccept(async () => {
+			const [selected] = this._quickPick.selectedItems;
+			if (!selected) {
+				return;
+			}
+			if (selected === this._openNewTabPick) {
+				logBrowserOpen(telemetryService, 'quickOpenWithoutUrl');
+				this._quickPick.hide();
+				await this._editorService.openEditor({
+					resource: BrowserViewUri.forId(generateUuid()),
+				});
+			} else {
+				await this._editorService.openEditor(selected.editor, selected.groupId);
+			}
+		}));
+
+		this._register(this._quickPick.onDidHide(() => this.dispose()));
+	}
+
+	show(): void {
+		this._buildItems();
+
+		// Pre-select the currently active browser editor
+		const activeEditor = this._editorService.activeEditor;
+		if (activeEditor instanceof BrowserEditorInput) {
+			const activePick = (this._quickPick.items as readonly (IBrowserQuickPickItem | IQuickPickSeparator)[])
+				.find((item): item is IBrowserQuickPickItem => item.type !== 'separator' && item.editor === activeEditor);
+			if (activePick) {
+				this._quickPick.activeItems = [activePick];
+			}
+		}
+
+		this._quickPick.show();
+	}
+
+	private _buildItems(): void {
+		this._itemListeners.clear();
+
+		// Remember which editor was active so we can restore selection
+		const activeEditor = this._quickPick.activeItems[0]?.editor;
+
+		const picks: (IBrowserQuickPickItem | IQuickPickSeparator)[] = [];
+		const groups = this._editorGroupsService.getGroups(GroupsOrder.GRID_APPEARANCE);
+
+		const groupsWithBrowserEditors = groups
+			.map(group => ({ group, browserEditors: group.editors.filter((e): e is BrowserEditorInput => e instanceof BrowserEditorInput) }))
+			.filter(({ browserEditors }) => browserEditors.length > 0);
+		const multipleGroups = groupsWithBrowserEditors.length > 1;
+
+		// Build a map of group ID to aria label for screen readers
+		const mapGroupIdToGroupAriaLabel = new Map<GroupIdentifier, string>();
+		for (const { group } of groupsWithBrowserEditors) {
+			mapGroupIdToGroupAriaLabel.set(group.id, group.ariaLabel);
+		}
+
+		let newActivePick: IBrowserQuickPickItem | undefined;
+
+		for (const { group, browserEditors } of groupsWithBrowserEditors) {
+			if (multipleGroups) {
+				picks.push({ type: 'separator', label: group.label });
+			}
+			for (const editor of browserEditors) {
+				const icon = editor.getIcon();
+				const description = editor.getDescription();
+				const nameAndDescription = description ? `${editor.getName()} ${description}` : editor.getName();
+				const pick: IBrowserQuickPickItem = {
+					groupId: group.id,
+					editor,
+					label: editor.getName(),
+					ariaLabel: multipleGroups
+						? localize('browserEntryAriaLabelWithGroup', "{0}, {1}", nameAndDescription, mapGroupIdToGroupAriaLabel.get(group.id))
+						: nameAndDescription,
+					description,
+					buttons: [closeButtonItem],
+					italic: !group.isPinned(editor),
+				};
+				if (icon instanceof URI) {
+					pick.iconPath = { dark: icon };
+				} else if (icon) {
+					pick.iconClass = ThemeIcon.asClassName(icon);
+				}
+				picks.push(pick);
+
+				if (editor === activeEditor) {
+					newActivePick = pick;
+				}
+
+				this._itemListeners.add(editor.onDidChangeLabel(() => this._buildItems()));
+			}
+			this._itemListeners.add(group.onDidModelChange(() => this._buildItems()));
+		}
+
+		picks.push({ type: 'separator' });
+		picks.push(this._openNewTabPick);
+
+		this._quickPick.keepScrollPosition = true;
+		this._quickPick.items = picks;
+		if (newActivePick) {
+			this._quickPick.activeItems = [newActivePick];
+		}
+	}
+}
+
+class QuickOpenBrowserAction extends Action2 {
+	constructor() {
+		const neverShowInTitleBar = ContextKeyExpr.equals('config.workbench.browser.showInTitleBar', false);
+		super({
+			id: BrowserViewCommandId.QuickOpen,
+			title: localize2('browser.quickOpenAction', "Quick Open Browser Tab..."),
+			icon: Codicon.globe,
+			category: BrowserActionCategory,
+			f1: true,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				// Note: on Linux this conflicts with the "toggle block comment" keybinding.
+				//       it's not as problem at the moment becase oh the `when`, but worth noting for the future.
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyA,
+				when: BROWSER_EDITOR_ACTIVE
+			},
+			menu: {
+				id: MenuId.TitleBar,
+				group: 'navigation',
+				order: 10,
+				when: ContextKeyExpr.and(CONTEXT_BROWSER_EDITOR_OPEN, neverShowInTitleBar.negate()),
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const picker = accessor.get(IInstantiationService).createInstance(BrowserTabQuickPick);
+		picker.show();
+	}
+}
+
+interface IOpenBrowserOptions {
+	url?: string;
+	openToSide?: boolean;
+
+	/**
+	 * If set, the first existing tab with a URL matching this glob pattern will be reused / focused instead of opening a new tab.
+	 *
+	 * This is used by Live Preview extension to reuse tabs, especially after reload / restart.
+	 */
+	reuseUrlFilter?: string;
+}
+
+class OpenIntegratedBrowserAction extends Action2 {
+	constructor() {
+		super({
+			id: BrowserViewCommandId.Open,
+			title: localize2('browser.openAction', "Open Integrated Browser"),
+			category: BrowserActionCategory,
+			icon: Codicon.globe,
+			f1: true,
+			menu: {
+				id: MenuId.TitleBar,
+				group: 'navigation',
+				order: 10,
+				when: ContextKeyExpr.and(
+					// This is a hack to work around `true` just testing for truthiness of the key. It works since `1 == true` in JS.
+					ContextKeyExpr.equals('config.workbench.browser.showInTitleBar', 1),
+					CONTEXT_BROWSER_EDITOR_OPEN.negate()
+				)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, urlOrOptions?: string | IOpenBrowserOptions): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const telemetryService = accessor.get(ITelemetryService);
+
+		// Parse arguments
+		const options = typeof urlOrOptions === 'string' ? { url: urlOrOptions } : (urlOrOptions ?? {});
+		const resource = BrowserViewUri.forId(generateUuid());
+		const group = options.openToSide ? SIDE_GROUP : ACTIVE_GROUP;
+
+		if (options.reuseUrlFilter) {
+			const filterUri = URI.parse(options.reuseUrlFilter);
+			const matchingEditor = editorService.editors.find((e): e is BrowserEditorInput => {
+				if (!(e instanceof BrowserEditorInput)) {
+					return false;
+				}
+
+				const editorUri = URI.parse(e.url || '');
+				// URIs default to putting "file" scheme. Check that the scheme is really in the filter.
+				if (filterUri.scheme && options.reuseUrlFilter!.startsWith(`${filterUri.scheme}:`) && filterUri.scheme !== editorUri.scheme) {
+					return false;
+				}
+				if (filterUri.authority && !match(filterUri.authority, editorUri.authority)) {
+					return false;
+				}
+				if (filterUri.path && !match(filterUri.path, editorUri.path)) {
+					return false;
+				}
+				if (filterUri.query) {
+					const filterParams = new URLSearchParams(filterUri.query);
+					const editorParams = new URLSearchParams(editorUri.query);
+					if (![...filterParams].every(([key, value]) => match(value, editorParams.get(key) ?? ''))) {
+						return false;
+					}
+				}
+
+				return true;
+			});
+			if (matchingEditor) {
+				if (options.url) {
+					matchingEditor.navigate(options.url);
+				}
+				await editorService.openEditor(matchingEditor);
+				return;
+			}
+		}
+
+		logBrowserOpen(telemetryService, options.url ? 'commandWithUrl' : 'commandWithoutUrl');
+
+		const editorPane = await editorService.openEditor({ resource, options: { viewState: { url: options.url } } }, group);
+
+		// Lock the group when opening to the side
+		if (options.openToSide && editorPane?.group) {
+			editorPane.group.lock(true);
+		}
+	}
+}
+
+class NewTabAction extends Action2 {
+	constructor() {
+		super({
+			id: BrowserViewCommandId.NewTab,
+			title: localize2('browser.newTabAction', "New Tab"),
+			category: BrowserActionCategory,
+			f1: true,
+			precondition: BROWSER_EDITOR_ACTIVE,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: BrowserActionGroup.Tabs,
+				order: 1,
+			},
+			// When already in a browser, Ctrl/Cmd + T opens a new tab
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over search actions
+				primary: KeyMod.CtrlCmd | KeyCode.KeyT,
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, _browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const telemetryService = accessor.get(ITelemetryService);
+		const resource = BrowserViewUri.forId(generateUuid());
+
+		logBrowserOpen(telemetryService, 'newTabCommand');
+
+		await editorService.openEditor({ resource });
+	}
+}
+
+class CloseAllBrowserTabsAction extends Action2 {
+	constructor() {
+		super({
+			id: BrowserViewCommandId.CloseAll,
+			title: localize2('browser.closeAll', "Close All Browser Tabs"),
+			category: BrowserActionCategory,
+			f1: true,
+			precondition: CONTEXT_BROWSER_EDITOR_OPEN,
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const editorGroupsService = accessor.get(IEditorGroupsService);
+		for (const group of editorGroupsService.getGroups(GroupsOrder.GRID_APPEARANCE)) {
+			const browserEditors = group.getEditors(EditorsOrder.SEQUENTIAL).filter((e): e is BrowserEditorInput => e instanceof BrowserEditorInput);
+			if (browserEditors.length > 0) {
+				await group.closeEditors(browserEditors);
+			}
+		}
+	}
+}
+
+class CloseAllBrowserTabsInGroupAction extends Action2 {
+	constructor() {
+		super({
+			id: BrowserViewCommandId.CloseAllInGroup,
+			title: localize2('browser.closeAllInGroup', "Close All Browser Tabs in Group"),
+			category: BrowserActionCategory,
+			f1: true,
+			precondition: BROWSER_EDITOR_ACTIVE,
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const editorGroupsService = accessor.get(IEditorGroupsService);
+		const editorService = accessor.get(IEditorService);
+		const group = editorGroupsService.getGroup(editorService.activeEditorPane?.group?.id ?? editorGroupsService.activeGroup.id);
+		if (!group) {
+			return;
+		}
+		const browserEditors = group.getEditors(EditorsOrder.SEQUENTIAL).filter((e): e is BrowserEditorInput => e instanceof BrowserEditorInput);
+		if (browserEditors.length > 0) {
+			await group.closeEditors(browserEditors);
+		}
+	}
+}
+
+// Register as "Close All Browser Tabs" action in editor title menu to align with the regular "Close All" action
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: BrowserViewCommandId.CloseAllInGroup, title: localize('browser.closeAllInGroupShort', "Close All Browser Tabs") }, group: '1_close', order: 55, when: BROWSER_EDITOR_ACTIVE });
+
+registerAction2(QuickOpenBrowserAction);
+registerAction2(OpenIntegratedBrowserAction);
+registerAction2(NewTabAction);
+registerAction2(CloseAllBrowserTabsAction);
+registerAction2(CloseAllBrowserTabsInGroupAction);
+
+registerAction2(class ToggleBrowserTitleBarButton extends ToggleTitleBarConfigAction {
+	constructor() {
+		super('workbench.browser.showInTitleBar', localize('toggle.browser', 'Integrated Browser'), localize('toggle.browserDescription', "Toggle visibility of the Integrated Browser button in title bar"), 8);
+	}
+});
+
+/**
+ * Tracks whether any browser editor is open across all editor groups and
+ * keeps the `browserEditorOpen` context key in sync.
+ */
+class BrowserEditorOpenContextKeyContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.browserEditorOpenContextKey';
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IEditorService editorService: IEditorService,
+	) {
+		super();
+
+		const contextKey = CONTEXT_BROWSER_EDITOR_OPEN.bindTo(contextKeyService);
+		const update = () => contextKey.set(editorService.editors.some(e => e instanceof BrowserEditorInput));
+
+		update();
+
+		this._register(editorService.onWillOpenEditor(e => {
+			if (e.editor instanceof BrowserEditorInput) {
+				contextKey.set(true);
+			}
+		}));
+		this._register(editorService.onDidCloseEditor(e => {
+			if (e.editor instanceof BrowserEditorInput) {
+				update();
+			}
+		}));
+	}
+}
+
+registerWorkbenchContribution2(BrowserEditorOpenContextKeyContribution.ID, BrowserEditorOpenContextKeyContribution, WorkbenchPhase.AfterRestored);
+
+/**
+ * Opens localhost URLs in the Integrated Browser when the setting is enabled.
+ */
+class LocalhostLinkOpenerContribution extends Disposable implements IWorkbenchContribution, IExternalOpener {
+	static readonly ID = 'workbench.contrib.localhostLinkOpener';
+
+	constructor(
+		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IEditorService private readonly editorService: IEditorService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) {
+		super();
+
+		this._register(openerService.registerExternalOpener(this));
+	}
+
+	async openExternal(href: string, _ctx: { sourceUri: URI; preferredOpenerId?: string }, _token: CancellationToken): Promise<boolean> {
+		if (!this.configurationService.getValue<boolean>('workbench.browser.openLocalhostLinks')) {
+			return false;
+		}
+
+		try {
+			const parsed = new URL(href);
+			if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+				return false;
+			}
+			if (!isLocalhostAuthority(parsed.host)) {
+				return false;
+			}
+		} catch {
+			return false;
+		}
+
+		logBrowserOpen(this.telemetryService, 'localhostLinkOpener');
+
+		const browserUri = BrowserViewUri.forId(generateUuid());
+		await this.editorService.openEditor({ resource: browserUri, options: { pinned: true, viewState: { url: href } } });
+		return true;
+	}
+}
+
+registerWorkbenchContribution2(LocalhostLinkOpenerContribution.ID, LocalhostLinkOpenerContribution, WorkbenchPhase.BlockStartup);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	...workbenchConfigurationNodeBase,
+	properties: {
+		'workbench.browser.showInTitleBar': {
+			type: ['boolean', 'string'],
+			enum: [true, false, 'whenOpen'],
+			enumDescriptions: [
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.showInTitleBar.true' }, 'The button is always shown in the title bar.'),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.showInTitleBar.false' }, 'The button is never shown in the title bar.'),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.showInTitleBar.whenOpen' }, 'The button is shown in the title bar when a browser editor is open.')
+			],
+			default: 'whenOpen',
+			experiment: { mode: 'startup' },
+			description: localize(
+				{ comment: ['This is the description for a setting.'], key: 'browser.showInTitleBar' },
+				'Controls whether the Integrated Browser button is shown in the title bar.'
+			)
+		},
+		'workbench.browser.openLocalhostLinks': {
+			type: 'boolean',
+			default: false,
+			experiment: { mode: 'startup' },
+			markdownDescription: localize(
+				{ comment: ['This is the description for a setting.'], key: 'browser.openLocalhostLinks' },
+				'When enabled, localhost links from the terminal, chat, and other sources will open in the Integrated Browser instead of the system browser.'
+			)
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css b/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css
index d80361715ce..f5856137557 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css
+++ b/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css
@@ -30,7 +30,7 @@
 	width: 100%;
 	height: 100%;
 
-	.browser-toolbar {
+	.browser-navbar {
 		display: flex;
 		align-items: center;
 		padding: 6px 8px;
@@ -58,6 +58,7 @@
 		flex: 1;
 		display: flex;
 		align-items: center;
+		min-width: 0;
 		background-color: var(--vscode-input-background);
 		border: 1px solid var(--vscode-input-border);
 		border-radius: var(--vscode-cornerRadius-small);
@@ -69,13 +70,47 @@
 
 	.browser-url-input {
 		flex: 1;
+		min-width: 0;
 		padding: 4px 8px;
+		font-size: 13px;
+		line-height: 17px;
 		background-color: transparent;
 		color: var(--vscode-input-foreground);
 		border: none;
 		border-radius: var(--vscode-cornerRadius-small);
 		outline: none !important;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
+
+	.browser-url-bar-widgets {
+		display: flex;
+		align-items: center;
+		flex-shrink: 0;
+	}
+
+	.browser-zoom-pill {
+		display: none;
+		align-items: center;
+		gap: 2px;
+		margin: 0 2px;
+		padding: 0 2px;
+		flex-shrink: 0;
+		border-radius: var(--vscode-cornerRadius-small);
+		color: var(--vscode-descriptionForeground);
 		font-size: 13px;
+		line-height: 1;
+		white-space: nowrap;
+		pointer-events: none;
+
+		&.visible {
+			display: flex;
+		}
+
+		.codicon {
+			font-size: 14px;
+		}
 	}
 
 	.browser-share-toggle-container {
@@ -285,18 +320,19 @@
 		left: 0;
 		right: 0;
 		bottom: 0;
-		flex: 1;
 		display: flex;
 		align-items: flex-start;
-		justify-content: flex-start;
+		justify-content: center;
 		padding: 80px 40px;
-		margin: 0 2px 2px;
 		background-color: var(--vscode-editor-background);
+		overflow-y: auto;
 	}
 
 	.browser-error-content {
-		max-width: 600px;
+		max-width: 520px;
 		width: 100%;
+		user-select: text;
+		-webkit-user-select: text;
 	}
 
 	.browser-error-title {
@@ -307,9 +343,8 @@
 	}
 
 	.browser-error-detail {
-		margin-bottom: 12px;
-		line-height: 1.6;
-		color: var(--vscode-foreground);
+		margin-bottom: 8px;
+		line-height: 20px;
 
 		strong {
 			font-weight: 600;
@@ -317,7 +352,7 @@
 
 		code {
 			background-color: var(--vscode-textCodeBlock-background);
-			padding: 2px 6px;
+			padding: 1px 4px;
 			border-radius: 3px;
 			font-family: var(--monaco-monospace-font);
 			font-size: 12px;
@@ -330,10 +365,6 @@
 		z-index: 10;
 		overflow: hidden;
 
-		&.find-visible {
-			border-bottom: 1px solid var(--vscode-widget-border);
-		}
-
 		/* Override SimpleFindWidget absolute positioning to flow in layout */
 		.simple-find-part-wrapper {
 			position: relative;
@@ -433,4 +464,169 @@
 		}
 
 	}
+
+	/* Site info indicator in URL bar */
+	.browser-site-info-container {
+		display: flex;
+		align-items: center;
+		position: relative;
+		flex-shrink: 0;
+		margin-left: 1px;
+	}
+
+	.browser-site-info-indicator {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 23px;
+		height: 23px;
+		border-radius: var(--vscode-cornerRadius-small);
+		cursor: pointer;
+		background-color: var(--vscode-statusBarItem-errorBackground);
+		outline: none !important;
+
+		&:focus-visible {
+			outline: 1px solid var(--vscode-focusBorder) !important;
+			outline-offset: -1px !important;
+		}
+
+		.codicon {
+			font-size: 15px;
+			margin: 0;
+			color: var(--vscode-statusBarItem-errorForeground);
+		}
+	}
+
+	/* URL input wrapper for display/input swap */
+	.browser-url-input-wrapper {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		min-width: 0;
+	}
+
+	.browser-url-display {
+		flex: 1;
+		padding: 4px 8px;
+		font-size: 13px;
+		line-height: 17px;
+		color: var(--vscode-input-foreground);
+		cursor: text;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		outline: none !important;
+
+		&.placeholder {
+			color: var(--vscode-input-placeholderForeground);
+		}
+	}
+
+	.browser-url-display-protocol-bad {
+		color: var(--vscode-errorForeground);
+		text-decoration: line-through;
+	}
+
+	/* Certificate error page styles */
+	.browser-error-icon {
+		margin-bottom: 12px;
+
+		.codicon {
+			font-size: 32px;
+		}
+
+		&.cert-error .codicon {
+			color: var(--vscode-errorForeground);
+		}
+	}
+
+	.browser-cert-details-table {
+		margin-top: 16px;
+		padding: 8px 4px;
+		border: 1px solid var(--vscode-widget-border, var(--vscode-contrastBorder, transparent));
+		border-radius: var(--vscode-cornerRadius-medium);
+		background-color: var(--vscode-editorWidget-background);
+	}
+
+	.browser-cert-details-heading {
+		font-weight: 600;
+		margin-bottom: 8px;
+		padding: 0 8px;
+	}
+
+	.browser-cert-details-row {
+		display: grid;
+		grid-template-columns: 30% 70%;
+		gap: 4px;
+		padding: 3px 8px;
+		font-size: 12px;
+
+		&:nth-child(odd) {
+			background-color: rgba(130, 130, 130, 0.04);
+		}
+	}
+
+	.browser-cert-details-label {
+		color: var(--vscode-descriptionForeground);
+		white-space: nowrap;
+	}
+
+	.browser-cert-details-value {
+		word-break: break-all;
+		font-family: var(--monaco-monospace-font);
+	}
+
+	.browser-cert-action {
+		margin-top: 20px;
+		display: flex;
+		justify-content: flex-end;
+		flex-direction: row;
+		gap: 8px;
+
+		&.reverse {
+			flex-direction: row-reverse;
+			justify-content: flex-start;
+		}
+
+		.monaco-button {
+			width: fit-content;
+		}
+	}
+
+	/* Site info hover popover */
+	.browser-site-info-hover-content {
+		padding: 4px 8px;
+		width: 320px;
+		max-width: 320px;
+	}
+
+	.browser-site-info-hover-heading {
+		font-weight: 600;
+		color: var(--vscode-errorForeground);
+	}
+
+	.browser-site-info-hover-detail {
+		font-size: 12px;
+		line-height: 1.5;
+		margin-top: 8px;
+	}
+
+	.browser-site-info-hover-revoke {
+		display: inline-block;
+		font-size: 12px;
+		color: var(--vscode-textLink-foreground);
+		cursor: pointer;
+		text-decoration: var(--text-link-decoration);
+		margin-top: 8px;
+
+		&:hover {
+			color: var(--vscode-textLink-activeForeground);
+			text-decoration: underline;
+		}
+
+		&:focus-visible {
+			outline: 1px solid var(--vscode-focusBorder);
+			outline-offset: 2px;
+		}
+	}
 }
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/siteInfoWidget.ts b/src/vs/workbench/contrib/browserView/electron-browser/siteInfoWidget.ts
new file mode 100644
index 00000000000..5ec296b0cef
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/siteInfoWidget.ts
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from '../../../../nls.js';
+import { $, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IBrowserViewCertificateError } from '../../../../platform/browserView/common/browserView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import type { BrowserEditor } from './browserEditor.js';
+
+/**
+ * Widget that displays site security information (e.g. certificate errors)
+ * as an indicator button inside the URL bar, with a hover popover for details.
+ */
+export class SiteInfoWidget extends Disposable {
+
+	private readonly _container: HTMLElement;
+	private readonly _indicator: HTMLElement;
+
+	constructor(
+		parent: HTMLElement,
+		private readonly editor: BrowserEditor,
+		@IHoverService private readonly hoverService: IHoverService
+	) {
+		super();
+
+		this._container = $('.browser-site-info-container');
+		this._container.style.display = 'none';
+
+		this._indicator = $('.browser-site-info-indicator');
+		this._indicator.tabIndex = 0;
+		this._indicator.role = 'button';
+		this._indicator.ariaLabel = localize('browser.notSecure', "Not Secure");
+		this._indicator.appendChild(renderIcon(Codicon.workspaceUntrusted));
+		this._container.appendChild(this._indicator);
+
+		parent.appendChild(this._container);
+
+		this._register(addDisposableListener(this._indicator, EventType.CLICK, () => this._showHover()));
+		this._register(addDisposableListener(this._indicator, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				this._showHover();
+			}
+		}));
+	}
+
+	/**
+	 * Update visibility and state from a certificate error (or lack thereof).
+	 */
+	setCertificateError(certError: IBrowserViewCertificateError | undefined): void {
+		this._container.style.display = certError ? '' : 'none';
+	}
+
+	private _showHover(): void {
+		const certError = this.editor.getCertificateError();
+		if (!certError) {
+			return;
+		}
+
+		const content = document.createElement('div');
+		content.classList.add('browser-site-info-hover-content');
+
+		const heading = document.createElement('div');
+		heading.classList.add('browser-site-info-hover-heading');
+		heading.textContent = localize('browser.certHoverHeading', "Certificate Not Trusted");
+		content.appendChild(heading);
+
+		const detail1 = document.createElement('div');
+		detail1.classList.add('browser-site-info-hover-detail');
+		detail1.textContent = localize(
+			'browser.certHoverDetail1',
+			"Your connection to this site is not secure."
+		);
+		content.appendChild(detail1);
+
+		if (certError.hasTrustedException) {
+			const detail2 = document.createElement('div');
+			detail2.classList.add('browser-site-info-hover-detail');
+			detail2.textContent = localize(
+				'browser.certHoverDetail2',
+				"You previously chose to proceed to '{0}' despite a certificate error ({1}).",
+				certError.host,
+				certError.error
+			);
+			content.appendChild(detail2);
+
+			const revokeLink = document.createElement('a');
+			revokeLink.classList.add('browser-site-info-hover-revoke');
+			revokeLink.textContent = localize('browser.certRevoke', "Revoke and Close");
+			revokeLink.role = 'button';
+			revokeLink.tabIndex = 0;
+			revokeLink.addEventListener('click', () => {
+				hover?.dispose();
+				this.editor.revokeAndClose(certError);
+			});
+			revokeLink.addEventListener('keydown', (e) => {
+				if (e.key === 'Enter' || e.key === ' ') {
+					e.preventDefault();
+					hover?.dispose();
+					this.editor.revokeAndClose(certError);
+				}
+			});
+			content.appendChild(revokeLink);
+		}
+
+		const hover = this.hoverService.showInstantHover({
+			content,
+			target: this._indicator,
+			container: this._container,
+			position: { hoverPosition: HoverPosition.BELOW },
+			persistence: { sticky: true }
+		}, true);
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/tools/browserTools.contribution.ts b/src/vs/workbench/contrib/browserView/electron-browser/tools/browserTools.contribution.ts
index ee655808073..b113304a284 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/tools/browserTools.contribution.ts
+++ b/src/vs/workbench/contrib/browserView/electron-browser/tools/browserTools.contribution.ts
@@ -13,7 +13,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase, type IWorkbenchContribu
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { IChatContextService } from '../../../chat/browser/contextContrib/chatContextService.js';
 import { ILanguageModelToolsService, ToolDataSource, ToolSet } from '../../../chat/common/tools/languageModelToolsService.js';
-import { BrowserEditorInput } from '../browserEditorInput.js';
+import { BrowserEditorInput } from '../../common/browserEditorInput.js';
 import { ClickBrowserTool, ClickBrowserToolData } from './clickBrowserTool.js';
 import { DragElementTool, DragElementToolData } from './dragElementTool.js';
 import { HandleDialogBrowserTool, HandleDialogBrowserToolData } from './handleDialogBrowserTool.js';
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/tools/openBrowserToolNonAgentic.ts b/src/vs/workbench/contrib/browserView/electron-browser/tools/openBrowserToolNonAgentic.ts
index d9c819f7ca9..67e4e0eb801 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/tools/openBrowserToolNonAgentic.ts
+++ b/src/vs/workbench/contrib/browserView/electron-browser/tools/openBrowserToolNonAgentic.ts
@@ -7,6 +7,7 @@ import type { CancellationToken } from '../../../../../base/common/cancellation.
 import { localize } from '../../../../../nls.js';
 import { logBrowserOpen } from '../../../../../platform/browserView/common/browserViewTelemetry.js';
 import { BrowserViewUri } from '../../../../../platform/browserView/common/browserViewUri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../chat/common/tools/languageModelToolsService.js';
@@ -50,8 +51,8 @@ export class OpenBrowserToolNonAgentic implements IToolImpl {
 
 		logBrowserOpen(this.telemetryService, 'chatTool');
 
-		const browserUri = BrowserViewUri.forUrl(params.url);
-		await this.editorService.openEditor({ resource: browserUri, options: { pinned: true } });
+		const browserUri = BrowserViewUri.forId(generateUuid());
+		await this.editorService.openEditor({ resource: browserUri, options: { pinned: true, viewState: { url: params.url } } });
 
 		return {
 			content: [{
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/tools/readBrowserTool.ts b/src/vs/workbench/contrib/browserView/electron-browser/tools/readBrowserTool.ts
index 63aa66cc707..9f9d04f4e2f 100644
--- a/src/vs/workbench/contrib/browserView/electron-browser/tools/readBrowserTool.ts
+++ b/src/vs/workbench/contrib/browserView/electron-browser/tools/readBrowserTool.ts
@@ -43,7 +43,7 @@ export class ReadBrowserTool implements IToolImpl {
 	) { }
 
 	async prepareToolInvocation(_context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
-		const link = `[browser page](${BrowserViewUri.forUrl('', _context.parameters.pageId).toString()})`;
+		const link = `[browser page](${BrowserViewUri.forId(_context.parameters.pageId).toString()})`;
 		return {
 			invocationMessage: new MarkdownString(localize('browser.read.invocation', "Reading {0}", link)),
 			pastTenseMessage: new MarkdownString(localize('browser.read.past', "Read {0}", link)),
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index a6f6a8952dc..f33a0d8cba9 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -56,6 +56,7 @@ import { ISCMHistoryItemChangeRangeVariableEntry, ISCMHistoryItemChangeVariableE
 import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../../common/model/chatViewModel.js';
 import { IChatWidgetHistoryService } from '../../common/widget/chatWidgetHistoryService.js';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { AICustomizationManagementCommands } from '../aiCustomization/aiCustomizationManagement.js';
 import { ILanguageModelChatSelector, ILanguageModelsService } from '../../common/languageModels.js';
 import { CopilotUsageExtensionFeatureId } from '../../common/languageModelStats.js';
 import { ILanguageModelToolsConfirmationService } from '../../common/tools/languageModelToolsConfirmationService.js';
@@ -86,6 +87,7 @@ export const GENERATE_SKILL_COMMAND_ID = 'workbench.action.chat.generateSkill';
 export const GENERATE_AGENT_COMMAND_ID = 'workbench.action.chat.generateAgent';
 export const GENERATE_HOOK_COMMAND_ID = 'workbench.action.chat.generateHook';
 export const INSERT_FORK_CONVERSATION_COMMAND_ID = 'workbench.action.chat.insertForkConversationCommand';
+export const INSERT_TROUBLESHOOT_COMMAND_ID = 'workbench.action.chat.insertTroubleshootCommand';
 
 const defaultChat = {
 	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
@@ -1394,6 +1396,27 @@ export function registerChatActions() {
 		}
 	});
 
+	registerAction2(class InsertTroubleshootSlashCommandAction extends Action2 {
+		constructor() {
+			super({
+				id: INSERT_TROUBLESHOOT_COMMAND_ID,
+				title: localize2('insertTroubleshootSlashCommand', "Insert Troubleshoot Command"),
+				shortTitle: localize2('insertTroubleshootSlashCommand.short', "Insert /troubleshoot"),
+				category: CHAT_CATEGORY,
+				f1: true,
+				precondition: ChatContextKeys.enabled
+			});
+		}
+
+		async run(accessor: ServicesAccessor): Promise<void> {
+			const commandService = accessor.get(ICommandService);
+			await commandService.executeCommand('workbench.action.chat.open', {
+				query: '/troubleshoot ',
+				isPartialQuery: true,
+			});
+		}
+	});
+
 	registerAction2(class OpenChatFeatureSettingsAction extends Action2 {
 		constructor() {
 			super({
@@ -1413,6 +1436,12 @@ export function registerChatActions() {
 					id: MenuId.ChatWelcomeContext,
 					group: '2_settings',
 					order: 1
+				},
+				{
+					id: MenuId.ViewTitle,
+					when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId), ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`)),
+					order: 15,
+					group: '3_configure'
 				}]
 			});
 		}
@@ -1423,11 +1452,29 @@ export function registerChatActions() {
 		}
 	});
 
+	// When customizations menu is enabled, show a direct gear action to open the Customizations editor
+	MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
+		command: {
+			id: AICustomizationManagementCommands.OpenEditor,
+			title: localize2('openChatCustomizations', "Open Customizations"),
+			category: CHAT_CATEGORY,
+			icon: Codicon.gear
+		},
+		group: 'navigation',
+		when: ContextKeyExpr.and(
+			ChatContextKeys.enabled,
+			ContextKeyExpr.equals('view', ChatViewId),
+			ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`)
+		),
+		order: 6
+	});
+
+	// When customizations menu is disabled, show the legacy gear submenu
 	MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
 		submenu: CHAT_CONFIG_MENU_ID,
 		title: localize2('config.label', "Configure Chat"),
 		group: 'navigation',
-		when: ContextKeyExpr.equals('view', ChatViewId),
+		when: ContextKeyExpr.and(ContextKeyExpr.equals('view', ChatViewId), ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`).negate()),
 		icon: Codicon.gear,
 		order: 6
 	});
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts
index 6401df034be..b6eb80ddbbf 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { isElectron } from '../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
@@ -21,19 +22,26 @@ import { FileEditorInput } from '../../../files/browser/editors/fileEditorInput.
 import { NotebookEditorInput } from '../../../notebook/common/notebookEditorInput.js';
 import { IChatContextPickService, IChatContextValueItem, IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../attachments/chatContextPickService.js';
 import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry, IImageVariableEntry, toToolSetVariableEntry, toToolVariableEntry } from '../../common/attachments/chatVariableEntries.js';
-import { ILanguageModelToolsService, isToolSet, ToolDataSource } from '../../common/tools/languageModelToolsService.js';
-import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { isToolSet, ToolDataSource } from '../../common/tools/languageModelToolsService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
+import { IChatWidget } from '../chat.js';
 import { imageToHash, isImage } from '../widget/input/editor/chatPasteProviders.js';
 import { convertBufferToScreenshotVariable } from '../attachments/chatScreenshotContext.js';
 import { ChatInstructionsPickerPick } from '../promptSyntax/attachInstructionsAction.js';
 import { createDebugEventsAttachment } from '../chatDebug/chatDebugAttachment.js';
 import { IChatDebugService } from '../../common/chatDebugService.js';
-import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { getAgentSessionProviderIcon, AgentSessionProviders } from '../agentSessions/agentSessions.js';
 import { ITerminalService } from '../../../terminal/browser/terminal.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 
+/**
+ * Command ID that extensions can call to enable debug tools for the current
+ * chat session. Sets the context key and immediately flushes tool updates so
+ * that newly-enabled tools are visible on the next `vscode.lm.tools` read.
+ */
+export const EnableChatDebugToolsCommandId = 'chat.enableDebugTools';
 
 export class ChatContextContributions extends Disposable implements IWorkbenchContribution {
 
@@ -42,29 +50,9 @@ export class ChatContextContributions extends Disposable implements IWorkbenchCo
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IChatContextPickService contextPickService: IChatContextPickService,
-		@IChatDebugService chatDebugService: IChatDebugService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService,
-		@IChatWidgetService chatWidgetService: IChatWidgetService,
 	) {
 		super();
 
-		// Bind at the global context key service level so the tools service can evaluate it.
-		// Widget-scoped keys are not reliably visible to singleton services during async request processing.
-		const hasAttachedDebugDataKey = ChatContextKeys.chatSessionHasAttachedDebugData.bindTo(contextKeyService);
-		this._store.add(chatWidgetService.onDidChangeFocusedSession(() => {
-			const sessionResource = chatWidgetService.lastFocusedWidget?.viewModel?.sessionResource;
-			hasAttachedDebugDataKey.set(!!sessionResource && chatDebugService.hasAttachedDebugData(sessionResource));
-			languageModelToolsService.flushToolUpdates();
-		}));
-		this._store.add(chatDebugService.onDidAttachDebugData(sessionResource => {
-			const focusedSession = chatWidgetService.lastFocusedWidget?.viewModel?.sessionResource;
-			if (focusedSession && focusedSession.toString() === sessionResource.toString()) {
-				hasAttachedDebugDataKey.set(true);
-				languageModelToolsService.flushToolUpdates();
-			}
-		}));
-
 		// ###############################################################################################
 		//
 		// Default context picks/values which are "native" to chat. This is NOT the complete list
@@ -79,6 +67,7 @@ export class ChatContextContributions extends Disposable implements IWorkbenchCo
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ClipboardImageContextValuePick)));
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ScreenshotContextValuePick)));
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(DebugEventsSnapshotContextValuePick)));
+		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(SessionReferenceContextPickerPick)));
 	}
 }
 
@@ -335,3 +324,53 @@ class DebugEventsSnapshotContextValuePick implements IChatContextValueItem {
 		return createDebugEventsAttachment(sessionResource, this._chatDebugService);
 	}
 }
+
+class SessionReferenceContextPickerPick implements IChatContextPickerItem {
+
+	readonly type = 'pickerPick';
+	readonly icon = Codicon.comment;
+	readonly label = localize('chatContext.sessions', 'Sessions...');
+	readonly ordinal = -400;
+
+	constructor(
+		@IChatSessionsService private readonly _chatSessionsService: IChatSessionsService,
+	) { }
+
+	isEnabled(widget: IChatWidget): boolean {
+		return widget.location === ChatAgentLocation.Chat;
+	}
+
+	asPicker(widget: IChatWidget): IChatContextPicker {
+		const currentSessionResource = widget.viewModel?.sessionResource;
+		return {
+			placeholder: localize('chatContext.sessions.placeholder', 'Select a session'),
+			picks: (async () => {
+				const picks: IChatContextPickerPickItem[] = [];
+				const sessionProviderFilter = [AgentSessionProviders.Local, AgentSessionProviders.Background, AgentSessionProviders.Claude];
+				for await (const group of this._chatSessionsService.getChatSessionItems(sessionProviderFilter, CancellationToken.None)) {
+					const providerIcon = getAgentSessionProviderIcon(group.chatSessionType);
+					for (const item of group.items) {
+						if (currentSessionResource && item.resource.toString() === currentSessionResource.toString()) {
+							continue;
+						}
+						const sessionResource = item.resource;
+						const icon = item.iconPath ?? providerIcon;
+						picks.push({
+							label: item.label,
+							description: new Date(item.timing.lastRequestEnded ?? item.timing.created).toLocaleString(),
+							asAttachment: (): IChatRequestVariableEntry => ({
+								kind: 'sessionReference',
+								id: sessionResource.toString(),
+								name: item.label,
+								value: sessionResource,
+								icon,
+							})
+						});
+					}
+				}
+				picks.sort((a, b) => (b.description ?? '').localeCompare(a.description ?? ''));
+				return picks;
+			})()
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index b8c8e03eb9d..04243ca9f84 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -51,6 +51,7 @@ import { isQuickChat } from '../widget/chatWidget.js';
 import { resizeImage } from '../chatImageUtils.js';
 import { registerPromptActions } from '../promptSyntax/promptFileActions.js';
 import { CHAT_CATEGORY } from './chatActions.js';
+import { registerCreatePluginAction } from './createPluginAction.js';
 
 export function registerChatContextActions() {
 	registerAction2(AttachContextAction);
@@ -60,6 +61,7 @@ export function registerChatContextActions() {
 	registerAction2(AttachSearchResultAction);
 	registerAction2(AttachPinnedEditorsToChatAction);
 	registerPromptActions();
+	registerCreatePluginAction();
 }
 
 async function withChatView(accessor: ServicesAccessor): Promise<IChatWidget | undefined> {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index c49e5c69c32..a35750ecd16 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -24,7 +24,7 @@ import { ITelemetryService } from '../../../../../platform/telemetry/common/tele
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { IsSessionsWindowContext } from '../../../../common/contextkeys.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
-import { getModeNameForTelemetry, IChatMode, IChatModeService } from '../../common/chatModes.js';
+import { getModeNameForTelemetry, buildCustomAgentHandoffsInfo, getHandoffId, IChatMode, IChatModeService } from '../../common/chatModes.js';
 import { chatVariableLeader } from '../../common/requestParser/chatParserTypes.js';
 import { ChatStopCancellationNoopClassification, ChatStopCancellationNoopEvent, ChatStopCancellationNoopEventName, IChatService } from '../../common/chatService/chatService.js';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
@@ -608,6 +608,7 @@ export class OpenDelegationPickerAction extends Action2 {
 						ChatContextKeys.enabled,
 						ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat),
 						ChatContextKeys.inQuickChat.negate(),
+						ChatContextKeys.chatSessionSupportsDelegation,
 						ChatContextKeys.chatSessionIsEmpty.negate()
 					),
 					group: 'navigation',
@@ -1021,6 +1022,163 @@ export class CancelEdit extends Action2 {
 	}
 }
 
+// --- Handoff Discovery & Execution Commands ---
+
+export const GetHandoffsActionId = 'workbench.action.chat.getHandoffs';
+
+interface IGetHandoffsArgs {
+	/**
+	 * Name of the custom agent (defined in an `.agent.md` file) whose handoffs
+	 * you want to retrieve. If omitted, all
+	 * handoffs from all agents and built-in modes are returned.
+	 */
+	sourceCustomAgent?: string;
+}
+
+/**
+ * Discovers the handoffs available across custom agents (and built-in modes).
+ *
+ * **Return value**: `ICustomAgentInfo[]` — an array where each element
+ * represents an agent/mode with its `id`, `name`, `isBuiltin`,
+ * `visibility`, and `handoffs` list.
+ *
+ * @see ICustomAgentInfo
+ * @see IHandoffInfo
+ */
+class GetHandoffsAction extends Action2 {
+
+	static readonly ID = GetHandoffsActionId;
+
+	constructor() {
+		super({
+			id: GetHandoffsAction.ID,
+			title: localize2('chat.getHandoffs.label', "Get Handoffs"),
+			f1: false,
+			category: CHAT_CATEGORY,
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]) {
+		const modeService = accessor.get(IChatModeService);
+		const arg = args.at(0) as IGetHandoffsArgs | undefined;
+
+		const { builtin, custom } = modeService.getModes();
+		let allModes: readonly IChatMode[] = [...builtin, ...custom];
+
+		if (arg?.sourceCustomAgent) {
+			const filterName = arg.sourceCustomAgent;
+			allModes = allModes.filter(m => m.name.get().toLowerCase() === filterName.toLowerCase());
+		}
+
+		return buildCustomAgentHandoffsInfo(allModes);
+	}
+}
+
+export const ExecuteHandoffActionId = 'workbench.action.chat.executeHandoff';
+
+interface IExecuteHandoffArgs {
+	/**
+	 * The stable handoff ID (from getHandoffs). Primary match key.
+	 * IDs are unique within a given source agent; when handoffs from
+	 * multiple source agents share the same target+label, also provide
+	 * `sourceCustomAgent` to disambiguate.
+	 */
+	id?: string;
+	/** Fallback: handoff label to match. Case-insensitive. */
+	label?: string;
+	/**
+	 * The chat session URI identifying which chat widget to execute in.
+	 * If omitted, falls back to the last-focused chat widget.
+	 */
+	sessionResource?: string;
+	/**
+	 * Name of the *source* custom agent (from `.agent.md`) that declares the handoff to
+	 * execute. If omitted, falls back to the session's currently active mode/agent.
+	 */
+	sourceCustomAgent?: string;
+}
+
+interface IExecuteHandoffResult {
+	success: boolean;
+	targetMode?: string;
+	error?: string;
+}
+
+class ExecuteHandoffAction extends Action2 {
+
+	static readonly ID = ExecuteHandoffActionId;
+
+	constructor() {
+		super({
+			id: ExecuteHandoffAction.ID,
+			title: localize2('chat.executeHandoff.label', "Execute Handoff"),
+			f1: false,
+			category: CHAT_CATEGORY,
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<IExecuteHandoffResult> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const modeService = accessor.get(IChatModeService);
+
+		const arg = args.at(0) as IExecuteHandoffArgs | undefined;
+		if (!arg?.id && !arg?.label) {
+			return { success: false, error: 'Either id or label is required' };
+		}
+
+		// Resolve the target widget: explicit sessionResource, or fall back to last-focused
+		let widget: IChatWidget | undefined;
+		if (arg.sessionResource) {
+			let sessionResource;
+			try {
+				sessionResource = URI.parse(arg.sessionResource);
+			} catch {
+				return { success: false, error: `Invalid sessionResource URI: '${arg.sessionResource}'` };
+			}
+			widget = chatWidgetService.getWidgetBySessionResource(sessionResource);
+		} else {
+			widget = chatWidgetService.lastFocusedWidget;
+		}
+		if (!widget) {
+			return { success: false, error: 'No chat widget found. Provide sessionResource or focus a chat widget.' };
+		}
+
+		// Resolve the source custom agent whose handoffs we search (case-insensitive)
+		let sourceMode: IChatMode | undefined;
+		if (arg.sourceCustomAgent) {
+			const filterName = arg.sourceCustomAgent.toLowerCase();
+			const { builtin, custom } = modeService.getModes();
+			sourceMode = [...builtin, ...custom].find(m => m.name.get().toLowerCase() === filterName || m.id.toLowerCase() === filterName);
+		}
+		if (!sourceMode) {
+			sourceMode = widget.input.currentModeObs.get();
+		}
+
+		const handoffs = sourceMode?.handOffs?.get();
+		if (!handoffs || handoffs.length === 0) {
+			return { success: false, error: `No handoffs available for mode '${sourceMode?.name.get()}'` };
+		}
+
+		// Match by id first, then by label
+		let matchedHandoff = arg.id
+			? handoffs.find(h => getHandoffId(h) === arg.id)
+			: undefined;
+
+		if (!matchedHandoff && arg.label) {
+			const labelLower = arg.label.trim().toLowerCase();
+			matchedHandoff = handoffs.find(h => h.label.trim().toLowerCase() === labelLower);
+		}
+
+		if (!matchedHandoff) {
+			const identifier = arg.id ?? arg.label;
+			return { success: false, error: `No handoff with identifier '${identifier}' found for mode '${sourceMode?.name.get()}'` };
+		}
+
+		await widget.executeHandoff(matchedHandoff);
+		return { success: true, targetMode: matchedHandoff.agent };
+	}
+}
+
 
 export function registerChatExecuteActions() {
 	registerAction2(ChatSubmitAction);
@@ -1040,4 +1198,6 @@ export function registerChatExecuteActions() {
 	registerAction2(ChatSessionPrimaryPickerAction);
 	registerAction2(ChangeChatModelAction);
 	registerAction2(CancelEdit);
+	registerAction2(GetHandoffsAction);
+	registerAction2(ExecuteHandoffAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatForkActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatForkActions.ts
index fd008ea10c9..c0768d6b70a 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatForkActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatForkActions.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { revive } from '../../../../../base/common/marshalling.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -11,10 +12,12 @@ import { localize, localize2 } from '../../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IProgressService } from '../../../../../platform/progress/common/progress.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { IChatService, ResponseModelState } from '../../common/chatService/chatService.js';
 import type { ISerializableChatData } from '../../common/model/chatModel.js';
 import { isChatTreeItem, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { IChatSessionRequestHistoryItem, IChatSessionsService } from '../../common/chatSessionsService.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { ChatTreeItem, ChatViewPaneTarget, IChatWidgetService } from '../chat.js';
 
@@ -34,7 +37,13 @@ export function registerChatForkActions() {
 						id: MenuId.ChatMessageCheckpoint,
 						group: 'navigation',
 						order: 3,
-						when: ContextKeyExpr.and(ChatContextKeys.isRequest, ChatContextKeys.lockedToCodingAgent.negate())
+						when: ContextKeyExpr.and(
+							ChatContextKeys.isRequest,
+							ContextKeyExpr.or(
+								ChatContextKeys.lockedToCodingAgent.negate(),
+								ChatContextKeys.chatSessionSupportsFork
+							)
+						)
 					}
 				]
 			});
@@ -43,12 +52,22 @@ export function registerChatForkActions() {
 		async run(accessor: ServicesAccessor, ...args: unknown[]) {
 			const chatWidgetService = accessor.get(IChatWidgetService);
 			const chatService = accessor.get(IChatService);
+			const chatSessionsService = accessor.get(IChatSessionsService);
+			const progressService = accessor.get(IProgressService);
 			const forkedTitlePrefix = localize('chat.forked.titlePrefix', "Forked: ");
 
 			// When invoked via /fork slash command, args[0] is a URI (sessionResource).
 			// Fork at the last request in that session.
 			if (URI.isUri(args[0])) {
 				const sourceSessionResource = args[0];
+
+				// Check if this is a contributed session that supports forking
+				const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
+				if (contentProviderSchemes.includes(sourceSessionResource.scheme)) {
+					await forkContributedChatSession(sourceSessionResource, undefined, false, chatSessionsService, chatWidgetService, progressService);
+					return;
+				}
+
 				const chatModel = chatService.getSession(sourceSessionResource);
 				if (!chatModel) {
 					return;
@@ -117,17 +136,43 @@ export function registerChatForkActions() {
 				return;
 			}
 
-			const chatModel = chatService.getSession(sessionResource);
-			if (!chatModel) {
-				return;
-			}
-
 			// Get all requests and find the target request index
 			const targetRequestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
 			if (!targetRequestId) {
 				return;
 			}
 
+			// Check if this is a contributed session that supports forking
+			const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
+			if (contentProviderSchemes.includes(sessionResource.scheme)) {
+				const contributedSession = await chatSessionsService.getOrCreateChatSession(sessionResource, CancellationToken.None);
+				let request = contributedSession.history.find((entry): entry is IChatSessionRequestHistoryItem => entry.type === 'request' && entry.id === targetRequestId);
+				if (!request) {
+					const chatModel = chatService.getSession(sessionResource);
+					const serializedData = chatModel?.toJSON();
+					for (const [, entry] of serializedData?.requests.entries() ?? []) {
+						if (entry.requestId === targetRequestId) {
+							request = {
+								id: entry.requestId,
+								type: 'request',
+								prompt: typeof entry.message === 'string' ? entry.message : entry.message.text,
+								participant: entry.agent?.id ?? '',
+								variableData: entry.variableData,
+								modelId: entry.modelId,
+							};
+							break;
+						}
+					}
+				}
+				await forkContributedChatSession(sessionResource, request, true, chatSessionsService, chatWidgetService, progressService);
+				return;
+			}
+
+			const chatModel = chatService.getSession(sessionResource);
+			if (!chatModel) {
+				return;
+			}
+
 			// Export the full session data and truncate to include only requests up to and including the target
 			const serializedData = chatModel.toJSON();
 			const isRequestItem = isRequestVM(item);
@@ -187,3 +232,19 @@ export function registerChatForkActions() {
 		}
 	});
 }
+
+async function forkContributedChatSession(sourceSessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, openForkedSessionImmediately: boolean, chatSessionsService: IChatSessionsService, chatWidgetService: IChatWidgetService, progressService: IProgressService) {
+	const cts = new CancellationTokenSource();
+	try {
+		const forkedItem = await chatSessionsService.forkChatSession(sourceSessionResource, request, cts.token);
+		if (openForkedSessionImmediately) {
+			await chatWidgetService.openSession(forkedItem.resource, ChatViewPaneTarget);
+		} else {
+			setTimeout(async () => {
+				await chatWidgetService.openSession(forkedItem.resource, ChatViewPaneTarget);
+			}, 0);
+		}
+	} finally {
+		cts.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts
index 271e82b2baf..cdc8b4e2858 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts
@@ -205,6 +205,16 @@ export function registerNewChatActions() {
 		order: 1
 	});
 
+	MenuRegistry.appendMenuItem(MenuId.ChatTitleBarMenu, {
+		command: {
+			id: ACTION_ID_NEW_CHAT,
+			title: localize2('chat.newEdits.label', "New Chat"),
+		},
+		when: ChatContextKeys.enabled,
+		group: 'b_new',
+		order: -1,
+	});
+
 	registerAction2(class UndoChatEditInteractionAction extends EditingSessionAction {
 		constructor() {
 			super({
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatOpenAgentDebugPanelAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatOpenAgentDebugPanelAction.ts
index 685ebc58948..d6522e25c2a 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatOpenAgentDebugPanelAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatOpenAgentDebugPanelAction.ts
@@ -11,9 +11,11 @@ import { localize, localize2 } from '../../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IDialogService, IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { isChatViewTitleActionContext } from '../../common/actions/chatActions.js';
@@ -21,19 +23,21 @@ import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { IChatDebugService } from '../../common/chatDebugService.js';
 import { ChatViewId, IChatWidgetService } from '../chat.js';
 import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from './chatActions.js';
+import { ChatConfiguration } from '../../common/constants.js';
 import { ChatDebugEditorInput } from '../chatDebug/chatDebugEditorInput.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { IChatDebugEditorOptions } from '../chatDebug/chatDebugTypes.js';
+import { LocalChatSessionUri } from '../../common/model/chatUri.js';
 
 /**
- * Registers the Open Agent Debug Panel and Show Agent Logs actions.
+ * Registers the Open Agent Debug Logs and Show Agent Debug Logs actions.
  */
 export function registerChatOpenAgentDebugPanelAction() {
 	registerAction2(class OpenAgentDebugPanelAction extends Action2 {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.openAgentDebugPanel',
-				title: localize2('chat.openAgentDebugPanel.label', "Open Agent Debug Panel"),
+				title: localize2('chat.openAgentDebugPanel.label', "Open Agent Debug Logs"),
 				f1: true,
 				category: Categories.Developer,
 				precondition: ChatContextKeys.enabled,
@@ -56,10 +60,10 @@ export function registerChatOpenAgentDebugPanelAction() {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.openAgentDebugPanelForSession',
-				title: localize2('chat.openAgentDebugPanelForSession.label', "Show Agent Logs"),
+				title: localize2('chat.openAgentDebugPanelForSession.label', "Show Agent Debug Logs"),
 				f1: false,
 				category: CHAT_CATEGORY,
-				precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.chatSessionHasDebugData),
+				precondition: ChatContextKeys.enabled,
 				menu: [{
 					id: CHAT_CONFIG_MENU_ID,
 					when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
@@ -70,6 +74,11 @@ export function registerChatOpenAgentDebugPanelAction() {
 					group: '2_settings',
 					order: 0,
 					when: ChatContextKeys.inChatEditor.negate()
+				}, {
+					id: MenuId.ViewTitle,
+					when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId), ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`)),
+					order: 0,
+					group: '4_logs'
 				}]
 			});
 		}
@@ -126,6 +135,8 @@ export function registerChatOpenAgentDebugPanelAction() {
 			const fileDialogService = accessor.get(IFileDialogService);
 			const fileService = accessor.get(IFileService);
 			const notificationService = accessor.get(INotificationService);
+			const openerService = accessor.get(IOpenerService);
+			const telemetryService = accessor.get(ITelemetryService);
 
 			const sessionResource = chatDebugService.activeSessionResource;
 			if (!sessionResource) {
@@ -133,7 +144,11 @@ export function registerChatOpenAgentDebugPanelAction() {
 				return;
 			}
 
-			const defaultUri = joinPath(await fileDialogService.defaultFilePath(), defaultDebugLogFileName);
+			const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+			const rawIdentifier = localSessionId ?? (sessionResource.path.replace(/^\//, '') || sessionResource.authority);
+			const sessionIdentifier = rawIdentifier?.replace(/[/\\:*?"<>|.]+/g, '_').replace(/^_+|_+$/g, '');
+			const exportFileName = sessionIdentifier ? `agent-debug-log-${sessionIdentifier}.json` : defaultDebugLogFileName;
+			const defaultUri = joinPath(await fileDialogService.defaultFilePath(), exportFileName);
 			const outputPath = await fileDialogService.showSaveDialog({ defaultUri, filters: debugLogFilters });
 			if (!outputPath) {
 				return;
@@ -146,6 +161,19 @@ export function registerChatOpenAgentDebugPanelAction() {
 			}
 
 			await fileService.writeFile(outputPath, VSBuffer.wrap(data));
+
+			telemetryService.publicLog2<ChatDebugExportEvent, ChatDebugExportClassification>('chatDebugLogExported', {
+				fileSizeBytes: data.byteLength,
+			});
+
+			notificationService.prompt(
+				Severity.Info,
+				localize('chatDebugLog.exportSuccess', "Agent debug log exported successfully."),
+				[{
+					label: localize('chatDebugLog.openExportedFile', "Open File"),
+					run: () => openerService.open(outputPath)
+				}]
+			);
 		}
 	});
 
@@ -169,10 +197,12 @@ export function registerChatOpenAgentDebugPanelAction() {
 
 		async run(accessor: ServicesAccessor): Promise<void> {
 			const chatDebugService = accessor.get(IChatDebugService);
+			const dialogService = accessor.get(IDialogService);
 			const editorService = accessor.get(IEditorService);
 			const fileDialogService = accessor.get(IFileDialogService);
 			const fileService = accessor.get(IFileService);
 			const notificationService = accessor.get(INotificationService);
+			const telemetryService = accessor.get(ITelemetryService);
 
 			const defaultUri = joinPath(await fileDialogService.defaultFilePath(), defaultDebugLogFileName);
 			const result = await fileDialogService.showOpenDialog({
@@ -184,15 +214,62 @@ export function registerChatOpenAgentDebugPanelAction() {
 				return;
 			}
 
+			const maxImportSize = 50 * 1024 * 1024; // 50 MB
+			const stat = await fileService.stat(result[0]);
+			if (stat.size !== undefined && stat.size > maxImportSize) {
+				telemetryService.publicLog2<ChatDebugImportEvent, ChatDebugImportClassification>('chatDebugLogImported', {
+					fileSizeBytes: stat.size,
+					result: 'fileTooLarge',
+				});
+				await dialogService.warn(
+					localize('chatDebugLog.fileTooLargeTitle', "File Too Large"),
+					localize('chatDebugLog.fileTooLargeDetail', "The selected file ({0} MB) exceeds the 50 MB size limit for debug log imports.", (stat.size / (1024 * 1024)).toFixed(1))
+				);
+				return;
+			}
+
 			const content = await fileService.readFile(result[0]);
 			const sessionUri = await chatDebugService.importLog(content.value.buffer);
 			if (!sessionUri) {
+				telemetryService.publicLog2<ChatDebugImportEvent, ChatDebugImportClassification>('chatDebugLogImported', {
+					fileSizeBytes: content.value.byteLength,
+					result: 'providerFailed',
+				});
 				notificationService.notify({ severity: Severity.Warning, message: localize('chatDebugLog.importFailed', "Import is not supported by the current provider.") });
 				return;
 			}
 
+			telemetryService.publicLog2<ChatDebugImportEvent, ChatDebugImportClassification>('chatDebugLogImported', {
+				fileSizeBytes: content.value.byteLength,
+				result: 'success',
+			});
+
 			const options: IChatDebugEditorOptions = { pinned: true, sessionResource: sessionUri, viewHint: 'overview' };
 			await editorService.openEditor(ChatDebugEditorInput.instance, options);
 		}
 	});
 }
+
+// Telemetry types
+
+type ChatDebugExportEvent = {
+	fileSizeBytes: number;
+};
+
+type ChatDebugExportClassification = {
+	fileSizeBytes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Size of the exported chat debug log file in bytes.' };
+	owner: 'vijayu';
+	comment: 'Tracks usage of the Agent Debug Logs export feature.';
+};
+
+type ChatDebugImportEvent = {
+	fileSizeBytes: number;
+	result: 'success' | 'fileTooLarge' | 'providerFailed';
+};
+
+type ChatDebugImportClassification = {
+	fileSizeBytes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Size of the imported chat debug log file in bytes.' };
+	result: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Outcome of the chat debug file import: success, fileTooLarge, or providerFailed.' };
+	owner: 'vijayu';
+	comment: 'Tracks usage of the Agent Debug Logs import feature and failure modes.';
+};
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.ts
index c4186a2adca..7c60cd3cc90 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.ts
@@ -3,12 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize2 } from '../../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
-import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from './chatActions.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { IAgentPluginRepositoryService } from '../../common/plugins/agentPluginRepositoryService.js';
+import { IPluginInstallService } from '../../common/plugins/pluginInstallService.js';
+import { type IMarketplaceReference, MarketplaceReferenceKind, parseMarketplaceReference, parseMarketplaceReferences } from '../../common/plugins/pluginMarketplaceService.js';
 import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { InstalledAgentPluginsViewId } from '../agentPluginsView.js';
+import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from './chatActions.js';
 
 export class ManagePluginsAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.managePlugins';
@@ -32,6 +44,191 @@ export class ManagePluginsAction extends Action2 {
 	}
 }
 
+class InstallFromSourceAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.installPluginFromSource';
+
+	constructor() {
+		super({
+			id: InstallFromSourceAction.ID,
+			title: localize2('installPluginFromSource', 'Install Plugin from Source'),
+			category: CHAT_CATEGORY,
+			icon: Codicon.add,
+			precondition: ChatContextKeys.enabled,
+			f1: true,
+			menu: [{
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('view', InstalledAgentPluginsViewId),
+					ChatContextKeys.Setup.hidden.negate(),
+				),
+				group: 'navigation',
+				order: 1,
+			}],
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const quickInputService = accessor.get(IQuickInputService);
+		const pluginInstallService = accessor.get(IPluginInstallService);
+
+		const store = new DisposableStore();
+		const inputBox = store.add(quickInputService.createInputBox());
+		inputBox.placeholder = localize('pluginSourcePlaceholder', "owner/repo or git clone URL");
+		inputBox.prompt = localize('pluginSourcePrompt', "Enter a GitHub repository or git URL to install a plugin from");
+		inputBox.show();
+
+		store.add(inputBox.onDidChangeValue(() => {
+			inputBox.validationMessage = undefined;
+		}));
+
+		store.add(inputBox.onDidHide(() => {
+			store.dispose();
+		}));
+
+		store.add(inputBox.onDidAccept(async () => {
+			const source = inputBox.value.trim();
+			if (!source) {
+				return;
+			}
+
+			// Quick format validation keeps the input box open for correction.
+			const validationError = pluginInstallService.validatePluginSource(source);
+			if (validationError) {
+				inputBox.validationMessage = validationError;
+				return;
+			}
+
+			// Show busy state and prevent concurrent installs.
+			inputBox.busy = true;
+			inputBox.enabled = false;
+			try {
+				// Hide the input box so it doesn't conflict with trust/progress dialogs.
+				inputBox.hide();
+
+				const result = await pluginInstallService.installPluginFromValidatedSource(source);
+				if (!result.success) {
+					if (result.message) {
+						// Re-open with the error so the user can correct their input.
+						inputBox.validationMessage = result.message;
+					}
+					inputBox.show();
+				} else {
+					const ref = parseMarketplaceReference(source);
+					if (ref) {
+						accessor.get(IExtensionsWorkbenchService).openSearch(`@agentPlugins ${ref.displayLabel}`);
+					}
+				}
+			} finally {
+				inputBox.busy = false;
+				inputBox.enabled = true;
+			}
+		}));
+	}
+}
+
+interface IMarketplaceQuickPickItem extends IQuickPickItem {
+	readonly reference: IMarketplaceReference;
+}
+
+class ManagePluginMarketplacesAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.managePluginMarketplaces';
+
+	constructor() {
+		super({
+			id: ManagePluginMarketplacesAction.ID,
+			title: localize2('managePluginMarketplaces', 'Manage Plugin Marketplaces'),
+			icon: Codicon.globe,
+			category: CHAT_CATEGORY,
+			precondition: ChatContextKeys.enabled,
+			f1: true,
+			menu: [{
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('view', InstalledAgentPluginsViewId),
+					ChatContextKeys.Setup.hidden.negate(),
+				),
+				group: 'navigation',
+				order: 2,
+			}],
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const quickInputService = accessor.get(IQuickInputService);
+		const configurationService = accessor.get(IConfigurationService);
+		const pluginRepositoryService = accessor.get(IAgentPluginRepositoryService);
+		const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+		const commandService = accessor.get(ICommandService);
+		const fileService = accessor.get(IFileService);
+
+		const configuredRefs = configurationService.getValue<unknown[]>(ChatConfiguration.PluginMarketplaces) ?? [];
+		const refs = parseMarketplaceReferences(configuredRefs);
+
+		if (refs.length === 0) {
+			quickInputService.pick([], { placeHolder: localize('noMarketplaces', "No plugin marketplaces configured") });
+			return;
+		}
+
+		// Step 1: pick a marketplace
+		const items: IMarketplaceQuickPickItem[] = refs.map(ref => ({
+			label: ref.displayLabel,
+			description: ref.kind === MarketplaceReferenceKind.LocalFileUri
+				? localize('localMarketplace', "Local")
+				: ref.cloneUrl,
+			reference: ref,
+		}));
+
+		const selected = await quickInputService.pick(items, {
+			placeHolder: localize('selectMarketplace', "Select a plugin marketplace"),
+		});
+
+		if (!selected) {
+			return;
+		}
+
+		const ref = selected.reference;
+
+		// Step 2: pick an action for the selected marketplace
+		const actionItems: IQuickPickItem[] = [
+			{ id: 'showPlugins', label: localize('showPlugins', "Show Plugins") },
+		];
+
+		// "Open Folder" only for cloned/local repos
+		const repoUri = pluginRepositoryService.getRepositoryUri(ref);
+		const repoExists = await fileService.exists(repoUri);
+		if (repoExists) {
+			actionItems.push({ id: 'openDirectory', label: localize('openMarketplaceDirectory', "Open Folder") });
+		}
+
+		actionItems.push({ id: 'removeMarketplace', label: localize('removeMarketplace', "Remove Marketplace") });
+
+		const action = await quickInputService.pick(actionItems, {
+			placeHolder: localize('selectMarketplaceAction', "Select an action for '{0}'", ref.displayLabel),
+		});
+
+		if (!action) {
+			return;
+		}
+
+		switch (action.id) {
+			case 'showPlugins':
+				extensionsWorkbenchService.openSearch(`@agentPlugins ${ref.displayLabel}`);
+				break;
+			case 'openDirectory':
+				await commandService.executeCommand('revealFileInOS', repoUri);
+				break;
+			case 'removeMarketplace': {
+				const currentValues = configurationService.getValue<unknown[]>(ChatConfiguration.PluginMarketplaces) ?? [];
+				const updated = currentValues.filter(v => typeof v === 'string' && v.trim() !== ref.rawValue);
+				await configurationService.updateValue(ChatConfiguration.PluginMarketplaces, updated);
+				break;
+			}
+		}
+	}
+}
+
 export function registerChatPluginActions() {
 	registerAction2(ManagePluginsAction);
+	registerAction2(InstallFromSourceAction);
+	registerAction2(ManagePluginMarketplacesAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 14c73c7b688..89475130ce5 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -45,12 +45,12 @@ export function registerChatTitleActions() {
 					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					order: 2,
-					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ChatContextKeys.responseHasError.negate(), ContextKeyExpr.has(enableFeedbackConfig))
+					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ChatContextKeys.responseHasError.negate(), ContextKeyExpr.has(enableFeedbackConfig), ChatContextKeys.lockedToCodingAgent.negate())
 				}, {
 					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
 					group: 'navigation',
 					order: 1,
-					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ChatContextKeys.responseHasError.negate(), ContextKeyExpr.has(enableFeedbackConfig))
+					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ChatContextKeys.responseHasError.negate(), ContextKeyExpr.has(enableFeedbackConfig), ChatContextKeys.lockedToCodingAgent.negate())
 				}]
 			});
 		}
@@ -92,12 +92,12 @@ export function registerChatTitleActions() {
 					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					order: 3,
-					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ContextKeyExpr.has(enableFeedbackConfig))
+					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ContextKeyExpr.has(enableFeedbackConfig), ChatContextKeys.lockedToCodingAgent.negate())
 				}, {
 					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
 					group: 'navigation',
 					order: 2,
-					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ChatContextKeys.responseHasError.negate(), ContextKeyExpr.has(enableFeedbackConfig))
+					when: ContextKeyExpr.and(ChatContextKeys.extensionParticipantRegistered, ChatContextKeys.isResponse, ChatContextKeys.responseHasError.negate(), ContextKeyExpr.has(enableFeedbackConfig), ChatContextKeys.lockedToCodingAgent.negate())
 				}]
 			});
 		}
@@ -188,12 +188,13 @@ export function registerChatTitleActions() {
 						group: 'navigation',
 						when: ContextKeyExpr.and(
 							ChatContextKeys.isResponse,
-							ContextKeyExpr.in(ChatContextKeys.itemId.key, ChatContextKeys.lastItemId.key))
+							ContextKeyExpr.in(ChatContextKeys.itemId.key, ChatContextKeys.lastItemId.key),
+							ChatContextKeys.lockedToCodingAgent.negate())
 					},
 					{
 						id: MenuId.ChatEditingWidgetToolbar,
 						group: 'navigation',
-						when: applyingChatEditsFailedContextKey,
+						when: ContextKeyExpr.and(applyingChatEditsFailedContextKey, ChatContextKeys.lockedToCodingAgent.negate()),
 						order: 0
 					}
 				]
@@ -283,7 +284,7 @@ export function registerChatTitleActions() {
 					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					isHiddenByDefault: true,
-					when: ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ChatContextKeys.isResponse, ChatContextKeys.responseIsFiltered.negate())
+					when: ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, ChatContextKeys.isResponse, ChatContextKeys.responseIsFiltered.negate(), ChatContextKeys.lockedToCodingAgent.negate())
 				}
 			});
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
index 0baba0ac0dc..df32c865dff 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
@@ -117,7 +117,7 @@ export class InsertCodeBlockOperation {
 
 		const edits = [new ResourceTextEdit(activeModel.uri, { range, text })];
 		await this.bulkEditService.apply(edits);
-		this.codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
+		this.codeEditorService.listCodeEditors().find(editor => isEqual(editor.getModel()?.uri, activeModel.uri))?.focus();
 		return true;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/createPluginAction.ts b/src/vs/workbench/contrib/chat/browser/actions/createPluginAction.ts
new file mode 100644
index 00000000000..f07e36e4e5e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/createPluginAction.ts
@@ -0,0 +1,587 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { parse as parseJSONC } from '../../../../../base/common/jsonc.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { basename, dirname, joinPath } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isUriComponents, URI } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IQuickInputButton, IQuickInputService, IQuickTreeItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { InstalledAgentPluginsViewId } from '../agentPluginsView.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { IPromptPath, IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
+import { IMcpRegistry } from '../../../mcp/common/mcpRegistryTypes.js';
+import { McpCollectionDefinition, McpCollectionSortOrder, McpServerDefinition, McpServerTransportType } from '../../../mcp/common/mcpTypes.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+
+const VALID_PLUGIN_NAME = /^[a-z0-9]([a-z0-9\-.]*[a-z0-9])?$/;
+const INVALID_CONSECUTIVE = /--|[.][.]/;
+
+export function validatePluginName(name: string): string | undefined {
+	if (!name) {
+		return localize('pluginNameRequired', "Plugin name is required.");
+	}
+	if (name.length > 64) {
+		return localize('pluginNameTooLong', "Plugin name must be at most 64 characters.");
+	}
+	if (!VALID_PLUGIN_NAME.test(name)) {
+		return localize('pluginNameInvalid', "Plugin name must contain only lowercase alphanumeric characters, hyphens, and periods, and must start and end with an alphanumeric character.");
+	}
+	if (INVALID_CONSECUTIVE.test(name)) {
+		return localize('pluginNameConsecutive', "Plugin name must not contain consecutive hyphens or periods.");
+	}
+	return undefined;
+}
+
+type ResourceType = 'instruction' | 'prompt' | 'agent' | 'skill' | 'hook' | 'mcp';
+
+export interface IResourceTreeItem extends IQuickTreeItem {
+	readonly resourceType: ResourceType;
+	readonly promptPath?: IPromptPath;
+	readonly mcpServer?: { collection: McpCollectionDefinition; definition: McpServerDefinition };
+	children?: readonly IResourceTreeItem[];
+}
+
+interface IGroupTreeItem extends IQuickTreeItem {
+	readonly resourceType?: undefined;
+	children: IResourceTreeItem[];
+}
+
+function isUserDefined(storage: PromptsStorage): boolean {
+	return storage === PromptsStorage.local || storage === PromptsStorage.user;
+}
+
+function isUserDefinedMcpCollection(collection: McpCollectionDefinition): boolean {
+	const order = collection.presentation?.order;
+	return order === McpCollectionSortOrder.User
+		|| order === McpCollectionSortOrder.WorkspaceFolder
+		|| order === McpCollectionSortOrder.Workspace;
+}
+
+/**
+ * Gets a display label for a prompt resource. Skills need special handling
+ * because their URI points to `SKILL.md`, so we use the parent directory name.
+ */
+export function getResourceLabel(r: IPromptPath): string {
+	if (r.name) {
+		return r.name;
+	}
+	if (r.type === PromptsType.skill && basename(r.uri).toLowerCase() === 'skill.md') {
+		return basename(dirname(r.uri));
+	}
+	return basename(r.uri);
+}
+
+/**
+ * Gets a filesystem-safe name for a resource, stripping any namespace prefix
+ * (e.g. `plugin:skillname` → `skillname`).
+ */
+export function getResourceFileName(r: IPromptPath): string {
+	const label = getResourceLabel(r);
+	const colonIndex = label.indexOf(':');
+	return colonIndex >= 0 ? label.substring(colonIndex + 1) : label;
+}
+
+class CreatePluginAction extends Action2 {
+
+	static readonly ID = 'workbench.action.chat.createPlugin';
+
+	constructor() {
+		super({
+			id: CreatePluginAction.ID,
+			title: localize2('chat.createPlugin', "Create Plugin"),
+			category: CHAT_CATEGORY,
+			f1: true,
+			precondition: ChatContextKeys.enabled,
+			icon: Codicon.save,
+			menu: [{
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('view', InstalledAgentPluginsViewId),
+					ChatContextKeys.Setup.hidden.negate(),
+				),
+				group: 'navigation',
+				order: 2,
+			}],
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const quickInputService = accessor.get(IQuickInputService);
+		const promptsService = accessor.get(IPromptsService);
+		const mcpRegistry = accessor.get(IMcpRegistry);
+		const fileDialogService = accessor.get(IFileDialogService);
+		const fileService = accessor.get(IFileService);
+		const commandService = accessor.get(ICommandService);
+		const notificationService = accessor.get(INotificationService);
+
+		// Step 1: Gather resources
+		const [instructions, prompts, agents, skills, hooks] = await (async () => {
+			const cts = new CancellationTokenSource();
+			try {
+				return await Promise.all([
+					promptsService.listPromptFiles(PromptsType.instructions, cts.token),
+					promptsService.listPromptFiles(PromptsType.prompt, cts.token),
+					promptsService.listPromptFiles(PromptsType.agent, cts.token),
+					promptsService.listPromptFiles(PromptsType.skill, cts.token),
+					promptsService.listPromptFiles(PromptsType.hook, cts.token),
+				]);
+			} finally {
+				cts.dispose(true);
+			}
+		})();
+
+		const mcpCollections = mcpRegistry.collections.get();
+
+		// Step 2: Build tree items grouped by resource type
+		let showAll = false;
+
+		const buildTree = (): (IGroupTreeItem | IResourceTreeItem)[] => {
+			const groups: (IGroupTreeItem | IResourceTreeItem)[] = [];
+
+			const addGroup = (
+				resources: readonly IPromptPath[],
+				resourceType: ResourceType,
+				groupLabel: string,
+				icon: ThemeIcon,
+			) => {
+				const filtered = showAll ? resources : resources.filter(r => isUserDefined(r.storage));
+				if (filtered.length === 0) {
+					return;
+				}
+				const children: IResourceTreeItem[] = filtered.map(r => ({
+					label: getResourceLabel(r),
+					description: r.storage,
+					resourceType,
+					promptPath: r,
+					checked: false,
+				}));
+				groups.push({
+					label: groupLabel,
+					iconClass: ThemeIcon.asClassName(icon),
+					checked: undefined,
+					collapsed: false,
+					pickable: false,
+					children,
+				});
+			};
+
+			addGroup(instructions, 'instruction', localize('instructions', "Instructions"), Codicon.book);
+			addGroup(prompts, 'prompt', localize('prompts', "Prompts"), Codicon.comment);
+			addGroup(agents, 'agent', localize('agents', "Agents"), Codicon.copilot);
+			addGroup(skills, 'skill', localize('skills', "Skills"), Codicon.lightbulb);
+			addGroup(hooks, 'hook', localize('hooks', "Hooks"), Codicon.zap);
+
+			// MCP servers
+			const mcpChildren: IResourceTreeItem[] = [];
+			for (const collection of mcpCollections) {
+				if (!showAll && !isUserDefinedMcpCollection(collection)) {
+					continue;
+				}
+				const defs = collection.serverDefinitions.get();
+				for (const def of defs) {
+					mcpChildren.push({
+						label: def.label,
+						description: collection.label,
+						resourceType: 'mcp',
+						mcpServer: { collection, definition: def },
+						checked: false,
+					});
+				}
+			}
+			if (mcpChildren.length > 0) {
+				groups.push({
+					label: localize('mcpServers', "MCP Servers"),
+					iconClass: ThemeIcon.asClassName(Codicon.mcp),
+					checked: undefined,
+					collapsed: false,
+					pickable: false,
+					children: mcpChildren,
+				});
+			}
+
+			return groups;
+		};
+
+		// Step 3: Show QuickTree for multi-select with groupings
+		const disposables = new DisposableStore();
+		const tree = disposables.add(quickInputService.createQuickTree<IGroupTreeItem | IResourceTreeItem>());
+		tree.placeholder = localize('selectResources', "Select resources to include in the plugin");
+		tree.matchOnDescription = true;
+		tree.matchOnLabel = true;
+		tree.sortByLabel = false;
+		tree.title = localize('createPluginTitle', "Create Plugin");
+		tree.setItemTree(buildTree());
+
+		const toggleButton: IQuickInputButton = { iconClass: ThemeIcon.asClassName(Codicon.filter), tooltip: localize('showAll', "Show Built-in, Extension, and Plugin Resources") };
+		tree.buttons = [toggleButton];
+
+		disposables.add(tree.onDidTriggerButton((button: IQuickInputButton) => {
+			if (button === toggleButton) {
+				showAll = !showAll;
+				tree.setItemTree(buildTree());
+			}
+		}));
+
+		const selectedItems = await new Promise<readonly (IGroupTreeItem | IResourceTreeItem)[] | undefined>(resolve => {
+			disposables.add(tree.onDidAccept(() => {
+				resolve(tree.checkedLeafItems);
+				tree.hide();
+			}));
+			disposables.add(tree.onDidHide(() => {
+				resolve(undefined);
+			}));
+			tree.show();
+		});
+
+		disposables.dispose();
+
+		if (!selectedItems || selectedItems.length === 0) {
+			return;
+		}
+
+		const selected = selectedItems.filter((i): i is IResourceTreeItem => !!i.resourceType);
+
+		// Step 4: Ask for plugin name
+		const pluginName = await quickInputService.input({
+			prompt: localize('pluginNamePrompt', "Enter a name for the plugin"),
+			placeHolder: 'my-plugin',
+			validateInput: async (value: string) => validatePluginName(value),
+		});
+
+		if (!pluginName) {
+			return;
+		}
+
+		// Step 5: Ask where to save
+		const folderUris = await fileDialogService.showOpenDialog({
+			canSelectFiles: false,
+			canSelectFolders: true,
+			canSelectMany: false,
+			title: localize('selectPluginLocation', "Select Plugin Save Location"),
+			openLabel: localize('selectFolder', "Select Folder"),
+		});
+
+		if (!folderUris || folderUris.length === 0) {
+			return;
+		}
+
+		const targetDir = folderUris[0];
+		const pluginRoot = joinPath(targetDir, pluginName);
+
+		// Check if plugin directory already exists
+		if (await fileService.exists(pluginRoot)) {
+			notificationService.error(localize('pluginExists', "A directory named '{0}' already exists at this location. Please choose a different name or location.", pluginName));
+			return;
+		}
+
+		// Step 6: Create plugin structure
+		try {
+			await writePluginToDisk(fileService, pluginRoot, pluginName, selected);
+
+			// Step 7: Check for marketplace.json and update it
+			await updateMarketplaceIfNeeded(fileService, targetDir, pluginName);
+
+			// Step 8: Reveal the plugin directory in the OS file explorer
+			try {
+				await commandService.executeCommand('revealFileInOS', pluginRoot);
+			} catch {
+				// revealFileInOS may not be available for all URI schemes
+			}
+
+			notificationService.info(localize('pluginCreated', "Plugin '{0}' created successfully.", pluginName));
+
+		} catch (err) {
+			notificationService.error(localize('pluginCreateError', "Failed to create plugin: {0}", String(err)));
+		}
+	}
+}
+
+/**
+ * Writes a plugin directory structure to disk from selected resources.
+ */
+export async function writePluginToDisk(
+	fileService: IFileService,
+	pluginRoot: URI,
+	pluginName: string,
+	selected: readonly IResourceTreeItem[],
+): Promise<void> {
+	await fileService.createFolder(pluginRoot);
+
+	// Create .plugin/plugin.json
+	const manifestDir = joinPath(pluginRoot, '.plugin');
+	await fileService.createFolder(manifestDir);
+	const manifest = {
+		name: pluginName,
+		version: '1.0.0',
+		description: '',
+	};
+	await fileService.writeFile(joinPath(manifestDir, 'plugin.json'), VSBuffer.fromString(JSON.stringify(manifest, null, '\t')));
+
+	// Group selected items by type
+	const byType = {
+		instruction: selected.filter(i => i.resourceType === 'instruction'),
+		prompt: selected.filter(i => i.resourceType === 'prompt'),
+		agent: selected.filter(i => i.resourceType === 'agent'),
+		skill: selected.filter(i => i.resourceType === 'skill'),
+		hook: selected.filter(i => i.resourceType === 'hook'),
+		mcp: selected.filter(i => i.resourceType === 'mcp'),
+	};
+
+	// Copy instructions → rules/
+	if (byType.instruction.length > 0) {
+		const rulesDir = joinPath(pluginRoot, 'rules');
+		await fileService.createFolder(rulesDir);
+		for (const item of byType.instruction) {
+			if (!item.promptPath) {
+				continue;
+			}
+			const name = getResourceFileName(item.promptPath);
+			const fileName = name.endsWith('.instructions.md') || name.endsWith('.mdc') || name.endsWith('.md')
+				? name
+				: name + '.instructions.md';
+			const content = await fileService.readFile(item.promptPath.uri);
+			await fileService.writeFile(joinPath(rulesDir, fileName), content.value);
+		}
+	}
+
+	// Copy prompts → commands/
+	if (byType.prompt.length > 0) {
+		const commandsDir = joinPath(pluginRoot, 'commands');
+		await fileService.createFolder(commandsDir);
+		for (const item of byType.prompt) {
+			if (!item.promptPath) {
+				continue;
+			}
+			const name = getResourceFileName(item.promptPath);
+			const fileName = name.endsWith('.md') ? name : name + '.md';
+			const content = await fileService.readFile(item.promptPath.uri);
+			await fileService.writeFile(joinPath(commandsDir, fileName), content.value);
+		}
+	}
+
+	// Copy agents → agents/
+	if (byType.agent.length > 0) {
+		const agentsDir = joinPath(pluginRoot, 'agents');
+		await fileService.createFolder(agentsDir);
+		for (const item of byType.agent) {
+			if (!item.promptPath) {
+				continue;
+			}
+			const name = getResourceFileName(item.promptPath);
+			const fileName = name.endsWith('.md') ? name : name + '.md';
+			const content = await fileService.readFile(item.promptPath.uri);
+			await fileService.writeFile(joinPath(agentsDir, fileName), content.value);
+		}
+	}
+
+	// Copy skills → skills/ (recursive directory copy)
+	if (byType.skill.length > 0) {
+		const skillsDir = joinPath(pluginRoot, 'skills');
+		await fileService.createFolder(skillsDir);
+		for (const item of byType.skill) {
+			if (!item.promptPath) {
+				continue;
+			}
+			const sourceUri = item.promptPath.uri;
+			const skillName = getResourceFileName(item.promptPath);
+
+			// The URI for a skill might point to the SKILL.md file or to the directory
+			const sourceName = basename(sourceUri);
+			const isFile = sourceName.toLowerCase() === 'skill.md';
+			const skillSourceDir = isFile ? joinPath(sourceUri, '..') : sourceUri;
+
+			const destSkillDir = joinPath(skillsDir, skillName);
+			await copyDirectory(fileService, skillSourceDir, destSkillDir);
+		}
+	}
+
+	// Copy hooks → hooks/hooks.json (merge all selected hook files)
+	if (byType.hook.length > 0) {
+		const hooksDir = joinPath(pluginRoot, 'hooks');
+		await fileService.createFolder(hooksDir);
+
+		const mergedHooks: Record<string, Record<string, unknown>[]> = {};
+		for (const item of byType.hook) {
+			if (!item.promptPath) {
+				continue;
+			}
+			try {
+				const content = await fileService.readFile(item.promptPath.uri);
+				const parsed = parseJSONC<Record<string, unknown>>(content.value.toString());
+				const hooksObj = (parsed?.hooks ?? parsed) as Record<string, unknown> | undefined;
+				if (hooksObj && typeof hooksObj === 'object') {
+					for (const [hookType, commands] of Object.entries(hooksObj)) {
+						if (Array.isArray(commands)) {
+							if (!mergedHooks[hookType]) {
+								mergedHooks[hookType] = [];
+							}
+							for (const cmd of commands) {
+								mergedHooks[hookType].push(serializeHookCommand(cmd));
+							}
+						}
+					}
+				}
+			} catch {
+				// Skip unparseable hook files
+			}
+		}
+
+		const hooksJson = { hooks: mergedHooks };
+		await fileService.writeFile(
+			joinPath(hooksDir, 'hooks.json'),
+			VSBuffer.fromString(JSON.stringify(hooksJson, null, '\t'))
+		);
+	}
+
+	// Export MCP servers → .mcp.json
+	if (byType.mcp.length > 0) {
+		const mcpServers: Record<string, object> = {};
+		for (const item of byType.mcp) {
+			if (!item.mcpServer) {
+				continue;
+			}
+			const def = item.mcpServer.definition;
+			mcpServers[def.label] = serializeMcpLaunch(def.launch);
+		}
+		const mcpJson = { mcpServers };
+		await fileService.writeFile(
+			joinPath(pluginRoot, '.mcp.json'),
+			VSBuffer.fromString(JSON.stringify(mcpJson, null, '\t'))
+		);
+	}
+}
+
+export function serializeHookCommand(cmd: Record<string, unknown>): Record<string, unknown> {
+	const result: Record<string, unknown> = { type: 'command' };
+	if (typeof cmd.command === 'string') {
+		result['command'] = cmd.command;
+	}
+	if (typeof cmd.windows === 'string') {
+		result['windows'] = cmd.windows;
+	}
+	if (typeof cmd.linux === 'string') {
+		result['linux'] = cmd.linux;
+	}
+	if (typeof cmd.osx === 'string') {
+		result['osx'] = cmd.osx;
+	}
+	if (cmd.cwd !== undefined) {
+		result['cwd'] = isUriComponents(cmd.cwd) ? URI.revive(cmd.cwd).fsPath : String(cmd.cwd);
+	}
+	if (cmd.env && typeof cmd.env === 'object' && Object.keys(cmd.env as Record<string, unknown>).length > 0) {
+		result['env'] = cmd.env;
+	}
+	if (typeof cmd.timeout === 'number') {
+		result['timeout'] = cmd.timeout;
+	}
+	return result;
+}
+
+export function serializeMcpLaunch(launch: McpServerDefinition['launch']): object {
+	if (launch.type === McpServerTransportType.Stdio) {
+		const result: Record<string, unknown> = {
+			type: 'stdio',
+			command: launch.command,
+		};
+		if (launch.args.length > 0) {
+			result['args'] = [...launch.args];
+		}
+		if (launch.cwd) {
+			result['cwd'] = launch.cwd;
+		}
+		if (Object.keys(launch.env).length > 0) {
+			result['env'] = { ...launch.env };
+		}
+		return result;
+	} else {
+		const result: Record<string, unknown> = {
+			type: 'http',
+			url: launch.uri.toString(),
+		};
+		if (launch.headers.length > 0) {
+			const headers: Record<string, string> = {};
+			for (const [key, value] of launch.headers) {
+				headers[key] = value;
+			}
+			result['headers'] = headers;
+		}
+		return result;
+	}
+}
+
+export async function copyDirectory(fileService: IFileService, source: URI, target: URI): Promise<void> {
+	const stat = await fileService.resolve(source);
+	if (stat.isDirectory) {
+		await fileService.createFolder(target);
+		if (stat.children) {
+			for (const child of stat.children) {
+				const childName = basename(child.resource);
+				await copyDirectory(fileService, child.resource, joinPath(target, childName));
+			}
+		}
+	} else {
+		const content = await fileService.readFile(source);
+		await fileService.writeFile(target, content.value);
+	}
+}
+
+const MARKETPLACE_PATHS = [
+	'marketplace.json',
+	'.plugin/marketplace.json',
+];
+
+export async function updateMarketplaceIfNeeded(fileService: IFileService, targetDir: URI, pluginName: string): Promise<void> {
+	for (const relPath of MARKETPLACE_PATHS) {
+		const marketplaceUri = joinPath(targetDir, relPath);
+		if (await fileService.exists(marketplaceUri)) {
+			try {
+				const content = await fileService.readFile(marketplaceUri);
+				const marketplace = parseJSONC<Record<string, unknown>>(content.value.toString());
+				if (marketplace && typeof marketplace === 'object') {
+					if (!Array.isArray(marketplace['plugins'])) {
+						marketplace['plugins'] = [];
+					}
+
+					const plugins = marketplace['plugins'] as { name?: string; source?: string }[];
+
+					// Skip if a plugin with this name already exists
+					if (plugins.some(p => p.name === pluginName)) {
+						return;
+					}
+
+					plugins.push({
+						name: pluginName,
+						source: `./${pluginName}/`,
+					});
+
+					await fileService.writeFile(
+						marketplaceUri,
+						VSBuffer.fromString(JSON.stringify(marketplace, null, '\t'))
+					);
+				}
+			} catch {
+				// Skip if marketplace.json is unparseable
+			}
+			return; // Only update the first found marketplace
+		}
+	}
+}
+
+export function registerCreatePluginAction(): void {
+	registerAction2(CreatePluginAction);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.ts b/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.ts
index 216fe391589..7618325ea95 100644
--- a/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditor.ts
@@ -373,7 +373,7 @@ export class AgentPluginEditor extends EditorPane {
 				rawUrl = `https://raw.githubusercontent.com/${githubBlobMatch.groups['owner']}/${githubBlobMatch.groups['repo']}/${githubBlobMatch.groups['rest']}`;
 			}
 			try {
-				const context = await this.requestService.request({ type: 'GET', url: rawUrl }, token);
+				const context = await this.requestService.request({ type: 'GET', url: rawUrl, callSite: 'agentPluginEditor.fetchReadme' }, token);
 				const text = await asText(context);
 				return text ?? '';
 			} catch {
diff --git a/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditorInput.ts b/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditorInput.ts
index d2acd9f94f7..adddd57b417 100644
--- a/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditorInput.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentPluginEditor/agentPluginEditorInput.ts
@@ -31,7 +31,7 @@ export class AgentPluginEditorInput extends EditorInput {
 	}
 
 	override get capabilities(): EditorInputCapabilities {
-		return EditorInputCapabilities.Readonly | EditorInputCapabilities.Singleton;
+		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.RequiresModal;
 	}
 
 	override get resource() {
diff --git a/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.ts b/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.ts
index 329c531cad5..155b5b23178 100644
--- a/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Action } from '../../../../base/common/actions.js';
+import { SequencerByKey } from '../../../../base/common/async.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { revive } from '../../../../base/common/marshalling.js';
 import { dirname, isEqual, isEqualOrParent, joinPath } from '../../../../base/common/resources.js';
@@ -38,6 +39,7 @@ export class AgentPluginRepositoryService implements IAgentPluginRepositoryServi
 	private readonly _cacheRoot: URI;
 	private readonly _marketplaceIndex = new Lazy<Map<string, IMarketplaceIndexEntry>>(() => this._loadMarketplaceIndex());
 	private readonly _pluginSources: ReadonlyMap<PluginSourceKind, IPluginSource>;
+	private readonly _cloneSequencer = new SequencerByKey<string>();
 
 	constructor(
 		@ICommandService private readonly _commandService: ICommandService,
@@ -90,21 +92,23 @@ export class AgentPluginRepositoryService implements IAgentPluginRepositoryServi
 
 	async ensureRepository(marketplace: IMarketplaceReference, options?: IEnsureRepositoryOptions): Promise<URI> {
 		const repoDir = this.getRepositoryUri(marketplace, options?.marketplaceType);
-		const repoExists = await this._fileService.exists(repoDir);
-		if (repoExists) {
+		return this._cloneSequencer.queue(repoDir.fsPath, async () => {
+			const repoExists = await this._fileService.exists(repoDir);
+			if (repoExists) {
+				this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
+				return repoDir;
+			}
+
+			if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
+				throw new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`);
+			}
+
+			const progressTitle = options?.progressTitle ?? localize('preparingMarketplace', "Preparing plugin marketplace '{0}'...", marketplace.displayLabel);
+			const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
+			await this._cloneRepository(repoDir, marketplace.cloneUrl, progressTitle, failureLabel);
 			this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
 			return repoDir;
-		}
-
-		if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
-			throw new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`);
-		}
-
-		const progressTitle = options?.progressTitle ?? localize('preparingMarketplace', "Preparing plugin marketplace '{0}'...", marketplace.displayLabel);
-		const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
-		await this._cloneRepository(repoDir, marketplace.cloneUrl, progressTitle, failureLabel);
-		this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
-		return repoDir;
+		});
 	}
 
 	async pullRepository(marketplace: IMarketplaceReference, options?: IPullRepositoryOptions): Promise<boolean> {
@@ -282,13 +286,27 @@ export class AgentPluginRepositoryService implements IAgentPluginRepositoryServi
 		}
 	}
 
-	async cleanupPluginSource(plugin: IMarketplacePlugin): Promise<void> {
+	async cleanupPluginSource(plugin: IMarketplacePlugin, otherInstalledDescriptors?: readonly IPluginSourceDescriptor[]): Promise<void> {
 		const repo = this.getPluginSource(plugin.sourceDescriptor.kind);
 		const cleanupDir = repo.getCleanupTarget(this._cacheRoot, plugin.sourceDescriptor);
 		if (!cleanupDir) {
 			return;
 		}
 
+		// Skip deletion when another installed plugin shares the same
+		// cleanup target (e.g. same cloned repository with different sub-paths).
+		if (otherInstalledDescriptors) {
+			const shared = otherInstalledDescriptors.some(other => {
+				const otherRepo = this.getPluginSource(other.kind);
+				const otherTarget = otherRepo.getCleanupTarget(this._cacheRoot, other);
+				return otherTarget && isEqual(otherTarget, cleanupDir);
+			});
+			if (shared) {
+				this._logService.info(`[${plugin.sourceDescriptor.kind}] Skipping cleanup of shared cache: ${cleanupDir.toString()}`);
+				return;
+			}
+		}
+
 		try {
 			const exists = await this._fileService.exists(cleanupDir);
 			if (exists) {
diff --git a/src/vs/workbench/contrib/chat/browser/agentPluginsView.ts b/src/vs/workbench/contrib/chat/browser/agentPluginsView.ts
index 48e0c7a57d6..da07fef0238 100644
--- a/src/vs/workbench/contrib/chat/browser/agentPluginsView.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentPluginsView.ts
@@ -36,7 +36,7 @@ import { getLocationBasedViewColors } from '../../../browser/parts/views/viewPan
 import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewDescriptorService, IViewsRegistry, Extensions as ViewExtensions } from '../../../common/views.js';
-import { IEditorService, MODAL_GROUP } from '../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { VIEW_CONTAINER } from '../../extensions/browser/extensions.contribution.js';
 import { manageExtensionIcon } from '../../extensions/browser/extensionsIcons.js';
 import { AbstractExtensionsListView } from '../../extensions/browser/extensionsViews.js';
@@ -358,8 +358,7 @@ export class AgentPluginsListView extends AbstractExtensionsListView<IAgentPlugi
 		this._register(Event.debounce(Event.filter(this.list.onDidOpen, e => e.element !== null), (_, event) => event, 75, true)(options => {
 			this.editorService.openEditor(
 				this.instantiationService.createInstance(AgentPluginEditorInput, options.element!),
-				options.editorOptions,
-				MODAL_GROUP
+				options.editorOptions
 			);
 		}));
 	}
@@ -413,24 +412,52 @@ export class AgentPluginsListView extends AbstractExtensionsListView<IAgentPlugi
 
 	async show(query: string): Promise<IPagedModel<IAgentPluginItem>> {
 		this.currentQuery = query;
-		const text = query.replace(/@agentPlugins/i, '').trim().toLowerCase();
+		const stripped = query.replace(/@agentPlugins/i, '').trim();
+		const isRecommended = /^@recommended$/i.test(stripped);
+		const isInstalled = /(?:^|\s)@installed(?:\s|$)/i.test(stripped);
+		const text = isRecommended ? '' : stripped.replace(/(?:^|\s)@installed(?:\s|$)/gi, ' ').trim().toLowerCase();
 
 		let installed = this.queryInstalled();
 		if (text) {
 			installed = installed.filter(p =>
 				p.name.toLowerCase().includes(text) ||
-				p.description.toLowerCase().includes(text)
+				p.description.toLowerCase().includes(text) ||
+				(p.marketplace ?? '').toLowerCase().includes(text)
 			);
 		}
 
+		// When @recommended, filter to plugins listed in workspace recommendations.
+		if (isRecommended) {
+			const recommended = this.pluginMarketplaceService.recommendedPlugins.get();
+			installed = installed.filter(p => {
+				const marketplace = p.plugin.fromMarketplace;
+				if (!marketplace) {
+					return false;
+				}
+				const key = `${marketplace.name}@${marketplace.marketplace}`;
+				return recommended.has(key);
+			});
+		}
+
 		let items: IAgentPluginItem[] = installed;
 
-		if (!this.listOptions.installedOnly) {
+		if (!this.listOptions.installedOnly && !isInstalled) {
 			const marketplacePlugins = await this.queryMarketplacePlugins();
-			const lowerText = text.toLowerCase();
-			const marketplace = marketplacePlugins
-				.filter(p => p.name.toLowerCase().includes(lowerText) || p.description.toLowerCase().includes(lowerText))
-				.map(marketplacePluginToItem);
+			let filteredMp = marketplacePlugins;
+
+			if (isRecommended) {
+				// When @recommended, filter marketplace plugins to those in recommendations.
+				const recommended = this.pluginMarketplaceService.recommendedPlugins.get();
+				filteredMp = filteredMp.filter(p => {
+					const key = `${p.name}@${p.marketplace}`;
+					return recommended.has(key);
+				});
+			} else {
+				const lowerText = text.toLowerCase();
+				filteredMp = filteredMp.filter(p => p.name.toLowerCase().includes(lowerText) || p.description.toLowerCase().includes(lowerText) || p.marketplace.toLowerCase().includes(lowerText));
+			}
+
+			const marketplace = filteredMp.map(marketplacePluginToItem);
 
 			// Filter out marketplace items that are already installed
 			const installedPaths = new Set(installed.map(i => i.plugin.uri.toString()));
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.ts
new file mode 100644
index 00000000000..75ad8c68014
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostAuth.ts
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../../../base/common/uri.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IAuthenticationService } from '../../../../../services/authentication/common/authentication.js';
+
+/**
+ * Resolves a bearer token for a protected resource by trying each
+ * authorization server in order. First attempts an exact scope match,
+ * then falls back to finding the session whose scopes are the narrowest
+ * superset of the requested scopes.
+ */
+export async function resolveTokenForResource(
+	resourceServer: URI,
+	authorizationServers: readonly string[],
+	scopes: readonly string[],
+	authenticationService: IAuthenticationService,
+	logService: ILogService,
+	logPrefix: string,
+): Promise<string | undefined> {
+	for (const server of authorizationServers) {
+		const serverUri = URI.parse(server);
+		const providerId = await authenticationService.getOrActivateProviderIdForServer(serverUri, resourceServer);
+		if (!providerId) {
+			logService.trace(`${logPrefix} No auth provider found for server: ${server}`);
+			continue;
+		}
+		logService.trace(`${logPrefix} Resolved auth provider '${providerId}' for server: ${server}`);
+
+		// Try exact scope match first
+		const sessions = await authenticationService.getSessions(providerId, [...scopes], { authorizationServer: serverUri }, true);
+		if (sessions.length > 0) {
+			return sessions[0].accessToken;
+		}
+
+		// Fall back: get all sessions and find the narrowest superset of requested scopes
+		const allSessions = await authenticationService.getSessions(providerId, undefined, { authorizationServer: serverUri }, true);
+		const requestedSet = new Set(scopes);
+		let bestToken: string | undefined;
+		let bestExtraScopes = Infinity;
+		for (const session of allSessions) {
+			const sessionScopes = new Set(session.scopes);
+			let isSuperset = true;
+			for (const scope of requestedSet) {
+				if (!sessionScopes.has(scope)) {
+					isSuperset = false;
+					break;
+				}
+			}
+			if (isSuperset) {
+				const extraScopes = sessionScopes.size - requestedSet.size;
+				if (extraScopes < bestExtraScopes) {
+					bestExtraScopes = extraScopes;
+					bestToken = session.accessToken;
+				}
+			}
+		}
+		if (bestToken) {
+			return bestToken;
+		}
+	}
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.ts
new file mode 100644
index 00000000000..4db5423a665
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostChatContribution.ts
@@ -0,0 +1,270 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { AgentHostFileSystemProvider } from '../../../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
+import { IAgentHostService, AgentHostEnabledSettingId, type AgentProvider } from '../../../../../../platform/agentHost/common/agentService.js';
+import { AGENT_HOST_LABEL_FORMATTER, AGENT_HOST_SCHEME } from '../../../../../../platform/agentHost/common/agentHostUri.js';
+import { isSessionAction } from '../../../../../../platform/agentHost/common/state/sessionActions.js';
+import { SessionClientState } from '../../../../../../platform/agentHost/common/state/sessionClientState.js';
+import { ROOT_STATE_URI, type IAgentInfo, type IRootState } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { IDefaultAccountService } from '../../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+import { IAuthenticationService } from '../../../../../services/authentication/common/authentication.js';
+import { IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { ILanguageModelsService } from '../../../common/languageModels.js';
+import { resolveTokenForResource } from './agentHostAuth.js';
+import { AgentHostLanguageModelProvider } from './agentHostLanguageModelProvider.js';
+import { AgentHostSessionHandler } from './agentHostSessionHandler.js';
+import { AgentHostSessionListController } from './agentHostSessionListController.js';
+import { LoggingAgentConnection } from './loggingAgentConnection.js';
+
+export { AgentHostSessionHandler } from './agentHostSessionHandler.js';
+export { AgentHostSessionListController } from './agentHostSessionListController.js';
+
+/**
+ * Discovers available agents from the agent host process and dynamically
+ * registers each one as a chat session type with its own session handler,
+ * list controller, and language model provider.
+ *
+ * Gated on the `chat.agentHost.enabled` setting.
+ */
+export class AgentHostContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.agentHostContribution';
+
+	private _loggedConnection: LoggingAgentConnection | undefined;
+	private _clientState: SessionClientState | undefined;
+	private readonly _agentRegistrations = this._register(new DisposableMap<AgentProvider, DisposableStore>());
+	/** Model providers keyed by agent provider, for pushing model updates. */
+	private readonly _modelProviders = new Map<AgentProvider, AgentHostLanguageModelProvider>();
+
+	constructor(
+		@IAgentHostService private readonly _agentHostService: IAgentHostService,
+		@IChatSessionsService private readonly _chatSessionsService: IChatSessionsService,
+		@IDefaultAccountService private readonly _defaultAccountService: IDefaultAccountService,
+		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
+		@ILogService private readonly _logService: ILogService,
+		@ILanguageModelsService private readonly _languageModelsService: ILanguageModelsService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IFileService private readonly _fileService: IFileService,
+		@ILabelService private readonly _labelService: ILabelService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super();
+
+		if (!configurationService.getValue<boolean>(AgentHostEnabledSettingId)) {
+			return;
+		}
+
+		// Wrap the agent host service with logging to a dedicated output channel
+		this._loggedConnection = this._register(this._instantiationService.createInstance(
+			LoggingAgentConnection,
+			this._agentHostService,
+			'agentHostIpc.local',
+			'Agent Host (Local)'));
+
+		// Register a read-only filesystem provider for the local agent host
+		// so that agent-host-scheme URIs with 'local' authority can be resolved.
+		const fsProvider = this._register(new AgentHostFileSystemProvider());
+		this._register(fsProvider.registerAuthority('local', this._agentHostService));
+		this._register(this._fileService.registerProvider(AGENT_HOST_SCHEME, fsProvider));
+
+		// Display agent-host URIs with the original file path
+		this._register(this._labelService.registerFormatter(AGENT_HOST_LABEL_FORMATTER));
+
+		// Shared client state for protocol reconciliation
+		this._clientState = this._register(new SessionClientState(this._agentHostService.clientId, this._logService));
+
+		// Forward action envelopes from the host to client state
+		this._register(this._loggedConnection.onDidAction(envelope => {
+			// Only root actions are relevant here; session actions are
+			// handled by individual session handlers.
+			if (!isSessionAction(envelope.action)) {
+				this._clientState!.receiveEnvelope(envelope);
+			}
+		}));
+
+		// Forward notifications to client state
+		this._register(this._loggedConnection.onDidNotification(n => {
+			this._clientState!.receiveNotification(n);
+		}));
+
+		// React to root state changes (agent discovery / removal)
+		this._register(this._clientState.onDidChangeRootState(rootState => {
+			this._handleRootStateChange(rootState);
+		}));
+
+		this._initializeAndSubscribe();
+	}
+
+	private async _initializeAndSubscribe(): Promise<void> {
+		try {
+			const snapshot = await this._loggedConnection!.subscribe(URI.parse(ROOT_STATE_URI));
+			if (this._store.isDisposed) {
+				return;
+			}
+			// Feed snapshot into client state - fires onDidChangeRootState
+			this._clientState!.handleSnapshot(ROOT_STATE_URI, snapshot.state, snapshot.fromSeq);
+		} catch (err) {
+			this._logService.error('[AgentHost] Failed to subscribe to root state', err);
+			this._loggedConnection!.logError('subscribe(root)', err);
+		}
+	}
+
+	private _handleRootStateChange(rootState: IRootState): void {
+		const incoming = new Set(rootState.agents.map(a => a.provider));
+
+		// Remove agents that are no longer present
+		for (const [provider] of this._agentRegistrations) {
+			if (!incoming.has(provider)) {
+				this._agentRegistrations.deleteAndDispose(provider);
+				this._modelProviders.delete(provider);
+			}
+		}
+
+		// Register new agents and push model updates to existing ones
+		for (const agent of rootState.agents) {
+			if (!this._agentRegistrations.has(agent.provider)) {
+				this._registerAgent(agent);
+			} else {
+				// Push updated models to existing model provider
+				const modelProvider = this._modelProviders.get(agent.provider);
+				modelProvider?.updateModels(agent.models);
+			}
+		}
+	}
+
+	private _registerAgent(agent: IAgentInfo): void {
+		const store = new DisposableStore();
+		this._agentRegistrations.set(agent.provider, store);
+		const sessionType = `agent-host-${agent.provider}`;
+		const agentId = sessionType;
+		const vendor = sessionType;
+
+		// Chat session contribution
+		store.add(this._chatSessionsService.registerChatSessionContribution({
+			type: sessionType,
+			name: agentId,
+			displayName: agent.displayName,
+			description: agent.description,
+			canDelegate: true,
+			requiresCustomModels: true,
+		}));
+
+		// Session list controller
+		const listController = store.add(this._instantiationService.createInstance(AgentHostSessionListController, sessionType, agent.provider, this._loggedConnection!, undefined));
+		store.add(this._chatSessionsService.registerChatSessionItemController(sessionType, listController));
+
+		// Session handler
+		const sessionHandler = store.add(this._instantiationService.createInstance(AgentHostSessionHandler, {
+			provider: agent.provider,
+			agentId,
+			sessionType,
+			fullName: agent.displayName,
+			description: agent.description,
+			connection: this._loggedConnection!,
+			connectionAuthority: 'local',
+			resolveAuthentication: () => this._resolveAuthenticationInteractively(),
+		}));
+		store.add(this._chatSessionsService.registerChatSessionContentProvider(sessionType, sessionHandler));
+
+		// Language model provider
+		const vendorDescriptor = { vendor, displayName: agent.displayName, configuration: undefined, managementCommand: undefined, when: undefined };
+		this._languageModelsService.deltaLanguageModelChatProviderDescriptors([vendorDescriptor], []);
+		store.add(toDisposable(() => this._languageModelsService.deltaLanguageModelChatProviderDescriptors([], [vendorDescriptor])));
+		const modelProvider = store.add(new AgentHostLanguageModelProvider(sessionType, vendor));
+		modelProvider.updateModels(agent.models);
+		this._modelProviders.set(agent.provider, modelProvider);
+		store.add(toDisposable(() => this._modelProviders.delete(agent.provider)));
+		store.add(this._languageModelsService.registerLanguageModelProvider(vendor, modelProvider));
+
+		// Push auth token and refresh models from server
+		this._authenticateWithServer().then(() => this._loggedConnection!.refreshModels()).catch(() => { /* best-effort */ });
+		store.add(this._defaultAccountService.onDidChangeDefaultAccount(() =>
+			this._authenticateWithServer().then(() => this._loggedConnection!.refreshModels()).catch(() => { /* best-effort */ })));
+		store.add(this._authenticationService.onDidChangeSessions(() =>
+			this._authenticateWithServer().then(() => this._loggedConnection!.refreshModels()).catch(() => { /* best-effort */ })));
+	}
+
+	/**
+	 * Discover auth requirements from the server's resource metadata
+	 * and authenticate using matching tokens resolved via the standard
+	 * VS Code authentication service (same flow as MCP auth).
+	 */
+	private async _authenticateWithServer(): Promise<void> {
+		try {
+			const metadata = await this._loggedConnection!.getResourceMetadata();
+			this._logService.trace(`[AgentHost] Resource metadata: ${metadata.resources.length} resource(s)`);
+			for (const resource of metadata.resources) {
+				const resourceUri = URI.parse(resource.resource);
+				const token = await this._resolveTokenForResource(resourceUri, resource.authorization_servers ?? [], resource.scopes_supported ?? []);
+				if (token) {
+					this._logService.info(`[AgentHost] Authenticating for resource: ${resource.resource}`);
+					await this._loggedConnection!.authenticate({ resource: resource.resource, token });
+				} else {
+					this._logService.info(`[AgentHost] No token resolved for resource: ${resource.resource}`);
+				}
+			}
+		} catch (err) {
+			this._logService.error('[AgentHost] Failed to authenticate with server', err);
+			this._loggedConnection!.logError('authenticateWithServer', err);
+		}
+	}
+
+	/**
+	 * Resolve a bearer token for a set of authorization servers using the
+	 * standard VS Code authentication service provider resolution.
+	 */
+	private _resolveTokenForResource(resourceServer: URI, authorizationServers: readonly string[], scopes: readonly string[]): Promise<string | undefined> {
+		return resolveTokenForResource(resourceServer, authorizationServers, scopes, this._authenticationService, this._logService, '[AgentHost]');
+	}
+
+	/**
+	 * Interactively prompt the user to authenticate when the server requires it.
+	 * Fetches resource metadata, resolves the auth provider, creates a session
+	 * (which triggers the login UI), and pushes the token to the server.
+	 * Returns true if authentication succeeded.
+	 */
+	private async _resolveAuthenticationInteractively(): Promise<boolean> {
+		try {
+			const metadata = await this._loggedConnection!.getResourceMetadata();
+			for (const resource of metadata.resources) {
+				for (const server of resource.authorization_servers ?? []) {
+					const serverUri = URI.parse(server);
+					const resourceUri = URI.parse(resource.resource);
+					const providerId = await this._authenticationService.getOrActivateProviderIdForServer(serverUri, resourceUri);
+					if (!providerId) {
+						continue;
+					}
+
+					// createSession will show the login UI if no session exists
+					const scopes = [...(resource.scopes_supported ?? [])];
+					const session = await this._authenticationService.createSession(providerId, scopes, {
+						activateImmediate: true,
+						authorizationServer: serverUri,
+					});
+
+					await this._loggedConnection!.authenticate({
+						resource: resource.resource,
+						token: session.accessToken,
+					});
+					this._logService.info(`[AgentHost] Interactive authentication succeeded for ${resource.resource}`);
+					return true;
+				}
+			}
+		} catch (err) {
+			this._logService.error('[AgentHost] Interactive authentication failed', err);
+			this._loggedConnection!.logError('resolveAuthenticationInteractively', err);
+		}
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.ts
new file mode 100644
index 00000000000..546dd68513b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLanguageModelProvider.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { ISessionModelInfo } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { ILanguageModelChatProvider, ILanguageModelChatMetadataAndIdentifier } from '../../../common/languageModels.js';
+
+/**
+ * Exposes models available from the agent host process as selectable
+ * language models in the chat model picker. Models are provided from
+ * root state (via {@link IAgentInfo.models}) rather than via RPC.
+ */
+export class AgentHostLanguageModelProvider extends Disposable implements ILanguageModelChatProvider {
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+
+	private _models: readonly ISessionModelInfo[] = [];
+
+	constructor(
+		private readonly _sessionType: string,
+		private readonly _vendor: string,
+	) {
+		super();
+	}
+
+	/**
+	 * Called by {@link AgentHostContribution} when models change in root state.
+	 */
+	updateModels(models: readonly ISessionModelInfo[]): void {
+		this._models = models;
+		this._onDidChange.fire();
+	}
+
+	async provideLanguageModelChatInfo(_options: unknown, _token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]> {
+		return this._models
+			.filter(m => m.policyState !== 'disabled')
+			.map(m => ({
+				identifier: `${this._vendor}:${m.id}`,
+				metadata: {
+					extension: new ExtensionIdentifier('vscode.agent-host'),
+					name: m.name,
+					id: m.id,
+					vendor: this._vendor,
+					version: '1.0',
+					family: m.id,
+					maxInputTokens: m.maxContextWindow ?? 0,
+					maxOutputTokens: 0,
+					isDefaultForLocation: {},
+					isUserSelectable: true,
+					modelPickerCategory: undefined,
+					targetChatSessionType: this._sessionType,
+					capabilities: {
+						vision: m.supportsVision ?? false,
+						toolCalling: true,
+						agentMode: true,
+					},
+				},
+			}));
+	}
+
+	async sendChatRequest(): Promise<never> {
+		throw new Error('Agent-host models do not support direct chat requests');
+	}
+
+	async provideTokenCount(): Promise<number> {
+		return 0;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts
new file mode 100644
index 00000000000..f51a429171c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts
@@ -0,0 +1,1020 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Throttler } from '../../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, DisposableMap, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { localize } from '../../../../../../nls.js';
+import { toAgentHostUri } from '../../../../../../platform/agentHost/common/agentHostUri.js';
+import { AgentProvider, AgentSession, IAgentAttachment, type IAgentConnection } from '../../../../../../platform/agentHost/common/agentService.js';
+import { ActionType, isSessionAction, type ISessionAction } from '../../../../../../platform/agentHost/common/state/sessionActions.js';
+import { SessionClientState } from '../../../../../../platform/agentHost/common/state/sessionClientState.js';
+import { AHP_AUTH_REQUIRED, ProtocolError } from '../../../../../../platform/agentHost/common/state/sessionProtocol.js';
+import { getToolKind, getToolLanguage } from '../../../../../../platform/agentHost/common/state/sessionReducers.js';
+import { AttachmentType, PendingMessageKind, ResponsePartKind, ToolCallCancellationReason, ToolCallConfirmationReason, ToolCallStatus, TurnState, type IMessageAttachment } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
+import { IChatProgress, IChatService, IChatToolInvocation, ToolConfirmKind, ChatRequestQueueKind } from '../../../common/chatService/chatService.js';
+import { IChatSession, IChatSessionContentProvider, IChatSessionHistoryItem } from '../../../common/chatSessionsService.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { ChatToolInvocation } from '../../../common/model/chatProgressTypes/chatToolInvocation.js';
+import { IChatAgentData, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { getAgentHostIcon } from '../agentSessions.js';
+import { finalizeToolInvocation, toolCallStateToInvocation, turnsToHistory, type IToolCallFileEdit } from './stateToProgressAdapter.js';
+
+// =============================================================================
+// AgentHostSessionHandler — renderer-side handler for a single agent host
+// chat session type. Bridges the protocol state layer with the chat UI:
+// subscribes to session state, derives IChatProgress[] from immutable state
+// changes, and dispatches client actions (turnStarted, toolCallConfirmed,
+// turnCancelled) back to the server.
+// =============================================================================
+
+// =============================================================================
+// Chat session
+// =============================================================================
+
+class AgentHostChatSession extends Disposable implements IChatSession {
+	readonly progressObs = observableValue<IChatProgress[]>('agentHostProgress', []);
+	readonly isCompleteObs = observableValue<boolean>('agentHostComplete', true);
+
+	private readonly _onWillDispose = this._register(new Emitter<void>());
+	readonly onWillDispose = this._onWillDispose.event;
+
+	private readonly _onDidStartServerRequest = this._register(new Emitter<{ prompt: string }>());
+	readonly onDidStartServerRequest = this._onDidStartServerRequest.event;
+
+	readonly requestHandler: IChatSession['requestHandler'];
+	readonly interruptActiveResponseCallback: IChatSession['interruptActiveResponseCallback'];
+
+	constructor(
+		readonly sessionResource: URI,
+		readonly history: readonly IChatSessionHistoryItem[],
+		private readonly _sendRequest: (request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, token: CancellationToken) => Promise<void>,
+		onDispose: () => void,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		this._register(toDisposable(() => this._onWillDispose.fire()));
+		this._register(toDisposable(onDispose));
+
+		this.requestHandler = async (request, progress, _history, cancellationToken) => {
+			this._logService.info('[AgentHost] requestHandler called');
+			this.isCompleteObs.set(false, undefined);
+			await this._sendRequest(request, progress, cancellationToken);
+			this.isCompleteObs.set(true, undefined);
+		};
+
+		this.interruptActiveResponseCallback = history.length > 0 ? undefined : async () => {
+			return true;
+		};
+	}
+
+	/**
+	 * Called by the session handler when a server-initiated turn starts.
+	 * Resets the progress observable and signals listeners to create a new
+	 * request+response pair in the chat model.
+	 */
+	startServerRequest(prompt: string): void {
+		this._logService.info('[AgentHost] Server-initiated request started');
+		this.progressObs.set([], undefined);
+		this.isCompleteObs.set(false, undefined);
+		this._onDidStartServerRequest.fire({ prompt });
+	}
+}
+
+// =============================================================================
+// Session handler
+// =============================================================================
+
+export interface IAgentHostSessionHandlerConfig {
+	readonly provider: AgentProvider;
+	readonly agentId: string;
+	readonly sessionType: string;
+	readonly fullName: string;
+	readonly description: string;
+	/** The agent connection to use for this handler. */
+	readonly connection: IAgentConnection;
+	/** Sanitized connection authority for constructing vscode-agent-host:// URIs. */
+	readonly connectionAuthority: string;
+	/** Extension identifier for the registered agent. Defaults to 'vscode.agent-host'. */
+	readonly extensionId?: string;
+	/** Extension display name for the registered agent. Defaults to 'Agent Host'. */
+	readonly extensionDisplayName?: string;
+	/**
+	 * Optional callback to resolve a working directory for a new session.
+	 * If not provided, falls back to the first workspace folder.
+	 */
+	readonly resolveWorkingDirectory?: (resourceKey: string) => string | undefined;
+	/**
+	 * Optional callback invoked when the server rejects an operation because
+	 * authentication is required. Should trigger interactive authentication
+	 * and return true if the user authenticated successfully.
+	 */
+	readonly resolveAuthentication?: () => Promise<boolean>;
+}
+
+export class AgentHostSessionHandler extends Disposable implements IChatSessionContentProvider {
+
+	private readonly _activeSessions = new Map<string, AgentHostChatSession>();
+	/** Maps UI resource keys to resolved backend session URIs. */
+	private readonly _sessionToBackend = new Map<string, URI>();
+	/** Per-session subscription to chat model pending request changes. */
+	private readonly _pendingMessageSubscriptions = this._register(new DisposableMap<string>());
+	/** Per-session subscription watching for server-initiated turns. */
+	private readonly _serverTurnWatchers = this._register(new DisposableMap<string>());
+	/** Turn IDs dispatched by this client, used to distinguish server-originated turns. */
+	private readonly _clientDispatchedTurnIds = new Set<string>();
+	private readonly _config: IAgentHostSessionHandlerConfig;
+
+	/** Client state manager shared across all sessions for this handler. */
+	private readonly _clientState: SessionClientState;
+
+	constructor(
+		config: IAgentHostSessionHandlerConfig,
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
+		@IChatService private readonly _chatService: IChatService,
+		@ILogService private readonly _logService: ILogService,
+		@IProductService private readonly _productService: IProductService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+		this._config = config;
+
+		// Create shared client state manager for this handler instance
+		this._clientState = this._register(new SessionClientState(config.connection.clientId, this._logService));
+
+		// Forward action envelopes from IPC to client state
+		this._register(config.connection.onDidAction(envelope => {
+			if (isSessionAction(envelope.action)) {
+				this._clientState.receiveEnvelope(envelope);
+			}
+		}));
+
+		this._registerAgent();
+	}
+
+	async provideChatSessionContent(sessionResource: URI, _token: CancellationToken): Promise<IChatSession> {
+		const resourceKey = sessionResource.path.substring(1);
+
+		// For untitled (new) sessions, defer backend session creation until the
+		// first request arrives so the user-selected model is available.
+		// For existing sessions we resolve immediately to load history.
+		let resolvedSession: URI | undefined;
+		const isUntitled = resourceKey.startsWith('untitled-');
+		const history: IChatSessionHistoryItem[] = [];
+		if (!isUntitled) {
+			resolvedSession = this._resolveSessionUri(sessionResource);
+			this._sessionToBackend.set(resourceKey, resolvedSession);
+			try {
+				const snapshot = await this._config.connection.subscribe(resolvedSession);
+				if (snapshot?.state) {
+					this._clientState.handleSnapshot(resolvedSession.toString(), snapshot.state, snapshot.fromSeq);
+					const sessionState = this._clientState.getSessionState(resolvedSession.toString());
+					if (sessionState) {
+						history.push(...turnsToHistory(sessionState.turns, this._config.agentId));
+					}
+				}
+			} catch (err) {
+				this._logService.warn(`[AgentHost] Failed to subscribe to existing session: ${resolvedSession.toString()}`, err);
+			}
+		}
+		const session = this._instantiationService.createInstance(
+			AgentHostChatSession,
+			sessionResource,
+			history,
+			async (request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, token: CancellationToken) => {
+				const backendSession = resolvedSession ?? await this._createAndSubscribe(sessionResource, request.userSelectedModelId);
+				if (!resolvedSession) {
+					resolvedSession = backendSession;
+					this._sessionToBackend.set(resourceKey, backendSession);
+				}
+				// For existing sessions, set up pending message sync on the first turn
+				// (after the ChatModel becomes available in the ChatService).
+				this._ensurePendingMessageSubscription(resourceKey, sessionResource, backendSession);
+				return this._handleTurn(backendSession, request, progress, token);
+			},
+			() => {
+				this._activeSessions.delete(resourceKey);
+				this._sessionToBackend.delete(resourceKey);
+				this._pendingMessageSubscriptions.deleteAndDispose(resourceKey);
+				this._serverTurnWatchers.deleteAndDispose(resourceKey);
+				if (resolvedSession) {
+					this._clientState.unsubscribe(resolvedSession.toString());
+					this._config.connection.unsubscribe(resolvedSession);
+					this._config.connection.disposeSession(resolvedSession);
+				}
+			},
+		);
+		this._activeSessions.set(resourceKey, session);
+
+		// For existing (non-untitled) sessions, start watching for server-initiated turns
+		// immediately. For untitled sessions, this is deferred to _createAndSubscribe.
+		if (resolvedSession) {
+			this._watchForServerInitiatedTurns(resolvedSession, sessionResource);
+		}
+
+		return session;
+	}
+
+	// ---- Agent registration -------------------------------------------------
+
+	private _registerAgent(): void {
+		const agentData: IChatAgentData = {
+			id: this._config.agentId,
+			name: this._config.agentId,
+			fullName: this._config.fullName,
+			description: this._config.description,
+			extensionId: new ExtensionIdentifier(this._config.extensionId ?? 'vscode.agent-host'),
+			extensionVersion: undefined,
+			extensionPublisherId: 'vscode',
+			extensionDisplayName: this._config.extensionDisplayName ?? 'Agent Host',
+			isDefault: false,
+			isDynamic: true,
+			isCore: true,
+			metadata: { themeIcon: getAgentHostIcon(this._productService) },
+			slashCommands: [],
+			locations: [ChatAgentLocation.Chat],
+			modes: [ChatModeKind.Agent],
+			disambiguation: [],
+		};
+
+		const agentImpl: IChatAgentImplementation = {
+			invoke: async (request, progress, _history, cancellationToken) => {
+				return this._invokeAgent(request, progress, cancellationToken);
+			},
+		};
+
+		this._register(this._chatAgentService.registerDynamicAgent(agentData, agentImpl));
+	}
+
+	private async _invokeAgent(
+		request: IChatAgentRequest,
+		progress: (parts: IChatProgress[]) => void,
+		cancellationToken: CancellationToken,
+	): Promise<IChatAgentResult> {
+		this._logService.info(`[AgentHost] _invokeAgent called for resource: ${request.sessionResource.toString()}`);
+
+		// Resolve or create backend session
+		const resourceKey = request.sessionResource.path.substring(1);
+		let resolvedSession = this._sessionToBackend.get(resourceKey);
+		if (!resolvedSession) {
+			resolvedSession = await this._createAndSubscribe(request.sessionResource, request.userSelectedModelId);
+			this._sessionToBackend.set(resourceKey, resolvedSession);
+		}
+
+		await this._handleTurn(resolvedSession, request, progress, cancellationToken);
+
+		const activeSession = this._activeSessions.get(resourceKey);
+		if (activeSession) {
+			activeSession.isCompleteObs.set(true, undefined);
+		}
+
+		return {};
+	}
+
+	// ---- Pending message sync -----------------------------------------------
+
+	/**
+	 * Diffs the chat model's pending requests against the protocol state in
+	 * `_clientState` and dispatches Set/Removed/Reordered actions as needed.
+	 */
+	private _syncPendingMessages(sessionResource: URI, backendSession: URI): void {
+		const chatModel = this._chatService.getSession(sessionResource);
+		if (!chatModel) {
+			return;
+		}
+		const session = backendSession.toString();
+		const pending = chatModel.getPendingRequests();
+		const protocolState = this._clientState.getSessionState(session);
+		const prevSteering = protocolState?.steeringMessage;
+		const prevQueued = protocolState?.queuedMessages ?? [];
+
+		// Compute current state from chat model
+		let currentSteering: { id: string; text: string } | undefined;
+		const currentQueued: { id: string; text: string }[] = [];
+		for (const p of pending) {
+			if (p.kind === ChatRequestQueueKind.Steering) {
+				currentSteering = { id: p.request.id, text: p.request.message.text };
+			} else {
+				currentQueued.push({ id: p.request.id, text: p.request.message.text });
+			}
+		}
+
+		// --- Steering ---
+		if (currentSteering) {
+			if (currentSteering.id !== prevSteering?.id) {
+				this._dispatchAction({
+					type: ActionType.SessionPendingMessageSet,
+					session,
+					kind: PendingMessageKind.Steering,
+					id: currentSteering.id,
+					userMessage: { text: currentSteering.text },
+				});
+			}
+		} else if (prevSteering) {
+			this._dispatchAction({
+				type: ActionType.SessionPendingMessageRemoved,
+				session,
+				kind: PendingMessageKind.Steering,
+				id: prevSteering.id,
+			});
+		}
+
+		// --- Queued: removals ---
+		const currentQueuedIds = new Set(currentQueued.map(q => q.id));
+		for (const prev of prevQueued) {
+			if (!currentQueuedIds.has(prev.id)) {
+				this._dispatchAction({
+					type: ActionType.SessionPendingMessageRemoved,
+					session,
+					kind: PendingMessageKind.Queued,
+					id: prev.id,
+				});
+			}
+		}
+
+		// --- Queued: additions ---
+		const prevQueuedIds = new Set(prevQueued.map(q => q.id));
+		for (const q of currentQueued) {
+			if (!prevQueuedIds.has(q.id)) {
+				this._dispatchAction({
+					type: ActionType.SessionPendingMessageSet,
+					session,
+					kind: PendingMessageKind.Queued,
+					id: q.id,
+					userMessage: { text: q.text },
+				});
+			}
+		}
+
+		// --- Queued: reordering ---
+		// After additions/removals, check if the remaining common items changed order.
+		// Re-read protocol state since dispatches above may have mutated it.
+		const updatedProtocol = this._clientState.getSessionState(session);
+		const updatedQueued = updatedProtocol?.queuedMessages ?? [];
+		if (updatedQueued.length > 1 && currentQueued.length === updatedQueued.length) {
+			const needsReorder = currentQueued.some((q, i) => q.id !== updatedQueued[i].id);
+			if (needsReorder) {
+				this._dispatchAction({
+					type: ActionType.SessionQueuedMessagesReordered,
+					session,
+					order: currentQueued.map(q => q.id),
+				});
+			}
+		}
+	}
+
+	private _dispatchAction(action: ISessionAction): void {
+		const seq = this._clientState.applyOptimistic(action);
+		this._config.connection.dispatchAction(action, this._clientState.clientId, seq);
+	}
+
+	// ---- Server-initiated turn detection ------------------------------------
+
+	/**
+	 * Sets up a persistent listener on the session's protocol state that
+	 * detects server-initiated turns (e.g. auto-consumed queued messages).
+	 * When a new `activeTurn` appears whose `turnId` was NOT dispatched by
+	 * this client, it signals the {@link AgentHostChatSession} to create a
+	 * new request in the chat model, removes the consumed pending request
+	 * if applicable, and pipes turn progress through `progressObs`.
+	 */
+	private _watchForServerInitiatedTurns(backendSession: URI, sessionResource: URI): void {
+		const resourceKey = sessionResource.path.substring(1);
+		const sessionStr = backendSession.toString();
+		let lastSeenTurnId: string | undefined;
+		let previousQueuedIds: Set<string> | undefined;
+
+		const disposables = new DisposableStore();
+
+		// MutableDisposable for per-turn progress tracking (replaced each turn)
+		const turnProgressDisposable = new MutableDisposable<DisposableStore>();
+		disposables.add(turnProgressDisposable);
+
+		disposables.add(this._clientState.onDidChangeSessionState(e => {
+			if (e.session !== sessionStr) {
+				return;
+			}
+
+			// Track queued message IDs so we can detect which one was consumed
+			const currentQueuedIds = new Set((e.state.queuedMessages ?? []).map(m => m.id));
+
+			const activeTurn = e.state.activeTurn;
+			if (!activeTurn || activeTurn.id === lastSeenTurnId) {
+				previousQueuedIds = currentQueuedIds;
+				return;
+			}
+			lastSeenTurnId = activeTurn.id;
+
+			// If we dispatched this turn, the existing _handleTurn flow handles it
+			if (this._clientDispatchedTurnIds.has(activeTurn.id)) {
+				previousQueuedIds = currentQueuedIds;
+				return;
+			}
+
+			const chatSession = this._activeSessions.get(resourceKey);
+			if (!chatSession) {
+				previousQueuedIds = currentQueuedIds;
+				return;
+			}
+
+			this._logService.info(`[AgentHost] Server-initiated turn detected: ${activeTurn.id}`);
+
+			// Determine which queued message was consumed by diffing queue state
+			if (previousQueuedIds) {
+				for (const prevId of previousQueuedIds) {
+					if (!currentQueuedIds.has(prevId)) {
+						this._chatService.removePendingRequest(sessionResource, prevId);
+					}
+				}
+			}
+			previousQueuedIds = currentQueuedIds;
+
+			// Signal the session to create a new request+response pair
+			chatSession.startServerRequest(activeTurn.userMessage.text);
+
+			// Set up turn progress tracking — reuse the same state-to-progress
+			// translation as _handleTurn, but pipe output to progressObs/isCompleteObs
+			const turnStore = new DisposableStore();
+			turnProgressDisposable.value = turnStore;
+			this._trackServerTurnProgress(backendSession, activeTurn.id, chatSession, sessionResource, turnStore);
+		}));
+
+		this._serverTurnWatchers.set(resourceKey, disposables);
+	}
+
+	/**
+	 * Tracks protocol state changes for a specific server-initiated turn and
+	 * pushes `IChatProgress[]` items into the session's `progressObs`.
+	 * When the turn finishes, sets `isCompleteObs` to true.
+	 */
+	private _trackServerTurnProgress(
+		backendSession: URI,
+		turnId: string,
+		chatSession: AgentHostChatSession,
+		sessionResource: URI,
+		turnDisposables: DisposableStore,
+	): void {
+		const sessionStr = backendSession.toString();
+		const activeToolInvocations = new Map<string, ChatToolInvocation>();
+		const lastEmittedLengths = new Map<string, number>();
+		const throttler = new Throttler();
+		turnDisposables.add(throttler);
+
+		const progress = (parts: IChatProgress[]) => {
+			const current = chatSession.progressObs.get();
+			chatSession.progressObs.set([...current, ...parts], undefined);
+		};
+
+		let finished = false;
+		const finish = () => throttler.queue(async () => {
+			if (finished) {
+				return;
+			}
+			finished = true;
+			for (const [, invocation] of activeToolInvocations) {
+				invocation.didExecuteTool(undefined);
+			}
+			activeToolInvocations.clear();
+			chatSession.isCompleteObs.set(true, undefined);
+		});
+
+		turnDisposables.add(this._clientState.onDidChangeSessionState(e => {
+			throttler.queue(async () => {
+				if (e.session !== sessionStr) {
+					return;
+				}
+
+				const activeTurn = e.state.activeTurn;
+				const isActive = activeTurn?.id === turnId;
+				const responseParts = isActive
+					? activeTurn.responseParts
+					: e.state.turns.find(t => t.id === turnId)?.responseParts;
+
+				if (responseParts) {
+					for (const rp of responseParts) {
+						switch (rp.kind) {
+							case ResponsePartKind.Markdown: {
+								const lastLen = lastEmittedLengths.get(rp.id) ?? 0;
+								if (rp.content.length > lastLen) {
+									const delta = rp.content.substring(lastLen);
+									lastEmittedLengths.set(rp.id, rp.content.length);
+									progress([{ kind: 'markdownContent', content: new MarkdownString(delta, { supportHtml: true }) }]);
+								}
+								break;
+							}
+							case ResponsePartKind.Reasoning: {
+								const lastLen = lastEmittedLengths.get(rp.id) ?? 0;
+								if (rp.content.length > lastLen) {
+									const delta = rp.content.substring(lastLen);
+									lastEmittedLengths.set(rp.id, rp.content.length);
+									progress([{ kind: 'thinking', value: delta }]);
+								}
+								break;
+							}
+							case ResponsePartKind.ToolCall: {
+								const tc = rp.toolCall;
+								const toolCallId = tc.toolCallId;
+								let existing = activeToolInvocations.get(toolCallId);
+
+								if (!existing) {
+									existing = toolCallStateToInvocation(tc);
+									activeToolInvocations.set(toolCallId, existing);
+									progress([existing]);
+
+									if (tc.status === ToolCallStatus.PendingConfirmation) {
+										this._awaitToolConfirmation(existing, toolCallId, backendSession, turnId, CancellationToken.None);
+									}
+								} else if (tc.status === ToolCallStatus.PendingConfirmation) {
+									existing.didExecuteTool(undefined);
+									const confirmInvocation = toolCallStateToInvocation(tc);
+									activeToolInvocations.set(toolCallId, confirmInvocation);
+									progress([confirmInvocation]);
+									this._awaitToolConfirmation(confirmInvocation, toolCallId, backendSession, turnId, CancellationToken.None);
+								} else if (tc.status === ToolCallStatus.Running) {
+									existing.invocationMessage = typeof tc.invocationMessage === 'string'
+										? tc.invocationMessage
+										: new MarkdownString(tc.invocationMessage.markdown);
+									if (getToolKind(tc) === 'terminal' && tc.toolInput) {
+										existing.toolSpecificData = {
+											kind: 'terminal',
+											commandLine: { original: tc.toolInput },
+											language: getToolLanguage(tc) ?? 'shellscript',
+										};
+									}
+								}
+
+								if (existing && (tc.status === ToolCallStatus.Completed || tc.status === ToolCallStatus.Cancelled) && !IChatToolInvocation.isComplete(existing)) {
+									activeToolInvocations.delete(toolCallId);
+									const fileEdits = finalizeToolInvocation(existing, tc);
+									if (fileEdits.length > 0) {
+										// File edits from server-initiated turns are not routed through
+										// the editing session here; the request is not yet available
+										// in the ChatModel at this point.
+									}
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				if (!isActive && !finished) {
+					const lastTurn = e.state.turns.find(t => t.id === turnId);
+					if (lastTurn?.state === TurnState.Error && lastTurn.error) {
+						progress([{ kind: 'markdownContent', content: new MarkdownString(`\n\nError: (${lastTurn.error.errorType}) ${lastTurn.error.message}`) }]);
+					}
+					finish();
+				}
+			});
+		}));
+	}
+
+	// ---- Turn handling (state-driven) ---------------------------------------
+
+	private async _handleTurn(
+		session: URI,
+		request: IChatAgentRequest,
+		progress: (parts: IChatProgress[]) => void,
+		cancellationToken: CancellationToken,
+	): Promise<void> {
+		if (cancellationToken.isCancellationRequested) {
+			return;
+		}
+
+		const turnId = generateUuid();
+		this._clientDispatchedTurnIds.add(turnId);
+		const cleanUpTurnId = () => this._clientDispatchedTurnIds.delete(turnId);
+		const attachments = this._convertVariablesToAttachments(request);
+		const messageAttachments: IMessageAttachment[] = attachments.map(a => ({
+			type: a.type,
+			path: a.path,
+			displayName: a.displayName,
+		}));
+
+		// If the user selected a different model since the session was created
+		// (or since the last turn), dispatch a model change action first so the
+		// agent backend picks up the new model before processing the turn.
+		const rawModelId = this._extractRawModelId(request.userSelectedModelId);
+		if (rawModelId) {
+			const currentModel = this._clientState.getSessionState(session.toString())?.summary.model;
+			if (currentModel !== rawModelId) {
+				const modelAction = {
+					type: ActionType.SessionModelChanged as const,
+					session: session.toString(),
+					model: rawModelId,
+				};
+				const modelSeq = this._clientState.applyOptimistic(modelAction);
+				this._config.connection.dispatchAction(modelAction, this._clientState.clientId, modelSeq);
+			}
+		}
+
+		// Dispatch session/turnStarted — the server will call sendMessage on
+		// the provider as a side effect.
+		const turnAction = {
+			type: ActionType.SessionTurnStarted as const,
+			session: session.toString(),
+			turnId,
+			userMessage: {
+				text: request.message,
+				attachments: messageAttachments.length > 0 ? messageAttachments : undefined,
+			},
+		};
+		const clientSeq = this._clientState.applyOptimistic(turnAction);
+		this._config.connection.dispatchAction(turnAction, this._clientState.clientId, clientSeq);
+
+		// Track live ChatToolInvocation objects for this turn
+		const activeToolInvocations = new Map<string, ChatToolInvocation>();
+
+		// Track last-emitted content lengths per response part to compute deltas
+		const lastEmittedLengths = new Map<string, number>();
+
+		const turnDisposables = new DisposableStore();
+
+		// We throttle updates because generation of edits is async, if this breaks
+		// layouts if they are not sequenced correctly.
+		const throttler = new Throttler();
+		turnDisposables.add(throttler);
+
+		let resolveDone: () => void;
+		const done = new Promise<void>(resolve => { resolveDone = resolve; });
+
+		let finished = false;
+		const finish = () => throttler.queue(async () => {
+			if (finished) {
+				return;
+			}
+			finished = true;
+			cleanUpTurnId();
+			// Finalize any outstanding tool invocations
+			for (const [, invocation] of activeToolInvocations) {
+				invocation.didExecuteTool(undefined);
+			}
+			activeToolInvocations.clear();
+			turnDisposables.dispose();
+			resolveDone();
+		});
+
+		// Listen to state changes and translate to IChatProgress[]
+		turnDisposables.add(this._clientState.onDidChangeSessionState(e => {
+			throttler.queue(async () => {
+				if (e.session !== session.toString() || cancellationToken.isCancellationRequested) {
+					return;
+				}
+
+				// Find response parts for our turn — either from the active
+				// turn or from the finalized turn in the history array.
+				const activeTurn = e.state.activeTurn;
+				const isActive = activeTurn?.id === turnId;
+				const responseParts = isActive
+					? activeTurn.responseParts
+					: e.state.turns.find(t => t.id === turnId)?.responseParts;
+
+				if (responseParts) {
+					for (const rp of responseParts) {
+						switch (rp.kind) {
+							case ResponsePartKind.Markdown: {
+								const lastLen = lastEmittedLengths.get(rp.id) ?? 0;
+								if (rp.content.length > lastLen) {
+									const delta = rp.content.substring(lastLen);
+									lastEmittedLengths.set(rp.id, rp.content.length);
+									// supportHtml is load bearing. Without this the markdown string
+									// gets merged into the edit part in chatModel.ts which breaks
+									// rendering because the thinking content part does not deal with this.
+									progress([{ kind: 'markdownContent', content: new MarkdownString(delta, { supportHtml: true }) }]);
+								}
+								break;
+							}
+							case ResponsePartKind.Reasoning: {
+								const lastLen = lastEmittedLengths.get(rp.id) ?? 0;
+								if (rp.content.length > lastLen) {
+									const delta = rp.content.substring(lastLen);
+									lastEmittedLengths.set(rp.id, rp.content.length);
+									progress([{ kind: 'thinking', value: delta }]);
+								}
+								break;
+							}
+							case ResponsePartKind.ToolCall: {
+								const tc = rp.toolCall;
+								const toolCallId = tc.toolCallId;
+								let existing = activeToolInvocations.get(toolCallId);
+
+								if (!existing) {
+									// First time seeing this tool call — create an invocation
+									existing = toolCallStateToInvocation(tc);
+									activeToolInvocations.set(toolCallId, existing);
+									progress([existing]);
+
+									if (tc.status === ToolCallStatus.PendingConfirmation) {
+										this._awaitToolConfirmation(existing, toolCallId, session, turnId, cancellationToken);
+									}
+								} else if (tc.status === ToolCallStatus.PendingConfirmation) {
+									// Running → PendingConfirmation (re-confirmation).
+									existing.didExecuteTool(undefined);
+									const confirmInvocation = toolCallStateToInvocation(tc);
+									activeToolInvocations.set(toolCallId, confirmInvocation);
+									progress([confirmInvocation]);
+									this._awaitToolConfirmation(confirmInvocation, toolCallId, session, turnId, cancellationToken);
+								} else if (tc.status === ToolCallStatus.Running) {
+									// Streaming → Running: update with now-available parameters.
+									existing.invocationMessage = typeof tc.invocationMessage === 'string'
+										? tc.invocationMessage
+										: new MarkdownString(tc.invocationMessage.markdown);
+									if (getToolKind(tc) === 'terminal' && tc.toolInput) {
+										existing.toolSpecificData = {
+											kind: 'terminal',
+											commandLine: { original: tc.toolInput },
+											language: getToolLanguage(tc) ?? 'shellscript',
+										};
+									}
+								}
+
+								// Finalize terminal-state tools (whether just created or pre-existing)
+								if (existing && (tc.status === ToolCallStatus.Completed || tc.status === ToolCallStatus.Cancelled) && !IChatToolInvocation.isComplete(existing)) {
+									const fileEdits = finalizeToolInvocation(existing, tc);
+									if (fileEdits.length > 0) {
+										await this._applyFileEdits(request.sessionResource, request, fileEdits, progress);
+									}
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// If the turn is no longer active, emit any error and finish.
+				if (!isActive) {
+					const lastTurn = e.state.turns.find(t => t.id === turnId);
+					if (lastTurn?.state === TurnState.Error && lastTurn.error) {
+						progress([{ kind: 'markdownContent', content: new MarkdownString(`\n\nError: (${lastTurn.error.errorType}) ${lastTurn.error.message}`) }]);
+					}
+					if (!finished) {
+						finish();
+					}
+				}
+			});
+		}));
+
+		turnDisposables.add(cancellationToken.onCancellationRequested(() => {
+			this._logService.info(`[AgentHost] Cancellation requested for ${session.toString()}, dispatching turnCancelled`);
+			const cancelAction = {
+				type: ActionType.SessionTurnCancelled as const,
+				session: session.toString(),
+				turnId,
+			};
+			const seq = this._clientState.applyOptimistic(cancelAction);
+			this._config.connection.dispatchAction(cancelAction, this._clientState.clientId, seq);
+			finish();
+		}));
+
+		await done;
+	}
+
+	// ---- Tool confirmation --------------------------------------------------
+
+	/**
+	 * Awaits user confirmation on a PendingConfirmation tool call invocation
+	 * and dispatches `SessionToolCallConfirmed` back to the server.
+	 */
+	private _awaitToolConfirmation(
+		invocation: ChatToolInvocation,
+		toolCallId: string,
+		session: URI,
+		turnId: string,
+		cancellationToken: CancellationToken,
+	): void {
+		IChatToolInvocation.awaitConfirmation(invocation, cancellationToken).then(reason => {
+			const approved = reason.type !== ToolConfirmKind.Denied && reason.type !== ToolConfirmKind.Skipped;
+			this._logService.info(`[AgentHost] Tool confirmation: toolCallId=${toolCallId}, approved=${approved}`);
+			if (approved) {
+				const confirmAction = {
+					type: ActionType.SessionToolCallConfirmed as const,
+					session: session.toString(),
+					turnId,
+					toolCallId,
+					approved: true as const,
+					confirmed: ToolCallConfirmationReason.UserAction,
+				};
+				const seq = this._clientState.applyOptimistic(confirmAction);
+				this._config.connection.dispatchAction(confirmAction, this._clientState.clientId, seq);
+			} else {
+				const denyAction = {
+					type: ActionType.SessionToolCallConfirmed as const,
+					session: session.toString(),
+					turnId,
+					toolCallId,
+					approved: false as const,
+					reason: ToolCallCancellationReason.Denied as const,
+				};
+				const seq = this._clientState.applyOptimistic(denyAction);
+				this._config.connection.dispatchAction(denyAction, this._clientState.clientId, seq);
+			}
+		}).catch(err => {
+			this._logService.warn(`[AgentHost] Tool confirmation failed for toolCallId=${toolCallId}`, err);
+		});
+	}
+
+	// ---- File edit routing ---------------------------------------------------
+
+	/**
+	 * Routes file edits from completed tool calls through the editing session's
+	 * external edits pipeline. Calls start/stop in sequence since the edit has
+	 * already happened on the remote by the time we receive the tool completion.
+	 */
+	private async _applyFileEdits(
+		sessionResource: URI,
+		request: IChatAgentRequest,
+		fileEdits: IToolCallFileEdit[],
+		progress: (parts: IChatProgress[]) => void,
+	): Promise<void> {
+		const chatSession = this._chatService.getSession(sessionResource);
+		const editingSession = chatSession?.editingSession;
+		const response = chatSession?.getRequests().find(req => req.id === request.requestId)?.response;
+		if (!editingSession || !response) {
+			return;
+		}
+
+		const authority = this._config.connectionAuthority;
+		const wrapUri = (uri: URI) => toAgentHostUri(uri, authority);
+
+		for (const edit of fileEdits) {
+			const operationId = this._nextOperationId++;
+			const resource = wrapUri(edit.resource);
+			const beforeUri = wrapUri(edit.beforeContentUri);
+			const afterUri = wrapUri(edit.afterContentUri);
+
+			const startProgress = await editingSession.startExternalEdits(
+				response, operationId, [resource], edit.undoStopId,
+				[beforeUri],
+			);
+			progress(startProgress);
+
+			const stopProgress = await editingSession.stopExternalEdits(
+				response, operationId,
+				[afterUri],
+			);
+			progress(stopProgress);
+		}
+	}
+
+	private _nextOperationId = 0;
+
+	// ---- Session resolution -------------------------------------------------
+
+	/** Maps a UI session resource to a backend provider URI. */
+	private _resolveSessionUri(sessionResource: URI): URI {
+		const rawId = sessionResource.path.substring(1);
+		return AgentSession.uri(this._config.provider, rawId);
+	}
+
+	/** Creates a new backend session and subscribes to its state. */
+	private async _createAndSubscribe(sessionResource: URI, modelId?: string): Promise<URI> {
+		const rawModelId = this._extractRawModelId(modelId);
+		const resourceKey = sessionResource.path.substring(1);
+		const workingDirectory = this._config.resolveWorkingDirectory?.(resourceKey)
+			?? this._workspaceContextService.getWorkspace().folders[0]?.uri.fsPath;
+
+		this._logService.trace(`[AgentHost] Creating new session, model=${rawModelId ?? '(default)'}, provider=${this._config.provider}`);
+
+		let session: URI;
+		try {
+			session = await this._config.connection.createSession({
+				model: rawModelId,
+				provider: this._config.provider,
+				workingDirectory,
+			});
+		} catch (err) {
+			// If authentication is required, try to resolve it and retry once
+			if (this._isAuthRequiredError(err) && this._config.resolveAuthentication) {
+				this._logService.info('[AgentHost] Authentication required, prompting user...');
+				const authenticated = await this._config.resolveAuthentication();
+				if (authenticated) {
+					session = await this._config.connection.createSession({
+						model: rawModelId,
+						provider: this._config.provider,
+						workingDirectory,
+					});
+				} else {
+					throw new Error(localize('agentHost.authRequired', "Authentication is required to start a session. Please sign in and try again."));
+				}
+			} else {
+				throw err;
+			}
+		}
+
+		this._logService.trace(`[AgentHost] Created session: ${session.toString()}`);
+
+		// Subscribe to the new session's state
+		try {
+			const snapshot = await this._config.connection.subscribe(session);
+			this._clientState.handleSnapshot(session.toString(), snapshot.state, snapshot.fromSeq);
+		} catch (err) {
+			this._logService.error(`[AgentHost] Failed to subscribe to new session: ${session.toString()}`, err);
+		}
+
+		// Start syncing the chat model's pending requests to the protocol
+		this._ensurePendingMessageSubscription(resourceKey, sessionResource, session);
+
+		// Start watching for server-initiated turns on this session
+		this._watchForServerInitiatedTurns(session, sessionResource);
+
+		return session;
+	}
+
+	/**
+	 * Ensures that the chat model's pending request changes are synced to the
+	 * protocol for a given session. No-ops if already subscribed.
+	 */
+	private _ensurePendingMessageSubscription(resourceKey: string, sessionResource: URI, backendSession: URI): void {
+		if (this._pendingMessageSubscriptions.has(resourceKey)) {
+			return;
+		}
+		const chatModel = this._chatService?.getSession(sessionResource);
+		if (chatModel) {
+			this._pendingMessageSubscriptions.set(resourceKey, chatModel.onDidChangePendingRequests(() => {
+				this._syncPendingMessages(sessionResource, backendSession);
+			}));
+		}
+	}
+
+	/**
+	 * Check if an error is an "authentication required" error.
+	 * Checks for the AHP_AUTH_REQUIRED error code when available,
+	 * with a message-based fallback for transports that don't preserve
+	 * structured error codes (e.g. ProxyChannel).
+	 */
+	private _isAuthRequiredError(err: unknown): boolean {
+		if (err instanceof ProtocolError && err.code === AHP_AUTH_REQUIRED) {
+			return true;
+		}
+		if (err instanceof Error && err.message.includes('Authentication required')) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Extracts the raw model id from a language-model service identifier.
+	 * E.g. "agent-host-copilot:claude-sonnet-4-20250514" → "claude-sonnet-4-20250514".
+	 */
+	private _extractRawModelId(languageModelIdentifier: string | undefined): string | undefined {
+		if (!languageModelIdentifier) {
+			return undefined;
+		}
+		const prefix = this._config.sessionType + ':';
+		if (languageModelIdentifier.startsWith(prefix)) {
+			return languageModelIdentifier.substring(prefix.length);
+		}
+		return languageModelIdentifier;
+	}
+
+	private _convertVariablesToAttachments(request: IChatAgentRequest): IAgentAttachment[] {
+		const attachments: IAgentAttachment[] = [];
+		for (const v of request.variables.variables) {
+			if (v.kind === 'file') {
+				const uri = v.value instanceof URI ? v.value : undefined;
+				if (uri?.scheme === 'file') {
+					attachments.push({ type: AttachmentType.File, path: uri.fsPath, displayName: v.name });
+				}
+			} else if (v.kind === 'directory') {
+				const uri = v.value instanceof URI ? v.value : undefined;
+				if (uri?.scheme === 'file') {
+					attachments.push({ type: AttachmentType.Directory, path: uri.fsPath, displayName: v.name });
+				}
+			} else if (v.kind === 'implicit' && v.isSelection) {
+				const uri = v.uri;
+				if (uri?.scheme === 'file') {
+					attachments.push({ type: AttachmentType.Selection, path: uri.fsPath, displayName: v.name });
+				}
+			}
+		}
+		if (attachments.length > 0) {
+			this._logService.trace(`[AgentHost] Converted ${attachments.length} attachments from ${request.variables.variables.length} variables`);
+		}
+		return attachments;
+	}
+
+	// ---- Lifecycle ----------------------------------------------------------
+
+	override dispose(): void {
+		for (const [, session] of this._activeSessions) {
+			session.dispose();
+		}
+		this._activeSessions.clear();
+		this._sessionToBackend.clear();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.ts
new file mode 100644
index 00000000000..095117618df
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListController.ts
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+import { AgentSession, type IAgentConnection } from '../../../../../../platform/agentHost/common/agentService.js';
+import { isSessionAction } from '../../../../../../platform/agentHost/common/state/sessionActions.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta } from '../../../common/chatSessionsService.js';
+import { getAgentHostIcon } from '../agentSessions.js';
+
+/**
+ * Provides session list items for the chat sessions sidebar by querying
+ * active sessions from an agent host connection. Listens to protocol
+ * notifications for incremental updates.
+ *
+ * Works with both local and remote agent host connections via the
+ * {@link IAgentConnection} interface.
+ */
+export class AgentHostSessionListController extends Disposable implements IChatSessionItemController {
+
+	private readonly _onDidChangeChatSessionItems = this._register(new Emitter<IChatSessionItemsDelta>());
+	readonly onDidChangeChatSessionItems = this._onDidChangeChatSessionItems.event;
+
+	private _items: IChatSessionItem[] = [];
+
+	constructor(
+		private readonly _sessionType: string,
+		private readonly _provider: string,
+		private readonly _connection: IAgentConnection,
+		private readonly _description: string | undefined,
+		@IProductService private readonly _productService: IProductService,
+	) {
+		super();
+
+		// React to protocol notifications for session list changes
+		this._register(this._connection.onDidNotification(n => {
+			if (n.type === 'notify/sessionAdded' && n.summary.provider === this._provider) {
+				const rawId = AgentSession.id(n.summary.resource);
+				const workingDir = typeof n.summary.workingDirectory === 'string' ? n.summary.workingDirectory : undefined;
+				const item: IChatSessionItem = {
+					resource: URI.from({ scheme: this._sessionType, path: `/${rawId}` }),
+					label: n.summary.title ?? `Session ${rawId.substring(0, 8)}`,
+					description: this._description,
+					iconPath: getAgentHostIcon(this._productService),
+					status: ChatSessionStatus.Completed,
+					metadata: this._buildMetadata(workingDir),
+					timing: {
+						created: n.summary.createdAt,
+						lastRequestStarted: n.summary.modifiedAt,
+						lastRequestEnded: n.summary.modifiedAt,
+					},
+				};
+				this._items.push(item);
+				this._onDidChangeChatSessionItems.fire({ addedOrUpdated: [item] });
+			} else if (n.type === 'notify/sessionRemoved') {
+				const removedId = AgentSession.id(n.session);
+				const idx = this._items.findIndex(item => item.resource.path === `/${removedId}`);
+				if (idx >= 0) {
+					const [removed] = this._items.splice(idx, 1);
+					this._onDidChangeChatSessionItems.fire({ removed: [removed.resource] });
+				}
+			}
+		}));
+
+		// Refresh on turnComplete actions for metadata updates (title, timing)
+		this._register(this._connection.onDidAction(e => {
+			if (e.action.type === 'session/turnComplete' && isSessionAction(e.action) && AgentSession.provider(e.action.session) === this._provider) {
+				const cts = new CancellationTokenSource();
+				this.refresh(cts.token).finally(() => cts.dispose());
+			}
+		}));
+	}
+
+	get items(): readonly IChatSessionItem[] {
+		return this._items;
+	}
+
+	async refresh(_token: CancellationToken): Promise<void> {
+		try {
+			const sessions = await this._connection.listSessions();
+			const filtered = sessions.filter(s => AgentSession.provider(s.session) === this._provider);
+			const rawId = (s: typeof filtered[0]) => AgentSession.id(s.session);
+			this._items = filtered.map(s => ({
+				resource: URI.from({ scheme: this._sessionType, path: `/${rawId(s)}` }),
+				label: s.summary ?? `Session ${rawId(s).substring(0, 8)}`,
+				description: this._description,
+				iconPath: getAgentHostIcon(this._productService),
+				status: ChatSessionStatus.Completed,
+				metadata: this._buildMetadata(s.workingDirectory),
+				timing: {
+					created: s.startTime,
+					lastRequestStarted: s.modifiedTime,
+					lastRequestEnded: s.modifiedTime,
+				},
+			}));
+		} catch {
+			this._items = [];
+		}
+		this._onDidChangeChatSessionItems.fire({ addedOrUpdated: this._items });
+	}
+
+	private _buildMetadata(workingDirectory?: string): { readonly [key: string]: unknown } | undefined {
+		if (!this._description) {
+			return undefined;
+		}
+		const result: { [key: string]: unknown } = { remoteAgentHost: this._description };
+		if (workingDirectory) {
+			result.workingDirectoryPath = workingDirectory;
+		}
+		return result;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/loggingAgentConnection.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/loggingAgentConnection.ts
new file mode 100644
index 00000000000..01266552539
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/loggingAgentConnection.ts
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../../../../base/common/uri.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IAgentConnection, IAgentCreateSessionConfig, IAgentDescriptor, IAgentSessionMetadata, IAuthenticateParams, IAuthenticateResult, IResourceMetadata, AgentHostIpcLoggingSettingId } from '../../../../../../platform/agentHost/common/agentService.js';
+import type { IActionEnvelope, INotification, ISessionAction } from '../../../../../../platform/agentHost/common/state/sessionActions.js';
+import type { IBrowseDirectoryResult, IFetchContentResult, IStateSnapshot } from '../../../../../../platform/agentHost/common/state/sessionProtocol.js';
+import { Extensions, IOutputChannel, IOutputChannelRegistry, IOutputService } from '../../../../../services/output/common/output.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+
+/**
+ * JSON replacer that serializes revived URI objects to their string form,
+ * keeping the rest of the payload intact.
+ */
+function uriReplacer(_key: string, value: unknown): unknown {
+	if (value && typeof value === 'object' && (value as { $mid?: unknown }).$mid !== undefined && (value as { scheme?: unknown }).scheme !== undefined) {
+		return URI.revive(value as UriComponents).toString();
+	}
+	return value;
+}
+
+function formatPayload(data: unknown): string {
+	if (data === undefined) {
+		return '';
+	}
+	try {
+		return JSON.stringify(data, uriReplacer, 2);
+	} catch {
+		return String(data);
+	}
+}
+
+/**
+ * A logging wrapper around an {@link IAgentConnection} that writes all IPC
+ * traffic to a dedicated output channel. Used by both local and remote agent
+ * host contributions to provide per-host IPC tracing.
+ *
+ * The output channel is registered on construction and removed on dispose,
+ * so its lifetime matches the connection.
+ *
+ * All method calls, results, errors, and events are logged with arrows:
+ * - `>>` for outgoing calls
+ * - `<<` for results
+ * - `!!` for errors
+ * - `**` for events (onDidAction, onDidNotification)
+ */
+export class LoggingAgentConnection extends Disposable implements IAgentConnection {
+
+	declare readonly _serviceBrand: undefined;
+
+	private _outputChannel: IOutputChannel | undefined;
+	private readonly _enabled: boolean;
+
+	readonly clientId: string;
+	readonly onDidAction: Event<IActionEnvelope>;
+	readonly onDidNotification: Event<INotification>;
+
+	constructor(
+		private readonly _inner: IAgentConnection,
+		private readonly _channelId: string,
+		private readonly _channelLabel: string,
+		@IOutputService private readonly _outputService: IOutputService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super();
+		this.clientId = _inner.clientId;
+		this._enabled = !!configurationService.getValue<boolean>(AgentHostIpcLoggingSettingId);
+
+		if (this._enabled) {
+			// Register the output channel
+			const registry = Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels);
+			registry.registerChannel({
+				id: this._channelId,
+				label: this._channelLabel,
+				log: false,
+				languageId: 'log',
+			});
+			this._register({ dispose: () => registry.removeChannel(this._channelId) });
+		}
+
+		// Wrap events with logging
+		const onDidActionEmitter = this._register(new Emitter<IActionEnvelope>());
+		this._register(_inner.onDidAction(e => {
+			this._log('**', 'onDidAction', e);
+			onDidActionEmitter.fire(e);
+		}));
+		this.onDidAction = onDidActionEmitter.event;
+
+		const onDidNotificationEmitter = this._register(new Emitter<INotification>());
+		this._register(_inner.onDidNotification(e => {
+			this._log('**', 'onDidNotification', e);
+			onDidNotificationEmitter.fire(e);
+		}));
+		this.onDidNotification = onDidNotificationEmitter.event;
+	}
+
+	// ---- IAgentConnection method proxies with logging -----------------------
+
+	async listAgents(): Promise<IAgentDescriptor[]> {
+		return this._logCall('listAgents', undefined, () => this._inner.listAgents());
+	}
+
+	async getResourceMetadata(): Promise<IResourceMetadata> {
+		return this._logCall('getResourceMetadata', undefined, () => this._inner.getResourceMetadata());
+	}
+
+	async authenticate(params: IAuthenticateParams): Promise<IAuthenticateResult> {
+		return this._logCall('authenticate', params, () => this._inner.authenticate(params));
+	}
+
+	async refreshModels(): Promise<void> {
+		return this._logCall('refreshModels', undefined, () => this._inner.refreshModels());
+	}
+
+	async listSessions(): Promise<IAgentSessionMetadata[]> {
+		return this._logCall('listSessions', undefined, () => this._inner.listSessions());
+	}
+
+	async createSession(config?: IAgentCreateSessionConfig): Promise<URI> {
+		return this._logCall('createSession', config, () => this._inner.createSession(config));
+	}
+
+	async disposeSession(session: URI): Promise<void> {
+		return this._logCall('disposeSession', session, () => this._inner.disposeSession(session));
+	}
+
+	async shutdown(): Promise<void> {
+		return this._logCall('shutdown', undefined, () => this._inner.shutdown());
+	}
+
+	async subscribe(resource: URI): Promise<IStateSnapshot> {
+		return this._logCall('subscribe', resource, () => this._inner.subscribe(resource));
+	}
+
+	unsubscribe(resource: URI): void {
+		this._log('>>', 'unsubscribe', resource);
+		this._inner.unsubscribe(resource);
+	}
+
+	dispatchAction(action: ISessionAction, clientId: string, clientSeq: number): void {
+		this._log('>>', 'dispatchAction', { action, clientId, clientSeq });
+		this._inner.dispatchAction(action, clientId, clientSeq);
+	}
+
+	async browseDirectory(uri: URI): Promise<IBrowseDirectoryResult> {
+		return this._logCall('browseDirectory', uri, () => this._inner.browseDirectory(uri));
+	}
+
+	async fetchContent(uri: URI): Promise<IFetchContentResult> {
+		return this._logCall('fetchContent', uri, () => this._inner.fetchContent(uri));
+	}
+
+	// ---- Public logging API for callers' catch blocks -----------------------
+
+	/**
+	 * Log an error to the output channel. Use this from caller catch blocks
+	 * so connection errors appear in the per-host channel.
+	 */
+	logError(context: string, error: unknown): void {
+		this._log('!!', context, error instanceof Error ? error.message : String(error));
+	}
+
+	// ---- Internal helpers ---------------------------------------------------
+
+	private async _logCall<T>(method: string, params: unknown, fn: () => Promise<T>): Promise<T> {
+		this._log('>>', method, params);
+		try {
+			const result = await fn();
+			this._log('<<', method, result);
+			return result;
+		} catch (err) {
+			this._log('!!', method, err instanceof Error ? err.message : String(err));
+			throw err;
+		}
+	}
+
+	private _log(arrow: string, method: string, data?: unknown): void {
+		if (!this._enabled) {
+			return;
+		}
+
+		if (!this._outputChannel) {
+			this._outputChannel = this._outputService.getChannel(this._channelId);
+			if (!this._outputChannel) {
+				return;
+			}
+		}
+
+		const timestamp = new Date().toISOString();
+		const payload = formatPayload(data);
+		this._outputChannel.append(`[${timestamp}] ${arrow} ${method}${payload ? `\n${payload}` : ''}\n`);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/stateToProgressAdapter.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/stateToProgressAdapter.ts
new file mode 100644
index 00000000000..dceeac89e09
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/stateToProgressAdapter.ts
@@ -0,0 +1,302 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ToolCallStatus, TurnState, ResponsePartKind, getToolFileEdits, getToolOutputText, type ICompletedToolCall, type IToolCallState, type ITurn } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { getToolKind, getToolLanguage } from '../../../../../../platform/agentHost/common/state/sessionReducers.js';
+import { type IChatProgress, type IChatTerminalToolInvocationData, type IChatToolInputInvocationData, type IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService/chatService.js';
+import { type IChatSessionHistoryItem } from '../../../common/chatSessionsService.js';
+import { ChatToolInvocation } from '../../../common/model/chatProgressTypes/chatToolInvocation.js';
+import { type IToolConfirmationMessages, type IToolData, ToolDataSource, ToolInvocationPresentation } from '../../../common/tools/languageModelToolsService.js';
+import { hasKey } from '../../../../../../base/common/types.js';
+
+function getPtyTerminalData(meta: Record<string, unknown> | undefined): { input?: string; output?: string } | undefined {
+	if (!meta) {
+		return undefined;
+	}
+	const value = meta['ptyTerminal'];
+	if (!value || typeof value !== 'object') {
+		return undefined;
+	}
+	const input = (value as { input?: unknown }).input;
+	const output = (value as { output?: unknown }).output;
+	return {
+		input: typeof input === 'string' ? input : undefined,
+		output: typeof output === 'string' ? output : undefined,
+	};
+}
+
+/**
+ * Converts completed turns from the protocol state into session history items.
+ */
+export function turnsToHistory(turns: readonly ITurn[], participantId: string): IChatSessionHistoryItem[] {
+	const history: IChatSessionHistoryItem[] = [];
+	for (const turn of turns) {
+		// Request
+		history.push({ type: 'request', prompt: turn.userMessage.text, participant: participantId });
+
+		// Response parts — iterate the unified responseParts array
+		const parts: IChatProgress[] = [];
+
+		for (const rp of turn.responseParts) {
+			switch (rp.kind) {
+				case ResponsePartKind.Markdown:
+					if (rp.content) {
+						parts.push({ kind: 'markdownContent', content: new MarkdownString(rp.content) });
+					}
+					break;
+				case ResponsePartKind.ToolCall:
+					parts.push(completedToolCallToSerialized(rp.toolCall as ICompletedToolCall));
+					break;
+				case ResponsePartKind.Reasoning:
+					if (rp.content) {
+						parts.push({ kind: 'thinking', value: rp.content });
+					}
+					break;
+				case ResponsePartKind.ContentRef:
+					// Content references are not restored into history;
+					// they are handled separately by the content provider.
+					break;
+			}
+		}
+
+		// Error message for failed turns
+		if (turn.state === TurnState.Error && turn.error) {
+			parts.push({ kind: 'markdownContent', content: new MarkdownString(`\n\nError: (${turn.error.errorType}) ${turn.error.message}`) });
+		}
+
+		history.push({ type: 'response', parts, participant: participantId });
+	}
+	return history;
+}
+
+/**
+ * Converts a completed tool call from the protocol state into a serialized
+ * tool invocation suitable for history replay.
+ */
+function completedToolCallToSerialized(tc: ICompletedToolCall): IChatToolInvocationSerialized {
+	const isTerminal = getToolKind(tc) === 'terminal';
+	const isSuccess = tc.status === ToolCallStatus.Completed && tc.success;
+	const invocationMsg = stringOrMarkdownToString(tc.invocationMessage) ?? '';
+
+	let toolSpecificData: IChatTerminalToolInvocationData | undefined;
+	if (isTerminal) {
+		const ptyTerminal = getPtyTerminalData(tc._meta);
+		const commandInput = ptyTerminal?.input ?? tc.toolInput;
+		const toolOutput = tc.status === ToolCallStatus.Completed ? (ptyTerminal?.output ?? getToolOutputText(tc)) : undefined;
+		if (!commandInput && toolOutput === undefined) {
+			toolSpecificData = undefined;
+		} else {
+			toolSpecificData = {
+				kind: 'terminal',
+				commandLine: { original: commandInput ?? '' },
+				language: getToolLanguage(tc) ?? 'shellscript',
+				terminalCommandOutput: toolOutput !== undefined ? { text: toolOutput } : undefined,
+				terminalCommandState: { exitCode: isSuccess ? 0 : 1 },
+			};
+		}
+	}
+
+	const pastTenseMsg = isSuccess
+		? stringOrMarkdownToString(tc.pastTenseMessage) ?? invocationMsg
+		: invocationMsg;
+
+	return {
+		kind: 'toolInvocationSerialized',
+		toolCallId: tc.toolCallId,
+		toolId: tc.toolName,
+		source: ToolDataSource.Internal,
+		invocationMessage: invocationMsg,
+		originMessage: undefined,
+		pastTenseMessage: isTerminal ? undefined : pastTenseMsg,
+		isConfirmed: isSuccess
+			? { type: ToolConfirmKind.ConfirmationNotNeeded }
+			: { type: ToolConfirmKind.Denied },
+		isComplete: true,
+		presentation: undefined,
+		toolSpecificData,
+	};
+}
+
+/**
+ * Creates a live {@link ChatToolInvocation} from the protocol's tool-call
+ * state. Used during active turns to represent running tool calls in the UI.
+ */
+/**
+ * Converts a protocol `StringOrMarkdown` value to a chat-layer `IMarkdownString`.
+ */
+function stringOrMarkdownToString(value: string | { readonly markdown: string } | undefined): string | IMarkdownString | undefined {
+	if (value === undefined) {
+		return undefined;
+	}
+	return typeof value === 'string' ? value : new MarkdownString(value.markdown);
+}
+
+/**
+ * Creates a live {@link ChatToolInvocation} from the protocol's tool-call
+ * state. Used during active turns to represent running tool calls in the UI.
+ */
+export function toolCallStateToInvocation(tc: IToolCallState): ChatToolInvocation {
+	const toolData: IToolData = {
+		id: tc.toolName,
+		source: ToolDataSource.Internal,
+		displayName: tc.displayName,
+		modelDescription: tc.toolName,
+	};
+
+	if (tc.status === ToolCallStatus.PendingConfirmation) {
+		// Tool needs confirmation — create with confirmation messages
+		const titleText = stringOrMarkdownToString(tc.confirmationTitle) ?? stringOrMarkdownToString(tc.invocationMessage) ?? tc.displayName;
+		const titleStr = typeof titleText === 'string' ? titleText : titleText?.value ?? '';
+		const confirmationMessages: IToolConfirmationMessages = {
+			title: typeof titleText === 'string' ? new MarkdownString(titleText) : (titleText ?? new MarkdownString('')),
+			message: new MarkdownString(''),
+		};
+
+		let toolSpecificData: IChatTerminalToolInvocationData | IChatToolInputInvocationData | undefined;
+		if (getToolKind(tc) === 'terminal' && tc.toolInput) {
+			toolSpecificData = {
+				kind: 'terminal',
+				commandLine: { original: tc.toolInput },
+				language: getToolLanguage(tc) ?? 'shellscript',
+			};
+		} else if (tc.toolInput) {
+			let rawInput: unknown;
+			try { rawInput = JSON.parse(tc.toolInput); } catch { rawInput = { input: tc.toolInput }; }
+			toolSpecificData = { kind: 'input', rawInput };
+		}
+
+		return new ChatToolInvocation(
+			{
+				invocationMessage: typeof titleText === 'string' ? new MarkdownString(titleStr) : (titleText ?? new MarkdownString('')),
+				confirmationMessages,
+				presentation: ToolInvocationPresentation.HiddenAfterComplete,
+				toolSpecificData,
+			},
+			toolData,
+			tc.toolCallId,
+			undefined,
+			undefined,
+		);
+	}
+
+	const invocation = new ChatToolInvocation(undefined, toolData, tc.toolCallId, undefined, undefined);
+	invocation.invocationMessage = stringOrMarkdownToString(tc.invocationMessage) ?? '';
+
+	if (getToolKind(tc) === 'terminal') {
+		const ptyTerminal = getPtyTerminalData(tc._meta);
+		const commandInput = ptyTerminal?.input ?? (tc.status !== ToolCallStatus.Streaming ? (tc.toolInput ?? '') : '');
+		invocation.toolSpecificData = {
+			kind: 'terminal',
+			commandLine: { original: commandInput },
+			language: getToolLanguage(tc) ?? 'shellscript',
+			terminalCommandOutput: ptyTerminal?.output !== undefined ? { text: ptyTerminal.output } : undefined,
+		} satisfies IChatTerminalToolInvocationData;
+	}
+
+	return invocation;
+}
+
+/**
+ * Data returned by {@link finalizeToolInvocation} describing file edits
+ * that should be routed through the editing session's external edits pipeline.
+ */
+export interface IToolCallFileEdit {
+	/** The real file URI on the remote (e.g., `file:///path/to/file`). */
+	readonly resource: URI;
+	/** URI to read the before-snapshot content from. */
+	readonly beforeContentUri: URI;
+	/** URI to read the after-content from (real file on remote via agenthost:// scheme). */
+	readonly afterContentUri: URI;
+	/** Undo stop ID for grouping edits. */
+	readonly undoStopId: string;
+}
+
+/**
+ * Updates a live {@link ChatToolInvocation} with completion data from the
+ * protocol's tool-call state, transitioning it to the completed state.
+ *
+ * Returns file edits that the caller should route through the editing
+ * session's external edits pipeline.
+ */
+export function finalizeToolInvocation(invocation: ChatToolInvocation, tc: IToolCallState): IToolCallFileEdit[] {
+	const isCompleted = tc.status === ToolCallStatus.Completed;
+	const isCancelled = tc.status === ToolCallStatus.Cancelled;
+	const isTerminal = invocation.toolSpecificData?.kind === 'terminal' || getToolKind(tc) === 'terminal';
+
+	if ((isCompleted || isCancelled) && hasKey(tc, { invocationMessage: true })) {
+		invocation.invocationMessage = stringOrMarkdownToString(tc.invocationMessage) ?? invocation.invocationMessage;
+	}
+
+	if (isTerminal && (isCompleted || isCancelled)) {
+		const ptyTerminal = getPtyTerminalData(tc._meta);
+		const toolOutput = isCompleted ? (ptyTerminal?.output ?? getToolOutputText(tc)) : undefined;
+		const existing = invocation.toolSpecificData as IChatTerminalToolInvocationData | undefined;
+		const commandInput = ptyTerminal?.input ?? tc.toolInput ?? existing?.commandLine?.original ?? '';
+		invocation.toolSpecificData = {
+			kind: 'terminal',
+			commandLine: { original: commandInput },
+			language: existing?.language ?? getToolLanguage(tc) ?? 'shellscript',
+			terminalCommandOutput: toolOutput !== undefined ? { text: toolOutput } : undefined,
+			terminalCommandState: { exitCode: isCompleted && tc.success ? 0 : 1 },
+		};
+	} else if (isCompleted && tc.pastTenseMessage) {
+		invocation.pastTenseMessage = stringOrMarkdownToString(tc.pastTenseMessage);
+	}
+
+	const isFailure = (isCompleted && !tc.success) || isCancelled;
+	const errorMessage = isCompleted ? tc.error?.message : (isCancelled ? tc.reasonMessage : undefined);
+	const errorString = typeof errorMessage === 'string' ? errorMessage : errorMessage?.markdown;
+	invocation.didExecuteTool(isFailure ? { content: [], toolResultError: errorString } : undefined);
+
+	// Extract file edits for the editing session pipeline
+	return isCompleted ? fileEditsToExternalEdits(tc) : [];
+}
+
+/**
+ * Extracts file edit content entries from a completed tool call and
+ * converts them to {@link IToolCallFileEdit} data for routing through
+ * the editing session's external edits pipeline.
+ */
+function fileEditsToExternalEdits(tc: IToolCallState): IToolCallFileEdit[] {
+	if (tc.status !== ToolCallStatus.Completed) {
+		return [];
+	}
+	const edits = getToolFileEdits(tc);
+	if (edits.length === 0) {
+		return [];
+	}
+	const result: IToolCallFileEdit[] = [];
+	for (const edit of edits) {
+		const filePath = getFilePathFromToolInput(tc);
+		if (filePath) {
+			result.push({
+				resource: URI.file(filePath),
+				beforeContentUri: URI.parse(edit.beforeURI),
+				afterContentUri: URI.parse(edit.afterURI),
+				undoStopId: generateUuid(),
+			});
+		}
+	}
+	return result;
+}
+
+/**
+ * Extracts the file path from a tool call's input parameters.
+ * Edit tools store the file path in JSON parameters as `path`.
+ */
+function getFilePathFromToolInput(tc: IToolCallState): string | undefined {
+	if (tc.status !== ToolCallStatus.Completed || !tc.toolInput) {
+		return undefined;
+	}
+	try {
+		const params = JSON.parse(tc.toolInput);
+		return typeof params.path === 'string' ? params.path : undefined;
+	} catch {
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts
index 95a563c19f5..61ef7f44865 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts
@@ -16,7 +16,7 @@ import { IAgentSessionsService, AgentSessionsService } from './agentSessionsServ
 import { LocalAgentsSessionsController } from './localAgentSessionsController.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
 import { ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
-import { ArchiveAgentSessionAction, ArchiveAgentSessionSectionAction, UnarchiveAgentSessionAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, OpenAgentSessionInNewWindowAction, ShowAgentSessionsSidebar, HideAgentSessionsSidebar, ToggleAgentSessionsSidebar, RefreshAgentSessionsViewerAction, FindAgentSessionInViewerAction, MarkAgentSessionUnreadAction, MarkAgentSessionReadAction, FocusAgentSessionsAction, SetAgentSessionsOrientationStackedAction, SetAgentSessionsOrientationSideBySideAction, PickAgentSessionAction, ArchiveAllAgentSessionsAction, MarkAllAgentSessionsReadAction, RenameAgentSessionAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, MarkAgentSessionSectionReadAction, ToggleShowAgentSessionsAction, UnarchiveAgentSessionSectionAction } from './agentSessionsActions.js';
+import { ArchiveAgentSessionAction, ArchiveAgentSessionSectionAction, UnarchiveAgentSessionAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, OpenAgentSessionInNewWindowAction, ShowAgentSessionsSidebar, HideAgentSessionsSidebar, ToggleAgentSessionsSidebar, RefreshAgentSessionsViewerAction, FindAgentSessionInViewerAction, MarkAgentSessionUnreadAction, MarkAgentSessionReadAction, FocusAgentSessionsAction, SetAgentSessionsOrientationStackedAction, SetAgentSessionsOrientationSideBySideAction, PickAgentSessionAction, ArchiveAllAgentSessionsAction, MarkAllAgentSessionsReadAction, RenameAgentSessionAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, MarkAgentSessionSectionReadAction, ToggleShowAgentSessionsAction, UnarchiveAgentSessionSectionAction, PinAgentSessionAction, UnpinAgentSessionAction, CollapseAllAgentSessionSectionsAction } from './agentSessionsActions.js';
 import { AgentSessionsQuickAccessProvider, AGENT_SESSIONS_QUICK_ACCESS_PREFIX } from './agentSessionsQuickAccess.js';
 
 //#region Actions and Menus
@@ -28,8 +28,11 @@ registerAction2(MarkAllAgentSessionsReadAction);
 registerAction2(ArchiveAgentSessionSectionAction);
 registerAction2(UnarchiveAgentSessionSectionAction);
 registerAction2(MarkAgentSessionSectionReadAction);
+registerAction2(CollapseAllAgentSessionSectionsAction);
 registerAction2(ArchiveAgentSessionAction);
 registerAction2(UnarchiveAgentSessionAction);
+registerAction2(PinAgentSessionAction);
+registerAction2(UnpinAgentSessionAction);
 registerAction2(RenameAgentSessionAction);
 registerAction2(DeleteAgentSessionAction);
 registerAction2(DeleteAllLocalSessionsAction);
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts
index f7662aa6914..f48b0a98494 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts
@@ -7,10 +7,9 @@ import { localize } from '../../../../../nls.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-
-import { IChatSessionTiming } from '../../common/chatService/chatService.js';
 import { foreground, listActiveSelectionForeground, registerColor, transparent } from '../../../../../platform/theme/common/colorRegistry.js';
 import { getChatSessionType } from '../../common/model/chatUri.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
 
 export enum AgentSessionProviders {
 	Local = 'local',
@@ -19,9 +18,18 @@ export enum AgentSessionProviders {
 	Claude = 'claude-code',
 	Codex = 'openai-codex',
 	Growth = 'copilot-growth',
+	AgentHostCopilot = 'agent-host-copilot',
 }
 
-export function isBuiltInAgentSessionProvider(provider: string): boolean {
+/**
+ * A session target is either a well-known {@link AgentSessionProviders} enum
+ * value or a dynamic string for dynamically-registered providers (e.g. remote
+ * agent hosts like `remote-{authority}-copilot`).
+ * TODO@roblourens HACK
+ */
+export type AgentSessionTarget = AgentSessionProviders | (string & {});
+
+export function isBuiltInAgentSessionProvider(provider: AgentSessionTarget): boolean {
 	return provider === AgentSessionProviders.Local ||
 		provider === AgentSessionProviders.Background ||
 		provider === AgentSessionProviders.Cloud ||
@@ -36,13 +44,14 @@ export function getAgentSessionProvider(sessionResource: URI | string): AgentSes
 		case AgentSessionProviders.Cloud:
 		case AgentSessionProviders.Claude:
 		case AgentSessionProviders.Codex:
+		case AgentSessionProviders.AgentHostCopilot:
 			return type;
 		default:
 			return undefined;
 	}
 }
 
-export function getAgentSessionProviderName(provider: AgentSessionProviders): string {
+export function getAgentSessionProviderName(provider: AgentSessionTarget): string {
 	switch (provider) {
 		case AgentSessionProviders.Local:
 			return localize('chat.session.providerLabel.local', "Local");
@@ -56,10 +65,14 @@ export function getAgentSessionProviderName(provider: AgentSessionProviders): st
 			return 'Codex';
 		case AgentSessionProviders.Growth:
 			return 'Growth';
+		case AgentSessionProviders.AgentHostCopilot:
+			return 'Agent Host - Copilot';
+		default:
+			return provider;
 	}
 }
 
-export function getAgentSessionProviderIcon(provider: AgentSessionProviders): ThemeIcon {
+export function getAgentSessionProviderIcon(provider: AgentSessionTarget): ThemeIcon {
 	switch (provider) {
 		case AgentSessionProviders.Local:
 			return Codicon.vm;
@@ -73,10 +86,52 @@ export function getAgentSessionProviderIcon(provider: AgentSessionProviders): Th
 			return Codicon.claude;
 		case AgentSessionProviders.Growth:
 			return Codicon.lightbulb;
+		case AgentSessionProviders.AgentHostCopilot:
+			return Codicon.vscodeInsiders; // default; use getAgentHostIcon() for quality-aware icon
+		default:
+			return Codicon.extensions;
 	}
 }
 
-export function isFirstPartyAgentSessionProvider(provider: AgentSessionProviders): boolean {
+/**
+ * Returns the VS Code or VS Code Insiders icon depending on product quality.
+ */
+export function getAgentHostIcon(productService: IProductService): ThemeIcon {
+	return productService.quality === 'stable' ? Codicon.vscode : Codicon.vscodeInsiders;
+}
+
+export function isFirstPartyAgentSessionProvider(provider: AgentSessionTarget): boolean {
+	switch (provider) {
+		case AgentSessionProviders.Local:
+		case AgentSessionProviders.Background:
+		case AgentSessionProviders.Cloud:
+		case AgentSessionProviders.AgentHostCopilot:
+			return true;
+		case AgentSessionProviders.Claude:
+		case AgentSessionProviders.Codex:
+		case AgentSessionProviders.Growth:
+			return false;
+		default:
+			return false;
+	}
+}
+
+/**
+ * Returns whether the given session type is an agent host target.
+ * Matches the local agent host (`agent-host-*`) and remote agent hosts (`remote-*`).
+ *
+ * Note: The `remote-` prefix convention is established by
+ * {@link RemoteAgentHostContribution} which generates session types as
+ * `remote-{sanitizedAddress}-{provider}`. If future remote providers that
+ * are NOT agent hosts need a different prefix, this function must be updated.
+ */
+export function isAgentHostTarget(target: string): boolean {
+	return target === AgentSessionProviders.AgentHostCopilot ||
+		target.startsWith('agent-host-') ||
+		target.startsWith('remote-');
+}
+
+export function getAgentCanContinueIn(provider: AgentSessionTarget): boolean {
 	switch (provider) {
 		case AgentSessionProviders.Local:
 		case AgentSessionProviders.Background:
@@ -85,24 +140,14 @@ export function isFirstPartyAgentSessionProvider(provider: AgentSessionProviders
 		case AgentSessionProviders.Claude:
 		case AgentSessionProviders.Codex:
 		case AgentSessionProviders.Growth:
+		case AgentSessionProviders.AgentHostCopilot:
+			return false;
+		default:
 			return false;
 	}
 }
 
-export function getAgentCanContinueIn(provider: AgentSessionProviders): boolean {
-	switch (provider) {
-		case AgentSessionProviders.Local:
-		case AgentSessionProviders.Background:
-		case AgentSessionProviders.Cloud:
-			return true;
-		case AgentSessionProviders.Claude:
-		case AgentSessionProviders.Codex:
-		case AgentSessionProviders.Growth:
-			return false;
-	}
-}
-
-export function getAgentSessionProviderDescription(provider: AgentSessionProviders): string {
+export function getAgentSessionProviderDescription(provider: AgentSessionTarget): string {
 	switch (provider) {
 		case AgentSessionProviders.Local:
 			return localize('chat.session.providerDescription.local', "Run tasks within VS Code chat. The agent iterates via chat and works interactively to implement changes on your main workspace.");
@@ -116,6 +161,10 @@ export function getAgentSessionProviderDescription(provider: AgentSessionProvide
 			return localize('chat.session.providerDescription.codex', "Opens a new Codex session in the editor. Codex sessions can be managed from the chat sessions view.");
 		case AgentSessionProviders.Growth:
 			return localize('chat.session.providerDescription.growth', "Learn about Copilot features.");
+		case AgentSessionProviders.AgentHostCopilot:
+			return 'Run a Copilot SDK agent in a dedicated process.';
+		default:
+			return '';
 	}
 }
 
@@ -140,6 +189,9 @@ export interface IAgentSessionsControl {
 
 	clearFocus(): void;
 	hasFocusOrSelection(): boolean;
+
+	resetSectionCollapseState(): void;
+	collapseAllSections(): void;
 }
 
 export const agentSessionReadIndicatorForeground = registerColor(
@@ -162,7 +214,3 @@ export const agentSessionSelectedUnfocusedBadgeBorder = registerColor(
 
 export const AGENT_SESSION_RENAME_ACTION_ID = 'agentSession.rename';
 export const AGENT_SESSION_DELETE_ACTION_ID = 'agentSession.delete';
-
-export function getAgentSessionTime(timing: IChatSessionTiming): number {
-	return timing.lastRequestStarted ?? timing.created;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
index 950fea0381e..b4805d349a6 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
@@ -179,7 +179,7 @@ export class ArchiveAllAgentSessionsAction extends Action2 {
 			message: sessionsToArchive.length === 1
 				? localize('archiveAllSessions.confirmSingle', "Are you sure you want to archive 1 agent session?")
 				: localize('archiveAllSessions.confirm', "Are you sure you want to archive {0} agent sessions?", sessionsToArchive.length),
-			detail: localize('archiveAllSessions.detail', "You can unarchive sessions later if needed from the Chat view."),
+			detail: localize('archiveAllSessions.detail', "You can unarchive sessions later if needed from the sessions view."),
 			primaryButton: localize('archiveAllSessions.archive', "Archive")
 		});
 
@@ -312,24 +312,24 @@ export class UnarchiveAgentSessionSectionAction extends Action2 {
 		const dialogService = accessor.get(IDialogService);
 		const storageService = accessor.get(IStorageService);
 
-		const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
-		if (!skipConfirmation) {
-			const confirmed = await dialogService.confirm({
-				message: context.sessions.length === 1
-					? localize('unarchiveSectionSessions.confirmSingle', "Are you sure you want to unarchive 1 agent session?")
-					: localize('unarchiveSectionSessions.confirm', "Are you sure you want to unarchive {0} agent sessions?", context.sessions.length),
-				primaryButton: localize('unarchiveSectionSessions.unarchive', "Unarchive All"),
-				checkbox: {
-					label: localize('doNotAskAgain', "Do not ask me again")
+		if (context.sessions.length > 1) {
+			const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
+			if (!skipConfirmation) {
+				const confirmed = await dialogService.confirm({
+					message: localize('unarchiveSectionSessions.confirm', "Are you sure you want to unarchive {0} agent sessions?", context.sessions.length),
+					primaryButton: localize('unarchiveSectionSessions.unarchive', "Unarchive All"),
+					checkbox: {
+						label: localize('doNotAskAgain', "Do not ask me again")
+					}
+				});
+
+				if (!confirmed.confirmed) {
+					return;
 				}
-			});
 
-			if (!confirmed.confirmed) {
-				return;
-			}
-
-			if (confirmed.checkboxChecked) {
-				storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+				if (confirmed.checkboxChecked) {
+					storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+				}
 			}
 		}
 
@@ -365,6 +365,25 @@ export class MarkAgentSessionSectionReadAction extends Action2 {
 	}
 }
 
+export class CollapseAllAgentSessionSectionsAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSessionSection.collapseAll',
+			title: localize2('collapseAll', "Collapse All"),
+			menu: [{
+				id: MenuId.AgentSessionSectionContext,
+				group: '2_collapse',
+				order: 1,
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, _section: unknown, control?: IAgentSessionsControl): Promise<void> {
+		control?.collapseAllSections();
+	}
+}
+
 //#endregion
 
 //#region Session Actions
@@ -540,6 +559,74 @@ export class UnarchiveAgentSessionAction extends BaseAgentSessionAction {
 	}
 }
 
+export class PinAgentSessionAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: 'agentSession.pin',
+			title: localize2('pin', "Pin"),
+			icon: Codicon.pin,
+			menu: [{
+				id: MenuId.AgentSessionItemToolbar,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.isPinnedAgentSession.negate(),
+					ChatContextKeys.isArchivedAgentSession.negate()
+				),
+			}, {
+				id: MenuId.AgentSessionsContext,
+				group: '0_pin',
+				order: 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.isPinnedAgentSession.negate(),
+					ChatContextKeys.isArchivedAgentSession.negate()
+				),
+			}]
+		});
+	}
+
+	runWithSessions(sessions: IAgentSession[]): void {
+		for (const session of sessions) {
+			session.setPinned(true);
+		}
+	}
+}
+
+export class UnpinAgentSessionAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: 'agentSession.unpin',
+			title: localize2('unpin', "Unpin"),
+			icon: Codicon.pinned,
+			menu: [{
+				id: MenuId.AgentSessionItemToolbar,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.isPinnedAgentSession,
+					ChatContextKeys.isArchivedAgentSession.negate()
+				),
+			}, {
+				id: MenuId.AgentSessionsContext,
+				group: '0_pin',
+				order: 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.isPinnedAgentSession,
+					ChatContextKeys.isArchivedAgentSession.negate()
+				),
+			}]
+		});
+	}
+
+	runWithSessions(sessions: IAgentSession[]): void {
+		for (const session of sessions) {
+			session.setPinned(false);
+		}
+	}
+}
+
 export class RenameAgentSessionAction extends BaseAgentSessionAction {
 
 	constructor() {
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts
index afefa7448ab..ad17b336879 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts
@@ -8,13 +8,13 @@ import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IOpenEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
-import { $, append, EventHelper, addDisposableListener, EventType, hide, setVisibility } from '../../../../../base/browser/dom.js';
+import { $, append, EventHelper, addDisposableListener, EventType, getWindow, hide, setVisibility } from '../../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { localize } from '../../../../../nls.js';
-import { AgentSessionSection, IAgentSession, IAgentSessionSection, IAgentSessionsModel, IMarshalledAgentSessionContext, isAgentSession, isAgentSessionSection } from './agentSessionsModel.js';
-import { AgentSessionListItem, AgentSessionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionSectionRenderer, AgentSessionsSorter, IAgentSessionsFilter, IAgentSessionsSorterOptions } from './agentSessionsViewer.js';
-import { AgentSessionsGrouping } from './agentSessionsFilter.js';
+import { AgentSessionSection, IAgentSession, IAgentSessionSection, IAgentSessionsModel, IMarshalledAgentSessionContext, isAgentSession, isAgentSessionSection, isAgentSessionShowLess, isAgentSessionShowMore } from './agentSessionsModel.js';
+import { AgentSessionListItem, AgentSessionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionSectionRenderer, AgentSessionSectionLabels, AgentSessionShowLessRenderer, AgentSessionShowMoreRenderer, AgentSessionsSorter, getRepositoryName, IAgentSessionsFilter } from './agentSessionsViewer.js';
+import { AgentSessionsGrouping, AgentSessionsSorting } from './agentSessionsFilter.js';
 import { AgentSessionApprovalModel } from './agentSessionApprovalModel.js';
 import { FuzzyScore } from '../../../../../base/common/filters.js';
 import { IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
@@ -33,7 +33,7 @@ import { IAgentSessionsService } from './agentSessionsService.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IListStyles } from '../../../../../base/browser/ui/list/listWidget.js';
 import { IStyleOverride } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { getAgentSessionTime, IAgentSessionsControl } from './agentSessions.js';
+import { IAgentSessionsControl } from './agentSessions.js';
 import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ISessionOpenOptions, openSession } from './agentSessionsOpener.js';
@@ -42,14 +42,19 @@ import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
 import { IMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { IChatWidget } from '../chat.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
 
-export interface IAgentSessionsControlOptions extends IAgentSessionsSorterOptions {
+export interface IAgentSessionsControlOptions {
 	readonly overrideStyles: IStyleOverride<IListStyles>;
 	readonly filter: IAgentSessionsFilter;
 	readonly source: string;
 	readonly disableHover?: boolean;
-	readonly showIsolationIcon?: boolean;
 	readonly enableApprovalRow?: boolean;
+	readonly repositoryGroupLimit?: number;
+	readonly hideSectionCount?: boolean;
+	readonly hideSessionBadge?: boolean;
+	readonly useStatusOnlyIcons?: boolean;
+	readonly compactShowMore?: boolean;
 
 	getHoverPosition(): HoverPosition;
 	trackActiveEditorSession(): boolean;
@@ -80,8 +85,12 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 	private emptyFilterMessage: HTMLElement | undefined;
 
 	private sessionsList: WorkbenchCompressibleAsyncDataTree<IAgentSessionsModel, AgentSessionListItem, FuzzyScore> | undefined;
+	private sessionsDataSource: AgentSessionsDataSource | undefined;
+	private static readonly RECENT_SESSIONS_FOR_EXPAND = 5;
+
 	private sessionsListFindIsOpen = false;
 	private _isProgrammaticCollapseChange = false;
+	private readonly _recentRepositoryLabels = new Set<string>();
 
 	private readonly updateSessionsListThrottler = this._register(new Throttler());
 
@@ -91,6 +100,7 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 	private visible: boolean = true;
 
 	private focusedAgentSessionArchivedContextKey: IContextKey<boolean>;
+	private focusedAgentSessionPinnedContextKey: IContextKey<boolean>;
 	private focusedAgentSessionReadContextKey: IContextKey<boolean>;
 	private focusedAgentSessionTypeContextKey: IContextKey<string>;
 	private hasMultipleAgentSessionsSelectedContextKey: IContextKey<boolean>;
@@ -108,10 +118,12 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IStorageService private readonly storageService: IStorageService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 	) {
 		super();
 
 		this.focusedAgentSessionArchivedContextKey = ChatContextKeys.isArchivedAgentSession.bindTo(this.contextKeyService);
+		this.focusedAgentSessionPinnedContextKey = ChatContextKeys.isPinnedAgentSession.bindTo(this.contextKeyService);
 		this.focusedAgentSessionReadContextKey = ChatContextKeys.isReadAgentSession.bindTo(this.contextKeyService);
 		this.focusedAgentSessionTypeContextKey = ChatContextKeys.agentSessionType.bindTo(this.contextKeyService);
 		this.hasMultipleAgentSessionsSelectedContextKey = ChatContextKeys.hasMultipleAgentSessionsSelected.bindTo(this.contextKeyService);
@@ -212,6 +224,10 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 		this.storageService.store(AgentSessionsControl.SECTION_COLLAPSE_STATE_KEY, JSON.stringify(state), StorageScope.PROFILE, StorageTarget.USER);
 	}
 
+	resetSectionCollapseState(): void {
+		this.storageService.remove(AgentSessionsControl.SECTION_COLLAPSE_STATE_KEY, StorageScope.PROFILE);
+	}
+
 	private createList(container: HTMLElement): void {
 		const collapseByDefault = (element: unknown) => {
 			if (isAgentSessionSection(element)) {
@@ -235,30 +251,37 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 					if (element.section === AgentSessionSection.Yesterday && this.hasTodaySessions()) {
 						return true; // Also collapse Yesterday when there are sessions from Today
 					}
+					if (element.section === AgentSessionSection.Repository && !this._recentRepositoryLabels.has(element.label)) {
+						return true; // Collapse repository sections that don't contain recent sessions
+					}
 				}
 			}
 
 			return false;
 		};
 
-		const sorter = new AgentSessionsSorter(this.options);
+		const sorter = new AgentSessionsSorter(() => this.options.filter.sortResults?.() ?? AgentSessionsSorting.Created);
 		const approvalModel = this.options.enableApprovalRow ? this._register(this.instantiationService.createInstance(AgentSessionApprovalModel)) : undefined;
 		const activeSessionResource = observableValue<URI | undefined>(this, undefined);
 		const sessionRenderer = this._register(this.instantiationService.createInstance(AgentSessionRenderer, {
 			...this.options,
 			isGroupedByRepository: () => this.options.filter.groupResults?.() === AgentSessionsGrouping.Repository,
+			isSortedByUpdated: () => this.options.filter.sortResults?.() === AgentSessionsSorting.Updated,
 		}, approvalModel, activeSessionResource));
-		const sessionFilter = this._register(new AgentSessionsDataSource(this.options.filter, sorter));
+		const compact = this.options.compactShowMore;
+		const sessionDataSource = this.sessionsDataSource = this._register(new AgentSessionsDataSource(this.options.filter, sorter, this.options.repositoryGroupLimit));
 		const list = this.sessionsList = this._register(this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree,
 			'AgentSessionsView',
 			container,
-			new AgentSessionsListDelegate(approvalModel),
+			new AgentSessionsListDelegate(approvalModel, this.options.compactShowMore),
 			new AgentSessionsCompressionDelegate(),
 			[
 				sessionRenderer,
-				this.instantiationService.createInstance(AgentSessionSectionRenderer),
+				this.instantiationService.createInstance(AgentSessionSectionRenderer, { hideSectionCount: this.options.hideSectionCount }),
+				new AgentSessionShowMoreRenderer({ compactLabel: this.options.compactShowMore }),
+				new AgentSessionShowLessRenderer(),
 			],
-			sessionFilter,
+			sessionDataSource,
 			{
 				accessibilityProvider: new AgentSessionsAccessibilityProvider(),
 				dnd: this.instantiationService.createInstance(AgentSessionsDragAndDrop),
@@ -283,10 +306,216 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 			}
 		}));
 
-		this._register(sessionFilter.onDidGetChildren(count => {
+		// In compact mode, expand show-more/show-less when hovering any item in the same group
+		if (compact) {
+			let expandedShowMoreElement: AgentSessionListItem | undefined;
+			let expandedSectionLabel: string | undefined;
+			let currentAnimatedHeight = AgentSessionShowMoreRenderer.COLLAPSED_HEIGHT;
+
+			const sectionToShowMore = new Map<string, AgentSessionListItem>();
+
+			const rebuildSectionMap = () => {
+				sectionToShowMore.clear();
+				try {
+					const rootNode = list.getNode();
+					for (const sectionNode of rootNode.children) {
+						if (isAgentSessionSection(sectionNode.element)) {
+							const label = sectionNode.element.label;
+							for (const child of sectionNode.children) {
+								if (isAgentSessionShowMore(child.element) || isAgentSessionShowLess(child.element)) {
+									sectionToShowMore.set(label, child.element);
+								}
+							}
+						}
+					}
+				} catch {
+					// Tree may not be initialized yet
+				}
+			};
+
+			let expandAnimationId: number | undefined;
+			let collapseAnimationId: number | undefined;
+			const targetWindow = getWindow(container);
+
+			// Cancel pending animations on dispose to avoid calling into a disposed tree
+			this._register({
+				dispose: () => {
+					if (expandAnimationId) { targetWindow.cancelAnimationFrame(expandAnimationId); }
+					if (collapseAnimationId) { targetWindow.cancelAnimationFrame(collapseAnimationId); }
+				}
+			});
+
+			const animateHeight = (element: AgentSessionListItem, from: number, to: number, onComplete?: () => void) => {
+				// Respect prefers-reduced-motion
+				if (this.accessibilityService.isMotionReduced()) {
+					if (list.hasNode(element)) {
+						isUpdatingHeight = true;
+						try {
+							list.updateElementHeight(element, to);
+						} finally {
+							isUpdatingHeight = false;
+						}
+						currentAnimatedHeight = to;
+					}
+					onComplete?.();
+					return undefined;
+				}
+
+				const duration = 150;
+				const start = Date.now();
+				const step = () => {
+					const elapsed = Date.now() - start;
+					const progress = Math.min(elapsed / duration, 1);
+					const eased = 1 - Math.pow(1 - progress, 2);
+					const height = Math.round(from + (to - from) * eased);
+					if (list.hasNode(element)) {
+						isUpdatingHeight = true;
+						try {
+							list.updateElementHeight(element, height);
+						} finally {
+							isUpdatingHeight = false;
+						}
+						currentAnimatedHeight = height;
+					}
+					if (progress < 1) {
+						return targetWindow.requestAnimationFrame(step);
+					}
+					onComplete?.();
+					return undefined;
+				};
+				return targetWindow.requestAnimationFrame(step);
+			};
+
+			const collapseCurrentShowMore = () => {
+				if (collapseAnimationId) {
+					targetWindow.cancelAnimationFrame(collapseAnimationId);
+					collapseAnimationId = undefined;
+				}
+				if (expandAnimationId) {
+					targetWindow.cancelAnimationFrame(expandAnimationId);
+					expandAnimationId = undefined;
+				}
+				if (expandedShowMoreElement && expandedSectionLabel) {
+					if (list.hasNode(expandedShowMoreElement)) {
+						collapseAnimationId = animateHeight(
+							expandedShowMoreElement,
+							currentAnimatedHeight,
+							AgentSessionShowMoreRenderer.COLLAPSED_HEIGHT,
+							() => { collapseAnimationId = undefined; }
+						);
+					}
+				}
+				expandedShowMoreElement = undefined;
+				expandedSectionLabel = undefined;
+			};
+
+			const expandShowMore = (sectionLabel: string) => {
+				if (expandedSectionLabel === sectionLabel) {
+					return;
+				}
+
+				collapseCurrentShowMore();
+
+				const showMoreItem = sectionToShowMore.get(sectionLabel);
+				if (!showMoreItem || !list.hasNode(showMoreItem)) {
+					return;
+				}
+
+				expandedShowMoreElement = showMoreItem;
+				expandedSectionLabel = sectionLabel;
+				currentAnimatedHeight = AgentSessionShowMoreRenderer.COLLAPSED_HEIGHT;
+				expandAnimationId = animateHeight(
+					showMoreItem,
+					AgentSessionShowMoreRenderer.COLLAPSED_HEIGHT,
+					AgentSessionShowMoreRenderer.HEIGHT,
+					() => { expandAnimationId = undefined; }
+				);
+			};
+
+			// Listen to tree model changes — rebuild the section map.
+			// Use a flag to avoid re-entrancy since updateElementHeight
+			// triggers model changes.
+			let isUpdatingHeight = false;
+			this._register(list.onDidChangeModel(() => {
+				if (isUpdatingHeight) {
+					return;
+				}
+				expandedShowMoreElement = undefined;
+				expandedSectionLabel = undefined;
+				currentAnimatedHeight = AgentSessionShowMoreRenderer.COLLAPSED_HEIGHT;
+				rebuildSectionMap();
+			}));
+
+			// On mouseover, determine section from the hovered element
+			this._register(addDisposableListener(container, 'mouseover', (e: MouseEvent) => {
+				const target = e.target as HTMLElement;
+				const row = target.closest('.monaco-list-row');
+				if (!row) {
+					return;
+				}
+
+				let sectionLabel: string | undefined;
+
+				// Section header — querySelector is needed to identify elements within virtualized list rows
+				// eslint-disable-next-line no-restricted-syntax
+				const sectionHeaderEl = row.querySelector('.agent-session-section-label');
+				if (sectionHeaderEl) {
+					sectionLabel = sectionHeaderEl.textContent ?? undefined;
+				}
+
+				// Show-more element
+				if (!sectionLabel) {
+					// eslint-disable-next-line no-restricted-syntax
+					const showMoreEl = row.querySelector('.agent-session-show-more');
+					if (showMoreEl) {
+						sectionLabel = showMoreEl.getAttribute('data-section-label') ?? undefined;
+					}
+				}
+
+				// Session item — use data-section-label attribute
+				if (!sectionLabel) {
+					// eslint-disable-next-line no-restricted-syntax
+					const sessionItem = row.querySelector('.agent-session-item[data-section-label]');
+					if (sessionItem) {
+						sectionLabel = sessionItem.getAttribute('data-section-label') ?? undefined;
+					}
+				}
+
+				// If we couldn't determine the section but are still hovering
+				// inside a row with a session item, keep the current state
+				// (prevents collapse when hovering toolbar icons, diff stats, etc.)
+				if (!sectionLabel) {
+					// eslint-disable-next-line no-restricted-syntax
+					if (row.querySelector('.agent-session-item')) {
+						return;
+					}
+					collapseCurrentShowMore();
+					return;
+				}
+
+				if (!sectionToShowMore.has(sectionLabel)) {
+					collapseCurrentShowMore();
+					return;
+				}
+
+				expandShowMore(sectionLabel);
+			}));
+
+			this._register(addDisposableListener(container, 'mouseleave', () => {
+				collapseCurrentShowMore();
+			}));
+
+			rebuildSectionMap();
+		}
+
+		this._register(sessionDataSource.onDidGetChildren(count => {
 			this.updateEmpty(count === 0);
 		}));
 
+		this._register(sessionDataSource.onDidExpandRepositoryGroup(() => {
+			this.update();
+		}));
+
 		const model = this.agentSessionsService.model;
 
 		this._register(this.options.filter.onDidChange(async () => {
@@ -302,6 +531,7 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 			}
 		}));
 
+		this.computeRecentRepositoryLabels();
 		list.setInput(model);
 
 		this._register(list.onDidOpen(e => this.openAgentSession(e)));
@@ -317,11 +547,13 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 			const focused = list.getFocus().at(0);
 			if (focused && isAgentSession(focused)) {
 				this.focusedAgentSessionArchivedContextKey.set(focused.isArchived());
+				this.focusedAgentSessionPinnedContextKey.set(focused.isPinned());
 				this.focusedAgentSessionReadContextKey.set(focused.isRead());
 				this.focusedAgentSessionTypeContextKey.set(focused.providerType);
 				activeSessionResource.set(focused.resource, undefined);
 			} else {
 				this.focusedAgentSessionArchivedContextKey.reset();
+				this.focusedAgentSessionPinnedContextKey.reset();
 				this.focusedAgentSessionReadContextKey.reset();
 				this.focusedAgentSessionTypeContextKey.reset();
 				activeSessionResource.set(undefined, undefined);
@@ -367,16 +599,40 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 
 		return this.agentSessionsService.model.sessions.some(session =>
 			!session.isArchived() &&
-			getAgentSessionTime(session.timing) >= startOfToday
+			session.timing.created >= startOfToday
 		);
 	}
 
+	private computeRecentRepositoryLabels(): void {
+		this._recentRepositoryLabels.clear();
+
+		const sessions = this.agentSessionsService.model.sessions
+			.filter(s => !s.isArchived() && !s.isPinned())
+			.sort((a, b) => b.timing.created - a.timing.created)
+			.slice(0, AgentSessionsControl.RECENT_SESSIONS_FOR_EXPAND);
+
+		for (const session of sessions) {
+			const name = getRepositoryName(session);
+			this._recentRepositoryLabels.add(name ?? AgentSessionSectionLabels[AgentSessionSection.Repository]);
+		}
+	}
+
 	private async openAgentSession(e: IOpenEvent<AgentSessionListItem | undefined>): Promise<void> {
 		const element = e.element;
 		if (!element || isAgentSessionSection(element)) {
 			return; // Section headers are not openable
 		}
 
+		if (isAgentSessionShowMore(element)) {
+			this.sessionsDataSource?.expandRepositoryGroup(element.sectionLabel);
+			return;
+		}
+
+		if (isAgentSessionShowLess(element)) {
+			this.sessionsDataSource?.collapseRepositoryGroup(element.sectionLabel);
+			return;
+		}
+
 		this.telemetryService.publicLog2<AgentSessionOpenedEvent, AgentSessionOpenedClassification>('agentSessionOpened', {
 			providerType: element.providerType,
 			source: this.options.source
@@ -394,7 +650,7 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 	}
 
 	private async showContextMenu({ element, anchor, browserEvent }: ITreeContextMenuEvent<AgentSessionListItem>): Promise<void> {
-		if (!element) {
+		if (!element || isAgentSessionShowMore(element) || isAgentSessionShowLess(element)) {
 			return;
 		}
 
@@ -416,7 +672,7 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 		this.contextMenuService.showContextMenu({
 			getActions: () => Separator.join(...menu.getActions({ arg: section, shouldForwardArgs: true }).map(([, actions]) => actions)),
 			getAnchor: () => anchor,
-			getActionsContext: () => section,
+			getActionsContext: () => this,
 		});
 
 		menu.dispose();
@@ -427,6 +683,7 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 
 		const contextOverlay: Array<[string, boolean | string]> = [];
 		contextOverlay.push([ChatContextKeys.isArchivedAgentSession.key, session.isArchived()]);
+		contextOverlay.push([ChatContextKeys.isPinnedAgentSession.key, session.isPinned()]);
 		contextOverlay.push([ChatContextKeys.isReadAgentSession.key, session.isRead()]);
 		contextOverlay.push([ChatContextKeys.agentSessionType.key, session.providerType]);
 
@@ -503,8 +760,22 @@ export class AgentSessionsControl extends Disposable implements IAgentSessionsCo
 		return this.agentSessionsService.model.resolve(undefined);
 	}
 
+	collapseAllSections(): void {
+		if (!this.sessionsList) {
+			return;
+		}
+
+		const model = this.agentSessionsService.model;
+		for (const child of this.sessionsList.getNode(model).children) {
+			if (isAgentSessionSection(child.element) && !child.collapsed) {
+				this.sessionsList.collapse(child.element);
+			}
+		}
+	}
+
 	async update(): Promise<void> {
 		return this.updateSessionsListThrottler.queue(async () => {
+			this.computeRecentRepositoryLabels();
 			await this.sessionsList?.updateChildren();
 
 			this._onDidUpdate.fire();
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts
index 5cb399a6c87..5f0e8a74545 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts
@@ -21,6 +21,11 @@ export enum AgentSessionsGrouping {
 	Repository = 'repository'
 }
 
+export enum AgentSessionsSorting {
+	Created = 'created',
+	Updated = 'updated'
+}
+
 export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilter> {
 
 	readonly filterMenuId?: MenuId;
@@ -41,6 +46,7 @@ export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilte
 	notifyResults?(count: number): void;
 
 	readonly groupResults?: () => AgentSessionsGrouping | undefined;
+	readonly sortResults?: () => AgentSessionsSorting | undefined;
 
 	overrideExclude?(session: IAgentSession): boolean | undefined;
 }
@@ -50,6 +56,7 @@ const DEFAULT_EXCLUDES: IAgentSessionsFilterExcludes = Object.freeze({
 	states: [] as const,
 	archived: true as const /* archived are never excluded but toggle between expanded and collapsed */,
 	read: false as const,
+	repositoryGroupCapped: true as const /* when true, repo groups are capped at a limit with a "show more" item */,
 });
 
 export class AgentSessionsFilter extends Disposable implements Required<IAgentSessionsFilter> {
@@ -61,6 +68,7 @@ export class AgentSessionsFilter extends Disposable implements Required<IAgentSe
 
 	readonly limitResults = () => this.options.limitResults?.();
 	readonly groupResults = () => this.options.groupResults?.();
+	readonly sortResults = () => this.options.sortResults?.();
 
 	private excludes = DEFAULT_EXCLUDES;
 	private isStoringExcludes = false;
@@ -273,6 +281,15 @@ export class AgentSessionsFilter extends Disposable implements Required<IAgentSe
 		}));
 	}
 
+	/**
+	 * Programmatically toggle the repository group capping state.
+	 */
+	setRepositoryGroupCapped(capped: boolean): void {
+		if (this.excludes.repositoryGroupCapped !== capped) {
+			this.storeExcludes({ ...this.excludes, repositoryGroupCapped: capped });
+		}
+	}
+
 	private registerResetAction(disposables: DisposableStore, menuId: MenuId): void {
 		const that = this;
 		disposables.add(registerAction2(class extends Action2 {
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts
index e66ecd14f44..76ee31512fe 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts
@@ -3,13 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from '../../../../../base/common/arrays.js';
 import { ThrottledDelayer } from '../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { safeStringify } from '../../../../../base/common/objects.js';
@@ -24,9 +23,11 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../../pla
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceTrustManagementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
 import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
 import { Extensions, IOutputChannelRegistry, IOutputService } from '../../../../services/output/common/output.js';
-import { ChatSessionStatus as AgentSessionStatus, IChatSessionFileChange, IChatSessionFileChange2, IChatSessionItem, IChatSessionsService, ResolvedChatSessionsExtensionPoint } from '../../common/chatSessionsService.js';
+import { ChatSessionStatus as AgentSessionStatus, IChatSessionFileChange, IChatSessionFileChange2, IChatSessionItem, IChatSessionsService, isSessionInProgressStatus, ResolvedChatSessionsExtensionPoint } from '../../common/chatSessionsService.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
 import { IChatWidgetService } from '../chat.js';
 import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderIcon, getAgentSessionProviderName, isBuiltInAgentSessionProvider } from './agentSessions.js';
 
@@ -36,8 +37,8 @@ export { ChatSessionStatus as AgentSessionStatus, isSessionInProgressStatus } fr
 
 export interface IAgentSessionsModel {
 
-	readonly onWillResolve: Event<void>;
-	readonly onDidResolve: Event<void>;
+	readonly onWillResolve: Event<string /* provider */>;
+	readonly onDidResolve: Event<string /* provider */>;
 
 	readonly onDidChangeSessions: Event<void>;
 	readonly onDidChangeSessionArchivedState: Event<IAgentSession>;
@@ -112,7 +113,11 @@ export interface IAgentSession extends IAgentSessionData {
 	isArchived(): boolean;
 	setArchived(archived: boolean): void;
 
+	isPinned(): boolean;
+	setPinned(pinned: boolean): void;
+
 	isRead(): boolean;
+	isMarkedUnread(): boolean;
 	setRead(read: boolean): void;
 }
 
@@ -137,7 +142,14 @@ export function isLocalAgentSessionItem(session: IAgentSession): boolean {
 export function isAgentSession(obj: unknown): obj is IAgentSession {
 	const session = obj as IAgentSession | undefined;
 
-	return URI.isUri(session?.resource) && typeof session.setArchived === 'function' && typeof session.setRead === 'function';
+	return URI.isUri(session?.resource)
+		&& typeof session.isArchived === 'function'
+		&& typeof session.setArchived === 'function'
+		&& typeof session.isPinned === 'function'
+		&& typeof session.setPinned === 'function'
+		&& typeof session.isRead === 'function'
+		&& typeof session.isMarkedUnread === 'function'
+		&& typeof session.setRead === 'function';
 }
 
 export function isAgentSessionsModel(obj: unknown): obj is IAgentSessionsModel {
@@ -146,14 +158,28 @@ export function isAgentSessionsModel(obj: unknown): obj is IAgentSessionsModel {
 	return Array.isArray(sessionsModel?.sessions) && typeof sessionsModel?.getSession === 'function';
 }
 
+export function countUnreadSessions(sessions: IAgentSession[]): number {
+	let unread = 0;
+	for (const session of sessions) {
+		if (!session.isArchived() && session.status === AgentSessionStatus.Completed && !session.isRead()) {
+			unread++;
+		}
+	}
+	return unread;
+}
+
 interface IAgentSessionState {
 	readonly archived?: boolean;
+	readonly pinned?: boolean;
 	readonly read?: number /* last date turned read */;
 }
 
 export const enum AgentSessionSection {
 
-	// Default Grouping (by date)
+	// Pinned Grouping
+	Pinned = 'pinned',
+
+	// Date Grouping
 	Today = 'today',
 	Yesterday = 'yesterday',
 	Week = 'week',
@@ -179,6 +205,33 @@ export function isAgentSessionSection(obj: unknown): obj is IAgentSessionSection
 	return typeof candidate.section === 'string' && Array.isArray(candidate.sessions);
 }
 
+/**
+ * A "Show N More..." item that appears as the last child
+ * of a capped repository group section.
+ */
+export interface IAgentSessionShowMore {
+	readonly showMore: true;
+	readonly sectionLabel: string;
+	readonly remainingCount: number;
+}
+
+export function isAgentSessionShowMore(obj: unknown): obj is IAgentSessionShowMore {
+	return (obj as IAgentSessionShowMore)?.showMore === true;
+}
+
+/**
+ * A "Show less" item that appears as the last child
+ * of an expanded repository group section to allow collapsing back.
+ */
+export interface IAgentSessionShowLess {
+	readonly showLess: true;
+	readonly sectionLabel: string;
+}
+
+export function isAgentSessionShowLess(obj: unknown): obj is IAgentSessionShowLess {
+	return (obj as IAgentSessionShowLess)?.showLess === true;
+}
+
 export interface IMarshalledAgentSessionContext {
 	readonly $mid: MarshalledId.AgentSessionContext;
 
@@ -318,11 +371,22 @@ class AgentSessionsLogger extends Disposable {
 				}
 			}
 
+			// Metadata
+			if (session.metadata && Object.keys(session.metadata).length > 0) {
+				lines.push(`  Metadata:`);
+				for (const [key, value] of Object.entries(session.metadata)) {
+					const renderedValue = typeof value === 'string' ? value : safeStringify(value);
+					lines.push(`    ${key}: ${renderedValue}`);
+				}
+			}
+
 			// Our state (read/unread, archived)
 			lines.push(`  State:`);
 			lines.push(`    Archived (provider): ${session.archived ?? 'N/A'}`);
 			lines.push(`    Archived (computed): ${session.isArchived()}`);
 			lines.push(`    Archived (stored): ${state?.archived ?? 'N/A'}`);
+			lines.push(`    Pinned: ${session.isPinned()}`);
+			lines.push(`    Pinned (stored): ${state?.pinned ?? 'N/A'}`);
 			lines.push(`    Read: ${session.isRead()}`);
 			lines.push(`    Read date (stored): ${state?.read ? new Date(state.read).toISOString() : 'N/A'}`);
 
@@ -347,6 +411,7 @@ class AgentSessionsLogger extends Disposable {
 		for (const [resource, state] of sessionStates) {
 			lines.push(`URI: ${resource.toString()}`);
 			lines.push(`  Archived: ${state.archived}`);
+			lines.push(`  Pinned: ${state.pinned}`);
 			lines.push(`  Read: ${state.read ? new Date(state.read).toISOString() : '0 (unread)'}`);
 			lines.push('');
 		}
@@ -370,10 +435,10 @@ class AgentSessionsLogger extends Disposable {
 
 export class AgentSessionsModel extends Disposable implements IAgentSessionsModel {
 
-	private readonly _onWillResolve = this._register(new Emitter<void>());
+	private readonly _onWillResolve = this._register(new Emitter<string>());
 	readonly onWillResolve = this._onWillResolve.event;
 
-	private readonly _onDidResolve = this._register(new Emitter<void>());
+	private readonly _onDidResolve = this._register(new Emitter<string>());
 	readonly onDidResolve = this._onDidResolve.event;
 
 	private readonly _onDidChangeSessions = this._register(new Emitter<void>());
@@ -386,10 +451,16 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 	get resolved(): boolean { return this._resolved; }
 
 	private _sessions: ResourceMap<IInternalAgentSession>;
-	get sessions(): IAgentSession[] { return Array.from(this._sessions.values()); }
+	get sessions(): IAgentSession[] {
+		const sessions = Array.from(this._sessions.values());
+		if (this.environmentService.isSessionsWindow) {
+			return sessions.filter(session => session.providerType !== AgentSessionProviders.Claude && session.providerType !== AgentSessionProviders.Codex); // filter out sessions that can currently not be triggered in the sessions app (TODO@bpasero revisit later)
+		}
 
-	private readonly resolver = this._register(new ThrottledDelayer<void>(300));
-	private readonly providersToResolve = new Set<string | undefined>();
+		return sessions;
+	}
+
+	private readonly resolvers = this._register(new DisposableMap<string, ThrottledDelayer<void>>());
 
 	private readonly cache: AgentSessionsCache;
 	private readonly logger: AgentSessionsLogger;
@@ -403,6 +474,8 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 	) {
 		super();
 
@@ -434,7 +507,21 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 		// Sessions updates
 		this._register(this.chatSessionsService.onDidChangeItemsProviders(({ chatSessionType }) => this.resolve(chatSessionType)));
 		this._register(this.chatSessionsService.onDidChangeAvailability(() => this.resolve(undefined)));
-		this._register(this.chatSessionsService.onDidChangeSessionItems(({ chatSessionType }) => this.updateItems([chatSessionType], CancellationToken.None)));
+		this._register(this.chatSessionsService.onDidChangeSessionItems((delta) => {
+			const changedChatSessionTypes = new Set<string>();
+
+			for (const resource of delta.addedOrUpdated ?? []) {
+				changedChatSessionTypes.add(getChatSessionType(resource.resource));
+			}
+
+			for (const resource of delta.removed ?? []) {
+				changedChatSessionTypes.add(getChatSessionType(resource));
+			}
+
+			for (const chatSessionType of changedChatSessionTypes) {
+				this.resolveProvider(chatSessionType, { refreshProvider: false /* skip because we react on an event already */ });
+			}
+		}));
 		this._register(this.workspaceContextService.onDidChangeWorkspaceFolders(() => this.resolve(undefined)));
 		this._register(this.workspaceTrustManagementService.onDidChangeTrust(() => this.resolve(undefined)));
 
@@ -450,55 +537,55 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 	}
 
 	async resolve(provider: string | string[] | undefined): Promise<void> {
-		if (Array.isArray(provider)) {
-			for (const p of provider) {
-				this.providersToResolve.add(p);
-			}
-		} else {
-			this.providersToResolve.add(provider);
+		const providers = Array.isArray(provider)
+			? provider
+			: provider !== undefined
+				? [provider]
+				: this.chatSessionsService.getRegisteredChatSessionItemProviders();
+
+		await Promise.all(providers.map(provider => this.resolveProvider(provider, { refreshProvider: true })));
+	}
+
+	private resolveProvider(provider: string, options: { refreshProvider: boolean }): Promise<void> {
+		if (this.chatEntitlementService.sentiment.hidden) {
+			return Promise.resolve(); // don't resolve if AI features are disabled
 		}
 
-		return this.resolver.trigger(async token => {
+		let resolver = this.resolvers.get(provider);
+		if (!resolver) {
+			resolver = new ThrottledDelayer<void>(500);
+			this.resolvers.set(provider, resolver);
+		}
+
+		return resolver.trigger(async token => {
 			if (token.isCancellationRequested || this.lifecycleService.willShutdown) {
 				return;
 			}
 
 			try {
-				this._onWillResolve.fire();
-				return await this.doResolve(token);
+				this._onWillResolve.fire(provider);
+				return await this.doResolveProvider(provider, options, token);
+			} catch (error) {
+				this.logger.logIfTrace(`Error resolving sessions for provider ${provider}: ${error instanceof Error ? error.stack : String(error)}`);
 			} finally {
-				this._onDidResolve.fire();
+				this._onDidResolve.fire(provider);
 			}
 		});
 	}
 
-	private async doResolve(token: CancellationToken): Promise<void> {
-		const providersToResolve = Array.from(this.providersToResolve);
-		this.providersToResolve.clear();
+	private async doResolveProvider(provider: string, options: { refreshProvider: boolean }, token: CancellationToken): Promise<void> {
+		if (options.refreshProvider) {
+			await this.chatSessionsService.refreshChatSessionItems([provider], token);
+		}
 
-		const providerFilter = providersToResolve.includes(undefined) ? undefined : coalesce(providersToResolve);
-
-		await this.chatSessionsService.refreshChatSessionItems(providerFilter, token);
-		await this.updateItems(providerFilter, token);
-	}
-
-	/**
-	 * Update the sessions by fetching from the service. This does not trigger an explicit refresh
-	 */
-	private async updateItems(providerFilter: readonly string[] | undefined, token: CancellationToken): Promise<void> {
 		const mapSessionContributionToType = new Map<string, ResolvedChatSessionsExtensionPoint>();
 		for (const contribution of this.chatSessionsService.getAllChatSessionContributions()) {
 			mapSessionContributionToType.set(contribution.type, contribution);
 		}
 
-		const providerResults = this.chatSessionsService.getChatSessionItems(providerFilter, token);
-
-		const resolvedProviders = new Set<string>();
+		// Phase 1: Fetch new items for this provider (async, may interleave with other providers)
 		const sessions = new ResourceMap<IInternalAgentSession>();
-
-		for await (const { chatSessionType, items: providerSessions } of providerResults) {
-			resolvedProviders.add(chatSessionType);
-
+		for await (const { chatSessionType, items: providerSessions } of this.chatSessionsService.getChatSessionItems([provider], token)) {
 			if (token.isCancellationRequested) {
 				return;
 			}
@@ -538,9 +625,16 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 			}
 		}
 
+		// Phase 2: Atomically update sessions (sync - reads latest this._sessions
+		// so concurrent updateItems calls for other providers don't lose data)
+
 		for (const [, session] of this._sessions) {
-			if (!resolvedProviders.has(session.providerType) && (isBuiltInAgentSessionProvider(session.providerType) || mapSessionContributionToType.has(session.providerType))) {
-				sessions.set(session.resource, session); // fill in existing sessions for providers that did not resolve if they are known or built-in
+			if (
+				session.providerType !== provider &&
+				!sessions.has(session.resource) &&
+				(isBuiltInAgentSessionProvider(session.providerType) || mapSessionContributionToType.has(session.providerType))
+			) {
+				sessions.set(session.resource, session);
 			}
 		}
 
@@ -557,7 +651,10 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 			...data,
 			isArchived: () => this.isArchived(data),
 			setArchived: (archived: boolean) => this.setArchived(data, archived),
+			isPinned: () => this.isPinned(data),
+			setPinned: (pinned: boolean) => this.setPinned(data, pinned),
 			isRead: () => this.isRead(data),
+			isMarkedUnread: () => this.isMarkedUnread(data),
 			setRead: (read: boolean) => this.setRead(data, read),
 		};
 	}
@@ -592,6 +689,25 @@ export class AgentSessionsModel extends Disposable implements IAgentSessionsMode
 		this._onDidChangeSessions.fire();
 	}
 
+	private isPinned(session: IInternalAgentSessionData): boolean {
+		return this.sessionStates.get(session.resource)?.pinned ?? false;
+	}
+
+	private setPinned(session: IInternalAgentSessionData, pinned: boolean): void {
+		if (pinned === this.isPinned(session)) {
+			return; // no change
+		}
+
+		const state = this.sessionStates.get(session.resource) ?? {};
+		this.sessionStates.set(session.resource, { ...state, pinned });
+
+		this._onDidChangeSessions.fire();
+	}
+
+	private isMarkedUnread(session: IInternalAgentSessionData): boolean {
+		return this.sessionStates.get(session.resource)?.read === AgentSessionsModel.UNREAD_MARKER;
+	}
+
 	private isRead(session: IInternalAgentSessionData): boolean {
 		if (this.isArchived(session)) {
 			return true; // archived sessions are always read
@@ -734,7 +850,7 @@ class AgentSessionsCache {
 			badge: session.badge,
 			tooltip: session.tooltip,
 
-			status: session.status,
+			status: isSessionInProgressStatus(session.status) ? AgentSessionStatus.Completed : session.status, // never cache sessions as in progress, this needs to be live state
 			archived: session.archived,
 
 			timing: session.timing,
@@ -797,6 +913,7 @@ class AgentSessionsCache {
 		const serialized: ISerializedAgentSessionState[] = Array.from(states.entries()).map(([resource, state]) => ({
 			resource: resource.toString(),
 			archived: state.archived,
+			pinned: state.pinned,
 			read: state.read
 		}));
 
@@ -817,6 +934,7 @@ class AgentSessionsCache {
 			for (const entry of cached) {
 				states.set(typeof entry.resource === 'string' ? URI.parse(entry.resource) : URI.revive(entry.resource), {
 					archived: entry.archived,
+					pinned: entry.pinned,
 					read: entry.read
 				});
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts
index 056f9ecd07f..d04feb219aa 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts
@@ -15,7 +15,7 @@ import { ISessionOpenOptions, openSession } from './agentSessionsOpener.js';
 import { IAgentSession, isLocalAgentSessionItem } from './agentSessionsModel.js';
 import { IAgentSessionsService } from './agentSessionsService.js';
 import { AgentSessionsSorter, groupAgentSessionsByDate, sessionDateFromNow } from './agentSessionsViewer.js';
-import { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, getAgentSessionTime } from './agentSessions.js';
+import { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID } from './agentSessions.js';
 import { AgentSessionsFilter } from './agentSessionsFilter.js';
 
 interface ISessionPickItem extends IQuickPickItem {
@@ -44,7 +44,7 @@ export const deleteButton: IQuickInputButton = {
 
 export function getSessionDescription(session: IAgentSession): string {
 	const descriptionText = typeof session.description === 'string' ? session.description : session.description ? renderAsPlaintext(session.description) : undefined;
-	const timeAgo = sessionDateFromNow(getAgentSessionTime(session.timing));
+	const timeAgo = sessionDateFromNow(session.timing.created);
 	const descriptionParts = [descriptionText, session.providerLabel, timeAgo].filter(part => !!part);
 
 	return descriptionParts.join(' • ');
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.ts
index 3bce41c7d02..feef67a70a2 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.ts
@@ -7,6 +7,7 @@ import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { createDecorator, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 import { AgentSessionsModel, IAgentSession, IAgentSessionsModel } from './agentSessionsModel.js';
 
 export interface IAgentSessionsService {
@@ -29,14 +30,23 @@ export class AgentSessionsService extends Disposable implements IAgentSessionsSe
 	get model(): IAgentSessionsModel {
 		if (!this._model) {
 			this._model = this._register(this.instantiationService.createInstance(AgentSessionsModel));
-			this._register(this._model.onDidChangeSessionArchivedState(session => this._onDidChangeSessionArchivedState.fire(session)));
+			this._register(this._model.onDidChangeSessionArchivedState(session => {
+				if (session.isArchived()) {
+					void this.chatService.cancelCurrentRequestForSession(session.resource, 'archive');
+				}
+
+				this._onDidChangeSessionArchivedState.fire(session);
+			}));
 			this._model.resolve(undefined /* all providers */);
 		}
 
 		return this._model;
 	}
 
-	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) {
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatService private readonly chatService: IChatService,
+	) {
 		super();
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
index a2d434be7f9..aaddd2664aa 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
@@ -14,10 +14,11 @@ import { ICompressedTreeNode } from '../../../../../base/browser/ui/tree/compres
 import { ICompressibleKeyboardNavigationLabelProvider, ICompressibleTreeRenderer } from '../../../../../base/browser/ui/tree/objectTree.js';
 import { ITreeNode, ITreeElementRenderDetails, IAsyncDataSource, ITreeSorter, ITreeDragAndDrop, ITreeDragOverReaction } from '../../../../../base/browser/ui/tree/tree.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import { AgentSessionSection, AgentSessionStatus, getAgentChangesSummary, hasValidDiff, IAgentSession, IAgentSessionSection, IAgentSessionsModel, isAgentSession, isAgentSessionSection, isAgentSessionsModel, isSessionInProgressStatus } from './agentSessionsModel.js';
+import { AgentSessionSection, AgentSessionStatus, getAgentChangesSummary, hasValidDiff, IAgentSession, IAgentSessionSection, IAgentSessionShowLess, IAgentSessionShowMore, IAgentSessionsModel, isAgentSession, isAgentSessionSection, isAgentSessionShowLess, isAgentSessionShowMore, isAgentSessionsModel, isSessionInProgressStatus } from './agentSessionsModel.js';
 import { IconLabel } from '../../../../../base/browser/ui/iconLabel/iconLabel.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ThemeIcon, themeColorFromId } from '../../../../../base/common/themables.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { asCssVariable } from '../../../../../platform/theme/common/colorUtils.js';
 import { fromNow, getDurationString } from '../../../../../base/common/date.js';
 import { FuzzyScore, createMatches } from '../../../../../base/common/filters.js';
 import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
@@ -41,17 +42,17 @@ import { Emitter, Event } from '../../../../../base/common/event.js';
 import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
 import { MarkdownString, IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { AgentSessionHoverWidget } from './agentSessionHoverWidget.js';
-import { AgentSessionProviders, getAgentSessionTime } from './agentSessions.js';
-import { AgentSessionsGrouping } from './agentSessionsFilter.js';
+import { AgentSessionProviders } from './agentSessions.js';
+import { AgentSessionsGrouping, AgentSessionsSorting } from './agentSessionsFilter.js';
 import { autorun, IObservable } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { AgentSessionApprovalModel } from './agentSessionApprovalModel.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { compareIgnoreCase } from '../../../../../base/common/strings.js';
 
-
-export type AgentSessionListItem = IAgentSession | IAgentSessionSection;
+export type AgentSessionListItem = IAgentSession | IAgentSessionSection | IAgentSessionShowMore | IAgentSessionShowLess;
 
 //#region Agent Session Renderer
 
@@ -63,12 +64,13 @@ interface IAgentSessionItemTemplate {
 
 	// Column 2 Row 1
 	readonly title: IconLabel;
+	readonly pinnedIndicator: HTMLElement;
 	readonly statusContainer: HTMLElement;
-	readonly statusProviderIcon: HTMLElement;
 	readonly statusTime: HTMLElement;
 	readonly titleToolbar: MenuWorkbenchToolBar;
 
 	// Column 2 Row 2
+	readonly detailsIcon: HTMLElement;
 	readonly diffContainer: HTMLElement;
 	readonly diffAddedSpan: HTMLSpanElement;
 	readonly diffRemovedSpan: HTMLSpanElement;
@@ -89,9 +91,12 @@ interface IAgentSessionItemTemplate {
 
 export interface IAgentSessionRendererOptions {
 	readonly disableHover?: boolean;
-	readonly showIsolationIcon?: boolean;
+	readonly hideSessionBadge?: boolean;
+	readonly useStatusOnlyIcons?: boolean;
 	getHoverPosition(): HoverPosition;
+
 	isGroupedByRepository?(): boolean;
+	isSortedByUpdated?(): boolean;
 }
 
 export class AgentSessionRenderer extends Disposable implements ICompressibleTreeRenderer<IAgentSession, FuzzyScore, IAgentSessionItemTemplate> {
@@ -140,22 +145,21 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 				h('div.agent-session-main-col', [
 					h('div.agent-session-title-row', [
 						h('div.agent-session-title@title'),
+						h('div.agent-session-pinned-indicator@pinnedIndicator'),
 						h('div.agent-session-title-toolbar@titleToolbar'),
 					]),
 					h('div.agent-session-details-row', [
+						h('div.agent-session-details-icon@detailsIcon'),
+						h('div.agent-session-badge@badge'),
+						h('span.agent-session-separator@separator'),
 						h('div.agent-session-diff-container@diffContainer',
 							[
 								h('span.agent-session-diff-added@addedSpan'),
 								h('span.agent-session-diff-removed@removedSpan')
 							]),
 						h('div.agent-session-description@description'),
-						h('div.agent-session-details-right', [
-							h('div.agent-session-badge@badge'),
-							h('span.agent-session-separator@separator'),
-							h('div.agent-session-status@statusContainer', [
-								h('span.agent-session-status-provider-icon@statusProviderIcon'),
-								h('span.agent-session-status-time@statusTime')
-							]),
+						h('div.agent-session-status@statusContainer', [
+							h('span.agent-session-status-time@statusTime'),
 						]),
 					]),
 					h('div.agent-session-approval-row@approvalRow', [
@@ -178,15 +182,16 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 			element: elements.item,
 			icon: elements.icon,
 			title: disposables.add(new IconLabel(elements.title, { supportHighlights: true, supportIcons: true })),
+			pinnedIndicator: elements.pinnedIndicator,
 			titleToolbar,
+			detailsIcon: elements.detailsIcon,
+			badge: elements.badge,
+			separator: elements.separator,
 			diffContainer: elements.diffContainer,
 			diffAddedSpan: elements.addedSpan,
 			diffRemovedSpan: elements.removedSpan,
-			badge: elements.badge,
-			separator: elements.separator,
 			description: elements.description,
 			statusContainer: elements.statusContainer,
-			statusProviderIcon: elements.statusProviderIcon,
 			statusTime: elements.statusTime,
 			approvalRow: elements.approvalRow,
 			approvalLabel: elements.approvalLabel,
@@ -209,8 +214,35 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 		// Archived
 		template.element.classList.toggle('archived', session.element.isArchived());
 
-		// Icon
-		template.icon.className = `agent-session-icon ${ThemeIcon.asClassName(this.getIcon(session.element))}`;
+		// Section label for group hover detection
+		if (this.options.isGroupedByRepository?.()) {
+			const repoName = getRepositoryName(session.element);
+			if (repoName) {
+				template.element.setAttribute('data-section-label', repoName);
+			} else {
+				template.element.removeAttribute('data-section-label');
+			}
+		} else {
+			template.element.removeAttribute('data-section-label');
+		}
+
+		// Icon — in status-only mode, show status indicator in icon column and session type icon in details row
+		if (this.options.useStatusOnlyIcons) {
+			const statusIcon = this.getIcon(session.element, true);
+			template.icon.className = `agent-session-icon ${ThemeIcon.asClassName(statusIcon)}${session.element.status === AgentSessionStatus.NeedsInput ? ' needs-input' : ''}`;
+			template.icon.style.color = statusIcon.color ? asCssVariable(statusIcon.color.id) : '';
+			if (session.element.providerType === AgentSessionProviders.Background) {
+				template.detailsIcon.className = 'agent-session-details-icon'; // hide default provider icon (same as Local in non-status-only mode)
+			} else {
+				template.detailsIcon.className = `agent-session-details-icon ${ThemeIcon.asClassName(session.element.icon)}`;
+				template.detailsIcon.classList.add('visible');
+			}
+		} else {
+			const icon = this.getIcon(session.element);
+			template.icon.className = `agent-session-icon ${ThemeIcon.asClassName(icon)}${session.element.status === AgentSessionStatus.NeedsInput ? ' needs-input' : ''}`;
+			template.icon.style.color = icon.color ? asCssVariable(icon.color.id) : '';
+			template.detailsIcon.className = 'agent-session-details-icon';
+		}
 
 		// Title
 		const markdownTitle = new MarkdownString(session.element.label);
@@ -218,10 +250,19 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 
 		// Title Actions - Update context keys
 		ChatContextKeys.isArchivedAgentSession.bindTo(template.contextKeyService).set(session.element.isArchived());
+		ChatContextKeys.isPinnedAgentSession.bindTo(template.contextKeyService).set(session.element.isPinned());
 		ChatContextKeys.isReadAgentSession.bindTo(template.contextKeyService).set(session.element.isRead());
 		ChatContextKeys.agentSessionType.bindTo(template.contextKeyService).set(session.element.providerType);
 		template.titleToolbar.context = session.element;
 
+		// Pinned indicator
+		const isPinned = session.element.isPinned();
+		template.pinnedIndicator.className = 'agent-session-pinned-indicator ' + (ThemeIcon.asClassName(Codicon.pinned));
+		template.pinnedIndicator.classList.toggle('visible', isPinned);
+
+		// Badge
+		const hasBadge = this.renderBadge(session, template);
+
 		// Diff information
 		let hasDiff = false;
 		const { changes: diff } = session.element;
@@ -230,7 +271,6 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 				hasDiff = true;
 			}
 		}
-		template.diffContainer.classList.toggle('has-diff', hasDiff);
 
 		let hasAgentSessionChanges = false;
 		if (
@@ -247,20 +287,21 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 
 		ChatContextKeys.hasAgentSessionChanges.bindTo(template.contextKeyService).set(hasAgentSessionChanges);
 
-		// Badge
-		const hasBadge = this.renderBadge(session, template);
-		template.badge.classList.toggle('has-badge', hasBadge);
 
-		// Description (unless diff is shown)
-		if (!hasDiff) {
-			this.renderDescription(session, template);
-		}
-
-		// Separator (dot between badge and timestamp)
-		template.separator.classList.toggle('has-separator', hasBadge);
+		// Description
+		const hasDescription = this.renderDescription(session, template);
 
 		// Status
-		this.renderStatus(session, template);
+		const hasStatus = this.renderStatus(session, template);
+
+		// When in progress with a description, only show description in the details row
+		const hideDetails = hasDescription && isSessionInProgressStatus(session.element.status);
+		template.badge.classList.toggle('has-badge', hasBadge && !hideDetails);
+		template.diffContainer.classList.toggle('has-diff', hasDiff && !hideDetails);
+		template.statusContainer.classList.toggle('hidden', hideDetails);
+		template.separator.classList.toggle('has-separator', !hideDetails && hasBadge && hasDiff);
+		template.description.classList.toggle('has-separator', hasDescription && !hideDetails && (hasBadge || hasDiff));
+		template.statusContainer.classList.toggle('has-separator', !hideDetails && hasStatus && (hasBadge || hasDiff || hasDescription));
 
 		// Hover
 		this.renderHover(session, template);
@@ -272,24 +313,57 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 	}
 
 	private renderBadge(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): boolean {
+		if (this.options.hideSessionBadge) {
+			return false;
+		}
+
 		const badge = session.element.badge;
 		if (!badge) {
 			return false;
 		}
 
-		// When grouped by repository, hide the badge if it only shows the repo name
-		// (since the section header already displays it)
-		if (this.options.isGroupedByRepository?.()) {
+		// When grouped by repository, hide the badge only if the name it shows
+		// matches the section header (i.e. the repository name for this session).
+		// Badges with a different name (e.g. worktree name) are still shown.
+		// Pinned and archived sessions always keep their badge since they are
+		// grouped under their own section, not a repository section.
+		if (
+			this.options.isGroupedByRepository?.() &&
+			!session.element.isArchived() &&
+			!session.element.isPinned()
+		) {
 			const raw = typeof badge === 'string' ? badge : badge.value;
-			if (/^\$\((?:repo|folder|worktree)\)\s*.+/.test(raw)) {
-				return false;
+			const match = raw.match(/^\$\((?:repo|folder|worktree)\)\s*(.+)/);
+			if (match) {
+				const badgeName = match[1].trim();
+				const repoName = getRepositoryName(session.element);
+				if (badgeName === repoName) {
+					return false;
+				}
 			}
 		}
 
-		this.renderMarkdownOrText(badge, template.badge, template.elementDisposable);
+		const normalisedBadge = this.stripCodicons(badge);
+		const badgeValue = typeof normalisedBadge === 'string' ? normalisedBadge : normalisedBadge.value;
+		if (!badgeValue) {
+			return false;
+		}
+
+		this.renderMarkdownOrText(normalisedBadge, template.badge, template.elementDisposable);
+
 		return true;
 	}
 
+	private stripCodicons(content: string | IMarkdownString): string | IMarkdownString {
+		const raw = typeof content === 'string' ? content : content.value;
+		const stripped = raw.replace(/\$\([a-z0-9\-]+\)\s*/gi, '').trim();
+		if (typeof content === 'string') {
+			return stripped;
+		}
+
+		return MarkdownString.lift({ ...content, value: stripped });
+	}
+
 	private renderMarkdownOrText(content: string | IMarkdownString, container: HTMLElement, disposables: DisposableStore): void {
 		if (typeof content === 'string') {
 			container.textContent = content;
@@ -312,6 +386,10 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 			return false;
 		}
 
+		if (diff.insertions === 0 && diff.deletions === 0) {
+			return false;
+		}
+
 		if (diff.insertions >= 0 /* render even `0` for more homogeneity */) {
 			template.diffAddedSpan.textContent = `+${diff.insertions}`;
 		}
@@ -323,53 +401,73 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 		return true;
 	}
 
-	private getIcon(session: IAgentSession): ThemeIcon {
+	private getIcon(session: IAgentSession, statusOnly?: boolean): ThemeIcon {
 		if (session.status === AgentSessionStatus.InProgress) {
 			return Codicon.sessionInProgress;
 		}
 
 		if (session.status === AgentSessionStatus.NeedsInput) {
-			return Codicon.report;
+			return Codicon.circleFilled;
 		}
 
 		if (session.status === AgentSessionStatus.Failed) {
 			return Codicon.error;
 		}
 
+		if (statusOnly) {
+			// PR status icons
+			const metadata = session.metadata;
+			const hasPR = metadata?.pullRequestUrl || metadata?.pullRequestNumber;
+			if (hasPR) {
+				switch (metadata?.pullRequestState) {
+					case 'merged':
+						return { ...Codicon.gitPullRequestDone, color: themeColorFromId('charts.purple') };
+					case 'closed':
+						return { ...Codicon.gitPullRequestClosed, color: themeColorFromId('charts.red') };
+					case 'draft':
+						return { ...Codicon.gitPullRequestDraft, color: themeColorFromId('descriptionForeground') };
+					default:
+						return { ...Codicon.gitPullRequest, color: themeColorFromId('charts.green') };
+				}
+			}
+		}
+
 		if (!session.isRead() && !session.isArchived()) {
 			return Codicon.circleFilled;
 		}
 
+		if (!statusOnly && session.providerType === AgentSessionProviders.Local) {
+			return Codicon.circleSmallFilled;
+		}
+
+		if (!statusOnly) {
+			return session.icon;
+		}
+
 		return Codicon.circleSmallFilled;
 	}
 
-	private renderDescription(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): void {
+	private renderDescription(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): boolean {
 		const description = session.element.description;
 		if (description) {
 			this.renderMarkdownOrText(description, template.description, template.elementDisposable);
-			return;
+			return true;
 		}
 
 		// Fallback to state label
 		if (session.element.status === AgentSessionStatus.InProgress) {
 			template.description.textContent = localize('chat.session.status.inProgress', "Working...");
+			return true;
 		} else if (session.element.status === AgentSessionStatus.NeedsInput) {
 			template.description.textContent = localize('chat.session.status.needsInput', "Input needed.");
-		} else if (
-			session.element.timing.lastRequestEnded &&
-			session.element.timing.lastRequestStarted &&
-			session.element.timing.lastRequestEnded > session.element.timing.lastRequestStarted
-		) {
-			const duration = this.toDuration(session.element.timing.lastRequestStarted, session.element.timing.lastRequestEnded, false, true);
-
-			template.description.textContent = session.element.status === AgentSessionStatus.Failed ?
-				localize('chat.session.status.failedAfter', "Failed after {0}", duration) :
-				localize('chat.session.status.completedAfter', "Completed in {0}", duration);
-		} else {
-			template.description.textContent = session.element.status === AgentSessionStatus.Failed ?
-				localize('chat.session.status.failed', "Failed") :
-				localize('chat.session.status.completed', "Completed");
+			return true;
+		} else if (session.element.status === AgentSessionStatus.Failed) {
+			template.description.textContent = localize('chat.session.status.failed', "Failed");
+			return true;
 		}
+
+		template.description.textContent = '';
+		return false;
 	}
 
 	private toDuration(startTime: number, endTime: number, useFullTimeWords: boolean, disallowNow: boolean): string {
@@ -381,44 +479,41 @@ export class AgentSessionRenderer extends Disposable implements ICompressibleTre
 		return getDurationString(elapsed, useFullTimeWords);
 	}
 
-	private renderStatus(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): void {
+	private renderStatus(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): boolean {
 
-		const getTimeLabel = (session: IAgentSession) => {
+		// Show repository name for pinned sessions when grouped by repository,
+		// since they are not placed under a repository section header.
+		const repoPrefix = (session.element.isPinned() && this.options.isGroupedByRepository?.())
+			? getRepositoryName(session.element)
+			: undefined;
+
+		const getStatusText = (session: IAgentSession) => {
 			let timeLabel: string | undefined;
 			if (session.status === AgentSessionStatus.InProgress && session.timing.lastRequestStarted) {
 				timeLabel = this.toDuration(session.timing.lastRequestStarted, Date.now(), false, false);
 			}
 
 			if (!timeLabel) {
-				const date = getAgentSessionTime(session.timing);
+				const date = this.options.isSortedByUpdated?.()
+					? session.timing.lastRequestEnded ?? session.timing.created
+					: session.timing.created;
 				const seconds = Math.round((new Date().getTime() - date) / 1000);
 				if (seconds < 60) {
 					timeLabel = localize('secondsDuration', "now");
 				} else {
-					timeLabel = sessionDateFromNow(date);
+					timeLabel = sessionDateFromNow(date, true);
 				}
 			}
 
-			return timeLabel;
+			return repoPrefix ? `${repoPrefix} \u00B7 ${timeLabel}` : timeLabel;
 		};
 
-		// Provider icon (only shown for non-local sessions)
-		// When showIsolationIcon is enabled for background sessions, show worktree/folder icon instead
-		const isLocal = session.element.providerType === AgentSessionProviders.Local;
-		if (isLocal) {
-			template.statusProviderIcon.className = '';
-		} else if (this.options.showIsolationIcon && session.element.providerType === AgentSessionProviders.Background) {
-			const hasWorktree = typeof session.element.metadata?.worktreePath === 'string';
-			const isolationIcon = hasWorktree ? Codicon.worktree : Codicon.folder;
-			template.statusProviderIcon.className = `agent-session-status-provider-icon ${ThemeIcon.asClassName(isolationIcon)}`;
-		} else {
-			template.statusProviderIcon.className = `agent-session-status-provider-icon ${ThemeIcon.asClassName(session.element.icon)}`;
-		}
-
 		// Time label
-		template.statusTime.textContent = getTimeLabel(session.element);
+		template.statusTime.textContent = getStatusText(session.element);
 		const timer = template.elementDisposable.add(new IntervalTimer());
-		timer.cancelAndSet(() => template.statusTime.textContent = getTimeLabel(session.element), session.element.status === AgentSessionStatus.InProgress ? 1000 /* every second */ : 60 * 1000 /* every minute */);
+		timer.cancelAndSet(() => template.statusTime.textContent = getStatusText(session.element), session.element.status === AgentSessionStatus.InProgress ? 1000 /* every second */ : 60 * 1000 /* every minute */);
+
+		return true;
 	}
 
 	private renderHover(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): void {
@@ -556,11 +651,16 @@ export function toStatusLabel(status: AgentSessionStatus): string {
 interface IAgentSessionSectionTemplate {
 	readonly container: HTMLElement;
 	readonly label: HTMLSpanElement;
+	readonly count: HTMLSpanElement;
 	readonly toolbar: MenuWorkbenchToolBar;
 	readonly contextKeyService: IContextKeyService;
 	readonly disposables: IDisposable;
 }
 
+export interface IAgentSessionSectionRendererOptions {
+	readonly hideSectionCount?: boolean;
+}
+
 export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IAgentSessionSection, FuzzyScore, IAgentSessionSectionTemplate> {
 
 	static readonly TEMPLATE_ID = 'agent-session-section';
@@ -568,6 +668,7 @@ export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IA
 	readonly templateId = AgentSessionSectionRenderer.TEMPLATE_ID;
 
 	constructor(
+		private readonly sectionOptions: IAgentSessionSectionRendererOptions,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) { }
@@ -579,6 +680,7 @@ export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IA
 			'div.agent-session-section@container',
 			[
 				h('span.agent-session-section-label@label'),
+				h('span.agent-session-section-count@count'),
 				h('div.agent-session-section-toolbar@toolbar')
 			]
 		);
@@ -594,6 +696,7 @@ export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IA
 		return {
 			container: elements.container,
 			label: elements.label,
+			count: elements.count,
 			toolbar,
 			contextKeyService,
 			disposables
@@ -605,6 +708,13 @@ export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IA
 		// Label
 		template.label.textContent = element.element.label;
 
+		// Count
+		if (this.sectionOptions.hideSectionCount) {
+			template.count.textContent = '';
+		} else {
+			template.count.textContent = String(element.element.sessions.length);
+		}
+
 		// Toolbar
 		ChatContextKeys.agentSessionSection.bindTo(template.contextKeyService).set(element.element.section);
 		template.toolbar.context = element.element;
@@ -625,18 +735,123 @@ export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IA
 
 //#endregion
 
+//#region Show More / Show Less Renderer
+
+interface IAgentSessionShowMoreTemplate {
+	readonly container: HTMLElement;
+	readonly label: HTMLElement;
+	readonly disposables: DisposableStore;
+}
+
+export interface IAgentSessionShowMoreRendererOptions {
+	readonly compactLabel?: boolean;
+}
+
+export class AgentSessionShowMoreRenderer implements ICompressibleTreeRenderer<IAgentSessionShowMore, FuzzyScore, IAgentSessionShowMoreTemplate> {
+
+	static readonly TEMPLATE_ID = 'agent-session-show-more';
+	static readonly HEIGHT = 26;
+	static readonly COLLAPSED_HEIGHT = 1;
+
+	readonly templateId = AgentSessionShowMoreRenderer.TEMPLATE_ID;
+
+	constructor(private readonly options?: IAgentSessionShowMoreRendererOptions) { }
+
+	renderTemplate(container: HTMLElement): IAgentSessionShowMoreTemplate {
+		const disposables = new DisposableStore();
+
+		const elements = h(
+			'div.agent-session-show-more@container',
+			[h('span.agent-session-show-more-label@label')]
+		);
+
+		container.appendChild(elements.container);
+
+		return {
+			container: elements.container,
+			label: elements.label,
+			disposables,
+		};
+	}
+
+	renderElement(element: ITreeNode<IAgentSessionShowMore, FuzzyScore>, _index: number, template: IAgentSessionShowMoreTemplate): void {
+		template.label.textContent = this.options?.compactLabel
+			? localize('agentSessions.showMoreCompact', "+{0} more", element.element.remainingCount)
+			: localize('agentSessions.showMore', "Show {0} More...", element.element.remainingCount);
+		template.container.setAttribute('data-section-label', element.element.sectionLabel);
+	}
+
+	renderCompressedElements(): void {
+		throw new Error('Should never happen since show-more is incompressible');
+	}
+
+	disposeElement(): void { }
+
+	disposeTemplate(templateData: IAgentSessionShowMoreTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+export class AgentSessionShowLessRenderer implements ICompressibleTreeRenderer<IAgentSessionShowLess, FuzzyScore, IAgentSessionShowMoreTemplate> {
+
+	static readonly TEMPLATE_ID = 'agent-session-show-less';
+	static readonly HEIGHT = AgentSessionShowMoreRenderer.HEIGHT;
+
+	readonly templateId = AgentSessionShowLessRenderer.TEMPLATE_ID;
+
+	renderTemplate(container: HTMLElement): IAgentSessionShowMoreTemplate {
+		const disposables = new DisposableStore();
+
+		const elements = h(
+			'div.agent-session-show-more@container',
+			[h('span.agent-session-show-more-label@label')]
+		);
+
+		container.appendChild(elements.container);
+
+		return {
+			container: elements.container,
+			label: elements.label,
+			disposables,
+		};
+	}
+
+	renderElement(element: ITreeNode<IAgentSessionShowLess, FuzzyScore>, _index: number, template: IAgentSessionShowMoreTemplate): void {
+		template.label.textContent = localize('agentSessions.showLess', "Show less");
+		template.container.setAttribute('data-section-label', element.element.sectionLabel);
+	}
+
+	renderCompressedElements(): void {
+		throw new Error('Should never happen since show-less is incompressible');
+	}
+
+	disposeElement(): void { }
+
+	disposeTemplate(templateData: IAgentSessionShowMoreTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+//#endregion
+
 export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSessionListItem> {
 
 	static readonly ITEM_HEIGHT = 54;
 	static readonly SECTION_HEIGHT = 26;
 
-	constructor(private readonly _approvalModel?: AgentSessionApprovalModel) { }
+	constructor(private readonly _approvalModel?: AgentSessionApprovalModel,
+		private readonly _compactShowMore?: boolean,
+	) { }
 
 	getHeight(element: AgentSessionListItem): number {
 		if (isAgentSessionSection(element)) {
 			return AgentSessionsListDelegate.SECTION_HEIGHT;
 		}
 
+		if (isAgentSessionShowMore(element) || isAgentSessionShowLess(element)) {
+			return this._compactShowMore ? AgentSessionShowMoreRenderer.COLLAPSED_HEIGHT : AgentSessionShowMoreRenderer.HEIGHT;
+		}
+
 		let height = AgentSessionsListDelegate.ITEM_HEIGHT;
 		const approval = this._approvalModel?.getApproval(element.resource).get();
 		if (approval) {
@@ -646,6 +861,9 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
 	}
 
 	hasDynamicHeight(element: AgentSessionListItem): boolean {
+		if (isAgentSessionShowMore(element) || isAgentSessionShowLess(element)) {
+			return true;
+		}
 		return !!this._approvalModel && isAgentSession(element);
 	}
 
@@ -654,6 +872,14 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
 			return AgentSessionSectionRenderer.TEMPLATE_ID;
 		}
 
+		if (isAgentSessionShowMore(element)) {
+			return AgentSessionShowMoreRenderer.TEMPLATE_ID;
+		}
+
+		if (isAgentSessionShowLess(element)) {
+			return AgentSessionShowLessRenderer.TEMPLATE_ID;
+		}
+
 		return AgentSessionRenderer.TEMPLATE_ID;
 	}
 }
@@ -674,7 +900,15 @@ export class AgentSessionsAccessibilityProvider implements IListAccessibilityPro
 
 	getAriaLabel(element: AgentSessionListItem): string | null {
 		if (isAgentSessionSection(element)) {
-			return localize('agentSessionSectionAriaLabel', "{0} sessions section", element.label);
+			return localize('agentSessionSectionAriaLabel', "{0} sessions section, {1} sessions", element.label, element.sessions.length);
+		}
+
+		if (isAgentSessionShowMore(element)) {
+			return localize('agentSessionShowMoreAriaLabel', "Show {0} more sessions", element.remainingCount);
+		}
+
+		if (isAgentSessionShowLess(element)) {
+			return localize('agentSessionShowLessAriaLabel', "Show less sessions");
 		}
 
 		return localize('agentSessionItemAriaLabel', "{0} session {1} ({2}), created {3}", element.providerLabel, element.label, toStatusLabel(element.status), new Date(element.timing.created).toLocaleString());
@@ -687,6 +921,7 @@ export interface IAgentSessionsFilterExcludes {
 
 	readonly archived: boolean;
 	readonly read: boolean;
+	readonly repositoryGroupCapped: boolean;
 }
 
 export interface IAgentSessionsFilter {
@@ -708,6 +943,12 @@ export interface IAgentSessionsFilter {
 	 */
 	readonly groupResults?: () => AgentSessionsGrouping | undefined;
 
+	/**
+	 * The field to sort sessions by.
+	 * Defaults to created date when undefined.
+	 */
+	readonly sortResults?: () => AgentSessionsSorting | undefined;
+
 	/**
 	 * A callback to notify the filter about the number of
 	 * results after filtering.
@@ -738,15 +979,44 @@ export interface IAgentSessionsFilter {
 export class AgentSessionsDataSource extends Disposable implements IAsyncDataSource<IAgentSessionsModel, AgentSessionListItem> {
 
 	private static readonly CAPPED_SESSIONS_LIMIT = 3;
+	static readonly REPOSITORY_GROUP_LIMIT = 5;
 
 	private readonly _onDidGetChildren = this._register(new Emitter<number>());
 	readonly onDidGetChildren: Event<number> = this._onDidGetChildren.event;
 
+	private readonly _onDidExpandRepositoryGroup = this._register(new Emitter<void>());
+	readonly onDidExpandRepositoryGroup: Event<void> = this._onDidExpandRepositoryGroup.event;
+
+	private readonly expandedRepositoryGroups = new Set<string>();
+
 	constructor(
 		private readonly filter: IAgentSessionsFilter | undefined,
 		private readonly sorter: ITreeSorter<IAgentSession>,
+		private readonly repositoryGroupLimit?: number,
 	) {
 		super();
+
+		if (this.filter) {
+			let previousCapped = this.filter.getExcludes().repositoryGroupCapped;
+			this._register(this.filter.onDidChange(() => {
+				const currentCapped = this.filter!.getExcludes().repositoryGroupCapped;
+				// Only clear expanded state when capping transitions from off to on
+				if (currentCapped && !previousCapped) {
+					this.expandedRepositoryGroups.clear();
+				}
+				previousCapped = currentCapped;
+			}));
+		}
+	}
+
+	expandRepositoryGroup(sectionLabel: string): void {
+		this.expandedRepositoryGroups.add(sectionLabel);
+		this._onDidExpandRepositoryGroup.fire();
+	}
+
+	collapseRepositoryGroup(sectionLabel: string): void {
+		this.expandedRepositoryGroups.delete(sectionLabel);
+		this._onDidExpandRepositoryGroup.fire();
 	}
 
 	hasChildren(element: IAgentSessionsModel | AgentSessionListItem): boolean {
@@ -761,7 +1031,7 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 			return element.sessions.length > 0;
 		}
 
-		// Session element
+		// Session element or show more
 		else {
 			return false;
 		}
@@ -801,19 +1071,36 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 
 		// Sessions	section
 		else if (isAgentSessionSection(element)) {
+			const isCappingEnabled = this.repositoryGroupLimit && this.filter?.getExcludes().repositoryGroupCapped;
+			if (isCappingEnabled && element.section === AgentSessionSection.Repository && element.sessions.length > this.repositoryGroupLimit) {
+				if (!this.expandedRepositoryGroups.has(element.label)) {
+					// Collapsed: show limited sessions + "show more"
+					const visible = element.sessions.slice(0, this.repositoryGroupLimit);
+					const remainingCount = element.sessions.length - this.repositoryGroupLimit;
+					return [...visible, { showMore: true as const, sectionLabel: element.label, remainingCount }];
+				} else {
+					// Expanded: show all sessions + "show less"
+					return [...element.sessions, { showLess: true as const, sectionLabel: element.label }];
+				}
+			}
 			return element.sessions;
 		}
 
-		// Session element
+		// Session element or show more
 		else {
 			return [];
 		}
 	}
 
 	private groupSessionsIntoSections(sessions: IAgentSession[]): AgentSessionListItem[] {
-		const sortedSessions = sessions.sort(this.sorter.compare.bind(this.sorter));
+		const isCapped = this.filter?.groupResults?.() === AgentSessionsGrouping.Capped;
 
-		if (this.filter?.groupResults?.() === AgentSessionsGrouping.Capped) {
+		const sorter = this.sorter;
+		const sortedSessions = sorter instanceof AgentSessionsSorter
+			? sessions.sort((a, b) => sorter.compare(a, b, true /* prioritize active sessions to keep in-progress/needs-input ones top within each group */))
+			: sessions.sort(sorter.compare.bind(sorter));
+
+		if (isCapped) {
 			if (this.filter?.getExcludes().read) {
 				return sortedSessions; // When filtering to show only unread sessions, show a flat list
 			}
@@ -831,14 +1118,22 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 
 		const firstArchivedIndex = sortedSessions.findIndex(session => session.isArchived());
 		const nonArchivedCount = firstArchivedIndex === -1 ? sortedSessions.length : firstArchivedIndex;
+		const nonArchivedSessions = sortedSessions.slice(0, nonArchivedCount);
+		const archivedSessions = sortedSessions.slice(nonArchivedCount);
 
-		const topSessions = sortedSessions.slice(0, Math.min(AgentSessionsDataSource.CAPPED_SESSIONS_LIMIT, nonArchivedCount));
-		const othersSessions = sortedSessions.slice(topSessions.length);
+		// All pinned sessions are always visible
+		const pinnedSessions = nonArchivedSessions.filter(session => session.isPinned());
+		const unpinnedSessions = nonArchivedSessions.filter(session => !session.isPinned());
 
-		// Add top sessions directly (no section header)
-		result.push(...topSessions);
+		// Take up to N non-pinned sessions from the sorted order (preserves NeedsInput prioritization)
+		const topUnpinned = unpinnedSessions.slice(0, AgentSessionsDataSource.CAPPED_SESSIONS_LIMIT);
+		const remainingUnpinned = unpinnedSessions.slice(AgentSessionsDataSource.CAPPED_SESSIONS_LIMIT);
 
-		// Add "More" section for the rest
+		// Add pinned first, then top N non-pinned
+		result.push(...pinnedSessions, ...topUnpinned);
+
+		// Add "More" section for the rest (remaining unpinned + archived)
+		const othersSessions = [...remainingUnpinned, ...archivedSessions];
 		if (othersSessions.length > 0) {
 			result.push({
 				section: AgentSessionSection.More,
@@ -852,7 +1147,8 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 
 	private groupSessionsByDate(sortedSessions: IAgentSession[]): AgentSessionListItem[] {
 		const result: AgentSessionListItem[] = [];
-		const groupedSessions = groupAgentSessionsByDate(sortedSessions);
+		const sortBy = this.filter?.sortResults?.();
+		const groupedSessions = groupAgentSessionsByDate(sortedSessions, sortBy);
 
 		for (const { sessions, section, label } of groupedSessions.values()) {
 			if (sessions.length === 0) {
@@ -867,9 +1163,9 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 
 	private groupSessionsByRepository(sortedSessions: IAgentSession[]): AgentSessionListItem[] {
 		const repoMap = new Map<string, { label: string; sessions: IAgentSession[] }>();
+		const pinnedSessions: IAgentSession[] = [];
 		const archivedSessions: IAgentSession[] = [];
-		const unknownKey = '\x00unknown';
-		const unknownLabel = localize('agentSessions.noRepository', "Other");
+		const otherSessions: IAgentSession[] = [];
 
 		for (const session of sortedSessions) {
 			if (session.isArchived()) {
@@ -877,20 +1173,33 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 				continue;
 			}
 
-			const repoName = this.getRepositoryName(session);
-			const repoId = repoName || unknownKey;
-			const repoLabel = repoName || unknownLabel;
-
-			let group = repoMap.get(repoId);
-			if (!group) {
-				group = { label: repoLabel, sessions: [] };
-				repoMap.set(repoId, group);
+			if (session.isPinned()) {
+				pinnedSessions.push(session);
+				continue;
+			}
+
+			const repoName = getRepositoryName(session);
+			if (repoName) {
+				let group = repoMap.get(repoName);
+				if (!group) {
+					group = { label: repoName, sessions: [] };
+					repoMap.set(repoName, group);
+				}
+				group.sessions.push(session);
+			} else {
+				otherSessions.push(session);
 			}
-			group.sessions.push(session);
 		}
 
 		const result: AgentSessionListItem[] = [];
-		for (const [, { label, sessions }] of repoMap) {
+
+		// Pinned sessions are added directly (no section header) so they
+		// appear at the top without a "PINNED" group label.
+		result.push(...pinnedSessions);
+
+		const sortedRepoGroups = [...repoMap.values()].sort((a, b) => compareIgnoreCase(a.label, b.label));
+
+		for (const { label, sessions } of sortedRepoGroups) {
 			result.push({
 				section: AgentSessionSection.Repository,
 				label,
@@ -898,6 +1207,14 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 			});
 		}
 
+		if (otherSessions.length > 0) {
+			result.push({
+				section: AgentSessionSection.Repository,
+				label: AgentSessionSectionLabels[AgentSessionSection.Repository],
+				sessions: otherSessions,
+			});
+		}
+
 		if (archivedSessions.length > 0) {
 			result.push({
 				section: AgentSessionSection.Archived,
@@ -908,164 +1225,185 @@ export class AgentSessionsDataSource extends Disposable implements IAsyncDataSou
 
 		return result;
 	}
+}
 
-	private getRepositoryName(session: IAgentSession): string | undefined {
-		const metadata = session.metadata;
-		if (metadata) {
-			// Cloud sessions: metadata.owner + metadata.name
-			const owner = metadata.owner as string | undefined;
-			const name = metadata.name as string | undefined;
-			if (owner && name) {
-				return name;
-			}
-
-			// repositoryNwo: "owner/repo"
-			const nwo = metadata.repositoryNwo as string | undefined;
-			if (nwo && nwo.includes('/')) {
-				return nwo.split('/').pop()!;
-			}
-
-			// repository: could be "owner/repo", a URL, or git@host:owner/repo.git
-			const repository = metadata.repository as string | undefined;
-			if (repository) {
-				const repoName = this.parseRepositoryName(repository);
-				if (repoName) {
-					return repoName;
+/**
+ * Extracts the repository name for an agent session from its metadata or badge.
+ * Used for grouping sessions by repository and for determining whether a badge
+ * is redundant with the section header.
+ */
+export function getRepositoryName(session: IAgentSession): string | undefined {
+	const metadata = session.metadata;
+	if (metadata) {
+		// Remote agent host sessions: group by folder + remote name (e.g. "myproject [dev-box]")
+		const remoteAgentHost = metadata.remoteAgentHost as string | undefined;
+		if (remoteAgentHost) {
+			const workingDir = metadata.workingDirectoryPath as string | undefined;
+			if (workingDir) {
+				const folderName = extractRepoNameFromPath(workingDir);
+				if (folderName) {
+					return `${folderName} [${remoteAgentHost}]`;
 				}
 			}
+			return remoteAgentHost;
+		}
 
-			// repositoryUrl: "https://github.com/owner/repo"
-			const repositoryUrl = metadata.repositoryUrl as string | undefined;
-			if (repositoryUrl) {
-				const repoName = this.parseRepositoryName(repositoryUrl);
-				if (repoName) {
-					return repoName;
-				}
-			}
+		// Cloud sessions: metadata.owner + metadata.name
+		const owner = metadata.owner as string | undefined;
+		const name = metadata.name as string | undefined;
+		if (owner && name) {
+			return name;
+		}
 
-			// repositoryPath: extract repo name from the directory path basename
-			const repositoryPath = metadata.repositoryPath as string | undefined;
-			if (repositoryPath) {
-				const repoName = this.extractRepoNameFromPath(repositoryPath);
-				if (repoName) {
-					return repoName;
-				}
-			}
+		// repositoryNwo: "owner/repo"
+		const nwo = metadata.repositoryNwo as string | undefined;
+		if (nwo && nwo.includes('/')) {
+			return nwo.split('/').pop()!;
+		}
 
-			// worktreePath: extract repo name from the worktree path
-			const worktreePath = metadata.worktreePath as string | undefined;
-			if (worktreePath) {
-				const repoName = this.extractRepoNameFromPath(worktreePath);
-				if (repoName) {
-					return repoName;
-				}
-			}
-
-			// workingDirectoryPath: fallback to extract name from the working directory
-			const workingDirectoryPath = metadata.workingDirectoryPath as string | undefined;
-			if (workingDirectoryPath) {
-				const repoName = this.extractRepoNameFromPath(workingDirectoryPath);
-				if (repoName) {
-					return repoName;
-				}
+		// repository: could be "owner/repo", a URL, or git@host:owner/repo.git
+		const repository = metadata.repository as string | undefined;
+		if (repository) {
+			const repoName = parseRepositoryName(repository);
+			if (repoName) {
+				return repoName;
 			}
 		}
 
-		// Fallback: extract repo/folder name from badge
-		const badge = session.badge;
-		if (badge) {
-			const raw = typeof badge === 'string' ? badge : badge.value;
-			const badgeMatch = raw.match(/\$\((?:repo|folder|worktree)\)\s*(.+)/);
-			if (badgeMatch) {
-				return badgeMatch[1].trim();
+		// repositoryUrl: "https://github.com/owner/repo"
+		const repositoryUrl = metadata.repositoryUrl as string | undefined;
+		if (repositoryUrl) {
+			const repoName = parseRepositoryName(repositoryUrl);
+			if (repoName) {
+				return repoName;
 			}
 		}
 
-		return undefined;
+		// repositoryPath: extract repo name from the directory path basename
+		const repositoryPath = metadata.repositoryPath as string | undefined;
+		if (repositoryPath) {
+			const repoName = extractRepoNameFromPath(repositoryPath);
+			if (repoName) {
+				return repoName;
+			}
+		}
+
+		// worktreePath: extract repo name from the worktree path
+		const worktreePath = metadata.worktreePath as string | undefined;
+		if (worktreePath) {
+			const repoName = extractRepoNameFromPath(worktreePath);
+			if (repoName) {
+				return repoName;
+			}
+		}
+
+		// workingDirectoryPath: fallback to extract name from the working directory
+		const workingDirectoryPath = metadata.workingDirectoryPath as string | undefined;
+		if (workingDirectoryPath) {
+			const repoName = extractRepoNameFromPath(workingDirectoryPath);
+			if (repoName) {
+				return repoName;
+			}
+		}
 	}
 
-	/**
-	 * Parses a repository name from various formats: "owner/repo", URLs,
-	 * and git@host:owner/repo.git style references.
-	 */
-	private parseRepositoryName(value: string): string | undefined {
-		// Direct "owner/repo" style (no scheme, no git@ prefix)
-		if (value.includes('/') && !value.includes('://') && !value.startsWith('git@')) {
-			let repoSegment = value.split('/').filter(Boolean).pop();
+	// Fallback: extract repo/folder name from badge
+	const badge = session.badge;
+	if (badge) {
+		const raw = typeof badge === 'string' ? badge : badge.value;
+		const badgeMatch = raw.match(/\$\((?:repo|folder|worktree)\)\s*(.+)/);
+		if (badgeMatch) {
+			return badgeMatch[1].trim();
+		}
+	}
+
+	return undefined;
+}
+
+/**
+ * Parses a repository name from various formats: "owner/repo", URLs,
+ * and git@host:owner/repo.git style references.
+ */
+function parseRepositoryName(value: string): string | undefined {
+	// Direct "owner/repo" style (no scheme, no git@ prefix)
+	if (value.includes('/') && !value.includes('://') && !value.startsWith('git@')) {
+		let repoSegment = value.split('/').filter(Boolean).pop();
+		if (repoSegment?.endsWith('.git')) {
+			repoSegment = repoSegment.slice(0, -4);
+		}
+		return repoSegment || undefined;
+	}
+
+	// Standard URL formats (https://..., ssh://..., etc.)
+	try {
+		const url = new URL(value);
+		const parts = url.pathname.split('/').filter(Boolean);
+		if (parts.length >= 2) {
+			let repoSegment = parts[1];
+			if (repoSegment.endsWith('.git')) {
+				repoSegment = repoSegment.slice(0, -4);
+			}
+			return repoSegment || undefined;
+		}
+	} catch {
+		// not a standard URL
+	}
+
+	// git@host:owner/repo(.git) style URLs
+	if (value.startsWith('git@')) {
+		const colonIndex = value.indexOf(':');
+		if (colonIndex !== -1 && colonIndex < value.length - 1) {
+			const pathPart = value.substring(colonIndex + 1);
+			let repoSegment = pathPart.split('/').filter(Boolean).pop();
 			if (repoSegment?.endsWith('.git')) {
 				repoSegment = repoSegment.slice(0, -4);
 			}
 			return repoSegment || undefined;
 		}
-
-		// Standard URL formats (https://..., ssh://..., etc.)
-		try {
-			const url = new URL(value);
-			const parts = url.pathname.split('/').filter(Boolean);
-			if (parts.length >= 2) {
-				let repoSegment = parts[1];
-				if (repoSegment.endsWith('.git')) {
-					repoSegment = repoSegment.slice(0, -4);
-				}
-				return repoSegment || undefined;
-			}
-		} catch {
-			// not a standard URL
-		}
-
-		// git@host:owner/repo(.git) style URLs
-		if (value.startsWith('git@')) {
-			const colonIndex = value.indexOf(':');
-			if (colonIndex !== -1 && colonIndex < value.length - 1) {
-				const pathPart = value.substring(colonIndex + 1);
-				let repoSegment = pathPart.split('/').filter(Boolean).pop();
-				if (repoSegment?.endsWith('.git')) {
-					repoSegment = repoSegment.slice(0, -4);
-				}
-				return repoSegment || undefined;
-			}
-		}
-
-		return undefined;
 	}
 
-	/**
-	 * Extracts the repository name from a filesystem path, handling git worktree
-	 * conventions where paths follow `<repo>.worktrees/<worktree-name>`.
-	 */
-	private extractRepoNameFromPath(dirPath: string): string | undefined {
-		const segments = dirPath.split(/[/\\]/).filter(Boolean);
-		if (segments.length < 2) {
-			return segments[0];
-		}
+	return undefined;
+}
 
-		const parent = segments[segments.length - 2];
-		if (parent.endsWith('.worktrees')) {
-			return parent.slice(0, -'.worktrees'.length) || undefined;
-		}
-
-		return segments[segments.length - 1];
+/**
+ * Extracts the repository name from a filesystem path, handling git worktree
+ * conventions where paths follow `<repo>.worktrees/<worktree-name>`.
+ */
+function extractRepoNameFromPath(dirPath: string): string | undefined {
+	const segments = dirPath.split(/[/\\]/).filter(Boolean);
+	if (segments.length < 2) {
+		return segments[0];
 	}
+
+	const parent = segments[segments.length - 2];
+	if (parent.endsWith('.worktrees')) {
+		return parent.slice(0, -'.worktrees'.length) || undefined;
+	}
+
+	return segments[segments.length - 1];
 }
 
 export const AgentSessionSectionLabels = {
+	[AgentSessionSection.Pinned]: localize('agentSessions.pinnedSection', "Pinned"),
 	[AgentSessionSection.Today]: localize('agentSessions.todaySection', "Today"),
 	[AgentSessionSection.Yesterday]: localize('agentSessions.yesterdaySection', "Yesterday"),
 	[AgentSessionSection.Week]: localize('agentSessions.weekSection', "Last 7 days"),
 	[AgentSessionSection.Older]: localize('agentSessions.olderSection', "Older"),
 	[AgentSessionSection.Archived]: localize('agentSessions.archivedSection', "Archived"),
 	[AgentSessionSection.More]: localize('agentSessions.moreSection', "More"),
+	[AgentSessionSection.Repository]: localize('agentSessions.noRepository', "Other"),
 };
 
 const DAY_THRESHOLD = 24 * 60 * 60 * 1000;
 const WEEK_THRESHOLD = 7 * DAY_THRESHOLD;
 
-export function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSessionSection, IAgentSessionSection> {
+export function groupAgentSessionsByDate(sessions: IAgentSession[], sortBy?: AgentSessionsSorting): Map<AgentSessionSection, IAgentSessionSection> {
 	const now = Date.now();
 	const startOfToday = new Date(now).setHours(0, 0, 0, 0);
 	const startOfYesterday = startOfToday - DAY_THRESHOLD;
 	const weekThreshold = now - WEEK_THRESHOLD;
 
+	const pinnedSessions: IAgentSession[] = [];
 	const todaySessions: IAgentSession[] = [];
 	const yesterdaySessions: IAgentSession[] = [];
 	const weekSessions: IAgentSession[] = [];
@@ -1075,8 +1413,12 @@ export function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSe
 	for (const session of sessions) {
 		if (session.isArchived()) {
 			archivedSessions.push(session);
+		} else if (session.isPinned()) {
+			pinnedSessions.push(session);
 		} else {
-			const sessionTime = getAgentSessionTime(session.timing);
+			const sessionTime = sortBy === AgentSessionsSorting.Updated
+				? session.timing.lastRequestEnded ?? session.timing.created
+				: session.timing.created;
 			if (sessionTime >= startOfToday) {
 				todaySessions.push(session);
 			} else if (sessionTime >= startOfYesterday) {
@@ -1090,6 +1432,7 @@ export function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSe
 	}
 
 	return new Map<AgentSessionSection, IAgentSessionSection>([
+		[AgentSessionSection.Pinned, { section: AgentSessionSection.Pinned, label: AgentSessionSectionLabels[AgentSessionSection.Pinned], sessions: pinnedSessions }],
 		[AgentSessionSection.Today, { section: AgentSessionSection.Today, label: AgentSessionSectionLabels[AgentSessionSection.Today], sessions: todaySessions }],
 		[AgentSessionSection.Yesterday, { section: AgentSessionSection.Yesterday, label: AgentSessionSectionLabels[AgentSessionSection.Yesterday], sessions: yesterdaySessions }],
 		[AgentSessionSection.Week, { section: AgentSessionSection.Week, label: AgentSessionSectionLabels[AgentSessionSection.Week], sessions: weekSessions }],
@@ -1098,7 +1441,7 @@ export function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSe
 	]);
 }
 
-export function sessionDateFromNow(sessionTime: number): string {
+export function sessionDateFromNow(sessionTime: number, appendAgoLabel?: boolean): string {
 	const now = Date.now();
 	const startOfToday = new Date(now).setHours(0, 0, 0, 0);
 	const startOfYesterday = startOfToday - DAY_THRESHOLD;
@@ -1111,14 +1454,18 @@ export function sessionDateFromNow(sessionTime: number): string {
 	// normalization logic.
 
 	if (sessionTime < startOfToday && sessionTime >= startOfYesterday) {
-		return localize('date.fromNow.days.singular', '1 day');
+		return appendAgoLabel
+			? localize('date.fromNow.days.singular.ago', '1 day ago')
+			: localize('date.fromNow.days.singular', '1 day');
 	}
 
 	if (sessionTime < startOfYesterday && sessionTime >= startOfTwoDaysAgo) {
-		return localize('date.fromNow.days.multiple', '2 days');
+		return appendAgoLabel
+			? localize('date.fromNow.days.multiple.ago', '2 days ago')
+			: localize('date.fromNow.days.multiple', '2 days');
 	}
 
-	return fromNow(sessionTime, false);
+	return fromNow(sessionTime, appendAgoLabel);
 }
 
 export class AgentSessionsIdentityProvider implements IIdentityProvider<IAgentSessionsModel | AgentSessionListItem> {
@@ -1128,6 +1475,14 @@ export class AgentSessionsIdentityProvider implements IIdentityProvider<IAgentSe
 			return `section-${element.section}-${element.label}`;
 		}
 
+		if (isAgentSessionShowMore(element)) {
+			return `show-more-${element.sectionLabel}`;
+		}
+
+		if (isAgentSessionShowLess(element)) {
+			return `show-less-${element.sectionLabel}`;
+		}
+
 		if (isAgentSession(element)) {
 			return element.resource.toString();
 		}
@@ -1150,25 +1505,27 @@ export class AgentSessionsCompressionDelegate implements ITreeCompressionDelegat
 	}
 }
 
-export interface IAgentSessionsSorterOptions {
-	overrideCompare?(sessionA: IAgentSession, sessionB: IAgentSession): number | undefined;
-}
-
 export class AgentSessionsSorter implements ITreeSorter<IAgentSession> {
 
-	constructor(private readonly options?: IAgentSessionsSorterOptions) { }
+	private readonly getSortBy: () => AgentSessionsSorting;
 
-	compare(sessionA: IAgentSession, sessionB: IAgentSession): number {
+	constructor(getSortBy?: () => AgentSessionsSorting) {
+		this.getSortBy = getSortBy ?? (() => AgentSessionsSorting.Created);
+	}
 
-		// Input Needed
-		const aNeedsInput = sessionA.status === AgentSessionStatus.NeedsInput;
-		const bNeedsInput = sessionB.status === AgentSessionStatus.NeedsInput;
+	compare(sessionA: IAgentSession, sessionB: IAgentSession, prioritizeActiveSessions = false): number {
 
-		if (aNeedsInput && !bNeedsInput) {
-			return -1; // a (needs input) comes before b (other)
-		}
-		if (!aNeedsInput && bNeedsInput) {
-			return 1; // a (other) comes after b (needs input)
+		// Special sorting if enabled
+		if (prioritizeActiveSessions) {
+			const aNeedsInput = sessionA.status === AgentSessionStatus.NeedsInput;
+			const bNeedsInput = sessionB.status === AgentSessionStatus.NeedsInput;
+
+			if (aNeedsInput && !bNeedsInput) {
+				return -1; // a (needs input) comes before b (other)
+			}
+			if (!aNeedsInput && bNeedsInput) {
+				return 1; // a (other) comes after b (needs input)
+			}
 		}
 
 		// Archived
@@ -1182,15 +1539,29 @@ export class AgentSessionsSorter implements ITreeSorter<IAgentSession> {
 			return 1; // a (archived) comes after b (non-archived)
 		}
 
-		// Before we compare by time, allow override
-		const override = this.options?.overrideCompare?.(sessionA, sessionB);
-		if (typeof override === 'number') {
-			return override;
+		// Pinned (non-archived pinned sessions come before non-pinned)
+		const aPinned = !aArchived && sessionA.isPinned();
+		const bPinned = !bArchived && sessionB.isPinned();
+
+		if (aPinned && !bPinned) {
+			return -1;
+		}
+		if (!aPinned && bPinned) {
+			return 1;
 		}
 
-		// Sort by end or start time (most recent first)
-		const timeA = getAgentSessionTime(sessionA.timing);
-		const timeB = getAgentSessionTime(sessionB.timing);
+		// Sort by time
+		const sortBy = this.getSortBy();
+		const timeA = prioritizeActiveSessions
+			? sessionA.timing.lastRequestStarted ?? sessionA.timing.created
+			: sortBy === AgentSessionsSorting.Updated
+				? sessionA.timing.lastRequestEnded ?? sessionA.timing.created
+				: sessionA.timing.created;
+		const timeB = prioritizeActiveSessions
+			? sessionB.timing.lastRequestStarted ?? sessionB.timing.created
+			: sortBy === AgentSessionsSorting.Updated
+				? sessionB.timing.lastRequestEnded ?? sessionB.timing.created
+				: sessionB.timing.created;
 		return timeB - timeA;
 	}
 }
@@ -1202,6 +1573,14 @@ export class AgentSessionsKeyboardNavigationLabelProvider implements ICompressib
 			return element.label;
 		}
 
+		if (isAgentSessionShowMore(element)) {
+			return element.sectionLabel;
+		}
+
+		if (isAgentSessionShowLess(element)) {
+			return element.sectionLabel;
+		}
+
 		return element.label;
 	}
 
@@ -1225,8 +1604,8 @@ export class AgentSessionsDragAndDrop extends Disposable implements ITreeDragAnd
 	}
 
 	getDragURI(element: AgentSessionListItem): string | null {
-		if (isAgentSessionSection(element)) {
-			return null; // section headers are not draggable
+		if (isAgentSessionSection(element) || isAgentSessionShowMore(element) || isAgentSessionShowLess(element)) {
+			return null; // section headers, show-more and show-less items are not draggable
 		}
 
 		return element.resource.toString();
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts
index a5e80a2aa79..e3855988f0a 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts
@@ -90,26 +90,6 @@ export class ExitAgentSessionProjectionAction extends Action2 {
 
 //#endregion
 
-//#region Toggle Agent Status
-
-export class ToggleAgentStatusAction extends ToggleTitleBarConfigAction {
-	constructor() {
-		super(
-			ChatConfiguration.AgentStatusEnabled,
-			localize('toggle.agentStatus', 'Agent Status'),
-			localize('toggle.agentStatusDescription', "Toggle visibility of the Agent Status in title bar"), 6,
-			ContextKeyExpr.and(
-				ChatContextKeys.enabled,
-				IsCompactTitleBarContext.negate(),
-				ChatContextKeys.supported,
-				ContextKeyExpr.has('config.window.commandCenter')
-			)
-		);
-	}
-}
-
-//#endregion
-
 //#region Toggle Agent Quick Input
 
 export class ToggleUnifiedAgentsBarAction extends ToggleTitleBarConfigAction {
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts
index 07fec9b6d17..4e1d91d4927 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts
@@ -6,7 +6,7 @@
 import { registerSingleton, InstantiationType } from '../../../../../../platform/instantiation/common/extensions.js';
 import { MenuId, MenuRegistry, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
 import { IAgentSessionProjectionService, AgentSessionProjectionService, AGENT_SESSION_PROJECTION_ENABLED_PROVIDERS } from './agentSessionProjectionService.js';
-import { EnterAgentSessionProjectionAction, ExitAgentSessionProjectionAction, ToggleAgentStatusAction, ToggleUnifiedAgentsBarAction } from './agentSessionProjectionActions.js';
+import { EnterAgentSessionProjectionAction, ExitAgentSessionProjectionAction, ToggleUnifiedAgentsBarAction } from './agentSessionProjectionActions.js';
 import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
 import { AgentTitleBarStatusRendering } from './agentTitleBarStatusWidget.js';
 import { AgentTitleBarStatusService, IAgentTitleBarStatusService } from './agentTitleBarStatusService.js';
@@ -235,7 +235,6 @@ class AgentSessionReadyContribution extends Disposable implements IWorkbenchCont
 
 registerAction2(EnterAgentSessionProjectionAction);
 registerAction2(ExitAgentSessionProjectionAction);
-registerAction2(ToggleAgentStatusAction);
 registerAction2(ToggleUnifiedAgentsBarAction);
 
 registerSingleton(IAgentSessionProjectionService, AgentSessionProjectionService, InstantiationType.Delayed);
@@ -251,10 +250,8 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	icon: Codicon.chatSparkle,
 	when: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
-		ContextKeyExpr.or(
-			ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`),
-			ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
-		)
+		ContextKeyExpr.notEquals(`config.${ChatConfiguration.AgentStatusEnabled}`, 'hidden'),
+		ContextKeyExpr.notEquals(`config.${ChatConfiguration.AgentStatusEnabled}`, false)
 	),
 	order: 10002 // to the right of the chat button
 });
@@ -271,7 +268,6 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, {
 			ChatContextKeys.Setup.hidden.negate(),
 			ChatContextKeys.Setup.disabled.negate()
 		),
-		ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`),
 		ContextKeyExpr.has('config.window.commandCenter').negate(),
 	),
 	order: 1
@@ -283,13 +279,7 @@ MenuRegistry.appendMenuItem(MenuId.AgentsTitleBarControlMenu, {
 		id: 'workbench.action.chat.toggle',
 		title: localize('openChat', "Open Chat"),
 	},
-	when: ContextKeyExpr.and(
-		ChatContextKeys.enabled,
-		ContextKeyExpr.or(
-			ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`),
-			ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
-		)
-	),
+	when: ChatContextKeys.enabled,
 	group: 'a_open',
 	order: 1
 });
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts
index 86ec453b950..0ec54a9d165 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts
@@ -21,15 +21,10 @@ import { IAgentSessionsService } from '../agentSessionsService.js';
 import { AgentSessionStatus, IAgentSession, isSessionInProgressStatus } from '../agentSessionsModel.js';
 import { BaseActionViewItem, IBaseActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { IAction, Separator, SubmenuAction, toAction } from '../../../../../../base/common/actions.js';
-import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../../../platform/workspace/common/workspace.js';
-import { IBrowserWorkbenchEnvironmentService } from '../../../../../services/environment/browser/environmentService.js';
 import { IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
-import { Verbosity } from '../../../../../common/editor.js';
-import { Schemas } from '../../../../../../base/common/network.js';
 import { renderAsPlaintext } from '../../../../../../base/browser/markdownRenderer.js';
-import { openSession } from '../agentSessionsOpener.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../../../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
@@ -43,6 +38,7 @@ import { IActionViewItemService } from '../../../../../../platform/actions/brows
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { mainWindow } from '../../../../../../base/browser/window.js';
 import { LayoutSettings } from '../../../../../services/layout/browser/layoutService.js';
+import { WindowTitle } from '../../../../../browser/parts/titlebar/windowTitle.js';
 import { ChatConfiguration } from '../../../common/constants.js';
 import { ChatEntitlement, IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
 import { IChatWidgetService } from '../../chat.js';
@@ -62,7 +58,7 @@ type AgentStatusClickAction =
 	| 'exitProjection';
 
 type AgentStatusClickEvent = {
-	source: 'pill' | 'sparkle' | 'unread' | 'inProgress';
+	source: 'pill' | 'sparkle' | 'unread' | 'inProgress' | 'needsInput';
 	action: AgentStatusClickAction;
 };
 
@@ -84,8 +80,39 @@ const FILTER_STORAGE_KEY = 'agentSessions.filterExcludes.agentsessionsviewerfilt
 // Storage key for saving user's filter state before we override it
 const PREVIOUS_FILTER_STORAGE_KEY = 'agentSessions.filterExcludes.previousUserFilter';
 
-const NLS_EXTENSION_HOST = localize('devExtensionWindowTitlePrefix', "[Extension Development Host]");
-const TITLE_DIRTY = '\u25cf ';
+type AgentStatusSettingMode = 'hidden' | 'badge' | 'compact';
+
+function shouldForceHiddenAgentStatus(configurationService: IConfigurationService): boolean {
+	const aiFeaturesDisabled = configurationService.getValue<boolean>(ChatConfiguration.AIDisabled) === true;
+	const aiCustomizationsDisabled = configurationService.getValue<boolean>('disableAICustomizations') === true
+		|| configurationService.getValue<boolean>('workbench.disableAICustomizations') === true
+		|| configurationService.getValue<boolean>(ChatConfiguration.ChatCustomizationMenuEnabled) === false;
+
+	return aiFeaturesDisabled && aiCustomizationsDisabled;
+}
+
+function getAgentStatusSettingMode(configurationService: IConfigurationService): AgentStatusSettingMode {
+	if (shouldForceHiddenAgentStatus(configurationService)) {
+		return 'hidden';
+	}
+
+	const value = configurationService.getValue(ChatConfiguration.AgentStatusEnabled);
+
+	if (value === false || value === 'hidden') {
+		return 'hidden';
+	}
+
+	if (value === 'badge') {
+		return 'badge';
+	}
+
+	// Backward compatibility: previous experiments stored this as a boolean.
+	if (value === true || value === undefined || value === 'compact') {
+		return 'compact';
+	}
+
+	return 'compact';
+}
 
 /**
  * Agent Status Widget - renders agent status in the command center.
@@ -102,7 +129,6 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	private readonly _dynamicDisposables = this._register(new DisposableStore());
 
 	/** The currently displayed in-progress session (if any) - clicking pill opens this */
-	private _displayedSession: IAgentSession | undefined;
 
 	/** Cached render state to avoid unnecessary DOM rebuilds */
 	private _lastRenderState: string | undefined;
@@ -110,12 +136,13 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	/** Guard to prevent re-entrant rendering */
 	private _isRendering = false;
 
-	/** First focusable element for keyboard navigation */
-	private _firstFocusableElement: HTMLElement | undefined;
+	/** Roving tabindex elements for keyboard navigation */
+	private _rovingElements: HTMLElement[] = [];
+	private _rovingIndex: number = 0;
 
 	/** Tracks if this window applied a badge filter (unread/inProgress), so we only auto-clear our own filters */
 	// TODO: This is imperfect. Targetted fix for vscode#290863. We should revisit storing filter state per-window to avoid this
-	private _badgeFilterAppliedByThisWindow: 'unread' | 'inProgress' | null = null;
+	private _badgeFilterAppliedByThisWindow: 'unread' | 'inProgress' | 'needsInput' | null = null;
 
 	/** Reusable menu for CommandCenterCenter items (e.g., debug toolbar) */
 	private readonly _commandCenterMenu;
@@ -123,6 +150,9 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	/** Menu for ChatTitleBarMenu items (same as chat controls dropdown) */
 	private readonly _chatTitleBarMenu;
 
+	/** WindowTitle instance for honoring the user's window.title setting */
+	private readonly _windowTitle: WindowTitle;
+
 	constructor(
 		action: IAction,
 		options: IBaseActionViewItemOptions | undefined,
@@ -132,9 +162,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		@ICommandService private readonly commandService: ICommandService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
-		@ILabelService private readonly labelService: ILabelService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService,
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IMenuService private readonly menuService: IMenuService,
@@ -153,6 +181,9 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		// Create menu for ChatTitleBarMenu to show in sparkle section dropdown
 		this._chatTitleBarMenu = this._register(this.menuService.createMenu(MenuId.ChatTitleBarMenu, this.contextKeyService));
 
+		// Create WindowTitle to honor the user's window.title setting
+		this._windowTitle = this._register(this.instantiationService.createInstance(WindowTitle, mainWindow));
+
 		// Re-render when control mode or session info changes
 		this._register(this.agentTitleBarStatusService.onDidChangeMode(() => {
 			this._render();
@@ -167,6 +198,11 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 			this._render();
 		}));
 
+		// Re-render when window title changes (honors user's window.title setting)
+		this._register(this._windowTitle.onDidChange(() => {
+			this._render();
+		}));
+
 		// Re-render when active editor changes (for file name display when tabs are hidden)
 		this._register(this.editorService.onDidActiveEditorChange(() => {
 			this._render();
@@ -192,7 +228,15 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 		// Re-render when settings change
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.UnifiedAgentsBar) || e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled) || e.affectsConfiguration(ChatConfiguration.ChatViewSessionsEnabled)) {
+			if (
+				e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled)
+				|| e.affectsConfiguration(ChatConfiguration.UnifiedAgentsBar)
+				|| e.affectsConfiguration(ChatConfiguration.ChatViewSessionsEnabled)
+				|| e.affectsConfiguration(ChatConfiguration.AIDisabled)
+				|| e.affectsConfiguration(ChatConfiguration.ChatCustomizationMenuEnabled)
+				|| e.affectsConfiguration('disableAICustomizations')
+				|| e.affectsConfiguration('workbench.disableAICustomizations')
+			) {
 				this._lastRenderState = undefined; // Force re-render
 				this._render();
 			}
@@ -223,6 +267,8 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		super.render(container);
 		this._container = container;
 		container.classList.add('agent-status-container');
+		container.setAttribute('role', 'toolbar');
+		container.setAttribute('aria-label', localize('agentStatusToolbarLabel', "Agent Status"));
 		// Container should not be focusable - inner elements handle focus
 		container.tabIndex = -1;
 
@@ -237,8 +283,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	}
 
 	override focus(): void {
-		// Focus the first focusable child instead
-		this._firstFocusableElement?.focus();
+		this._rovingElements[this._rovingIndex]?.focus();
 	}
 
 	override blur(): void {
@@ -285,11 +330,10 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 			const label = this._getLabel();
 
 			// Get current filter state for state key
-			const { isFilteredToUnread, isFilteredToInProgress } = this._getCurrentFilterState();
+			const { isFilteredToUnread, isFilteredToInProgress, isFilteredToNeedsInput } = this._getCurrentFilterState();
 
-			// Check which settings are enabled (these are independent settings)
+			const statusMode = getAgentStatusSettingMode(this.configurationService);
 			const unifiedAgentsBarEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.UnifiedAgentsBar) === true;
-			const agentStatusEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true;
 			const viewSessionsEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled) !== false;
 
 			// Build state key for comparison
@@ -303,8 +347,9 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 				label,
 				isFilteredToUnread,
 				isFilteredToInProgress,
+				isFilteredToNeedsInput,
+				statusMode,
 				unifiedAgentsBarEnabled,
-				agentStatusEnabled,
 				viewSessionsEnabled,
 			});
 
@@ -317,9 +362,9 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 			// Clear existing content
 			reset(this._container);
 
-			// Clear previous disposables and focusable element for dynamic content
+			// Clear previous disposables and roving elements for dynamic content
 			this._dynamicDisposables.clear();
-			this._firstFocusableElement = undefined;
+			this._rovingElements = [];
 
 			if (this.agentTitleBarStatusService.mode === AgentStatusMode.Session) {
 				// Agent Session Projection mode - show session title + close button
@@ -327,19 +372,77 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 			} else if (this.agentTitleBarStatusService.mode === AgentStatusMode.SessionReady) {
 				// Session ready mode - show session title + enter projection button
 				this._renderSessionReadyMode(this._dynamicDisposables);
-			} else if (unifiedAgentsBarEnabled) {
-				// Unified Agents Bar - show full pill with label + status badge
+			} else if (statusMode === 'compact') {
+				// Compact mode - replace command center search with integrated control
 				this._renderChatInputMode(this._dynamicDisposables);
-			} else if (agentStatusEnabled) {
-				// Agent Status - show only the status badge (sparkle + unread/active counts)
-				this._renderBadgeOnlyMode(this._dynamicDisposables);
+			} else if (statusMode === 'badge') {
+				// Badge mode - render status badge next to command center search
+				this._renderStatusBadge(this._dynamicDisposables, activeSessions, unreadSessions, attentionNeededSessions);
 			}
-			// If neither setting is enabled, nothing is rendered (container is already cleared)
+			// Hidden mode intentionally renders nothing.
+
+			// Setup roving tabindex for keyboard navigation
+			this._setupRovingTabIndex(this._dynamicDisposables);
 		} finally {
 			this._isRendering = false;
 		}
 	}
 
+	/**
+	 * Setup roving tabindex for arrow key navigation between interactive elements.
+	 * Uses the elements registered in `this._rovingElements` in their existing order.
+	 */
+	private _setupRovingTabIndex(disposables: DisposableStore): void {
+		if (!this._container || this._rovingElements.length === 0) {
+			return;
+		}
+
+		if (this._rovingIndex >= this._rovingElements.length) {
+			this._rovingIndex = 0;
+		}
+		for (let i = 0; i < this._rovingElements.length; i++) {
+			this._rovingElements[i].tabIndex = i === this._rovingIndex ? 0 : -1;
+		}
+
+		disposables.add(addDisposableListener(this._container, EventType.KEY_DOWN, (e) => {
+			const index = this._rovingElements.findIndex(el => el === e.target || el.contains(e.target as Node));
+			if (index === -1) {
+				return;
+			}
+
+			const nextIndex = this._getNextRovingIndex(index, e.key);
+			if (nextIndex !== undefined && nextIndex !== index) {
+				e.preventDefault();
+				e.stopPropagation();
+				this._moveRovingFocus(index, nextIndex);
+			}
+		}));
+	}
+
+	/**
+	 * Moves roving focus from `currentIndex` to `nextIndex`, updating tabIndex and focusing the element.
+	 */
+	private _moveRovingFocus(currentIndex: number, nextIndex: number): void {
+		this._rovingElements[currentIndex].tabIndex = -1;
+		this._rovingElements[nextIndex].tabIndex = 0;
+		this._rovingElements[nextIndex].focus();
+		this._rovingIndex = nextIndex;
+	}
+
+	/**
+	 * Returns the next roving index for the given key, or `undefined` if no navigation should occur.
+	 */
+	private _getNextRovingIndex(currentIndex: number, key: string): number | undefined {
+		const len = this._rovingElements.length;
+		switch (key) {
+			case 'ArrowRight': return (currentIndex + 1) % len;
+			case 'ArrowLeft': return (currentIndex - 1 + len) % len;
+			case 'Home': return 0;
+			case 'End': return len - 1;
+			default: return undefined;
+		}
+	}
+
 	// #region Session Statistics
 
 	/**
@@ -392,20 +495,20 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 		const { activeSessions, unreadSessions, attentionNeededSessions, hasAttentionNeeded } = this._getSessionStats();
 
-		// Render command center items (like debug toolbar) FIRST - to the left
-		this._renderCommandCenterToolbar(disposables);
-
 		// Create pill
 		const pill = $('div.agent-status-pill.chat-input-mode');
 		if (hasAttentionNeeded) {
 			pill.classList.add('needs-attention');
 		}
-		pill.setAttribute('role', 'button');
-		pill.setAttribute('aria-label', localize('openQuickAccess', "Open Quick Access"));
-		pill.tabIndex = 0;
-		this._firstFocusableElement = pill;
 		this._container.appendChild(pill);
 
+		// Render command center items (like debug toolbar) inside the pill
+		this._renderCommandCenterToolbar(disposables, pill);
+
+		// Compact mode is always true when rendering chat input mode (caller already checked for compact)
+		const isCompactMode = true;
+		pill.classList.toggle('compact-mode', isCompactMode);
+
 		// Left icon container (sparkle by default, report+count when attention needed, search on hover)
 		const leftIcon = $('span.agent-status-left-icon');
 		if (hasAttentionNeeded) {
@@ -418,82 +521,105 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		} else {
 			reset(leftIcon, renderIcon(Codicon.searchSparkle));
 		}
-		pill.appendChild(leftIcon);
+		if (!isCompactMode) {
+			pill.appendChild(leftIcon);
+		}
 
-		// Label (workspace name by default, placeholder on hover)
-		// Show attention progress or default label
+		// Input area wrapper - hover only activates here, not on badge sections
+		const inputArea = $('div.agent-status-input-area');
+		inputArea.setAttribute('role', 'button');
+		inputArea.setAttribute('aria-label', localize('openQuickAccess', "Open Quick Access"));
+		inputArea.tabIndex = 0;
+		this._rovingElements.push(inputArea);
+		pill.appendChild(inputArea);
+
+		// Label - always shows workspace name in compact mode
 		const label = $('span.agent-status-label');
-		const { session: attentionSession, progress: progressText } = this._getSessionNeedingAttention(attentionNeededSessions);
-		this._displayedSession = attentionSession;
+		const { progress: progressText } = this._getSessionNeedingAttention(attentionNeededSessions);
+		const defaultLabel = isCompactMode ? this._getLabel() : (progressText ?? this._getLabel());
 
-		const defaultLabel = progressText ?? this._getLabel();
-
-		if (progressText) {
+		if (!isCompactMode && progressText) {
 			label.classList.add('has-progress');
 		}
 
 		const hoverLabel = localize('askAnythingPlaceholder', "Ask anything or describe what to build");
 
 		label.textContent = defaultLabel;
-		pill.appendChild(label);
+		inputArea.appendChild(label);
 
-		// Send icon (hidden by default, shown on hover - only when not showing attention message)
-		const sendIcon = $('span.agent-status-send');
-		reset(sendIcon, renderIcon(Codicon.send));
-		sendIcon.classList.add('hidden');
-		pill.appendChild(sendIcon);
-
-		// Hover behavior - swap icon and label (only when showing default state).
-		// When progressText is defined (e.g. sessions need attention), keep the attention/progress
-		// message visible and do not replace it with the generic placeholder on hover.
-		if (!progressText) {
-			disposables.add(addDisposableListener(pill, EventType.MOUSE_ENTER, () => {
+		if (isCompactMode) {
+			// Compact mode: hover resets icon state but keeps workspace name
+			disposables.add(addDisposableListener(inputArea, EventType.MOUSE_ENTER, () => {
 				reset(leftIcon, renderIcon(Codicon.searchSparkle));
 				leftIcon.classList.remove('has-attention');
-				label.textContent = hoverLabel;
 				label.classList.remove('has-progress');
-				sendIcon.classList.remove('hidden');
 			}));
 
-			disposables.add(addDisposableListener(pill, EventType.MOUSE_LEAVE, () => {
+			disposables.add(addDisposableListener(inputArea, EventType.MOUSE_LEAVE, () => {
 				reset(leftIcon, renderIcon(Codicon.searchSparkle));
-				label.textContent = defaultLabel;
-				sendIcon.classList.add('hidden');
 			}));
+		} else {
+			// Send icon (hidden by default, shown on hover - only when not showing attention message)
+			const sendIcon = $('span.agent-status-send');
+			reset(sendIcon, renderIcon(Codicon.send));
+			sendIcon.classList.add('hidden');
+			inputArea.appendChild(sendIcon);
+
+			// Hover behavior - swap icon and label (only when showing default state).
+			if (!progressText) {
+				disposables.add(addDisposableListener(inputArea, EventType.MOUSE_ENTER, () => {
+					reset(leftIcon, renderIcon(Codicon.searchSparkle));
+					leftIcon.classList.remove('has-attention');
+					label.textContent = hoverLabel;
+					label.classList.remove('has-progress');
+					sendIcon.classList.remove('hidden');
+				}));
+
+				disposables.add(addDisposableListener(inputArea, EventType.MOUSE_LEAVE, () => {
+					reset(leftIcon, renderIcon(Codicon.searchSparkle));
+					label.textContent = defaultLabel;
+					sendIcon.classList.add('hidden');
+				}));
+			}
 		}
 
-		// Setup hover tooltip
+		// Setup hover tooltip on input area
 		const hoverDelegate = getDefaultHoverDelegate('mouse');
-		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, pill, () => {
-			if (this._displayedSession) {
-				return localize('openSessionTooltip', "Open session: {0}", this._displayedSession.label);
-			}
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, inputArea, () => {
 			const kbForTooltip = this.keybindingService.lookupKeybinding(UNIFIED_QUICK_ACCESS_ACTION_ID)?.getLabel();
 			return kbForTooltip
 				? localize('askTooltip', "Open Quick Access ({0})", kbForTooltip)
 				: localize('askTooltip2', "Open Quick Access");
 		}));
 
-		// Click handler - open displayed session if showing progress, otherwise open unified quick access
-		disposables.add(addDisposableListener(pill, EventType.CLICK, (e) => {
+		// Click handler - always open quick access in compact mode (attention sessions are handled by the badge)
+		disposables.add(addDisposableListener(inputArea, EventType.CLICK, (e) => {
 			e.preventDefault();
 			e.stopPropagation();
-			this._handlePillClick();
+			this.telemetryService.publicLog2<AgentStatusClickEvent, AgentStatusClickClassification>('agentStatusWidget.click', {
+				source: 'pill',
+				action: 'quickAccess',
+			});
+			const useUnifiedQuickAccess = this.configurationService.getValue<boolean>(ChatConfiguration.UnifiedAgentsBar) === true;
+			this.commandService.executeCommand(useUnifiedQuickAccess ? UNIFIED_QUICK_ACCESS_ACTION_ID : QUICK_OPEN_ACTION_ID);
 		}));
 
 		// Keyboard handler
-		disposables.add(addDisposableListener(pill, EventType.KEY_DOWN, (e) => {
+		disposables.add(addDisposableListener(inputArea, EventType.KEY_DOWN, (e) => {
 			if (e.key === 'Enter' || e.key === ' ') {
 				e.preventDefault();
 				e.stopPropagation();
-				this._handlePillClick();
+				this.telemetryService.publicLog2<AgentStatusClickEvent, AgentStatusClickClassification>('agentStatusWidget.click', {
+					source: 'pill',
+					action: 'quickAccess',
+				});
+				const useUnifiedQuickAccess = this.configurationService.getValue<boolean>(ChatConfiguration.UnifiedAgentsBar) === true;
+				this.commandService.executeCommand(useUnifiedQuickAccess ? UNIFIED_QUICK_ACCESS_ACTION_ID : QUICK_OPEN_ACTION_ID);
 			}
 		}));
 
-		// Status badge (separate rectangle on right) - only when Agent Status is enabled
-		if (this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true) {
-			this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
-		}
+		// In compact mode, render status badge inline within the pill
+		this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions, pill);
 	}
 
 	private _renderSessionMode(disposables: DisposableStore): void {
@@ -537,10 +663,8 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		disposables.add(addDisposableListener(pill, EventType.CLICK, exitHandler));
 		disposables.add(addDisposableListener(pill, EventType.MOUSE_DOWN, exitHandler));
 
-		// Status badge (separate rectangle on right) - only when Agent Status is enabled
-		if (this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true) {
-			this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
-		}
+		// Status badge (separate rectangle on right)
+		this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
 	}
 
 	/**
@@ -588,24 +712,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		disposables.add(addDisposableListener(pill, EventType.CLICK, enterHandler));
 		disposables.add(addDisposableListener(pill, EventType.MOUSE_DOWN, enterHandler));
 
-		// Status badge (separate rectangle on right) - only when Agent Status is enabled
-		if (this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true) {
-			this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
-		}
-	}
-
-	/**
-	 * Render badge-only mode - just the status badge without the full pill.
-	 * Used when Agent Status is enabled but Enhanced Agent Status is not.
-	 */
-	private _renderBadgeOnlyMode(disposables: DisposableStore): void {
-		if (!this._container) {
-			return;
-		}
-
-		const { activeSessions, unreadSessions, attentionNeededSessions } = this._getSessionStats();
-
-		// Status badge only - no pill, no command center toolbar
+		// Status badge (separate rectangle on right)
 		this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
 	}
 
@@ -618,8 +725,9 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	 * Filters out the quick open action since we provide our own search UI.
 	 * Adds a dot separator after the toolbar if content was rendered.
 	 */
-	private _renderCommandCenterToolbar(disposables: DisposableStore): void {
-		if (!this._container) {
+	private _renderCommandCenterToolbar(disposables: DisposableStore, parent?: HTMLElement): void {
+		const container = parent ?? this._container;
+		if (!container) {
 			return;
 		}
 
@@ -647,7 +755,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 		const hoverDelegate = getDefaultHoverDelegate('mouse');
 		const toolbarContainer = $('div.agent-status-command-center-toolbar');
-		this._container.appendChild(toolbarContainer);
+		container.appendChild(toolbarContainer);
 
 		const toolbar = this.instantiationService.createInstance(WorkbenchToolBar, toolbarContainer, {
 			hiddenItemStrategy: HiddenItemStrategy.NoHide,
@@ -660,10 +768,17 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 		toolbar.setActions(allActions);
 
-		// Add dot separator after the toolbar (matching command center style)
-		const separator = renderIcon(Codicon.circleSmallFilled);
-		separator.classList.add('agent-status-separator');
-		this._container.appendChild(separator);
+		// Add separator after the toolbar
+		if (parent) {
+			// Inside pill (compact mode): use a vertical line separator
+			const separator = $('span.agent-status-line-separator');
+			container.appendChild(separator);
+		} else {
+			// Outside pill: use dot separator (matching command center style)
+			const separator = renderIcon(Codicon.circleSmallFilled);
+			separator.classList.add('agent-status-separator');
+			container.appendChild(separator);
+		}
 	}
 
 	/**
@@ -680,9 +795,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		searchButton.setAttribute('role', 'button');
 		searchButton.setAttribute('aria-label', localize('openQuickOpen', "Open Quick Open"));
 		searchButton.tabIndex = 0;
-		if (!this._firstFocusableElement) {
-			this._firstFocusableElement = searchButton;
-		}
+		this._rovingElements.push(searchButton);
 		container.appendChild(searchButton);
 
 		// Setup hover
@@ -715,7 +828,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	 * Shows split UI with sparkle icon on left, then unread, needs-input, and active indicators.
 	 * Always renders the sparkle icon section.
 	 */
-	private _renderStatusBadge(disposables: DisposableStore, activeSessions: IAgentSession[], unreadSessions: IAgentSession[], attentionNeededSessions: IAgentSession[]): void {
+	private _renderStatusBadge(disposables: DisposableStore, activeSessions: IAgentSession[], unreadSessions: IAgentSession[], attentionNeededSessions: IAgentSession[], inlineContainer?: HTMLElement): void {
 		if (!this._container) {
 			return;
 		}
@@ -725,18 +838,21 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		const hasAttentionNeeded = attentionNeededSessions.length > 0;
 
 		// Auto-clear filter if the filtered category becomes empty if this window applied it
-		this._clearFilterIfCategoryEmpty(hasUnreadSessions, hasActiveSessions);
+		this._clearFilterIfCategoryEmpty(hasUnreadSessions, hasActiveSessions, hasAttentionNeeded);
 
-		const badge = $('div.agent-status-badge');
-		this._container.appendChild(badge);
+		// When inlineContainer is provided, render sections directly into it (compact mode)
+		// Otherwise, create a separate badge container
+		let badge: HTMLElement;
+		if (inlineContainer) {
+			badge = inlineContainer;
+		} else {
+			badge = $('div.agent-status-badge');
+			this._container.appendChild(badge);
+		}
 
 		// Sparkle dropdown button section (always visible on left) - proper button with dropdown menu
 		const sparkleContainer = $('span.agent-status-badge-section.sparkle');
 		sparkleContainer.tabIndex = 0;
-		if (!this._firstFocusableElement) {
-			this._firstFocusableElement = sparkleContainer;
-		}
-		badge.appendChild(sparkleContainer);
 
 		// Get menu actions for dropdown with proper group separators
 		const menuActions: IAction[] = Separator.join(...this._chatTitleBarMenu.getActions({ shouldForwardArgs: true }).map(([, actions]) => actions));
@@ -792,6 +908,23 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		sparkleDropdown.render(sparkleContainer);
 		disposables.add(sparkleDropdown);
 
+		// Capture-phase listener for ArrowLeft/ArrowRight/Home/End to prevent DropdownWithPrimaryActionViewItem
+		// from consuming these keys internally. This ensures the outer roving tabindex handles navigation.
+		disposables.add(addDisposableListener(sparkleContainer, EventType.KEY_DOWN, (e) => {
+			if (e.key === 'ArrowLeft' || e.key === 'ArrowRight' || e.key === 'Home' || e.key === 'End') {
+				const idx = this._rovingElements.indexOf(sparkleContainer);
+				if (idx === -1) {
+					return;
+				}
+				const nextIndex = this._getNextRovingIndex(idx, e.key);
+				if (nextIndex !== undefined && nextIndex !== idx) {
+					e.preventDefault();
+					e.stopImmediatePropagation();
+					this._moveRovingFocus(idx, nextIndex);
+				}
+			}
+		}, true /* useCapture */));
+
 		// Add keyboard handler for Enter/Space on the sparkle container
 		disposables.add(addDisposableListener(sparkleContainer, EventType.KEY_DOWN, (e) => {
 			if (e.key === 'Enter' || e.key === ' ') {
@@ -812,10 +945,25 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		// Only show status indicators if chat.viewSessions.enabled is true
 		const viewSessionsEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled) !== false;
 
+		// When compact mode is active, show status indicators before the sparkle button:
+		// [needs-input, active, unread, sparkle] (populating inward)
+		// Otherwise, keep original order: [sparkle, unread, active, needs-input]
+		const reverseOrder = !!inlineContainer;
+
+		if (!reverseOrder) {
+			// Original order: sparkle first
+			badge.appendChild(sparkleContainer);
+		}
+
+		// Build status sections but don't append yet - we need to control order
+		let unreadSection: HTMLElement | undefined;
+		let activeSection: HTMLElement | undefined;
+		let needsInputSection: HTMLElement | undefined;
+
 		// Unread section (blue dot + count)
 		if (viewSessionsEnabled && hasUnreadSessions && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
 			const { isFilteredToUnread } = this._getCurrentFilterState();
-			const unreadSection = $('span.agent-status-badge-section.unread');
+			unreadSection = $('span.agent-status-badge-section.unread');
 			if (isFilteredToUnread) {
 				unreadSection.classList.add('filtered');
 			}
@@ -827,7 +975,6 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 			const unreadCount = $('span.agent-status-text');
 			unreadCount.textContent = String(unreadSessions.length);
 			unreadSection.appendChild(unreadCount);
-			badge.appendChild(unreadSection);
 
 			// Click handler - filter to unread sessions
 			disposables.add(addDisposableListener(unreadSection, EventType.CLICK, (e) => {
@@ -850,30 +997,58 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 			disposables.add(this.hoverService.setupManagedHover(hoverDelegate, unreadSection, unreadTooltip));
 		}
 
-		// In-progress/Needs-input section - shows "needs input" state when any session needs attention,
-		// otherwise shows "in progress" state. This is a single section that transforms based on state.
-		if (viewSessionsEnabled && hasActiveSessions) {
-			const { isFilteredToInProgress } = this._getCurrentFilterState();
-			const activeSection = $('span.agent-status-badge-section.active');
-			if (hasAttentionNeeded) {
-				activeSection.classList.add('needs-input');
+		// Needs-input section - shows sessions requiring user attention (approval/confirmation/input)
+		if (viewSessionsEnabled && hasAttentionNeeded) {
+			const { isFilteredToNeedsInput } = this._getCurrentFilterState();
+			needsInputSection = $('span.agent-status-badge-section.active.needs-input');
+			if (isFilteredToNeedsInput) {
+				needsInputSection.classList.add('filtered');
 			}
+			needsInputSection.setAttribute('role', 'button');
+			needsInputSection.tabIndex = 0;
+			const needsInputIcon = $('span.agent-status-icon');
+			reset(needsInputIcon, renderIcon(Codicon.report));
+			needsInputSection.appendChild(needsInputIcon);
+			const needsInputCount = $('span.agent-status-text');
+			needsInputCount.textContent = String(attentionNeededSessions.length);
+			needsInputSection.appendChild(needsInputCount);
+
+			disposables.add(addDisposableListener(needsInputSection, EventType.CLICK, (e) => {
+				e.preventDefault();
+				e.stopPropagation();
+				this._openSessionsWithFilter('needsInput');
+			}));
+			disposables.add(addDisposableListener(needsInputSection, EventType.KEY_DOWN, (e) => {
+				if (e.key === 'Enter' || e.key === ' ') {
+					e.preventDefault();
+					e.stopPropagation();
+					this._openSessionsWithFilter('needsInput');
+				}
+			}));
+
+			const needsInputTooltip = attentionNeededSessions.length === 1
+				? localize('needsInputSessionsTooltip1', "{0} session needs input", attentionNeededSessions.length)
+				: localize('needsInputSessionsTooltip', "{0} sessions need input", attentionNeededSessions.length);
+			disposables.add(this.hoverService.setupManagedHover(hoverDelegate, needsInputSection, needsInputTooltip));
+		}
+
+		// In-progress section - shows sessions that are actively running (excludes needs-input)
+		const inProgressOnly = activeSessions.filter(s => s.status !== AgentSessionStatus.NeedsInput);
+		if (viewSessionsEnabled && inProgressOnly.length > 0) {
+			const { isFilteredToInProgress } = this._getCurrentFilterState();
+			activeSection = $('span.agent-status-badge-section.active');
 			if (isFilteredToInProgress) {
 				activeSection.classList.add('filtered');
 			}
 			activeSection.setAttribute('role', 'button');
 			activeSection.tabIndex = 0;
 			const statusIcon = $('span.agent-status-icon');
-			// Show report icon when needs input, otherwise session-in-progress icon
-			reset(statusIcon, renderIcon(hasAttentionNeeded ? Codicon.report : Codicon.sessionInProgress));
+			reset(statusIcon, renderIcon(Codicon.sessionInProgress));
 			activeSection.appendChild(statusIcon);
 			const statusCount = $('span.agent-status-text');
-			// Show needs-input count when attention needed, otherwise total active count
-			statusCount.textContent = String(hasAttentionNeeded ? attentionNeededSessions.length : activeSessions.length);
+			statusCount.textContent = String(inProgressOnly.length);
 			activeSection.appendChild(statusCount);
-			badge.appendChild(activeSection);
 
-			// Click handler - filter to in-progress sessions
 			disposables.add(addDisposableListener(activeSection, EventType.CLICK, (e) => {
 				e.preventDefault();
 				e.stopPropagation();
@@ -887,17 +1062,28 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 				}
 			}));
 
-			// Hover tooltip - different message based on state
-			const activeTooltip = hasAttentionNeeded
-				? (attentionNeededSessions.length === 1
-					? localize('needsInputSessionsTooltip1', "{0} session needs input", attentionNeededSessions.length)
-					: localize('needsInputSessionsTooltip', "{0} sessions need input", attentionNeededSessions.length))
-				: (activeSessions.length === 1
-					? localize('activeSessionsTooltip1', "{0} session in progress", activeSessions.length)
-					: localize('activeSessionsTooltip', "{0} sessions in progress", activeSessions.length));
+			const activeTooltip = inProgressOnly.length === 1
+				? localize('activeSessionsTooltip1', "{0} session in progress", inProgressOnly.length)
+				: localize('activeSessionsTooltip', "{0} sessions in progress", inProgressOnly.length);
 			disposables.add(this.hoverService.setupManagedHover(hoverDelegate, activeSection, activeTooltip));
 		}
 
+		// Append status sections in the correct order and register for roving tabindex
+		if (reverseOrder) {
+			// [needs-input, active, unread, sparkle] — populates inward
+			if (needsInputSection) { badge.appendChild(needsInputSection); this._rovingElements.push(needsInputSection); }
+			if (activeSection) { badge.appendChild(activeSection); this._rovingElements.push(activeSection); }
+			if (unreadSection) { badge.appendChild(unreadSection); this._rovingElements.push(unreadSection); }
+			badge.appendChild(sparkleContainer);
+			this._rovingElements.push(sparkleContainer);
+		} else {
+			// Original: [sparkle (already appended), unread, active, needs-input]
+			this._rovingElements.push(sparkleContainer);
+			if (unreadSection) { badge.appendChild(unreadSection); this._rovingElements.push(unreadSection); }
+			if (activeSection) { badge.appendChild(activeSection); this._rovingElements.push(activeSection); }
+			if (needsInputSection) { badge.appendChild(needsInputSection); this._rovingElements.push(needsInputSection); }
+		}
+
 	}
 
 	/**
@@ -905,31 +1091,35 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	 * For example, if filtered to "unread" but no unread sessions exist, restore user's previous filter.
 	 * Only auto-clears if THIS window applied the badge filter to avoid cross-window interference.
 	 */
-	private _clearFilterIfCategoryEmpty(hasUnreadSessions: boolean, hasActiveSessions: boolean): void {
+	private _clearFilterIfCategoryEmpty(hasUnreadSessions: boolean, hasActiveSessions: boolean, hasAttentionNeeded: boolean): void {
 		// Only auto-clear if this window applied the badge filter
 		// This prevents Window B from clearing filters that Window A set
 		if (this._badgeFilterAppliedByThisWindow === 'unread' && !hasUnreadSessions) {
 			this._restoreUserFilter();
 		} else if (this._badgeFilterAppliedByThisWindow === 'inProgress' && !hasActiveSessions) {
 			this._restoreUserFilter();
+		} else if (this._badgeFilterAppliedByThisWindow === 'needsInput' && !hasAttentionNeeded) {
+			this._restoreUserFilter();
 		}
 	}
 
 	/**
 	 * Get the current filter state from storage.
 	 */
-	private _getCurrentFilterState(): { isFilteredToUnread: boolean; isFilteredToInProgress: boolean } {
+	private _getCurrentFilterState(): { isFilteredToUnread: boolean; isFilteredToInProgress: boolean; isFilteredToNeedsInput: boolean } {
 		const filter = this._getStoredFilter();
 		if (!filter) {
-			return { isFilteredToUnread: false, isFilteredToInProgress: false };
+			return { isFilteredToUnread: false, isFilteredToInProgress: false, isFilteredToNeedsInput: false };
 		}
 
 		// Detect if filtered to unread (read=true excludes read sessions, leaving only unread)
 		const isFilteredToUnread = filter.read === true && filter.states.length === 0;
-		// Detect if filtered to in-progress (2 excluded states = Completed + Failed)
-		const isFilteredToInProgress = filter.states?.length === 2 && filter.read === false;
+		// Detect if filtered to in-progress only (3 excluded states including NeedsInput)
+		const isFilteredToInProgress = filter.states?.length === 3 && filter.states.includes(AgentSessionStatus.NeedsInput) && filter.read === false;
+		// Detect if filtered to needs-input only (3 excluded states including InProgress)
+		const isFilteredToNeedsInput = filter.states?.length === 3 && filter.states.includes(AgentSessionStatus.InProgress) && filter.read === false;
 
-		return { isFilteredToUnread, isFilteredToInProgress };
+		return { isFilteredToUnread, isFilteredToInProgress, isFilteredToNeedsInput };
 	}
 
 	/**
@@ -972,11 +1162,11 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	 * This preserves the original user filter when switching between badge filters.
 	 */
 	private _saveUserFilter(): void {
-		const { isFilteredToUnread, isFilteredToInProgress } = this._getCurrentFilterState();
+		const { isFilteredToUnread, isFilteredToInProgress, isFilteredToNeedsInput } = this._getCurrentFilterState();
 
 		// Don't overwrite the saved filter if we're already in a badge-filtered state
 		// The previous user filter should already be saved
-		if (isFilteredToUnread || isFilteredToInProgress) {
+		if (isFilteredToUnread || isFilteredToInProgress || isFilteredToNeedsInput) {
 			return;
 		}
 
@@ -1012,56 +1202,54 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	/**
 	 * Opens the agent sessions view with a specific filter applied, or restores previous filter if already applied.
 	 * Preserves session type (provider) filters while toggling only status filters.
-	 * @param filterType 'unread' to show only unread sessions, 'inProgress' to show only in-progress sessions
 	 */
-	private _openSessionsWithFilter(filterType: 'unread' | 'inProgress'): void {
-		const { isFilteredToUnread, isFilteredToInProgress } = this._getCurrentFilterState();
+	private _openSessionsWithFilter(filterType: 'unread' | 'inProgress' | 'needsInput'): void {
+		const { isFilteredToUnread, isFilteredToInProgress, isFilteredToNeedsInput } = this._getCurrentFilterState();
 		const currentFilter = this._getStoredFilter();
 		// Preserve existing provider filters (session type filters like Local, Background, etc.)
 		const preservedProviders = currentFilter?.providers ?? [];
 
 		// Log telemetry for filter button clicks
-		const isToggleOff = (filterType === 'unread' && isFilteredToUnread) || (filterType === 'inProgress' && isFilteredToInProgress);
+		const isToggleOff = (filterType === 'unread' && isFilteredToUnread)
+			|| (filterType === 'inProgress' && isFilteredToInProgress)
+			|| (filterType === 'needsInput' && isFilteredToNeedsInput);
 		this.telemetryService.publicLog2<AgentStatusClickEvent, AgentStatusClickClassification>('agentStatusWidget.click', {
 			source: filterType,
 			action: isToggleOff ? 'clearFilter' : 'applyFilter',
 		});
 
-		// Toggle filter based on current state
-		if (filterType === 'unread') {
-			if (isFilteredToUnread) {
-				// Already filtered to unread - restore user's previous filter
-				this._restoreUserFilter();
-			} else {
-				// Save current filter before applying our own
-				this._saveUserFilter();
-				// Exclude read sessions to show only unread, preserving provider filters
+		// Check if already filtered to this type — toggle off
+		if (isToggleOff) {
+			this._restoreUserFilter();
+		} else {
+			// Save current filter before applying our own
+			this._saveUserFilter();
+
+			if (filterType === 'unread') {
 				this._storeFilter({
 					providers: preservedProviders,
 					states: [],
 					archived: true,
 					read: true
 				});
-				// Track that this window applied the badge filter
-				this._badgeFilterAppliedByThisWindow = 'unread';
-			}
-		} else {
-			if (isFilteredToInProgress) {
-				// Already filtered to in-progress - restore user's previous filter
-				this._restoreUserFilter();
-			} else {
-				// Save current filter before applying our own
-				this._saveUserFilter();
-				// Exclude Completed and Failed to show InProgress and NeedsInput, preserving provider filters
+			} else if (filterType === 'inProgress') {
+				// Exclude Completed, Failed, and NeedsInput — show only InProgress
 				this._storeFilter({
 					providers: preservedProviders,
-					states: [AgentSessionStatus.Completed, AgentSessionStatus.Failed],
+					states: [AgentSessionStatus.Completed, AgentSessionStatus.Failed, AgentSessionStatus.NeedsInput],
+					archived: true,
+					read: false
+				});
+			} else {
+				// Exclude Completed, Failed, and InProgress — show only NeedsInput
+				this._storeFilter({
+					providers: preservedProviders,
+					states: [AgentSessionStatus.Completed, AgentSessionStatus.Failed, AgentSessionStatus.InProgress],
 					archived: true,
 					read: false
 				});
-				// Track that this window applied the badge filter
-				this._badgeFilterAppliedByThisWindow = 'inProgress';
 			}
+			this._badgeFilterAppliedByThisWindow = filterType;
 		}
 
 		// Open the sessions view
@@ -1077,6 +1265,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		escButton.setAttribute('role', 'button');
 		escButton.setAttribute('aria-label', localize('exitAgentSessionProjection', "Exit Agent Session Projection"));
 		escButton.tabIndex = 0;
+		this._rovingElements.push(escButton);
 		parent.appendChild(escButton);
 
 		// Setup hover
@@ -1117,9 +1306,7 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		enterButton.setAttribute('role', 'button');
 		enterButton.setAttribute('aria-label', localize('enterAgentSessionProjection', "Enter Agent Session Projection"));
 		enterButton.tabIndex = 0;
-		if (!this._firstFocusableElement) {
-			this._firstFocusableElement = enterButton;
-		}
+		this._rovingElements.push(enterButton);
 		parent.appendChild(enterButton);
 
 		// Setup hover
@@ -1156,29 +1343,6 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 	// #endregion
 
-	// #region Click Handlers
-
-	/**
-	 * Handle pill click - opens the displayed session if showing progress, otherwise opens unified quick access
-	 */
-	private _handlePillClick(): void {
-		if (this._displayedSession) {
-			this.telemetryService.publicLog2<AgentStatusClickEvent, AgentStatusClickClassification>('agentStatusWidget.click', {
-				source: 'pill',
-				action: 'openSession',
-			});
-			this.instantiationService.invokeFunction(openSession, this._displayedSession);
-		} else {
-			this.telemetryService.publicLog2<AgentStatusClickEvent, AgentStatusClickClassification>('agentStatusWidget.click', {
-				source: 'pill',
-				action: 'quickAccess',
-			});
-			this.commandService.executeCommand(UNIFIED_QUICK_ACCESS_ACTION_ID);
-		}
-	}
-
-	// #endregion
-
 	// #region Session Helpers
 
 	/**
@@ -1215,24 +1379,23 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 	// #region Label Helpers
 
 	/**
-	 * Compute the label to display, matching the command center behavior.
-	 * Includes prefix and suffix decorations (remote host, extension dev host, etc.)
+	 * Compute the label to display in the command center.
+	 * Uses the workspace name (folder name) with prefix/suffix decorations.
+	 * Falls back to file name when tabs are hidden, or "Search" when empty.
 	 */
 	private _getLabel(): string {
-		const { prefix, suffix } = this._getTitleDecorations();
+		const { prefix, suffix } = this._windowTitle.getTitleDecorations();
 
-		// Base label: workspace name or file name (when tabs are hidden)
-		let label = this.labelService.getWorkspaceLabel(this.workspaceContextService.getWorkspace());
-		if (this.editorGroupsService.partOptions.showTabs === 'none') {
-			const activeEditor = this.editorService.activeEditor;
-			if (activeEditor) {
-				const dirty = activeEditor.isDirty() && !activeEditor.isSaving() ? TITLE_DIRTY : '';
-				label = `${dirty}${activeEditor.getTitle(Verbosity.SHORT)}`;
-			}
+		// Base label: custom title, workspace name, or file name when tabs are hidden
+		let label = this._windowTitle.workspaceName;
+		if (this._windowTitle.isCustomTitleFormat()) {
+			label = this._windowTitle.getWindowTitle();
+		} else if (!label && this.editorGroupsService.partOptions.showTabs === 'none') {
+			label = this._windowTitle.fileName ?? '';
 		}
 
 		if (!label) {
-			label = localize('agentStatusWidget.askAnything', "Ask anything...");
+			label = localize('agentStatusWidget.search', "Search");
 		}
 
 		// Apply prefix and suffix decorations
@@ -1246,28 +1409,6 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 		return label.replaceAll(/\r\n|\r|\n/g, '\u23CE');
 	}
 
-	/**
-	 * Get prefix and suffix decorations for the title (matching WindowTitle behavior)
-	 */
-	private _getTitleDecorations(): { prefix: string | undefined; suffix: string | undefined } {
-		let prefix: string | undefined;
-		const suffix: string | undefined = undefined;
-
-		// Add remote host label if connected to a remote
-		if (this.environmentService.remoteAuthority) {
-			prefix = this.labelService.getHostLabel(Schemas.vscodeRemote, this.environmentService.remoteAuthority);
-		}
-
-		// Add extension development host prefix
-		if (this.environmentService.isExtensionDevelopment) {
-			prefix = !prefix
-				? NLS_EXTENSION_HOST
-				: `${NLS_EXTENSION_HOST} - ${prefix}`;
-		}
-
-		return { prefix, suffix };
-	}
-
 	// #endregion
 }
 
@@ -1284,7 +1425,8 @@ export class AgentTitleBarStatusRendering extends Disposable implements IWorkben
 	constructor(
 		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
 
@@ -1295,19 +1437,38 @@ export class AgentTitleBarStatusRendering extends Disposable implements IWorkben
 			return instantiationService.createInstance(AgentTitleBarStatusWidget, action, options);
 		}, undefined));
 
-		// Add/remove CSS classes on workbench based on settings
-		// Force enable command center and disable chat controls when agent status or unified agents bar is enabled
+		// Add/remove CSS classes on workbench based on settings.
+		// Only hide the default command center search box (via unified-agents-bar)
+		// when chat is enabled, so the search box remains visible during remote
+		// connection startup before the agent status widget is ready to render.
+		const chatEnabledKey = contextKeyService.getContextKeyValue<boolean>('chatIsEnabled');
+		let chatEnabled = !!chatEnabledKey;
+
 		const updateClass = () => {
 			const commandCenterEnabled = configurationService.getValue<boolean>(LayoutSettings.COMMAND_CENTER) === true;
-			const enabled = configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true && commandCenterEnabled;
-			const enhanced = configurationService.getValue<boolean>(ChatConfiguration.UnifiedAgentsBar) === true && commandCenterEnabled;
+			const statusMode = getAgentStatusSettingMode(configurationService);
+			const enabled = commandCenterEnabled && chatEnabled && statusMode !== 'hidden';
+			const enhanced = enabled && statusMode === 'compact';
 
 			mainWindow.document.body.classList.toggle('agent-status-enabled', enabled);
 			mainWindow.document.body.classList.toggle('unified-agents-bar', enhanced);
 		};
 		updateClass();
 		this._register(configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled) || e.affectsConfiguration(ChatConfiguration.UnifiedAgentsBar) || e.affectsConfiguration(LayoutSettings.COMMAND_CENTER)) {
+			if (
+				e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled)
+				|| e.affectsConfiguration(LayoutSettings.COMMAND_CENTER)
+				|| e.affectsConfiguration(ChatConfiguration.AIDisabled)
+				|| e.affectsConfiguration(ChatConfiguration.ChatCustomizationMenuEnabled)
+				|| e.affectsConfiguration('disableAICustomizations')
+				|| e.affectsConfiguration('workbench.disableAICustomizations')
+			) {
+				updateClass();
+			}
+		}));
+		this._register(contextKeyService.onDidChangeContext(e => {
+			if (e.affectsSome(new Set(['chatIsEnabled']))) {
+				chatEnabled = !!contextKeyService.getContextKeyValue<boolean>('chatIsEnabled');
 				updateClass();
 			}
 		}));
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css
index 2da5d3bb06a..620950ec921 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css
@@ -65,13 +65,24 @@
 	border-color: var(--vscode-commandCenter-activeBorder, transparent);
 }
 
-.agent-status-pill.chat-input-mode {
+/* Compact mode: pill hover is handled by individual sections, not the whole pill */
+.agent-status-pill.compact-mode {
+	padding: 0;
+	gap: 0;
+	background-color: transparent;
+}
+
+.agent-status-pill.compact-mode:hover {
+	background-color: transparent;
+	border-color: var(--vscode-commandCenter-border, transparent);
+}
+
+.agent-status-pill.chat-input-mode:not(.compact-mode) {
 	cursor: pointer;
 }
 
-.agent-status-pill.chat-input-mode:focus {
-	outline: 1px solid var(--vscode-focusBorder);
-	outline-offset: -1px;
+.agent-status-pill.chat-input-mode .agent-status-input-area {
+	cursor: pointer;
 }
 
 .agent-status-pill.session-mode,
@@ -95,13 +106,53 @@
 	color: var(--vscode-commandCenter-activeForeground);
 }
 
-/* Label */
+/* Label - styled as placeholder text */
 .agent-status-label {
 	flex: 1;
 	text-align: center;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	opacity: 0.6;
+}
+
+/* Compact mode: left-aligned label, no icon */
+.agent-status-pill.compact-mode .agent-status-label {
+	text-align: left;
+}
+
+/* Compact mode: inline status sections inside the pill */
+.agent-status-pill.compact-mode .agent-status-badge-section {
+	flex-shrink: 0;
+}
+
+/* Input hover target - only this area triggers hover, not badge sections */
+.agent-status-pill .agent-status-input-area {
+	display: flex;
+	align-items: center;
+	flex: 1;
+	min-width: 0;
+	overflow: hidden;
+	cursor: pointer;
+	gap: 6px;
+	border-radius: 5px 0 0 5px;
+	height: 100%;
+	padding: 0 10px;
+	background-color: var(--vscode-agentStatusIndicator-background);
+}
+
+/* When preceded by a toolbar/separator, remove left border-radius */
+.agent-status-line-separator + .agent-status-input-area {
+	border-radius: 0;
+}
+
+.agent-status-pill .agent-status-input-area:hover {
+	background-color: var(--vscode-commandCenter-activeBackground);
+}
+
+.agent-status-pill .agent-status-input-area:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
 }
 
 .agent-status-label.has-progress {
@@ -203,6 +254,9 @@
 	display: flex;
 	align-items: center;
 	-webkit-app-region: no-drag;
+	height: 100%;
+	background-color: var(--vscode-agentStatusIndicator-background);
+	border-radius: 5px 0 0 5px;
 }
 
 .agent-status-separator {
@@ -212,6 +266,16 @@
 	align-items: center;
 }
 
+/* Vertical line separator used inside the pill in compact+debug mode */
+.agent-status-line-separator {
+	width: 1px;
+	align-self: stretch;
+	margin: 4px 0;
+	background-color: var(--vscode-commandCenter-border, rgba(128, 128, 128, 0.35));
+	flex-shrink: 0;
+	pointer-events: none;
+}
+
 /* Status Badge */
 .agent-status-badge {
 	display: flex;
@@ -235,6 +299,7 @@
 	height: 100%;
 	position: relative;
 	cursor: pointer;
+	background-color: var(--vscode-agentStatusIndicator-background);
 }
 
 .agent-status-badge-section:first-child { border-radius: 5px 0 0 5px; }
@@ -281,7 +346,8 @@
 }
 
 /* Separator between sections */
-.agent-status-badge-section + .agent-status-badge-section::before {
+.agent-status-badge-section + .agent-status-badge-section::before,
+.agent-status-input-area + .agent-status-badge-section::before {
 	content: '';
 	position: absolute;
 	left: 0;
@@ -317,10 +383,16 @@
 }
 
 .agent-status-badge-section.sparkle .action-container {
-	padding: 0 4px;
+	padding: 0 5px;
 	border-radius: 5px 0 0 5px;
 }
 
+/* In compact mode, no left radius on sparkle - it sits flush next to other sections */
+.agent-status-pill.compact-mode .agent-status-badge-section.sparkle .action-container {
+	border-radius: 0;
+	padding: 0 5px 0 6px;
+}
+
 .agent-status-badge-section.sparkle .dropdown-action-container {
 	width: 18px;
 	padding: 0;
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.ts
index 569dffd129c..0b8c5259143 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsController.ts
@@ -10,12 +10,14 @@ import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { IChatModel } from '../../common/model/chatModel.js';
-import { convertLegacyChatSessionTiming, IChatDetail, IChatService, ResponseModelState } from '../../common/chatService/chatService.js';
-import { ChatSessionStatus, IChatSessionItem, IChatSessionItemController, IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
-import { getChatSessionType } from '../../common/model/chatUri.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { convertLegacyChatSessionTiming, IChatDetail, IChatService, ResponseModelState } from '../../common/chatService/chatService.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta, IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
+import { IChatModel } from '../../common/model/chatModel.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
 
 export class LocalAgentsSessionsController extends Disposable implements IChatSessionItemController, IWorkbenchContribution {
 
@@ -26,7 +28,7 @@ export class LocalAgentsSessionsController extends Disposable implements IChatSe
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange = this._onDidChange.event;
 
-	readonly _onDidChangeChatSessionItems = this._register(new Emitter<void>());
+	readonly _onDidChangeChatSessionItems = this._register(new Emitter<IChatSessionItemsDelta>());
 	readonly onDidChangeChatSessionItems = this._onDidChangeChatSessionItems.event;
 
 	constructor(
@@ -51,20 +53,30 @@ export class LocalAgentsSessionsController extends Disposable implements IChatSe
 	}
 
 	private registerListeners(): void {
-		const refreshItems = async () => {
-			this._onDidChangeChatSessionItems.fire();
+		this._register(this.chatService.registerChatModelChangeListeners(Schemas.vscodeLocalChatSession, async sessionResource => {
+			if (getChatSessionType(sessionResource) !== this.chatSessionType) {
+				return;
+			}
+
+			// TODO: This gets fired too often
 			await this.refresh(CancellationToken.None);
-			this._onDidChangeChatSessionItems.fire();
-		};
+			const item = this.getItem(sessionResource);
 
-		this._register(this.chatService.registerChatModelChangeListeners(Schemas.vscodeLocalChatSession, refreshItems));
-
-		this._register(this.chatService.onDidDisposeSession(e => {
-			const session = e.sessionResource.filter(resource => getChatSessionType(resource) === this.chatSessionType);
-			if (session.length > 0) {
-				refreshItems();
+			if (item) {
+				this._onDidChangeChatSessionItems.fire({ addedOrUpdated: [item] });
 			}
 		}));
+
+		this._register(this.chatService.onDidDisposeSession(e => {
+			const removedSessionResources = e.sessionResource.filter(resource => getChatSessionType(resource) === this.chatSessionType);
+			if (removedSessionResources.length) {
+				this._onDidChangeChatSessionItems.fire({ removed: removedSessionResources });
+			}
+		}));
+	}
+
+	private getItem(sessionResource: URI): IChatSessionItem | undefined {
+		return this._items.find(item => isEqual(item.resource, sessionResource));
 	}
 
 	private async provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]> {
@@ -109,6 +121,9 @@ export class LocalAgentsSessionsController extends Disposable implements IChatSe
 			}
 
 			description = this.chatSessionsService.getInProgressSessionDescription(model);
+		} else if (chat.isActive) {
+			// Sessions that are active but don't have a chat model are ultimately untitled with no requests
+			return undefined;
 		}
 
 		return {
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
index 913a82d0e39..4243cea6160 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
@@ -13,6 +13,15 @@
 		padding: 0 6px;
 	}
 
+	.agent-sessions-workbench .pane-body & .monaco-scrollable-element {
+		padding: 0 12px;
+	}
+
+	.agent-sessions-workbench .pane-body & .monaco-tree-sticky-container {
+		left: 12px;
+		width: calc(100% - 24px);
+	}
+
 	.monaco-list-row {
 		border-radius: 6px;
 	}
@@ -35,11 +44,12 @@
 		.agent-session-diff-container {
 			.agent-session-diff-added,
 			.agent-session-diff-removed {
-					color: unset;
+				color: unset;
 			}
 		}
 	}
 
+	.monaco-list-row.selected .agent-session-item,
 	.monaco-list-row.selected .agent-session-title {
 		color: unset;
 	}
@@ -48,6 +58,19 @@
 		color: var(--vscode-descriptionForeground);
 	}
 
+	.monaco-list-row .agent-session-pinned-indicator {
+		display: none;
+		height: 16px;
+		align-items: center;
+		color: var(--vscode-descriptionForeground);
+		font-size: 12px;
+		pointer-events: none;
+
+		&.visible {
+			display: flex;
+		}
+	}
+
 	.monaco-list-row .agent-session-title-toolbar {
 		/* for the absolute positioning of the toolbar below */
 		position: relative;
@@ -62,9 +85,13 @@
 		}
 	}
 
-	/* On hover or keyboard focus: show toolbar */
+	/* On hover or keyboard focus: show toolbar, hide pinned indicator */
 	.monaco-list-row:hover,
-	.monaco-list-row.focused {
+	.monaco-list-row.focused:not(.selected) {
+
+		.agent-session-pinned-indicator {
+			display: none;
+		}
 
 		.agent-session-title-toolbar {
 			display: block;
@@ -112,17 +139,32 @@
 					color: var(--vscode-errorForeground);
 				}
 
-				&.codicon.codicon-report {
-					color: var(--vscode-textLink-foreground);
-				}
-
 				&.codicon.codicon-circle-filled {
 					color: var(--vscode-textLink-foreground);
 				}
 
+				&.codicon.codicon-circle-filled.needs-input {
+					color: var(--vscode-list-warningForeground);
+					animation: agent-session-needs-input-pulse 2s ease-in-out infinite;
+				}
+
 				&.codicon.codicon-circle-small-filled {
 					color: var(--vscode-agentSessionReadIndicator-foreground);
 				}
+
+				&.codicon.codicon-git-pull-request {
+					color: var(--vscode-charts-green);
+				}
+
+				&.codicon.codicon-git-merge {
+					color: var(--vscode-charts-purple);
+				}
+
+				@media (prefers-reduced-motion: reduce) {
+					&.codicon.codicon-circle-filled.needs-input {
+						animation: none;
+					}
+				}
 			}
 		}
 
@@ -148,6 +190,18 @@
 			max-height: 15px;
 			color: var(--vscode-descriptionForeground);
 
+			.agent-session-details-icon {
+				display: none;
+				font-size: 11px;
+				line-height: 1;
+				flex-shrink: 0;
+
+				&.visible {
+					display: flex;
+					align-items: center;
+				}
+			}
+
 			.rendered-markdown {
 				p {
 					display: flex;
@@ -207,10 +261,6 @@
 				&:not(.has-badge) {
 					display: none;
 				}
-
-				.codicon {
-					font-size: 11px;
-				}
 			}
 		}
 
@@ -223,17 +273,17 @@
 			text-overflow: ellipsis;
 		}
 
-		.agent-session-title {
-			font-size: 13px;
+		.agent-session-description:empty {
+			display: none;
 		}
 
-		.agent-session-details-right {
-			display: flex;
-			align-items: center;
-			gap: 4px;
-			margin-left: auto;
-			white-space: nowrap;
-			flex-shrink: 0;
+		.agent-session-description.has-separator::before {
+			content: '\00B7';
+			margin-right: 4px;
+		}
+
+		.agent-session-title {
+			font-size: 13px;
 		}
 
 		.agent-session-status {
@@ -242,14 +292,15 @@
 			font-variant-numeric: tabular-nums;
 			white-space: nowrap;
 
-			.agent-session-status-provider-icon {
-				font-size: 11px;
+			&.has-separator::before {
+				content: '\00B7';
 				margin-right: 4px;
-
-				&.hidden {
-					display: none;
-				}
 			}
+
+			&.hidden {
+				display: none;
+			}
+
 		}
 		.agent-session-approval-row {
 			display: none;
@@ -300,12 +351,24 @@
 		}
 	}
 
+	.agent-session-show-more {
+		display: flex;
+		align-items: center;
+		font-size: 12px;
+		color: var(--vscode-foreground);
+		/* align with session item text: 6px item padding + 16px icon + 6px main-col padding */
+		padding: 0 6px 0 24px;
+		cursor: pointer;
+		text-decoration: none !important;
+	}
+
 	.agent-session-section {
 		display: flex;
 		align-items: center;
 		font-size: 11px;
 		font-weight: 500;
 		color: var(--vscode-descriptionForeground);
+		text-transform: uppercase;
 		/* align with session item padding */
 		padding: 0 6px;
 
@@ -313,6 +376,11 @@
 			flex: 1;
 		}
 
+		.agent-session-section-count {
+			opacity: 0.7;
+			margin-right: 4px;
+		}
+
 		.agent-session-section-toolbar {
 			/* for the absolute positioning of the toolbar below */
 			position: relative;
@@ -327,8 +395,13 @@
 		}
 	}
 
+	.monaco-list-row:hover .agent-session-section .agent-session-section-count,
+	.monaco-list-row.focused:not(.selected) .agent-session-section .agent-session-section-count {
+		display: none;
+	}
+
 	.monaco-list-row:hover .agent-session-section .agent-session-section-toolbar,
-	.monaco-list-row.focused .agent-session-section .agent-session-section-toolbar {
+	.monaco-list-row.focused:not(.selected) .agent-session-section .agent-session-section-toolbar {
 		width: 22px;
 
 		.monaco-toolbar {
@@ -367,3 +440,12 @@
 		}
 	}
 }
+
+@keyframes agent-session-needs-input-pulse {
+	0%, 100% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0.4;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidget.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidget.ts
index f7b67fbc41f..95ce950e3dc 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidget.ts
@@ -5,22 +5,25 @@
 
 import './media/aiCustomizationManagement.css';
 import * as DOM from '../../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { autorun } from '../../../../../base/common/observable.js';
-import { basename, dirname, isEqualOrParent } from '../../../../../base/common/resources.js';
+import { basename, dirname, isEqual, isEqualOrParent } from '../../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
 import { IListVirtualDelegate, IListRenderer, IListContextMenuEvent } from '../../../../../base/browser/ui/list/list.js';
-import { IPromptsService, PromptsStorage, IPromptPath } from '../../common/promptSyntax/service/promptsService.js';
+import { IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
 import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
 import { agentIcon, instructionsIcon, promptIcon, skillIcon, hookIcon, userIcon, workspaceIcon, extensionIcon, pluginIcon, builtinIcon } from './aiCustomizationIcons.js';
-import { AICustomizationManagementItemMenuId, AICustomizationManagementSection, BUILTIN_STORAGE } from './aiCustomizationManagement.js';
+import { AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, AICustomizationManagementItemMenuId, AICustomizationManagementSection, BUILTIN_STORAGE, AI_CUSTOMIZATION_ITEM_DISABLED_KEY } from './aiCustomizationManagement.js';
+import { IAgentPluginService } from '../../common/plugins/agentPluginService.js';
 import { InputBox } from '../../../../../base/browser/ui/inputbox/inputBox.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { Delayer } from '../../../../../base/common/async.js';
@@ -31,13 +34,14 @@ import { IOpenerService } from '../../../../../platform/opener/common/opener.js'
 import { Button, ButtonWithDropdown } from '../../../../../base/browser/ui/button/button.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { getFlatContextMenuActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { createActionViewItem, getContextMenuActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IAICustomizationWorkspaceService, applyStorageSourceFilter } from '../../common/aiCustomizationWorkspaceService.js';
 import { Action, Separator } from '../../../../../base/common/actions.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IPathService } from '../../../../services/path/common/pathService.js';
 import { generateCustomizationDebugReport } from './aiCustomizationDebugPanel.js';
@@ -48,11 +52,35 @@ import { HookType, HOOK_METADATA } from '../../common/promptSyntax/hookTypes.js'
 import { parse as parseJSONC } from '../../../../../base/common/json.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { OS } from '../../../../../base/common/platform.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { ICustomizationHarnessService, matchesWorkspaceSubpath, matchesInstructionFileFilter } from '../../common/customizationHarnessService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { getCleanPromptName, isInClaudeRulesFolder } from '../../common/promptSyntax/config/promptFileLocations.js';
+import { evaluateApplyToPattern } from '../../common/promptSyntax/computeAutomaticInstructions.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { IChatSessionsService, IChatSessionCustomizationItem, IChatSessionCustomizationItemGroup } from '../../common/chatSessionsService.js';
 
-export { truncateToFirstSentence } from './aiCustomizationListWidgetUtils.js';
+export { truncateToFirstLine } from './aiCustomizationListWidgetUtils.js';
 
 const $ = DOM.$;
 
+//#region Telemetry
+
+type CustomizationEditorSearchEvent = {
+	section: string;
+	resultCount: number;
+};
+
+type CustomizationEditorSearchClassification = {
+	section: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The active section when the search was performed.' };
+	resultCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The number of items matching the search query.' };
+	owner: 'joshspicer';
+	comment: 'Tracks search usage in the Chat Customizations editor.';
+};
+
+//#endregion
+
 const ITEM_HEIGHT = 44;
 const GROUP_HEADER_HEIGHT = 36;
 const GROUP_HEADER_HEIGHT_WITH_SEPARATOR = 40;
@@ -68,8 +96,23 @@ export interface IAICustomizationListItem {
 	readonly description?: string;
 	readonly storage: PromptsStorage;
 	readonly promptType: PromptsType;
+	readonly disabled: boolean;
 	/** When set, overrides `storage` for display grouping purposes. */
 	readonly groupKey?: string;
+	/** URI of the parent plugin, when this item comes from an installed plugin. */
+	readonly pluginUri?: URI;
+	/** When set, overrides the formatted name for display. */
+	readonly displayName?: string;
+	/** When set, shows a small inline badge next to the item name. */
+	readonly badge?: string;
+	/** Tooltip shown when hovering the badge. */
+	readonly badgeTooltip?: string;
+	/** When set, overrides the default prompt-type icon. */
+	readonly typeIcon?: ThemeIcon;
+	/** True when item comes from the default chat extension (grouped under Built-in). */
+	readonly isBuiltin?: boolean;
+	/** Display name of the contributing extension (for non-built-in extension items). */
+	readonly extensionLabel?: string;
 	nameMatches?: IMatch[];
 	descriptionMatches?: IMatch[];
 }
@@ -118,8 +161,10 @@ class AICustomizationListDelegate implements IListVirtualDelegate<IListEntry> {
 interface IAICustomizationItemTemplateData {
 	readonly container: HTMLElement;
 	readonly actionsContainer: HTMLElement;
+	readonly actionBar: ActionBar;
 	readonly typeIcon: HTMLElement;
 	readonly nameLabel: HighlightedLabel;
+	readonly badge: HTMLElement;
 	readonly description: HighlightedLabel;
 	readonly disposables: DisposableStore;
 	readonly elementDisposables: DisposableStore;
@@ -213,16 +258,25 @@ function promptTypeToIcon(type: PromptsType): ThemeIcon {
 }
 
 /**
- * Formats a name for display: strips a trailing .md extension, converts dashes/underscores
- * to spaces and applies title case.
- * Note: callers that pass IMatch highlight ranges must compute those ranges against the
- * formatted string (not the raw input), since .md stripping changes string length.
+ * Returns the icon for a given storage type.
+ */
+function storageToIcon(storage: PromptsStorage): ThemeIcon {
+	switch (storage) {
+		case PromptsStorage.local: return workspaceIcon;
+		case PromptsStorage.user: return userIcon;
+		case PromptsStorage.extension: return extensionIcon;
+		case PromptsStorage.plugin: return pluginIcon;
+		default: return instructionsIcon;
+	}
+}
+
+/**
+ * Formats a name for display by stripping a trailing .md extension.
+ * Names from frontmatter headers are shown as-is to stay consistent
+ * with how they appear in agent dropdowns and error messages.
  */
 export function formatDisplayName(name: string): string {
-	return name
-		.replace(/\.md$/i, '')
-		.replace(/[-_]/g, ' ')
-		.replace(/\b\w/g, c => c.toUpperCase());
+	return name.replace(/\.md$/i, '');
 }
 
 /**
@@ -234,6 +288,10 @@ class AICustomizationItemRenderer implements IListRenderer<IFileItemEntry, IAICu
 	constructor(
 		@IHoverService private readonly hoverService: IHoverService,
 		@ILabelService private readonly labelService: ILabelService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IAgentPluginService private readonly agentPluginService: IAgentPluginService,
 	) { }
 
 	renderTemplate(container: HTMLElement): IAICustomizationItemTemplateData {
@@ -245,17 +303,24 @@ class AICustomizationItemRenderer implements IListRenderer<IFileItemEntry, IAICu
 		const leftSection = DOM.append(container, $('.item-left'));
 		const typeIcon = DOM.append(leftSection, $('.item-type-icon'));
 		const textContainer = DOM.append(leftSection, $('.item-text'));
-		const nameLabel = disposables.add(new HighlightedLabel(DOM.append(textContainer, $('.item-name'))));
+		const nameRow = DOM.append(textContainer, $('.item-name-row'));
+		const nameLabel = disposables.add(new HighlightedLabel(DOM.append(nameRow, $('.item-name'))));
+		const badge = DOM.append(nameRow, $('.inline-badge.item-badge'));
 		const description = disposables.add(new HighlightedLabel(DOM.append(textContainer, $('.item-description'))));
 
 		// Right section for actions (hover-visible)
 		const actionsContainer = DOM.append(container, $('.item-right'));
+		const actionBar = disposables.add(new ActionBar(actionsContainer, {
+			actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService),
+		}));
 
 		return {
 			container,
 			actionsContainer,
+			actionBar,
 			typeIcon,
 			nameLabel,
+			badge,
 			description,
 			disposables,
 			elementDisposables,
@@ -266,15 +331,31 @@ class AICustomizationItemRenderer implements IListRenderer<IFileItemEntry, IAICu
 		templateData.elementDisposables.clear();
 		const element = entry.item;
 
-		// Type icon based on prompt type
+		// Type icon: use per-item override or fall back to prompt type
 		templateData.typeIcon.className = 'item-type-icon';
-		templateData.typeIcon.classList.add(...ThemeIcon.asClassNameArray(promptTypeToIcon(element.promptType)));
+		templateData.typeIcon.classList.add(...ThemeIcon.asClassNameArray(element.typeIcon ?? promptTypeToIcon(element.promptType)));
 
-		// Hover tooltip: name + full path
+		// Hover tooltip: name + source + badge context + plugin source
 		templateData.elementDisposables.add(this.hoverService.setupDelayedHover(templateData.container, () => {
-			const uriLabel = this.labelService.getUriLabel(element.uri, { relative: false });
+			let content: string;
+			if (element.isBuiltin) {
+				content = `${element.name}\n${localize('builtinSource', "Built-in")}`;
+			} else if (element.extensionLabel) {
+				content = `${element.name}\n${localize('fromExtension', "Extension: {0}", element.extensionLabel)}`;
+			} else {
+				const isWorkspaceItem = element.storage === PromptsStorage.local;
+				const uriLabel = this.labelService.getUriLabel(element.uri, { relative: isWorkspaceItem });
+				content = `${element.name}\n${uriLabel}`;
+			}
+			if (element.badgeTooltip) {
+				content += `\n\n${element.badgeTooltip}`;
+			}
+			const plugin = element.pluginUri && this.agentPluginService.plugins.get().find(p => isEqual(p.uri, element.pluginUri));
+			if (plugin) {
+				content += `\n${localize('fromPlugin', "Plugin: {0}", plugin.label)}`;
+			}
 			return {
-				content: `${element.name}\n${uriLabel}`,
+				content,
 				appearance: {
 					compact: true,
 					skipFadeInAnimation: true,
@@ -282,10 +363,29 @@ class AICustomizationItemRenderer implements IListRenderer<IFileItemEntry, IAICu
 			};
 		}));
 
+		// Apply disabled styling
+		templateData.container.classList.toggle('disabled', element.disabled);
+
 		// Name with highlights — nameMatches are pre-computed against the formatted display name
-		const displayName = formatDisplayName(element.name);
+		const displayName = element.displayName ?? formatDisplayName(element.name);
 		templateData.nameLabel.set(displayName, element.nameMatches);
 
+		// Optional inline badge (e.g. "always added", "*.ts")
+		if (element.badge) {
+			templateData.badge.textContent = element.badge;
+			templateData.badge.style.display = '';
+			if (element.badgeTooltip) {
+				templateData.elementDisposables.add(this.hoverService.setupManagedHover(
+					getDefaultHoverDelegate('mouse'),
+					templateData.badge,
+					element.badgeTooltip,
+				));
+			}
+		} else {
+			templateData.badge.textContent = '';
+			templateData.badge.style.display = 'none';
+		}
+
 		// Hooks show shell commands here, so keep the full text instead of truncating to the first sentence.
 		const secondaryText = getCustomizationSecondaryText(element.description, element.filename, element.promptType);
 		let secondaryTextMatches: IMatch[] | undefined;
@@ -317,6 +417,42 @@ class AICustomizationItemRenderer implements IListRenderer<IFileItemEntry, IAICu
 			templateData.description.set('', undefined);
 			templateData.description.element.style.display = 'none';
 		}
+
+		// Inline action bar from menu
+		const context = {
+			uri: element.uri.toString(),
+			name: element.name,
+			promptType: element.promptType,
+			storage: element.storage,
+			pluginUri: element.pluginUri?.toString(),
+		};
+
+		// Create scoped context key service with item-specific keys for when-clause filtering
+		const overlayPairs: [string, string | boolean][] = [
+			[AI_CUSTOMIZATION_ITEM_TYPE_KEY, element.promptType],
+			[AI_CUSTOMIZATION_ITEM_STORAGE_KEY, element.storage],
+			[AI_CUSTOMIZATION_ITEM_URI_KEY, element.uri.toString()],
+			[AI_CUSTOMIZATION_ITEM_DISABLED_KEY, element.disabled],
+		];
+		if (element.pluginUri) {
+			overlayPairs.push([AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, element.pluginUri.toString()]);
+		}
+		const overlay = this.contextKeyService.createOverlay(overlayPairs);
+
+		const menu = templateData.elementDisposables.add(
+			this.menuService.createMenu(AICustomizationManagementItemMenuId, overlay)
+		);
+
+		const updateActions = () => {
+			const actions = menu.getActions({ arg: context, shouldForwardArgs: true });
+			const { primary } = getContextMenuActions(actions, 'inline');
+			templateData.actionBar.clear();
+			templateData.actionBar.push(primary, { icon: true, label: false });
+		};
+		updateActions();
+		templateData.elementDisposables.add(menu.onDidChange(updateActions));
+
+		templateData.actionBar.context = context;
 	}
 
 	disposeTemplate(templateData: IAICustomizationItemTemplateData): void {
@@ -344,6 +480,102 @@ export function sectionToPromptType(section: AICustomizationManagementSection):
 	}
 }
 
+/**
+ * Maps a management section to the well-known customization group IDs
+ * used by {@link IChatSessionCustomizationsProvider}.
+ */
+function sectionToCustomizationGroupIds(section: AICustomizationManagementSection): string[] {
+	switch (section) {
+		case AICustomizationManagementSection.Agents:
+			return ['agents'];
+		case AICustomizationManagementSection.Skills:
+			return ['skills'];
+		case AICustomizationManagementSection.Instructions:
+			return ['agentInstructions', 'contextInstructions', 'onDemandInstructions'];
+		case AICustomizationManagementSection.Prompts:
+			return ['prompts'];
+		case AICustomizationManagementSection.Hooks:
+			return ['hooks'];
+		default:
+			return [];
+	}
+}
+
+/**
+ * Maps the numeric {@link IChatSessionCustomizationItem.storageLocation}
+ * to its corresponding {@link PromptsStorage}.
+ */
+function storageLocationToPromptsStorage(storageLocation: number): PromptsStorage {
+	switch (storageLocation) {
+		case 1: // Workspace
+			return PromptsStorage.local;
+		case 2: // User
+			return PromptsStorage.user;
+		case 3: // Extension
+			return PromptsStorage.extension;
+		case 4: // Plugin
+			return PromptsStorage.plugin;
+		case 5: // BuiltIn
+			return PromptsStorage.extension;
+		default:
+			return PromptsStorage.local;
+	}
+}
+
+/**
+ * Maps the numeric {@link IChatSessionCustomizationItem.storageLocation}
+ * to an optional groupKey override for the list display.
+ */
+function storageLocationToGroupKey(storageLocation: number): string | undefined {
+	// BuiltIn items are grouped under the special "builtin" key
+	if (storageLocation === 5) {
+		return BUILTIN_STORAGE;
+	}
+	return undefined;
+}
+
+/**
+ * Converts an {@link IChatSessionCustomizationItem} from the provider
+ * into an {@link IAICustomizationListItem} for the list widget.
+ */
+function mapProviderItemToListItem(
+	item: IChatSessionCustomizationItem,
+	groupId: string,
+	promptType: PromptsType,
+): IAICustomizationListItem {
+	const storage = storageLocationToPromptsStorage(item.storageLocation);
+	const filename = basename(item.uri);
+	// For instructions, use the group id as the groupKey so items
+	// are placed in the correct sub-group (agent-instructions, etc.)
+	const instructionGroupIds = new Set(['agentInstructions', 'contextInstructions', 'onDemandInstructions']);
+	const groupKey = instructionGroupIds.has(groupId)
+		? groupId.replace('Instructions', '-instructions')
+		: storageLocationToGroupKey(item.storageLocation);
+
+	return {
+		id: item.uri.toString(),
+		uri: item.uri,
+		name: item.label,
+		filename,
+		description: item.description,
+		storage,
+		promptType,
+		disabled: false,
+		groupKey,
+		typeIcon: item.icon,
+	};
+}
+
+/**
+ * An ordered create action for the add button.
+ */
+interface ICreateAction {
+	readonly label: string;
+	readonly enabled: boolean;
+	readonly tooltip?: string;
+	run(): void;
+}
+
 /**
  * Widget that displays a searchable list of AI customization items.
  */
@@ -372,6 +604,8 @@ export class AICustomizationListWidget extends Disposable {
 	private displayEntries: IListEntry[] = [];
 	private searchQuery: string = '';
 	private readonly collapsedGroups = new Set<string>();
+	private _currentGroupCommands: IChatSessionCustomizationItemGroup['commands'];
+	private _currentGroupItemCommands: IChatSessionCustomizationItemGroup['itemCommands'];
 	private readonly dropdownActionDisposables = this._register(new DisposableStore());
 
 	private readonly delayedFilter = new Delayer<void>(200);
@@ -385,8 +619,8 @@ export class AICustomizationListWidget extends Disposable {
 	private readonly _onDidRequestCreate = this._register(new Emitter<PromptsType>());
 	readonly onDidRequestCreate: Event<PromptsType> = this._onDidRequestCreate.event;
 
-	private readonly _onDidRequestCreateManual = this._register(new Emitter<{ type: PromptsType; target: 'workspace' | 'user' }>());
-	readonly onDidRequestCreateManual: Event<{ type: PromptsType; target: 'workspace' | 'user' }> = this._onDidRequestCreateManual.event;
+	private readonly _onDidRequestCreateManual = this._register(new Emitter<{ type: PromptsType; target: 'workspace' | 'user' | 'workspace-root'; rootFileName?: string }>());
+	readonly onDidRequestCreateManual: Event<{ type: PromptsType; target: 'workspace' | 'user' | 'workspace-root'; rootFileName?: string }> = this._onDidRequestCreateManual.event;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -403,6 +637,12 @@ export class AICustomizationListWidget extends Disposable {
 		@IHoverService private readonly hoverService: IHoverService,
 		@IFileService private readonly fileService: IFileService,
 		@IPathService private readonly pathService: IPathService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ICustomizationHarnessService private readonly harnessService: ICustomizationHarnessService,
+		@IAgentPluginService private readonly agentPluginService: IAgentPluginService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IProductService private readonly productService: IProductService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
 	) {
 		super();
 		this.element = $('.ai-customization-list-widget');
@@ -415,6 +655,13 @@ export class AICustomizationListWidget extends Disposable {
 			this.refresh();
 		}));
 
+		// Re-filter when the active harness changes
+		this._register(autorun(reader => {
+			this.harnessService.activeHarness.read(reader);
+			this.updateAddButton();
+			this.refresh();
+		}));
+
 	}
 
 	private create(): void {
@@ -430,7 +677,15 @@ export class AICustomizationListWidget extends Disposable {
 
 		this._register(this.searchInput.onDidChange(() => {
 			this.searchQuery = this.searchInput.value;
-			this.delayedFilter.trigger(() => this.filterItems());
+			this.delayedFilter.trigger(() => {
+				const matchCount = this.filterItems();
+				if (this.searchQuery.trim()) {
+					this.telemetryService.publicLog2<CustomizationEditorSearchEvent, CustomizationEditorSearchClassification>('chatCustomizationEditor.search', {
+						section: this.currentSection,
+						resultCount: matchCount,
+					});
+				}
+			});
 		}));
 
 		// Add button container next to search
@@ -461,8 +716,9 @@ export class AICustomizationListWidget extends Disposable {
 
 		// Empty state container
 		this.emptyStateContainer = DOM.append(this.element, $('.list-empty-state'));
-		this.emptyStateIcon = DOM.append(this.emptyStateContainer, $('.empty-state-icon'));
-		this.emptyStateText = DOM.append(this.emptyStateContainer, $('.empty-state-text'));
+		const emptyStateHeader = DOM.append(this.emptyStateContainer, $('.empty-state-header'));
+		this.emptyStateIcon = DOM.append(emptyStateHeader, $('.empty-state-icon'));
+		this.emptyStateText = DOM.append(emptyStateHeader, $('.empty-state-text'));
 		this.emptyStateSubtext = DOM.append(this.emptyStateContainer, $('.empty-state-subtext'));
 		this.emptyStateContainer.style.display = 'none';
 
@@ -485,9 +741,12 @@ export class AICustomizationListWidget extends Disposable {
 						if (entry.type === 'group-header') {
 							return localize('groupAriaLabel', "{0}, {1} items, {2}", entry.label, entry.count, entry.collapsed ? localize('collapsed', "collapsed") : localize('expanded', "expanded"));
 						}
-						return entry.item.description
+						const nameAndDesc = entry.item.description
 							? localize('itemAriaLabel', "{0}, {1}", entry.item.name, entry.item.description)
 							: entry.item.name;
+						return entry.item.disabled
+							? localize('itemAriaLabelDisabled', "{0}, disabled", nameAndDesc)
+							: nameAndDesc;
 					},
 					getWidgetAriaLabel: () => localize('listAriaLabel', "Chat Customizations"),
 				},
@@ -516,6 +775,15 @@ export class AICustomizationListWidget extends Disposable {
 		// Subscribe to prompt service changes
 		this._register(this.promptsService.onDidChangeCustomAgents(() => this.refresh()));
 		this._register(this.promptsService.onDidChangeSlashCommands(() => this.refresh()));
+		this._register(this.promptsService.onDidChangeSkills(() => this.refresh()));
+		this._register(this.chatSessionsService.onDidChangeCustomizations(() => this.refresh()));
+
+		// Refresh on file deletions so the list updates after inline delete actions
+		this._register(this.fileService.onDidFilesChange(e => {
+			if (e.gotDeleted()) {
+				this.refresh();
+			}
+		}));
 
 		// Section footer at bottom with description and link
 		this.sectionHeader = DOM.append(this.element, $('.section-footer'));
@@ -547,18 +815,31 @@ export class AICustomizationListWidget extends Disposable {
 			name: item.name,
 			promptType: item.promptType,
 			storage: item.storage,
+			pluginUri: item.pluginUri?.toString(),
 		};
 
-		// Get menu actions
-		const actions = this.menuService.getMenuActions(AICustomizationManagementItemMenuId, this.contextKeyService, {
+		// Create scoped context key service with item-specific keys for when-clause filtering
+		const overlayPairs: [string, string | boolean][] = [
+			[AI_CUSTOMIZATION_ITEM_TYPE_KEY, item.promptType],
+			[AI_CUSTOMIZATION_ITEM_STORAGE_KEY, item.storage],
+			[AI_CUSTOMIZATION_ITEM_URI_KEY, item.uri.toString()],
+			[AI_CUSTOMIZATION_ITEM_DISABLED_KEY, item.disabled],
+		];
+		if (item.pluginUri) {
+			overlayPairs.push([AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, item.pluginUri.toString()]);
+		}
+		const overlay = this.contextKeyService.createOverlay(overlayPairs);
+
+		// Get menu actions, excluding inline actions to avoid duplicates
+		const actions = this.menuService.getMenuActions(AICustomizationManagementItemMenuId, overlay, {
 			arg: context,
 			shouldForwardArgs: true,
 		});
 
-		const flatActions = getFlatContextMenuActions(actions);
+		const { secondary } = getContextMenuActions(actions, 'inline');
 
-		// Add copy path actions
-		const copyActions = [
+		// Add copy path actions (not shown for built-in items where the path is an implementation detail)
+		const copyActions = item.isBuiltin ? [] : [
 			new Separator(),
 			new Action('copyFullPath', localize('copyFullPath', "Copy Full Path"), undefined, true, async () => {
 				await this.clipboardService.writeText(item.uri.fsPath);
@@ -576,9 +857,25 @@ export class AICustomizationListWidget extends Disposable {
 			}),
 		];
 
+		// Add extension-provided item commands for non-built-in harnesses
+		const activeHarness = this.harnessService.activeHarness.get();
+		const hasProvider = this.chatSessionsService.hasCustomizationsProvider(activeHarness);
+		const extensionItemActions = (hasProvider && this._currentGroupItemCommands?.length)
+			? [
+				new Separator(),
+				...this._currentGroupItemCommands.map(cmd => new Action(
+					cmd.id,
+					cmd.title,
+					undefined,
+					true,
+					async () => { this.commandService.executeCommand(cmd.id, item.uri.toString()); },
+				)),
+			]
+			: [];
+
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
-			getActions: () => [...flatActions, ...copyActions],
+			getActions: () => [...secondary, ...extensionItemActions, ...copyActions],
 		});
 	}
 
@@ -588,8 +885,8 @@ export class AICustomizationListWidget extends Disposable {
 	async setSection(section: AICustomizationManagementSection): Promise<void> {
 		this.currentSection = section;
 		this.updateSectionHeader();
-		this.updateAddButton();
 		await this.loadItems();
+		this.updateAddButton();
 	}
 
 	/**
@@ -633,101 +930,184 @@ export class AICustomizationListWidget extends Disposable {
 	}
 
 	/**
-	 * Updates the add button label based on the current section.
+	 * Updates the add button by building a unified action list.
+	 * The first action becomes the primary button; the rest go in the dropdown.
 	 */
 	private updateAddButton(): void {
-		const typeLabel = this.getTypeLabel();
-		const dropdownActions = this.getDropdownActions();
-		const hasDropdown = dropdownActions.length > 0;
+		const actions = this.buildCreateActions();
+		const [primary, ...dropdown] = actions;
+		const hasDropdown = dropdown.length > 0;
 
 		// Toggle which button is visible
 		this.addButton.element.style.display = hasDropdown ? '' : 'none';
 		this.addButtonSimple.element.style.display = hasDropdown ? 'none' : '';
 
-		if (this.workspaceService.isSessionsWindow) {
-			// Sessions: primary is workspace creation
-			const hasWorkspace = this.hasActiveWorkspace();
-			const label = `$(${Codicon.add.id}) New ${typeLabel} (Workspace)`;
+		if (!primary) {
+			this.addButtonSimple.element.style.display = 'none';
+			this.addButton.element.style.display = 'none';
+			return;
+		}
 
-			if (hasDropdown) {
-				this.addButton.label = label;
-				this.addButton.enabled = hasWorkspace;
-				this.addButton.primaryButton.setTitle('');
-				this.addButton.dropdownButton.setTitle('');
-				if (!hasWorkspace) {
-					const disabledTitle = localize('createDisabled', "Open a workspace folder to create customizations.");
-					this.addButton.primaryButton.setTitle(disabledTitle);
-					this.addButton.dropdownButton.setTitle(disabledTitle);
-				}
-			} else {
-				this.addButtonSimple.label = label;
-				this.addButtonSimple.enabled = hasWorkspace;
-				if (!hasWorkspace) {
-					this.addButtonSimple.setTitle(localize('createDisabled', "Open a workspace folder to create customizations."));
-				} else {
-					this.addButtonSimple.setTitle('');
-				}
-			}
+		if (hasDropdown) {
+			this.addButton.label = primary.label;
+			this.addButton.enabled = primary.enabled;
+			this.addButton.primaryButton.setTitle(primary.tooltip ?? '');
+			this.addButton.dropdownButton.setTitle('');
 		} else {
-			// Core: primary is AI generation
-			const label = `$(${Codicon.sparkle.id}) Generate ${typeLabel}`;
-			if (hasDropdown) {
-				this.addButton.label = label;
-				this.addButton.enabled = true;
-				this.addButton.primaryButton.setTitle('');
-				this.addButton.dropdownButton.setTitle('');
-			} else {
-				this.addButtonSimple.label = label;
-				this.addButtonSimple.enabled = true;
-				this.addButtonSimple.setTitle('');
-			}
+			this.addButtonSimple.label = primary.label;
+			this.addButtonSimple.enabled = primary.enabled;
+			this.addButtonSimple.setTitle(primary.tooltip ?? '');
 		}
 	}
 
 	/**
-	 * Gets the dropdown actions for the add button.
+	 * Builds an ordered list of create actions for the current section.
+	 * The first entry is the primary button; remaining entries are dropdown items.
 	 */
-	private getDropdownActions(): Action[] {
-		this.dropdownActionDisposables.clear();
+	private buildCreateActions(): ICreateAction[] {
 		const typeLabel = this.getTypeLabel();
-		const actions: Action[] = [];
 		const promptType = sectionToPromptType(this.currentSection);
+		const descriptor = this.harnessService.getActiveDescriptor();
+		const override = descriptor.sectionOverrides?.get(this.currentSection);
+		const hasWorkspace = this.hasActiveWorkspace();
 
-		// Hooks: no user-scoped creation
+		// Extension-contributed harness: use commands from the provider group
+		const activeHarness = this.harnessService.activeHarness.get();
+		const hasProvider = this.chatSessionsService.hasCustomizationsProvider(activeHarness);
+		if (hasProvider && this._currentGroupCommands?.length) {
+			return this._currentGroupCommands.map(cmd => ({
+				label: `$(${Codicon.add.id}) ${cmd.title}`,
+				enabled: true,
+				run: () => { this.commandService.executeCommand(cmd.id, ...(cmd.arguments ?? [])); },
+			}));
+		}
+
+		// Full command override (e.g. Claude hooks) — single action, no dropdown
+		if (override?.commandId) {
+			return [{
+				label: `$(${Codicon.add.id}) ${override.label}`,
+				enabled: true,
+				run: () => { this.commandService.executeCommand(override.commandId!); },
+			}];
+		}
+
+		const createTypeLabel = override?.typeLabel ?? typeLabel;
+		const actions: ICreateAction[] = [];
+		const addedTargets = new Set<string>();
+
+		// Root-file primary button (e.g. "Add CLAUDE.md") — only when workspace is open.
+		// Without a workspace, user creation becomes primary and rootFile goes to dropdown.
+		if (override?.rootFile && hasWorkspace) {
+			actions.push({
+				label: `$(${Codicon.add.id}) ${override.label}`,
+				enabled: true,
+				run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace-root' }); },
+			});
+			addedTargets.add('workspace-root');
+		}
+
+		// Hooks have a simplified action set
 		if (promptType === PromptsType.hook) {
-			if (this.workspaceService.isSessionsWindow) {
-				// Sessions: no dropdown for hooks
-			} else {
-				// Core: primary is generate, dropdown has configure quick pick
-				if (this.hasActiveWorkspace()) {
-					actions.push(this.dropdownActionDisposables.add(new Action('configureHooks', `$(${Codicon.add.id}) Configure Hooks`, undefined, true, () => {
-						this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' });
-					})));
+			if (!this.workspaceService.isSessionsWindow && !descriptor.hideGenerateButton) {
+				// Core Local: Generate is primary, configure hooks in dropdown
+				actions.push({
+					label: `$(${Codicon.sparkle.id}) Generate ${typeLabel}`,
+					enabled: true,
+					run: () => { this._onDidRequestCreate.fire(promptType); },
+				});
+				if (hasWorkspace) {
+					actions.push({
+						label: `$(${Codicon.add.id}) Configure Hooks`,
+						enabled: true,
+						run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' }); },
+					});
 				}
+			} else if (!override?.commandId) {
+				// Sessions / non-local: workspace creation only
+				actions.push({
+					label: `$(${Codicon.add.id}) New ${typeLabel} (Workspace)`,
+					enabled: hasWorkspace,
+					tooltip: hasWorkspace ? undefined : localize('createDisabled', "Open a workspace folder to create customizations."),
+					run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' }); },
+				});
 			}
 			return actions;
 		}
 
-		if (this.workspaceService.isSessionsWindow) {
-			// Sessions: primary is workspace, dropdown has user
-			actions.push(this.dropdownActionDisposables.add(new Action('createUser', `$(${Codicon.account.id}) New ${typeLabel} (User)`, undefined, true, () => {
-				this._onDidRequestCreateManual.fire({ type: promptType, target: 'user' });
-			})));
-		} else {
-			// Core: primary is generate, dropdown has workspace + user
-			if (this.hasActiveWorkspace()) {
-				actions.push(this.dropdownActionDisposables.add(new Action('createWorkspace', `$(${Codicon.folder.id}) New ${typeLabel} (Workspace)`, undefined, true, () => {
-					this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' });
-				})));
+		// Non-hook sections: build the full action list
+
+		if (!override?.rootFile) {
+			// Determine the primary action (first in list)
+			if (!this.workspaceService.isSessionsWindow && !descriptor.hideGenerateButton) {
+				// Core Local: Generate is primary
+				actions.push({
+					label: `$(${Codicon.sparkle.id}) Generate ${typeLabel}`,
+					enabled: true,
+					run: () => { this._onDidRequestCreate.fire(promptType); },
+				});
+			} else if (hasWorkspace) {
+				// Sessions or non-local harness with workspace: workspace is primary
+				actions.push({
+					label: `$(${Codicon.add.id}) New ${createTypeLabel} (Workspace)`,
+					enabled: true,
+					run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' }); },
+				});
+				addedTargets.add('workspace');
+			} else {
+				// No workspace: user is primary
+				actions.push({
+					label: `$(${Codicon.add.id}) New ${createTypeLabel} (User)`,
+					enabled: true,
+					run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'user' }); },
+				});
+				addedTargets.add('user');
+			}
+		}
+
+		// Secondary actions (dropdown) — only add if not already present
+		if (hasWorkspace && !addedTargets.has('workspace')) {
+			actions.push({
+				label: `$(${Codicon.folder.id}) New ${createTypeLabel} (Workspace)`,
+				enabled: true,
+				run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' }); },
+			});
+		}
+
+		if (!addedTargets.has('user')) {
+			actions.push({
+				label: `$(${Codicon.account.id}) New ${createTypeLabel} (User)`,
+				enabled: true,
+				run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'user' }); },
+			});
+		}
+
+		// Root-file shortcuts from the descriptor (e.g. "New AGENTS.md")
+		if (hasWorkspace && override?.rootFileShortcuts && !addedTargets.has('workspace-root')) {
+			for (const fileName of override.rootFileShortcuts) {
+				actions.push({
+					label: `$(${Codicon.file.id}) New ${fileName}`,
+					enabled: true,
+					run: () => { this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace-root', rootFileName: fileName }); },
+				});
 			}
-			actions.push(this.dropdownActionDisposables.add(new Action('createUser', `$(${Codicon.account.id}) New ${typeLabel} (User)`, undefined, true, () => {
-				this._onDidRequestCreateManual.fire({ type: promptType, target: 'user' });
-			})));
 		}
 
 		return actions;
 	}
 
+	/**
+	 * Gets the dropdown actions for the add button (consumed by ButtonWithDropdown).
+	 * Returns all actions except the primary (first) from buildCreateActions.
+	 */
+	private getDropdownActions(): Action[] {
+		this.dropdownActionDisposables.clear();
+		const allActions = this.buildCreateActions();
+		// Skip the first (primary) action
+		return allActions.slice(1).map((a, i) =>
+			this.dropdownActionDisposables.add(new Action(`create_${i}`, a.label, undefined, a.enabled, () => a.run()))
+		);
+	}
+
 	/**
 	 * Checks if there's an active project root (workspace folder or session repository).
 	 */
@@ -739,16 +1119,9 @@ export class AICustomizationListWidget extends Disposable {
 	 * Executes the primary create action based on context.
 	 */
 	private executePrimaryCreateAction(): void {
-		const promptType = sectionToPromptType(this.currentSection);
-		if (this.workspaceService.isSessionsWindow) {
-			// Sessions: primary creates in workspace
-			if (!this.hasActiveWorkspace()) {
-				return;
-			}
-			this._onDidRequestCreateManual.fire({ type: promptType, target: 'workspace' });
-		} else {
-			// Core: primary is generate
-			this._onDidRequestCreate.fire(promptType);
+		const actions = this.buildCreateActions();
+		if (actions.length > 0 && actions[0].enabled) {
+			actions[0].run();
 		}
 	}
 
@@ -775,8 +1148,8 @@ export class AICustomizationListWidget extends Disposable {
 	 * Refreshes the current section's items.
 	 */
 	async refresh(): Promise<void> {
-		this.updateAddButton();
 		await this.loadItems();
+		this.updateAddButton();
 	}
 
 	/**
@@ -784,13 +1157,114 @@ export class AICustomizationListWidget extends Disposable {
 	 */
 	private async loadItems(): Promise<void> {
 		const section = this.currentSection;
+		this._currentGroupCommands = undefined;
+		this._currentGroupItemCommands = undefined;
+		const items = await this.fetchItemsForSection(section);
+
+		if (this.currentSection !== section) {
+			return; // section changed while loading
+		}
+
+		// Fetch commands for extension-contributed harnesses separately to avoid
+		// race conditions when _fetchItemsFromProvider is also called for count
+		// computation on other sections.
+		const activeHarness = this.harnessService.activeHarness.get();
+		const hasProvider = this.chatSessionsService.hasCustomizationsProvider(activeHarness);
+		if (hasProvider) {
+			const groups = await this.chatSessionsService.getCustomizations(activeHarness, CancellationToken.None);
+			if (groups) {
+				const matchingIds = sectionToCustomizationGroupIds(section);
+				this._currentGroupCommands = groups.filter(g => matchingIds.includes(g.id)).flatMap(g => g.commands ?? []);
+				this._currentGroupItemCommands = groups.filter(g => matchingIds.includes(g.id)).flatMap(g => g.itemCommands ?? []);
+			}
+		}
+
+		this.allItems = items;
+		this.filterItems();
+		this._onDidChangeItemCount.fire(items.length);
+	}
+
+	/**
+	 * Computes the item count for a given section without updating the display.
+	 * Uses the same loading and filtering logic as `loadItems` for consistency.
+	 */
+	async computeItemCountForSection(section: AICustomizationManagementSection): Promise<number> {
+		const items = await this.fetchItemsForSection(section);
+		return items.length;
+	}
+
+	/**
+	 * Returns true if the given extension identifier matches the default
+	 * chat extension (e.g. GitHub Copilot Chat). Used to group items from
+	 * the chat extension under "Built-in" instead of "Extensions", similar
+	 * to how MCP categorizes built-in servers.
+	 */
+	private isChatExtensionItem(extensionId: ExtensionIdentifier): boolean {
+		const chatExtensionId = this.productService.defaultChatAgent?.chatExtensionId;
+		return !!chatExtensionId && ExtensionIdentifier.equals(extensionId, chatExtensionId);
+	}
+
+	/**
+	 * Post-processes items to assign groupKey overrides for extension-sourced
+	 * items. Applies the built-in grouping consistently across all item types.
+	 *
+	 * Items that already have an explicit groupKey (e.g. instruction categories,
+	 * agent hooks) are left untouched — groupKey overrides are only applied to
+	 * items whose current groupKey is `undefined`.
+	 */
+	private applyBuiltinGroupKeys(items: IAICustomizationListItem[], extensionInfoByUri: ReadonlyMap<string, { id: ExtensionIdentifier; displayName?: string }>): IAICustomizationListItem[] {
+		return items.map(item => {
+			if (item.storage !== PromptsStorage.extension) {
+				return item;
+			}
+			const extInfo = extensionInfoByUri.get(item.uri.toString());
+			if (!extInfo) {
+				return item;
+			}
+			const isBuiltin = this.isChatExtensionItem(extInfo.id);
+			if (isBuiltin) {
+				return {
+					...item,
+					isBuiltin: true,
+					groupKey: item.groupKey ?? BUILTIN_STORAGE,
+				};
+			}
+			return {
+				...item,
+				extensionLabel: extInfo.displayName || extInfo.id.value,
+			};
+		});
+	}
+
+	/**
+	 * Fetches and filters items for a given section.
+	 * Shared between `loadItems` (active section) and `computeItemCountForSection` (any section).
+	 */
+	private async fetchItemsForSection(section: AICustomizationManagementSection): Promise<IAICustomizationListItem[]> {
+		// Extension-contributed harnesses always use the provider path
+		const activeHarness = this.harnessService.activeHarness.get();
+		const hasProvider = this.chatSessionsService.hasCustomizationsProvider(activeHarness);
+
+		if (hasProvider) {
+			return this._fetchItemsFromProvider(section);
+		}
+
 		const promptType = sectionToPromptType(section);
 		const items: IAICustomizationListItem[] = [];
+		const disabledUris = this.promptsService.getDisabledPromptFiles(promptType);
+		const extensionInfoByUri = new Map<string, { id: ExtensionIdentifier; displayName?: string }>();
 
 
 		if (promptType === PromptsType.agent) {
 			// Use getCustomAgents which has parsed name/description from frontmatter
 			const agents = await this.promptsService.getCustomAgents(CancellationToken.None);
+			// Build extension display name lookup from raw file list
+			const allAgentFiles = await this.promptsService.listPromptFiles(PromptsType.agent, CancellationToken.None);
+			for (const file of allAgentFiles) {
+				if (file.extension) {
+					extensionInfoByUri.set(file.uri.toString(), { id: file.extension.identifier, displayName: file.extension.displayName });
+				}
+			}
 			for (const agent of agents) {
 				const filename = basename(agent.uri);
 				items.push({
@@ -801,14 +1275,29 @@ export class AICustomizationListWidget extends Disposable {
 					description: agent.description,
 					storage: agent.source.storage,
 					promptType,
+					pluginUri: agent.source.storage === PromptsStorage.plugin ? agent.source.pluginUri : undefined,
+					disabled: disabledUris.has(agent.uri),
 				});
+				// Track extension ID for built-in grouping (if not already set from file list)
+				if (agent.source.storage === PromptsStorage.extension && !extensionInfoByUri.has(agent.uri.toString())) {
+					extensionInfoByUri.set(agent.uri.toString(), { id: agent.source.extensionId });
+				}
 			}
 		} else if (promptType === PromptsType.skill) {
-			// Use findAgentSkills which has parsed name/description from frontmatter
+			// Use findAgentSkills for enabled skills (has parsed name/description from frontmatter)
 			const skills = await this.promptsService.findAgentSkills(CancellationToken.None);
+			// Build extension ID lookup from raw file list (like MCP builds collectionSources)
+			const allSkillFiles = await this.promptsService.listPromptFiles(PromptsType.skill, CancellationToken.None);
+			for (const file of allSkillFiles) {
+				if (file.extension) {
+					extensionInfoByUri.set(file.uri.toString(), { id: file.extension.identifier, displayName: file.extension.displayName });
+				}
+			}
+			const seenUris = new ResourceSet();
 			for (const skill of skills || []) {
 				const filename = basename(skill.uri);
 				const skillName = skill.name || basename(dirname(skill.uri)) || filename;
+				seenUris.add(skill.uri);
 				items.push({
 					id: skill.uri.toString(),
 					uri: skill.uri,
@@ -817,8 +1306,28 @@ export class AICustomizationListWidget extends Disposable {
 					description: skill.description,
 					storage: skill.storage,
 					promptType,
+					pluginUri: skill.storage === PromptsStorage.plugin ? this.findPluginUri(skill.uri) : undefined,
+					disabled: false,
 				});
 			}
+			// Also include disabled skills from the raw file list
+			if (disabledUris.size > 0) {
+				for (const file of allSkillFiles) {
+					if (!seenUris.has(file.uri) && disabledUris.has(file.uri)) {
+						const filename = basename(file.uri);
+						items.push({
+							id: file.uri.toString(),
+							uri: file.uri,
+							name: file.name || basename(dirname(file.uri)) || filename,
+							filename,
+							description: file.description,
+							storage: file.storage,
+							promptType,
+							disabled: true,
+						});
+					}
+				}
+			}
 		} else if (promptType === PromptsType.prompt) {
 			// Use getPromptSlashCommands which has parsed name/description from frontmatter
 			// Filter out skills since they have their own section
@@ -836,7 +1345,12 @@ export class AICustomizationListWidget extends Disposable {
 					description: command.description,
 					storage: command.promptPath.storage,
 					promptType,
+					pluginUri: command.promptPath.storage === PromptsStorage.plugin ? command.promptPath.pluginUri : undefined,
+					disabled: disabledUris.has(command.promptPath.uri),
 				});
+				if (command.promptPath.extension) {
+					extensionInfoByUri.set(command.promptPath.uri.toString(), { id: command.promptPath.extension.identifier, displayName: command.promptPath.extension.displayName });
+				}
 			}
 		} else if (promptType === PromptsType.hook) {
 			// Try to parse individual hooks from each file; fall back to showing the file itself
@@ -846,6 +1360,23 @@ export class AICustomizationListWidget extends Disposable {
 			const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
 
 			for (const hookFile of hookFiles) {
+				// Plugins parse their own hooks and emit them individually because they can
+				// be embedded with interpolations in the plugin manifests; don't re-parse them
+				if (hookFile.storage === PromptsStorage.plugin) {
+					const filename = basename(hookFile.uri);
+					items.push({
+						id: hookFile.uri.toString() + ':' + hookFile.name,
+						uri: hookFile.uri,
+						name: hookFile.name || this.getFriendlyName(filename),
+						filename,
+						storage: hookFile.storage,
+						promptType,
+						pluginUri: hookFile.pluginUri,
+						disabled: disabledUris.has(hookFile.uri),
+					});
+					continue;
+				}
+
 				let parsedHooks = false;
 				try {
 					const content = await this.fileService.readFile(hookFile.uri);
@@ -868,6 +1399,7 @@ export class AICustomizationListWidget extends Disposable {
 									description: truncatedCmd || localize('hookUnset', "(unset)"),
 									storage: hookFile.storage,
 									promptType,
+									disabled: disabledUris.has(hookFile.uri),
 								});
 							}
 						}
@@ -881,10 +1413,11 @@ export class AICustomizationListWidget extends Disposable {
 					items.push({
 						id: hookFile.uri.toString(),
 						uri: hookFile.uri,
-						name: this.getFriendlyName(filename),
+						name: hookFile.name || this.getFriendlyName(filename),
 						filename,
 						storage: hookFile.storage,
 						promptType,
+						disabled: disabledUris.has(hookFile.uri),
 					});
 				}
 			}
@@ -915,78 +1448,191 @@ export class AICustomizationListWidget extends Disposable {
 							storage: agent.source.storage,
 							groupKey: 'agents',
 							promptType,
+							pluginUri: agent.source.storage === PromptsStorage.plugin ? agent.source.pluginUri : undefined,
+							disabled: disabledUris.has(agent.uri),
 						});
 					}
 				}
 			}
 		} else {
-			// For instructions, fetch prompt files and group by storage
+			// For instructions, group by category: agent instructions, context instructions, on-demand instructions
 			const promptFiles = await this.promptsService.listPromptFiles(promptType, CancellationToken.None);
-			const allItems: IPromptPath[] = [...promptFiles];
-
-			// Also include agent instruction files (AGENTS.md, CLAUDE.md, copilot-instructions.md)
-			if (promptType === PromptsType.instructions) {
-				const agentInstructions = await this.promptsService.listAgentInstructions(CancellationToken.None, undefined);
-				const workspaceFolderUris = this.workspaceContextService.getWorkspace().folders.map(f => f.uri);
-				const activeRoot = this.workspaceService.getActiveProjectRoot();
-				if (activeRoot) {
-					workspaceFolderUris.push(activeRoot);
+			for (const file of promptFiles) {
+				if (file.extension) {
+					extensionInfoByUri.set(file.uri.toString(), { id: file.extension.identifier, displayName: file.extension.displayName });
 				}
-				for (const file of agentInstructions) {
-					const isWorkspaceFile = workspaceFolderUris.some(root => isEqualOrParent(file.uri, root));
-					allItems.push({
-						uri: file.uri,
-						storage: isWorkspaceFile ? PromptsStorage.local : PromptsStorage.user,
-						type: PromptsType.instructions,
-						name: basename(file.uri),
+			}
+			const agentInstructionFiles = await this.promptsService.listAgentInstructions(CancellationToken.None, undefined);
+			const agentInstructionUris = new ResourceSet(agentInstructionFiles.map(f => f.uri));
+
+			// Add agent instruction items
+			const workspaceFolderUris = this.workspaceContextService.getWorkspace().folders.map(f => f.uri);
+			const activeRoot = this.workspaceService.getActiveProjectRoot();
+			if (activeRoot) {
+				workspaceFolderUris.push(activeRoot);
+			}
+			for (const file of agentInstructionFiles) {
+				const storage = PromptsStorage.local;
+				const filename = basename(file.uri);
+				items.push({
+					id: file.uri.toString(),
+					uri: file.uri,
+					name: filename,
+					filename: this.labelService.getUriLabel(file.uri, { relative: true }),
+					displayName: filename,
+					storage,
+					promptType,
+					typeIcon: storageToIcon(storage),
+					groupKey: 'agent-instructions',
+					disabled: disabledUris.has(file.uri),
+				});
+			}
+
+			// Parse prompt files to separate into context vs on-demand
+			const promptFilesToParse = promptFiles.filter(item => !agentInstructionUris.has(item.uri));
+			const parseResults = await Promise.all(promptFilesToParse.map(async item => {
+				try {
+					const parsed = await this.promptsService.parseNew(item.uri, CancellationToken.None);
+					return { item, parsed };
+				} catch {
+					// Parse failed — treat as on-demand
+					return { item, parsed: undefined };
+				}
+			}));
+
+			for (const { item, parsed } of parseResults) {
+				const applyTo = evaluateApplyToPattern(parsed?.header, isInClaudeRulesFolder(item.uri));
+				const name = parsed?.header?.name;
+				let description = parsed?.header?.description;
+				const friendlyName = this.getFriendlyName(name || item.name || getCleanPromptName(item.uri));
+				description = description || item.description;
+
+				if (applyTo !== undefined) {
+					// Context instruction
+					const badge = applyTo === '**'
+						? localize('alwaysAdded', "always added")
+						: applyTo;
+					const badgeTooltip = applyTo === '**'
+						? localize('alwaysAddedTooltip', "This instruction is automatically included in every interaction.")
+						: localize('onContextTooltip', "This instruction is automatically included when files matching '{0}' are in context.", applyTo);
+					items.push({
+						id: item.uri.toString(),
+						uri: item.uri,
+						name: friendlyName,
+						filename: this.labelService.getUriLabel(item.uri, { relative: true }),
+						displayName: friendlyName,
+						badge,
+						badgeTooltip,
+						description: description,
+						storage: item.storage,
+						promptType,
+						typeIcon: storageToIcon(item.storage),
+						groupKey: 'context-instructions',
+						pluginUri: item.storage === PromptsStorage.plugin ? item.pluginUri : undefined,
+						disabled: disabledUris.has(item.uri),
+					});
+				} else {
+					// On-demand instruction
+					items.push({
+						id: item.uri.toString(),
+						uri: item.uri,
+						name: friendlyName,
+						filename: basename(item.uri),
+						displayName: friendlyName,
+						description: description,
+						storage: item.storage,
+						promptType,
+						typeIcon: storageToIcon(item.storage),
+						groupKey: 'on-demand-instructions',
+						pluginUri: item.storage === PromptsStorage.plugin ? item.pluginUri : undefined,
+						disabled: disabledUris.has(item.uri),
 					});
 				}
 			}
-
-			const workspaceItems = allItems.filter(item => item.storage === PromptsStorage.local);
-			const userItems = allItems.filter(item => item.storage === PromptsStorage.user);
-			const extensionItems = allItems.filter(item => item.storage === PromptsStorage.extension);
-			const pluginItems = allItems.filter(item => item.storage === PromptsStorage.plugin);
-			const builtinItems = allItems.filter(item => item.storage === BUILTIN_STORAGE);
-
-			const mapToListItem = (item: IPromptPath): IAICustomizationListItem => {
-				const filename = basename(item.uri);
-				// For instructions, derive a friendly name from filename
-				const friendlyName = item.name || this.getFriendlyName(filename);
-				return {
-					id: item.uri.toString(),
-					uri: item.uri,
-					name: friendlyName,
-					filename,
-					description: item.description,
-					storage: item.storage,
-					promptType,
-				};
-			};
-
-			items.push(...workspaceItems.map(mapToListItem));
-			items.push(...userItems.map(mapToListItem));
-			items.push(...extensionItems.map(mapToListItem));
-			items.push(...pluginItems.map(mapToListItem));
-			items.push(...builtinItems.map(mapToListItem));
 		}
 
+		// Assign built-in groupKeys — items from the default chat extension
+		// are re-grouped under "Built-in" instead of "Extensions".
+		// This is a single-pass transformation applied after all items are
+		// collected, keeping the item-building code free of grouping logic.
+		const groupedItems = this.applyBuiltinGroupKeys(items, extensionInfoByUri);
+
 		// Apply storage source filter (removes items not in visible sources or excluded user roots)
 		const filter = this.workspaceService.getStorageSourceFilter(promptType);
-		const filteredItems = applyStorageSourceFilter(items, filter);
+		const filteredItems = applyStorageSourceFilter(groupedItems, filter);
 		items.length = 0;
 		items.push(...filteredItems);
 
+		// Apply workspace subpath filter — when the active harness specifies
+		// workspaceSubpaths, hide workspace-local items that aren't under one
+		// of the recognized sub-paths (e.g. Claude only shows .claude/ items).
+		// Exception: instruction files matched by the harness's instructionFileFilter
+		// are exempt (e.g. CLAUDE.md at workspace root is a Claude-native file
+		// even though it's not under .claude/).
+		const descriptor = this.harnessService.getActiveDescriptor();
+		const subpaths = descriptor.workspaceSubpaths;
+		const instrFilter = descriptor.instructionFileFilter;
+		if (subpaths) {
+			const projectRoot = this.workspaceService.getActiveProjectRoot();
+			for (let i = items.length - 1; i >= 0; i--) {
+				const item = items[i];
+				if (item.storage === PromptsStorage.local && projectRoot && isEqualOrParent(item.uri, projectRoot)) {
+					if (!matchesWorkspaceSubpath(item.uri.path, subpaths)) {
+						// Keep instruction files that match the harness's native patterns
+						if (instrFilter && promptType === PromptsType.instructions && matchesInstructionFileFilter(item.uri.path, instrFilter)) {
+							continue;
+						}
+						items.splice(i, 1);
+					}
+				}
+			}
+		}
+
+		// Apply instruction file filter — when the active harness specifies
+		// instructionFileFilter, hide instruction files that don't match the
+		// recognized patterns (e.g. Claude doesn't support *.instructions.md).
+		if (instrFilter && promptType === PromptsType.instructions) {
+			for (let i = items.length - 1; i >= 0; i--) {
+				if (!matchesInstructionFileFilter(items[i].uri.path, instrFilter)) {
+					items.splice(i, 1);
+				}
+			}
+		}
+
 		// Sort items by name
 		items.sort((a, b) => a.name.localeCompare(b.name));
 
-		if (this.currentSection !== section) {
-			return; // section changed while loading
+		return items;
+	}
+
+	/**
+	 * Fetches items from the registered {@link IChatSessionCustomizationsProvider}
+	 * instead of the built-in {@link IPromptsService} discovery.
+	 */
+	private async _fetchItemsFromProvider(section: AICustomizationManagementSection): Promise<IAICustomizationListItem[]> {
+		const promptType = sectionToPromptType(section);
+
+		// Use the active harness ID as the session type
+		const activeHarness = this.harnessService.activeHarness.get();
+		const groups = await this.chatSessionsService.getCustomizations(activeHarness, CancellationToken.None);
+
+		if (!groups) {
+			return [];
 		}
 
-		this.allItems = items;
-		this.filterItems();
-		this._onDidChangeItemCount.fire(items.length);
+		// Filter groups to only those matching the current section
+		const matchingGroupIds = sectionToCustomizationGroupIds(section);
+		const filteredGroups = groups.filter(g => matchingGroupIds.includes(g.id));
+
+		const items: IAICustomizationListItem[] = [];
+		for (const group of filteredGroups) {
+			for (const item of group.items) {
+				items.push(mapProviderItemToListItem(item, group.id, promptType));
+			}
+		}
+
+		items.sort((a, b) => a.name.localeCompare(b.name));
+		return items;
 	}
 
 	/**
@@ -1011,7 +1657,7 @@ export class AICustomizationListWidget extends Disposable {
 	/**
 	 * Filters items based on the current search query and builds grouped display entries.
 	 */
-	private filterItems(): void {
+	private filterItems(): number {
 		let matchedItems: IAICustomizationListItem[];
 
 		if (!this.searchQuery.trim()) {
@@ -1023,12 +1669,13 @@ export class AICustomizationListWidget extends Disposable {
 			for (const item of this.allItems) {
 				// Compute matches against the formatted display name so highlight positions
 				// are correct even after .md stripping and title-casing.
-				const displayName = formatDisplayName(item.name);
+				const displayName = item.displayName ?? formatDisplayName(item.name);
 				const nameMatches = matchesContiguousSubString(query, displayName);
 				const descriptionMatches = item.description ? matchesContiguousSubString(query, item.description) : null;
 				const filenameMatches = matchesContiguousSubString(query, item.filename);
+				const badgeMatches = item.badge ? matchesContiguousSubString(query, item.badge) : null;
 
-				if (nameMatches || descriptionMatches || filenameMatches) {
+				if (nameMatches || descriptionMatches || filenameMatches || badgeMatches) {
 					matchedItems.push({
 						...item,
 						nameMatches: nameMatches || undefined,
@@ -1038,17 +1685,24 @@ export class AICustomizationListWidget extends Disposable {
 			}
 		}
 
-		// Group items by storage
+		// Group items — instructions use category-based grouping; other sections use storage-based
 		const promptType = sectionToPromptType(this.currentSection);
 		const visibleSources = new Set(this.workspaceService.getStorageSourceFilter(promptType).sources);
-		const groups: { groupKey: string; label: string; icon: ThemeIcon; description: string; items: IAICustomizationListItem[] }[] = [
-			{ groupKey: PromptsStorage.local, label: localize('workspaceGroup', "Workspace"), icon: workspaceIcon, description: localize('workspaceGroupDescription', "Customizations stored as files in your project folder and shared with your team via version control."), items: [] },
-			{ groupKey: PromptsStorage.user, label: localize('userGroup', "User"), icon: userIcon, description: localize('userGroupDescription', "Customizations stored locally on your machine in a central location. Private to you and available across all projects."), items: [] },
-			{ groupKey: PromptsStorage.extension, label: localize('extensionGroup', "Extensions"), icon: extensionIcon, description: localize('extensionGroupDescription', "Read-only customizations provided by installed extensions."), items: [] },
-			{ groupKey: PromptsStorage.plugin, label: localize('pluginGroup', "Plugins"), icon: pluginIcon, description: localize('pluginGroupDescription', "Read-only customizations provided by installed plugins."), items: [] },
-			{ groupKey: BUILTIN_STORAGE, label: localize('builtinGroup', "Built-in"), icon: builtinIcon, description: localize('builtinGroupDescription', "Built-in customizations shipped with the application."), items: [] },
-			{ groupKey: 'agents', label: localize('agentsGroup', "Agents"), icon: agentIcon, description: localize('agentsGroupDescription', "Hooks defined in agent files."), items: [] },
-		].filter(g => visibleSources.has(g.groupKey as PromptsStorage) || g.groupKey === 'agents');
+		const groups: { groupKey: string; label: string; icon: ThemeIcon; description: string; items: IAICustomizationListItem[] }[] =
+			this.currentSection === AICustomizationManagementSection.Instructions
+				? [
+					{ groupKey: 'agent-instructions', label: localize('agentInstructionsGroup', "Agent Instructions"), icon: instructionsIcon, description: localize('agentInstructionsGroupDescription', "Instruction files automatically loaded for all agent interactions (e.g. AGENTS.md, CLAUDE.md, copilot-instructions.md)."), items: [] },
+					{ groupKey: 'context-instructions', label: localize('contextInstructionsGroup', "Included Based on Context"), icon: instructionsIcon, description: localize('contextInstructionsGroupDescription', "Instructions automatically loaded when matching files are part of the context."), items: [] },
+					{ groupKey: 'on-demand-instructions', label: localize('onDemandInstructionsGroup', "Loaded on Demand"), icon: instructionsIcon, description: localize('onDemandInstructionsGroupDescription', "Instructions loaded only when explicitly referenced."), items: [] },
+				]
+				: [
+					{ groupKey: PromptsStorage.local, label: localize('workspaceGroup', "Workspace"), icon: workspaceIcon, description: localize('workspaceGroupDescription', "Customizations stored as files in your project folder and shared with your team via version control."), items: [] },
+					{ groupKey: PromptsStorage.user, label: localize('userGroup', "User"), icon: userIcon, description: localize('userGroupDescription', "Customizations stored locally on your machine in a central location. Private to you and available across all projects."), items: [] },
+					{ groupKey: PromptsStorage.plugin, label: localize('pluginGroup', "Plugins"), icon: pluginIcon, description: localize('pluginGroupDescription', "Read-only customizations provided by installed plugins."), items: [] },
+					{ groupKey: PromptsStorage.extension, label: localize('extensionGroup', "Extensions"), icon: extensionIcon, description: localize('extensionGroupDescription', "Read-only customizations provided by installed extensions."), items: [] },
+					{ groupKey: BUILTIN_STORAGE, label: localize('builtinGroup', "Built-in"), icon: builtinIcon, description: localize('builtinGroupDescription', "Built-in customizations shipped with the application."), items: [] },
+					{ groupKey: 'agents', label: localize('agentsGroup', "Agents"), icon: agentIcon, description: localize('agentsGroupDescription', "Hooks defined in agent files."), items: [] },
+				].filter(g => visibleSources.has(g.groupKey as PromptsStorage) || g.groupKey === 'agents');
 
 		for (const item of matchedItems) {
 			const key = item.groupKey ?? item.storage;
@@ -1095,6 +1749,7 @@ export class AICustomizationListWidget extends Disposable {
 
 		this.list.splice(0, this.list.length, this.displayEntries);
 		this.updateEmptyState();
+		return matchedItems.length;
 	}
 
 	/**
@@ -1152,6 +1807,18 @@ export class AICustomizationListWidget extends Disposable {
 		}
 	}
 
+	/**
+	 * Finds the plugin URI for an item URI by checking the known plugins.
+	 */
+	private findPluginUri(itemUri: URI): URI | undefined {
+		for (const plugin of this.agentPluginService.plugins.get()) {
+			if (isEqualOrParent(itemUri, plugin.uri)) {
+				return plugin.uri;
+			}
+		}
+		return undefined;
+	}
+
 	private getEmptyStateInfo(): { title: string; description: string } {
 		switch (this.currentSection) {
 			case AICustomizationManagementSection.Agents:
@@ -1214,32 +1881,36 @@ export class AICustomizationListWidget extends Disposable {
 		}
 	}
 
+	/**
+	 * Scrolls the list so the last item is visible.
+	 */
+	revealLastItem(): void {
+		if (this.displayEntries.length > 0) {
+			this.list.reveal(this.displayEntries.length - 1);
+		}
+	}
+
 	/**
 	 * Layouts the widget.
 	 */
 	layout(height: number, width: number): void {
-		const sectionFooterHeight = this.sectionHeader.offsetHeight || 0;
-		const searchBarHeight = this.searchAndButtonContainer.offsetHeight || 52;
-		const listHeight = height - sectionFooterHeight - searchBarHeight;
-
+		this.element.style.height = `${height}px`;
 		this.searchInput.layout();
-		this.listContainer.style.height = `${Math.max(0, listHeight)}px`;
-		this.list.layout(Math.max(0, listHeight), width);
 
-		// Re-layout once after footer renders if we used a zero fallback
-		if (sectionFooterHeight === 0) {
-			DOM.getWindow(this.listContainer).requestAnimationFrame(() => {
-				if (this._store.isDisposed) {
-					return;
-				}
-				const actualFooterHeight = this.sectionHeader.offsetHeight;
-				if (actualFooterHeight > 0) {
-					const correctedHeight = height - actualFooterHeight - searchBarHeight;
-					this.listContainer.style.height = `${Math.max(0, correctedHeight)}px`;
-					this.list.layout(Math.max(0, correctedHeight), width);
-				}
-			});
+		// Measure sibling elements to calculate the remaining space for the list.
+		// When offsetHeight returns 0 the container just became visible
+		// after display:none and the browser hasn't reflowed yet — defer
+		// layout to the next frame so measurements are accurate.
+		const searchBarHeight = this.searchAndButtonContainer.offsetHeight;
+		if (searchBarHeight === 0) {
+			DOM.getWindow(this.element).requestAnimationFrame(() => this.layout(height, width));
+			return;
 		}
+		const footerHeight = this.sectionHeader.offsetHeight;
+		const listHeight = Math.max(0, height - searchBarHeight - footerHeight);
+
+		this.listContainer.style.height = `${listHeight}px`;
+		this.list.layout(listHeight, width);
 	}
 
 	/**
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidgetUtils.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidgetUtils.ts
index dbe55af4e77..ec6730aefac 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidgetUtils.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationListWidgetUtils.ts
@@ -6,15 +6,13 @@
 import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
 
 /**
- * Truncates a description string to the first sentence, with a maximum character fallback.
+ * Truncates a description string to the first line.
+ * The UI applies CSS text-overflow ellipsis for width overflow.
  */
-export function truncateToFirstSentence(text: string, maxChars = 120): string {
-	const match = text.match(/^[^.!?]*[.!?]/);
-	if (match && match[0].length <= maxChars) {
-		return match[0];
-	}
-	if (text.length > maxChars) {
-		return text.substring(0, maxChars).trimEnd() + '\u2026';
+export function truncateToFirstLine(text: string): string {
+	const newlineIndex = text.search(/[\r\n]/);
+	if (newlineIndex !== -1) {
+		return text.substring(0, newlineIndex);
 	}
 	return text;
 }
@@ -27,5 +25,5 @@ export function getCustomizationSecondaryText(description: string | undefined, f
 		return filename;
 	}
 
-	return promptType === PromptsType.hook ? description : truncateToFirstSentence(description);
+	return promptType === PromptsType.hook ? description : truncateToFirstLine(description);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.ts
index 7011d2094f6..ac7d63aba97 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.contribution.ts
@@ -3,41 +3,68 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isMacintosh, isWindows } from '../../../../../base/common/platform.js';
+import { basename, dirname, isEqualOrParent } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { localize, localize2 } from '../../../../../nls.js';
 import { Action2, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { FileSystemProviderCapabilities, IFileService } from '../../../../../platform/files/common/files.js';
 import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
-import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../../../browser/editor.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../../browser/editor.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
 import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../../../../common/editor.js';
 import { EditorInput } from '../../../../common/editor/editorInput.js';
-import { IEditorService, MODAL_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IAICustomizationWorkspaceService } from '../../common/aiCustomizationWorkspaceService.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { IAgentPluginService } from '../../common/plugins/agentPluginService.js';
+import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
-import { AICustomizationManagementEditor } from './aiCustomizationManagementEditor.js';
-import { AICustomizationManagementEditorInput } from './aiCustomizationManagementEditorInput.js';
+import { AgentPluginItemKind } from '../agentPluginEditor/agentPluginItems.js';
 import {
+	AI_CUSTOMIZATION_ITEM_DISABLED_KEY,
+	AI_CUSTOMIZATION_ITEM_STORAGE_KEY,
+	AI_CUSTOMIZATION_ITEM_TYPE_KEY,
+	AI_CUSTOMIZATION_ITEM_URI_KEY,
 	AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID,
 	AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID,
 	AICustomizationManagementCommands,
 	AICustomizationManagementItemMenuId,
 	AICustomizationManagementSection,
+	BUILTIN_STORAGE,
 } from './aiCustomizationManagement.js';
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
-import { PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
-import { IAICustomizationWorkspaceService } from '../../common/aiCustomizationWorkspaceService.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ChatConfiguration } from '../../common/constants.js';
-import { IFileService } from '../../../../../platform/files/common/files.js';
-import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
-import { basename, dirname } from '../../../../../base/common/resources.js';
-import { Schemas } from '../../../../../base/common/network.js';
-import { isWindows, isMacintosh } from '../../../../../base/common/platform.js';
+import { AICustomizationManagementEditor } from './aiCustomizationManagementEditor.js';
+import { AICustomizationManagementEditorInput } from './aiCustomizationManagementEditorInput.js';
+
+//#region Telemetry
+
+type CustomizationEditorDeleteItemEvent = {
+	promptType: string;
+	storage: string;
+};
+
+type CustomizationEditorDeleteItemClassification = {
+	promptType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of customization being deleted.' };
+	storage: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The storage location of the deleted item.' };
+	owner: 'joshspicer';
+	comment: 'Tracks item deletion in the Chat Customizations editor.';
+};
+
+//#endregion
 
 //#region Editor Registration
 
@@ -129,6 +156,20 @@ function extractPromptType(context: AICustomizationContext): PromptsType | undef
 	return context.promptType;
 }
 
+/**
+ * Extracts the parent plugin URI from context, if present.
+ */
+function extractPluginUri(context: AICustomizationContext): URI | undefined {
+	if (URI.isUri(context) || typeof context === 'string') {
+		return undefined;
+	}
+	const raw = context.pluginUri;
+	if (!raw) {
+		return undefined;
+	}
+	return URI.isUri(raw) ? raw : typeof raw === 'string' ? URI.parse(raw) : undefined;
+}
+
 // Open file action
 const OPEN_AI_CUSTOMIZATION_MGMT_FILE_ID = 'aiCustomizationManagement.openFile';
 registerAction2(class extends Action2 {
@@ -141,9 +182,19 @@ registerAction2(class extends Action2 {
 	}
 	async run(accessor: ServicesAccessor, context: AICustomizationContext): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		await editorService.openEditor({
+		const storage = extractStorage(context);
+
+		const editorPane = await editorService.openEditor({
 			resource: extractURI(context)
 		});
+
+		const codeEditor = getCodeEditor(editorPane?.getControl());
+		if (codeEditor && (storage === PromptsStorage.extension || storage === PromptsStorage.plugin)) {
+			codeEditor.updateOptions({
+				readOnly: true,
+				readOnlyMessage: new MarkdownString(localize('readonlyPluginFile', "This file is provided by a plugin or extension and cannot be edited.")),
+			});
+		}
 	}
 });
 
@@ -209,8 +260,26 @@ registerAction2(class extends Action2 {
 		// For skills, use the parent folder name since skills are structured as <skillname>/SKILL.md.
 		const fileName = isSkill ? basename(dirname(uri)) : basename(uri);
 
-		// Extension and plugin files cannot be deleted
-		if (storage === PromptsStorage.extension || storage === PromptsStorage.plugin) {
+		// Plugin-provided files: offer to uninstall the plugin
+		if (storage === PromptsStorage.plugin) {
+			const agentPluginService = accessor.get(IAgentPluginService);
+			const plugin = agentPluginService.plugins.get().find(p => isEqualOrParent(uri, p.uri));
+			if (plugin) {
+				const result = await dialogService.confirm({
+					message: localize('cannotDeletePluginItem', "This item is provided by the plugin '{0}'", plugin.label),
+					detail: localize('cannotDeletePluginItemDetail', "Individual components from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"),
+					primaryButton: localize('uninstallPlugin', "Uninstall Plugin"),
+					type: 'question',
+				});
+				if (result.confirmed) {
+					plugin.remove();
+				}
+			}
+			return;
+		}
+
+		// Extension and built-in files cannot be deleted
+		if (storage === PromptsStorage.extension || storage === BUILTIN_STORAGE) {
 			await dialogService.info(
 				localize('cannotDeleteExtension', "Cannot Delete Extension File"),
 				localize('cannotDeleteExtensionDetail', "Files provided by extensions cannot be deleted. You can disable the extension if you no longer want to use this customization.")
@@ -230,10 +299,21 @@ registerAction2(class extends Action2 {
 		});
 
 		if (confirmation.confirmed) {
+			try {
+				const telemetryService = accessor.get(ITelemetryService);
+				telemetryService.publicLog2<CustomizationEditorDeleteItemEvent, CustomizationEditorDeleteItemClassification>('chatCustomizationEditor.deleteItem', {
+					promptType: promptType ?? '',
+					storage: storage ?? '',
+				});
+			} catch {
+				// Telemetry must not block deletion
+			}
+
 			// For skills, delete the parent folder (e.g. .github/skills/my-skill/)
 			// since each skill is a folder containing SKILL.md.
 			const deleteTarget = isSkill ? dirname(uri) : uri;
-			await fileService.del(deleteTarget, { useTrash: true, recursive: isSkill });
+			const useTrash = fileService.hasCapability(deleteTarget, FileSystemProviderCapabilities.Trash);
+			await fileService.del(deleteTarget, { useTrash, recursive: isSkill });
 
 			// Commit the deletion to git (sessions: main repo + worktree)
 			if (storage === PromptsStorage.local) {
@@ -247,10 +327,55 @@ registerAction2(class extends Action2 {
 	}
 });
 
-// Context Key for prompt type to conditionally show "Run Prompt"
-const AI_CUSTOMIZATION_ITEM_TYPE_KEY = 'aiCustomizationManagementItemType';
+// Copy path action
+const COPY_AI_CUSTOMIZATION_PATH_ID = 'aiCustomizationManagement.copyPath';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: COPY_AI_CUSTOMIZATION_PATH_ID,
+			title: localize2('copyPath', "Copy Path"),
+			icon: Codicon.clippy,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: AICustomizationContext): Promise<void> {
+		const clipboardService = accessor.get(IClipboardService);
+		const uri = extractURI(context);
+		const textToCopy = uri.scheme === 'file' ? uri.fsPath : uri.toString(true);
+		await clipboardService.writeText(textToCopy);
+	}
+});
+
+/**
+ * When clause that hides an action for read-only (extension, plugin, built-in) items.
+ */
+const WHEN_ITEM_IS_DELETABLE = ContextKeyExpr.and(
+	ContextKeyExpr.notEquals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, PromptsStorage.extension),
+	ContextKeyExpr.notEquals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, PromptsStorage.plugin),
+	ContextKeyExpr.notEquals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, BUILTIN_STORAGE),
+);
+
+/**
+ * When clause that shows an action only for plugin items.
+ */
+const WHEN_ITEM_IS_PLUGIN = ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, PromptsStorage.plugin);
 
 // Register context menu items
+
+// Inline hover actions (shown as icon buttons on hover)
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: COPY_AI_CUSTOMIZATION_PATH_ID, title: localize('copyPath', "Copy Path"), icon: Codicon.clippy },
+	group: 'inline',
+	order: 1,
+});
+
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: DELETE_AI_CUSTOMIZATION_ID, title: localize('delete', "Delete"), icon: Codicon.trash },
+	group: 'inline',
+	order: 10,
+	when: WHEN_ITEM_IS_DELETABLE,
+});
+
+// Context menu items (shown on right-click)
 MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 	command: { id: OPEN_AI_CUSTOMIZATION_MGMT_FILE_ID, title: localize('open', "Open") },
 	group: '1_open',
@@ -269,8 +394,8 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 	group: '3_file',
 	order: 1,
 	when: ContextKeyExpr.or(
-		ContextKeyExpr.regex('aiCustomizationManagementItemUri', new RegExp(`^${Schemas.file}:`)),
-		ContextKeyExpr.regex('aiCustomizationManagementItemUri', new RegExp(`^${Schemas.vscodeUserData}:`))
+		ContextKeyExpr.regex(AI_CUSTOMIZATION_ITEM_URI_KEY, new RegExp(`^${Schemas.file}:`)),
+		ContextKeyExpr.regex(AI_CUSTOMIZATION_ITEM_URI_KEY, new RegExp(`^${Schemas.vscodeUserData}:`))
 	),
 });
 
@@ -278,6 +403,195 @@ MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
 	command: { id: DELETE_AI_CUSTOMIZATION_ID, title: localize('delete', "Delete") },
 	group: '4_modify',
 	order: 1,
+	when: WHEN_ITEM_IS_DELETABLE,
+});
+
+// Uninstall Plugin action - shown for plugin-provided items
+const UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID = 'aiCustomizationManagement.uninstallPlugin';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID,
+			title: localize2('uninstallPlugin', "Uninstall Plugin"),
+			icon: Codicon.trash,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: AICustomizationContext): Promise<void> {
+		const agentPluginService = accessor.get(IAgentPluginService);
+		const dialogService = accessor.get(IDialogService);
+
+		const uri = extractURI(context);
+		const plugin = agentPluginService.plugins.get().find(p => isEqualOrParent(uri, p.uri));
+		if (!plugin) {
+			return;
+		}
+
+		const result = await dialogService.confirm({
+			message: localize('confirmUninstallPlugin', "This item is provided by the plugin '{0}'", plugin.label),
+			detail: localize('confirmUninstallPluginDetail', "Individual components from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"),
+			primaryButton: localize('uninstallPluginBtn', "Uninstall Plugin"),
+			type: 'question',
+		});
+		if (result.confirmed) {
+			plugin.remove();
+		}
+	}
+});
+
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID, title: localize('uninstallPlugin', "Uninstall Plugin"), icon: Codicon.trash },
+	group: 'inline',
+	order: 10,
+	when: WHEN_ITEM_IS_PLUGIN,
+});
+
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: UNINSTALL_PLUGIN_AI_CUSTOMIZATION_ID, title: localize('uninstallPlugin', "Uninstall Plugin") },
+	group: '4_modify',
+	order: 1,
+	when: WHEN_ITEM_IS_PLUGIN,
+});
+
+// Show Plugin action - navigates to the parent plugin detail page
+const SHOW_PLUGIN_AI_CUSTOMIZATION_ID = 'aiCustomizationManagement.showPlugin';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: SHOW_PLUGIN_AI_CUSTOMIZATION_ID,
+			title: localize2('showPlugin', "Show Plugin"),
+		});
+	}
+	async run(accessor: ServicesAccessor, context: AICustomizationContext): Promise<void> {
+		const agentPluginService = accessor.get(IAgentPluginService);
+		const editorService = accessor.get(IEditorService);
+
+		const pluginUri = extractPluginUri(context);
+		if (!pluginUri) {
+			return;
+		}
+		const plugin = agentPluginService.plugins.get().find(p => p.uri.toString() === pluginUri.toString());
+		if (!plugin) {
+			return;
+		}
+
+		const item = {
+			kind: AgentPluginItemKind.Installed as const,
+			name: plugin.label,
+			description: plugin.fromMarketplace?.description ?? '',
+			marketplace: plugin.fromMarketplace?.marketplace,
+			plugin,
+		};
+
+		// Try to show within the active AI Customization editor (with back navigation)
+		const input = AICustomizationManagementEditorInput.getOrCreate();
+		const pane = await editorService.openEditor(input, { pinned: true });
+		if (pane instanceof AICustomizationManagementEditor) {
+			await pane.showPluginDetail(item);
+		}
+	}
+});
+
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: SHOW_PLUGIN_AI_CUSTOMIZATION_ID, title: localize('showPlugin', "Show Plugin") },
+	group: '1_open',
+	order: 2,
+	when: WHEN_ITEM_IS_PLUGIN,
+});
+
+// Disable item action
+const DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID = 'aiCustomizationManagement.disableItem';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
+			title: localize2('disable', "Disable"),
+			icon: Codicon.eyeClosed,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: AICustomizationContext): Promise<void> {
+		const promptsService = accessor.get(IPromptsService);
+		const uri = extractURI(context);
+		const promptType = extractPromptType(context);
+		if (!promptType) {
+			return;
+		}
+
+		const disabled = promptsService.getDisabledPromptFiles(promptType);
+		disabled.add(uri);
+		promptsService.setDisabledPromptFiles(promptType, disabled);
+	}
+});
+
+// Enable item action
+const ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID = 'aiCustomizationManagement.enableItem';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID,
+			title: localize2('enable', "Enable"),
+			icon: Codicon.eye,
+		});
+	}
+	async run(accessor: ServicesAccessor, context: AICustomizationContext): Promise<void> {
+		const promptsService = accessor.get(IPromptsService);
+		const uri = extractURI(context);
+		const promptType = extractPromptType(context);
+		if (!promptType) {
+			return;
+		}
+
+		const disabled = promptsService.getDisabledPromptFiles(promptType);
+		disabled.delete(uri);
+		promptsService.setDisabledPromptFiles(promptType, disabled);
+	}
+});
+
+// Context menu: Disable (shown when builtin item is enabled)
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID, title: localize('disable', "Disable") },
+	group: '5_toggle',
+	order: 1,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_DISABLED_KEY, false),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_TYPE_KEY, PromptsType.skill),
+	),
+});
+
+// Context menu: Enable (shown when builtin item is disabled)
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID, title: localize('enable', "Enable") },
+	group: '5_toggle',
+	order: 1,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_DISABLED_KEY, true),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_TYPE_KEY, PromptsType.skill),
+	),
+});
+
+// Inline hover: Disable (shown when builtin item is enabled)
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: DISABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID, title: localize('disable', "Disable"), icon: Codicon.eyeClosed },
+	group: 'inline',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_DISABLED_KEY, false),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_TYPE_KEY, PromptsType.skill),
+	),
+});
+
+// Inline hover: Enable (shown when builtin item is disabled)
+MenuRegistry.appendMenuItem(AICustomizationManagementItemMenuId, {
+	command: { id: ENABLE_AI_CUSTOMIZATION_MGMT_ITEM_ID, title: localize('enable', "Enable"), icon: Codicon.eye },
+	group: 'inline',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_DISABLED_KEY, true),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_STORAGE_KEY, BUILTIN_STORAGE),
+		ContextKeyExpr.equals(AI_CUSTOMIZATION_ITEM_TYPE_KEY, PromptsType.skill),
+	),
 });
 
 //#endregion
@@ -310,7 +624,7 @@ class AICustomizationManagementActionsContribution extends Disposable implements
 			async run(accessor: ServicesAccessor, section?: AICustomizationManagementSection): Promise<void> {
 				const editorService = accessor.get(IEditorService);
 				const input = AICustomizationManagementEditorInput.getOrCreate();
-				const pane = await editorService.openEditor(input, { pinned: true }, MODAL_GROUP);
+				const pane = await editorService.openEditor(input, { pinned: true });
 				if (section && pane instanceof AICustomizationManagementEditor) {
 					pane.selectSectionById(section);
 				}
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.ts
index e9ed6863b8f..d6439837a8e 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.ts
@@ -5,23 +5,13 @@
 
 import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 import { AICustomizationManagementSection } from '../../common/aiCustomizationWorkspaceService.js';
-import { PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
 import { localize } from '../../../../../nls.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 
 // Re-export for convenience — consumers import from this file
 export { AICustomizationManagementSection } from '../../common/aiCustomizationWorkspaceService.js';
-
-/**
- * Extended storage type for AI Customization that includes built-in prompts
- * shipped with the application, alongside the core `PromptsStorage` values.
- */
-export type AICustomizationPromptsStorage = PromptsStorage | 'builtin';
-
-/**
- * Storage type discriminator for built-in prompts shipped with the application.
- */
-export const BUILTIN_STORAGE: AICustomizationPromptsStorage = 'builtin';
+export type { AICustomizationPromptsStorage } from '../../common/aiCustomizationWorkspaceService.js';
+export { BUILTIN_STORAGE } from '../../common/aiCustomizationWorkspaceService.js';
 
 /**
  * Editor pane ID for the AI Customizations Management Editor.
@@ -72,6 +62,31 @@ export const AICustomizationManagementTitleMenuId = MenuId.for('AICustomizationM
  */
 export const AICustomizationManagementItemMenuId = MenuId.for('AICustomizationManagementEditorItem');
 
+/**
+ * Context key for the item prompt type (e.g. 'prompt', 'agent') used in when-clause filtering.
+ */
+export const AI_CUSTOMIZATION_ITEM_TYPE_KEY = 'aiCustomizationManagementItemType';
+
+/**
+ * Context key for the item storage type (e.g. 'local', 'user', 'extension') used in when-clause filtering.
+ */
+export const AI_CUSTOMIZATION_ITEM_STORAGE_KEY = 'aiCustomizationManagementItemStorage';
+
+/**
+ * Context key for the item URI used in when-clause filtering.
+ */
+export const AI_CUSTOMIZATION_ITEM_URI_KEY = 'aiCustomizationManagementItemUri';
+
+/**
+ * Context key for the parent plugin URI, set when the item is provided by a plugin.
+ */
+export const AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY = 'aiCustomizationManagementItemPluginUri';
+
+/**
+ * Context key indicating whether the item is disabled.
+ */
+export const AI_CUSTOMIZATION_ITEM_DISABLED_KEY = 'aiCustomizationManagementItemDisabled';
+
 /**
  * Storage key for persisting the selected section.
  */
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditor.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditor.ts
index 6de3558b5c3..f5de7aec226 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditor.ts
@@ -5,8 +5,10 @@
 
 import './media/aiCustomizationManagement.css';
 import * as DOM from '../../../../../base/browser/dom.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
 import { DisposableStore, IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { Event } from '../../../../../base/common/event.js';
 import { autorun } from '../../../../../base/common/observable.js';
@@ -27,7 +29,7 @@ import { IListVirtualDelegate, IListRenderer } from '../../../../../base/browser
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { basename, dirname, isEqual, isEqualOrParent } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { registerColor } from '../../../../../platform/theme/common/colorRegistry.js';
 import { PANEL_BORDER } from '../../../../common/theme.js';
@@ -53,6 +55,7 @@ import { agentIcon, instructionsIcon, promptIcon, skillIcon, hookIcon, pluginIco
 import { ChatModelsWidget } from '../chatManagement/chatModelsWidget.js';
 import { PromptsType, Target } from '../../common/promptSyntax/promptTypes.js';
 import { IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
+import { AGENT_MD_FILENAME } from '../../common/promptSyntax/config/promptFileLocations.js';
 import { INewPromptOptions, NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID, NEW_SKILL_COMMAND_ID } from '../promptSyntax/newPromptFileActions.js';
 import { showConfigureHooksQuickPick } from '../promptSyntax/hookActions.js';
 import { resolveWorkspaceTargetDirectory, resolveUserTargetDirectory } from './customizationCreatorService.js';
@@ -71,6 +74,8 @@ import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.js';
 import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { Action } from '../../../../../base/common/actions.js';
 import { McpServerEditorInput } from '../../../mcp/browser/mcpServerEditorInput.js';
 import { McpServerEditor } from '../../../mcp/browser/mcpServerEditor.js';
 import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
@@ -78,9 +83,79 @@ import { IWorkbenchMcpServer } from '../../../mcp/common/mcpTypes.js';
 import { AgentPluginEditor } from '../agentPluginEditor/agentPluginEditor.js';
 import { AgentPluginEditorInput } from '../agentPluginEditor/agentPluginEditorInput.js';
 import { IAgentPluginItem } from '../agentPluginEditor/agentPluginItems.js';
+import { ICustomizationHarnessService, CustomizationHarness, matchesWorkspaceSubpath } from '../../common/customizationHarnessService.js';
+import { ChatConfiguration } from '../../common/constants.js';
 
 const $ = DOM.$;
 
+//#region Telemetry
+
+type CustomizationEditorOpenedEvent = {
+	section: string;
+};
+
+type CustomizationEditorOpenedClassification = {
+	section: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The initially selected section when the editor opens.' };
+	owner: 'joshspicer';
+	comment: 'Tracks when the Chat Customizations editor is opened.';
+};
+
+type CustomizationEditorSectionChangedEvent = {
+	section: string;
+};
+
+type CustomizationEditorSectionChangedClassification = {
+	section: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The section the user navigated to.' };
+	owner: 'joshspicer';
+	comment: 'Tracks section navigation within the Chat Customizations editor.';
+};
+
+type CustomizationEditorItemSelectedEvent = {
+	section: string;
+	promptType: string;
+	storage: string;
+};
+
+type CustomizationEditorItemSelectedClassification = {
+	section: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The active section when the item was selected.' };
+	promptType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The prompt type of the selected item.' };
+	storage: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The storage location of the selected item (local, user, extension, plugin, builtin).' };
+	owner: 'joshspicer';
+	comment: 'Tracks item selection in the Chat Customizations editor.';
+};
+
+type CustomizationEditorCreateItemEvent = {
+	section: string;
+	promptType: string;
+	creationMode: 'ai' | 'manual';
+	target: string;
+};
+
+type CustomizationEditorCreateItemClassification = {
+	section: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The active section when the item was created.' };
+	promptType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of customization being created.' };
+	creationMode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the item was created via AI-guided flow or manual creation.' };
+	target: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The target storage for the new item (workspace, user).' };
+	owner: 'joshspicer';
+	comment: 'Tracks customization creation in the Chat Customizations editor.';
+};
+
+type CustomizationEditorSaveItemEvent = {
+	promptType: string;
+	storage: string;
+	saveTarget: string;
+};
+
+type CustomizationEditorSaveItemClassification = {
+	promptType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of customization being saved.' };
+	storage: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The original storage location of the item.' };
+	saveTarget: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The target storage for the save (workspace, user, existing).' };
+	owner: 'joshspicer';
+	comment: 'Tracks save actions in the Chat Customizations editor.';
+};
+
+//#endregion
+
 export const aiCustomizationManagementSashBorder = registerColor(
 	'aiCustomizationManagement.sashBorder',
 	PANEL_BORDER,
@@ -93,6 +168,7 @@ interface ISectionItem {
 	readonly id: AICustomizationManagementSection;
 	readonly label: string;
 	readonly icon: ThemeIcon;
+	count: number;
 }
 
 interface ISaveTargetQuickPickItem extends IQuickPickItem {
@@ -105,6 +181,7 @@ interface IBuiltinPromptSaveRequest {
 	readonly folder: URI;
 	readonly sourceUri: URI;
 	readonly content: string;
+	readonly promptType: PromptsType;
 	readonly projectRoot?: URI;
 }
 
@@ -128,6 +205,7 @@ interface ISectionItemTemplateData {
 	readonly container: HTMLElement;
 	readonly icon: HTMLElement;
 	readonly label: HTMLElement;
+	readonly count: HTMLElement;
 }
 
 class SectionItemRenderer implements IListRenderer<ISectionItem, ISectionItemTemplateData> {
@@ -137,13 +215,21 @@ class SectionItemRenderer implements IListRenderer<ISectionItem, ISectionItemTem
 		container.classList.add('section-list-item');
 		const icon = DOM.append(container, $('.section-icon'));
 		const label = DOM.append(container, $('.section-label'));
-		return { container, icon, label };
+		const count = DOM.append(container, $('.section-count'));
+		return { container, icon, label, count };
 	}
 
 	renderElement(element: ISectionItem, index: number, templateData: ISectionItemTemplateData): void {
 		templateData.icon.className = 'section-icon';
 		templateData.icon.classList.add(...ThemeIcon.asClassNameArray(element.icon));
 		templateData.label.textContent = element.label;
+		if (element.count > 0) {
+			templateData.count.textContent = String(element.count);
+			templateData.count.style.display = '';
+		} else {
+			templateData.count.textContent = '';
+			templateData.count.style.display = 'none';
+		}
 	}
 
 	disposeTemplate(): void { }
@@ -203,12 +289,16 @@ export class AICustomizationManagementEditor extends EditorPane {
 	private pluginDetailContainer: HTMLElement | undefined;
 	private embeddedPluginEditor: AgentPluginEditor | undefined;
 	private readonly pluginDetailDisposables = this._register(new DisposableStore());
+	/** Section to restore when navigating back from plugin detail (when opened from a non-plugin section). */
+	private pluginDetailReturnSection: AICustomizationManagementSection | undefined;
 
 	private dimension: DOM.Dimension | undefined;
 	private readonly sections: ISectionItem[] = [];
+	private readonly allSections: ISectionItem[] = [];
 	private selectedSection: AICustomizationManagementSection = AICustomizationManagementSection.Agents;
 
 	private readonly editorDisposables = this._register(new DisposableStore());
+	private readonly promptsSectionCountScheduler = this._register(new RunOnceScheduler(() => this._doRefreshAllPromptsSectionCounts(), 100));
 	private _editorContentChanged = false;
 
 	// Folder picker (sessions window only)
@@ -216,6 +306,12 @@ export class AICustomizationManagementEditor extends EditorPane {
 	private folderPickerLabel: HTMLElement | undefined;
 	private folderPickerClearButton: HTMLElement | undefined;
 
+	// Harness dropdown
+	private harnessDropdownContainer: HTMLElement | undefined;
+	private harnessDropdownButton: HTMLElement | undefined;
+	private harnessDropdownIcon: HTMLElement | undefined;
+	private harnessDropdownLabel: HTMLElement | undefined;
+
 	private readonly inEditorContextKey: IContextKey<boolean>;
 	private readonly sectionContextKey: IContextKey<string>;
 
@@ -237,8 +333,10 @@ export class AICustomizationManagementEditor extends EditorPane {
 		@IHoverService private readonly hoverService: IHoverService,
 		@IModelService private readonly modelService: IModelService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IFileService private readonly fileService: IFileService,
 		@INotificationService private readonly notificationService: INotificationService,
+		@ICustomizationHarnessService private readonly harnessService: ICustomizationHarnessService,
 	) {
 		super(AICustomizationManagementEditor.ID, group, telemetryService, themeService, storageService);
 
@@ -272,9 +370,10 @@ export class AICustomizationManagementEditor extends EditorPane {
 		for (const id of this.workspaceService.managementSections) {
 			const info = sectionInfo[id];
 			if (info) {
-				this.sections.push({ id, ...info });
+				this.allSections.push({ id, ...info, count: 0 });
 			}
 		}
+		this.rebuildVisibleSections();
 
 		// Restore selected section from storage, falling back to first available
 		const savedSection = this.storageService.get(AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY, StorageScope.PROFILE);
@@ -370,9 +469,55 @@ export class AICustomizationManagementEditor extends EditorPane {
 		}));
 	}
 
+	/**
+	 * Whether the harness selector UI is enabled.
+	 * When disabled, the editor behaves as if "Local" is always selected.
+	 */
+	private get isHarnessSelectorEnabled(): boolean {
+		return this.configurationService.getValue<boolean>(ChatConfiguration.ChatCustomizationHarnessSelectorEnabled) !== false;
+	}
+
+	/**
+	 * Rebuilds the visible sections list based on the active harness's
+	 * `hiddenSections`. If the current selection falls into a hidden
+	 * section, the first visible section is selected instead.
+	 */
+	private rebuildVisibleSections(): void {
+		let hidden: Set<string>;
+		if (this.isHarnessSelectorEnabled) {
+			const activeId = this.harnessService.activeHarness.get();
+			const descriptor = this.harnessService.availableHarnesses.get().find(h => h.id === activeId);
+			hidden = new Set(descriptor?.hiddenSections ?? []);
+		} else {
+			hidden = new Set(); // Local harness has no hidden sections
+		}
+
+		this.sections.length = 0;
+		for (const s of this.allSections) {
+			if (!hidden.has(s.id)) {
+				this.sections.push(s);
+			}
+		}
+
+		// Update the list widget if it exists
+		if (this.sectionsList) {
+			this.sectionsList.splice(0, this.sectionsList.length, this.sections);
+		}
+
+		// If the current selection is hidden, fall back to first visible
+		if (!this.sections.some(s => s.id === this.selectedSection) && this.sections.length > 0) {
+			this.selectSection(this.sections[0].id);
+		} else {
+			this.ensureSectionsListReflectsActiveSection();
+		}
+	}
+
 	private createSidebar(): void {
 		const sidebarContent = DOM.append(this.sidebarContainer, $('.sidebar-content'));
 
+		// Harness dropdown (shown when multiple harnesses available)
+		this.createHarnessDropdown(sidebarContent);
+
 		// Main sections list container (takes remaining space)
 		const sectionsListContainer = DOM.append(sidebarContent, $('.sidebar-sections-list'));
 
@@ -408,12 +553,105 @@ export class AICustomizationManagementEditor extends EditorPane {
 			this.selectSection(e.elements[0].id);
 		}));
 
+		// React to harness changes — rebuild visible sections and refresh counts.
+		// Also track availableHarnesses to handle agent registration/unregistration.
+		this.editorDisposables.add(autorun(reader => {
+			const available = this.harnessService.availableHarnesses.read(reader);
+			const activeId = this.harnessService.activeHarness.read(reader);
+
+			// If the active harness is no longer available, fall back to the default
+			if (!available.some(h => h.id === activeId) && available.length > 0) {
+				this.harnessService.setActiveHarness(available[0].id);
+				return; // setActiveHarness will trigger another autorun cycle
+			}
+
+			this.rebuildVisibleSections();
+			this.updateHarnessDropdown();
+			this.refreshAllPromptsSectionCounts();
+		}));
+
+		// When the harness selector setting is off, lock to Local harness.
+		// In Sessions (single CLI harness) the dropdown is already hidden and
+		// setActiveHarness(VSCode) is a safe no-op since the CLI harness
+		// remains active — filtering stays correct for that window.
+		if (!this.isHarnessSelectorEnabled) {
+			this.harnessService.setActiveHarness(CustomizationHarness.VSCode);
+		}
+		this.editorDisposables.add(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.ChatCustomizationHarnessSelectorEnabled)) {
+				if (!this.isHarnessSelectorEnabled) {
+					this.harnessService.setActiveHarness(CustomizationHarness.VSCode);
+				}
+			}
+		}));
+
 		// Folder picker (sessions window only)
 		if (this.workspaceService.isSessionsWindow) {
 			this.createFolderPicker(sidebarContent);
 		}
 	}
 
+	private createHarnessDropdown(sidebarContent: HTMLElement): void {
+		if (!this.isHarnessSelectorEnabled) {
+			return;
+		}
+
+		const container = this.harnessDropdownContainer = DOM.append(sidebarContent, $('.sidebar-harness-dropdown'));
+
+		this.harnessDropdownButton = DOM.append(container, $('button.harness-dropdown-button'));
+		this.harnessDropdownButton.setAttribute('aria-label', localize('selectHarness', "Select customization target"));
+		this.harnessDropdownButton.setAttribute('aria-haspopup', 'listbox');
+
+		this.harnessDropdownIcon = DOM.append(this.harnessDropdownButton, $('span.harness-dropdown-icon'));
+		this.harnessDropdownLabel = DOM.append(this.harnessDropdownButton, $('span.harness-dropdown-label'));
+		DOM.append(this.harnessDropdownButton, $('span.harness-dropdown-chevron.codicon.codicon-chevron-down'));
+
+		this.updateHarnessDropdown();
+
+		this.editorDisposables.add(DOM.addDisposableListener(this.harnessDropdownButton, 'click', () => {
+			this.showHarnessMenu();
+		}));
+	}
+
+	private updateHarnessDropdown(): void {
+		if (!this.harnessDropdownContainer || !this.harnessDropdownIcon || !this.harnessDropdownLabel) {
+			return;
+		}
+		const harnesses = this.harnessService.availableHarnesses.get();
+		// Hide dropdown when only one harness is available
+		this.harnessDropdownContainer.style.display = harnesses.length <= 1 ? 'none' : '';
+
+		const activeId = this.harnessService.activeHarness.get();
+		const descriptor = harnesses.find(h => h.id === activeId);
+		if (descriptor) {
+			this.harnessDropdownIcon.className = 'harness-dropdown-icon';
+			this.harnessDropdownIcon.classList.add(...ThemeIcon.asClassNameArray(descriptor.icon));
+			this.harnessDropdownLabel.textContent = descriptor.label;
+		}
+	}
+
+	private showHarnessMenu(): void {
+		if (!this.harnessDropdownButton) {
+			return;
+		}
+		const harnesses = this.harnessService.availableHarnesses.get();
+		const activeId = this.harnessService.activeHarness.get();
+
+		const actions = harnesses.map(h => {
+			const action = new Action(h.id, h.label, ThemeIcon.asClassName(h.icon), true, () => {
+				this.harnessService.setActiveHarness(h.id);
+			});
+			action.checked = h.id === activeId;
+			return action;
+		});
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => this.harnessDropdownButton!,
+			getActions: () => actions,
+			getCheckedActionsRepresentation: () => 'radio',
+		});
+	}
+
 	private createFolderPicker(sidebarContent: HTMLElement): void {
 		const footer = this.folderPickerContainer = DOM.append(sidebarContent, $('.sidebar-folder-picker'));
 
@@ -485,6 +723,11 @@ export class AICustomizationManagementEditor extends EditorPane {
 
 		// Handle item selection
 		this.editorDisposables.add(this.listWidget.onDidSelectItem(item => {
+			this.telemetryService.publicLog2<CustomizationEditorItemSelectedEvent, CustomizationEditorItemSelectedClassification>('chatCustomizationEditor.itemSelected', {
+				section: this.selectedSection,
+				promptType: item.promptType,
+				storage: item.storage,
+			});
 			const isWorkspaceFile = item.storage === PromptsStorage.local;
 			const isReadOnly = item.storage === PromptsStorage.extension || item.storage === PromptsStorage.plugin || item.storage === BUILTIN_STORAGE;
 			this.showEmbeddedEditor(item.uri, item.name, item.promptType, item.storage, isWorkspaceFile, isReadOnly);
@@ -496,8 +739,8 @@ export class AICustomizationManagementEditor extends EditorPane {
 		}));
 
 		// Handle manual create actions - open editor directly
-		this.editorDisposables.add(this.listWidget.onDidRequestCreateManual(({ type, target }) => {
-			this.createNewItemManual(type, target);
+		this.editorDisposables.add(this.listWidget.onDidRequestCreateManual(({ type, target, rootFileName }) => {
+			this.createNewItemManual(type, target, rootFileName);
 		}));
 
 		// Container for Models content (only in sessions)
@@ -532,6 +775,10 @@ export class AICustomizationManagementEditor extends EditorPane {
 			this.editorDisposables.add(this.mcpListWidget.onDidSelectServer(server => {
 				this.showEmbeddedMcpDetail(server);
 			}));
+
+			this.editorDisposables.add(this.mcpListWidget.onDidRequestShowPlugin(item => {
+				this.showPluginDetail(item);
+			}));
 		}
 
 		// Container for Plugins content
@@ -545,6 +792,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 			this.createEmbeddedPluginDetail();
 
 			this.editorDisposables.add(this.pluginListWidget.onDidSelectPlugin(item => {
+				this.pluginDetailReturnSection = undefined;
 				this.showEmbeddedPluginDetail(item);
 			}));
 		}
@@ -556,6 +804,42 @@ export class AICustomizationManagementEditor extends EditorPane {
 		// Set initial visibility based on selected section
 		this.updateContentVisibility();
 
+		// Wire up section count updates — active prompts section gets its count
+		// from the list widget; all prompts sections are also refreshed from
+		// the prompts service on every change event for consistency.
+		this.editorDisposables.add(this.listWidget.onDidChangeItemCount(count => {
+			if (this.isPromptsSection(this.selectedSection)) {
+				this.updateSectionCount(this.selectedSection, count);
+			}
+		}));
+		if (this.mcpListWidget) {
+			this.editorDisposables.add(this.mcpListWidget.onDidChangeItemCount(count => {
+				this.updateSectionCount(AICustomizationManagementSection.McpServers, count);
+			}));
+			this.mcpListWidget.fireItemCount();
+		}
+		if (this.pluginListWidget) {
+			this.editorDisposables.add(this.pluginListWidget.onDidChangeItemCount(count => {
+				this.updateSectionCount(AICustomizationManagementSection.Plugins, count);
+			}));
+			this.pluginListWidget.fireItemCount();
+		}
+		if (this.modelsWidget) {
+			this.editorDisposables.add(this.modelsWidget.onDidChangeItemCount(count => {
+				this.updateSectionCount(AICustomizationManagementSection.Models, count);
+			}));
+			this.modelsWidget.fireItemCount();
+		}
+
+		// Any prompts data change → refresh ALL prompts section counts (debounced)
+		this.editorDisposables.add(this.promptsService.onDidChangeCustomAgents(() => this.refreshAllPromptsSectionCounts()));
+		this.editorDisposables.add(this.promptsService.onDidChangeSkills(() => this.refreshAllPromptsSectionCounts()));
+		this.editorDisposables.add(this.promptsService.onDidChangeInstructions(() => this.refreshAllPromptsSectionCounts()));
+		this.editorDisposables.add(this.promptsService.onDidChangeSlashCommands(() => this.refreshAllPromptsSectionCounts()));
+
+		// Load initial counts for all sections
+		this.refreshAllPromptsSectionCounts();
+
 		// Load items for the initial section
 		if (this.isPromptsSection(this.selectedSection)) {
 			void this.listWidget.setSection(this.selectedSection);
@@ -570,12 +854,56 @@ export class AICustomizationManagementEditor extends EditorPane {
 			section === AICustomizationManagementSection.Hooks;
 	}
 
+	//#region Section Counts
+
+	/**
+	 * Updates the count for a specific section and re-renders the sidebar.
+	 */
+	private updateSectionCount(sectionId: AICustomizationManagementSection, count: number): void {
+		const section = this.sections.find(s => s.id === sectionId);
+		if (!section || section.count === count) {
+			return;
+		}
+		section.count = count;
+		// Re-splice the sections list to trigger re-render
+		this.sectionsList.splice(0, this.sectionsList.length, this.sections);
+		this.ensureSectionsListReflectsActiveSection();
+	}
+
+	/**
+	 * Schedules a debounced refresh of all prompts-based section counts.
+	 */
+	private refreshAllPromptsSectionCounts(): void {
+		this.promptsSectionCountScheduler.schedule();
+	}
+
+	/**
+	 * Performs the actual refresh of all prompts-based section counts.
+	 * Uses the list widget's shared item-loading logic so sidebar counts
+	 * match the per-group counts shown inside each section.
+	 */
+	private _doRefreshAllPromptsSectionCounts(): void {
+		for (const section of this.sections) {
+			if (this.isPromptsSection(section.id)) {
+				this.listWidget.computeItemCountForSection(section.id).then(count => {
+					this.updateSectionCount(section.id, count);
+				}, onUnexpectedError);
+			}
+		}
+	}
+
+	//#endregion
+
 	private selectSection(section: AICustomizationManagementSection): void {
 		if (this.selectedSection === section) {
 			this.ensureSectionsListReflectsActiveSection(section);
 			return;
 		}
 
+		this.telemetryService.publicLog2<CustomizationEditorSectionChangedEvent, CustomizationEditorSectionChangedClassification>('chatCustomizationEditor.sectionChanged', {
+			section,
+		});
+
 		if (this.viewMode === 'editor') {
 			this.goBackToList();
 		}
@@ -634,7 +962,9 @@ export class AICustomizationManagementEditor extends EditorPane {
 		const isMcpSection = this.selectedSection === AICustomizationManagementSection.McpServers;
 		const isPluginsSection = this.selectedSection === AICustomizationManagementSection.Plugins;
 
-		this.promptsContentContainer.style.display = !isEditorMode && !isDetailMode && isPromptsSection ? '' : 'none';
+		if (this.promptsContentContainer) {
+			this.promptsContentContainer.style.display = !isEditorMode && !isDetailMode && isPromptsSection ? '' : 'none';
+		}
 		if (this.modelsContentContainer) {
 			this.modelsContentContainer.style.display = !isEditorMode && !isDetailMode && isModelsSection ? '' : 'none';
 		}
@@ -667,6 +997,12 @@ export class AICustomizationManagementEditor extends EditorPane {
 	 * Creates a new customization using the AI-guided flow.
 	 */
 	private async createNewItemWithAI(type: PromptsType): Promise<void> {
+		this.telemetryService.publicLog2<CustomizationEditorCreateItemEvent, CustomizationEditorCreateItemClassification>('chatCustomizationEditor.createItem', {
+			section: this.selectedSection,
+			promptType: type,
+			creationMode: 'ai',
+			target: 'workspace',
+		});
 		if (this.input) {
 			this.group.closeEditor(this.input);
 		}
@@ -676,7 +1012,35 @@ export class AICustomizationManagementEditor extends EditorPane {
 	/**
 	 * Creates a new prompt file and opens it in the embedded editor.
 	 */
-	private async createNewItemManual(type: PromptsType, target: 'workspace' | 'user'): Promise<void> {
+	private async createNewItemManual(type: PromptsType, target: 'workspace' | 'user' | 'workspace-root', rootFileName?: string): Promise<void> {
+		this.telemetryService.publicLog2<CustomizationEditorCreateItemEvent, CustomizationEditorCreateItemClassification>('chatCustomizationEditor.createItem', {
+			section: this.selectedSection,
+			promptType: type,
+			creationMode: 'manual',
+			target: target === 'workspace-root' ? 'workspace' : target,
+		});
+
+		// Handle workspace-root files (e.g. AGENTS.md or CLAUDE.md at project root).
+		// rootFileName is passed from rootFileShortcuts; falls back to
+		// the section override's rootFile, then AGENTS.md as the default.
+		if (target === 'workspace-root') {
+			const projectRoot = this.workspaceService.getActiveProjectRoot();
+			if (!projectRoot) {
+				return;
+			}
+			const override = this.harnessService.getActiveDescriptor().sectionOverrides?.get(this.selectedSection);
+			const fileName = rootFileName ?? override?.rootFile ?? AGENT_MD_FILENAME;
+			const fileUri = URI.joinPath(projectRoot, fileName);
+			if (await this.fileService.exists(fileUri)) {
+				// File already exists — just open it
+				await this.showEmbeddedEditor(fileUri, fileName, PromptsType.instructions, PromptsStorage.local, true);
+			} else {
+				await this.fileService.createFile(fileUri);
+				await this.showEmbeddedEditor(fileUri, fileName, PromptsType.instructions, PromptsStorage.local, true);
+			}
+			void this.listWidget.refresh();
+			return;
+		}
 
 		if (type === PromptsType.hook) {
 			if (this.workspaceService.isSessionsWindow) {
@@ -700,13 +1064,24 @@ export class AICustomizationManagementEditor extends EditorPane {
 			return;
 		}
 
-		const targetDir = target === 'workspace'
-			? resolveWorkspaceTargetDirectory(this.workspaceService, type)
-			: await resolveUserTargetDirectory(this.promptsService, type);
+		const targetDir = await this.resolveTargetDirectoryWithPicker(type, target);
+		if (targetDir === null) {
+			return; // User cancelled the picker
+		}
+		// targetDir may be undefined when no matching folder exists for the
+		// requested storage type (e.g. skills have no user-storage folder).
+		// Pass it through — the command handles undefined by showing its own
+		// folder picker via askForPromptSourceFolder.
+
+		// When the active harness overrides the file extension (e.g. Claude
+		// rules use .md instead of .instructions.md), pass it through so the
+		// name picker and file creation use the correct extension.
+		const override = this.harnessService.getActiveDescriptor().sectionOverrides?.get(this.selectedSection);
 
 		const options: INewPromptOptions = {
 			targetFolder: targetDir,
 			targetStorage: target === 'user' ? PromptsStorage.user : PromptsStorage.local,
+			fileExtension: override?.fileExtension,
 			openFile: async (uri) => {
 				const isWorkspace = target === 'workspace';
 				await this.showEmbeddedEditor(uri, basename(uri), type, target === 'user' ? PromptsStorage.user : PromptsStorage.local, isWorkspace);
@@ -727,6 +1102,92 @@ export class AICustomizationManagementEditor extends EditorPane {
 		void this.listWidget.refresh();
 	}
 
+	/**
+	 * Resolves the target directory for creating a new customization file.
+	 * If multiple source folders exist for the given storage type, shows a
+	 * picker to let the user choose. Otherwise, returns the single match.
+	 *
+	 * @returns the resolved URI, `undefined` when no folder is available,
+	 *          or `null` when the user cancelled the picker.
+	 */
+	private async resolveTargetDirectoryWithPicker(type: PromptsType, target: 'workspace' | 'user'): Promise<URI | undefined | null> {
+		const allFolders = await this.promptsService.getSourceFolders(type);
+		const projectRoot = this.workspaceService.getActiveProjectRoot();
+		const descriptor = this.harnessService.getActiveDescriptor();
+		const subpaths = descriptor.workspaceSubpaths;
+
+		// Partition folders by whether they're under the active project root.
+		// The storage tags from getSourceFolders() are unreliable (tilde-expanded
+		// user paths like ~/.copilot/skills get tagged PromptsStorage.local),
+		// so we use the project root as the authoritative boundary.
+		let matchingFolders;
+		if (target === 'workspace') {
+			matchingFolders = projectRoot
+				? allFolders.filter(f => {
+					if (!isEqualOrParent(f.uri, projectRoot)) {
+						return false;
+					}
+					// When the active harness specifies workspaceSubpaths, only offer
+					// directories whose path includes one of those sub-paths.
+					if (subpaths) {
+						return matchesWorkspaceSubpath(f.uri.path, subpaths);
+					}
+					return true;
+				})
+				: [];
+		} else {
+			matchingFolders = projectRoot
+				? allFolders.filter(f => !isEqualOrParent(f.uri, projectRoot))
+				: allFolders;
+
+			// When the active harness restricts user roots, only offer
+			// directories under the harness-accessible user roots
+			// (e.g. Claude → ~/.claude only, not ~/.copilot or profile paths).
+			const filter = this.harnessService.getStorageSourceFilter(type);
+			if (filter.includedUserFileRoots) {
+				const roots = filter.includedUserFileRoots;
+				matchingFolders = matchingFolders.filter(f =>
+					roots.some(root => isEqualOrParent(f.uri, root))
+				);
+			}
+		}
+
+		// Deduplicate by URI (getSourceFolders may return the same path
+		// from both config-based discovery and the AgenticPromptsService override)
+		const seen = new Set<string>();
+		matchingFolders = matchingFolders.filter(f => {
+			const key = f.uri.toString();
+			if (seen.has(key)) {
+				return false;
+			}
+			seen.add(key);
+			return true;
+		});
+
+		if (matchingFolders.length === 0) {
+			// No matching folders — return undefined so the command can fall
+			// back to askForPromptSourceFolder (not null which means cancellation)
+			return undefined;
+		}
+
+		if (matchingFolders.length === 1) {
+			return matchingFolders[0].uri;
+		}
+
+		// Multiple directories — ask the user which one to use
+		const items: (IQuickPickItem & { uri: URI })[] = matchingFolders.map(folder => ({
+			label: this.promptsService.getPromptLocationLabel(folder),
+			description: folder.uri.fsPath,
+			uri: folder.uri,
+		}));
+
+		const picked = await this.quickInputService.pick(items, {
+			placeHolder: localize('selectTargetDirectory', "Select a directory for the new customization file"),
+		});
+
+		return picked?.uri ?? null;
+	}
+
 	override updateStyles(): void {
 		const borderColor = this.theme.getColor(aiCustomizationManagementSashBorder);
 		if (borderColor) {
@@ -741,6 +1202,10 @@ export class AICustomizationManagementEditor extends EditorPane {
 		this.inEditorContextKey.set(true);
 		this.sectionContextKey.set(this.selectedSection);
 
+		this.telemetryService.publicLog2<CustomizationEditorOpenedEvent, CustomizationEditorOpenedClassification>('chatCustomizationEditor.opened', {
+			section: this.selectedSection,
+		});
+
 		await super.setInput(input, options, context, token);
 
 		if (this.dimension) {
@@ -816,6 +1281,11 @@ export class AICustomizationManagementEditor extends EditorPane {
 			if (this.isPromptsSection(sectionId)) {
 				void this.listWidget.setSection(sectionId);
 			}
+			// Re-layout after visibility change so the newly-visible widget
+			// can measure its flex-computed container height correctly.
+			if (this.dimension) {
+				this.layout(this.dimension);
+			}
 			this.ensureSectionsListReflectsActiveSection(sectionId);
 		}
 	}
@@ -827,6 +1297,19 @@ export class AICustomizationManagementEditor extends EditorPane {
 		void this.listWidget.refresh();
 	}
 
+	/**
+	 * Scrolls the active list widget so the last item is visible.
+	 */
+	public revealLastItem(): void {
+		if (this.selectedSection === AICustomizationManagementSection.McpServers) {
+			this.mcpListWidget?.revealLastItem();
+		} else if (this.selectedSection === AICustomizationManagementSection.Plugins) {
+			this.pluginListWidget?.revealLastItem();
+		} else {
+			this.listWidget.revealLastItem();
+		}
+	}
+
 	/**
 	 * Generates a debug report for the current section.
 	 */
@@ -902,7 +1385,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 		this.updateContentVisibility();
 
 		try {
-			if (storage === BUILTIN_STORAGE && promptType === PromptsType.prompt) {
+			if (storage === BUILTIN_STORAGE && (promptType === PromptsType.prompt || promptType === PromptsType.skill)) {
 				const session = await this.getOrCreateBuiltinEditingSession(uri);
 
 				if (!isEqual(this.currentEditingUri, uri)) {
@@ -966,6 +1449,13 @@ export class AICustomizationManagementEditor extends EditorPane {
 	private goBackToList(): void {
 		const fileUri = this.currentEditingUri;
 		const backgroundSaveRequest = this.createExistingCustomizationSaveRequest();
+		if (backgroundSaveRequest) {
+			this.telemetryService.publicLog2<CustomizationEditorSaveItemEvent, CustomizationEditorSaveItemClassification>('chatCustomizationEditor.saveItem', {
+				promptType: this.currentEditingPromptType ?? '',
+				storage: String(this.currentEditingStorage ?? ''),
+				saveTarget: 'existing',
+			});
+		}
 		if (fileUri && this.currentEditingStorage === BUILTIN_STORAGE) {
 			this.disposeBuiltinEditingSession(fileUri);
 		}
@@ -1031,7 +1521,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 	private createBuiltinPromptSaveRequest(target: ISaveTargetQuickPickItem): IBuiltinPromptSaveRequest | undefined {
 		const sourceUri = this.currentEditingUri;
 		const promptType = this.currentEditingPromptType;
-		if (!sourceUri || this.currentEditingStorage !== BUILTIN_STORAGE || promptType !== PromptsType.prompt || !target.folder || target.target === 'cancel') {
+		if (!sourceUri || this.currentEditingStorage !== BUILTIN_STORAGE || (promptType !== PromptsType.prompt && promptType !== PromptsType.skill) || !target.folder || target.target === 'cancel') {
 			return;
 		}
 
@@ -1045,6 +1535,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 			folder: target.folder,
 			sourceUri,
 			content: session.model.getValue(),
+			promptType,
 			projectRoot: target.target === 'workspace' ? this.workspaceService.getActiveProjectRoot() : undefined,
 		};
 	}
@@ -1067,8 +1558,15 @@ export class AICustomizationManagementEditor extends EditorPane {
 	}
 
 	private async saveBuiltinPromptCopy(request: IBuiltinPromptSaveRequest): Promise<void> {
-		const targetUri = URI.joinPath(request.folder, basename(request.sourceUri));
-		await this.fileService.createFolder(request.folder);
+		let targetUri: URI;
+		if (request.promptType === PromptsType.skill) {
+			// Skills use {skillName}/SKILL.md directory structure
+			const skillFolderName = basename(dirname(request.sourceUri));
+			targetUri = URI.joinPath(request.folder, skillFolderName, basename(request.sourceUri));
+		} else {
+			targetUri = URI.joinPath(request.folder, basename(request.sourceUri));
+		}
+		await this.fileService.createFolder(dirname(targetUri));
 		await this.fileService.writeFile(targetUri, VSBuffer.fromString(request.content));
 		if (request.target === 'workspace' && request.projectRoot) {
 			await this.workspaceService.commitFiles(request.projectRoot, [targetUri]);
@@ -1084,8 +1582,9 @@ export class AICustomizationManagementEditor extends EditorPane {
 
 	private async pickBuiltinPromptSaveTarget(): Promise<ISaveTargetQuickPickItem | undefined> {
 		const items: ISaveTargetQuickPickItem[] = [];
+		const promptType = this.currentEditingPromptType ?? PromptsType.prompt;
 
-		const workspaceFolder = resolveWorkspaceTargetDirectory(this.workspaceService, PromptsType.prompt);
+		const workspaceFolder = resolveWorkspaceTargetDirectory(this.workspaceService, promptType);
 		if (workspaceFolder) {
 			items.push({
 				label: localize('workspaceSaveTarget', "Workspace"),
@@ -1095,7 +1594,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 			});
 		}
 
-		const userFolder = await resolveUserTargetDirectory(this.promptsService, PromptsType.prompt);
+		const userFolder = await resolveUserTargetDirectory(this.promptsService, promptType);
 		if (userFolder) {
 			items.push({
 				label: localize('userSaveTarget', "User"),
@@ -1112,7 +1611,7 @@ export class AICustomizationManagementEditor extends EditorPane {
 
 		return this.quickInputService.pick(items, {
 			canPickMany: false,
-			placeHolder: localize('saveBuiltinPromptCopyPlaceholder', "Select Workspace, User, or Cancel"),
+			placeHolder: localize('saveBuiltinCopyPlaceholder', "Select Workspace, User, or Cancel"),
 			matchOnDescription: true,
 		});
 	}
@@ -1134,6 +1633,13 @@ export class AICustomizationManagementEditor extends EditorPane {
 				}
 
 				backgroundSaveRequest = this.createBuiltinPromptSaveRequest(selection);
+				if (backgroundSaveRequest) {
+					this.telemetryService.publicLog2<CustomizationEditorSaveItemEvent, CustomizationEditorSaveItemClassification>('chatCustomizationEditor.saveItem', {
+						promptType: this.currentEditingPromptType ?? '',
+						storage: String(this.currentEditingStorage ?? ''),
+						saveTarget: selection.target,
+					});
+				}
 			}
 
 			this.goBackToList();
@@ -1142,10 +1648,10 @@ export class AICustomizationManagementEditor extends EditorPane {
 				void this.saveBuiltinPromptCopy(saveRequest).then(() => {
 					void this.listWidget?.refresh();
 				}, error => {
-					console.error('Failed to save built-in prompt override:', error);
+					console.error('Failed to save built-in override:', error);
 					this.notificationService.warn(saveRequest.target === 'workspace'
-						? localize('saveBuiltinPromptCopyFailedWorkspace', "Could not save the prompt override to the workspace prompts.")
-						: localize('saveBuiltinPromptCopyFailedUser', "Could not save the prompt override to your user prompts."));
+						? localize('saveBuiltinCopyFailedWorkspace', "Could not save the override to the workspace.")
+						: localize('saveBuiltinCopyFailedUser', "Could not save the override to your user folder."));
 				});
 			}
 		} finally {
@@ -1163,17 +1669,17 @@ export class AICustomizationManagementEditor extends EditorPane {
 		this.editorActionButtonIcon.className = `codicon codicon-${shouldShowBuiltinSaveAction ? Codicon.save.id : Codicon.arrowLeft.id} editor-action-button-icon`;
 		this.editorActionButton.disabled = this.editorActionButtonInProgress;
 		this.editorActionButton.setAttribute('aria-label', shouldShowBuiltinSaveAction
-			? localize('savePromptCopyAndChooseLocation', "Save prompt override")
+			? localize('saveBuiltinCopyAndChooseLocation', "Save override")
 			: localize('backToList', "Back to list"));
 		this.editorActionButton.title = shouldShowBuiltinSaveAction
-			? localize('savePromptCopyAndChooseLocationTooltip', "Save prompt override (choose Workspace, User, or Cancel)")
+			? localize('saveBuiltinCopyAndChooseLocationTooltip', "Save override (choose Workspace, User, or Cancel)")
 			: localize('backToList', "Back to list");
 	}
 
 	private shouldShowBuiltinSaveAction(): boolean {
 		return this._editorContentChanged
 			&& this.currentEditingStorage === BUILTIN_STORAGE
-			&& this.currentEditingPromptType === PromptsType.prompt;
+			&& (this.currentEditingPromptType === PromptsType.prompt || this.currentEditingPromptType === PromptsType.skill);
 	}
 
 	private resetEditorSaveIndicator(): void {
@@ -1311,16 +1817,40 @@ export class AICustomizationManagementEditor extends EditorPane {
 		}
 	}
 
+	/**
+	 * Public method to show a plugin detail from any section (e.g. from "Show Plugin" context menu).
+	 * Saves the current section so the back button returns the user to it.
+	 */
+	public async showPluginDetail(item: IAgentPluginItem): Promise<void> {
+		if (this.selectedSection !== AICustomizationManagementSection.Plugins) {
+			this.pluginDetailReturnSection = this.selectedSection;
+		}
+		await this.showEmbeddedPluginDetail(item);
+	}
+
 	private goBackFromPluginDetail(): void {
 		this.pluginDetailDisposables.clear();
 		this.embeddedPluginEditor?.clearInput();
-		this.viewMode = 'list';
-		this.updateContentVisibility();
+
+		const returnSection = this.pluginDetailReturnSection;
+		this.pluginDetailReturnSection = undefined;
+
+		if (returnSection) {
+			// Return to the section the user was on before opening the plugin detail.
+			// selectSection may early-return when the section hasn't changed, so always
+			// ensure viewMode and content visibility are updated.
+			this.viewMode = 'list';
+			this.updateContentVisibility();
+			this.selectSection(returnSection);
+		} else {
+			this.viewMode = 'list';
+			this.updateContentVisibility();
+			this.pluginListWidget?.focusSearch();
+		}
 
 		if (this.dimension) {
 			this.layout(this.dimension);
 		}
-		this.pluginListWidget?.focusSearch();
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditorInput.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditorInput.ts
index 819107dfceb..f317182e7c6 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditorInput.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagementEditorInput.ts
@@ -6,7 +6,7 @@
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localize } from '../../../../../nls.js';
-import { IUntypedEditorInput } from '../../../../common/editor.js';
+import { IUntypedEditorInput, EditorInputCapabilities } from '../../../../common/editor.js';
 import { EditorInput } from '../../../../common/editor/editorInput.js';
 import { AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID } from './aiCustomizationManagement.js';
 
@@ -20,6 +20,10 @@ export class AICustomizationManagementEditorInput extends EditorInput {
 
 	readonly resource = undefined;
 
+	override get capabilities(): EditorInputCapabilities {
+		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.RequiresModal;
+	}
+
 	private static _instance: AICustomizationManagementEditorInput | undefined;
 
 	/**
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.ts
index dea000c2086..8a64b0cddba 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationWorkspaceService.ts
@@ -9,9 +9,10 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { IAICustomizationWorkspaceService, AICustomizationManagementSection, IStorageSourceFilter } from '../../common/aiCustomizationWorkspaceService.js';
 import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
-import { IChatPromptSlashCommand, IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
+import { IChatPromptSlashCommand, IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { ICustomizationHarnessService } from '../../common/customizationHarnessService.js';
 import {
 	GENERATE_AGENT_COMMAND_ID,
 	GENERATE_HOOK_COMMAND_ID,
@@ -29,6 +30,7 @@ class AICustomizationWorkspaceService implements IAICustomizationWorkspaceServic
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IPromptsService private readonly promptsService: IPromptsService,
+		@ICustomizationHarnessService private readonly harnessService: ICustomizationHarnessService,
 	) {
 		const workspaceFolders = observableFromEventOpts(
 			{ owner: this },
@@ -56,12 +58,8 @@ class AICustomizationWorkspaceService implements IAICustomizationWorkspaceServic
 		AICustomizationManagementSection.Plugins,
 	];
 
-	private static readonly _defaultFilter: IStorageSourceFilter = {
-		sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.extension, PromptsStorage.plugin],
-	};
-
-	getStorageSourceFilter(_type: PromptsType): IStorageSourceFilter {
-		return AICustomizationWorkspaceService._defaultFilter;
+	getStorageSourceFilter(type: PromptsType): IStorageSourceFilter {
+		return this.harnessService.getStorageSourceFilter(type);
 	}
 
 	readonly isSessionsWindow = false;
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationCreatorService.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationCreatorService.ts
index 7058da4c373..cec5c423ff0 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationCreatorService.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationCreatorService.ts
@@ -11,9 +11,11 @@ import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
 import { getPromptFileDefaultLocations } from '../../common/promptSyntax/config/promptFileLocations.js';
 import { IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { isEqualOrParent } from '../../../../../base/common/resources.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
 import { localize } from '../../../../../nls.js';
+import { ICustomizationHarnessService, matchesWorkspaceSubpath } from '../../common/customizationHarnessService.js';
 
 /**
  * Service that opens an AI-guided chat session to help the user create
@@ -32,6 +34,7 @@ export class CustomizationCreatorService {
 		@IAICustomizationWorkspaceService private readonly workspaceService: IAICustomizationWorkspaceService,
 		@IPromptsService private readonly promptsService: IPromptsService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@ICustomizationHarnessService private readonly harnessService: ICustomizationHarnessService,
 	) { }
 
 	async createWithAI(type: PromptsType): Promise<void> {
@@ -58,7 +61,10 @@ export class CustomizationCreatorService {
 		// directory and have those changes tracked.
 
 		// Capture project root BEFORE opening new chat (which may change active session)
-		const targetDir = this.resolveTargetDirectory(type);
+		const targetDir = await this.resolveTargetDirectoryWithPicker(type);
+		if (targetDir === null) {
+			return; // User cancelled the picker
+		}
 		const systemInstructions = buildAgentInstructions(type, targetDir, trimmedName);
 		const userMessage = buildUserMessage(type, targetDir, trimmedName);
 
@@ -95,6 +101,65 @@ export class CustomizationCreatorService {
 		return resolveWorkspaceTargetDirectory(this.workspaceService, type);
 	}
 
+	/**
+	 * Resolves the workspace directory for a new customization file.
+	 * If multiple local source folders exist, shows a picker to let the user choose.
+	 *
+	 * @returns the resolved URI, `undefined` when no folder is available,
+	 *          or `null` when the user cancelled the picker.
+	 */
+	private async resolveTargetDirectoryWithPicker(type: PromptsType): Promise<URI | undefined | null> {
+		const allFolders = await this.promptsService.getSourceFolders(type);
+		const projectRoot = this.workspaceService.getActiveProjectRoot();
+		const descriptor = this.harnessService.getActiveDescriptor();
+		const subpaths = descriptor.workspaceSubpaths;
+
+		// Filter to only workspace-scoped folders (under the active project root).
+		// Don't rely on storage tags — tilde-expanded user paths can be tagged local.
+		// Deduplicate by URI to avoid inflated counts and duplicate picker entries.
+		// When the active harness specifies workspaceSubpaths, further restrict to
+		// directories whose path includes one of those sub-paths (e.g. `.claude`).
+		const seen = new Set<string>();
+		const workspaceFolders = projectRoot
+			? allFolders.filter(f => {
+				if (!isEqualOrParent(f.uri, projectRoot)) {
+					return false;
+				}
+				const key = f.uri.toString();
+				if (seen.has(key)) {
+					return false;
+				}
+				seen.add(key);
+				if (subpaths) {
+					return matchesWorkspaceSubpath(f.uri.path, subpaths);
+				}
+				return true;
+			})
+			: [];
+
+		if (workspaceFolders.length === 0) {
+			// No workspace folders — fall back to the existing resolution logic
+			return this.resolveTargetDirectory(type);
+		}
+
+		if (workspaceFolders.length === 1) {
+			return workspaceFolders[0].uri;
+		}
+
+		// Multiple directories — ask the user which one to use
+		const items = workspaceFolders.map(folder => ({
+			label: this.promptsService.getPromptLocationLabel(folder),
+			description: folder.uri.fsPath,
+			uri: folder.uri,
+		}));
+
+		const picked = await this.quickInputService.pick(items, {
+			placeHolder: localize('selectTargetDirectory', "Select a directory for the new customization file"),
+		});
+
+		return picked?.uri ?? null;
+	}
+
 	/**
 	 * Resolves the user-level directory for a new customization file.
 	 */
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts
new file mode 100644
index 00000000000..3f03253741d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/customizationHarnessService.ts
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { derived, observableFromEvent } from '../../../../../base/common/observable.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import {
+	CustomizationHarness,
+	CustomizationHarnessServiceBase,
+	ICustomizationHarnessService,
+	IHarnessDescriptor,
+	createCliHarnessDescriptor,
+	createClaudeHarnessDescriptor,
+	createVSCodeHarnessDescriptor,
+	getCliUserRoots,
+	getClaudeUserRoots,
+} from '../../common/customizationHarnessService.js';
+import { PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
+import { BUILTIN_STORAGE } from '../../common/aiCustomizationWorkspaceService.js';
+import { IPathService } from '../../../../services/path/common/pathService.js';
+import { IChatAgentService } from '../../common/participants/chatAgents.js';
+
+/**
+ * Core implementation of the customization harness service.
+ * Exposes VS Code, CLI, and Claude harnesses for filtering customizations.
+ * CLI and Claude harnesses are only shown when their respective agents are registered.
+ */
+class CustomizationHarnessService extends CustomizationHarnessServiceBase {
+	constructor(
+		@IPathService pathService: IPathService,
+		@IChatAgentService chatAgentService: IChatAgentService,
+	) {
+		const userHome = pathService.userHome({ preferLocal: true });
+		// The Local harness includes extension-contributed and built-in customizations.
+		// Built-in items come from the default chat extension (productService.defaultChatAgent).
+		// CLI and Claude harnesses don't consume extension contributions.
+		const localExtras = [PromptsStorage.extension, BUILTIN_STORAGE];
+		const restrictedExtras: readonly string[] = [];
+		const allHarnesses: readonly IHarnessDescriptor[] = [
+			createVSCodeHarnessDescriptor(localExtras),
+			createCliHarnessDescriptor(getCliUserRoots(userHome), restrictedExtras),
+			createClaudeHarnessDescriptor(getClaudeUserRoots(userHome), restrictedExtras),
+		];
+
+		// Track agent registration changes as an observable.
+		// Return the agent count so the value changes on each event
+		// (observableFromEvent uses strictEquals to decide whether to notify).
+		const agentCount = observableFromEvent(chatAgentService.onDidChangeAgents, () => chatAgentService.getAgents().length);
+
+		// Derive available harnesses from agent registration state
+		const available = derived(reader => {
+			agentCount.read(reader);
+			return allHarnesses.filter(h => {
+				if (!h.requiredAgentId) {
+					return true;
+				}
+				return !!chatAgentService.getAgent(h.requiredAgentId);
+			});
+		});
+
+		super(
+			allHarnesses,
+			CustomizationHarness.VSCode,
+			available,
+		);
+	}
+}
+
+registerSingleton(ICustomizationHarnessService, CustomizationHarnessService, InstantiationType.Delayed);
+
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpListWidget.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpListWidget.ts
index ffaecde8443..23fea69dcde 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpListWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpListWidget.ts
@@ -16,7 +16,9 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { IMcpWorkbenchService, IWorkbenchMcpServer, McpConnectionState, McpServerInstallState, IMcpService } from '../../../../contrib/mcp/common/mcpTypes.js';
+import { IMcpWorkbenchService, IWorkbenchMcpServer, McpConnectionState, McpServerInstallState, IMcpService, IMcpServer } from '../../../../contrib/mcp/common/mcpTypes.js';
+import { IMcpRegistry } from '../../../mcp/common/mcpRegistryTypes.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
 import { isContributionDisabled } from '../../common/enablement.js';
 import { McpCommandIds } from '../../../../contrib/mcp/common/mcpCommandIds.js';
 import { autorun } from '../../../../../base/common/observable.js';
@@ -26,24 +28,41 @@ import { InputBox } from '../../../../../base/browser/ui/inputbox/inputBox.js';
 import { IContextMenuService, IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Delayer } from '../../../../../base/common/async.js';
-import { IAction, Separator } from '../../../../../base/common/actions.js';
+import { Action, IAction, Separator } from '../../../../../base/common/actions.js';
 import { getContextMenuActions } from '../../../../contrib/mcp/browser/mcpServerActions.js';
 import { LocalMcpServerScope } from '../../../../services/mcp/common/mcpWorkbenchManagementService.js';
-import { workspaceIcon, userIcon, mcpServerIcon, builtinIcon } from './aiCustomizationIcons.js';
-import { formatDisplayName, truncateToFirstSentence } from './aiCustomizationListWidget.js';
+import { IAgentPluginService } from '../../common/plugins/agentPluginService.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { workspaceIcon, userIcon, mcpServerIcon, builtinIcon, pluginIcon, extensionIcon } from './aiCustomizationIcons.js';
+import { formatDisplayName, truncateToFirstLine } from './aiCustomizationListWidget.js';
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IAICustomizationWorkspaceService } from '../../common/aiCustomizationWorkspaceService.js';
+import { ICustomizationHarnessService, CustomizationHarness } from '../../common/customizationHarnessService.js';
 import { CustomizationGroupHeaderRenderer, ICustomizationGroupHeaderEntry, CUSTOMIZATION_GROUP_HEADER_HEIGHT, CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR } from './customizationGroupHeaderRenderer.js';
+import { AgentPluginItemKind, IAgentPluginItem } from '../agentPluginEditor/agentPluginItems.js';
 
 const $ = DOM.$;
 
 const MCP_ITEM_HEIGHT = 36;
 
+const PLUGIN_COLLECTION_PREFIX = 'plugin.';
+
+const COPILOT_EXTENSION_IDS = ['github.copilot', 'github.copilot-chat'];
+
+function isCopilotExtension(id: ExtensionIdentifier): boolean {
+	return COPILOT_EXTENSION_IDS.some(copilotId => ExtensionIdentifier.equals(id, copilotId));
+}
+
+function getPluginUriFromCollectionId(collectionId: string | undefined): string | undefined {
+	return collectionId?.startsWith(PLUGIN_COLLECTION_PREFIX) ? collectionId.slice(PLUGIN_COLLECTION_PREFIX.length) : undefined;
+}
+
 /**
  * Represents a collapsible group header in the MCP server list.
  */
 interface IMcpGroupHeaderEntry extends ICustomizationGroupHeaderEntry {
-	readonly scope: LocalMcpServerScope | 'builtin';
+	readonly scope: LocalMcpServerScope | 'builtin' | 'plugin' | 'extension';
 }
 
 /**
@@ -55,13 +74,14 @@ interface IMcpServerItemEntry {
 }
 
 /**
- * Represents a built-in MCP server provided by an extension.
+ * Represents a built-in MCP server provided by an extension or plugin.
  */
 interface IMcpBuiltinItemEntry {
 	readonly type: 'builtin-item';
 	readonly id: string;
 	readonly label: string;
 	readonly description: string;
+	readonly collectionId?: string;
 }
 
 type IMcpListEntry = IMcpGroupHeaderEntry | IMcpServerItemEntry | IMcpBuiltinItemEntry;
@@ -98,6 +118,7 @@ interface IMcpServerItemTemplateData {
 	readonly name: HTMLElement;
 	readonly description: HTMLElement;
 	readonly status: HTMLElement;
+	readonly bridgedBadge: HTMLElement;
 	readonly disposables: DisposableStore;
 }
 
@@ -110,6 +131,9 @@ class McpServerItemRenderer implements IListRenderer<IMcpServerItemEntry | IMcpB
 	constructor(
 		@IMcpService private readonly mcpService: IMcpService,
 		@IAICustomizationWorkspaceService private readonly workspaceService: IAICustomizationWorkspaceService,
+		@IAgentPluginService private readonly agentPluginService: IAgentPluginService,
+		@ICustomizationHarnessService private readonly harnessService: ICustomizationHarnessService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) { }
 
 	renderTemplate(container: HTMLElement): IMcpServerItemTemplateData {
@@ -119,34 +143,65 @@ class McpServerItemRenderer implements IListRenderer<IMcpServerItemEntry | IMcpB
 		typeIcon.classList.add(...ThemeIcon.asClassNameArray(mcpServerIcon));
 
 		const details = DOM.append(container, $('.mcp-server-details'));
-		const name = DOM.append(details, $('.mcp-server-name'));
+		const nameRow = DOM.append(details, $('.mcp-server-name-row'));
+		const name = DOM.append(nameRow, $('.mcp-server-name'));
+
+		const bridgedBadge = DOM.append(nameRow, $('.inline-badge.mcp-bridged-badge'));
+		bridgedBadge.textContent = localize('bridged', "Bridged");
+
 		const description = DOM.append(details, $('.mcp-server-description'));
 
 		const status = DOM.append(container, $('.mcp-server-status'));
 
-		return { container, typeIcon, name, description, status, disposables: new DisposableStore() };
+		return { container, typeIcon, name, description, status, bridgedBadge, disposables: new DisposableStore() };
 	}
 
 	renderElement(element: IMcpServerItemEntry | IMcpBuiltinItemEntry, index: number, templateData: IMcpServerItemTemplateData): void {
 		templateData.disposables.clear();
 
+		// Show/hide the "Bridged" badge based on active harness
+		templateData.disposables.add(autorun(reader => {
+			const activeId = this.harnessService.activeHarness.read(reader);
+			templateData.bridgedBadge.style.display = activeId !== CustomizationHarness.VSCode ? '' : 'none';
+		}));
+		templateData.disposables.add(this.hoverService.setupManagedHover(
+			getDefaultHoverDelegate('mouse'),
+			templateData.bridgedBadge,
+			localize('bridgedHover', "This server is managed by VS Code and forwarded to all compatible agent sessions."),
+		));
+
 		if (element.type === 'builtin-item') {
 			templateData.container.classList.add('builtin');
 			templateData.name.textContent = formatDisplayName(element.label);
 			if (element.description) {
-				templateData.description.textContent = truncateToFirstSentence(element.description);
+				templateData.description.textContent = truncateToFirstLine(element.description);
 				templateData.description.style.display = '';
 			} else {
 				templateData.description.style.display = 'none';
 			}
 			templateData.status.style.display = 'none';
+
+			// Add hover with plugin provenance for plugin-sourced builtin items
+			const pluginUriStr = getPluginUriFromCollectionId(element.collectionId);
+			if (pluginUriStr) {
+				templateData.disposables.add(this.hoverService.setupDelayedHover(templateData.container, () => {
+					const plugin = this.agentPluginService.plugins.get().find(p => p.uri.toString() === pluginUriStr);
+					if (plugin) {
+						return {
+							content: `${element.label}\n${localize('fromPlugin', "Plugin: {0}", plugin.label)}`,
+							appearance: { compact: true, skipFadeInAnimation: true },
+						};
+					}
+					return { content: element.label, appearance: { compact: true, skipFadeInAnimation: true } };
+				}));
+			}
 			return;
 		}
 
 		templateData.container.classList.remove('builtin');
 		templateData.name.textContent = formatDisplayName(element.server.label);
 		if (element.server.description) {
-			templateData.description.textContent = truncateToFirstSentence(element.server.description);
+			templateData.description.textContent = truncateToFirstLine(element.server.description);
 			templateData.description.style.display = '';
 		} else {
 			templateData.description.style.display = 'none';
@@ -301,6 +356,12 @@ export class McpListWidget extends Disposable {
 	private readonly _onDidSelectServer = this._register(new Emitter<IWorkbenchMcpServer>());
 	readonly onDidSelectServer = this._onDidSelectServer.event;
 
+	private readonly _onDidChangeItemCount = this._register(new Emitter<number>());
+	readonly onDidChangeItemCount = this._onDidChangeItemCount.event;
+
+	private readonly _onDidRequestShowPlugin = this._register(new Emitter<IAgentPluginItem>());
+	readonly onDidRequestShowPlugin = this._onDidRequestShowPlugin.event;
+
 	private sectionHeader!: HTMLElement;
 	private sectionDescription!: HTMLElement;
 	private sectionLink!: HTMLAnchorElement;
@@ -316,10 +377,13 @@ export class McpListWidget extends Disposable {
 	private backLink!: HTMLElement;
 
 	private filteredServers: IWorkbenchMcpServer[] = [];
+	private filteredBuiltinCount = 0;
 	private displayEntries: IMcpListEntry[] = [];
 	private galleryServers: IWorkbenchMcpServer[] = [];
 	private searchQuery: string = '';
 	private browseMode: boolean = false;
+	private lastHeight: number = 0;
+	private lastWidth: number = 0;
 	private readonly collapsedGroups = new Set<string>();
 	private galleryCts: CancellationTokenSource | undefined;
 	private readonly delayedFilter = new Delayer<void>(200);
@@ -329,11 +393,14 @@ export class McpListWidget extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IMcpWorkbenchService private readonly mcpWorkbenchService: IMcpWorkbenchService,
 		@IMcpService private readonly mcpService: IMcpService,
+		@IMcpRegistry private readonly mcpRegistry: IMcpRegistry,
 		@ICommandService private readonly commandService: ICommandService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IContextViewService private readonly contextViewService: IContextViewService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IHoverService private readonly hoverService: IHoverService,
+		@IAgentPluginService private readonly agentPluginService: IAgentPluginService,
+		@IDialogService private readonly dialogService: IDialogService,
 	) {
 		super();
 		this.element = $('.mcp-list-widget');
@@ -377,10 +444,16 @@ export class McpListWidget extends Disposable {
 			this.toggleBrowseMode(!this.browseMode);
 		}));
 
-		const addButtonContainer = DOM.append(buttonContainer, $('.list-add-button-container'));
-		this.addButton = this._register(new Button(addButtonContainer, { ...defaultButtonStyles, supportIcons: true }));
-		this.addButton.label = `$(${Codicon.add.id}) ${localize('addServer', "Add Server")}`;
-		this.addButton.element.classList.add('list-add-button');
+		this.addButton = this._register(new Button(buttonContainer, {
+			...defaultButtonStyles,
+			secondary: true,
+			supportIcons: true,
+			title: localize('addServer', "Add Server"),
+			ariaLabel: localize('addServer', "Add Server")
+		}));
+		this.addButton.label = `$(${Codicon.add.id})`;
+		this.addButton.element.classList.add('list-icon-button');
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.addButton.element, localize('addServerTooltip', "Add Server")));
 		this._register(this.addButton.onDidClick(() => {
 			this.commandService.executeCommand(McpCommandIds.AddConfiguration);
 		}));
@@ -407,9 +480,10 @@ export class McpListWidget extends Disposable {
 
 		// Empty state
 		this.emptyContainer = DOM.append(this.element, $('.mcp-empty-state'));
-		const emptyIcon = DOM.append(this.emptyContainer, $('.empty-icon'));
+		const emptyHeader = DOM.append(this.emptyContainer, $('.empty-state-header'));
+		const emptyIcon = DOM.append(emptyHeader, $('.empty-icon'));
 		emptyIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.server));
-		this.emptyText = DOM.append(this.emptyContainer, $('.empty-text'));
+		this.emptyText = DOM.append(emptyHeader, $('.empty-text'));
 		this.emptySubtext = DOM.append(this.emptyContainer, $('.empty-subtext'));
 
 		// List container
@@ -521,7 +595,7 @@ export class McpListWidget extends Disposable {
 
 		// Update UI for browse vs installed mode
 		this.backLink.style.display = browse ? '' : 'none';
-		this.addButton.element.parentElement!.style.display = browse ? 'none' : '';
+		this.addButton.element.style.display = browse ? 'none' : '';
 		this.browseButton.element.parentElement!.style.display = browse ? 'none' : '';
 
 		this.searchInput.setPlaceHolder(browse
@@ -536,6 +610,11 @@ export class McpListWidget extends Disposable {
 			this.galleryServers = [];
 			this.filterServers();
 		}
+
+		// Re-layout to account for the back link height change
+		if (this.lastHeight > 0) {
+			this.layout(this.lastHeight, this.lastWidth);
+		}
 	}
 
 	private async queryGallery(): Promise<void> {
@@ -671,8 +750,79 @@ export class McpListWidget extends Disposable {
 			isFirst = false;
 		}
 
-		// Add built-in / extension-provided servers
-		if (builtinServers.length > 0) {
+		// Add plugin-provided, extension-provided, and built-in servers.
+		// Servers from the Copilot extension (github.copilot / github.copilot-chat)
+		// are treated as built-in; servers from other extensions go under "Extensions".
+		const collectionSources = new Map(this.mcpRegistry.collections.get().map(c => [c.id, c.source]));
+		const pluginServers: IMcpServer[] = [];
+		const extensionServers: IMcpServer[] = [];
+		const otherBuiltinServers: IMcpServer[] = [];
+		for (const server of builtinServers) {
+			const source = collectionSources.get(server.collection.id);
+			if (server.collection.id.startsWith(PLUGIN_COLLECTION_PREFIX)) {
+				pluginServers.push(server);
+			} else if (source instanceof ExtensionIdentifier && !isCopilotExtension(source)) {
+				extensionServers.push(server);
+			} else {
+				otherBuiltinServers.push(server);
+			}
+		}
+
+		if (pluginServers.length > 0) {
+			const collapsed = this.collapsedGroups.has('plugin');
+			entries.push({
+				type: 'group-header',
+				id: 'mcp-group-plugin',
+				scope: 'plugin',
+				label: localize('pluginGroup', "Plugins"),
+				icon: pluginIcon,
+				count: pluginServers.length,
+				isFirst,
+				description: localize('pluginGroupDescription', "MCP servers provided by installed plugins."),
+				collapsed,
+			});
+			if (!collapsed) {
+				for (const server of pluginServers) {
+					entries.push({
+						type: 'builtin-item',
+						id: `builtin-${server.definition.id}`,
+						label: server.definition.label,
+						description: '',
+						collectionId: server.collection.id,
+					});
+				}
+			}
+			isFirst = false;
+		}
+
+		if (extensionServers.length > 0) {
+			const collapsed = this.collapsedGroups.has('extension');
+			entries.push({
+				type: 'group-header',
+				id: 'mcp-group-extension',
+				scope: 'extension',
+				label: localize('extensionGroup', "Extensions"),
+				icon: extensionIcon,
+				count: extensionServers.length,
+				isFirst,
+				description: localize('extensionGroupDescription', "MCP servers contributed by installed VS Code extensions."),
+				collapsed,
+			});
+			if (!collapsed) {
+				for (const server of extensionServers) {
+					entries.push({
+						type: 'builtin-item',
+						id: `builtin-${server.definition.id}`,
+						label: server.definition.label,
+						description: '',
+						collectionId: server.collection.id,
+					});
+				}
+			}
+			isFirst = false;
+		}
+
+		if (otherBuiltinServers.length > 0) {
 			const collapsed = this.collapsedGroups.has('builtin');
 			entries.push({
 				type: 'group-header',
@@ -680,25 +830,47 @@ export class McpListWidget extends Disposable {
 				scope: 'builtin',
 				label: localize('builtInGroup', "Built-in"),
 				icon: builtinIcon,
-				count: builtinServers.length,
+				count: otherBuiltinServers.length,
 				isFirst,
 				description: localize('builtInGroupDescription', "MCP servers built into VS Code. These are available automatically."),
 				collapsed,
 			});
 			if (!collapsed) {
-				for (const server of builtinServers) {
+				for (const server of otherBuiltinServers) {
 					entries.push({
 						type: 'builtin-item',
 						id: `builtin-${server.definition.id}`,
 						label: server.definition.label,
 						description: '',
+						collectionId: server.collection.id,
 					});
 				}
 			}
+			isFirst = false;
 		}
 
 		this.displayEntries = entries;
 		this.list.splice(0, this.list.length, this.displayEntries);
+
+		// Compute sidebar badge directly from the data arrays (same source as group headers)
+		this.filteredBuiltinCount = builtinServers.length;
+		this._onDidChangeItemCount.fire(this.itemCount);
+	}
+
+	/**
+	 * Gets the total item count from the underlying data arrays
+	 * (the same source used to build group headers).
+	 */
+	get itemCount(): number {
+		return this.filteredServers.length + this.filteredBuiltinCount;
+	}
+
+	/**
+	 * Re-fires the current item count. Call after subscribing to onDidChangeItemCount
+	 * to ensure the subscriber receives the latest count.
+	 */
+	fireItemCount(): void {
+		this._onDidChangeItemCount.fire(this.itemCount);
 	}
 
 	/**
@@ -717,28 +889,26 @@ export class McpListWidget extends Disposable {
 	 * Layouts the widget.
 	 */
 	layout(height: number, width: number): void {
-		const sectionFooterHeight = this.sectionHeader.offsetHeight || 0;
-		const searchBarHeight = this.searchAndButtonContainer.offsetHeight || 52;
-		const backLinkHeight = this.browseMode ? (this.backLink.offsetHeight || 28) : 0;
-		const listHeight = height - sectionFooterHeight - searchBarHeight - backLinkHeight;
+		this.lastHeight = height;
+		this.lastWidth = width;
 
-		this.listContainer.style.height = `${Math.max(0, listHeight)}px`;
-		this.list.layout(Math.max(0, listHeight), width);
+		this.element.style.height = `${height}px`;
 
-		// Re-layout once after footer renders if we used a zero fallback
-		if (sectionFooterHeight === 0) {
-			DOM.getWindow(this.listContainer).requestAnimationFrame(() => {
-				if (this._store.isDisposed) {
-					return;
-				}
-				const actualFooterHeight = this.sectionHeader.offsetHeight;
-				if (actualFooterHeight > 0) {
-					const correctedHeight = height - actualFooterHeight - searchBarHeight - backLinkHeight;
-					this.listContainer.style.height = `${Math.max(0, correctedHeight)}px`;
-					this.list.layout(Math.max(0, correctedHeight), width);
-				}
-			});
+		// Measure sibling elements to calculate the list height.
+		// When offsetHeight returns 0 the container just became visible
+		// after display:none and the browser hasn't reflowed yet — defer
+		// layout to the next frame so measurements are accurate.
+		const searchBarHeight = this.searchAndButtonContainer.offsetHeight;
+		if (searchBarHeight === 0) {
+			DOM.getWindow(this.element).requestAnimationFrame(() => this.layout(this.lastHeight, this.lastWidth));
+			return;
 		}
+		const footerHeight = this.sectionHeader.offsetHeight;
+		const backLinkHeight = this.browseMode ? this.backLink.offsetHeight : 0;
+		const listHeight = Math.max(0, height - searchBarHeight - footerHeight - backLinkHeight);
+
+		this.listContainer.style.height = `${listHeight}px`;
+		this.list.layout(listHeight, width);
 	}
 
 	/**
@@ -748,6 +918,15 @@ export class McpListWidget extends Disposable {
 		this.searchInput.focus();
 	}
 
+	/**
+	 * Scrolls the list so the last item is visible.
+	 */
+	revealLastItem(): void {
+		if (this.list.length > 0) {
+			this.list.reveal(this.list.length - 1);
+		}
+	}
+
 	/**
 	 * Focuses the list.
 	 */
@@ -763,7 +942,66 @@ export class McpListWidget extends Disposable {
 	 * Handles context menu for MCP server items.
 	 */
 	private onContextMenu(e: IListContextMenuEvent<IMcpListEntry>): void {
-		if (!e.element || e.element.type !== 'server-item') {
+		if (!e.element) {
+			return;
+		}
+
+		// Plugin-provided builtin items get an "Uninstall Plugin" context menu
+		if (e.element.type === 'builtin-item') {
+			const collectionId = e.element.collectionId;
+			const pluginUriStr = getPluginUriFromCollectionId(collectionId);
+			if (!pluginUriStr) {
+				return;
+			}
+			const plugin = this.agentPluginService.plugins.get().find(p => p.uri.toString() === pluginUriStr);
+			if (!plugin) {
+				return;
+			}
+
+			const disposables = new DisposableStore();
+			const showPluginAction = disposables.add(new Action(
+				'mcpServer.showPlugin',
+				localize('showPlugin', "Show Plugin"),
+				undefined,
+				true,
+				async () => {
+					const item = {
+						kind: AgentPluginItemKind.Installed as const,
+						name: plugin.label,
+						description: plugin.fromMarketplace?.description ?? '',
+						marketplace: plugin.fromMarketplace?.marketplace,
+						plugin,
+					};
+					this._onDidRequestShowPlugin.fire(item);
+				}
+			));
+			const uninstallAction = disposables.add(new Action(
+				'mcpServer.uninstallPlugin',
+				localize('uninstallPlugin', "Uninstall Plugin"),
+				undefined,
+				true,
+				async () => {
+					const result = await this.dialogService.confirm({
+						message: localize('confirmUninstallPluginMcp', "This MCP server is provided by the plugin '{0}'", plugin.label),
+						detail: localize('confirmUninstallPluginMcpDetail', "Individual MCP servers from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"),
+						primaryButton: localize('uninstallPluginBtn', "Uninstall Plugin"),
+						type: 'question',
+					});
+					if (result.confirmed) {
+						plugin.remove();
+					}
+				}
+			));
+
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => e.anchor,
+				getActions: () => [showPluginAction, uninstallAction],
+				onHide: () => disposables.dispose(),
+			});
+			return;
+		}
+
+		if (e.element.type !== 'server-item') {
 			return;
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/media/aiCustomizationManagement.css b/src/vs/workbench/contrib/chat/browser/aiCustomization/media/aiCustomizationManagement.css
index 938c539fb4e..4c6fd79b107 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/media/aiCustomizationManagement.css
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/media/aiCustomizationManagement.css
@@ -53,7 +53,7 @@
 	background: transparent;
 	color: var(--vscode-descriptionForeground);
 	cursor: pointer;
-	font-size: 11px;
+	font-size: 13px;
 }
 
 .ai-customization-management-editor .folder-picker-button:hover {
@@ -139,6 +139,17 @@
 	font-weight: 400;
 }
 
+.ai-customization-management-editor .section-list-item .section-count {
+	flex-shrink: 0;
+	font-size: 10px;
+	font-weight: 500;
+	color: var(--vscode-descriptionForeground);
+	border-radius: 8px;
+	min-width: 14px;
+	text-align: center;
+	line-height: 16px;
+}
+
 /* Content area */
 .ai-customization-management-editor .management-content {
 	background-color: var(--vscode-editor-background);
@@ -157,6 +168,57 @@
 	display: flex;
 	flex-direction: column;
 	height: 100%;
+	overflow: hidden;
+}
+
+/* Harness dropdown in sidebar */
+.ai-customization-management-editor .sidebar-harness-dropdown {
+	flex-shrink: 0;
+	padding: 6px 4px 4px;
+}
+
+.ai-customization-management-editor .harness-dropdown-button {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	width: 100%;
+	padding: 5px 8px;
+	border: 1px solid var(--vscode-dropdown-border, transparent);
+	border-radius: 4px;
+	background: var(--vscode-dropdown-background);
+	color: var(--vscode-dropdown-foreground);
+	cursor: pointer;
+	font-size: 12px;
+	text-align: left;
+}
+
+.ai-customization-management-editor .harness-dropdown-button:hover {
+	background: var(--vscode-dropdown-background);
+	border-color: var(--vscode-focusBorder);
+}
+
+.ai-customization-management-editor .harness-dropdown-button:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.ai-customization-management-editor .harness-dropdown-icon {
+	font-size: 14px;
+	flex-shrink: 0;
+	color: inherit;
+}
+
+.ai-customization-management-editor .harness-dropdown-label {
+	flex: 1;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.ai-customization-management-editor .harness-dropdown-chevron {
+	font-size: 12px;
+	flex-shrink: 0;
+	opacity: 0.7;
 }
 
 /* Search and button container - consistent with Models view */
@@ -213,7 +275,7 @@
 	align-items: center;
 	justify-content: center;
 	padding: 48px 24px;
-	gap: 12px;
+	gap: 8px;
 	text-align: center;
 	flex: 1;
 }
@@ -233,7 +295,7 @@
 .ai-customization-list-widget .list-empty-state .empty-state-subtext {
 	font-size: 13px;
 	color: var(--vscode-descriptionForeground);
-	max-width: 300px;
+	max-width: 250px;
 	line-height: 1.4;
 }
 
@@ -246,16 +308,16 @@
 	display: flex;
 	align-items: center;
 	gap: 6px;
-	padding: 8px 8px 4px 8px;
+	padding: 4px 8px;
 	cursor: pointer;
 	user-select: none;
 	border-radius: 4px;
 }
 
 /* Spacing above non-first group headers */
-.ai-customization-group-header.has-previous-group {
-	padding-top: 12px;
-}
+/* .ai-customization-group-header.has-previous-group {
+	margin-top: 8px;
+} */
 
 .ai-customization-group-header:hover {
 	background-color: var(--vscode-list-hoverBackground);
@@ -273,13 +335,7 @@
 }
 
 .ai-customization-group-header .group-icon {
-	flex-shrink: 0;
-	width: 16px;
-	height: 16px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	opacity: 0.8;
+	display: none;
 }
 
 .ai-customization-group-header .group-label-group {
@@ -292,9 +348,8 @@
 }
 
 .ai-customization-group-header .group-label {
-	font-size: 11px;
-	font-weight: 600;
-	text-transform: uppercase;
+	font-weight: 500;
+	text-transform: capitalize;
 	letter-spacing: 0.04em;
 	color: var(--vscode-sideBarSectionHeader-foreground, var(--vscode-foreground));
 	overflow: hidden;
@@ -306,9 +361,7 @@
 	flex-shrink: 0;
 	font-size: 10px;
 	font-weight: 500;
-	background-color: var(--vscode-list-inactiveSelectionBackground);
-	color: var(--vscode-list-inactiveSelectionForeground, var(--vscode-foreground));
-	padding: 0 5px;
+	color: var(--vscode-descriptionForeground);
 	border-radius: 8px;
 	min-width: 14px;
 	text-align: center;
@@ -354,6 +407,10 @@
 	background-color: var(--vscode-list-hoverBackground);
 }
 
+.ai-customization-list-item.disabled {
+	opacity: 0.5;
+}
+
 .ai-customization-list-item .item-left {
 	display: flex;
 	align-items: center;
@@ -396,6 +453,25 @@
 	opacity: 0.6;
 }
 
+/* Shared inline badge style — used by MCP "Bridged" badge and item badges */
+.inline-badge {
+	flex-shrink: 0;
+	font-size: 10px;
+	padding: 0 4px;
+	border-radius: 3px;
+	color: var(--vscode-descriptionForeground);
+	background: var(--vscode-toolbar-hoverBackground, rgba(90, 93, 94, 0.31));
+	white-space: nowrap;
+	line-height: 16px;
+}
+
+/* MCP bridged badge — shown inline next to the server name */
+.mcp-server-item .mcp-server-name-row {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+}
+
 .ai-customization-list-item .item-type-icon {
 	flex-shrink: 0;
 	width: 16px;
@@ -415,6 +491,13 @@
 	min-width: 0;
 }
 
+.ai-customization-list-item .item-name-row {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	overflow: hidden;
+}
+
 .ai-customization-list-item .item-name {
 	font-size: 13px;
 	overflow: hidden;
@@ -637,6 +720,7 @@
 	display: flex;
 	flex-direction: column;
 	height: 100%;
+	overflow: hidden;
 }
 
 .mcp-list-widget .section-footer {
@@ -680,7 +764,7 @@
 	align-items: center;
 	justify-content: center;
 	padding: 48px 24px;
-	gap: 12px;
+	gap: 8px;
 	text-align: center;
 	flex: 1;
 }
@@ -700,7 +784,7 @@
 .mcp-list-widget .mcp-empty-state .empty-subtext {
 	font-size: 13px;
 	color: var(--vscode-descriptionForeground);
-	max-width: 300px;
+	max-width: 250px;
 	line-height: 1.4;
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/aiCustomization/pluginListWidget.ts b/src/vs/workbench/contrib/chat/browser/aiCustomization/pluginListWidget.ts
index ccbda744363..28ec72c3c1f 100644
--- a/src/vs/workbench/contrib/chat/browser/aiCustomization/pluginListWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/aiCustomization/pluginListWidget.ts
@@ -20,10 +20,12 @@ import { IOpenerService } from '../../../../../platform/opener/common/opener.js'
 import { URI } from '../../../../../base/common/uri.js';
 import { InputBox } from '../../../../../base/browser/ui/inputbox/inputBox.js';
 import { IContextMenuService, IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Delayer } from '../../../../../base/common/async.js';
 import { IAction, Separator } from '../../../../../base/common/actions.js';
 import { basename, dirname } from '../../../../../base/common/resources.js';
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IAgentPlugin, IAgentPluginService } from '../../common/plugins/agentPluginService.js';
 import { isContributionEnabled } from '../../common/enablement.js';
@@ -32,7 +34,7 @@ import { IMarketplacePlugin, IPluginMarketplaceService } from '../../common/plug
 import { IPluginInstallService } from '../../common/plugins/pluginInstallService.js';
 import { AgentPluginItemKind, IAgentPluginItem, IInstalledPluginItem, IMarketplacePluginItem } from '../agentPluginEditor/agentPluginItems.js';
 import { pluginIcon } from './aiCustomizationIcons.js';
-import { formatDisplayName, truncateToFirstSentence } from './aiCustomizationListWidget.js';
+import { formatDisplayName, truncateToFirstLine } from './aiCustomizationListWidget.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { CustomizationGroupHeaderRenderer, ICustomizationGroupHeaderEntry, CUSTOMIZATION_GROUP_HEADER_HEIGHT, CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR } from './customizationGroupHeaderRenderer.js';
 
@@ -131,7 +133,7 @@ class PluginInstalledItemRenderer implements IListRenderer<IPluginInstalledItemE
 		templateData.name.textContent = formatDisplayName(element.item.name);
 
 		if (element.item.description) {
-			templateData.description.textContent = truncateToFirstSentence(element.item.description);
+			templateData.description.textContent = truncateToFirstLine(element.item.description);
 			templateData.description.style.display = '';
 		} else {
 			templateData.description.style.display = 'none';
@@ -275,6 +277,9 @@ export class PluginListWidget extends Disposable {
 	private readonly _onDidSelectPlugin = this._register(new Emitter<IAgentPluginItem>());
 	readonly onDidSelectPlugin = this._onDidSelectPlugin.event;
 
+	private readonly _onDidChangeItemCount = this._register(new Emitter<number>());
+	readonly onDidChangeItemCount = this._onDidChangeItemCount.event;
+
 	private sectionHeader!: HTMLElement;
 	private sectionDescription!: HTMLElement;
 	private sectionLink!: HTMLAnchorElement;
@@ -293,6 +298,8 @@ export class PluginListWidget extends Disposable {
 	private marketplaceItems: IMarketplacePluginItem[] = [];
 	private searchQuery: string = '';
 	private browseMode: boolean = false;
+	private lastHeight: number = 0;
+	private lastWidth: number = 0;
 	private readonly collapsedGroups = new Set<string>();
 	private marketplaceCts: CancellationTokenSource | undefined;
 	private readonly delayedFilter = new Delayer<void>(200);
@@ -308,6 +315,7 @@ export class PluginListWidget extends Disposable {
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ILabelService private readonly labelService: ILabelService,
+		@ICommandService private readonly commandService: ICommandService,
 	) {
 		super();
 		this.element = $('.mcp-list-widget'); // reuse MCP list widget CSS
@@ -339,7 +347,7 @@ export class PluginListWidget extends Disposable {
 			}
 		}));
 
-		// Button container (Browse Marketplace)
+		// Button container (Browse Marketplace + Install from Source)
 		const buttonContainer = DOM.append(this.searchAndButtonContainer, $('.list-button-group'));
 
 		const browseButtonContainer = DOM.append(buttonContainer, $('.list-add-button-container'));
@@ -350,6 +358,24 @@ export class PluginListWidget extends Disposable {
 			this.toggleBrowseMode(!this.browseMode);
 		}));
 
+		const installFromSourceButton = this._register(new Button(buttonContainer, { ...defaultButtonStyles, secondary: true, supportIcons: true }));
+		installFromSourceButton.label = `$(${Codicon.add.id})`;
+		installFromSourceButton.setTitle(localize('installFromSource', "Install Plugin from Source"));
+		installFromSourceButton.element.classList.add('list-icon-button');
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), installFromSourceButton.element, localize('installFromSourceTooltip', "Install Plugin from Source")));
+		this._register(installFromSourceButton.onDidClick(() => {
+			this.commandService.executeCommand('workbench.action.chat.installPluginFromSource');
+		}));
+
+		const createPluginButton = this._register(new Button(buttonContainer, { ...defaultButtonStyles, secondary: true, supportIcons: true }));
+		createPluginButton.label = `$(${Codicon.save.id})`;
+		createPluginButton.setTitle(localize('createPlugin', "Create Plugin"));
+		createPluginButton.element.classList.add('list-icon-button');
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), createPluginButton.element, localize('createPluginTooltip', "Create Plugin")));
+		this._register(createPluginButton.onDidClick(() => {
+			this.commandService.executeCommand('workbench.action.chat.createPlugin');
+		}));
+
 		// Back to installed link (shown only in browse mode)
 		this.backLink = DOM.append(this.element, $('.mcp-back-link'));
 		this.backLink.setAttribute('role', 'button');
@@ -372,9 +398,10 @@ export class PluginListWidget extends Disposable {
 
 		// Empty state
 		this.emptyContainer = DOM.append(this.element, $('.mcp-empty-state'));
-		const emptyIcon = DOM.append(this.emptyContainer, $('.empty-icon'));
+		const emptyHeader = DOM.append(this.emptyContainer, $('.empty-state-header'));
+		const emptyIcon = DOM.append(emptyHeader, $('.empty-icon'));
 		emptyIcon.classList.add(...ThemeIcon.asClassNameArray(pluginIcon));
-		this.emptyText = DOM.append(this.emptyContainer, $('.empty-text'));
+		this.emptyText = DOM.append(emptyHeader, $('.empty-text'));
 		this.emptySubtext = DOM.append(this.emptyContainer, $('.empty-subtext'));
 
 		// List container
@@ -386,7 +413,7 @@ export class PluginListWidget extends Disposable {
 		this.sectionDescription.textContent = localize('pluginsDescription', "Extend your AI agent with plugins that add commands, skills, agents, hooks, and MCP servers from reusable packages.");
 		this.sectionLink = DOM.append(this.sectionHeader, $('a.section-footer-link')) as HTMLAnchorElement;
 		this.sectionLink.textContent = localize('learnMorePlugins', "Learn more about agent plugins");
-		this.sectionLink.href = 'https://code.visualstudio.com/docs/copilot/chat/agent-plugins';
+		this.sectionLink.href = 'https://code.visualstudio.com/docs/copilot/customization/agent-plugins';
 		this._register(DOM.addDisposableListener(this.sectionLink, 'click', (e) => {
 			e.preventDefault();
 			const href = this.sectionLink.href;
@@ -503,6 +530,11 @@ export class PluginListWidget extends Disposable {
 			this.marketplaceItems = [];
 			this.filterPlugins();
 		}
+
+		// Re-layout to account for the back link height change
+		if (this.lastHeight > 0) {
+			this.layout(this.lastHeight, this.lastWidth);
+		}
 	}
 
 	private async queryMarketplace(): Promise<void> {
@@ -645,6 +677,25 @@ export class PluginListWidget extends Disposable {
 
 		this.displayEntries = entries;
 		this.list.splice(0, this.list.length, this.displayEntries);
+
+		// Compute sidebar badge directly from the data array (same source as group headers)
+		this._onDidChangeItemCount.fire(this.itemCount);
+	}
+
+	/**
+	 * Gets the total item count from the underlying data array
+	 * (the same source used to build group headers).
+	 */
+	get itemCount(): number {
+		return this.installedItems.length;
+	}
+
+	/**
+	 * Re-fires the current item count. Call after subscribing to onDidChangeItemCount
+	 * to ensure the subscriber receives the latest count.
+	 */
+	fireItemCount(): void {
+		this._onDidChangeItemCount.fire(this.itemCount);
 	}
 
 	private toggleGroup(entry: IPluginGroupHeaderEntry): void {
@@ -657,33 +708,38 @@ export class PluginListWidget extends Disposable {
 	}
 
 	layout(height: number, width: number): void {
-		const sectionFooterHeight = this.sectionHeader.offsetHeight || 0;
-		const searchBarHeight = this.searchAndButtonContainer.offsetHeight || 52;
-		const backLinkHeight = this.browseMode ? (this.backLink.offsetHeight || 28) : 0;
-		const listHeight = height - sectionFooterHeight - searchBarHeight - backLinkHeight;
+		this.lastHeight = height;
+		this.lastWidth = width;
 
-		this.listContainer.style.height = `${Math.max(0, listHeight)}px`;
-		this.list.layout(Math.max(0, listHeight), width);
+		this.element.style.height = `${height}px`;
 
-		if (sectionFooterHeight === 0) {
-			DOM.getWindow(this.listContainer).requestAnimationFrame(() => {
-				if (this._store.isDisposed) {
-					return;
-				}
-				const actualFooterHeight = this.sectionHeader.offsetHeight;
-				if (actualFooterHeight > 0) {
-					const correctedHeight = height - actualFooterHeight - searchBarHeight - backLinkHeight;
-					this.listContainer.style.height = `${Math.max(0, correctedHeight)}px`;
-					this.list.layout(Math.max(0, correctedHeight), width);
-				}
-			});
+		// Measure sibling elements to calculate the list height.
+		// When offsetHeight returns 0 the container just became visible
+		// after display:none and the browser hasn't reflowed yet — defer
+		// layout to the next frame so measurements are accurate.
+		const searchBarHeight = this.searchAndButtonContainer.offsetHeight;
+		if (searchBarHeight === 0) {
+			DOM.getWindow(this.element).requestAnimationFrame(() => this.layout(this.lastHeight, this.lastWidth));
+			return;
 		}
+		const footerHeight = this.sectionHeader.offsetHeight;
+		const backLinkHeight = this.browseMode ? this.backLink.offsetHeight : 0;
+		const listHeight = Math.max(0, height - searchBarHeight - footerHeight - backLinkHeight);
+
+		this.listContainer.style.height = `${listHeight}px`;
+		this.list.layout(listHeight, width);
 	}
 
 	focusSearch(): void {
 		this.searchInput.focus();
 	}
 
+	revealLastItem(): void {
+		if (this.list.length > 0) {
+			this.list.reveal(this.list.length - 1);
+		}
+	}
+
 	focus(): void {
 		this.list.domFocus();
 		if (this.list.length > 0) {
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts
index 9a283997160..849d78a520a 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts
@@ -61,12 +61,15 @@ import { toHistoryItemHoverContent } from '../../../scm/browser/scmHistory.js';
 import { getHistoryItemEditorTitle } from '../../../scm/browser/util.js';
 import { ITerminalService } from '../../../terminal/browser/terminal.js';
 import { IChatContentReference } from '../../common/chatService/chatService.js';
+import { coerceImageBuffer } from '../../common/chatImageExtraction.js';
+import { ChatConfiguration } from '../../common/constants.js';
 import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry, IElementVariableEntry, INotebookOutputVariableEntry, IPromptFileVariableEntry, IPromptTextVariableEntry, ISCMHistoryItemVariableEntry, OmittedState, PromptFileVariableKind, ChatRequestToolReferenceEntry, ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemChangeRangeVariableEntry, ITerminalVariableEntry, isStringVariableEntry } from '../../common/attachments/chatVariableEntries.js';
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../common/languageModels.js';
 import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
 import { ILanguageModelToolsService, isToolSet } from '../../common/tools/languageModelToolsService.js';
 import { getCleanPromptName } from '../../common/promptSyntax/config/promptFileLocations.js';
 import { IChatContextService } from '../contextContrib/chatContextService.js';
+import { IChatImageCarouselService } from '../chatImageCarouselService.js';
 
 const commonHoverOptions: Partial<IHoverOptions> = {
 	style: HoverStyle.Pointer,
@@ -137,6 +140,15 @@ abstract class AbstractChatAttachmentWidget extends Disposable {
 		return modelSupportsVision(this.currentLanguageModel);
 	}
 
+	private _hasClearButton = false;
+
+	protected appendDeletionHint(ariaLabel: string): string {
+		if (!this._hasClearButton) {
+			return ariaLabel;
+		}
+		return localize('chat.attachment.withDeleteHint', "{0} (Delete)", ariaLabel);
+	}
+
 	protected attachClearButton() {
 
 		if (this.attachment.range || !this.options.supportsDeletion) {
@@ -145,6 +157,8 @@ abstract class AbstractChatAttachmentWidget extends Disposable {
 			return;
 		}
 
+		this._hasClearButton = true;
+
 		const clearButton = new Button(this.element, {
 			supportIcons: true,
 			hoverDelegate: createInstantHoverDelegate(),
@@ -255,7 +269,7 @@ export class FileAttachmentWidget extends AbstractChatAttachmentWidget {
 			});
 		}
 
-		this.element.ariaLabel = ariaLabel;
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
 
 		this.instantiationService.invokeFunction(accessor => {
 			this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
@@ -310,6 +324,8 @@ export class TerminalCommandAttachmentWidget extends AbstractChatAttachmentWidge
 				await clickHandler();
 			}
 		}));
+
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
 	}
 }
 
@@ -407,6 +423,7 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatImageCarouselService private readonly chatImageCarouselService: IChatImageCarouselService,
 	) {
 		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
@@ -421,8 +438,11 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 
 		const ref = attachment.references?.[0]?.reference;
 		resource = ref && URI.isUri(ref) ? ref : undefined;
+		const imageData = coerceImageBuffer(attachment.value);
 		const clickHandler = async () => {
-			if (resource) {
+			if ((resource || imageData) && configurationService.getValue<boolean>(ChatConfiguration.ImageCarouselEnabled)) {
+				await this.openInCarousel(attachment.name, imageData, resource);
+			} else if (resource) {
 				await this.openResource(resource, { editorOptions: { preserveFocus: true } }, false, undefined);
 			}
 		};
@@ -430,15 +450,29 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 		const currentLanguageModelName = this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name ?? this.currentLanguageModel.identifier : 'Current model';
 
 		const fullName = resource ? this.labelService.getUriLabel(resource) : (attachment.fullName || attachment.name);
-		this._register(createImageElements(resource, attachment.name, fullName, this.element, attachment.value as Uint8Array, this.hoverService, ariaLabel, currentLanguageModelName, clickHandler, this.currentLanguageModel, attachment.omittedState, this.chatEntitlementService.previewFeaturesDisabled));
+		this._register(createImageElements(resource, attachment.name, fullName, this.element, imageData ?? (attachment.value as Uint8Array), this.hoverService, ariaLabel, currentLanguageModelName, clickHandler, this.currentLanguageModel, attachment.omittedState, this.chatEntitlementService.previewFeaturesDisabled));
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
+
+		// Wire up click + keyboard (Enter/Space) open handlers
+		const canOpenCarousel = !!imageData && configurationService.getValue<boolean>(ChatConfiguration.ImageCarouselEnabled);
+		if (canOpenCarousel || resource) {
+			this.element.style.cursor = 'pointer';
+			this._register(registerOpenEditorListeners(this.element, async () => {
+				await clickHandler();
+			}));
+		}
 
 		if (resource) {
-			this.addResourceOpenHandlers(resource, undefined);
 			instantiationService.invokeFunction(accessor => {
 				this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
 			});
 		}
 	}
+
+	private async openInCarousel(name: string, data: Uint8Array | undefined, referenceUri: URI | undefined): Promise<void> {
+		const resource = referenceUri ?? URI.from({ scheme: 'data', path: name });
+		await this.chatImageCarouselService.openCarouselAtResource(resource, data);
+	}
 }
 
 function createImageElements(resource: URI | undefined, name: string, fullName: string,
@@ -461,7 +495,6 @@ function createImageElements(resource: URI | undefined, name: string, fullName:
 
 	if (resource) {
 		element.style.cursor = 'pointer';
-		disposable.add(dom.addDisposableListener(element, 'click', clickHandler));
 	}
 	const supportsVision = modelSupportsVision(currentLanguageModel);
 	const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$((supportsVision && !previewFeaturesDisabled) ? 'span.codicon.codicon-file-media' : 'span.codicon.codicon-warning'));
@@ -546,7 +579,7 @@ export class PasteAttachmentWidget extends AbstractChatAttachmentWidget {
 		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
-		this.element.ariaLabel = ariaLabel;
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
 
 		const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
 		let resource: URI | undefined;
@@ -614,7 +647,7 @@ export class DefaultChatAttachmentWidget extends AbstractChatAttachmentWidget {
 			const withIcon = attachment.icon?.id ? `$(${attachment.icon.id})\u00A0${attachmentLabel}` : attachmentLabel;
 			this.label.setLabel(withIcon, correspondingContentReference?.options?.status?.description);
 		}
-		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+		this.element.ariaLabel = this.appendDeletionHint(localize('chat.attachment', "Attached context, {0}", attachment.name));
 
 		if (attachment.kind === 'diagnostic') {
 			if (attachment.filterUri) {
@@ -746,7 +779,7 @@ export class PromptFileAttachmentWidget extends AbstractChatAttachmentWidget {
 		this.hintElement.innerText = typeLabel;
 
 
-		this.element.ariaLabel = ariaLabel;
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
 	}
 }
 
@@ -784,6 +817,7 @@ export class PromptTextAttachmentWidget extends AbstractChatAttachmentWidget {
 			}));
 		}
 		this.label.setLabel(localize('instructions.label', 'Additional Instructions'), undefined, undefined);
+		this.element.ariaLabel = this.appendDeletionHint(localize('chat.attachment', "Attached context, {0}", attachment.name));
 
 		this._register(hoverService.setupDelayedHover(this.element, {
 			...commonHoverOptions,
@@ -823,7 +857,7 @@ export class ToolSetOrToolItemAttachmentWidget extends AbstractChatAttachmentWid
 		this.label.setLabel(`$(${icon.id})\u00A0${name}`, undefined);
 
 		this.element.style.cursor = 'pointer';
-		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", name);
+		this.element.ariaLabel = this.appendDeletionHint(localize('chat.attachment', "Attached context, {0}", name));
 
 		let hoverContent: string | undefined;
 
@@ -901,10 +935,10 @@ export class NotebookCellOutputChatAttachmentWidget extends AbstractChatAttachme
 			//
 		}
 		this.label.setLabel(withIcon, undefined, { title });
-		this.element.ariaLabel = this.getAriaLabel(attachment);
+		this.element.ariaLabel = this.appendDeletionHint(this.getAriaLabel(attachment));
 	}
 	private renderGenericOutput(resource: URI, attachment: INotebookOutputVariableEntry) {
-		this.element.ariaLabel = this.getAriaLabel(attachment);
+		this.element.ariaLabel = this.appendDeletionHint(this.getAriaLabel(attachment));
 		this.label.setFile(resource, { hidePath: true, icon: ThemeIcon.fromId('output') });
 	}
 	private renderImageOutput(resource: URI, attachment: INotebookOutputVariableEntry) {
@@ -921,6 +955,7 @@ export class NotebookCellOutputChatAttachmentWidget extends AbstractChatAttachme
 		const currentLanguageModelName = this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name ?? this.currentLanguageModel.identifier : undefined;
 		const buffer = this.getOutputItem(resource, attachment)?.data.buffer ?? new Uint8Array();
 		this._register(createImageElements(resource, attachment.name, attachment.name, this.element, buffer, this.hoverService, ariaLabel, currentLanguageModelName, clickHandler, this.currentLanguageModel, attachment.omittedState, this.chatEntitlementService.previewFeaturesDisabled));
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
 	}
 
 	private getOutputItem(resource: URI, attachment: INotebookOutputVariableEntry) {
@@ -958,7 +993,7 @@ export class ElementChatAttachmentWidget extends AbstractChatAttachmentWidget {
 		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const ariaLabel = localize('chat.elementAttachment', "Attached element, {0}", attachment.name);
-		this.element.ariaLabel = ariaLabel;
+		this.element.ariaLabel = this.appendDeletionHint(ariaLabel);
 
 		this.element.style.position = 'relative';
 		this.element.style.cursor = 'pointer';
@@ -1264,7 +1299,7 @@ export class SCMHistoryItemAttachmentWidget extends AbstractChatAttachmentWidget
 		this.label.setLabel(attachment.name, undefined);
 
 		this.element.style.cursor = 'pointer';
-		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+		this.element.ariaLabel = this.appendDeletionHint(localize('chat.attachment', "Attached context, {0}", attachment.name));
 
 		const { content, disposables } = toHistoryItemHoverContent(markdownRendererService, attachment.historyItem, false);
 		this._store.add(hoverService.setupDelayedHover(this.element, {
@@ -1314,7 +1349,7 @@ export class SCMHistoryItemChangeAttachmentWidget extends AbstractChatAttachment
 		const nameSuffix = `\u00A0$(${Codicon.gitCommit.id})${attachment.historyItem.displayId ?? attachment.historyItem.id}`;
 		this.label.setFile(attachment.value, { fileKind: FileKind.FILE, hidePath: true, nameSuffix });
 
-		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+		this.element.ariaLabel = this.appendDeletionHint(localize('chat.attachment', "Attached context, {0}", attachment.name));
 
 		const { content, disposables } = toHistoryItemHoverContent(markdownRendererService, attachment.historyItem, false);
 		this._store.add(hoverService.setupDelayedHover(this.element, {
@@ -1359,7 +1394,7 @@ export class SCMHistoryItemChangeRangeAttachmentWidget extends AbstractChatAttac
 		const nameSuffix = `\u00A0$(${Codicon.gitCommit.id})${historyItemStartId}..${historyItemEndId}`;
 		this.label.setFile(attachment.value, { fileKind: FileKind.FILE, hidePath: true, nameSuffix });
 
-		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+		this.element.ariaLabel = this.appendDeletionHint(localize('chat.attachment', "Attached context, {0}", attachment.name));
 
 		this.addResourceOpenHandlers(attachment.value, undefined);
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts b/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
index 9eeac397e31..dfc3474638c 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
@@ -93,13 +93,16 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		contextNode.classList.toggle('disabled', !context.enabled);
 		const file: URI | undefined = context.uri;
 		const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? localize('cell.lowercase', "cell") : localize('file.lowercase', "file");
+		const contextLabel = context.name ?? (file ? basename(file) : localize('implicitContextFallback', "context"));
 
 		const isSuggestedEnabled = this.configService.getValue('chat.implicitContext.suggestedContext');
 
 		// Create toggle button BEFORE the label so it appears on the left
 		if (isSuggestedEnabled) {
 			if (!isSelection) {
-				const buttonMsg = context.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : '';
+				const buttonMsg = context.enabled
+					? localize('disableImplicitContext', "Disable {0} context {1}", attachmentTypeName, contextLabel)
+					: localize('addToContext', "Add {0} to context", contextLabel);
 				const toggleButton = this.renderDisposables.add(new Button(contextNode, { supportIcons: true, title: buttonMsg }));
 				toggleButton.icon = context.enabled ? Codicon.x : Codicon.plus;
 				this.renderDisposables.add(toggleButton.onDidClick(async (e) => {
@@ -158,6 +161,7 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		if (isStringImplicitContextValue(context.value)) {
 			markdownTooltip = context.value.tooltip;
 			title = this.renderString(label, context.name, context.icon, context.value.resourceUri, markdownTooltip, localize('openFile', "Current file context"));
+			contextNode.ariaLabel = localize('chat.implicitStringContext', "Suggested context, {0}", context.name);
 		} else {
 			title = this.renderResource(context.value, context.isSelection, context.enabled, label, contextNode);
 		}
@@ -214,7 +218,9 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		const fileBasename = basename(file);
 		const fileDirname = dirname(file);
 		const friendlyName = `${fileBasename} ${fileDirname}`;
-		const ariaLabel = range ? localize('chat.fileAttachmentWithRange', "Attached {0}, {1}, line {2} to line {3}", attachmentTypeName, friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.fileAttachment', "Attached {0}, {1}", attachmentTypeName, friendlyName);
+		const ariaLabel = range
+			? localize('chat.implicitFileContextWithRange', "Suggested context, {0}, {1}, line {2} to line {3}", attachmentTypeName, friendlyName, range.startLineNumber, range.endLineNumber)
+			: localize('chat.implicitFileContext', "Suggested context, {0}, {1}", attachmentTypeName, friendlyName);
 
 		const uriLabel = this.labelService.getUriLabel(file, { relative: true });
 		const currentFile = localize('openEditor', "Current {0} context", attachmentTypeName);
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 93251f797e3..ca72356a437 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -8,6 +8,7 @@ import { Disposable, DisposableMap, DisposableStore } from '../../../../base/com
 import { Schemas } from '../../../../base/common/network.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { PolicyCategory } from '../../../../base/common/policy.js';
+import { AgentHostEnabledSettingId, AgentHostIpcLoggingSettingId } from '../../../../platform/agentHost/common/agentService.js';
 import { registerEditorFeature } from '../../../../editor/common/editorFeatures.js';
 import * as nls from '../../../../nls.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
@@ -28,6 +29,7 @@ import { IWorkbenchAssignmentService } from '../../../services/assignment/common
 import { ChatEntitlement, IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { AddConfigurationType, AssistedTypes } from '../../mcp/browser/mcpCommandsAddConfiguration.js';
 import { allDiscoverySources, discoverySourceSettingsLabel, mcpDiscoverySection, mcpServerSamplingSection } from '../../mcp/common/mcpConfiguration.js';
@@ -42,6 +44,7 @@ import { IChatService } from '../common/chatService/chatService.js';
 import { ChatService } from '../common/chatService/chatServiceImpl.js';
 import { IChatSessionsService } from '../common/chatSessionsService.js';
 import { ChatSlashCommandService, IChatSlashCommandService } from '../common/participants/chatSlashCommands.js';
+import { ChatArtifactsService, IChatArtifactsService } from '../common/tools/chatArtifactsService.js';
 import { ChatTodoListService, IChatTodoListService } from '../common/tools/chatTodoListService.js';
 import { ChatTransferService, IChatTransferService } from '../common/model/chatTransferService.js';
 import { IChatVariablesService } from '../common/attachments/chatVariables.js';
@@ -54,9 +57,9 @@ import { ILanguageModelToolsConfirmationService } from '../common/tools/language
 import { ILanguageModelToolsService } from '../common/tools/languageModelToolsService.js';
 import { agentPluginDiscoveryRegistry, IAgentPluginService } from '../common/plugins/agentPluginService.js';
 import { ChatPromptFilesExtensionPointHandler } from '../common/promptSyntax/chatPromptFilesContribution.js';
-import { PromptsConfig } from '../common/promptSyntax/config/config.js';
+import { isTildePath, PromptsConfig } from '../common/promptSyntax/config/config.js';
 import { INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, DEFAULT_SKILL_SOURCE_FOLDERS, AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, SKILL_FILENAME, CLAUDE_AGENTS_SOURCE_FOLDER, DEFAULT_HOOK_FILE_PATHS, DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS, PromptFileSource, COPILOT_USER_AGENTS_SOURCE_FOLDER } from '../common/promptSyntax/config/promptFileLocations.js';
-import { PromptLanguageFeaturesProvider } from '../common/promptSyntax/promptFileContributions.js';
+import { PromptLanguageFeaturesProvider } from './promptSyntax/promptFileContributions.js';
 import { AGENT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, SKILL_DOCUMENTATION_URL, HOOK_DOCUMENTATION_URL, PromptsType } from '../common/promptSyntax/promptTypes.js';
 import { hookFileSchema, HOOK_SCHEMA_URI } from '../common/promptSyntax/hookSchema.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -125,6 +128,7 @@ import { ChatLayoutService } from './widget/chatLayoutService.js';
 import { ChatLanguageModelsDataContribution, LanguageModelsConfigurationService } from './languageModelsConfigurationService.js';
 import './chatManagement/chatManagement.contribution.js';
 import './aiCustomization/aiCustomizationWorkspaceService.js';
+import './aiCustomization/customizationHarnessService.js';
 import './aiCustomization/aiCustomizationManagement.contribution.js';
 
 import { ChatOutputRendererService, IChatOutputRendererService } from './chatOutputItemRenderer.js';
@@ -145,11 +149,13 @@ import './widget/input/editor/chatInputEditorContrib.js';
 import './widget/input/editor/chatInputEditorHover.js';
 import { LanguageModelToolsConfirmationService } from './tools/languageModelToolsConfirmationService.js';
 import { LanguageModelToolsService, globalAutoApproveDescription } from './tools/languageModelToolsService.js';
-import { AgentPluginService, ConfiguredAgentPluginDiscovery, MarketplaceAgentPluginDiscovery } from '../common/plugins/agentPluginServiceImpl.js';
+import { AgentPluginService, ConfiguredAgentPluginDiscovery, ExtensionAgentPluginDiscovery, MarketplaceAgentPluginDiscovery } from '../common/plugins/agentPluginServiceImpl.js';
 import { IAgentPluginRepositoryService } from '../common/plugins/agentPluginRepositoryService.js';
 import { IPluginInstallService } from '../common/plugins/pluginInstallService.js';
 import { IPluginMarketplaceService, PluginMarketplaceService } from '../common/plugins/pluginMarketplaceService.js';
+import { WorkspacePluginSettingsService, IWorkspacePluginSettingsService } from '../common/plugins/workspacePluginSettingsService.js';
 import { AgentPluginsViewsContribution } from './agentPluginsView.js';
+import { AgentPluginRecommendations } from './claudePluginRecommendations.js';
 import { AgentPluginEditor } from './agentPluginEditor/agentPluginEditor.js';
 import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
 import { AgentPluginRepositoryService } from './agentPluginRepositoryService.js';
@@ -157,6 +163,7 @@ import { PluginInstallService } from './pluginInstallService.js';
 import './promptSyntax/promptCodingAgentActionContribution.js';
 import './promptSyntax/promptToolsCodeLensProvider.js';
 import { ChatSlashCommandsContribution } from './chatSlashCommands.js';
+import { PluginUrlHandler } from './pluginUrlHandler.js';
 import { PromptUrlHandler } from './promptSyntax/promptUrlHandler.js';
 import { ConfigureToolSets, UserToolSetsContributions } from './tools/toolSetsContribution.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
@@ -169,6 +176,7 @@ import { ChatTipService, IChatTipService } from './chatTipService.js';
 import { ChatQueuePickerRendering } from './widget/input/chatQueuePickerActionItem.js';
 import { ExploreAgentDefaultModel } from './exploreAgentDefaultModel.js';
 import { PlanAgentDefaultModel } from './planAgentDefaultModel.js';
+import { ChatImageCarouselService, IChatImageCarouselService } from './chatImageCarouselService.js';
 
 const toolReferenceNameEnumValues: string[] = [];
 const toolReferenceNameEnumDescriptions: string[] = [];
@@ -229,9 +237,15 @@ configurationRegistry.registerConfiguration({
 			default: 0
 		},
 		[ChatConfiguration.AgentStatusEnabled]: {
-			type: 'boolean',
-			markdownDescription: nls.localize('chat.agentsControl.enabled', "Controls whether the 'Agent Status' indicator is shown in the title bar command center. Enabling this setting will automatically enable {0}. The unread/in-progress session indicators require {1} to be enabled.", '`#window.commandCenter#`', '`#chat.viewSessions.enabled#`'),
-			default: true,
+			type: 'string',
+			enum: ['hidden', 'badge', 'compact'],
+			enumDescriptions: [
+				nls.localize('chat.agentsControl.hidden', "The agent status indicator is hidden from the title bar."),
+				nls.localize('chat.agentsControl.badge', "Shows the agent status as a badge next to the command center."),
+				nls.localize('chat.agentsControl.compact', "Replaces the command center search box with a compact agent status indicator and unified chat widget."),
+			],
+			markdownDescription: nls.localize('chat.agentsControl.enabled', "Controls how the 'Agent Status' indicator appears in the title bar command center. When set to `hidden`, the indicator is not shown. Other values show the indicator and automatically enable {0}. The unread and in-progress session indicators require {1} to be enabled.", '`#window.commandCenter#`', '`#chat.viewSessions.enabled#`'),
+			default: 'compact',
 			tags: ['experimental']
 		},
 		[ChatConfiguration.UnifiedAgentsBar]: {
@@ -300,15 +314,16 @@ configurationRegistry.registerConfiguration({
 				mode: 'auto'
 			}
 		},
+		[ChatConfiguration.RevealNextChangeOnResolve]: {
+			type: 'boolean',
+			markdownDescription: nls.localize('chat.editing.revealNextChangeOnResolve', "Controls whether the editor automatically reveals the next change after keeping or undoing a chat edit."),
+			default: true,
+		},
 		'chat.tips.enabled': {
 			type: 'boolean',
 			scope: ConfigurationScope.APPLICATION,
 			description: nls.localize('chat.tips.enabled', "Controls whether tips are shown above user messages in chat. New tips are added frequently, so this is a helpful way to stay up to date with the latest features."),
-			default: false,
-			tags: ['experimental'],
-			experiment: {
-				mode: 'auto'
-			}
+			default: true,
 		},
 		'chat.upvoteAnimation': {
 			type: 'string',
@@ -366,7 +381,7 @@ configurationRegistry.registerConfiguration({
 		},
 		[ChatConfiguration.AutoReply]: {
 			default: false,
-			markdownDescription: nls.localize('chat.autoReply.description', "Automatically answer chat question carousels using the current model. This is an advanced setting and can lead to unintended choices or actions based on incomplete context."),
+			markdownDescription: nls.localize('chat.autoReply.description', "Automatically skip question carousels by telling the agent that the user is not available and to use its best judgment. This is an advanced setting and can lead to unintended choices or actions based on incomplete context."),
 			type: 'boolean',
 			scope: ConfigurationScope.APPLICATION_MACHINE,
 			tags: ['experimental', 'advanced'],
@@ -413,7 +428,10 @@ configurationRegistry.registerConfiguration({
 			}
 		},
 		[ChatConfiguration.AutoApprovedUrls]: {
-			default: {},
+			default: {
+				'https://code.visualstudio.com': true,
+				'https://github.com/microsoft/vscode/wiki/*': true,
+			},
 			markdownDescription: nls.localize('chat.tools.fetchPage.approvedUrls', "Controls which URLs are automatically approved when requested by chat tools. Keys are URL patterns and values can be `true` to approve both requests and responses, `false` to deny, or an object with `approveRequest` and `approveResponse` properties for granular control.\n\nExamples:\n- `\"https://example.com\": true` - Approve all requests to example.com\n- `\"https://*.example.com\": true` - Approve all requests to any subdomain of example.com\n- `\"https://example.com/api/*\": { \"approveRequest\": true, \"approveResponse\": false }` - Approve requests but not responses for example.com/api paths"),
 			type: 'object',
 			additionalProperties: {
@@ -476,6 +494,51 @@ configurationRegistry.registerConfiguration({
 			type: 'boolean',
 			tags: ['experimental']
 		},
+		[ChatConfiguration.ArtifactsEnabled]: {
+			default: false,
+			description: nls.localize('chat.artifacts.enabled', "Controls whether the artifacts view is available in chat."),
+			type: 'boolean',
+			tags: ['experimental']
+		},
+		[ChatConfiguration.ArtifactsMode]: {
+			default: 'rules',
+			description: nls.localize('chat.artifacts.mode', "Controls how artifacts are populated. 'rules' extracts artifacts deterministically from the conversation. 'tool' lets the model set artifacts via a tool call."),
+			type: 'string',
+			enum: ['rules', 'tool'],
+			tags: ['experimental']
+		},
+		[ChatConfiguration.ArtifactsRulesByMimeType]: {
+			default: {
+				'image/*': { groupName: 'Screenshots', onlyShowGroup: true }
+			},
+			description: nls.localize('chat.artifacts.rules.byMimeType', "Rules for extracting artifacts from tool results by MIME type. Maps MIME type patterns (e.g. 'image/*') to group configuration."),
+			type: 'object',
+			additionalProperties: {
+				type: 'object',
+				properties: {
+					groupName: { type: 'string', description: nls.localize('chat.artifacts.rules.groupName', "Display name for the artifact group.") },
+					onlyShowGroup: { type: 'boolean', description: nls.localize('chat.artifacts.rules.onlyShowGroup', "When true, show only the group header instead of individual items.") }
+				},
+				required: ['groupName']
+			},
+			tags: ['experimental']
+		},
+		[ChatConfiguration.ArtifactsRulesByFilePath]: {
+			default: {
+				'**/*plan*.md': { groupName: 'Plans' }
+			},
+			description: nls.localize('chat.artifacts.rules.byFilePath', "Rules for extracting artifacts from written files by file path pattern. Maps glob patterns to group configuration."),
+			type: 'object',
+			additionalProperties: {
+				type: 'object',
+				properties: {
+					groupName: { type: 'string', description: nls.localize('chat.artifacts.rules.byFilePath.groupName', "Display name for the artifact group.") },
+					onlyShowGroup: { type: 'boolean', description: nls.localize('chat.artifacts.rules.byFilePath.onlyShowGroup', "When true, show only the group header instead of individual items.") }
+				},
+				required: ['groupName']
+			},
+			tags: ['experimental']
+		},
 		'chat.undoRequests.restoreInput': {
 			default: true,
 			markdownDescription: nls.localize('chat.undoRequests.restoreInput', "Controls whether the input of the chat should be restored when an undo request is made. The input will be filled with the text of the request that was restored."),
@@ -695,6 +758,20 @@ configurationRegistry.registerConfiguration({
 				}
 			}
 		},
+		[AgentHostEnabledSettingId]: {
+			type: 'boolean',
+			description: nls.localize('chat.agentHost.enabled', "When enabled, some agents run in a separate agent host process."),
+			default: false,
+			tags: ['experimental', 'advanced'],
+			included: product.quality !== 'stable',
+		},
+		[AgentHostIpcLoggingSettingId]: {
+			type: 'boolean',
+			description: nls.localize('chat.agentHost.ipcLogging', "When enabled, logs all IPC traffic for each agent host to a dedicated output channel."),
+			default: false,
+			tags: ['experimental', 'advanced'],
+			included: product.quality !== 'stable',
+		},
 		[ChatConfiguration.PlanAgentDefaultModel]: {
 			type: 'string',
 			description: nls.localize('chat.planAgent.defaultModel.description', "Select the default language model to use for the Plan agent from the available providers."),
@@ -992,6 +1069,15 @@ configurationRegistry.registerConfiguration({
 			disallowConfigurationDefault: true,
 			tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions']
 		},
+		[PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS]: {
+			type: 'boolean',
+			title: nls.localize('chat.useCustomizationsInParentRepos.title', "Use Customizations in Parent Repositories",),
+			markdownDescription: nls.localize('chat.useCustomizationsInParentRepos.description', "Controls whether to use chat customization files in parent repositories.",),
+			default: false,
+			restricted: true,
+			disallowConfigurationDefault: true,
+			tags: ['prompts', 'reusable prompts', 'prompt snippets', 'instructions']
+		},
 		[PromptsConfig.SKILLS_LOCATION_KEY]: {
 			type: 'object',
 			title: nls.localize('chat.agentSkillsLocations.title', "Agent Skills Locations",),
@@ -1199,11 +1285,11 @@ configurationRegistry.registerConfiguration({
 					type: 'array',
 					items: { type: 'string' },
 					default: [],
-					description: nls.localize('chat.agent.thinking.phrases.phrases', "Custom loading messages to show during thinking, terminal, and tool operations.")
+					description: nls.localize('chat.agent.thinking.phrases.phrases', "Custom loading messages to show during thinking, working progress, terminal, and tool operations.")
 				}
 			},
 			additionalProperties: false,
-			markdownDescription: nls.localize('chat.agent.thinking.phrases', "Customize the loading messages shown during agent operations. Use `\"mode\": \"replace\"` to use only your phrases, or `\"mode\": \"append\"` to add them to the defaults."),
+			markdownDescription: nls.localize('chat.agent.thinking.phrases', "Customize the loading messages shown during agent thinking and progress indicators. Use `\"mode\": \"replace\"` to use only your phrases, or `\"mode\": \"append\"` to add them to the defaults."),
 			tags: ['experimental'],
 		},
 		[ChatConfiguration.AutoExpandToolFailures]: {
@@ -1263,12 +1349,33 @@ configurationRegistry.registerConfiguration({
 				mode: 'auto'
 			}
 		},
+		[ChatConfiguration.SubagentsAllowInvocationsFromSubagents]: {
+			type: 'boolean',
+			description: nls.localize('chat.subagents.allowInvocationsFromSubagents', "Allow subagents to invoke subagents."),
+			markdownDescription: nls.localize('chat.subagents.allowInvocationsFromSubagents.md', "Controls whether subagents can invoke other subagents. When enabled, nesting is limited to a maximum depth of 5."),
+			default: false,
+			experiment: {
+				mode: 'auto'
+			}
+		},
 		[ChatConfiguration.ChatCustomizationMenuEnabled]: {
 			type: 'boolean',
 			tags: ['preview'],
-			description: nls.localize('chat.aiCustomizationMenu.enabled', "Controls whether the Chat Customizations editor is available in the Command Palette. When disabled, the Chat Customizations editor and related commands are hidden."),
+			description: nls.localize('chat.aiCustomizationMenu.enabled', "Controls whether the Chat Customizations editor is enabled. When enabled, the gear icon in the Chat view opens the Customizations editor directly and additional actions are moved to the overflow menu. When disabled, the gear icon shows the legacy configuration dropdown."),
 			default: true,
 		},
+		[ChatConfiguration.ChatCustomizationHarnessSelectorEnabled]: {
+			type: 'boolean',
+			tags: ['preview'],
+			description: nls.localize('chat.customizations.harnessSelector.enabled', "Controls whether the harness selector (Local, Copilot CLI, Claude) is shown in the Chat Customizations editor sidebar. When disabled, the editor always shows all customizations without filtering."),
+			default: true,
+		},
+		[ChatConfiguration.CustomizationsProviderApi]: {
+			type: 'boolean',
+			description: nls.localize('chat.customizations.providerApi.enabled', "When enabled, the Customizations management UI reads items from the session type's customizations provider instead of built-in discovery."),
+			default: false,
+			tags: ['experimental'],
+		},
 	}
 });
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
@@ -1644,6 +1751,7 @@ class HookSchemaAssociationContribution extends Disposable implements IWorkbench
 
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IPathService private readonly _pathService: IPathService,
 	) {
 		super();
 		this._updateAssociations();
@@ -1654,10 +1762,12 @@ class HookSchemaAssociationContribution extends Disposable implements IWorkbench
 		}));
 	}
 
-	private _updateAssociations(): void {
+	private async _updateAssociations(): Promise<void> {
 		this._registrations.clear();
 
 		const folders = PromptsConfig.promptSourceFolders(this._configurationService, PromptsType.hook);
+		const userHomeUri = await this._pathService.userHome();
+		const userHome = userHomeUri.fsPath ?? userHomeUri.path;
 
 		for (const folder of folders) {
 			// Skip Claude settings files — they use a different schema format
@@ -1665,10 +1775,15 @@ class HookSchemaAssociationContribution extends Disposable implements IWorkbench
 				continue;
 			}
 
+			// Expand tilde paths to absolute paths so the JSON language service can match them
+			const resolvedPath = isTildePath(folder.path)
+				? userHome + folder.path.substring(1)
+				: folder.path;
+
 			// If it's a specific .json file, use it directly; otherwise treat as directory
-			const glob = folder.path.toLowerCase().endsWith('.json')
-				? folder.path
-				: `${folder.path}/*.json`;
+			const glob = resolvedPath.toLowerCase().endsWith('.json')
+				? resolvedPath
+				: `${resolvedPath}/*.json`;
 
 			this._registrations.add(
 				jsonContributionRegistry.registerSchemaAssociation(HOOK_SCHEMA_URI, glob)
@@ -1759,6 +1874,7 @@ registerWorkbenchContribution2(ChatEditingEditorContextKeys.ID, ChatEditingEdito
 registerWorkbenchContribution2(ChatTransferContribution.ID, ChatTransferContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatContextContributions.ID, ChatContextContributions, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(PromptUrlHandler.ID, PromptUrlHandler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(PluginUrlHandler.ID, PluginUrlHandler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(ChatResponseResourceWorkbenchContribution.ID, ChatResponseResourceWorkbenchContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(UserToolSetsContributions.ID, UserToolSetsContributions, WorkbenchPhase.Eventually);
@@ -1766,6 +1882,7 @@ registerWorkbenchContribution2(PromptLanguageFeaturesProvider.ID, PromptLanguage
 registerWorkbenchContribution2(ChatWindowNotifier.ID, ChatWindowNotifier, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatRepoInfoContribution.ID, ChatRepoInfoContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(AgentPluginsViewsContribution.ID, AgentPluginsViewsContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(AgentPluginRecommendations.ID, AgentPluginRecommendations, WorkbenchPhase.Eventually);
 
 registerChatActions();
 registerChatAccessibilityActions();
@@ -1795,6 +1912,7 @@ registerEditorFeature(ChatPasteProvidersFeature);
 
 agentPluginDiscoveryRegistry.register(new SyncDescriptor(ConfiguredAgentPluginDiscovery));
 agentPluginDiscoveryRegistry.register(new SyncDescriptor(MarketplaceAgentPluginDiscovery));
+agentPluginDiscoveryRegistry.register(new SyncDescriptor(ExtensionAgentPluginDiscovery));
 
 registerSingleton(IChatResponseResourceFileSystemProvider, ChatResponseResourceFileSystemProvider, InstantiationType.Delayed);
 registerSingleton(IChatTransferService, ChatTransferService, InstantiationType.Delayed);
@@ -1812,6 +1930,7 @@ registerSingleton(IChatAgentNameService, ChatAgentNameService, InstantiationType
 registerSingleton(IChatVariablesService, ChatVariablesService, InstantiationType.Delayed);
 registerSingleton(IAgentPluginService, AgentPluginService, InstantiationType.Delayed);
 registerSingleton(IPluginMarketplaceService, PluginMarketplaceService, InstantiationType.Delayed);
+registerSingleton(IWorkspacePluginSettingsService, WorkspacePluginSettingsService, InstantiationType.Delayed);
 registerSingleton(IAgentPluginRepositoryService, AgentPluginRepositoryService, InstantiationType.Delayed);
 registerSingleton(IPluginInstallService, PluginInstallService, InstantiationType.Delayed);
 registerSingleton(ILanguageModelToolsService, LanguageModelToolsService, InstantiationType.Delayed);
@@ -1828,9 +1947,11 @@ registerSingleton(IChatModeService, ChatModeService, InstantiationType.Delayed);
 registerSingleton(IChatAttachmentResolveService, ChatAttachmentResolveService, InstantiationType.Delayed);
 registerSingleton(IChatAttachmentWidgetRegistry, ChatAttachmentWidgetRegistry, InstantiationType.Delayed);
 registerSingleton(IChatTodoListService, ChatTodoListService, InstantiationType.Delayed);
+registerSingleton(IChatArtifactsService, ChatArtifactsService, InstantiationType.Delayed);
 registerSingleton(IChatOutputRendererService, ChatOutputRendererService, InstantiationType.Delayed);
 registerSingleton(IChatLayoutService, ChatLayoutService, InstantiationType.Delayed);
 registerSingleton(IChatTipService, ChatTipService, InstantiationType.Delayed);
 registerSingleton(IChatDebugService, ChatDebugServiceImpl, InstantiationType.Delayed);
+registerSingleton(IChatImageCarouselService, ChatImageCarouselService, InstantiationType.Delayed);
 
 ChatWidget.CONTRIBS.push(ChatDynamicVariableModel);
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 9b3fc446d6c..8b2ff39adbe 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -18,6 +18,7 @@ import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } f
 import { IChatResponseModel, IChatModelInputState } from '../common/model/chatModel.js';
 import { IChatMode } from '../common/chatModes.js';
 import { IParsedChatRequest } from '../common/requestParser/chatParserTypes.js';
+import { IHandOff } from '../common/promptSyntax/promptFileParser.js';
 import { CHAT_PROVIDER_ID } from '../common/participants/chatParticipantContribTypes.js';
 import { ChatRequestQueueKind, IChatElicitationRequest, IChatLocationData, IChatSendRequestOptions } from '../common/chatService/chatService.js';
 import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, IChatPendingDividerViewModel } from '../common/model/chatViewModel.js';
@@ -27,7 +28,7 @@ import { IChatEditorOptions } from './widgetHosts/editor/chatEditor.js';
 import { ChatInputPart } from './widget/input/chatInputPart.js';
 import { ChatWidget, IChatWidgetContrib } from './widget/chatWidget.js';
 import { ICodeBlockActionContext } from './widget/chatContentParts/codeBlockPart.js';
-import { AgentSessionProviders } from './agentSessions/agentSessions.js';
+import { AgentSessionTarget } from './agentSessions/agentSessions.js';
 
 /**
  * A workspace item that can be selected in the workspace picker.
@@ -74,29 +75,29 @@ export interface IWorkspacePickerDelegate {
  * Allows consumers to get and optionally set the active session provider.
  */
 export interface ISessionTypePickerDelegate {
-	getActiveSessionProvider(): AgentSessionProviders | undefined;
+	getActiveSessionProvider(): AgentSessionTarget | undefined;
 	/**
 	 * Optional setter for the active session provider.
 	 * When provided, the picker will call this instead of executing the openNewChatSessionInPlace command.
 	 * This allows the welcome view to maintain independent state from the main chat panel.
 	 */
-	setActiveSessionProvider?(provider: AgentSessionProviders): void;
+	setActiveSessionProvider?(provider: AgentSessionTarget): void;
 	/**
 	 * Optional getter for the pending delegation target - the target that will be used when submit is pressed.
 	 */
-	getPendingDelegationTarget?(): AgentSessionProviders | undefined;
+	getPendingDelegationTarget?(): AgentSessionTarget | undefined;
 	/**
 	 * Optional setter for the pending delegation target.
 	 * When a user selects a different session provider in a non-empty chat,
 	 * this stores the target for delegation on the next submit instead of immediately creating a new session.
 	 */
-	setPendingDelegationTarget?(provider: AgentSessionProviders): void;
+	setPendingDelegationTarget?(provider: AgentSessionTarget): void;
 	/**
 	 * Optional event that fires when the active session provider changes.
 	 * When provided, listeners (like chatInputPart) can react to session type changes
 	 * and update pickers accordingly.
 	 */
-	onDidChangeActiveSessionProvider?: Event<AgentSessionProviders>;
+	onDidChangeActiveSessionProvider?: Event<AgentSessionTarget>;
 }
 
 export const IChatWidgetService = createDecorator<IChatWidgetService>('chatWidgetService');
@@ -226,6 +227,7 @@ export interface IChatListItemRendererOptions {
 	readonly noFooter?: boolean;
 	readonly renderDetectedCommandsWithRequest?: boolean;
 	readonly restorable?: boolean;
+	readonly supportsFork?: boolean;
 	readonly editable?: boolean;
 	readonly renderTextEditsAsSummary?: (uri: URI) => boolean;
 	readonly referencesExpandedWhenEmptyResponse?: boolean | ((mode: ChatModeKind) => boolean);
@@ -329,11 +331,6 @@ export interface IChatAcceptInputOptions {
 	 * If Steering, also sets yieldRequested on any active request to signal it should wrap up.
 	 */
 	queue?: ChatRequestQueueKind;
-	/**
-	 * When true, always queues the request regardless of whether a request is currently in progress.
-	 * The request stays in the pending queue until explicitly processed.
-	 */
-	alwaysQueue?: boolean;
 }
 
 export interface IChatWidgetViewModelChangeEvent {
@@ -437,6 +434,7 @@ export interface IChatWidget {
 	lockToCodingAgent(name: string, displayName: string, agentId?: string): void;
 	unlockFromCodingAgent(): void;
 	handleDelegationExitIfNeeded(sourceAgent: Pick<IChatAgentData, 'id' | 'name'> | undefined, targetAgent: IChatAgentData | undefined): Promise<void>;
+	executeHandoff(handoff: IHandOff, agentId?: string): Promise<void>;
 
 	delegateScrollFromMouseWheelEvent(event: IMouseWheelEvent): void;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatCustomizationDiscoveryRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatCustomizationDiscoveryRenderer.ts
index 1e5a41c1ea3..3935b0c5b75 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatCustomizationDiscoveryRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatCustomizationDiscoveryRenderer.ts
@@ -136,7 +136,7 @@ function setupFileListNavigation(listEl: HTMLElement, rows: { element: HTMLEleme
 /**
  * Render a file list resolved content as a rich HTML element.
  */
-export function renderCustomizationDiscoveryContent(content: IChatDebugEventFileListContent, openerService: IOpenerService, modelService: IModelService, languageService: ILanguageService, hoverService: IHoverService, labelService: ILabelService): { element: HTMLElement; disposables: DisposableStore } {
+export function renderCustomizationDiscoveryContent(content: IChatDebugEventFileListContent, openerService: IOpenerService, modelService: IModelService, languageService: ILanguageService, hoverService: IHoverService, labelService: ILabelService, scrollable?: { scanDomNode(): void }): { element: HTMLElement; disposables: DisposableStore } {
 	const disposables = new DisposableStore();
 	const container = $('div.chat-debug-file-list');
 	container.tabIndex = 0;
@@ -308,7 +308,7 @@ export function renderCustomizationDiscoveryContent(content: IChatDebugEventFile
 			DOM.append(row, $('span.chat-debug-source-folder-label', undefined, folder.uri.path));
 		}
 
-		setupCollapsibleToggle(chevron, header, contentEl, disposables, /* initiallyCollapsed */ true);
+		setupCollapsibleToggle(chevron, header, contentEl, disposables, /* initiallyCollapsed */ true, scrollable);
 	}
 
 	return { element: container, disposables };
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment.ts
index 2d847f283a9..cede789e8df 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment.ts
@@ -6,57 +6,10 @@
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { URI } from '../../../../../base/common/uri.js';
 import * as nls from '../../../../../nls.js';
-import { IChatDebugEvent, IChatDebugService } from '../../common/chatDebugService.js';
+import { IChatDebugService } from '../../common/chatDebugService.js';
+import { formatDebugEventsForContext, getDebugEventsModelDescription } from '../../common/chatDebugEvents.js';
 import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
 
-/**
- * Descriptions of each debug event kind for the model. Adding a new event kind
- * to {@link IChatDebugEvent} without adding an entry here will cause a compile error.
- */
-const debugEventKindDescriptions: Record<IChatDebugEvent['kind'], string> = {
-	generic: '- generic (category: "discovery"): File discovery for instructions, skills, agents, hooks. Resolving returns a fileList with full file paths, load status, skip reasons, and source folders. Always resolve these for questions about customization files.\n'
-		+ '- generic (other): Miscellaneous logs. Resolving returns additional text details.',
-	toolCall: '- toolCall: A tool invocation. Resolving returns tool name, input, output, status, and duration.',
-	modelTurn: '- modelTurn: An LLM round-trip. Resolving returns model name, token usage, timing, errors, and prompt sections.',
-	subagentInvocation: '- subagentInvocation: A sub-agent spawn. Resolving returns agent name, status, duration, and counts.',
-	userMessage: '- userMessage: The full prompt sent to the model. Resolving returns the complete message and all prompt sections (system prompt, instructions, context). Essential for understanding what the model received.',
-	agentResponse: '- agentResponse: The model\'s response. Resolving returns the full response text and sections.',
-};
-
-function formatDebugEventsForContext(events: readonly IChatDebugEvent[]): string {
-	const lines: string[] = [];
-	for (const event of events) {
-		const ts = event.created.toISOString();
-		const id = event.id ? ` [id=${event.id}]` : '';
-		switch (event.kind) {
-			case 'generic':
-				lines.push(`[${ts}]${id} ${event.level >= 3 ? 'ERROR' : event.level >= 2 ? 'WARN' : 'INFO'}: ${event.name}${event.details ? ' - ' + event.details : ''}${event.category ? ' (category: ' + event.category + ')' : ''}`);
-				break;
-			case 'toolCall':
-				lines.push(`[${ts}]${id} TOOL_CALL: ${event.toolName}${event.result ? ' result=' + event.result : ''}${event.durationInMillis !== undefined ? ' duration=' + event.durationInMillis + 'ms' : ''}`);
-				break;
-			case 'modelTurn':
-				lines.push(`[${ts}]${id} MODEL_TURN: ${event.requestName ?? 'unknown'}${event.model ? ' model=' + event.model : ''}${event.inputTokens !== undefined ? ' tokens(in=' + event.inputTokens + ',out=' + (event.outputTokens ?? '?') + ')' : ''}${event.durationInMillis !== undefined ? ' duration=' + event.durationInMillis + 'ms' : ''}`);
-				break;
-			case 'subagentInvocation':
-				lines.push(`[${ts}]${id} SUBAGENT: ${event.agentName}${event.status ? ' status=' + event.status : ''}${event.durationInMillis !== undefined ? ' duration=' + event.durationInMillis + 'ms' : ''}`);
-				break;
-			case 'userMessage':
-				lines.push(`[${ts}]${id} USER_MESSAGE: ${event.message.substring(0, 200)}${event.message.length > 200 ? '...' : ''} (${event.sections.length} sections)`);
-				break;
-			case 'agentResponse':
-				lines.push(`[${ts}]${id} AGENT_RESPONSE: ${event.message.substring(0, 200)}${event.message.length > 200 ? '...' : ''} (${event.sections.length} sections)`);
-				break;
-			default: {
-				const _: never = event;
-				void _;
-				break;
-			}
-		}
-	}
-	return lines.join('\n');
-}
-
 /**
  * Creates a debug events attachment for a chat session.
  * This can be used to attach debug logs to a chat request.
@@ -82,15 +35,6 @@ export async function createDebugEventsAttachment(
 		snapshotTime: Date.now(),
 		sessionResource,
 		value: summary,
-		modelDescription: 'These are the debug event logs from the current chat conversation. Analyze them to help answer the user\'s troubleshooting question.\n'
-			+ '\n'
-			+ 'CRITICAL INSTRUCTION: You MUST call the resolveDebugEventDetails tool on relevant events BEFORE answering. The log lines below are only summaries — they do NOT contain the actual data (file paths, prompt content, tool I/O, etc.). The real information is only available by resolving events. Never answer based solely on the summary lines. Always resolve first, then answer.\n'
-			+ '\n'
-			+ 'Call resolveDebugEventDetails in parallel on all events that could be relevant to the user\'s question. When in doubt, resolve more events rather than fewer.\n'
-			+ '\n'
-			+ 'IMPORTANT: Do NOT mention event IDs, tool resolution steps, or internal debug mechanics in your response. The user does not know about debug events or event IDs. Present your findings directly and naturally, as if you simply know the answer. Never say things like "I need to resolve events" or show event IDs.\n'
-			+ '\n'
-			+ 'Event types and what resolving them returns:\n'
-			+ Object.values(debugEventKindDescriptions).join('\n'),
+		modelDescription: getDebugEventsModelDescription(),
 	};
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCollapsible.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCollapsible.ts
index afbe701f809..1c4c31580b9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCollapsible.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugCollapsible.ts
@@ -7,15 +7,12 @@ import * as DOM from '../../../../../base/browser/dom.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { IChatDebugMessageSection } from '../../common/chatDebugService.js';
-
-const $ = DOM.$;
 
 /**
  * Wire up a collapsible toggle on a chevron+header+content triple.
  * Handles icon switching and display toggling.
  */
-export function setupCollapsibleToggle(chevron: HTMLElement, header: HTMLElement, contentEl: HTMLElement, disposables: DisposableStore, initiallyCollapsed: boolean = false): void {
+export function setupCollapsibleToggle(chevron: HTMLElement, header: HTMLElement, contentEl: HTMLElement, disposables: DisposableStore, initiallyCollapsed: boolean = false, scrollable?: { scanDomNode(): void }): void {
 	let collapsed = initiallyCollapsed;
 
 	// Accessibility: make header keyboard-focusable and expose toggle semantics
@@ -38,6 +35,7 @@ export function setupCollapsibleToggle(chevron: HTMLElement, header: HTMLElement
 		collapsed = !collapsed;
 		chevron.className = 'chat-debug-message-section-chevron';
 		updateState();
+		scrollable?.scanDomNode();
 	}));
 
 	disposables.add(DOM.addDisposableListener(header, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
@@ -47,25 +45,3 @@ export function setupCollapsibleToggle(chevron: HTMLElement, header: HTMLElement
 		}
 	}));
 }
-
-/**
- * Render a collapsible section with a clickable header and pre-formatted content
- * wrapped in a scrollable element.
- */
-export function renderCollapsibleSection(parent: HTMLElement, section: IChatDebugMessageSection, disposables: DisposableStore, initiallyCollapsed: boolean = false): void {
-	const sectionEl = DOM.append(parent, $('div.chat-debug-message-section'));
-
-	const header = DOM.append(sectionEl, $('div.chat-debug-message-section-header'));
-
-	const chevron = DOM.append(header, $(`span.chat-debug-message-section-chevron`));
-	DOM.append(header, $('span.chat-debug-message-section-title', undefined, section.name));
-
-	const contentEl = $('pre.chat-debug-message-section-content');
-	contentEl.textContent = section.content;
-	contentEl.tabIndex = 0;
-
-	const wrapper = DOM.append(sectionEl, $('div.chat-debug-message-section-content-wrapper'));
-	wrapper.appendChild(contentEl);
-
-	setupCollapsibleToggle(chevron, header, wrapper, disposables, initiallyCollapsed);
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugDetailPanel.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugDetailPanel.ts
index bd8fcbb3c70..cfdcc601178 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugDetailPanel.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugDetailPanel.ts
@@ -5,6 +5,9 @@
 
 import * as DOM from '../../../../../base/browser/dom.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { Orientation, Sash, SashState } from '../../../../../base/browser/ui/sash/sash.js';
+import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../../base/common/scrollable.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
@@ -24,9 +27,14 @@ import { renderCustomizationDiscoveryContent, fileListToPlainText } from './chat
 import { renderUserMessageContent, renderAgentResponseContent, messageEventToPlainText, renderResolvedMessageContent, resolvedMessageToPlainText } from './chatDebugMessageContentRenderer.js';
 import { renderToolCallContent, toolCallContentToPlainText } from './chatDebugToolCallContentRenderer.js';
 import { renderModelTurnContent, modelTurnContentToPlainText } from './chatDebugModelTurnContentRenderer.js';
+import { renderHookContent, hookContentToPlainText } from './chatDebugHookContentRenderer.js';
 
 const $ = DOM.$;
 
+const DETAIL_PANEL_DEFAULT_WIDTH = 350;
+const DETAIL_PANEL_MIN_WIDTH = 200;
+const DETAIL_PANEL_MAX_WIDTH = 800;
+
 /**
  * Reusable detail panel that resolves and displays the content of a
  * single {@link IChatDebugEvent}. Used by both the logs view and the
@@ -37,12 +45,23 @@ export class ChatDebugDetailPanel extends Disposable {
 	private readonly _onDidHide = this._register(new Emitter<void>());
 	readonly onDidHide = this._onDidHide.event;
 
+	private readonly _onDidChangeWidth = this._register(new Emitter<number>());
+	readonly onDidChangeWidth = this._onDidChangeWidth.event;
+
 	readonly element: HTMLElement;
 	private readonly contentContainer: HTMLElement;
+	private readonly scrollable: DomScrollableElement;
+	private readonly sash: Sash;
+	private headerElement: HTMLElement | undefined;
 	private readonly detailDisposables = this._register(new DisposableStore());
 	private currentDetailText: string = '';
 	private currentDetailEventId: string | undefined;
 	private firstFocusableElement: HTMLElement | undefined;
+	private _width: number = DETAIL_PANEL_DEFAULT_WIDTH;
+
+	get width(): number {
+		return this._width;
+	}
 
 	constructor(
 		parent: HTMLElement,
@@ -52,12 +71,43 @@ export class ChatDebugDetailPanel extends Disposable {
 		@IClipboardService private readonly clipboardService: IClipboardService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IOpenerService private readonly openerService: IOpenerService,
+		@ILanguageService private readonly languageService: ILanguageService,
 	) {
 		super();
 		this.element = DOM.append(parent, $('.chat-debug-detail-panel'));
 		this.contentContainer = $('.chat-debug-detail-content');
+		this.scrollable = this._register(new DomScrollableElement(this.contentContainer, {
+			horizontal: ScrollbarVisibility.Hidden,
+			vertical: ScrollbarVisibility.Auto,
+		}));
+		this.element.style.width = `${this._width}px`;
 		DOM.hide(this.element);
 
+		// Sash on the parent container, positioned at the left edge of the detail panel
+		this.sash = this._register(new Sash(parent, {
+			getVerticalSashLeft: () => parent.offsetWidth - this._width,
+		}, { orientation: Orientation.VERTICAL }));
+		this.sash.state = SashState.Disabled;
+
+		let sashStartWidth: number | undefined;
+		this._register(this.sash.onDidStart(() => sashStartWidth = this._width));
+		this._register(this.sash.onDidEnd(() => {
+			sashStartWidth = undefined;
+			this.sash.layout();
+		}));
+		this._register(this.sash.onDidChange(e => {
+			if (sashStartWidth === undefined) {
+				return;
+			}
+			// Dragging left (negative currentX delta) should increase width
+			const delta = e.startX - e.currentX;
+			const newWidth = Math.max(DETAIL_PANEL_MIN_WIDTH, Math.min(DETAIL_PANEL_MAX_WIDTH, sashStartWidth + delta));
+			this._width = newWidth;
+			this.element.style.width = `${newWidth}px`;
+			this.sash.layout();
+			this._onDidChangeWidth.fire(newWidth);
+		}));
+
 		// Handle Ctrl+A / Cmd+A to select all within the detail panel
 		this._register(DOM.addDisposableListener(this.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
@@ -87,13 +137,16 @@ export class ChatDebugDetailPanel extends Disposable {
 		const resolved = event.id ? await this.chatDebugService.resolveEvent(event.id) : undefined;
 
 		DOM.show(this.element);
+		this.sash.state = SashState.Enabled;
+		this.sash.layout();
 		DOM.clearNode(this.element);
 		DOM.clearNode(this.contentContainer);
 		this.detailDisposables.clear();
 
 		// Header with action buttons
 		const header = DOM.append(this.element, $('.chat-debug-detail-header'));
-		this.element.appendChild(this.contentContainer);
+		this.headerElement = header;
+		this.element.appendChild(this.scrollable.getDomNode());
 
 		const fullScreenButton = this.detailDisposables.add(new Button(header, { ariaLabel: localize('chatDebug.openInEditor', "Open in Editor"), title: localize('chatDebug.openInEditor', "Open in Editor") }));
 		fullScreenButton.element.classList.add('chat-debug-detail-button');
@@ -120,14 +173,13 @@ export class ChatDebugDetailPanel extends Disposable {
 		if (resolved && resolved.kind === 'fileList') {
 			this.currentDetailText = fileListToPlainText(resolved);
 			const { element: contentEl, disposables: contentDisposables } = this.instantiationService.invokeFunction(accessor =>
-				renderCustomizationDiscoveryContent(resolved, this.openerService, accessor.get(IModelService), accessor.get(ILanguageService), this.hoverService, accessor.get(ILabelService))
+				renderCustomizationDiscoveryContent(resolved, this.openerService, accessor.get(IModelService), this.languageService, this.hoverService, accessor.get(ILabelService), this.scrollable)
 			);
 			this.detailDisposables.add(contentDisposables);
 			this.contentContainer.appendChild(contentEl);
 		} else if (resolved && resolved.kind === 'toolCall') {
 			this.currentDetailText = toolCallContentToPlainText(resolved);
-			const languageService = this.instantiationService.invokeFunction(accessor => accessor.get(ILanguageService));
-			const { element: contentEl, disposables: contentDisposables } = await renderToolCallContent(resolved, languageService);
+			const { element: contentEl, disposables: contentDisposables } = await renderToolCallContent(resolved, this.languageService, this.clipboardService, this.scrollable);
 			if (this.currentDetailEventId !== event.id) {
 				// Another event was selected while we were rendering
 				contentDisposables.dispose();
@@ -137,22 +189,49 @@ export class ChatDebugDetailPanel extends Disposable {
 			this.contentContainer.appendChild(contentEl);
 		} else if (resolved && resolved.kind === 'message') {
 			this.currentDetailText = resolvedMessageToPlainText(resolved);
-			const { element: contentEl, disposables: contentDisposables } = renderResolvedMessageContent(resolved);
+			const { element: contentEl, disposables: contentDisposables } = await renderResolvedMessageContent(resolved, this.languageService, this.clipboardService, this.scrollable);
+			if (this.currentDetailEventId !== event.id) {
+				contentDisposables.dispose();
+				return;
+			}
 			this.detailDisposables.add(contentDisposables);
 			this.contentContainer.appendChild(contentEl);
 		} else if (resolved && resolved.kind === 'modelTurn') {
 			this.currentDetailText = modelTurnContentToPlainText(resolved);
-			const { element: contentEl, disposables: contentDisposables } = renderModelTurnContent(resolved);
+			const { element: contentEl, disposables: contentDisposables } = await renderModelTurnContent(resolved, this.languageService, this.clipboardService, this.scrollable);
+			if (this.currentDetailEventId !== event.id) {
+				// Another event was selected while we were rendering
+				contentDisposables.dispose();
+				return;
+			}
+			this.detailDisposables.add(contentDisposables);
+			this.contentContainer.appendChild(contentEl);
+		} else if (resolved && resolved.kind === 'hook') {
+			this.currentDetailText = hookContentToPlainText(resolved);
+			const { element: contentEl, disposables: contentDisposables } = await renderHookContent(resolved, this.languageService, this.clipboardService, this.scrollable);
+			if (this.currentDetailEventId !== event.id) {
+				// Another event was selected while we were rendering
+				contentDisposables.dispose();
+				return;
+			}
 			this.detailDisposables.add(contentDisposables);
 			this.contentContainer.appendChild(contentEl);
 		} else if (event.kind === 'userMessage') {
 			this.currentDetailText = messageEventToPlainText(event);
-			const { element: contentEl, disposables: contentDisposables } = renderUserMessageContent(event);
+			const { element: contentEl, disposables: contentDisposables } = await renderUserMessageContent(event, this.languageService, this.clipboardService, this.scrollable);
+			if (this.currentDetailEventId !== event.id) {
+				contentDisposables.dispose();
+				return;
+			}
 			this.detailDisposables.add(contentDisposables);
 			this.contentContainer.appendChild(contentEl);
 		} else if (event.kind === 'agentResponse') {
 			this.currentDetailText = messageEventToPlainText(event);
-			const { element: contentEl, disposables: contentDisposables } = renderAgentResponseContent(event);
+			const { element: contentEl, disposables: contentDisposables } = await renderAgentResponseContent(event, this.languageService, this.clipboardService, this.scrollable);
+			if (this.currentDetailEventId !== event.id) {
+				contentDisposables.dispose();
+				return;
+			}
 			this.detailDisposables.add(contentDisposables);
 			this.contentContainer.appendChild(contentEl);
 		} else {
@@ -165,6 +244,15 @@ export class ChatDebugDetailPanel extends Disposable {
 			}
 			pre.textContent = this.currentDetailText;
 		}
+
+		// Compute height from the parent container and set explicit
+		// dimensions so the scrollable element can show proper scrollbars.
+		const parentHeight = this.element.parentElement?.clientHeight ?? 0;
+		if (parentHeight > 0) {
+			this.layout(parentHeight);
+		} else {
+			this.scrollable.scanDomNode();
+		}
 	}
 
 	get isVisible(): boolean {
@@ -175,10 +263,29 @@ export class ChatDebugDetailPanel extends Disposable {
 		this.firstFocusableElement?.focus();
 	}
 
+	/**
+	 * Set explicit dimensions on the scrollable element so the scrollbar
+	 * can compute its size. Call after the panel is shown and whenever
+	 * the available space changes.
+	 */
+	layout(height: number): void {
+		const headerHeight = this.headerElement?.offsetHeight ?? 0;
+		const scrollableHeight = Math.max(0, height - headerHeight);
+		this.contentContainer.style.height = `${scrollableHeight}px`;
+		this.scrollable.scanDomNode();
+		this.sash.layout();
+	}
+
+	layoutSash(): void {
+		this.sash.layout();
+	}
+
 	hide(): void {
 		this.currentDetailEventId = undefined;
 		this.firstFocusableElement = undefined;
+		this.headerElement = undefined;
 		DOM.hide(this.element);
+		this.sash.state = SashState.Disabled;
 		DOM.clearNode(this.element);
 		DOM.clearNode(this.contentContainer);
 		this.detailDisposables.clear();
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
index 867053d97ac..80fb8635e65 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
@@ -11,6 +11,7 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { DisposableMap, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IStorageService } from '../../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
@@ -22,6 +23,7 @@ import { EditorInput } from '../../../../common/editor/editorInput.js';
 import { IEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
 import { IChatDebugService } from '../../common/chatDebugService.js';
 import { IChatService } from '../../common/chatService/chatService.js';
+import { AGENT_DEBUG_LOG_ENABLED_SETTING } from '../../common/promptSyntax/promptTypes.js';
 import { IChatWidgetService } from '../chat.js';
 import { ViewState, IChatDebugEditorOptions } from './chatDebugTypes.js';
 import { ChatDebugFilterState, registerFilterMenuItems } from './chatDebugFilters.js';
@@ -34,7 +36,7 @@ const $ = DOM.$;
 
 type ChatDebugPanelOpenedClassification = {
 	owner: 'vijayu';
-	comment: 'Event fired when the agent debug panel is opened';
+	comment: 'Event fired when the agent debug logs panel is opened';
 };
 
 type ChatDebugViewSwitchedEvent = {
@@ -44,7 +46,7 @@ type ChatDebugViewSwitchedEvent = {
 type ChatDebugViewSwitchedClassification = {
 	viewState: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The view the user navigated to (home, overview, logs, flowchart).' };
 	owner: 'vijayu';
-	comment: 'Tracks which views users navigate to in the debug panel.';
+	comment: 'Tracks which views users navigate to in the Agent Debug Logs.';
 };
 
 export class ChatDebugEditor extends EditorPane {
@@ -88,6 +90,7 @@ export class ChatDebugEditor extends EditorPane {
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IChatService private readonly chatService: IChatService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super(ChatDebugEditor.ID, group, telemetryService, themeService, storageService);
 	}
@@ -171,13 +174,6 @@ export class ChatDebugEditor extends EditorPane {
 		}));
 
 		this._register(this.chatService.onDidCreateModel(model => {
-			if (this.viewState === ViewState.Home) {
-				// Auto-navigate to the new session when the debug panel is
-				// already open on the home view.  This avoids the user having to
-				// wait for the title to resolve and manually clicking the session.
-				this.navigateToSession(model.sessionResource);
-			}
-
 			// Track title changes per model, disposing the previous listener
 			// for the same model URI to avoid leaks.
 			const key = model.sessionResource.toString();
@@ -307,6 +303,12 @@ export class ChatDebugEditor extends EditorPane {
 		super.setEditorVisible(visible);
 		if (visible) {
 			this.telemetryService.publicLog2<{}, ChatDebugPanelOpenedClassification>('chatDebugPanelOpened');
+			// If the feature flag is disabled, always reset to the home view
+			if (!this.configurationService.getValue<boolean>(AGENT_DEBUG_LOG_ENABLED_SETTING)) {
+				this.endActiveSession();
+				this.showView(ViewState.Home);
+				return;
+			}
 			// Re-show the current view so it reloads events from scratch,
 			// ensuring correct ordering and no stale duplicates.
 			// Navigation from new openEditor() options is handled by
@@ -316,6 +318,13 @@ export class ChatDebugEditor extends EditorPane {
 	}
 
 	private _applyNavigationOptions(options: IChatDebugEditorOptions): void {
+		// If the feature flag is disabled, always show the home view
+		if (!this.configurationService.getValue<boolean>(AGENT_DEBUG_LOG_ENABLED_SETTING)) {
+			this.endActiveSession();
+			this.showView(ViewState.Home);
+			return;
+		}
+
 		const { sessionResource, viewHint, filter } = options;
 		if (viewHint === 'logs' && sessionResource) {
 			this.navigateToSession(sessionResource, 'logs');
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditorInput.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditorInput.ts
index 6b160d58d28..a7659363f4f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditorInput.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditorInput.ts
@@ -41,7 +41,7 @@ export class ChatDebugEditorInput extends EditorInput {
 	readonly resource = ChatDebugEditorInput.RESOURCE;
 
 	override getName(): string {
-		return localize('chatDebugInputName', "Agent Debug Panel");
+		return localize('chatDebugInputName', "Agent Debug Logs");
 	}
 
 	override getIcon(): ThemeIcon {
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.ts
index be68f3d757e..5f7fd3267aa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.ts
@@ -5,6 +5,9 @@
 
 import { localize } from '../../../../../nls.js';
 import { IChatDebugEvent } from '../../common/chatDebugService.js';
+import { safeIntl } from '../../../../../base/common/date.js';
+
+const numberFormatter = safeIntl.NumberFormat();
 
 /**
  * Format the detail text for a debug event (used when no resolved content is available).
@@ -15,17 +18,17 @@ export function formatEventDetail(event: IChatDebugEvent): string {
 			const parts = [localize('chatDebug.detail.tool', "Tool: {0}", event.toolName)];
 			if (event.toolCallId) { parts.push(localize('chatDebug.detail.callId', "Call ID: {0}", event.toolCallId)); }
 			if (event.result) { parts.push(localize('chatDebug.detail.result', "Result: {0}", event.result)); }
-			if (event.durationInMillis !== undefined) { parts.push(localize('chatDebug.detail.durationMs', "Duration: {0}ms", event.durationInMillis)); }
+			if (event.durationInMillis !== undefined) { parts.push(localize('chatDebug.detail.durationMs', "Duration: {0}ms", numberFormatter.value.format(event.durationInMillis))); }
 			if (event.input) { parts.push(`\n${localize('chatDebug.detail.input', "Input:")}\n${event.input}`); }
 			if (event.output) { parts.push(`\n${localize('chatDebug.detail.output', "Output:")}\n${event.output}`); }
 			return parts.join('\n');
 		}
 		case 'modelTurn': {
 			const parts = [event.model ?? localize('chatDebug.detail.modelTurn', "Model Turn")];
-			if (event.inputTokens !== undefined) { parts.push(localize('chatDebug.detail.inputTokens', "Input tokens: {0}", event.inputTokens)); }
-			if (event.outputTokens !== undefined) { parts.push(localize('chatDebug.detail.outputTokens', "Output tokens: {0}", event.outputTokens)); }
-			if (event.totalTokens !== undefined) { parts.push(localize('chatDebug.detail.totalTokens', "Total tokens: {0}", event.totalTokens)); }
-			if (event.durationInMillis !== undefined) { parts.push(localize('chatDebug.detail.durationMs', "Duration: {0}ms", event.durationInMillis)); }
+			if (event.inputTokens !== undefined) { parts.push(localize('chatDebug.detail.inputTokens', "Input tokens: {0}", numberFormatter.value.format(event.inputTokens))); }
+			if (event.outputTokens !== undefined) { parts.push(localize('chatDebug.detail.outputTokens', "Output tokens: {0}", numberFormatter.value.format(event.outputTokens))); }
+			if (event.totalTokens !== undefined) { parts.push(localize('chatDebug.detail.totalTokens', "Total tokens: {0}", numberFormatter.value.format(event.totalTokens))); }
+			if (event.durationInMillis !== undefined) { parts.push(localize('chatDebug.detail.durationMs', "Duration: {0}ms", numberFormatter.value.format(event.durationInMillis))); }
 			return parts.join('\n');
 		}
 		case 'generic':
@@ -34,9 +37,9 @@ export function formatEventDetail(event: IChatDebugEvent): string {
 			const parts = [localize('chatDebug.detail.agent', "Agent: {0}", event.agentName)];
 			if (event.description) { parts.push(localize('chatDebug.detail.description', "Description: {0}", event.description)); }
 			if (event.status) { parts.push(localize('chatDebug.detail.status', "Status: {0}", event.status)); }
-			if (event.durationInMillis !== undefined) { parts.push(localize('chatDebug.detail.durationMs', "Duration: {0}ms", event.durationInMillis)); }
-			if (event.toolCallCount !== undefined) { parts.push(localize('chatDebug.detail.toolCallCount', "Tool calls: {0}", event.toolCallCount)); }
-			if (event.modelTurnCount !== undefined) { parts.push(localize('chatDebug.detail.modelTurnCount', "Model turns: {0}", event.modelTurnCount)); }
+			if (event.durationInMillis !== undefined) { parts.push(localize('chatDebug.detail.durationMs', "Duration: {0}ms", numberFormatter.value.format(event.durationInMillis))); }
+			if (event.toolCallCount !== undefined) { parts.push(localize('chatDebug.detail.toolCallCount', "Tool calls: {0}", numberFormatter.value.format(event.toolCallCount))); }
+			if (event.modelTurnCount !== undefined) { parts.push(localize('chatDebug.detail.modelTurnCount', "Model turns: {0}", numberFormatter.value.format(event.modelTurnCount))); }
 			return parts.join('\n');
 		}
 		case 'userMessage': {
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.ts
index 9797275555b..11ea6f76601 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.ts
@@ -28,6 +28,8 @@ const dateFormatter = safeIntl.DateTimeFormat(undefined, {
 	second: '2-digit',
 });
 
+const numberFormatter = safeIntl.NumberFormat();
+
 export interface IChatDebugEventTemplate {
 	readonly container: HTMLElement;
 	readonly created: HTMLElement;
@@ -35,38 +37,42 @@ export interface IChatDebugEventTemplate {
 	readonly details: HTMLElement;
 }
 
-function renderEventToTemplate(element: IChatDebugEvent, templateData: IChatDebugEventTemplate): void {
-	templateData.created.textContent = dateFormatter.value.format(element.created);
+/** Returns the formatted creation timestamp for a debug event. */
+export function getEventCreatedText(element: IChatDebugEvent): string {
+	return dateFormatter.value.format(element.created);
+}
 
+/** Returns the display name for a debug event. */
+export function getEventNameText(element: IChatDebugEvent): string {
 	switch (element.kind) {
-		case 'toolCall':
-			templateData.name.textContent = safeStr(element.toolName, localize('chatDebug.unknownEvent', "(unknown)"));
-			templateData.details.textContent = safeStr(element.result);
-			break;
-		case 'modelTurn':
-			templateData.name.textContent = safeStr(element.model) || localize('chatDebug.modelTurn', "Model Turn");
-			templateData.details.textContent = [
-				safeStr(element.requestName),
-				element.totalTokens !== undefined ? localize('chatDebug.tokens', "{0} tokens", element.totalTokens) : '',
-			].filter(Boolean).join(' \u00b7 ');
-			break;
-		case 'generic':
-			templateData.name.textContent = safeStr(element.name, localize('chatDebug.unknownEvent', "(unknown)"));
-			templateData.details.textContent = safeStr(element.details);
-			break;
-		case 'subagentInvocation':
-			templateData.name.textContent = safeStr(element.agentName, localize('chatDebug.unknownEvent', "(unknown)"));
-			templateData.details.textContent = safeStr(element.description) || safeStr(element.status);
-			break;
-		case 'userMessage':
-			templateData.name.textContent = localize('chatDebug.userMessage', "User Message");
-			templateData.details.textContent = safeStr(element.message);
-			break;
-		case 'agentResponse':
-			templateData.name.textContent = localize('chatDebug.agentResponse', "Agent Response");
-			templateData.details.textContent = safeStr(element.message);
-			break;
+		case 'toolCall': return safeStr(element.toolName, localize('chatDebug.unknownEvent', "(unknown)"));
+		case 'modelTurn': return safeStr(element.model) || localize('chatDebug.modelTurn', "Model Turn");
+		case 'generic': return safeStr(element.name, localize('chatDebug.unknownEvent', "(unknown)"));
+		case 'subagentInvocation': return safeStr(element.agentName, localize('chatDebug.unknownEvent', "(unknown)"));
+		case 'userMessage': return localize('chatDebug.userMessage', "User Message");
+		case 'agentResponse': return localize('chatDebug.agentResponse', "Agent Response");
 	}
+}
+
+/** Returns the details text for a debug event. */
+export function getEventDetailsText(element: IChatDebugEvent): string {
+	switch (element.kind) {
+		case 'toolCall': return safeStr(element.result);
+		case 'modelTurn': return [
+			safeStr(element.requestName),
+			element.totalTokens !== undefined ? localize('chatDebug.tokens', "{0} tokens", numberFormatter.value.format(element.totalTokens)) : '',
+		].filter(Boolean).join(' \u00b7 ');
+		case 'generic': return safeStr(element.details);
+		case 'subagentInvocation': return safeStr(element.description) || safeStr(element.status);
+		case 'userMessage': return safeStr(element.message);
+		case 'agentResponse': return safeStr(element.message);
+	}
+}
+
+function renderEventToTemplate(element: IChatDebugEvent, templateData: IChatDebugEventTemplate): void {
+	templateData.created.textContent = getEventCreatedText(element);
+	templateData.name.textContent = getEventNameText(element);
+	templateData.details.textContent = getEventDetailsText(element);
 
 	const isError = element.kind === 'generic' && element.level === ChatDebugLogLevel.Error
 		|| element.kind === 'toolCall' && element.result === 'error';
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.ts
index fefa283cceb..f3c86fa5427 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.ts
@@ -10,6 +10,7 @@ import { IContextKey, IContextKeyService, RawContextKey } from '../../../../../p
 import { MenuRegistry } from '../../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
 import { viewFilterSubmenu } from '../../../../browser/parts/views/viewFilter.js';
+import { parseTimeToken, stripTimestampTokens } from '../../common/chatDebugEvents.js';
 import {
 	CHAT_DEBUG_FILTER_ACTIVE,
 	CHAT_DEBUG_KIND_TOOL_CALL, CHAT_DEBUG_KIND_MODEL_TURN, CHAT_DEBUG_KIND_PROMPT_DISCOVERY, CHAT_DEBUG_KIND_SUBAGENT,
@@ -18,7 +19,7 @@ import {
 } from './chatDebugTypes.js';
 
 /**
- * Shared filter state for the Agent Debug Panel.
+ * Shared filter state for the Agent Debug Logs.
  *
  * Both the Logs view and the Flow Chart view read from this single source of
  * truth. Toggle commands modify the state and fire `onDidChange` so every
@@ -74,77 +75,15 @@ export class ChatDebugFilterState extends Disposable {
 		const normalized = text.toLowerCase();
 		if (this.textFilter !== normalized) {
 			this.textFilter = normalized;
-			this._parseTimestampFilters(normalized);
+			this.beforeTimestamp = parseTimeToken(normalized, 'before');
+			this.afterTimestamp = parseTimeToken(normalized, 'after');
 			this._onDidChange.fire();
 		}
 	}
 
-	setBeforeTimestamp(timestamp: number | undefined): void {
-		if (this.beforeTimestamp !== timestamp) {
-			this.beforeTimestamp = timestamp;
-			this._onDidChange.fire();
-		}
-	}
-
-	/**
-	 * Parse `before:YYYY[-MM[-DD[THH[:MM[:SS]]]]]` from the filter text.
-	 * Each component after the year is optional.
-	 */
-	private _parseTimestampFilters(text: string): void {
-		this.beforeTimestamp = ChatDebugFilterState.parseTimeToken(text, 'before');
-		this.afterTimestamp = ChatDebugFilterState.parseTimeToken(text, 'after');
-	}
-
-	static parseTimeToken(text: string, prefix: string): number | undefined {
-		const regex = new RegExp(`${prefix}:(\\d{4})(?:-(\\d{2})(?:-(\\d{2})(?:t(\\d{1,2})(?::(\\d{2})(?::(\\d{2}))?)?)?)?)?(?!\\w)`);
-		const m = regex.exec(text);
-		if (!m) {
-			return undefined;
-		}
-
-		const year = parseInt(m[1], 10);
-		const month = m[2] !== undefined ? parseInt(m[2], 10) - 1 : undefined;
-		const day = m[3] !== undefined ? parseInt(m[3], 10) : undefined;
-		const hour = m[4] !== undefined ? parseInt(m[4], 10) : undefined;
-		const minute = m[5] !== undefined ? parseInt(m[5], 10) : undefined;
-		const second = m[6] !== undefined ? parseInt(m[6], 10) : undefined;
-
-		// For 'before:', round up to the end of the most specific unit given.
-		// For 'after:', use the start of the most specific unit.
-		if (prefix === 'before') {
-			if (second !== undefined) {
-				return new Date(year, month!, day!, hour!, minute!, second, 999).getTime();
-			} else if (minute !== undefined) {
-				return new Date(year, month!, day!, hour!, minute, 59, 999).getTime();
-			} else if (hour !== undefined) {
-				return new Date(year, month!, day!, hour, 59, 59, 999).getTime();
-			} else if (day !== undefined) {
-				return new Date(year, month!, day, 23, 59, 59, 999).getTime();
-			} else if (month !== undefined) {
-				// End of the given month
-				return new Date(year, month + 1, 0, 23, 59, 59, 999).getTime();
-			} else {
-				// End of the given year
-				return new Date(year, 11, 31, 23, 59, 59, 999).getTime();
-			}
-		} else {
-			return new Date(
-				year,
-				month ?? 0,
-				day ?? 1,
-				hour ?? 0,
-				minute ?? 0,
-				second ?? 0,
-				0,
-			).getTime();
-		}
-	}
-
 	/** Returns the text filter with before:/after: tokens removed. */
 	get textFilterWithoutTimestamps(): string {
-		return this.textFilter
-			.replace(/\b(?:before|after):\d{4}(?:-\d{2}(?:-\d{2}(?:t\d{1,2}(?::\d{2}(?::\d{2})?)?)?)?)?\b/g, '')
-			.trim();
+		return stripTimestampTokens(this.textFilter);
 	}
 
 	isTimestampVisible(created: Date): boolean {
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.ts
index b6057612820..7f8997efa57 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.ts
@@ -9,6 +9,7 @@ import { BreadcrumbsWidget } from '../../../../../base/browser/ui/breadcrumbs/br
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -86,6 +87,7 @@ export class ChatDebugFlowChartView extends Disposable {
 	// Detail panel
 	private readonly detailPanel: ChatDebugDetailPanel;
 	private eventById = new Map<string, IChatDebugEvent>();
+	private readonly refreshScheduler: RunOnceScheduler;
 
 	constructor(
 		parent: HTMLElement,
@@ -158,6 +160,8 @@ export class ChatDebugFlowChartView extends Disposable {
 		// Set up pan/zoom event listeners and keyboard handling
 		this.setupPanZoom();
 		this.setupKeyboard();
+
+		this.refreshScheduler = this._register(new RunOnceScheduler(() => this.load(), 100));
 	}
 
 	setSession(sessionResource: URI): void {
@@ -184,11 +188,14 @@ export class ChatDebugFlowChartView extends Disposable {
 
 	hide(): void {
 		DOM.hide(this.container);
+		this.refreshScheduler.cancel();
 	}
 
 	refresh(): void {
 		if (this.container.style.display !== 'none') {
-			this.load();
+			if (!this.refreshScheduler.isScheduled()) {
+				this.refreshScheduler.schedule();
+			}
 		}
 	}
 
@@ -198,7 +205,7 @@ export class ChatDebugFlowChartView extends Disposable {
 		}
 		const sessionTitle = this.chatService.getSessionTitle(this.currentSessionResource) || LocalChatSessionUri.parseLocalSessionId(this.currentSessionResource) || this.currentSessionResource.toString();
 		this.breadcrumbWidget.setItems([
-			new TextBreadcrumbItem(localize('chatDebug.title', "Agent Debug Panel"), true),
+			new TextBreadcrumbItem(localize('chatDebug.title', "Agent Debug Logs"), true),
 			new TextBreadcrumbItem(sessionTitle, true),
 			new TextBreadcrumbItem(localize('chatDebug.flowChart', "Agent Flow Chart")),
 		]);
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.ts
index 0492768b660..1dc8b8b231e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
@@ -11,10 +12,14 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { isUUID } from '../../../../../base/common/uuid.js';
 import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { IChatDebugService } from '../../common/chatDebugService.js';
 import { IChatService } from '../../common/chatService/chatService.js';
-import { LocalChatSessionUri } from '../../common/model/chatUri.js';
+import { AGENT_DEBUG_LOG_ENABLED_SETTING } from '../../common/promptSyntax/promptTypes.js';
+import { getChatSessionType, isUntitledChatSession, LocalChatSessionUri } from '../../common/model/chatUri.js';
 import { IChatWidgetService } from '../chat.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
 
 const $ = DOM.$;
 
@@ -32,10 +37,18 @@ export class ChatDebugHomeView extends Disposable {
 		@IChatService private readonly chatService: IChatService,
 		@IChatDebugService private readonly chatDebugService: IChatDebugService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IPreferencesService private readonly preferencesService: IPreferencesService,
 	) {
 		super();
 		this.container = DOM.append(parent, $('.chat-debug-home'));
 		this.scrollContent = DOM.append(this.container, $('div.chat-debug-home-content'));
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(AGENT_DEBUG_LOG_ENABLED_SETTING)) {
+				this.render();
+			}
+		}));
 	}
 
 	show(): void {
@@ -51,7 +64,22 @@ export class ChatDebugHomeView extends Disposable {
 		DOM.clearNode(this.scrollContent);
 		this.renderDisposables.clear();
 
-		DOM.append(this.scrollContent, $('h2.chat-debug-home-title', undefined, localize('chatDebug.title', "Agent Debug Panel")));
+		DOM.append(this.scrollContent, $('h2.chat-debug-home-title', undefined, localize('chatDebug.title', "Agent Debug Logs")));
+
+		const isEnabled = this.configurationService.getValue<boolean>(AGENT_DEBUG_LOG_ENABLED_SETTING);
+		if (!isEnabled) {
+			DOM.append(this.scrollContent, $('p.chat-debug-home-subtitle', undefined,
+				localize('chatDebug.disabled', "Enable to view debug logs and investigate chat issues with /troubleshoot.")
+			));
+
+			const enableButton = this.renderDisposables.add(new Button(this.scrollContent, { ...defaultButtonStyles, secondary: true }));
+			enableButton.element.style.width = 'auto';
+			enableButton.label = localize('chatDebug.openSetting', "Enable in Settings");
+			this.renderDisposables.add(enableButton.onDidClick(() => {
+				this.preferencesService.openSettings({ jsonEditor: false, query: AGENT_DEBUG_LOG_ENABLED_SETTING });
+			}));
+			return;
+		}
 
 		// Determine the active session resource
 		const activeWidget = this.chatWidgetService.lastFocusedWidget;
@@ -60,7 +88,12 @@ export class ChatDebugHomeView extends Disposable {
 		// List sessions that have debug event data.
 		// Use the debug service as the source of truth — it includes sessions
 		// whose chat models may have been archived (e.g. when a new chat was started).
-		const sessionResources = [...this.chatDebugService.getSessionResources()].reverse();
+		const cliSessionTypes = new Set(['copilotcli', 'claude-code']);
+		const sessionResources = [...this.chatDebugService.getSessionResources()].reverse()
+			// Hide untitled bootstrap sessions for CLI session types (e.g. copilotcli, claude-code).
+			// These are transient sessions created during async session setup that only contain
+			// a single "Load Hooks" event and would confuse users.
+			.filter(r => !cliSessionTypes.has(getChatSessionType(r)) || !isUntitledChatSession(r));
 
 		// Sort: active session first
 		if (activeSessionResource) {
@@ -86,22 +119,24 @@ export class ChatDebugHomeView extends Disposable {
 
 			for (const sessionResource of sessionResources) {
 				const rawTitle = this.chatService.getSessionTitle(sessionResource);
+				const importedTitle = this.chatDebugService.getImportedSessionTitle(sessionResource);
 				let sessionTitle: string;
 				if (rawTitle && !isUUID(rawTitle)) {
 					sessionTitle = rawTitle;
 				} else if (LocalChatSessionUri.isLocalSession(sessionResource)) {
 					sessionTitle = localize('chatDebug.newSession', "New Chat");
+				} else if (importedTitle) {
+					sessionTitle = localize('chatDebug.importedSession', "Imported: {0}", importedTitle);
+				} else if (getChatSessionType(sessionResource) === 'copilotcli') {
+					const pathId = sessionResource.path.replace(/^\//, '').split('-')[0];
+					const shortId = pathId || sessionResource.authority || sessionResource.toString();
+					sessionTitle = localize('chatDebug.copilotCliSessionWithId', "Copilot CLI: {0}", shortId);
+				} else if (getChatSessionType(sessionResource) === 'claude-code') {
+					const pathId = sessionResource.path.replace(/^\//, '').split('-')[0];
+					const shortId = pathId || sessionResource.authority || sessionResource.toString();
+					sessionTitle = localize('chatDebug.claudeCodeSessionWithId', "Claude Code: {0}", shortId);
 				} else {
-					// For imported/external sessions, use the stored title if available
-					const importedTitle = this.chatDebugService.getImportedSessionTitle(sessionResource);
-					if (importedTitle) {
-						sessionTitle = localize('chatDebug.importedSession', "Imported: {0}", importedTitle);
-					} else {
-						// Fall back to URI segment
-						const uriLabel = sessionResource.path || sessionResource.fragment || sessionResource.toString();
-						const segment = uriLabel.replace(/^\/+/, '').split('/').pop() || uriLabel;
-						sessionTitle = localize('chatDebug.importedSession', "Imported: {0}", segment);
-					}
+					sessionTitle = localize('chatDebug.newSession', "New Chat");
 				}
 				const isActive = activeSessionResource !== undefined && sessionResource.toString() === activeSessionResource.toString();
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHookContentRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHookContentRenderer.ts
new file mode 100644
index 00000000000..1bdc7b22b6d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHookContentRenderer.ts
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from '../../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ChatDebugHookResult, IChatDebugEventHookContent } from '../../common/chatDebugService.js';
+import { renderSection, tokenizeContent } from './chatDebugToolCallContentRenderer.js';
+
+const $ = DOM.$;
+
+/**
+ * Render a resolved hook execution content with structured sections for
+ * hook type, command, result, duration, input, and output.
+ * When JSON is detected in input/output, renders it with syntax highlighting.
+ */
+export async function renderHookContent(content: IChatDebugEventHookContent, languageService: ILanguageService, clipboardService?: IClipboardService, scrollable?: { scanDomNode(): void }): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
+	const disposables = new DisposableStore();
+	const container = $('div.chat-debug-message-content');
+	container.tabIndex = 0;
+
+	// Header: hook type
+	DOM.append(container, $('div.chat-debug-message-content-title', undefined, content.hookType));
+
+	// Status summary line
+	const statusParts: string[] = [];
+	if (content.result !== undefined) {
+		statusParts.push(formatHookResult(content.result));
+	}
+	if (content.exitCode !== undefined) {
+		statusParts.push(localize('chatDebug.hook.exitCode', "Exit Code: {0}", content.exitCode));
+	}
+	if (content.durationInMillis !== undefined) {
+		statusParts.push(localize('chatDebug.hook.duration', "{0}ms", content.durationInMillis));
+	}
+	if (statusParts.length > 0) {
+		DOM.append(container, $('div.chat-debug-message-content-summary', undefined, statusParts.join(' \u00b7 ')));
+	}
+
+	// Build collapsible sections for command, input, output, and error
+	const sectionsContainer = DOM.append(container, $('div.chat-debug-message-sections'));
+
+	if (content.command) {
+		const { plainText, tokenizedHtml } = await tokenizeContent(content.command, languageService);
+		renderSection(sectionsContainer, localize('chatDebug.hook.command', "Command"), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+	}
+
+	if (content.input) {
+		const { plainText, tokenizedHtml } = await tokenizeContent(content.input, languageService);
+		renderSection(sectionsContainer, localize('chatDebug.hook.input', "Input"), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+	}
+
+	if (content.output) {
+		const { plainText, tokenizedHtml } = await tokenizeContent(content.output, languageService);
+		renderSection(sectionsContainer, localize('chatDebug.hook.output', "Output"), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+	}
+
+	if (content.errorMessage) {
+		const { plainText, tokenizedHtml } = await tokenizeContent(content.errorMessage, languageService);
+		renderSection(sectionsContainer, localize('chatDebug.hook.error', "Error"), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+	}
+
+	return { element: container, disposables };
+}
+
+function formatHookResult(result: ChatDebugHookResult): string {
+	switch (result) {
+		case ChatDebugHookResult.Success:
+			return localize('chatDebug.hook.result.success', "Success");
+		case ChatDebugHookResult.Error:
+			return localize('chatDebug.hook.result.error', "Error");
+		case ChatDebugHookResult.NonBlockingError:
+			return localize('chatDebug.hook.result.nonBlockingError', "Non-blocking Error");
+		default:
+			return String(result);
+	}
+}
+
+/**
+ * Convert a resolved hook content to plain text for clipboard / editor output.
+ */
+export function hookContentToPlainText(content: IChatDebugEventHookContent): string {
+	const lines: string[] = [];
+	lines.push(localize('chatDebug.hook.typeLabel', "Hook Type: {0}", content.hookType));
+
+	if (content.result !== undefined) {
+		lines.push(localize('chatDebug.hook.resultLabel', "Result: {0}", formatHookResult(content.result)));
+	}
+	if (content.exitCode !== undefined) {
+		lines.push(localize('chatDebug.hook.exitCodeLabel', "Exit Code: {0}", content.exitCode));
+	}
+	if (content.durationInMillis !== undefined) {
+		lines.push(localize('chatDebug.hook.durationLabel', "Duration: {0}ms", content.durationInMillis));
+	}
+
+	if (content.command) {
+		lines.push('');
+		lines.push(`[${localize('chatDebug.hook.command', "Command")}]`);
+		lines.push(content.command);
+	}
+
+	if (content.input) {
+		lines.push('');
+		lines.push(`[${localize('chatDebug.hook.input', "Input")}]`);
+		try {
+			const parsed = JSON.parse(content.input);
+			lines.push(JSON.stringify(parsed, null, 2));
+		} catch {
+			lines.push(content.input);
+		}
+	}
+
+	if (content.output) {
+		lines.push('');
+		lines.push(`[${localize('chatDebug.hook.output', "Output")}]`);
+		try {
+			const parsed = JSON.parse(content.output);
+			lines.push(JSON.stringify(parsed, null, 2));
+		} catch {
+			lines.push(content.output);
+		}
+	}
+
+	if (content.errorMessage) {
+		lines.push('');
+		lines.push(`[${localize('chatDebug.hook.error', "Error")}]`);
+		lines.push(content.errorMessage);
+	}
+
+	return lines.join('\n');
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugLogsView.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugLogsView.ts
index 550fa005b81..d2f6573afe6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugLogsView.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugLogsView.ts
@@ -7,6 +7,7 @@ import * as DOM from '../../../../../base/browser/dom.js';
 import { Dimension } from '../../../../../base/browser/dom.js';
 import { BreadcrumbsWidget } from '../../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { ProgressBar } from '../../../../../base/browser/ui/progressbar/progressbar.js';
 import { IObjectTreeElement } from '../../../../../base/browser/ui/tree/tree.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
@@ -20,17 +21,22 @@ import { IContextKeyService } from '../../../../../platform/contextkey/common/co
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { WorkbenchList, WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js';
-import { defaultBreadcrumbsWidgetStyles, defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { defaultBreadcrumbsWidgetStyles, defaultButtonStyles, defaultProgressBarStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { FilterWidget } from '../../../../browser/parts/views/viewFilter.js';
 import { IChatDebugEvent, IChatDebugService } from '../../common/chatDebugService.js';
+import { filterDebugEventsByText } from '../../common/chatDebugEvents.js';
 import { IChatService } from '../../common/chatService/chatService.js';
 import { LocalChatSessionUri } from '../../common/model/chatUri.js';
-import { ChatDebugEventRenderer, ChatDebugEventDelegate, ChatDebugEventTreeRenderer } from './chatDebugEventList.js';
+import { ChatDebugEventRenderer, ChatDebugEventDelegate, ChatDebugEventTreeRenderer, getEventCreatedText, getEventNameText, getEventDetailsText } from './chatDebugEventList.js';
 import { setupBreadcrumbKeyboardNavigation, TextBreadcrumbItem, LogsViewMode } from './chatDebugTypes.js';
 import { ChatDebugFilterState, bindFilterContextKeys } from './chatDebugFilters.js';
 import { ChatDebugDetailPanel } from './chatDebugDetailPanel.js';
 import { IChatWidgetService } from '../chat.js';
 import { createDebugEventsAttachment } from './chatDebugAttachment.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { Action, Separator } from '../../../../../base/common/actions.js';
+import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 
 const $ = DOM.$;
 
@@ -59,13 +65,13 @@ export class ChatDebugLogsView extends Disposable {
 	private tree: WorkbenchObjectTree<IChatDebugEvent, void>;
 
 	private currentSessionResource: URI | undefined;
-	private logsViewMode: LogsViewMode = LogsViewMode.List;
+	private logsViewMode: LogsViewMode = LogsViewMode.Tree;
 	private events: IChatDebugEvent[] = [];
 	private currentDimension: Dimension | undefined;
 	private readonly eventListener = this._register(new MutableDisposable());
 	private readonly sessionStateDisposable = this._register(new MutableDisposable());
 	private readonly refreshScheduler: RunOnceScheduler;
-	private shimmerRow!: HTMLElement;
+	private readonly progressBar: ProgressBar;
 
 	constructor(
 		parent: HTMLElement,
@@ -75,6 +81,8 @@ export class ChatDebugLogsView extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IClipboardService private readonly clipboardService: IClipboardService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 	) {
 		super();
 		this.refreshScheduler = this._register(new RunOnceScheduler(() => this.refreshList(), 50));
@@ -164,11 +172,18 @@ export class ChatDebugLogsView extends Disposable {
 		DOM.append(this.tableHeader, $('span.chat-debug-col-name', undefined, localize('chatDebug.col.name', "Name")));
 		DOM.append(this.tableHeader, $('span.chat-debug-col-details', undefined, localize('chatDebug.col.details', "Details")));
 
+		// Progress bar (shown when session is in progress)
+		this.progressBar = this._register(new ProgressBar(mainColumn, {
+			...defaultProgressBarStyles,
+			ariaLabel: localize('chatDebug.progressAriaLabel', "Chat debug logs loading progress")
+		}));
+
 		// Body container
 		this.bodyContainer = DOM.append(mainColumn, $('.chat-debug-logs-body'));
 
-		// List container
+		// List container (initially hidden — tree view is default)
 		this.listContainer = DOM.append(this.bodyContainer, $('.chat-debug-list-container'));
+		DOM.hide(this.listContainer);
 
 		const accessibilityProvider = {
 			getAriaLabel: (e: IChatDebugEvent) => {
@@ -208,9 +223,8 @@ export class ChatDebugLogsView extends Disposable {
 			{ identityProvider, accessibilityProvider }
 		));
 
-		// Tree container (initially hidden)
+		// Tree container (default view)
 		this.treeContainer = DOM.append(this.bodyContainer, $('.chat-debug-list-container'));
-		DOM.hide(this.treeContainer);
 
 		this.tree = this._register(this.instantiationService.createInstance(
 			WorkbenchObjectTree<IChatDebugEvent, void>,
@@ -221,15 +235,13 @@ export class ChatDebugLogsView extends Disposable {
 			{ identityProvider, accessibilityProvider }
 		));
 
-		// Shimmer row (positioned right below last row to indicate session is running)
-		this.shimmerRow = DOM.append(this.bodyContainer, $('.chat-debug-logs-shimmer-row'));
-		this.shimmerRow.setAttribute('aria-label', localize('chatDebug.loadingMore', "Loading more events…"));
-		this.shimmerRow.setAttribute('aria-busy', 'true');
-		DOM.append(this.shimmerRow, $('span.chat-debug-logs-shimmer-bar'));
-		DOM.hide(this.shimmerRow);
-
 		// Detail panel (sibling of main column so it aligns with table header)
 		this.detailPanel = this._register(this.instantiationService.createInstance(ChatDebugDetailPanel, contentContainer));
+		this._register(this.detailPanel.onDidChangeWidth(() => {
+			if (this.currentDimension) {
+				this.layout(this.currentDimension);
+			}
+		}));
 		this._register(this.detailPanel.onDidHide(() => {
 			if (this.list.getSelection().length > 0) {
 				this.list.setSelection([]);
@@ -237,6 +249,21 @@ export class ChatDebugLogsView extends Disposable {
 			if (this.tree.getSelection().length > 0) {
 				this.tree.setSelection([]);
 			}
+			if (this.currentDimension) {
+				this.layout(this.currentDimension);
+			}
+		}));
+
+		// Context menu
+		this._register(this.list.onContextMenu(e => {
+			if (e.element) {
+				this.showEventContextMenu(e.element, e.browserEvent);
+			}
+		}));
+		this._register(this.tree.onContextMenu(e => {
+			if (e.element) {
+				this.showEventContextMenu(e.element, e.browserEvent);
+			}
 		}));
 
 		// Resolve event details on selection
@@ -291,7 +318,7 @@ export class ChatDebugLogsView extends Disposable {
 		}
 		const sessionTitle = this.chatService.getSessionTitle(this.currentSessionResource) || LocalChatSessionUri.parseLocalSessionId(this.currentSessionResource) || this.currentSessionResource.toString();
 		this.breadcrumbWidget.setItems([
-			new TextBreadcrumbItem(localize('chatDebug.title', "Agent Debug Panel"), true),
+			new TextBreadcrumbItem(localize('chatDebug.title', "Agent Debug Logs"), true),
 			new TextBreadcrumbItem(sessionTitle, true),
 			new TextBreadcrumbItem(localize('chatDebug.logs', "Logs")),
 		]);
@@ -302,8 +329,8 @@ export class ChatDebugLogsView extends Disposable {
 		const breadcrumbHeight = 22;
 		const headerHeight = this.headerContainer.offsetHeight;
 		const tableHeaderHeight = this.tableHeader.offsetHeight;
-		const detailVisible = this.detailPanel.element.style.display !== 'none';
-		const detailWidth = detailVisible ? this.detailPanel.element.offsetWidth : 0;
+		const detailVisible = this.detailPanel.isVisible;
+		const detailWidth = detailVisible ? this.detailPanel.width : 0;
 		const listHeight = dimension.height - breadcrumbHeight - headerHeight - tableHeaderHeight;
 		const listWidth = dimension.width - detailWidth;
 		if (this.logsViewMode === LogsViewMode.Tree) {
@@ -311,10 +338,14 @@ export class ChatDebugLogsView extends Disposable {
 		} else {
 			this.list.layout(listHeight, listWidth);
 		}
+		if (this.detailPanel.isVisible) {
+			this.detailPanel.layout(listHeight);
+		}
+		this.detailPanel.layoutSash();
 	}
 
 	refreshList(): void {
-		let filtered = this.events;
+		let filtered: readonly IChatDebugEvent[] = this.events;
 
 		// Filter by kind toggles (pass category for generic events so only
 		// discovery-category events are affected by the Prompt Discovery toggle)
@@ -323,54 +354,11 @@ export class ChatDebugLogsView extends Disposable {
 			return this.filterState.isKindVisible(e.kind, category);
 		});
 
-		// Filter by timestamp (before:/after: syntax)
-		filtered = filtered.filter(e => this.filterState.isTimestampVisible(e.created));
-
-		// Filter by text search (excluding before:/after: tokens)
-		const filterText = this.filterState.textFilterWithoutTimestamps;
+		// Filter by text search and timestamp (before:/after: syntax is handled
+		// inside filterDebugEventsByText)
+		const filterText = this.filterState.textFilter;
 		if (filterText) {
-			const terms = filterText.split(/\s*,\s*/).filter(t => t.length > 0);
-			const includeTerms = terms.filter(t => !t.startsWith('!')).map(t => t.trim());
-			const excludeTerms = terms.filter(t => t.startsWith('!')).map(t => t.slice(1).trim()).filter(t => t.length > 0);
-
-			filtered = filtered.filter(e => {
-				const matchesText = (term: string): boolean => {
-					if (e.kind.toLowerCase().includes(term)) {
-						return true;
-					}
-					switch (e.kind) {
-						case 'toolCall':
-							return e.toolName.toLowerCase().includes(term) ||
-								(e.input?.toLowerCase().includes(term) ?? false) ||
-								(e.output?.toLowerCase().includes(term) ?? false);
-						case 'modelTurn':
-							return (e.model?.toLowerCase().includes(term) ?? false);
-						case 'generic':
-							return e.name.toLowerCase().includes(term) ||
-								(e.details?.toLowerCase().includes(term) ?? false) ||
-								(e.category?.toLowerCase().includes(term) ?? false);
-						case 'subagentInvocation':
-							return e.agentName.toLowerCase().includes(term) ||
-								(e.description?.toLowerCase().includes(term) ?? false);
-						case 'userMessage':
-							return e.message.toLowerCase().includes(term) ||
-								e.sections.some(s => s.name.toLowerCase().includes(term) || s.content.toLowerCase().includes(term));
-						case 'agentResponse':
-							return e.message.toLowerCase().includes(term) ||
-								e.sections.some(s => s.name.toLowerCase().includes(term) || s.content.toLowerCase().includes(term));
-					}
-				};
-
-				// Exclude terms: if any exclude term matches, filter out the event
-				if (excludeTerms.some(term => matchesText(term))) {
-					return false;
-				}
-				// Include terms: if present, at least one must match
-				if (includeTerms.length > 0) {
-					return includeTerms.some(term => matchesText(term));
-				}
-				return true;
-			});
+			filtered = filterDebugEventsByText(filtered, filterText);
 		}
 
 		if (this.logsViewMode === LogsViewMode.List) {
@@ -378,11 +366,6 @@ export class ChatDebugLogsView extends Disposable {
 		} else {
 			this.refreshTree(filtered);
 		}
-		this.updateShimmerPosition(filtered.length);
-	}
-
-	private updateShimmerPosition(itemCount: number): void {
-		this.shimmerRow.style.top = `${itemCount * 28}px`;
 	}
 
 	addEvent(event: IChatDebugEvent): void {
@@ -438,14 +421,14 @@ export class ChatDebugLogsView extends Disposable {
 
 	private trackSessionState(): void {
 		if (!this.currentSessionResource) {
-			DOM.hide(this.shimmerRow);
+			this.progressBar.stop();
 			this.sessionStateDisposable.clear();
 			return;
 		}
 
 		const model = this.chatService.getSession(this.currentSessionResource);
 		if (!model) {
-			DOM.hide(this.shimmerRow);
+			this.progressBar.stop();
 			this.sessionStateDisposable.clear();
 			return;
 		}
@@ -453,19 +436,19 @@ export class ChatDebugLogsView extends Disposable {
 		this.sessionStateDisposable.value = autorun(reader => {
 			const inProgress = model.requestInProgress.read(reader);
 			if (inProgress) {
-				DOM.show(this.shimmerRow);
+				this.progressBar.infinite();
 			} else {
-				DOM.hide(this.shimmerRow);
+				this.progressBar.stop();
 			}
 		});
 	}
 
-	private refreshTree(filtered: IChatDebugEvent[]): void {
+	private refreshTree(filtered: readonly IChatDebugEvent[]): void {
 		const treeElements = this.buildTreeHierarchy(filtered);
 		this.tree.setChildren(null, treeElements);
 	}
 
-	private buildTreeHierarchy(events: IChatDebugEvent[]): IObjectTreeElement<IChatDebugEvent>[] {
+	private buildTreeHierarchy(events: readonly IChatDebugEvent[]): IObjectTreeElement<IChatDebugEvent>[] {
 		const idToEvent = new Map<string, IChatDebugEvent>();
 		const idToChildren = new Map<string, IChatDebugEvent[]>();
 		const roots: IChatDebugEvent[] = [];
@@ -548,5 +531,29 @@ export class ChatDebugLogsView extends Disposable {
 		this.filterWidget.checkMoreFilters(!this.filterState.isAllFiltersDefault());
 	}
 
+	private showEventContextMenu(event: IChatDebugEvent, browserEvent: UIEvent): void {
+		const d = event.created;
+		const pad = (n: number) => String(n).padStart(2, '0');
+		const timestamp = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+		const row = [getEventCreatedText(event), getEventNameText(event), getEventDetailsText(event)].filter(Boolean).join('\t');
+		const name = getEventNameText(event);
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => DOM.isMouseEvent(browserEvent)
+				? new StandardMouseEvent(DOM.getWindow(this.container), browserEvent)
+				: this.container,
+			getActions: () => [
+				new Action('chatDebug.copyTimestamp', localize('chatDebug.copyTimestamp', "Copy Timestamp"), undefined, true, () => this.clipboardService.writeText(timestamp)),
+				new Action('chatDebug.copyRow', localize('chatDebug.copyRow', "Copy Row"), undefined, true, () => this.clipboardService.writeText(row)),
+				new Separator(),
+				new Action('chatDebug.filterBefore', localize('chatDebug.filterBefore', "Filter Before Timestamp"), undefined, true, () => this.applyFilterToken(`before:${timestamp}`)),
+				new Action('chatDebug.filterAfter', localize('chatDebug.filterAfter', "Filter After Timestamp"), undefined, true, () => this.applyFilterToken(`after:${timestamp}`)),
+				new Action('chatDebug.filterName', localize('chatDebug.filterName', "Filter Name"), undefined, !!name, () => this.applyFilterToken(name)),
+			],
+		});
+	}
+
+	private applyFilterToken(token: string): void {
+		this.filterWidget.setFilterText(token);
+	}
 
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugMessageContentRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugMessageContentRenderer.ts
index c06be60cbaa..03e677d2235 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugMessageContentRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugMessageContentRenderer.ts
@@ -6,15 +6,18 @@
 import * as DOM from '../../../../../base/browser/dom.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../nls.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { IChatDebugUserMessageEvent, IChatDebugAgentResponseEvent, IChatDebugEventMessageContent } from '../../common/chatDebugService.js';
-import { renderCollapsibleSection } from './chatDebugCollapsible.js';
+import { renderSection, tokenizeContent } from './chatDebugToolCallContentRenderer.js';
 
 const $ = DOM.$;
 
 /**
  * Render a user message event with collapsible prompt sections.
+ * JSON content in sections is syntax-highlighted.
  */
-export function renderUserMessageContent(event: IChatDebugUserMessageEvent): { element: HTMLElement; disposables: DisposableStore } {
+export async function renderUserMessageContent(event: IChatDebugUserMessageEvent, languageService: ILanguageService, clipboardService?: IClipboardService, scrollable?: { scanDomNode(): void }): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
 	const disposables = new DisposableStore();
 	const container = $('div.chat-debug-message-content');
 	container.tabIndex = 0;
@@ -28,7 +31,8 @@ export function renderUserMessageContent(event: IChatDebugUserMessageEvent): { e
 			localize('chatDebug.promptSections', "Prompt Sections ({0})", event.sections.length)));
 
 		for (const section of event.sections) {
-			renderCollapsibleSection(sectionsContainer, section, disposables);
+			const { plainText, tokenizedHtml } = await tokenizeContent(section.content, languageService);
+			renderSection(sectionsContainer, section.name, plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
 		}
 	}
 
@@ -37,8 +41,9 @@ export function renderUserMessageContent(event: IChatDebugUserMessageEvent): { e
 
 /**
  * Render an agent response event with collapsible response sections.
+ * JSON content in sections is syntax-highlighted.
  */
-export function renderAgentResponseContent(event: IChatDebugAgentResponseEvent): { element: HTMLElement; disposables: DisposableStore } {
+export async function renderAgentResponseContent(event: IChatDebugAgentResponseEvent, languageService: ILanguageService, clipboardService?: IClipboardService, scrollable?: { scanDomNode(): void }): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
 	const disposables = new DisposableStore();
 	const container = $('div.chat-debug-message-content');
 	container.tabIndex = 0;
@@ -52,7 +57,8 @@ export function renderAgentResponseContent(event: IChatDebugAgentResponseEvent):
 			localize('chatDebug.responseSections', "Response Sections ({0})", event.sections.length)));
 
 		for (const section of event.sections) {
-			renderCollapsibleSection(sectionsContainer, section, disposables);
+			const { plainText, tokenizedHtml } = await tokenizeContent(section.content, languageService);
+			renderSection(sectionsContainer, section.name, plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
 		}
 	}
 
@@ -79,8 +85,9 @@ export function messageEventToPlainText(event: IChatDebugUserMessageEvent | ICha
 
 /**
  * Render a resolved message content (from resolveChatDebugLogEvent) with collapsible sections.
+ * JSON content in sections is syntax-highlighted.
  */
-export function renderResolvedMessageContent(content: IChatDebugEventMessageContent): { element: HTMLElement; disposables: DisposableStore } {
+export async function renderResolvedMessageContent(content: IChatDebugEventMessageContent, languageService: ILanguageService, clipboardService?: IClipboardService, scrollable?: { scanDomNode(): void }): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
 	const disposables = new DisposableStore();
 	const container = $('div.chat-debug-message-content');
 	container.tabIndex = 0;
@@ -99,7 +106,8 @@ export function renderResolvedMessageContent(content: IChatDebugEventMessageCont
 		DOM.append(sectionsContainer, $('div.chat-debug-message-sections-label', undefined, label));
 
 		for (const section of content.sections) {
-			renderCollapsibleSection(sectionsContainer, section, disposables);
+			const { plainText, tokenizedHtml } = await tokenizeContent(section.content, languageService);
+			renderSection(sectionsContainer, section.name, plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugModelTurnContentRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugModelTurnContentRenderer.ts
index cc88136bf2b..d46779a813d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugModelTurnContentRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugModelTurnContentRenderer.ts
@@ -6,16 +6,21 @@
 import * as DOM from '../../../../../base/browser/dom.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../nls.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { IChatDebugEventModelTurnContent } from '../../common/chatDebugService.js';
-import { renderCollapsibleSection } from './chatDebugCollapsible.js';
+import { renderSection, tokenizeContent } from './chatDebugToolCallContentRenderer.js';
+import { safeIntl } from '../../../../../base/common/date.js';
 
 const $ = DOM.$;
+const numberFormatter = safeIntl.NumberFormat();
 
 /**
  * Render a resolved model turn content with structured display of
  * request metadata, token usage, and timing.
+ * When JSON is detected in section content, renders it with syntax highlighting.
  */
-export function renderModelTurnContent(content: IChatDebugEventModelTurnContent): { element: HTMLElement; disposables: DisposableStore } {
+export async function renderModelTurnContent(content: IChatDebugEventModelTurnContent, languageService: ILanguageService, clipboardService?: IClipboardService, scrollable?: { scanDomNode(): void }): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
 	const disposables = new DisposableStore();
 	const container = $('div.chat-debug-message-content');
 	container.tabIndex = 0;
@@ -31,11 +36,11 @@ export function renderModelTurnContent(content: IChatDebugEventModelTurnContent)
 	if (content.model) {
 		statusParts.push(content.model);
 	}
-	if (content.status) {
+	if (content.status && content.status !== 'unknown') {
 		statusParts.push(content.status);
 	}
 	if (content.durationInMillis !== undefined) {
-		statusParts.push(localize('chatDebug.modelTurn.duration', "{0}ms", content.durationInMillis));
+		statusParts.push(localize('chatDebug.modelTurn.duration', "{0}ms", numberFormatter.value.format(content.durationInMillis)));
 	}
 	if (statusParts.length > 0) {
 		DOM.append(container, $('div.chat-debug-message-content-summary', undefined, statusParts.join(' \u00b7 ')));
@@ -45,25 +50,25 @@ export function renderModelTurnContent(content: IChatDebugEventModelTurnContent)
 	const detailsContainer = DOM.append(container, $('div.chat-debug-model-turn-details'));
 
 	if (content.inputTokens !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.inputTokens', "Input tokens: {0}", content.inputTokens)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.inputTokens', "Input tokens: {0}", numberFormatter.value.format(content.inputTokens))));
 	}
 	if (content.outputTokens !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.outputTokens', "Output tokens: {0}", content.outputTokens)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.outputTokens', "Output tokens: {0}", numberFormatter.value.format(content.outputTokens))));
 	}
 	if (content.cachedTokens !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.cachedTokens', "Cached tokens: {0}", content.cachedTokens)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.cachedTokens', "Cached tokens: {0}", numberFormatter.value.format(content.cachedTokens))));
 	}
 	if (content.totalTokens !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.totalTokens', "Total tokens: {0}", content.totalTokens)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.totalTokens', "Total tokens: {0}", numberFormatter.value.format(content.totalTokens))));
 	}
 	if (content.timeToFirstTokenInMillis !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.ttft', "Time to first token: {0}ms", content.timeToFirstTokenInMillis)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.ttft', "Time to first token: {0}ms", numberFormatter.value.format(content.timeToFirstTokenInMillis))));
 	}
 	if (content.maxInputTokens !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.maxInputTokens', "Max input tokens: {0}", content.maxInputTokens)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.maxInputTokens', "Max input tokens: {0}", numberFormatter.value.format(content.maxInputTokens))));
 	}
 	if (content.maxOutputTokens !== undefined) {
-		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.maxOutputTokens', "Max output tokens: {0}", content.maxOutputTokens)));
+		DOM.append(detailsContainer, $('div', undefined, localize('chatDebug.modelTurn.maxOutputTokens', "Max output tokens: {0}", numberFormatter.value.format(content.maxOutputTokens))));
 	}
 	if (content.errorMessage) {
 		DOM.append(detailsContainer, $('div.chat-debug-model-turn-error', undefined, localize('chatDebug.modelTurn.error', "Error: {0}", content.errorMessage)));
@@ -76,7 +81,8 @@ export function renderModelTurnContent(content: IChatDebugEventModelTurnContent)
 			localize('chatDebug.modelTurn.sections', "Sections ({0})", content.sections.length)));
 
 		for (const section of content.sections) {
-			renderCollapsibleSection(sectionsContainer, section, disposables);
+			const { plainText, tokenizedHtml } = await tokenizeContent(section.content, languageService);
+			renderSection(sectionsContainer, section.name, plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
 		}
 	}
 
@@ -93,32 +99,32 @@ export function modelTurnContentToPlainText(content: IChatDebugEventModelTurnCon
 	if (content.model) {
 		lines.push(localize('chatDebug.modelTurn.modelLabel', "Model: {0}", content.model));
 	}
-	if (content.status) {
+	if (content.status && content.status !== 'unknown') {
 		lines.push(localize('chatDebug.modelTurn.statusLabel', "Status: {0}", content.status));
 	}
 	if (content.durationInMillis !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.durationLabel', "Duration: {0}ms", content.durationInMillis));
+		lines.push(localize('chatDebug.modelTurn.durationLabel', "Duration: {0}ms", numberFormatter.value.format(content.durationInMillis)));
 	}
 	if (content.timeToFirstTokenInMillis !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.ttftLabel', "Time to first token: {0}ms", content.timeToFirstTokenInMillis));
+		lines.push(localize('chatDebug.modelTurn.ttftLabel', "Time to first token: {0}ms", numberFormatter.value.format(content.timeToFirstTokenInMillis)));
 	}
 	if (content.inputTokens !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.inputTokensLabel', "Input tokens: {0}", content.inputTokens));
+		lines.push(localize('chatDebug.modelTurn.inputTokensLabel', "Input tokens: {0}", numberFormatter.value.format(content.inputTokens)));
 	}
 	if (content.outputTokens !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.outputTokensLabel', "Output tokens: {0}", content.outputTokens));
+		lines.push(localize('chatDebug.modelTurn.outputTokensLabel', "Output tokens: {0}", numberFormatter.value.format(content.outputTokens)));
 	}
 	if (content.cachedTokens !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.cachedTokensLabel', "Cached tokens: {0}", content.cachedTokens));
+		lines.push(localize('chatDebug.modelTurn.cachedTokensLabel', "Cached tokens: {0}", numberFormatter.value.format(content.cachedTokens)));
 	}
 	if (content.totalTokens !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.totalTokensLabel', "Total tokens: {0}", content.totalTokens));
+		lines.push(localize('chatDebug.modelTurn.totalTokensLabel', "Total tokens: {0}", numberFormatter.value.format(content.totalTokens)));
 	}
 	if (content.maxInputTokens !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.maxInputTokensLabel', "Max input tokens: {0}", content.maxInputTokens));
+		lines.push(localize('chatDebug.modelTurn.maxInputTokensLabel', "Max input tokens: {0}", numberFormatter.value.format(content.maxInputTokens)));
 	}
 	if (content.maxOutputTokens !== undefined) {
-		lines.push(localize('chatDebug.modelTurn.maxOutputTokensLabel', "Max output tokens: {0}", content.maxOutputTokens));
+		lines.push(localize('chatDebug.modelTurn.maxOutputTokensLabel', "Max output tokens: {0}", numberFormatter.value.format(content.maxOutputTokens)));
 	}
 	if (content.errorMessage) {
 		lines.push(localize('chatDebug.modelTurn.errorLabel', "Error: {0}", content.errorMessage));
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugOverviewView.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugOverviewView.ts
index fc5ce77add7..dfe3405b4b3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugOverviewView.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugOverviewView.ts
@@ -6,6 +6,7 @@
 import * as DOM from '../../../../../base/browser/dom.js';
 import { BreadcrumbsWidget } from '../../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
@@ -14,6 +15,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { defaultBreadcrumbsWidgetStyles, defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { ChatDebugLogLevel, IChatDebugEvent, IChatDebugService } from '../../common/chatDebugService.js';
+import { safeIntl } from '../../../../../base/common/date.js';
 import { IChatService } from '../../common/chatService/chatService.js';
 import { ChatAgentLocation } from '../../common/constants.js';
 import { IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
@@ -22,6 +24,7 @@ import { IChatWidgetService } from '../chat.js';
 import { setupBreadcrumbKeyboardNavigation, TextBreadcrumbItem } from './chatDebugTypes.js';
 
 const $ = DOM.$;
+const numberFormatter = safeIntl.NumberFormat();
 
 export const enum OverviewNavigation {
 	Home = 'home',
@@ -42,6 +45,7 @@ export class ChatDebugOverviewView extends Disposable {
 	private currentSessionResource: URI | undefined;
 	private metricsContainer: HTMLElement | undefined;
 	private isFirstLoad: boolean = true;
+	private readonly refreshScheduler: RunOnceScheduler;
 
 	constructor(
 		parent: HTMLElement,
@@ -54,6 +58,8 @@ export class ChatDebugOverviewView extends Disposable {
 		this.container = DOM.append(parent, $('.chat-debug-overview'));
 		DOM.hide(this.container);
 
+		this.refreshScheduler = this._register(new RunOnceScheduler(() => this.doRefresh(), 100));
+
 		// Breadcrumb
 		const breadcrumbContainer = DOM.append(this.container, $('.chat-debug-breadcrumb'));
 		this.breadcrumbWidget = this._register(new BreadcrumbsWidget(breadcrumbContainer, 3, undefined, Codicon.chevronRight, defaultBreadcrumbsWidgetStyles));
@@ -84,29 +90,36 @@ export class ChatDebugOverviewView extends Disposable {
 
 	hide(): void {
 		DOM.hide(this.container);
+		this.refreshScheduler.cancel();
 	}
 
 	refresh(): void {
 		if (this.container.style.display !== 'none') {
-			// On refresh, only update the metrics section in-place
-			if (this.metricsContainer && this.currentSessionResource) {
-				DOM.clearNode(this.metricsContainer);
-				const events = this.chatDebugService.getEvents(this.currentSessionResource);
-				this.renderMetricsContent(this.metricsContainer, events);
-				this.isFirstLoad = false;
-			} else {
-				this.load();
+			if (!this.refreshScheduler.isScheduled()) {
+				this.refreshScheduler.schedule();
 			}
 		}
 	}
 
+	private doRefresh(): void {
+		// On refresh, only update the metrics section in-place
+		if (this.metricsContainer && this.currentSessionResource) {
+			DOM.clearNode(this.metricsContainer);
+			const events = this.chatDebugService.getEvents(this.currentSessionResource);
+			this.renderMetricsContent(this.metricsContainer, events);
+			this.isFirstLoad = false;
+		} else {
+			this.load();
+		}
+	}
+
 	updateBreadcrumb(): void {
 		if (!this.currentSessionResource) {
 			return;
 		}
 		const sessionTitle = this.chatService.getSessionTitle(this.currentSessionResource) || LocalChatSessionUri.parseLocalSessionId(this.currentSessionResource) || this.currentSessionResource.toString();
 		this.breadcrumbWidget.setItems([
-			new TextBreadcrumbItem(localize('chatDebug.title', "Agent Debug Panel"), true),
+			new TextBreadcrumbItem(localize('chatDebug.title', "Agent Debug Logs"), true),
 			new TextBreadcrumbItem(sessionTitle),
 		]);
 	}
@@ -273,7 +286,7 @@ export class ChatDebugOverviewView extends Disposable {
 		const metrics: OverviewMetric[] = [
 			{ label: localize('chatDebug.metric.modelTurns', "Model Turns"), value: String(modelTurns.length) },
 			{ label: localize('chatDebug.metric.toolCalls', "Tool Calls"), value: String(toolCalls.length) },
-			{ label: localize('chatDebug.metric.totalTokens', "Total Tokens"), value: totalTokens.toLocaleString() },
+			{ label: localize('chatDebug.metric.totalTokens', "Total Tokens"), value: numberFormatter.value.format(totalTokens) },
 			{ label: localize('chatDebug.metric.errors', "Errors"), value: String(errors.length) },
 			{ label: localize('chatDebug.metric.totalEvents', "Total Events"), value: String(events.length) },
 		];
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.ts
index f8e0618f271..122ae04b4f6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugToolCallContentRenderer.ts
@@ -4,9 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../nls.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { tokenizeToString } from '../../../../../editor/common/languages/textToHtmlTokenizer.js';
 import { IChatDebugEventToolCallContent } from '../../common/chatDebugService.js';
@@ -20,7 +24,7 @@ const _ttpPolicy = createTrustedTypesPolicy('chatDebugTokenizer', {
 	}
 });
 
-function tryParseJSON(text: string): { parsed: unknown; isJSON: true } | { isJSON: false } {
+export function tryParseJSON(text: string): { parsed: unknown; isJSON: true } | { isJSON: false } {
 	try {
 		return { parsed: JSON.parse(text), isJSON: true };
 	} catch {
@@ -28,23 +32,61 @@ function tryParseJSON(text: string): { parsed: unknown; isJSON: true } | { isJSO
 	}
 }
 
+/**
+ * Format and syntax-highlight a content string.
+ * When the content is valid JSON it is pretty-printed and tokenized as JSON;
+ * otherwise it is tokenized as markdown.
+ */
+export async function tokenizeContent(text: string, languageService: ILanguageService): Promise<{ plainText: string; tokenizedHtml: string }> {
+	const result = tryParseJSON(text);
+	const plainText = result.isJSON ? JSON.stringify(result.parsed, null, 2) : text;
+	const language = result.isJSON ? 'json' : 'markdown';
+	const tokenizedHtml = await tokenizeToString(languageService, plainText, language);
+	return { plainText, tokenizedHtml };
+}
+
 /**
  * Render a collapsible section. When `tokenizedHtml` is provided the content
  * is rendered as syntax-highlighted HTML; otherwise plain-text is used.
+ * Optionally adds a copy button when `clipboardService` is provided.
  */
-function renderSection(
+export function renderSection(
 	parent: HTMLElement,
 	label: string,
 	plainText: string,
 	tokenizedHtml: string | undefined,
 	disposables: DisposableStore,
 	initiallyCollapsed: boolean = false,
+	clipboardService?: IClipboardService,
+	scrollable?: { scanDomNode(): void },
 ): void {
 	const sectionEl = DOM.append(parent, $('div.chat-debug-message-section'));
 	const header = DOM.append(sectionEl, $('div.chat-debug-message-section-header'));
 	const chevron = DOM.append(header, $('span.chat-debug-message-section-chevron'));
 	DOM.append(header, $('span.chat-debug-message-section-title', undefined, label));
 
+	if (clipboardService) {
+		const copyBtn = disposables.add(new Button(header, {
+			title: localize('chatDebug.section.copy', "Copy"),
+			ariaLabel: localize('chatDebug.section.copy', "Copy"),
+			hoverDelegate: getDefaultHoverDelegate('mouse'),
+		}));
+		copyBtn.icon = Codicon.copy;
+		copyBtn.element.classList.add('chat-debug-section-copy-btn');
+		disposables.add(DOM.addDisposableListener(copyBtn.element, DOM.EventType.MOUSE_ENTER, () => {
+			header.classList.add('chat-debug-section-copy-header-passthrough');
+		}));
+		disposables.add(DOM.addDisposableListener(copyBtn.element, DOM.EventType.MOUSE_LEAVE, () => {
+			header.classList.remove('chat-debug-section-copy-header-passthrough');
+		}));
+		disposables.add(copyBtn.onDidClick(e => {
+			if (e) {
+				DOM.EventHelper.stop(e, true);
+			}
+			clipboardService.writeText(plainText);
+		}));
+	}
+
 	const wrapper = DOM.append(sectionEl, $('div.chat-debug-message-section-content-wrapper'));
 	const contentEl = DOM.append(wrapper, $('pre.chat-debug-message-section-content'));
 	contentEl.tabIndex = 0;
@@ -56,7 +98,7 @@ function renderSection(
 		contentEl.textContent = plainText;
 	}
 
-	setupCollapsibleToggle(chevron, header, wrapper, disposables, initiallyCollapsed);
+	setupCollapsibleToggle(chevron, header, wrapper, disposables, initiallyCollapsed, scrollable);
 }
 
 /**
@@ -66,7 +108,7 @@ function renderSection(
  * When JSON is detected in input/output, renders it with syntax highlighting
  * using the editor's tokenization.
  */
-export async function renderToolCallContent(content: IChatDebugEventToolCallContent, languageService: ILanguageService): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
+export async function renderToolCallContent(content: IChatDebugEventToolCallContent, languageService: ILanguageService, clipboardService?: IClipboardService, scrollable?: { scanDomNode(): void }): Promise<{ element: HTMLElement; disposables: DisposableStore }> {
 	const disposables = new DisposableStore();
 	const container = $('div.chat-debug-message-content');
 	container.tabIndex = 0;
@@ -92,21 +134,13 @@ export async function renderToolCallContent(content: IChatDebugEventToolCallCont
 	const sectionsContainer = DOM.append(container, $('div.chat-debug-message-sections'));
 
 	if (content.input) {
-		const result = tryParseJSON(content.input);
-		const plainText = result.isJSON ? JSON.stringify(result.parsed, null, 2) : content.input;
-		const tokenizedHtml = result.isJSON
-			? await tokenizeToString(languageService, plainText, 'json')
-			: undefined;
-		renderSection(sectionsContainer, localize('chatDebug.toolCall.arguments', "Arguments"), plainText, tokenizedHtml, disposables);
+		const { plainText, tokenizedHtml } = await tokenizeContent(content.input, languageService);
+		renderSection(sectionsContainer, localize('chatDebug.toolCall.arguments', "Arguments"), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
 	}
 
 	if (content.output) {
-		const result = tryParseJSON(content.output);
-		const plainText = result.isJSON ? JSON.stringify(result.parsed, null, 2) : content.output;
-		const tokenizedHtml = result.isJSON
-			? await tokenizeToString(languageService, plainText, 'json')
-			: undefined;
-		renderSection(sectionsContainer, localize('chatDebug.toolCall.output', "Output"), plainText, tokenizedHtml, disposables);
+		const { plainText, tokenizedHtml } = await tokenizeContent(content.output, languageService);
+		renderSection(sectionsContainer, localize('chatDebug.toolCall.output', "Output"), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
 	}
 
 	return { element: container, disposables };
diff --git a/src/vs/workbench/contrib/chat/browser/chatDebug/media/chatDebug.css b/src/vs/workbench/contrib/chat/browser/chatDebug/media/chatDebug.css
index 7efa2352ee7..5709e69513e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDebug/media/chatDebug.css
+++ b/src/vs/workbench/contrib/chat/browser/chatDebug/media/chatDebug.css
@@ -331,11 +331,16 @@
 .chat-debug-table-header .chat-debug-col-details {
 	flex: 1;
 }
+.chat-debug-logs-main > .monaco-progress-container {
+	height: 2px;
+	flex-shrink: 0;
+}
 .chat-debug-logs-content {
 	display: flex;
 	flex-direction: row;
 	flex: 1;
 	overflow: hidden;
+	position: relative;
 }
 .chat-debug-logs-main {
 	display: flex;
@@ -401,34 +406,8 @@
 .chat-debug-log-row.chat-debug-log-trace {
 	opacity: 0.7;
 }
-.chat-debug-logs-shimmer-row {
-	position: absolute;
-	left: 0;
-	right: 0;
-	display: flex;
-	align-items: center;
-	padding: 0 16px;
-	height: 28px;
-	gap: 40px;
-	pointer-events: none;
-}
-.chat-debug-logs-shimmer-bar {
-	flex: 1;
-	height: 10px;
-	border-radius: 3px;
-	background: linear-gradient(
-		90deg,
-		var(--vscode-descriptionForeground) 25%,
-		var(--vscode-chat-thinkingShimmer, rgba(255, 255, 255, 0.3)) 50%,
-		var(--vscode-descriptionForeground) 75%
-	);
-	background-size: 200% 100%;
-	animation: chat-debug-shimmer 2s linear infinite;
-	opacity: 0.15;
-}
 .chat-debug-detail-panel {
 	flex-shrink: 0;
-	width: 350px;
 	display: flex;
 	flex-direction: column;
 	border-left: 1px solid var(--vscode-widget-border, var(--vscode-panel-border));
@@ -461,11 +440,6 @@
 	opacity: 1;
 	background: var(--vscode-toolbar-hoverBackground);
 }
-.chat-debug-detail-content {
-	flex: 1;
-	min-height: 0;
-	overflow-y: auto;
-}
 .chat-debug-detail-panel pre {
 	margin: 0;
 	padding: 8px 16px;
@@ -643,8 +617,6 @@
 }
 .chat-debug-message-section-content-wrapper {
 	border-top: 1px solid var(--vscode-widget-border, transparent);
-	max-height: 300px;
-	overflow-y: auto;
 }
 .chat-debug-message-section-content {
 	margin: 0;
@@ -666,7 +638,8 @@
 }
 
 /* ---- File list: settings gear button ---- */
-.chat-debug-settings-gear.monaco-button {
+.chat-debug-settings-gear.monaco-button,
+.chat-debug-section-copy-btn.monaco-button {
 	flex-shrink: 0;
 	opacity: 0.7;
 	border-radius: 3px;
@@ -676,14 +649,17 @@
 	color: inherit;
 	min-width: auto;
 }
-.chat-debug-settings-gear.monaco-button:hover {
+.chat-debug-settings-gear.monaco-button:hover,
+.chat-debug-section-copy-btn.monaco-button:hover {
 	opacity: 1;
 	background: var(--vscode-toolbar-hoverBackground);
 }
-.chat-debug-settings-gear-header-passthrough {
+.chat-debug-settings-gear-header-passthrough,
+.chat-debug-section-copy-header-passthrough {
 	pointer-events: none;
 }
-.chat-debug-settings-gear-header-passthrough .chat-debug-settings-gear {
+.chat-debug-settings-gear-header-passthrough .chat-debug-settings-gear,
+.chat-debug-section-copy-header-passthrough .chat-debug-section-copy-btn {
 	pointer-events: auto;
 }
 
@@ -727,6 +703,14 @@
 	display: flex;
 	flex: 1;
 	overflow: hidden;
+	position: relative;
+}
+.chat-debug-flowchart-content-wrapper > .chat-debug-detail-panel {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 10;
 }
 .chat-debug-flowchart-content {
 	flex: 1;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 1f021914c0b..32cd6e3de7b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -38,7 +38,6 @@ import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { ChatTreeItem, IChatWidget, IChatWidgetService } from '../chat.js';
 import { IAgentSession, isAgentSession } from '../agentSessions/agentSessionsModel.js';
 import { AgentSessionProviders } from '../agentSessions/agentSessions.js';
-import { IsSessionsWindowContext } from '../../../../common/contextkeys.js';
 
 export abstract class EditingSessionAction extends Action2 {
 
@@ -358,12 +357,6 @@ export class ViewAllSessionChangesAction extends Action2 {
 					group: 'navigation',
 					order: 10,
 					when: ChatContextKeys.hasAgentSessionChanges
-				},
-				{
-					id: MenuId.AgentSessionItemToolbar,
-					group: 'navigation',
-					order: 0,
-					when: ContextKeyExpr.and(ChatContextKeys.hasAgentSessionChanges, IsSessionsWindowContext.negate())
 				}
 			],
 		});
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts
index 2e14eb81176..a88991de260 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts
@@ -5,6 +5,7 @@
 
 import { VSBuffer } from '../../../../../base/common/buffer.js';
 import { constObservable, IObservable, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { LineRange } from '../../../../../editor/common/core/ranges/lineRange.js';
 import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
@@ -164,7 +165,7 @@ export class ChatEditingDeletedFileEntry extends AbstractChatEditingModifiedFile
 
 	equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
 		return !!snapshot &&
-			this.modifiedURI.toString() === snapshot.resource.toString() &&
+			isEqual(this.modifiedURI, snapshot.resource) &&
 			this._languageId === snapshot.languageId &&
 			this._originalContent === snapshot.original &&
 			snapshot.current === '' &&
@@ -198,6 +199,10 @@ export class ChatEditingDeletedFileEntry extends AbstractChatEditingModifiedFile
 		await this._fileService.writeFile(this.modifiedURI, VSBuffer.fromString(this._originalContent));
 	}
 
+	resetEditTrackerToInitialContent(): Promise<void> {
+		return Promise.resolve();
+	}
+
 	protected override async _areOriginalAndModifiedIdentical(): Promise<boolean> {
 		// A deleted file is never identical to its original (unless original was empty)
 		return this._originalContent === '';
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
index 442e73d33f4..e539ca72eef 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
@@ -17,6 +17,7 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IListService } from '../../../../../platform/list/browser/listService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { resolveCommandsContext } from '../../../../browser/parts/editor/editorCommandsContext.js';
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { EditorResourceAccessor, SideBySideEditor, TEXT_DIFF_EDITOR_ID } from '../../../../common/editor.js';
@@ -211,6 +212,7 @@ abstract class KeepOrUndoAction extends ChatEditingEditorAction {
 	override async runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration): Promise<void> {
 
 		const instaService = accessor.get(IInstantiationService);
+		const configService = accessor.get(IConfigurationService);
 
 		if (this._keep) {
 			session.accept(entry.modifiedURI);
@@ -218,7 +220,9 @@ abstract class KeepOrUndoAction extends ChatEditingEditorAction {
 			session.reject(entry.modifiedURI);
 		}
 
-		await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
+		if (configService.getValue<boolean>(ChatConfiguration.RevealNextChangeOnResolve)) {
+			await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
+		}
 	}
 }
 
@@ -270,6 +274,7 @@ abstract class AcceptRejectHunkAction extends ChatEditingEditorAction {
 	override async runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, ctrl: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void> {
 
 		const instaService = accessor.get(IInstantiationService);
+		const configService = accessor.get(IConfigurationService);
 
 		if (this._accept) {
 			await ctrl.acceptNearestChange(args[0] as IModifiedFileEntryChangeHunk | undefined);
@@ -277,7 +282,7 @@ abstract class AcceptRejectHunkAction extends ChatEditingEditorAction {
 			await ctrl.rejectNearestChange(args[0] as IModifiedFileEntryChangeHunk | undefined);
 		}
 
-		if (entry.changesCount.get() === 0) {
+		if (configService.getValue<boolean>(ChatConfiguration.RevealNextChangeOnResolve) && entry.changesCount.get() === 0) {
 			// no more changes, move to next file
 			await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 59f48b3ca06..2353e5c4890 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -6,6 +6,7 @@
 import { IReference, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { ITransaction, autorun, transaction } from '../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 import { assertType } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
@@ -186,7 +187,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 	equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
 		return !!snapshot &&
-			this.modifiedURI.toString() === snapshot.resource.toString() &&
+			isEqual(this.modifiedURI, snapshot.resource) &&
 			this.modifiedModel.getLanguageId() === snapshot.languageId &&
 			this.originalModel.getValue() === snapshot.original &&
 			this.modifiedModel.getValue() === snapshot.current &&
@@ -218,6 +219,10 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		await this._textModelChangeService.resetDocumentValues(undefined, this.initialContent);
 	}
 
+	async resetEditTrackerToInitialContent() {
+		await this._textModelChangeService.resetDocumentValues(this.initialContent, undefined);
+	}
+
 	protected override async _areOriginalAndModifiedIdentical(): Promise<boolean> {
 		return this._textModelChangeService.areOriginalAndModifiedIdentical();
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 2b02a675551..7ba9d6fb55d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -370,7 +370,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 	// --- inital content
 
 	abstract resetToInitialContent(): Promise<void>;
-
+	abstract resetEditTrackerToInitialContent(): Promise<void>;
 	abstract initialContent: string;
 
 	/**
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 48073f03acf..bd27db4fae7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -911,17 +911,28 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 	}
 
+	private _safeCreateSnapshot(model: NotebookTextModel): string {
+		try {
+			return createSnapshot(model, this.transientOptions, this.configurationService);
+		} catch (e) {
+			this.loggingService.error('Notebook Chat', `Error creating snapshot: ${e instanceof Error ? e.message : e}`);
+			return this.initialContent;
+		}
+	}
+
 	public getCurrentSnapshot() {
-		return createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+		return this._safeCreateSnapshot(this.modifiedModel);
 	}
 
 	override createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
+		const original = this._safeCreateSnapshot(this.originalModel);
+		const current = this.getCurrentSnapshot();
 		return {
 			resource: this.modifiedURI,
 			languageId: SnapshotLanguageId,
 			snapshotUri: getNotebookSnapshotFileURI(chatSessionResource, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
-			original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
-			current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
+			original,
+			current,
 			state: this.state.get(),
 			telemetryInfo: this.telemetryInfo,
 		};
@@ -946,6 +957,15 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.initializeModelsFromDiff();
 	}
 
+	async resetEditTrackerToInitialContent() {
+		if (this.initialContent) {
+			restoreSnapshot(this.originalModel, this.initialContent);
+		}
+
+		this.updateCellDiffInfo([], undefined);
+		this.initializeModelsFromDiff();
+	}
+
 	override async resetToInitialContent(): Promise<void> {
 		this.updateCellDiffInfo([], undefined);
 		this.restoreSnapshotInModifiedModel(this.initialContent);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
index 371bd071268..11a6ce23b97 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
@@ -410,7 +410,7 @@ class ChatDecorationsProvider extends Disposable implements IDecorationsProvider
 	}
 
 	provideDecorations(uri: URI, _token: CancellationToken): IDecorationData | undefined {
-		const isCurrentlyBeingModified = this._currentlyEditingUris.get().some(e => e.toString() === uri.toString());
+		const isCurrentlyBeingModified = this._currentlyEditingUris.get().some(e => isEqual(e, uri));
 		if (isCurrentlyBeingModified) {
 			return {
 				weight: 1000,
@@ -418,7 +418,7 @@ class ChatDecorationsProvider extends Disposable implements IDecorationsProvider
 				bubble: false
 			};
 		}
-		const isModified = this._modifiedUris.get().some(e => e.toString() === uri.toString());
+		const isModified = this._modifiedUris.get().some(e => isEqual(e, uri));
 		if (isModified) {
 			return {
 				weight: 1000,
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 8439b5518b7..37a0f2466aa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -30,6 +30,7 @@ import { EditorActivation } from '../../../../../platform/editor/common/editor.j
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
@@ -47,7 +48,7 @@ import { ChatEditingDeletedFileEntry } from './chatEditingDeletedFileEntry.js';
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
-import { FileOperation, FileOperationType } from './chatEditingOperations.js';
+import { FileOperation, FileOperationType, getKeyForChatSessionResource } from './chatEditingOperations.js';
 import { IChatEditingExplanationModelManager, IExplanationDiffInfo, IExplanationGenerationHandle } from './chatEditingExplanationModelManager.js';
 import { ChatEditingSessionStorage, IChatEditingSessionStop, StoredSessionState } from './chatEditingSessionStorage.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -59,6 +60,25 @@ const enum NotExistBehavior {
 	Abort,
 }
 
+type ChatEditingSessionInfoEvent = {
+	editSessionId: string;
+	entryCount: number;
+	modifiedCount: number;
+	acceptedCount: number;
+	rejectedCount: number;
+};
+
+type ChatEditingSessionInfoClassification = {
+	owner: 'jrieken';
+	comment: 'Tracks the number and state of chat editing entries when a session is stored.';
+	editSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Hashed identifier of the chat session for correlation.' };
+	entryCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Total number of entries stored with the session.' };
+	modifiedCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of entries in Modified state when storing.' };
+	acceptedCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of entries in Accepted state when storing.' };
+	rejectedCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of entries in Rejected state when storing.' };
+};
+
+
 class ThrottledSequencer extends Sequencer {
 
 	private _size = 0;
@@ -105,10 +125,6 @@ function createOpeningEditCodeBlock(uri: URI, isNotebook: boolean, undoStopId: s
 			isEdit: true,
 			undoStopId
 		},
-		{
-			kind: 'markdownContent',
-			content: new MarkdownString('\n````\n')
-		},
 		isNotebook
 			? {
 				kind: 'notebookEdit',
@@ -199,6 +215,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IFileService private readonly _fileService: IFileService,
 		@IChatEditingExplanationModelManager private readonly _explanationModelManager: IChatEditingExplanationModelManager,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 	) {
 		super();
 		this._timeline = this._instantiationService.createInstance(
@@ -308,7 +325,12 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	public storeState(): Promise<void> {
 		const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
-		return storage.storeState(this._getStoredState());
+		const storedState = this._getStoredState();
+		this._telemetryService.publicLog2<ChatEditingSessionInfoEvent, ChatEditingSessionInfoClassification>('chatEditing/sessionStore', {
+			editSessionId: getKeyForChatSessionResource(this.chatSessionResource),
+			...this._countEntryStates(this._entriesObs.get()),
+		});
+		return storage.storeState(storedState);
 	}
 
 	private _getStoredState(sessionResource = this.chatSessionResource): StoredSessionState {
@@ -637,7 +659,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		}
 	}
 
-	async startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string): Promise<IChatProgress[]> {
+	async startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string, contentFor?: URI[]): Promise<IChatProgress[]> {
 		const snapshots = new ResourceMap<string | undefined>();
 		const acquiredLockPromises: DeferredPromise<void>[] = [];
 		const releaseLockPromises: DeferredPromise<void>[] = [];
@@ -647,7 +669,9 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		await chatEditingSessionIsReady(this);
 
 		// Acquire locks for each resource and take snapshots
-		for (const resource of resources) {
+		for (let i = 0; i < resources.length; i++) {
+			const resource = resources[i];
+			const contentSource = contentFor?.[i];
 			const releaseLock = new DeferredPromise<void>();
 			releaseLockPromises.push(releaseLock);
 
@@ -660,20 +684,37 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 					return;
 				}
 
-				const entry = await this._getOrCreateModifiedFileEntry(resource, NotExistBehavior.Abort, telemetryInfo);
+				let initialContent: string | undefined;
+				if (contentSource) {
+					// Read the before-content from the provided URI instead of disk
+					try {
+						const data = await this._fileService.readFile(contentSource);
+						initialContent = data.value.toString();
+					} catch {
+						initialContent = '';
+					}
+				}
+
+				const entry = await this._getOrCreateModifiedFileEntry(resource, NotExistBehavior.Abort, telemetryInfo, initialContent);
 				if (entry) {
 					await this._acceptStreamingEditsStart(responseModel, undoStopId, resource);
 				}
 
-
 				const notebookUri = CellUri.parse(resource)?.notebook || resource;
 				progress.push(...createOpeningEditCodeBlock(resource, this._notebookService.hasSupportedNotebooks(notebookUri), undoStopId));
 
-				// Save to disk to ensure disk state is current before external edits
-				await entry?.save();
-
-				// Take snapshot of current state
-				snapshots.set(resource, entry && this._getCurrentTextOrNotebookSnapshot(entry));
+				if (initialContent !== undefined) {
+					if (entry) {
+						entry.initialContent = initialContent;
+						await entry.resetEditTrackerToInitialContent(); // in case it's reused
+					}
+					snapshots.set(resource, initialContent);
+				} else {
+					// Save to disk to ensure disk state is current before external edits
+					await entry?.save();
+					// Take snapshot of current state
+					snapshots.set(resource, entry && this._getCurrentTextOrNotebookSnapshot(entry));
+				}
 				entry?.startExternalEdit();
 				acquiredLock.complete();
 
@@ -696,7 +737,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		return progress;
 	}
 
-	async stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]> {
+	async stopExternalEdits(responseModel: IChatResponseModel, operationId: number, contentFor?: URI[]): Promise<IChatProgress[]> {
 		const operation = this._externalEditOperations.get(operationId);
 		if (!operation) {
 			this._logService.warn(`stopExternalEdits called for unknown operation ${operationId}`);
@@ -708,6 +749,18 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		const progress: IChatProgress[] = [];
 
 		try {
+			// Build a map of resource -> contentFor URI
+			const contentForMap = new ResourceMap<URI>();
+			if (contentFor) {
+				let idx = 0;
+				for (const [resource] of operation.snapshots) {
+					if (idx < contentFor.length && contentFor[idx]) {
+						contentForMap.set(resource, contentFor[idx]);
+					}
+					idx++;
+				}
+			}
+
 			// For each resource, compute the diff and create edit parts
 			for (const [resource, beforeSnapshot] of operation.snapshots) {
 				let entry = this._getEntry(resource);
@@ -726,11 +779,21 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 					continue;
 				}
 
-				// Reload from disk to ensure in-memory model is in sync with file system
-				await entry.revertToDisk();
-
-				// Take new snapshot after external changes
-				const afterSnapshot = this._getCurrentTextOrNotebookSnapshot(entry);
+				let afterSnapshot: string;
+				const contentSource = contentForMap.get(resource);
+				if (contentSource) {
+					// Read after-content from the provided URI instead of disk
+					try {
+						const data = await this._fileService.readFile(contentSource);
+						afterSnapshot = data.value.toString();
+					} catch {
+						afterSnapshot = '';
+					}
+				} else {
+					// Reload from disk to ensure in-memory model is in sync with file system
+					await entry.revertToDisk();
+					afterSnapshot = this._getCurrentTextOrNotebookSnapshot(entry) ?? '';
+				}
 
 				// Compute edits from the snapshots
 				let edits: (TextEdit | ICellEditOperation)[] = [];
@@ -783,6 +846,10 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			}
 		}
 
+		progress.push({
+			kind: 'markdownContent',
+			content: new MarkdownString('\n````\n'),
+		});
 
 		return progress;
 	}
@@ -945,6 +1012,10 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		}
 
 		this._entriesObs.set(entriesArr, undefined);
+		this._telemetryService.publicLog2<ChatEditingSessionInfoEvent, ChatEditingSessionInfoClassification>('chatEditing/sessionRestore', {
+			editSessionId: getKeyForChatSessionResource(this.chatSessionResource),
+			...this._countEntryStates(entriesArr),
+		});
 	}
 
 	private async _acceptEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
@@ -981,6 +1052,28 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
+	private _countEntryStates(entries: readonly AbstractChatEditingModifiedFileEntry[]): { entryCount: number; modifiedCount: number; acceptedCount: number; rejectedCount: number } {
+		let entryCount = 0;
+		let modifiedCount = 0;
+		let acceptedCount = 0;
+		let rejectedCount = 0;
+		for (const entry of entries) {
+			entryCount += 1;
+			switch (entry.state.get()) {
+				case ModifiedFileEntryState.Modified:
+					modifiedCount += 1;
+					break;
+				case ModifiedFileEntryState.Accepted:
+					acceptedCount += 1;
+					break;
+				case ModifiedFileEntryState.Rejected:
+					rejectedCount += 1;
+					break;
+			}
+		}
+		return { entryCount, modifiedCount, acceptedCount, rejectedCount };
+	}
+
 	private async _resolve(requestId: string, undoStop: string | undefined, resource: URI): Promise<void> {
 		const hasOtherTasks = Iterable.some(this._streamingEditLocks.keys(), k => k !== resource.toString());
 		if (!hasOtherTasks) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.ts b/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.ts
new file mode 100644
index 00000000000..9ea827bccff
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.ts
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getMediaMime } from '../../../../base/common/mime.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { localize } from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { extractImagesFromChatRequest, extractImagesFromChatResponse, IChatExtractedImage } from '../common/chatImageExtraction.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/model/chatViewModel.js';
+import { IChatWidgetService } from './chat.js';
+
+export const IChatImageCarouselService = createDecorator<IChatImageCarouselService>('chatImageCarouselService');
+
+export interface IChatImageCarouselService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Opens the image carousel for the given resource URI, collecting all images
+	 * from the focused chat widget's responses to populate the carousel.
+	 *
+	 * @param resource The URI of the clicked image to start the carousel at.
+	 * @param data Optional raw image data (e.g. for input attachment images that are Uint8Arrays).
+	 */
+	openCarouselAtResource(resource: URI, data?: Uint8Array): Promise<void>;
+}
+
+//#region Carousel data types
+
+export interface ICarouselImage {
+	readonly id: string;
+	readonly name: string;
+	readonly mimeType: string;
+	readonly data: Uint8Array;
+	readonly caption?: string;
+}
+
+export interface ICarouselSection {
+	readonly title: string;
+	readonly images: ICarouselImage[];
+}
+
+export interface ICarouselCollectionArgs {
+	readonly collection: {
+		readonly id: string;
+		readonly title: string;
+		readonly sections: ICarouselSection[];
+	};
+	readonly startIndex: number;
+}
+
+export interface ICarouselSingleImageArgs {
+	readonly name: string;
+	readonly mimeType: string;
+	readonly data: Uint8Array;
+	readonly title: string;
+}
+
+//#endregion
+
+//#region Testable helper functions
+
+/**
+ * Collects all carousel image sections from chat items.
+ * Each request/response pair with images becomes one section containing
+ * user attachment images, tool invocation images, and inline reference images.
+ */
+export async function collectCarouselSections(
+	items: (IChatRequestViewModel | IChatResponseViewModel)[],
+	readFile: (uri: URI) => Promise<Uint8Array>,
+): Promise<ICarouselSection[]> {
+	const sections: ICarouselSection[] = [];
+
+	// Build a map from request id to request VM for pairing
+	const requestMap = new Map<string, IChatRequestViewModel>();
+	for (const item of items) {
+		if (isRequestVM(item)) {
+			requestMap.set(item.id, item);
+		}
+	}
+
+	for (const item of items) {
+		if (!isResponseVM(item)) {
+			continue;
+		}
+
+		const { title: extractedTitle, images: responseImages } = await extractImagesFromChatResponse(item, async uri => VSBuffer.wrap(await readFile(uri)));
+
+		// Also collect images from the corresponding user request
+		const request = requestMap.get(item.requestId);
+		const requestImages = request ? extractImagesFromChatRequest(request) : [];
+
+		const allImages = [...requestImages, ...responseImages];
+		const dedupedImages = deduplicateConsecutiveImages(allImages);
+		if (dedupedImages.length > 0) {
+			sections.push({
+				title: request?.messageText ?? extractedTitle,
+				images: dedupedImages.map(({ uri, name, mimeType, data, caption }) => ({ id: uri.toString(), name, mimeType, data: data.buffer, caption }))
+			});
+		}
+	}
+
+	// Handle requests that have no response yet (e.g. pending requests with image attachments)
+	const respondedRequestIds = new Set(
+		items.filter(isResponseVM).map(r => r.requestId)
+	);
+	for (const item of items) {
+		if (!isRequestVM(item) || respondedRequestIds.has(item.id)) {
+			continue;
+		}
+		const requestImages = extractImagesFromChatRequest(item);
+		const dedupedImages = deduplicateConsecutiveImages(requestImages);
+		if (dedupedImages.length > 0) {
+			sections.push({
+				title: item.messageText,
+				images: dedupedImages.map(({ uri, name, mimeType, data, caption }) => ({ id: uri.toString(), name, mimeType, data: data.buffer, caption }))
+			});
+		}
+	}
+
+	return sections;
+}
+
+/**
+ * Removes consecutive images with the same URI, keeping only the first occurrence
+ * of each run of duplicates.
+ */
+function deduplicateConsecutiveImages(images: IChatExtractedImage[]): IChatExtractedImage[] {
+	return images.filter((img, index) => {
+		if (index === 0) {
+			return true;
+		}
+		return !isEqual(images[index - 1].uri, img.uri);
+	});
+}
+
+/**
+ * Finds the global index of the clicked image across all carousel sections.
+ * Tries URI string match, then parsed URI equality, then data buffer equality.
+ */
+export function findClickedImageIndex(
+	sections: ICarouselSection[],
+	resource: URI,
+	data?: Uint8Array,
+): number {
+	let globalOffset = 0;
+
+	for (const section of sections) {
+		const localIndex = findImageInListByUri(section.images, resource);
+		if (localIndex >= 0) {
+			return globalOffset + localIndex;
+		}
+		globalOffset += section.images.length;
+	}
+
+	if (!data) {
+		return -1;
+	}
+
+	globalOffset = 0;
+	for (const section of sections) {
+		const localIndex = findImageInListByData(section.images, data);
+		if (localIndex >= 0) {
+			return globalOffset + localIndex;
+		}
+		globalOffset += section.images.length;
+	}
+
+	return -1;
+}
+
+function findImageInListByUri(
+	images: ICarouselImage[],
+	resource: URI,
+): number {
+	// Try matching by URI string (for inline references and tool images with URIs)
+	const uriStr = resource.toString();
+	const byUri = images.findIndex(img => img.id === uriStr);
+	if (byUri >= 0) {
+		return byUri;
+	}
+
+	// Try matching by parsed URI equality (for tool invocation images with generated URIs)
+	const byParsedUri = images.findIndex(img => {
+		try {
+			return isEqual(URI.parse(img.id), resource);
+		} catch {
+			return false;
+		}
+	});
+	if (byParsedUri >= 0) {
+		return byParsedUri;
+	}
+
+	return -1;
+}
+
+function findImageInListByData(images: ICarouselImage[], data: Uint8Array): number {
+	const wrapped = VSBuffer.wrap(data);
+	return images.findIndex(img => VSBuffer.wrap(img.data).equals(wrapped));
+}
+
+/**
+ * Builds the collection arguments for the carousel command.
+ */
+export function buildCollectionArgs(
+	sections: ICarouselSection[],
+	clickedGlobalIndex: number,
+	sessionResource: URI,
+): ICarouselCollectionArgs {
+	const collectionId = sessionResource.toString() + '_carousel';
+	const defaultTitle = localize('chatImageCarousel.allImages', "Conversation Images");
+	return {
+		collection: {
+			id: collectionId,
+			title: sections.length === 1
+				? (sections[0].title || defaultTitle)
+				: defaultTitle,
+			sections,
+		},
+		startIndex: clickedGlobalIndex,
+	};
+}
+
+/**
+ * Builds the single-image arguments for the carousel command.
+ */
+export function buildSingleImageArgs(resource: URI, data: Uint8Array): ICarouselSingleImageArgs {
+	const name = resource.path.split('/').pop() ?? 'image';
+	const mimeType = getMediaMime(resource.path) ?? getMediaMime(name) ?? 'image/png';
+	return { name, mimeType, data, title: name };
+}
+
+//#endregion
+
+const CAROUSEL_COMMAND = 'workbench.action.chat.openImageInCarousel';
+
+export class ChatImageCarouselService implements IChatImageCarouselService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IFileService private readonly fileService: IFileService,
+	) { }
+
+	async openCarouselAtResource(resource: URI, data?: Uint8Array): Promise<void> {
+		const widget = this.chatWidgetService.lastFocusedWidget;
+		if (!widget?.viewModel) {
+			await this.openSingleImage(resource, data);
+			return;
+		}
+
+		const items = widget.viewModel.getItems().filter(
+			(item): item is IChatRequestViewModel | IChatResponseViewModel => isRequestVM(item) || isResponseVM(item)
+		);
+		const readFile = async (uri: URI) => (await this.fileService.readFile(uri)).value.buffer;
+		const sections = await collectCarouselSections(items, readFile);
+		const clickedGlobalIndex = findClickedImageIndex(sections, resource, data);
+
+		if (clickedGlobalIndex === -1 || sections.length === 0) {
+			await this.openSingleImage(resource, data);
+			return;
+		}
+
+		const args = buildCollectionArgs(sections, clickedGlobalIndex, widget.viewModel.sessionResource);
+		await this.commandService.executeCommand(CAROUSEL_COMMAND, args);
+	}
+
+	private async openSingleImage(resource: URI, data?: Uint8Array): Promise<void> {
+		if (!data) {
+			const content = await this.fileService.readFile(resource);
+			data = content.value.buffer;
+		}
+
+		const args = buildSingleImageArgs(resource, data);
+		await this.commandService.executeCommand(CAROUSEL_COMMAND, args);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatImageUtils.ts b/src/vs/workbench/contrib/chat/browser/chatImageUtils.ts
index 89f1ecb1225..62f7c38ec24 100644
--- a/src/vs/workbench/contrib/chat/browser/chatImageUtils.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatImageUtils.ts
@@ -8,6 +8,7 @@ import { joinPath } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 
 /**
  * Resizes an image provided as a UInt8Array string. Resizing is based on Open AI's algorithm for tokenzing images.
@@ -160,3 +161,10 @@ function getTimestampFromFilename(filename: string): number | undefined {
 	}
 	return undefined;
 }
+
+CommandsRegistry.registerCommand('_chat.resizeImage', async (_accessor, data: Uint8Array | VSBuffer, mimeType?: string): Promise<Uint8Array> => {
+	if (data instanceof VSBuffer) {
+		data = data.buffer;
+	}
+	return resizeImage(data, mimeType);
+});
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts
index 4a779592644..ed535454fa6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts
@@ -15,7 +15,7 @@ import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { IEditorPaneRegistry, EditorPaneDescriptor } from '../../../../browser/editor.js';
 import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../../../../common/editor.js';
 import { EditorInput } from '../../../../common/editor/editorInput.js';
-import { IEditorService, MODAL_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { ResourceContextKey } from '../../../../common/contextkeys.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { CONTEXT_MODELS_EDITOR, CONTEXT_MODELS_SEARCH_FOCUS, MANAGE_CHAT_COMMAND_ID } from '../../common/constants.js';
@@ -142,7 +142,7 @@ class ChatManagementActionsContribution extends Disposable implements IWorkbench
 			async run(accessor: ServicesAccessor, args: string | IOpenManageCopilotEditorActionOptions) {
 				const editorService = accessor.get(IEditorService);
 				args = sanitizeOpenManageCopilotEditorArgs(args);
-				return editorService.openEditor(new ModelsManagementEditorInput(), { pinned: true }, MODAL_GROUP);
+				return editorService.openEditor(new ModelsManagementEditorInput(), { pinned: true });
 			}
 		}));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditorInput.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditorInput.ts
index 1ab25995221..dd1f06bcee5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditorInput.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditorInput.ts
@@ -7,7 +7,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import * as nls from '../../../../../nls.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
-import { IUntypedEditorInput } from '../../../../common/editor.js';
+import { EditorInputCapabilities, IUntypedEditorInput } from '../../../../common/editor.js';
 import { EditorInput } from '../../../../common/editor/editorInput.js';
 
 const ChatManagementEditorIcon = registerIcon('ai-management-editor-label-icon', Codicon.copilot, nls.localize('aiManagementEditorLabelIcon', 'Icon of the AI Management editor label.'));
@@ -53,6 +53,10 @@ export class ModelsManagementEditorInput extends EditorInput {
 
 	readonly resource = undefined;
 
+	override get capabilities(): EditorInputCapabilities {
+		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.RequiresModal;
+	}
+
 	constructor() {
 		super();
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
index a75b18c6535..f362516fa9a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
@@ -792,6 +792,21 @@ class ActionsColumnRenderer extends ModelsTableColumnRenderer<IActionsColumnTemp
 	}
 
 	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: IActionsColumnTemplateData): void {
+		const configActions = this.languageModelsService.getModelConfigurationActions(entry.model.identifier);
+		if (configActions.length === 0 && !entry.model.metadata.configurationSchema) {
+			return;
+		}
+
+		const secondaryActions: IAction[] = [...configActions];
+
+		// Always add "Configure..." as fallback for complex properties
+		secondaryActions.push(toAction({
+			id: 'configureModel',
+			label: localize('models.configureModel', 'Configure...'),
+			run: () => this.languageModelsService.configureModel(entry.model.identifier)
+		}));
+
+		templateData.actionBar.setActions([], secondaryActions);
 	}
 }
 
@@ -845,6 +860,10 @@ export class ChatModelsWidget extends Disposable {
 	private static NUM_INSTANCES: number = 0;
 
 	readonly element: HTMLElement;
+
+	private readonly _onDidChangeItemCount = this._register(new Emitter<number>());
+	readonly onDidChangeItemCount = this._onDidChangeItemCount.event;
+
 	private searchWidget!: SuggestEnabledInput;
 	private searchActionsContainer!: HTMLElement;
 	private table!: WorkbenchTable<IViewModelEntry>;
@@ -1177,6 +1196,15 @@ export class ChatModelsWidget extends Disposable {
 					run: () => this.viewModel.setModelsVisibility(selectedModelEntries, true)
 				}));
 
+				// Show per-model configuration actions for a single model
+				if (selectedModelEntries.length === 1) {
+					const configActions = this.languageModelsService.getModelConfigurationActions(selectedModelEntries[0].model.identifier);
+					if (configActions.length) {
+						actions.push(new Separator());
+						actions.push(...configActions);
+					}
+				}
+
 				// Show configure action if all models are from the same group
 				configureGroup = selectedModelEntries[0].model.provider.group.name;
 				configureVendor = selectedModelEntries[0].model.provider.vendor;
@@ -1237,8 +1265,10 @@ export class ChatModelsWidget extends Disposable {
 		}));
 
 		this.table.splice(0, this.table.length, this.viewModel.viewModelEntries);
+		this._onDidChangeItemCount.fire(this.itemCount);
 		this.tableDisposables.add(this.viewModel.onDidChange(({ at, removed, added }) => {
 			this.table.splice(at, removed, added);
+			this._onDidChangeItemCount.fire(this.itemCount);
 			if (this.viewModel.selectedEntry) {
 				const selectedEntryIndex = this.viewModel.viewModelEntries.indexOf(this.viewModel.selectedEntry);
 				this.table.setFocus([selectedEntryIndex]);
@@ -1332,4 +1362,21 @@ export class ChatModelsWidget extends Disposable {
 		}
 	}
 
+	/**
+	 * Gets the total model count (excluding vendor/group/status headers).
+	 */
+	get itemCount(): number {
+		return this.viewModel.viewModelEntries
+			.filter(e => !isLanguageModelProviderEntry(e) && !isLanguageModelGroupEntry(e) && !isStatusEntry(e))
+			.length;
+	}
+
+	/**
+	 * Re-fires the current item count. Call after subscribing to onDidChangeItemCount
+	 * to ensure the subscriber receives the latest count.
+	 */
+	fireItemCount(): void {
+		this._onDidChangeItemCount.fire(this.itemCount);
+	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
index 63e9a52fb99..2aa815bec0e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
@@ -7,9 +7,9 @@ import { sep } from '../../../../../base/common/path.js';
 import { AsyncIterableProducer, raceCancellationError } from '../../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { AsyncEmitter, Emitter, Event } from '../../../../../base/common/event.js';
-import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../../base/common/map.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import * as resources from '../../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
@@ -31,26 +31,30 @@ import { ExtensionsRegistry } from '../../../../services/extensions/common/exten
 import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
 import { IChatAgentAttachmentCapabilities, IChatAgentData, IChatAgentService } from '../../common/participants/chatAgents.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
-import { IChatNewSessionRequest, IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemController, IChatSessionOptionsWillNotifyExtensionEvent, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsExtensionPoint, IChatSessionsService, isSessionInProgressStatus, ResolvedChatSessionsExtensionPoint } from '../../common/chatSessionsService.js';
+import { ChatSessionOptionsMap, IChatNewSessionRequest, IChatSession, IChatSessionContentProvider, IChatSessionCustomizationItemGroup, IChatSessionCustomizationsProvider, IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta, IChatSessionOptionsChangeEvent, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionRequestHistoryItem, IChatSessionsExtensionPoint, IChatSessionsService, isSessionInProgressStatus, ReadonlyChatSessionOptionsMap, ResolvedChatSessionsExtensionPoint } from '../../common/chatSessionsService.js';
 import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
 import { IChatModel } from '../../common/model/chatModel.js';
 import { IChatService, IChatToolInvocation } from '../../common/chatService/chatService.js';
 import { autorun, observableFromEvent } from '../../../../../base/common/observable.js';
-import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IChatRequestVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../../common/attachments/chatVariableEntries.js';
 import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
 import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { ChatViewId } from '../chat.js';
 import { ChatViewPane } from '../widgetHosts/viewPane/chatViewPane.js';
-import { AgentSessionProviders, getAgentSessionProviderName } from '../agentSessions/agentSessions.js';
+import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderName } from '../agentSessions/agentSessions.js';
 import { BugIndicatingError, isCancellationError } from '../../../../../base/common/errors.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { isUntitledChatSession, LocalChatSessionUri } from '../../common/model/chatUri.js';
 import { assertNever } from '../../../../../base/common/assert.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { Target } from '../../common/promptSyntax/promptTypes.js';
+import { slashReg } from '../../common/requestParser/chatRequestParser.js';
+import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.js';
 
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsExtensionPoint[]>({
 	extensionPoint: 'chatSessions',
@@ -83,7 +87,7 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsEx
 					type: 'string'
 				},
 				icon: {
-					description: localize('chatSessionsExtPoint.icon', 'Icon identifier (codicon ID) for the chat session editor tab. For example, "$(github)" or "$(cloud)".'),
+					description: localize('chatSessionsExtPoint.icon', 'Icon identifier (codicon ID) for the chat session editor tab. For example, "{0}" or "{1}".', '$(github)', '$(cloud)'),
 					anyOf: [{
 						type: 'string'
 					},
@@ -216,6 +220,16 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsEx
 					description: localize('chatSessionsExtPoint.requiresCustomModels', 'When set, the chat session will show a filtered model picker that prefers custom models. This enables the use of standard model picker with contributed sessions.'),
 					type: 'boolean',
 					default: false
+				},
+				autoAttachReferences: {
+					description: localize('chatSessionsExtPoint.autoAttachReferences', 'Whether to automatically attach instruction files to chat requests for this session type.'),
+					type: 'boolean',
+					default: false
+				},
+				useRequestToPopulateBuiltInPickers: {
+					description: localize('chatSessionsExtPoint.useRequestToPopulateBuiltInPickers', 'Whether to use ChatRequestTurn2 to populate built-in pickers such as the Agent and Model pickers.'),
+					type: 'boolean',
+					default: false
 				}
 			},
 			required: ['type', 'name', 'displayName', 'description'],
@@ -230,10 +244,13 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsEx
 
 class ContributedChatSessionData extends Disposable {
 
-	private readonly _optionsCache: Map<string /* 'models' */, string | IChatSessionProviderOptionItem>;
+	private readonly _optionsCache: ChatSessionOptionsMap;
 	public getOption(optionId: string): string | IChatSessionProviderOptionItem | undefined {
 		return this._optionsCache.get(optionId);
 	}
+	public getAllOptions(): IterableIterator<[string, string | IChatSessionProviderOptionItem]> {
+		return this._optionsCache.entries();
+	}
 	public setOption(optionId: string, value: string | IChatSessionProviderOptionItem): void {
 		this._optionsCache.set(optionId, value);
 	}
@@ -242,17 +259,12 @@ class ContributedChatSessionData extends Disposable {
 		readonly session: IChatSession,
 		readonly chatSessionType: string,
 		readonly resource: URI,
-		readonly options: Record<string, string | IChatSessionProviderOptionItem> | undefined,
+		readonly options: ReadonlyChatSessionOptionsMap | undefined,
 		private readonly onWillDispose: (resource: URI) => void
 	) {
 		super();
 
-		this._optionsCache = new Map<string, string | IChatSessionProviderOptionItem>();
-		if (options) {
-			for (const [key, value] of Object.entries(options)) {
-				this._optionsCache.set(key, value);
-			}
-		}
+		this._optionsCache = new Map(options);
 
 		this._register(this.session.onWillDispose(() => {
 			this.onWillDispose(this.resource);
@@ -266,7 +278,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 
 	private readonly _itemControllers = new Map</* type */ string, { readonly controller: IChatSessionItemController; readonly initialRefresh: Promise<void> }>();
 
-	private readonly _contributions: Map</* type */ string, { readonly contribution: IChatSessionsExtensionPoint; readonly extension: IRelaxedExtensionDescription }> = new Map();
+	private readonly _contributions: Map</* type */ string, { readonly contribution: IChatSessionsExtensionPoint; readonly extension: IRelaxedExtensionDescription | undefined }> = new Map();
 	private readonly _contributionDisposables = this._register(new DisposableMap</* type */ string>());
 
 	private readonly _contentProviders: Map</* scheme */ string, IChatSessionContentProvider> = new Map();
@@ -276,7 +288,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	private readonly _onDidChangeItemsProviders = this._register(new Emitter<{ readonly chatSessionType: string }>());
 	readonly onDidChangeItemsProviders = this._onDidChangeItemsProviders.event;
 
-	private readonly _onDidChangeSessionItems = this._register(new Emitter<{ readonly chatSessionType: string }>());
+	private readonly _onDidChangeSessionItems = this._register(new Emitter<IChatSessionItemsDelta>());
 	readonly onDidChangeSessionItems = this._onDidChangeSessionItems.event;
 
 	private readonly _onDidChangeAvailability = this._register(new Emitter<void>());
@@ -287,20 +299,22 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 
 	private readonly _onDidChangeContentProviderSchemes = this._register(new Emitter<{ readonly added: string[]; readonly removed: string[] }>());
 	public get onDidChangeContentProviderSchemes() { return this._onDidChangeContentProviderSchemes.event; }
-	private readonly _onDidChangeSessionOptions = this._register(new Emitter<URI>());
+	private readonly _onDidChangeSessionOptions = this._register(new Emitter<IChatSessionOptionsChangeEvent>());
 	public get onDidChangeSessionOptions() { return this._onDidChangeSessionOptions.event; }
 	private readonly _onDidChangeOptionGroups = this._register(new Emitter<string>());
 	public get onDidChangeOptionGroups() { return this._onDidChangeOptionGroups.event; }
-	private readonly _onRequestNotifyExtension = this._register(new AsyncEmitter<IChatSessionOptionsWillNotifyExtensionEvent>());
-	public get onRequestNotifyExtension() { return this._onRequestNotifyExtension.event; }
 
-	private readonly inProgressMap: Map<string, number> = new Map();
-	private readonly _sessionTypeOptions: Map<string, IChatSessionProviderOptionGroup[]> = new Map();
-	private readonly _sessionTypeNewSessionOptions: Map<string, Record<string, string | IChatSessionProviderOptionItem>> = new Map();
+	private readonly inProgressMap = new Map</* chatSessionType */ string, number>();
+	private readonly _sessionTypeOptions = new Map<string, IChatSessionProviderOptionGroup[]>();
+	private readonly _sessionTypeNewSessionOptions = new Map</* sessionType */string, ChatSessionOptionsMap>();
 
 	private readonly _sessions = new ResourceMap<ContributedChatSessionData>();
 	private readonly _resourceAliases = new ResourceMap<URI>(); // real resource -> untitled resource
 
+	private readonly _customizationsProviders = new Map<string, IChatSessionCustomizationsProvider>();
+	private readonly _onDidChangeCustomizations = this._register(new Emitter<{ readonly chatSessionType: string }>());
+	readonly onDidChangeCustomizations = this._onDidChangeCustomizations.event;
+
 	private readonly _hasCanDelegateProvidersKey: IContextKey<boolean>;
 
 	constructor(
@@ -338,24 +352,33 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		const builtinSessionProviders = [AgentSessionProviders.Local];
 		const contributedSessionProviders = observableFromEvent(
 			this.onDidChangeAvailability,
-			() => Array.from(this._contributions.keys()).filter(key => this._contributionDisposables.has(key) && isAgentSessionProviderType(key)) as AgentSessionProviders[],
+			() => Array.from(this._contributions.keys()).filter(key => this._contributionDisposables.has(key)),
 		).recomputeInitiallyAndOnChange(this._store);
 
 		this._register(autorun(reader => {
-			const activatedProviders = [...builtinSessionProviders, ...contributedSessionProviders.read(reader)];
-			for (const provider of Object.values(AgentSessionProviders)) {
-				if (activatedProviders.includes(provider)) {
-					reader.store.add(registerNewSessionInPlaceAction(provider, getAgentSessionProviderName(provider)));
+			const activatedProviders = contributedSessionProviders.read(reader);
+
+			// Register in-place actions for built-in enum providers
+			for (const provider of builtinSessionProviders) {
+				reader.store.add(registerNewSessionInPlaceAction(provider, getAgentSessionProviderName(provider)));
+			}
+
+			for (const type of activatedProviders) {
+				// TODO: Remove hardcoded providers from core
+				const knownProvider = getAgentSessionProvider(type);
+				if (knownProvider) {
+					// Well-known provider — use hardcoded name
+					reader.store.add(registerNewSessionInPlaceAction(type, getAgentSessionProviderName(knownProvider)));
+				} else {
+					// Extension-contributed — use contribution metadata
+					const contrib = this._contributions.get(type);
+					if (contrib) {
+						reader.store.add(registerNewSessionInPlaceAction(type, contrib.contribution.displayName ?? contrib.contribution.name ?? type));
+					}
 				}
 			}
 		}));
 
-		this._register(this.onDidChangeSessionItems(({ chatSessionType }) => {
-			this.updateInProgressStatus(chatSessionType).catch(error => {
-				this._logService.warn(`Failed to update progress status for '${chatSessionType}':`, error);
-			});
-		}));
-
 		this._register(this._labelService.registerFormatter({
 			scheme: Schemas.copilotPr,
 			formatting: {
@@ -366,27 +389,17 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		}));
 	}
 
-	public reportInProgress(chatSessionType: string, count: number): void {
-		let displayName: string | undefined;
-
-		if (chatSessionType === AgentSessionProviders.Local) {
-			displayName = localize('chat.session.inProgress.local', "Local Agent");
-		} else if (chatSessionType === AgentSessionProviders.Background) {
-			displayName = localize('chat.session.inProgress.background', "Background Agent");
-		} else if (chatSessionType === AgentSessionProviders.Cloud) {
-			displayName = localize('chat.session.inProgress.cloud', "Cloud Agent");
-		} else {
-			displayName = this._contributions.get(chatSessionType)?.contribution.displayName;
+	private reportInProgress(chatSessionType: string, count: number): void {
+		if (!this._itemControllers.has(chatSessionType)) {
+			this._logService.warn(`Attempted to report in-progress status for unknown chat session type '${chatSessionType}'`);
 		}
 
-		if (displayName) {
-			this.inProgressMap.set(displayName, count);
-		}
+		this.inProgressMap.set(chatSessionType, count);
 		this._onDidChangeInProgress.fire();
 	}
 
-	public getInProgress(): { displayName: string; count: number }[] {
-		return Array.from(this.inProgressMap.entries()).map(([displayName, count]) => ({ displayName, count }));
+	public getInProgress(): { chatSessionType: string; count: number }[] {
+		return Array.from(this.inProgressMap.entries()).map(([chatSessionType, count]) => ({ chatSessionType, count }));
 	}
 
 	private async updateInProgressStatus(chatSessionType: string): Promise<void> {
@@ -403,9 +416,9 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 	private registerContribution(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): IDisposable {
-		this._logService.info(`[ChatSessionsService] registerContribution called for type='${contribution.type}', canDelegate=${contribution.canDelegate}, when='${contribution.when}', extension='${ext.identifier.value}'`);
+		this._logService.trace(`[ChatSessionsService] registerContribution called for type='${contribution.type}', canDelegate=${contribution.canDelegate}, when='${contribution.when}', extension='${ext.identifier.value}'`);
 		if (this._contributions.has(contribution.type)) {
-			this._logService.info(`[ChatSessionsService] registerContribution: type='${contribution.type}' already registered, skipping`);
+			this._logService.trace(`[ChatSessionsService] registerContribution: type='${contribution.type}' already registered, skipping`);
 			return Disposable.None;
 		}
 
@@ -535,13 +548,22 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 
 				async run(accessor: ServicesAccessor, chatOptions?: { resource: UriComponents; prompt: string; attachedContext?: IChatRequestVariableEntry[] }): Promise<void> {
 					const chatService = accessor.get(IChatService);
+					const promptsService = accessor.get(IPromptsService);
+					const toolsService = accessor.get(ILanguageModelToolsService);
 					const { type } = contribution;
 
 					if (chatOptions) {
+						let attachedContext = chatOptions.attachedContext;
+
 						const resource = URI.revive(chatOptions.resource);
 						const ref = await chatService.acquireOrLoadSession(resource, ChatAgentLocation.Chat, CancellationToken.None);
 						try {
-							const result = await chatService.sendRequest(resource, chatOptions.prompt, { agentIdSilent: type, attachedContext: chatOptions.attachedContext });
+							const promptFile = await resolvePromptSlashCommand(chatOptions.prompt, promptsService, toolsService);
+							if (promptFile) {
+								attachedContext = [promptFile, ...(attachedContext ?? [])];
+							}
+
+							const result = await chatService.sendRequest(resource, chatOptions.prompt, { agentIdSilent: type, attachedContext });
 							if (result.kind === 'queued') {
 								await result.deferred;
 							} else if (result.kind === 'sent') {
@@ -597,7 +619,11 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 	private _evaluateAvailability(): void {
-		let hasChanges = false;
+		const newlyEnabledChatSessionTypes = new Set<string>();
+		const newlyDisabledChatSessionTypes = new Set<string>();
+
+		const disposedChatSessions = new ResourceSet();
+
 		for (const { contribution, extension } of this._contributions.values()) {
 			const isCurrentlyRegistered = this._contributionDisposables.has(contribution.type);
 			const shouldBeRegistered = this._isContributionAvailable(contribution);
@@ -607,28 +633,34 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 				this._contributionDisposables.deleteAndDispose(contribution.type);
 
 				// Also dispose any cached sessions for this contribution
-				this._disposeSessionsForContribution(contribution.type);
-				hasChanges = true;
+				for (const sessionResource of this._disposeSessionsForContribution(contribution.type)) {
+					disposedChatSessions.add(sessionResource);
+				}
+
+				newlyDisabledChatSessionTypes.add(contribution.type);
 			} else if (!isCurrentlyRegistered && shouldBeRegistered) {
 				// Enable the contribution by registering it
-				this._enableContribution(contribution, extension);
-				hasChanges = true;
+				if (extension) {
+					this._enableContribution(contribution, extension);
+				}
+				newlyEnabledChatSessionTypes.add(contribution.type);
 			}
 		}
-		if (hasChanges) {
+		if (newlyEnabledChatSessionTypes.size > 0 || newlyDisabledChatSessionTypes.size > 0) {
 			this._onDidChangeAvailability.fire();
-			for (const chatSessionType of this._itemControllers.keys()) {
+			for (const chatSessionType of [...newlyEnabledChatSessionTypes, ...newlyDisabledChatSessionTypes]) {
 				this._onDidChangeItemsProviders.fire({ chatSessionType });
 			}
-			for (const { contribution } of this._contributions.values()) {
-				this._onDidChangeSessionItems.fire({ chatSessionType: contribution.type });
+
+			if (disposedChatSessions.size > 0) {
+				this._onDidChangeSessionItems.fire({ removed: Array.from(disposedChatSessions) });
 			}
 		}
 		this._updateHasCanDelegateProvidersContextKey();
 	}
 
 	private _enableContribution(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): void {
-		this._logService.info(`[ChatSessionsService] _enableContribution: type='${contribution.type}', canDelegate=${contribution.canDelegate}`);
+		this._logService.trace(`[ChatSessionsService] _enableContribution: type='${contribution.type}', canDelegate=${contribution.canDelegate}`);
 		const disposableStore = new DisposableStore();
 		this._contributionDisposables.set(contribution.type, disposableStore);
 		if (contribution.canDelegate) {
@@ -638,7 +670,12 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		disposableStore.add(this._registerMenuItems(contribution, ext));
 	}
 
-	private _disposeSessionsForContribution(contributionId: string): void {
+	/**
+	 * Disposes of all sessions that belong to a contribution
+	 *
+	 * @returns List of session resources that were disposed.
+	 */
+	private _disposeSessionsForContribution(contributionId: string): URI[] {
 		// Find and dispose all sessions that belong to this contribution
 		const sessionsToDispose: URI[] = [];
 		for (const [sessionResource, sessionData] of this._sessions) {
@@ -657,6 +694,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 				sessionData.dispose(); // This will call _onWillDisposeSession and clean up
 			}
 		}
+		return sessionsToDispose;
 	}
 
 	private _registerAgent(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): IDisposable {
@@ -720,14 +758,14 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		return this.resolveChatSessionContribution(entry.extension, entry.contribution);
 	}
 
-	private resolveChatSessionContribution(ext: IRelaxedExtensionDescription, contribution: IChatSessionsExtensionPoint) {
+	private resolveChatSessionContribution(ext: IRelaxedExtensionDescription | undefined, contribution: IChatSessionsExtensionPoint) {
 		return {
 			...contribution,
 			icon: this.resolveIconForCurrentColorTheme(this.getContributionIcon(ext, contribution)),
 		};
 	}
 
-	private getContributionIcon(ext: IRelaxedExtensionDescription, contribution: IChatSessionsExtensionPoint): ThemeIcon | { light: URI; dark: URI } | undefined {
+	private getContributionIcon(ext: IRelaxedExtensionDescription | undefined, contribution: IChatSessionsExtensionPoint): ThemeIcon | { light: URI; dark: URI } | undefined {
 		if (!contribution.icon) {
 			return undefined;
 		}
@@ -737,8 +775,8 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 				: ThemeIcon.fromId(contribution.icon);
 		}
 		return {
-			dark: resources.joinPath(ext.extensionLocation, contribution.icon.dark),
-			light: resources.joinPath(ext.extensionLocation, contribution.icon.light)
+			dark: ext ? resources.joinPath(ext.extensionLocation, contribution.icon.dark) : URI.parse(contribution.icon.dark),
+			light: ext ? resources.joinPath(ext.extensionLocation, contribution.icon.light) : URI.parse(contribution.icon.light)
 		};
 	}
 
@@ -757,6 +795,20 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 
+	registerChatSessionContribution(contribution: IChatSessionsExtensionPoint): IDisposable {
+		if (this._contributions.has(contribution.type)) {
+			return { dispose: () => { } };
+		}
+
+		this._contributions.set(contribution.type, { contribution, extension: undefined });
+		this._onDidChangeAvailability.fire();
+
+		return toDisposable(() => {
+			this._contributions.delete(contribution.type);
+			this._onDidChangeAvailability.fire();
+		});
+	}
+
 	async activateChatSessionItemProvider(chatViewType: string): Promise<void> {
 		await this.doActivateChatSessionItemController(chatViewType);
 	}
@@ -846,17 +898,26 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		await this.tryActivateControllers(providersToResolve);
 
 		await Promise.all(Array.from(this._itemControllers).map(async ([chatSessionType, controllerEntry]) => {
+			const resolvedType = this._resolveToPrimaryType(chatSessionType) ?? chatSessionType;
+			if (providersToResolve && !providersToResolve.includes(resolvedType)) {
+				return; // skip: not considered for resolving
+			}
+
 			try {
 				await controllerEntry.controller.refresh(token);
 			} catch (err) {
 				if (!isCancellationError(err)) {
 					// Log error but continue with other providers
-					this._logService.error(`[ChatSessionsService] Failed to resolve sessions for provider ${chatSessionType}`, err);
+					this._logService.error(`[ChatSessionsService] Failed to resolve sessions for provider ${resolvedType}`, err);
 				}
 			}
 		}));
 	}
 
+	getRegisteredChatSessionItemProviders(): readonly string[] {
+		return [...new Set(Array.from(this._itemControllers.keys()).map(key => this._resolveToPrimaryType(key) ?? key))];
+	}
+
 	registerChatSessionItemController(chatSessionType: string, controller: IChatSessionItemController): IDisposable {
 		const disposables = new DisposableStore();
 
@@ -866,14 +927,11 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		this._itemControllers.set(chatSessionType, { controller, initialRefresh: controller.refresh(initialRefreshCts.token) });
 		this._onDidChangeItemsProviders.fire({ chatSessionType });
 
-		disposables.add(controller.onDidChangeChatSessionItems(() => {
-			this._onDidChangeSessionItems.fire({ chatSessionType });
+		disposables.add(controller.onDidChangeChatSessionItems(e => {
+			this._onDidChangeSessionItems.fire(e);
+			this.updateInProgressStatus(chatSessionType);
 		}));
 
-		this.updateInProgressStatus(chatSessionType).catch(error => {
-			this._logService.warn(`Failed to update initial progress status for '${chatSessionType}':`, error);
-		});
-
 		return {
 			dispose: () => {
 				initialRefreshCts.cancel();
@@ -884,6 +942,9 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 					this._itemControllers.delete(chatSessionType);
 					this._onDidChangeItemsProviders.fire({ chatSessionType });
 				}
+
+				// Remove any in-progress tracking for this provider since it's no longer available
+				this.updateInProgressStatus(chatSessionType);
 			}
 		};
 	}
@@ -913,6 +974,31 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		};
 	}
 
+	registerCustomizationsProvider(chatSessionType: string, provider: IChatSessionCustomizationsProvider): IDisposable {
+		this._customizationsProviders.set(chatSessionType, provider);
+		const onChangeDisposable = provider.onDidChangeCustomizations(() => {
+			this._onDidChangeCustomizations.fire({ chatSessionType });
+		});
+		return toDisposable(() => {
+			onChangeDisposable.dispose();
+			if (this._customizationsProviders.get(chatSessionType) === provider) {
+				this._customizationsProviders.delete(chatSessionType);
+			}
+		});
+	}
+
+	hasCustomizationsProvider(chatSessionType: string): boolean {
+		return this._customizationsProviders.has(chatSessionType);
+	}
+
+	async getCustomizations(chatSessionType: string, token: CancellationToken): Promise<IChatSessionCustomizationItemGroup[] | undefined> {
+		const provider = this._customizationsProviders.get(chatSessionType);
+		if (!provider) {
+			return undefined;
+		}
+		return provider.provideCustomizations(token);
+	}
+
 	public getInProgressSessionDescription(chatModel: IChatModel): string | undefined {
 		const requests = chatModel.getRequests();
 		if (requests.length === 0) {
@@ -1017,8 +1103,10 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 			session = await raceCancellationError(provider.provideChatSessionContent(sessionResource, token), token);
 		}
 
-		for (const [optionId, value] of Object.entries(session.options ?? {})) {
-			this.setSessionOption(sessionResource, optionId, value);
+		if (session.options) {
+			for (const [optionId, value] of session.options) {
+				this.setSessionOption(sessionResource, optionId, value);
+			}
 		}
 
 		// Make sure another session wasn't created while we were awaiting the provider
@@ -1038,14 +1126,28 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		this._sessions.set(sessionResource, sessionData);
 
 		// Make sure any listeners are aware of the new session and its options
-		this._onDidChangeSessionOptions.fire(sessionResource);
+		if (session.options) {
+			this._onDidChangeSessionOptions.fire({ sessionResource, updates: session.options });
+		}
 
 		return session;
 	}
 
 	public hasAnySessionOptions(sessionResource: URI): boolean {
 		const session = this._sessions.get(this._resolveResource(sessionResource));
-		return !!session && !!session.options && Object.keys(session.options).length > 0;
+		return !!session && !!session.options && session.options.size > 0;
+	}
+
+	public getSessionOptions(sessionResource: URI): Map<string, string> | undefined {
+		const session = this._sessions.get(this._resolveResource(sessionResource));
+		if (!session) {
+			return undefined;
+		}
+		const result = new Map<string, string>();
+		for (const [key, value] of session.getAllOptions()) {
+			result.set(key, typeof value === 'string' ? value : value.id);
+		}
+		return result.size > 0 ? result : undefined;
 	}
 
 	public getSessionOption(sessionResource: URI, optionId: string): string | IChatSessionProviderOptionItem | undefined {
@@ -1054,8 +1156,28 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 	public setSessionOption(sessionResource: URI, optionId: string, value: string | IChatSessionProviderOptionItem): boolean {
+		return this.updateSessionOptions(sessionResource, new Map([[optionId, value]]));
+	}
+
+	public updateSessionOptions(sessionResource: URI, updates: ReadonlyChatSessionOptionsMap): boolean {
 		const session = this._sessions.get(this._resolveResource(sessionResource));
-		return !!session?.setOption(optionId, value);
+		if (!session) {
+			return false;
+		}
+
+		let didChange = false;
+		for (const [optionId, value] of updates) {
+			const existingValue = session.getOption(optionId);
+			if (existingValue !== value) {
+				session.setOption(optionId, value);
+				didChange = true;
+			}
+		}
+
+		if (didChange) {
+			this._onDidChangeSessionOptions.fire({ sessionResource, updates: updates });
+		}
+		return didChange;
 	}
 
 	/**
@@ -1090,31 +1212,16 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		return this._sessionTypeOptions.get(chatSessionType);
 	}
 
-	public getNewSessionOptionsForSessionType(chatSessionType: string): Record<string, string | IChatSessionProviderOptionItem> | undefined {
-		return this._sessionTypeNewSessionOptions.get(chatSessionType);
+	public getNewSessionOptionsForSessionType(chatSessionType: string): ReadonlyChatSessionOptionsMap | undefined {
+		const options = this._sessionTypeNewSessionOptions.get(chatSessionType);
+		if (!options || options.size === 0) {
+			return undefined;
+		}
+		return new Map(options);
 	}
 
-	public setNewSessionOptionsForSessionType(chatSessionType: string, options: Record<string, string | IChatSessionProviderOptionItem>): void {
-		this._sessionTypeNewSessionOptions.set(chatSessionType, options);
-	}
-
-	/**
-	 * Notify extension about option changes for a session
-	 */
-	public async notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>): Promise<void> {
-		if (!updates.length) {
-			return;
-		}
-		this._logService.trace(`[ChatSessionsService] notifySessionOptionsChange: starting for ${sessionResource}, ${updates.length} update(s): [${updates.map(u => u.optionId).join(', ')}]`);
-		// Fire event to notify MainThreadChatSessions (which forwards to extension host)
-		// Uses fireAsync to properly await async listener work via waitUntil pattern
-		await this._onRequestNotifyExtension.fireAsync({ sessionResource, updates }, CancellationToken.None);
-		this._logService.trace(`[ChatSessionsService] notifySessionOptionsChange: fireAsync completed for ${sessionResource}`);
-		for (const u of updates) {
-			this.setSessionOption(sessionResource, u.optionId, u.value);
-		}
-		this._onDidChangeSessionOptions.fire(this._resolveResource(sessionResource));
-		this._logService.trace(`[ChatSessionsService] notifySessionOptionsChange: finished for ${sessionResource}`);
+	public setNewSessionOptionsForSessionType(chatSessionType: string, options: ReadonlyChatSessionOptionsMap): void {
+		this._sessionTypeNewSessionOptions.set(chatSessionType, new Map(options));
 	}
 
 	/**
@@ -1139,6 +1246,28 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		return !!contribution?.requiresCustomModels;
 	}
 
+	public supportsDelegationForSessionType(chatSessionType: string): boolean {
+		const contribution = this._contributions.get(chatSessionType)?.contribution;
+		return contribution?.supportsDelegation !== false;
+	}
+
+	public sessionSupportsFork(sessionResource: URI): boolean {
+		const session = this._sessions.get(sessionResource)
+			// Try to resolve in case an alias was used
+			?? this._sessions.get(this._resolveResource(sessionResource));
+		return !!session?.session.forkSession;
+	}
+
+	public async forkChatSession(sessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, token: CancellationToken): Promise<IChatSessionItem> {
+		const session = this._sessions.get(sessionResource)
+			// Try to resolve in case an alias was used
+			?? this._sessions.get(this._resolveResource(sessionResource));
+		if (!session?.session.forkSession) {
+			throw new Error(`Session ${sessionResource.toString()} does not support forking`);
+		}
+		return session.session.forkSession(request, token);
+	}
+
 	public getContentProviderSchemes(): string[] {
 		return Array.from(this._contentProviders.keys());
 	}
@@ -1202,7 +1331,7 @@ export enum ChatSessionPosition {
 type NewChatSessionSendOptions = {
 	readonly prompt: string;
 	readonly attachedContext?: IChatRequestVariableEntry[];
-	readonly initialSessionOptions?: ReadonlyArray<{ optionId: string; value: string | { id: string; name: string } }>;
+	readonly initialSessionOptions?: ReadonlyChatSessionOptionsMap;
 };
 
 export type NewChatSessionOpenOptions = {
@@ -1218,6 +1347,8 @@ async function openChatSession(accessor: ServicesAccessor, openOptions: NewChatS
 	const logService = accessor.get(ILogService);
 	const editorGroupService = accessor.get(IEditorGroupsService);
 	const editorService = accessor.get(IEditorService);
+	const promptsService = accessor.get(IPromptsService);
+	const toolsService = accessor.get(ILanguageModelToolsService);
 
 	// Determine resource to open
 	const resource = getResourceForNewChatSession(openOptions);
@@ -1276,13 +1407,38 @@ async function openChatSession(accessor: ServicesAccessor, openOptions: NewChatS
 					});
 				}
 			}
-			await chatService.sendRequest(resource, chatSendOptions.prompt, { agentIdSilent: openOptions.type, attachedContext: chatSendOptions.attachedContext });
+			let attachedContext = chatSendOptions.attachedContext;
+			const promptFile = await resolvePromptSlashCommand(chatSendOptions.prompt, promptsService, toolsService);
+			if (promptFile) {
+				attachedContext = [promptFile, ...(attachedContext ?? [])];
+			}
+			await chatService.sendRequest(resource, chatSendOptions.prompt, { agentIdSilent: openOptions.type, attachedContext });
 		} catch (e) {
 			logService.error(`Failed to send initial request to '${openOptions.type}' chat session with contextOptions: ${JSON.stringify(chatSendOptions)}`, e);
 		}
 	}
 }
 
+/**
+ * Returns the variable entry for a slash command if the prompt starts with a slash command that can be resolved to a prompt file, otherwise returns undefined.
+ */
+async function resolvePromptSlashCommand(prompt: string, promptsService: IPromptsService, toolsService: ILanguageModelToolsService): Promise<IChatRequestVariableEntry | undefined> {
+	const slashMatch = prompt.match(slashReg);
+	// starts with a slash command, add the corresponding prompt file to the context if it exists
+	if (slashMatch) {
+		// need to resolve the slash command to get the prompt file
+		const slashCommand = await promptsService.resolvePromptSlashCommand(slashMatch[1], CancellationToken.None);
+		if (slashCommand) {
+			const parseResult = slashCommand.parsedPromptFile;
+			// add the prompt file to the context
+			const refs = parseResult.body?.variableReferences.map(({ name, offset }) => ({ name, range: new OffsetRange(offset, offset + name.length + 1) })) ?? [];
+			const toolReferences = toolsService.toToolReferences(refs);
+			return toPromptFileVariableEntry(parseResult.uri, PromptFileVariableKind.PromptFile, undefined, true, toolReferences);
+		}
+	}
+	return undefined;
+}
+
 export function getResourceForNewChatSession(options: NewChatSessionOpenOptions): URI {
 	const isRemoteSession = options.type !== AgentSessionProviders.Local;
 	if (isRemoteSession) {
@@ -1303,4 +1459,3 @@ export function getResourceForNewChatSession(options: NewChatSessionOpenOptions)
 function isAgentSessionProviderType(type: string): boolean {
 	return Object.values(AgentSessionProviders).includes(type as AgentSessionProviders);
 }
-
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts
index fd19654bcef..45145ec7ec3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts
@@ -142,6 +142,7 @@ export class SearchableOptionPickerActionItem extends ChatSessionPickerActionIte
 			quickPick.placeholder = optionGroup.description ?? localize('selectOption.placeholder', "Select {0}", optionGroup.name);
 			quickPick.matchOnDescription = true;
 			quickPick.matchOnDetail = true;
+			quickPick.matchOnLabelMode = 'fuzzy';
 			quickPick.ignoreFocusOut = true;
 			quickPick.busy = true;
 			quickPick.show();
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
index 4a7157945cc..349ffc80a83 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
@@ -232,7 +232,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				});
 			}
 
-			override async run(accessor: ServicesAccessor, mode?: ChatModeKind | string, options?: { forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; inputValue?: string; dialogIcon?: ThemeIcon; dialogTitle?: string; dialogHideSkip?: boolean }): Promise<boolean> {
+			override async run(accessor: ServicesAccessor, mode?: ChatModeKind | string, options?: { forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; inputValue?: string; dialogIcon?: ThemeIcon; dialogTitle?: string }): Promise<boolean> {
 				const widgetService = accessor.get(IChatWidgetService);
 				const instantiationService = accessor.get(IInstantiationService);
 				const dialogService = accessor.get(IDialogService);
@@ -281,7 +281,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				});
 			}
 
-			override async run(accessor: ServicesAccessor, options?: { dialogIcon?: ThemeIcon; dialogTitle?: string; dialogHideSkip?: boolean }): Promise<unknown> {
+			override async run(accessor: ServicesAccessor, options?: { dialogIcon?: ThemeIcon; dialogTitle?: string }): Promise<unknown> {
 				const commandService = accessor.get(ICommandService);
 				const telemetryService = accessor.get(ITelemetryService);
 				const chatEntitlementService = accessor.get(IChatEntitlementService);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.ts
index 1563924cdb3..1382c23832e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupGrowthSession.ts
@@ -14,7 +14,7 @@ import { ICommandService } from '../../../../../platform/commands/common/command
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { ILifecycleService, LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
-import { ChatSessionStatus, IChatSessionItem, IChatSessionItemController, IChatSessionsService } from '../../common/chatSessionsService.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta, IChatSessionsService } from '../../common/chatSessionsService.js';
 import { AgentSessionProviders } from '../agentSessions/agentSessions.js';
 import { IAgentSession } from '../agentSessions/agentSessionsModel.js';
 import { ISessionOpenerParticipant, ISessionOpenOptions, sessionOpenerRegistry } from '../agentSessions/agentSessionsOpener.js';
@@ -36,8 +36,8 @@ export class GrowthSessionController extends Disposable implements IChatSessionI
 
 	private static readonly SESSION_URI = URI.from({ scheme: AgentSessionProviders.Growth, path: '/growth-welcome' });
 
-	private readonly _onDidChangeChatSessionItems = this._register(new Emitter<void>());
-	readonly onDidChangeChatSessionItems: Event<void> = this._onDidChangeChatSessionItems.event;
+	private readonly _onDidChangeChatSessionItems = this._register(new Emitter<IChatSessionItemsDelta>());
+	readonly onDidChangeChatSessionItems = this._onDidChangeChatSessionItems.event;
 
 	private readonly _onDidDismiss = this._register(new Emitter<void>());
 	readonly onDidDismiss: Event<void> = this._onDidDismiss.event;
@@ -103,7 +103,9 @@ export class GrowthSessionController extends Disposable implements IChatSessionI
 		this.storageService.store(GrowthSessionController.STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
 
 		// Fire change event first so that listeners (like the model) see empty items
-		this._onDidChangeChatSessionItems.fire();
+		this._onDidChangeChatSessionItems.fire({
+			removed: [GrowthSessionController.SESSION_URI],
+		});
 		// Then fire dismiss event which triggers unregistration of the controller.
 		this._onDidDismiss.fire();
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
index 1ff128a1f67..193681944b8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
@@ -511,6 +511,9 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
 							}
 						});
 					} else {
+						this.logService.warn(defaultChat.outputChannelId
+							? `[chat setup] No output channel found for id '${defaultChat.outputChannelId}' to show details about chat setup timeout. Please ensure the ${defaultChat.chatExtensionId} extension is activated.`
+							: '[chat setup] No output channel provided via product.json to show details about chat setup timeout.');
 						progress({
 							kind: 'command',
 							command: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts
index 7e77a64f55e..dbf3a6895b7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts
@@ -32,7 +32,6 @@ import { ChatSetupController } from './chatSetupController.js';
 import { IChatSetupResult, ChatSetupAnonymous, InstallChatEvent, InstallChatClassification, ChatSetupStrategy, ChatSetupResultValue } from './chatSetup.js';
 import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
 import { IHostService } from '../../../../services/host/browser/host.js';
-import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
 
 const defaultChat = {
 	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
@@ -51,7 +50,7 @@ export class ChatSetup {
 		let instance = ChatSetup.instance;
 		if (!instance) {
 			instance = ChatSetup.instance = instantiationService.invokeFunction(accessor => {
-				return new ChatSetup(context, controller, accessor.get(ITelemetryService), accessor.get(IWorkbenchLayoutService), accessor.get(IKeybindingService), accessor.get(IChatEntitlementService) as ChatEntitlementService, accessor.get(ILogService), accessor.get(IChatWidgetService), accessor.get(IWorkspaceTrustRequestService), accessor.get(IMarkdownRendererService), accessor.get(IDefaultAccountService), accessor.get(IHostService), accessor.get(IWorkbenchAssignmentService));
+				return new ChatSetup(context, controller, accessor.get(ITelemetryService), accessor.get(IWorkbenchLayoutService), accessor.get(IKeybindingService), accessor.get(IChatEntitlementService) as ChatEntitlementService, accessor.get(ILogService), accessor.get(IChatWidgetService), accessor.get(IWorkspaceTrustRequestService), accessor.get(IMarkdownRendererService), accessor.get(IDefaultAccountService), accessor.get(IHostService));
 			});
 		}
 
@@ -75,14 +74,13 @@ export class ChatSetup {
 		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
 		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
 		@IHostService private readonly hostService: IHostService,
-		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
 	) { }
 
 	skipDialog(): void {
 		this.skipDialogOnce = true;
 	}
 
-	async run(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; dialogIcon?: ThemeIcon; dialogTitle?: string; dialogHideSkip?: boolean }): Promise<IChatSetupResult> {
+	async run(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; dialogIcon?: ThemeIcon; dialogTitle?: string }): Promise<IChatSetupResult> {
 		if (this.pendingRun) {
 			return this.pendingRun;
 		}
@@ -96,7 +94,7 @@ export class ChatSetup {
 		}
 	}
 
-	private async doRun(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; dialogIcon?: ThemeIcon; dialogTitle?: string; dialogHideSkip?: boolean }): Promise<IChatSetupResult> {
+	private async doRun(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; dialogIcon?: ThemeIcon; dialogTitle?: string }): Promise<IChatSetupResult> {
 		this.context.update({ later: false });
 
 		const dialogSkipped = this.skipDialogOnce;
@@ -162,11 +160,10 @@ export class ChatSetup {
 		return { success, dialogSkipped };
 	}
 
-	private async showDialog(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous; dialogIcon?: ThemeIcon; dialogTitle?: string; dialogHideSkip?: boolean }): Promise<ChatSetupStrategy> {
+	private async showDialog(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous; dialogIcon?: ThemeIcon; dialogTitle?: string }): Promise<ChatSetupStrategy> {
 		const disposables = new DisposableStore();
 
-		const useCloseButton = options?.dialogHideSkip || await this.experimentService.getTreatment<boolean>('chatSetupDialogCloseButton');
-		const buttons = this.getButtons(options, useCloseButton);
+		const buttons = this.getButtons(options);
 
 		const dialog = disposables.add(new Dialog(
 			this.layoutService.activeContainer,
@@ -178,8 +175,8 @@ export class ChatSetup {
 				detail: ' ', // workaround allowing us to render the message in large
 				icon: options?.dialogIcon ?? Codicon.copilotLarge,
 				alignment: DialogContentsAlignment.Vertical,
-				cancelId: useCloseButton ? buttons.length : buttons.length - 1,
-				disableCloseButton: !useCloseButton,
+				cancelId: buttons.length,
+				disableCloseButton: false,
 				renderFooter: footer => footer.appendChild(this.createDialogFooter(disposables, options)),
 				buttonOptions: buttons.map(button => button[2])
 			}, this.keybindingService, this.layoutService, this.hostService)
@@ -191,7 +188,7 @@ export class ChatSetup {
 		return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
 	}
 
-	private getButtons(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }, useCloseButton?: boolean): Array<[string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined]> {
+	private getButtons(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): Array<[string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined]> {
 		type ContinueWithButton = [string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined];
 		const styleButton = (...classes: string[]) => ({ styleButton: (button: IButton) => button.element.classList.add(...classes) });
 
@@ -225,10 +222,6 @@ export class ChatSetup {
 			buttons = [[localize('setupAIButton', "Use AI Features"), ChatSetupStrategy.DefaultSetup, undefined]];
 		}
 
-		if (!useCloseButton) {
-			buttons.push([localize('skipForNow', "Skip for now"), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
-		}
-
 		return buttons;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatSlashCommands.ts b/src/vs/workbench/contrib/chat/browser/chatSlashCommands.ts
index 4d183f09c9e..f75404ddde0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSlashCommands.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSlashCommands.ts
@@ -5,19 +5,17 @@
 
 import { timeout } from '../../../../base/common/async.js';
 import { MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
 import * as nls from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IChatAgentService } from '../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../common/actions/chatContextKeys.js';
 import { IChatSlashCommandService } from '../common/participants/chatSlashCommands.js';
 import { IChatService } from '../common/chatService/chatService.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatPermissionLevel } from '../common/constants.js';
 import { ACTION_ID_NEW_CHAT } from './actions/chatActions.js';
 import { ChatSubmitAction, OpenModePickerAction, OpenModelPickerAction } from './actions/chatExecuteActions.js';
 import { ManagePluginsAction } from './actions/chatPluginActions.js';
@@ -27,13 +25,11 @@ import { CONFIGURE_INSTRUCTIONS_ACTION_ID } from './promptSyntax/attachInstructi
 import { showConfigureHooksQuickPick } from './promptSyntax/hookActions.js';
 import { CONFIGURE_PROMPTS_ACTION_ID } from './promptSyntax/runPromptAction.js';
 import { CONFIGURE_SKILLS_ACTION_ID } from './promptSyntax/skillActions.js';
-import {
-	AutoApproveStorageKeys,
-	globalAutoApproveDescription,
-} from './tools/languageModelToolsService.js';
+import { IChatWidgetService } from './chat.js';
 import { agentSlashCommandToMarkdown, agentToMarkdown } from './widget/chatContentParts/chatMarkdownDecorationsRenderer.js';
 import { Target } from '../common/promptSyntax/promptTypes.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 
 export class ChatSlashCommandsContribution extends Disposable {
 
@@ -47,9 +43,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 		@IAgentSessionsService agentSessionsService: IAgentSessionsService,
 		@IChatService chatService: IChatService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IDialogService dialogService: IDialogService,
-		@INotificationService notificationService: INotificationService,
-		@IStorageService storageService: IStorageService,
+		@IChatWidgetService chatWidgetService: IChatWidgetService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 	) {
 		super();
@@ -71,7 +65,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await instantiationService.invokeFunction(showConfigureHooksQuickPick);
 		}));
@@ -82,7 +76,6 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
 		}, async () => {
 			await commandService.executeCommand(OpenModelPickerAction.ID);
 		}));
@@ -93,7 +86,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await commandService.executeCommand(ConfigureToolsAction.ID);
 		}));
@@ -104,7 +97,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await commandService.executeCommand(ManagePluginsAction.ID);
 		}));
@@ -127,7 +120,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await commandService.executeCommand(OpenModePickerAction.ID);
 		}));
@@ -138,7 +131,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await commandService.executeCommand(CONFIGURE_SKILLS_ACTION_ID);
 		}));
@@ -149,7 +142,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await commandService.executeCommand(CONFIGURE_INSTRUCTIONS_ACTION_ID);
 		}));
@@ -160,7 +153,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async () => {
 			await commandService.executeCommand(CONFIGURE_PROMPTS_ACTION_ID);
 		}));
@@ -171,7 +164,10 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			when: ContextKeyExpr.or(
+				ChatContextKeys.lockedToCodingAgent.negate(),
+				ChatContextKeys.chatSessionSupportsFork
+			),
 		}, async (_prompt, _progress, _history, _location, sessionResource) => {
 			await commandService.executeCommand('workbench.action.chat.forkConversation', sessionResource);
 		}));
@@ -182,116 +178,90 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: false,
 			silent: true,
 			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async (prompt, _progress, _history, _location, sessionResource) => {
 			const title = prompt.trim();
 			if (title) {
 				chatService.setChatSessionTitle(sessionResource, title);
 			}
 		}));
-		const handleEnableAutoApprove = async () => {
-			const inspection = configurationService.inspect<boolean>(ChatConfiguration.GlobalAutoApprove);
-			if (inspection.policyValue !== undefined) {
-				if (inspection.policyValue === true) {
-					notificationService.info(nls.localize('autoApprove.alreadyEnabled', "Global auto-approve is already enabled."));
-					return;
-				}
-				notificationService.warn(nls.localize('autoApprove.policyBlocked', "Global auto-approve is managed by your organization policy. Contact your administrator to change this setting."));
-				return;
+		const setPermissionLevelForSession = (sessionResource: URI, level: ChatPermissionLevel) => {
+			const widget = chatWidgetService.getWidgetBySessionResource(sessionResource) ?? chatWidgetService.lastFocusedWidget;
+			if (widget) {
+				widget.input.setPermissionLevel(level);
 			}
-			if (configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove)) {
-				notificationService.info(nls.localize('autoApprove.alreadyEnabled', "Global auto-approve is already enabled."));
-				return;
-			}
-			const alreadyOptedIn = storageService.getBoolean(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION, false);
-			if (!alreadyOptedIn) {
-				const store = new DisposableStore();
-				try {
-					const cts = new CancellationTokenSource();
-					store.add(cts);
-					store.add(storageService.onDidChangeValue(StorageScope.APPLICATION, AutoApproveStorageKeys.GlobalAutoApproveOptIn, store)(() => {
-						if (storageService.getBoolean(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION, false)) {
-							cts.cancel();
-						}
-					}));
-
-					const result = await dialogService.prompt({
-						type: Severity.Warning,
-						message: nls.localize('autoApprove.enable.title', 'Enable global auto approve?'),
-						buttons: [
-							{ label: nls.localize('autoApprove.enable.button', 'Enable'), run: () => true },
-							{ label: nls.localize('autoApprove.cancel.button', 'Cancel'), run: () => false },
-						],
-						custom: {
-							markdownDetails: [{ markdown: new MarkdownString(globalAutoApproveDescription.value, { isTrusted: { enabledCommands: ['workbench.action.openSettings'] } }) }],
-						},
-						token: cts.token,
-					});
-
-					if (!cts.token.isCancellationRequested && result.result !== true) {
-						return;
-					}
-					storageService.store(AutoApproveStorageKeys.GlobalAutoApproveOptIn, true, StorageScope.APPLICATION, StorageTarget.USER);
-				} finally {
-					store.dispose();
-				}
-			}
-			await configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, true);
-			notificationService.info(nls.localize('autoApprove.enabled', "Global auto-approve enabled — all tool calls will be approved automatically"));
 		};
-		const handleDisableAutoApprove = async () => {
-			const inspection = configurationService.inspect<boolean>(ChatConfiguration.GlobalAutoApprove);
-			if (inspection.policyValue !== undefined) {
-				if (inspection.policyValue === false) {
-					notificationService.info(nls.localize('autoApprove.alreadyDisabled', "Global auto-approve is already disabled."));
-					return;
-				}
-				notificationService.warn(nls.localize('autoApprove.policyBlocked', "Global auto-approve is managed by your organization policy. Contact your administrator to change this setting."));
-				return;
+		const autoApprovePolicyValue = configurationService.inspect<boolean>(ChatConfiguration.GlobalAutoApprove).policyValue;
+		if (autoApprovePolicyValue !== false) {
+			this._store.add(slashCommandService.registerSlashCommand({
+				command: 'autoApprove',
+				detail: nls.localize('autoApprove', "Set permissions to bypass approvals"),
+				sortText: 'z1_autoApprove',
+				executeImmediately: true,
+				silent: true,
+				locations: [ChatAgentLocation.Chat],
+				targets: [Target.VSCode, Target.GitHubCopilot]
+			}, async (_prompt, _progress, _history, _location, sessionResource) => {
+				setPermissionLevelForSession(sessionResource, ChatPermissionLevel.AutoApprove);
+			}));
+			this._store.add(slashCommandService.registerSlashCommand({
+				command: 'disableAutoApprove',
+				detail: nls.localize('disableAutoApprove', "Set permissions back to default"),
+				sortText: 'z1_disableAutoApprove',
+				executeImmediately: true,
+				silent: true,
+				locations: [ChatAgentLocation.Chat],
+				targets: [Target.VSCode, Target.GitHubCopilot]
+			}, async (_prompt, _progress, _history, _location, sessionResource) => {
+				setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Default);
+			}));
+			this._store.add(slashCommandService.registerSlashCommand({
+				command: 'yolo',
+				detail: nls.localize('yolo', "Set permissions to bypass approvals"),
+				sortText: 'z1_yolo',
+				executeImmediately: true,
+				silent: true,
+				locations: [ChatAgentLocation.Chat],
+				targets: [Target.VSCode, Target.GitHubCopilot]
+			}, async (_prompt, _progress, _history, _location, sessionResource) => {
+				setPermissionLevelForSession(sessionResource, ChatPermissionLevel.AutoApprove);
+			}));
+			this._store.add(slashCommandService.registerSlashCommand({
+				command: 'disableYolo',
+				detail: nls.localize('disableYolo', "Set permissions back to default"),
+				sortText: 'z1_disableYolo',
+				executeImmediately: true,
+				silent: true,
+				locations: [ChatAgentLocation.Chat],
+				targets: [Target.VSCode, Target.GitHubCopilot]
+			}, async (_prompt, _progress, _history, _location, sessionResource) => {
+				setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Default);
+			}));
+			if (configurationService.getValue<boolean>(ChatConfiguration.AutopilotEnabled) !== false) {
+				this._store.add(slashCommandService.registerSlashCommand({
+					command: 'autopilot',
+					detail: nls.localize('autopilot', "Set permissions to autopilot mode"),
+					sortText: 'z1_autopilot',
+					executeImmediately: true,
+					silent: true,
+					locations: [ChatAgentLocation.Chat],
+					targets: [Target.VSCode, Target.GitHubCopilot]
+				}, async (_prompt, _progress, _history, _location, sessionResource) => {
+					setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Autopilot);
+				}));
+				this._store.add(slashCommandService.registerSlashCommand({
+					command: 'exitAutopilot',
+					detail: nls.localize('exitAutopilot', "Set permissions back to default"),
+					sortText: 'z1_exitAutopilot',
+					executeImmediately: true,
+					silent: true,
+					locations: [ChatAgentLocation.Chat],
+					targets: [Target.VSCode, Target.GitHubCopilot]
+				}, async (_prompt, _progress, _history, _location, sessionResource) => {
+					setPermissionLevelForSession(sessionResource, ChatPermissionLevel.Default);
+				}));
 			}
-			if (!configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove)) {
-				notificationService.info(nls.localize('autoApprove.alreadyDisabled', "Global auto-approve is already disabled."));
-				return;
-			}
-			await configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, false);
-			notificationService.info(nls.localize('autoApprove.disabled', "Global auto-approve disabled — tools will require approval"));
-		};
-		this._store.add(slashCommandService.registerSlashCommand({
-			command: 'autoApprove',
-			detail: nls.localize('autoApprove', "Enable global auto-approval of all tool calls"),
-			sortText: 'z1_autoApprove',
-			executeImmediately: true,
-			silent: true,
-			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
-		}, handleEnableAutoApprove));
-		this._store.add(slashCommandService.registerSlashCommand({
-			command: 'disableAutoApprove',
-			detail: nls.localize('disableAutoApprove', "Disable global auto-approval of all tool calls"),
-			sortText: 'z1_disableAutoApprove',
-			executeImmediately: true,
-			silent: true,
-			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
-		}, handleDisableAutoApprove));
-		this._store.add(slashCommandService.registerSlashCommand({
-			command: 'yolo',
-			detail: nls.localize('yolo', "Enable global auto-approval of all tool calls"),
-			sortText: 'z1_yolo',
-			executeImmediately: true,
-			silent: true,
-			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
-		}, handleEnableAutoApprove));
-		this._store.add(slashCommandService.registerSlashCommand({
-			command: 'disableYolo',
-			detail: nls.localize('disableYolo', "Disable global auto-approval of all tool calls"),
-			sortText: 'z1_disableYolo',
-			executeImmediately: true,
-			silent: true,
-			locations: [ChatAgentLocation.Chat],
-			target: Target.VSCode
-		}, handleDisableAutoApprove));
+		}
 		this._store.add(slashCommandService.registerSlashCommand({
 			command: 'help',
 			detail: '',
@@ -299,7 +269,7 @@ export class ChatSlashCommandsContribution extends Disposable {
 			executeImmediately: true,
 			locations: [ChatAgentLocation.Chat],
 			modes: [ChatModeKind.Ask],
-			target: Target.VSCode
+			targets: [Target.VSCode]
 		}, async (prompt, progress, _history, _location, sessionResource) => {
 			const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Chat);
 			const agents = chatAgentService.getAgents();
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts
index ad2cb70765e..5b28e7c8a89 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts
@@ -48,6 +48,7 @@ import { Color } from '../../../../../base/common/color.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { ChatViewId } from '../chat.js';
 import { isCompletionsEnabled } from '../../../../../editor/common/services/completionsEnablement.js';
+import { AgentSessionProviders } from '../agentSessions/agentSessions.js';
 
 const defaultChat = product.defaultChatAgent;
 
@@ -235,12 +236,15 @@ export class ChatStatusDashboard extends DomWidget {
 					}
 				}));
 
-				for (const { displayName, count } of inProgress) {
+				for (const { chatSessionType, count } of inProgress) {
 					if (count > 0) {
-						const text = localize('inProgressChatSession', "$(loading~spin) {0} in progress", displayName);
-						const chatSessionsElement = this.element.appendChild($('div.description'));
-						const parts = renderLabelWithIcons(text);
-						chatSessionsElement.append(...parts);
+						const displayName = this.getDisplayNameForChatSessionType(chatSessionType);
+						if (displayName) {
+							const text = '$(loading~spin) ' + localize('inProgressChatSession', "{0} in progress", displayName);
+							const chatSessionsElement = this.element.appendChild($('div.description'));
+							const parts = renderLabelWithIcons(text);
+							chatSessionsElement.append(...parts);
+						}
 					}
 				}
 			}
@@ -402,6 +406,18 @@ export class ChatStatusDashboard extends DomWidget {
 		}
 	}
 
+	private getDisplayNameForChatSessionType(chatSessionType: string): string | undefined {
+		if (chatSessionType === AgentSessionProviders.Local) {
+			return localize('chat.session.inProgress.local', "Local Agent");
+		} else if (chatSessionType === AgentSessionProviders.Background) {
+			return localize('chat.session.inProgress.background', "Background Agent");
+		} else if (chatSessionType === AgentSessionProviders.Cloud) {
+			return localize('chat.session.inProgress.cloud', "Cloud Agent");
+		} else {
+			return this.chatSessionsService.getChatSessionContribution(chatSessionType)?.displayName;
+		}
+	}
+
 	private canUseChat(): boolean {
 		if (!this.chatEntitlementService.sentiment.installed || this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
 			return false; // chat not installed or not enabled
diff --git a/src/vs/workbench/contrib/chat/browser/chatTipCatalog.ts b/src/vs/workbench/contrib/chat/browser/chatTipCatalog.ts
index 6a93f4d568f..f424b4692e7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatTipCatalog.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatTipCatalog.ts
@@ -19,6 +19,7 @@ import {
 	GENERATE_PROMPT_COMMAND_ID,
 	GENERATE_SKILL_COMMAND_ID,
 	INSERT_FORK_CONVERSATION_COMMAND_ID,
+	INSERT_TROUBLESHOOT_COMMAND_ID,
 } from './actions/chatActions.js';
 
 export const enum ChatTipTier {
@@ -372,4 +373,41 @@ export const TIP_CATALOG: readonly ITipDefinition[] = [
 		excludeWhenSettingsChanged: [ChatConfiguration.ThinkingPhrases],
 		dismissWhenCommandsClicked: ['workbench.action.openSettings'],
 	},
+	{
+		id: 'tip.autoAcceptDelay',
+		tier: ChatTipTier.Qol,
+		buildMessage() {
+			return new MarkdownString(
+				localize(
+					'tip.autoAcceptDelay',
+					"Configure [{0}](command:workbench.action.openSettings?%5B%22chat.editing.autoAcceptDelay%22%5D \"Open Settings\") to automatically accept changes from the agent after a short countdown.",
+					'auto-accept delay'
+				)
+			);
+		},
+		when: ContextKeyExpr.or(
+			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
+			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit),
+		),
+		excludeWhenSettingsChanged: ['chat.editing.autoAcceptDelay'],
+		dismissWhenCommandsClicked: ['workbench.action.openSettings'],
+	},
+	{
+		id: 'tip.troubleshoot',
+		tier: ChatTipTier.Qol,
+		buildMessage(ctx) {
+			const kb = formatKeybinding(ctx, INSERT_TROUBLESHOOT_COMMAND_ID);
+			return new MarkdownString(
+				localize(
+					'tip.troubleshoot',
+					"Something not working? Type [{0}](command:{1} \"Run /troubleshoot\"){2} <question> to diagnose issues from debug logs.",
+					'/troubleshoot',
+					INSERT_TROUBLESHOOT_COMMAND_ID,
+					kb
+				)
+			);
+		},
+		when: ChatContextKeys.chatSessionType.isEqualTo(localChatSessionType),
+		excludeWhenToolsInvoked: ['listDebugEvents'],
+	},
 ];
diff --git a/src/vs/workbench/contrib/chat/browser/claudePluginRecommendations.ts b/src/vs/workbench/contrib/chat/browser/claudePluginRecommendations.ts
new file mode 100644
index 00000000000..959895bdf10
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/claudePluginRecommendations.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { INotificationService, NeverShowAgainScope, Severity } from '../../../../platform/notification/common/notification.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { IChatService } from '../common/chatService/chatService.js';
+import { IPluginMarketplaceService } from '../common/plugins/pluginMarketplaceService.js';
+
+export class AgentPluginRecommendations extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.agentPluginRecommendations';
+
+	private _hasNotified = false;
+
+	constructor(
+		@IChatService private readonly _chatService: IChatService,
+		@IPluginMarketplaceService private readonly _pluginMarketplaceService: IPluginMarketplaceService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
+	) {
+		super();
+
+		this._register(this._chatService.onDidSubmitRequest(() => {
+			if (!this._hasNotified) {
+				this._hasNotified = true;
+				this._checkForRecommendedPlugins();
+			}
+		}));
+	}
+
+	private _checkForRecommendedPlugins(): void {
+		const recommended = this._pluginMarketplaceService.recommendedPlugins.get();
+		if (recommended.size === 0) {
+			return;
+		}
+
+		// Build a set of installed plugin keys ("name@marketplace") from
+		// storage without triggering any network fetch.
+		const installedKeys = new Set<string>();
+		for (const entry of this._pluginMarketplaceService.installedPlugins.get()) {
+			const key = `${entry.plugin.name}@${entry.plugin.marketplace}`;
+			installedKeys.add(key);
+		}
+
+		let uninstalledCount = 0;
+		for (const key of recommended) {
+			if (!installedKeys.has(key)) {
+				uninstalledCount++;
+			}
+		}
+
+		if (uninstalledCount === 0) {
+			return;
+		}
+
+		this._notificationService.prompt(
+			Severity.Info,
+			uninstalledCount === 1
+				? localize('agentPluginRecommendation.one', "This workspace recommends 1 agent plugin.")
+				: localize('agentPluginRecommendation.many', "This workspace recommends {0} agent plugins.", uninstalledCount),
+			[{
+				label: localize('showPlugins', "Show Plugins"),
+				run: () => {
+					this._extensionsWorkbenchService.openSearch('@agentPlugins @recommended');
+				}
+			}],
+			{
+				neverShowAgain: {
+					id: 'agentPluginRecommendations.dismissed',
+					scope: NeverShowAgainScope.WORKSPACE,
+					isSecondary: true,
+				}
+			}
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.ts b/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.ts
index 8109c362c3b..b33c3fe5278 100644
--- a/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.ts
@@ -67,7 +67,7 @@ export class ChatContextContribution extends Disposable implements IWorkbenchCon
 				for (const contribution of ext.value) {
 					const icon = contribution.icon ? ThemeIcon.fromString(contribution.icon) : undefined;
 					if (!icon && contribution.icon) {
-						ext.collector.error(localize('chatContextExtPoint.invalidIcon', "Invalid icon format for chat context contribution '{0}'. Icon must be in the format '$(iconId)' or '$(iconId~spin)', e.g. '$(copilot)'.", contribution.id));
+						ext.collector.error(localize('chatContextExtPoint.invalidIcon', "Invalid icon format for chat context contribution '{0}'. Icon must be in the format '{1}' or '{2}', e.g. '{3}'.", contribution.id, '$(iconId)', '$(iconId~spin)', '$(copilot)'));
 						continue;
 					}
 					if (!icon) {
diff --git a/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts b/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts
index f89cca85b67..e5ad21a9bb5 100644
--- a/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts
+++ b/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts
@@ -8,6 +8,7 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Mutable } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -315,6 +316,32 @@ export class ChatLanguageModelsDataContribution extends Disposable implements IW
 	private updateSchema(registry: IJSONContributionRegistry): void {
 		const vendors = this.languageModelsService.getVendors();
 
+		// Build per-model configuration schemas
+		const modelSchemas: IJSONSchema[] = [];
+		const modelIds = this.languageModelsService.getLanguageModelIds();
+		for (const modelId of modelIds) {
+			const metadata = this.languageModelsService.lookupLanguageModel(modelId);
+			if (metadata?.configurationSchema) {
+				modelSchemas.push({
+					if: {
+						properties: {
+							vendor: { const: metadata.vendor }
+						}
+					},
+					then: {
+						properties: {
+							settings: {
+								type: 'object',
+								properties: {
+									[metadata.id]: metadata.configurationSchema
+								}
+							}
+						}
+					}
+				});
+			}
+		}
+
 		const schema: IJSONSchema = {
 			type: 'array',
 			items: {
@@ -323,16 +350,23 @@ export class ChatLanguageModelsDataContribution extends Disposable implements IW
 						type: 'string',
 						enum: vendors.map(v => v.vendor)
 					},
-					name: { type: 'string' }
+					name: { type: 'string' },
+					settings: {
+						type: 'object',
+						description: localize('settings.perModelConfig', "Per-model settings"),
+					}
 				},
-				allOf: vendors.map(vendor => ({
-					if: {
-						properties: {
-							vendor: { const: vendor.vendor }
-						}
-					},
-					then: vendor.configuration
-				})),
+				allOf: [
+					...vendors.map(vendor => ({
+						if: {
+							properties: {
+								vendor: { const: vendor.vendor }
+							}
+						},
+						then: vendor.configuration
+					})),
+					...modelSchemas
+				],
 				required: ['vendor', 'name']
 			}
 		};
diff --git a/src/vs/workbench/contrib/chat/browser/pluginInstallService.ts b/src/vs/workbench/contrib/chat/browser/pluginInstallService.ts
index 39b0b79f015..44fccdc7c0d 100644
--- a/src/vs/workbench/contrib/chat/browser/pluginInstallService.ts
+++ b/src/vs/workbench/contrib/chat/browser/pluginInstallService.ts
@@ -9,14 +9,17 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { IAgentPluginRepositoryService } from '../common/plugins/agentPluginRepositoryService.js';
-import { IPluginInstallService, IUpdateAllPluginsOptions, IUpdateAllPluginsResult } from '../common/plugins/pluginInstallService.js';
-import { IMarketplacePlugin, IPluginMarketplaceService, hasSourceChanged, PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { ChatConfiguration } from '../common/constants.js';
+import { IPluginInstallService, IInstallPluginFromSourceOptions, IInstallPluginFromSourceResult, IUpdateAllPluginsOptions, IUpdateAllPluginsResult } from '../common/plugins/pluginInstallService.js';
+import { IMarketplacePlugin, IMarketplaceReference, IPluginMarketplaceService, MarketplaceReferenceKind, MarketplaceType, hasSourceChanged, parseMarketplaceReference, parseMarketplaceReferences, PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
 
 export class PluginInstallService implements IPluginInstallService {
 	declare readonly _serviceBrand: undefined;
@@ -30,6 +33,8 @@ export class PluginInstallService implements IPluginInstallService {
 		@ILogService private readonly _logService: ILogService,
 		@IProgressService private readonly _progressService: IProgressService,
 		@ICommandService private readonly _commandService: ICommandService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) { }
 
 	async installPlugin(plugin: IMarketplacePlugin): Promise<void> {
@@ -52,6 +57,170 @@ export class PluginInstallService implements IPluginInstallService {
 		return this._installGitPlugin(plugin);
 	}
 
+	async installPluginFromSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<void> {
+		const reference = parseMarketplaceReference(source);
+		if (!reference) {
+			this._notificationService.notify({
+				severity: Severity.Error,
+				message: localize('invalidSource', "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.", source),
+			});
+			return;
+		}
+
+		if (reference.kind === MarketplaceReferenceKind.LocalFileUri) {
+			this._notificationService.notify({
+				severity: Severity.Error,
+				message: localize('localSourceNotSupported', "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."),
+			});
+			return;
+		}
+
+		const result = await this._doInstallFromSource(reference, options);
+		if (!result.success && result.message) {
+			this._notificationService.notify({
+				severity: Severity.Error,
+				message: result.message,
+			});
+		}
+	}
+
+	validatePluginSource(source: string): string | undefined {
+		const reference = parseMarketplaceReference(source);
+		if (!reference) {
+			return localize('invalidSource', "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.", source);
+		}
+		if (reference.kind === MarketplaceReferenceKind.LocalFileUri) {
+			return localize('localSourceNotSupported', "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL.");
+		}
+		return undefined;
+	}
+
+	async installPluginFromValidatedSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<IInstallPluginFromSourceResult> {
+		const reference = parseMarketplaceReference(source);
+		if (!reference) {
+			return {
+				success: false,
+				message: localize('invalidSource', "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.", source),
+			};
+		}
+		if (reference.kind === MarketplaceReferenceKind.LocalFileUri) {
+			return {
+				success: false,
+				message: localize('localSourceNotSupported', "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."),
+			};
+		}
+
+		return this._doInstallFromSource(reference, options);
+	}
+
+	private async _doInstallFromSource(reference: IMarketplaceReference, options?: IInstallPluginFromSourceOptions): Promise<IInstallPluginFromSourceResult> {
+		// Build a source descriptor for the git clone.
+		const sourceDescriptor = reference.kind === MarketplaceReferenceKind.GitHubShorthand
+			? { kind: PluginSourceKind.GitHub as const, repo: reference.githubRepo! }
+			: { kind: PluginSourceKind.GitUrl as const, url: reference.cloneUrl };
+
+		// Build a temporary plugin object for the trust gate and clone step.
+		const tempPlugin: IMarketplacePlugin = {
+			name: reference.displayLabel,
+			description: '',
+			version: '',
+			source: '',
+			sourceDescriptor,
+			marketplace: reference.displayLabel,
+			marketplaceReference: reference,
+			marketplaceType: MarketplaceType.OpenPlugin,
+		};
+
+		if (!await this._ensureMarketplaceTrusted(tempPlugin)) {
+			return { success: false };
+		}
+
+		// Clone the repository.
+		let repoDir: URI;
+		try {
+			repoDir = await this._pluginRepositoryService.ensurePluginSource(tempPlugin, {
+				progressTitle: localize('cloningSource', "Cloning plugin source '{0}'...", reference.displayLabel),
+				failureLabel: reference.displayLabel,
+				marketplaceType: MarketplaceType.OpenPlugin,
+			});
+		} catch (e) {
+			const detail = e instanceof Error ? e.message : String(e);
+			return {
+				success: false,
+				message: localize('cloneFailedDetail', "Failed to clone plugin source '{0}': {1}", reference.displayLabel, detail),
+			};
+		}
+
+		const repoExists = await this._fileService.exists(repoDir);
+		if (!repoExists) {
+			return {
+				success: false,
+				message: localize('cloneFailed', "Failed to clone plugin source '{0}'.", reference.displayLabel),
+			};
+		}
+
+		// Scan for marketplace.json to discover plugins.
+		const discoveredPlugins = await this._pluginMarketplaceService.readPluginsFromDirectory(repoDir, reference);
+
+		if (discoveredPlugins.length === 0) {
+			void this._pluginRepositoryService.cleanupPluginSource(tempPlugin);
+			return {
+				success: false,
+				message: localize('noPluginsFound', "No plugins found in '{0}'. This does not appear to be a valid plugin marketplace.", reference.displayLabel),
+			};
+		}
+
+		// When targeting a specific plugin, find it, register it, and return.
+		if (options?.plugin) {
+			const matchedPlugin = discoveredPlugins.find(p => p.name === options.plugin);
+			if (!matchedPlugin) {
+				return {
+					success: false,
+					message: localize('pluginNotFound', "Plugin '{0}' not found in '{1}'.", options.plugin, reference.displayLabel),
+				};
+			}
+			await this._addMarketplaceToConfig(reference);
+			await this.installPlugin(matchedPlugin);
+			return { success: true, matchedPlugin };
+		}
+
+		if (discoveredPlugins.length === 1) {
+			await this._addMarketplaceToConfig(reference);
+			await this.installPlugin(discoveredPlugins[0]);
+			return { success: true };
+		}
+
+		// Multiple plugins — let the user choose.
+		const picks: (IQuickPickItem & { plugin: IMarketplacePlugin })[] = discoveredPlugins.map(p => ({
+			label: p.name,
+			description: p.description,
+			plugin: p,
+		}));
+
+		const selected = await this._quickInputService.pick(picks, {
+			placeHolder: localize('selectPlugin', "Select a plugin to install from '{0}'", reference.displayLabel),
+			canPickMany: false,
+		});
+
+		if (!selected) {
+			return { success: false };
+		}
+
+		await this._addMarketplaceToConfig(reference);
+		await this.installPlugin(selected.plugin);
+
+		return { success: true };
+	}
+
+	private _addMarketplaceToConfig(reference: IMarketplaceReference) {
+		const currentValues = this._configurationService.getValue<unknown[]>(ChatConfiguration.PluginMarketplaces) ?? [];
+		const existingRefs = parseMarketplaceReferences(currentValues);
+		if (existingRefs.some(r => r.canonicalId === reference.canonicalId)) {
+			return;
+		}
+		return this._configurationService.updateValue(ChatConfiguration.PluginMarketplaces, [...currentValues, reference.rawValue]);
+	}
+
 	async updatePlugin(plugin: IMarketplacePlugin, silent?: boolean): Promise<boolean> {
 		const kind = plugin.sourceDescriptor.kind;
 
diff --git a/src/vs/workbench/contrib/chat/browser/pluginSources.ts b/src/vs/workbench/contrib/chat/browser/pluginSources.ts
index 8ea0f30210d..383e3112e63 100644
--- a/src/vs/workbench/contrib/chat/browser/pluginSources.ts
+++ b/src/vs/workbench/contrib/chat/browser/pluginSources.ts
@@ -8,7 +8,7 @@ import { CancelablePromise, timeout } from '../../../../base/common/async.js';
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { isWindows } from '../../../../base/common/platform.js';
-import { dirname, joinPath } from '../../../../base/common/resources.js';
+import { dirname, isEqualOrParent, joinPath } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
@@ -79,18 +79,27 @@ abstract class AbstractGitPluginSource implements IPluginSource {
 	protected abstract _displayLabel(descriptor: IPluginSourceDescriptor): string;
 
 	getCleanupTarget(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI | undefined {
+		return this._getRepoDir(cacheRoot, descriptor);
+	}
+
+	/**
+	 * Returns the on-disk directory of the cloned repository. Subclasses that
+	 * support a sub-path within a repository should override this to return the
+	 * repository root, while {@link getInstallUri} returns root + sub-path.
+	 */
+	protected _getRepoDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI {
 		return this.getInstallUri(cacheRoot, descriptor);
 	}
 
 	async ensure(cacheRoot: URI, plugin: IMarketplacePlugin, options?: IEnsureRepositoryOptions): Promise<URI> {
 		const descriptor = plugin.sourceDescriptor;
-		const repoDir = this.getInstallUri(cacheRoot, descriptor);
+		const repoDir = this._getRepoDir(cacheRoot, descriptor);
 		const repoExists = await this._fileService.exists(repoDir);
 		const label = this._displayLabel(descriptor);
 
 		if (repoExists) {
 			await this._checkoutRevision(repoDir, descriptor, options?.failureLabel ?? label);
-			return repoDir;
+			return this.getInstallUri(cacheRoot, descriptor);
 		}
 
 		const progressTitle = options?.progressTitle ?? localize('cloningPluginSource', "Cloning plugin source '{0}'...", label);
@@ -99,12 +108,12 @@ abstract class AbstractGitPluginSource implements IPluginSource {
 
 		await this._cloneRepository(repoDir, this._cloneUrl(descriptor), progressTitle, failureLabel, ref);
 		await this._checkoutRevision(repoDir, descriptor, failureLabel);
-		return repoDir;
+		return this.getInstallUri(cacheRoot, descriptor);
 	}
 
 	async update(cacheRoot: URI, plugin: IMarketplacePlugin, options?: IPullRepositoryOptions): Promise<boolean> {
 		const descriptor = plugin.sourceDescriptor;
-		const repoDir = this.getInstallUri(cacheRoot, descriptor);
+		const repoDir = this._getRepoDir(cacheRoot, descriptor);
 		const repoExists = await this._fileService.exists(repoDir);
 		if (!repoExists) {
 			this._logService.warn(`[${this.kind}] Cannot update plugin '${options?.pluginName ?? plugin.name}': source repository not cloned`);
@@ -242,14 +251,32 @@ export class RelativePathPluginSource implements IPluginSource {
 export class GitHubPluginSource extends AbstractGitPluginSource {
 	readonly kind = PluginSourceKind.GitHub;
 
+	/** Returns the URI where the plugin content lives (repo root + optional sub-path). */
 	getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI {
+		const repoDir = this._getRepoDir(cacheRoot, descriptor);
+		const gh = descriptor as IGitHubPluginSource;
+		if (gh.path) {
+			const normalizedPath = gh.path.trim().replace(/^\.?\/+|\/+$/g, '');
+			if (normalizedPath) {
+				const target = joinPath(repoDir, normalizedPath);
+				if (isEqualOrParent(target, repoDir)) {
+					return target;
+				}
+			}
+		}
+		return repoDir;
+	}
+
+	/** Returns the cloned repository root (without sub-path). */
+	protected override _getRepoDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI {
 		const gh = descriptor as IGitHubPluginSource;
 		const [owner, repo] = gh.repo.split('/');
 		return joinPath(cacheRoot, 'github.com', owner, repo, ...gitRevisionCacheSuffix(gh.ref, gh.sha));
 	}
 
 	getLabel(descriptor: IPluginSourceDescriptor): string {
-		return (descriptor as IGitHubPluginSource).repo;
+		const gh = descriptor as IGitHubPluginSource;
+		return gh.path ? `${gh.repo}/${gh.path}` : gh.repo;
 	}
 
 	protected _cloneUrl(descriptor: IPluginSourceDescriptor): string {
diff --git a/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.ts b/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.ts
new file mode 100644
index 00000000000..5997044d851
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.ts
@@ -0,0 +1,236 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { mainWindow } from '../../../../base/browser/window.js';
+import { decodeBase64 } from '../../../../base/common/buffer.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IURLHandler, IURLService } from '../../../../platform/url/common/url.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
+import { AgentPluginItemKind, IMarketplacePluginItem } from './agentPluginEditor/agentPluginItems.js';
+import { ChatConfiguration } from '../common/constants.js';
+import { MarketplaceReferenceKind, parseMarketplaceReference, parseMarketplaceReferences } from '../common/plugins/marketplaceReference.js';
+import { IPluginInstallService } from '../common/plugins/pluginInstallService.js';
+
+/**
+ * Handles `vscode://chat-plugin/install?source=<base64>[&plugin=<base64>]` and
+ * `vscode://chat-plugin/add-marketplace?ref=<base64>` URLs.
+ *
+ * The `source` / `ref` query parameter is a base64-encoded `owner/repo` or
+ * git clone URL. When `plugin` is provided on the `/install` route, the handler
+ * targets that specific plugin within the marketplace, installs it, and opens
+ * its details in the editor. Otherwise, a confirmation dialog is shown before
+ * any action.
+ */
+export class PluginUrlHandler extends Disposable implements IWorkbenchContribution, IURLHandler {
+
+	static readonly ID = 'workbench.contrib.pluginUrlHandler';
+
+	constructor(
+		@IURLService urlService: IURLService,
+		@IPluginInstallService private readonly _pluginInstallService: IPluginInstallService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IHostService private readonly _hostService: IHostService,
+		@ILogService private readonly _logService: ILogService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+		this._register(urlService.registerHandler(this));
+	}
+
+	async handleURL(uri: URI): Promise<boolean> {
+		if (uri.authority !== 'chat-plugin') {
+			return false;
+		}
+
+		switch (uri.path) {
+			case '/install':
+				return this._handleInstall(uri);
+			case '/add-marketplace':
+				return this._handleAddMarketplace(uri);
+			default:
+				return false;
+		}
+	}
+
+	// --- install a plugin from source ---
+
+	private async _handleInstall(uri: URI): Promise<boolean> {
+		const source = this._decodeQueryParam(uri, 'source');
+		if (!source) {
+			this._logService.warn('[PluginUrlHandler] Missing or invalid "source" query parameter');
+			return true;
+		}
+
+		const ref = parseMarketplaceReference(source);
+		if (!ref) {
+			this._logService.warn(`[PluginUrlHandler] Invalid plugin source: ${source}`);
+			return true;
+		}
+
+		if (ref.kind === MarketplaceReferenceKind.LocalFileUri) {
+			this._logService.warn('[PluginUrlHandler] Local file URIs are not supported for install');
+			return true;
+		}
+
+		await this._hostService.focus(mainWindow);
+
+		const pluginName = this._decodeStringParam(uri, 'plugin');
+		if (pluginName) {
+			return this._handleInstallTargetedPlugin(source, ref.displayLabel, pluginName);
+		}
+
+		const { confirmed } = await this._dialogService.confirm({
+			type: 'question',
+			message: localize('confirmInstallPlugin', "Install Plugin from '{0}'?", ref.displayLabel),
+			detail: localize('confirmInstallPluginDetail', "An external application wants to install a plugin from this source. Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}", ref.rawValue),
+			primaryButton: localize({ key: 'installButton', comment: ['&& denotes a mnemonic'] }, "&&Install"),
+			custom: { icon: Codicon.shield },
+		});
+
+		if (!confirmed) {
+			return true;
+		}
+
+		await this._pluginInstallService.installPluginFromSource(source);
+		this._extensionsWorkbenchService.openSearch(`@agentPlugins ${ref.displayLabel}`);
+		return true;
+	}
+
+	/**
+	 * Handles the case where a specific plugin is targeted within a
+	 * marketplace. Delegates trust and discovery to the install service,
+	 * then opens the plugin details in a modal editor.
+	 */
+	private async _handleInstallTargetedPlugin(source: string, displayLabel: string, pluginName: string): Promise<boolean> {
+		const result = await this._pluginInstallService.installPluginFromValidatedSource(source, { plugin: pluginName });
+
+		if (!result.success) {
+			if (result.message) {
+				this._logService.warn(`[PluginUrlHandler] ${result.message}`);
+			}
+			this._extensionsWorkbenchService.openSearch(`@agentPlugins ${displayLabel}`);
+			return true;
+		}
+
+		if (!result.matchedPlugin) {
+			this._extensionsWorkbenchService.openSearch(`@agentPlugins ${displayLabel}`);
+			return true;
+		}
+
+		const plugin = result.matchedPlugin;
+		const item: IMarketplacePluginItem = {
+			kind: AgentPluginItemKind.Marketplace,
+			name: plugin.name,
+			description: plugin.description,
+			source: plugin.source,
+			sourceDescriptor: plugin.sourceDescriptor,
+			marketplace: plugin.marketplace,
+			marketplaceReference: plugin.marketplaceReference,
+			marketplaceType: plugin.marketplaceType,
+			readmeUri: plugin.readmeUri,
+		};
+
+		const input = this._instantiationService.createInstance(AgentPluginEditorInput, item);
+		await this._editorService.openEditor(input);
+
+		return true;
+	}
+
+	// --- add a marketplace ---
+
+	private async _handleAddMarketplace(uri: URI): Promise<boolean> {
+		const refValue = this._decodeQueryParam(uri, 'ref');
+		if (!refValue) {
+			this._logService.warn('[PluginUrlHandler] Missing or invalid "ref" query parameter');
+			return true;
+		}
+
+		const ref = parseMarketplaceReference(refValue);
+		if (!ref) {
+			this._logService.warn(`[PluginUrlHandler] Invalid marketplace reference: ${refValue}`);
+			return true;
+		}
+
+		await this._hostService.focus(mainWindow);
+
+		const { confirmed } = await this._dialogService.confirm({
+			type: 'question',
+			message: localize('confirmAddMarketplace', "Add Plugin Marketplace '{0}'?", ref.displayLabel),
+			detail: localize('confirmAddMarketplaceDetail', "An external application wants to add a plugin marketplace. Plugins from this marketplace will appear in the plugin catalog and can be installed.\n\nSource: {0}", ref.rawValue),
+			primaryButton: localize({ key: 'addMarketplaceButton', comment: ['&& denotes a mnemonic'] }, "&&Add Marketplace"),
+			custom: { icon: Codicon.shield },
+		});
+
+		if (!confirmed) {
+			return true;
+		}
+
+		const existing = this._configurationService.getValue<string[]>(ChatConfiguration.PluginMarketplaces) ?? [];
+		const existingRefs = parseMarketplaceReferences(existing);
+		if (!existingRefs.some(e => e.canonicalId === ref.canonicalId)) {
+			await this._configurationService.updateValue(
+				ChatConfiguration.PluginMarketplaces,
+				[...existing, refValue],
+				ConfigurationTarget.USER,
+			);
+		}
+
+		this._extensionsWorkbenchService.openSearch(`@agentPlugins ${ref.displayLabel}`);
+		return true;
+	}
+
+	// --- helpers ---
+
+	/**
+	 * Reads a query parameter and attempts to parse it as a marketplace
+	 * reference. Tries base64-decoding first, then falls back to the raw
+	 * value so that plain-text `owner/repo` values also work in URLs.
+	 */
+	private _decodeQueryParam(uri: URI, key: string): string | undefined {
+		const params = new URLSearchParams(uri.query);
+		const raw = params.get(key);
+		if (!raw) {
+			return undefined;
+		}
+
+		const decoded = this._tryBase64Decode(raw);
+		if (decoded && parseMarketplaceReference(decoded)) {
+			return decoded;
+		}
+		return parseMarketplaceReference(raw) ? raw : undefined;
+	}
+
+	/**
+	 * Reads a query parameter and decodes it. Tries base64-decoding first,
+	 * then falls back to the raw value.
+	 */
+	private _decodeStringParam(uri: URI, key: string): string | undefined {
+		const params = new URLSearchParams(uri.query);
+		return params.get(key) ?? undefined;
+	}
+
+	private _tryBase64Decode(raw: string): string | undefined {
+		try {
+			const decoded = decodeBase64(raw).toString();
+			return decoded || undefined;
+		} catch {
+			return undefined;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts
index a5c04f02c1e..27cc2591d9c 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts
@@ -25,7 +25,7 @@ import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { askForPromptFileName } from './pickers/askForPromptName.js';
 import { askForPromptSourceFolder } from './pickers/askForPromptSourceFolder.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
-import { getCleanPromptName, SKILL_FILENAME } from '../../common/promptSyntax/config/promptFileLocations.js';
+import { getCleanPromptName, SKILL_FILENAME, VALID_SKILL_NAME_REGEX } from '../../common/promptSyntax/config/promptFileLocations.js';
 import { PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
 import { getTarget } from '../../common/promptSyntax/languageProviders/promptFileAttributes.js';
 
@@ -38,6 +38,12 @@ export interface INewPromptOptions {
 	readonly targetFolder?: URI;
 	readonly targetStorage?: PromptsStorage;
 	readonly openFile?: (uri: URI) => Promise<ICodeEditor | undefined>;
+	/**
+	 * Override the file extension (e.g. `.md` for Claude rules instead of
+	 * `.instructions.md`). When set, the name picker uses this extension
+	 * instead of the default for the prompt type.
+	 */
+	readonly fileExtension?: string;
 }
 
 class AbstractNewPromptFileAction extends Action2 {
@@ -83,7 +89,7 @@ class AbstractNewPromptFileAction extends Action2 {
 			storage = selectedFolder.storage;
 		}
 
-		const fileName = await instaService.invokeFunction(askForPromptFileName, this.type, folderUri);
+		const fileName = await instaService.invokeFunction(askForPromptFileName, this.type, folderUri, undefined, options?.fileExtension);
 		if (!fileName) {
 			return;
 		}
@@ -321,7 +327,7 @@ class NewSkillFileAction extends Action2 {
 					return localize('commands.new.skill.name.tooLong', "Skill name must be 64 characters or less");
 				}
 				// Per spec: lowercase alphanumeric and hyphens only
-				if (!/^[a-z0-9-]+$/.test(name)) {
+				if (!VALID_SKILL_NAME_REGEX.test(name)) {
 					return localize('commands.new.skill.name.invalidChars', "Skill name may only contain lowercase letters, numbers, and hyphens");
 				}
 				if (name.startsWith('-') || name.endsWith('-')) {
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName.ts
index cce0b716c08..c7421626c78 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName.ts
@@ -20,7 +20,8 @@ export async function askForPromptFileName(
 	accessor: ServicesAccessor,
 	type: PromptsType,
 	selectedFolder: URI,
-	existingFileName?: string
+	existingFileName?: string,
+	fileExtensionOverride?: string,
 ): Promise<string | undefined> {
 	const quickInputService = accessor.get(IQuickInputService);
 	const fileService = accessor.get(IFileService);
@@ -31,7 +32,7 @@ export async function askForPromptFileName(
 			return undefined;
 		}
 
-		const fileExtension = getPromptFileExtension(type);
+		const fileExtension = fileExtensionOverride ?? getPromptFileExtension(type);
 		return (trimmedName.endsWith(fileExtension))
 			? trimmedName
 			: `${trimmedName}${fileExtension}`;
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts
index 349bb815934..b28c2c70f36 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts
@@ -14,7 +14,7 @@ import { IFileService } from '../../../../../../platform/files/common/files.js';
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
 import { IDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
-import { getCleanPromptName } from '../../../common/promptSyntax/config/promptFileLocations.js';
+import { getCleanPromptName, getSkillFolderName } from '../../../common/promptSyntax/config/promptFileLocations.js';
 import { PromptsType, INSTRUCTIONS_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, SKILL_DOCUMENTATION_URL, HOOK_DOCUMENTATION_URL } from '../../../common/promptSyntax/promptTypes.js';
 import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID, NEW_SKILL_COMMAND_ID } from '../newPromptFileActions.js';
 import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID, GENERATE_ON_DEMAND_INSTRUCTIONS_COMMAND_ID, GENERATE_PROMPT_COMMAND_ID, GENERATE_SKILL_COMMAND_ID, GENERATE_AGENT_COMMAND_ID } from '../../actions/chatActions.js';
@@ -531,6 +531,14 @@ export class PromptFilePickers {
 			result.push({ type: 'separator', label: localize('separator.plugins', "Plugins") });
 			result.push(...sortByLabel(await Promise.all(plugins.map(p => this._createPromptPickItem(p, pluginButtons, getVisibility(p), token)))));
 		}
+
+		// Internal built-in files are read-only
+		const internals = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.internal, token);
+		if (internals.length) {
+			const internalButtons: IQuickInputButton[] = [];
+			result.push({ type: 'separator', label: localize('separator.builtin', "Built-in") });
+			result.push(...sortByLabel(await Promise.all(internals.map(p => this._createPromptPickItem(p, internalButtons, getVisibility(p), token)))));
+		}
 		return result;
 	}
 
@@ -561,7 +569,7 @@ export class PromptFilePickers {
 
 	private async _createPromptPickItem(promptFile: IPromptPath, buttons: IQuickInputButton[] | undefined, visibility: boolean | undefined, token: CancellationToken): Promise<IPromptPickerQuickPickItem> {
 		const parsedPromptFile = await this._promptsService.parseNew(promptFile.uri, token).catch(() => undefined);
-		let promptName = parsedPromptFile?.header?.name ?? promptFile.name ?? getCleanPromptName(promptFile.uri);
+		let promptName = (parsedPromptFile?.header?.name ?? promptFile.name) || (promptFile.type === PromptsType.skill ? getSkillFolderName(promptFile.uri) : getCleanPromptName(promptFile.uri));
 		const promptDescription = parsedPromptFile?.header?.description ?? promptFile.description;
 
 		let tooltip: string | undefined;
@@ -579,6 +587,9 @@ export class PromptFilePickers {
 			case PromptsStorage.plugin:
 				tooltip = promptFile.name;
 				break;
+			case PromptsStorage.internal:
+				tooltip = undefined;
+				break;
 			default:
 				assertNever(promptFile);
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileContributions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileContributions.ts
new file mode 100644
index 00000000000..04e1853ddd5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileContributions.ts
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { PromptLinkProvider } from '../../common/promptSyntax/languageProviders/promptLinkProvider.js';
+import { PromptBodyAutocompletion } from '../../common/promptSyntax/languageProviders/promptBodyAutocompletion.js';
+import { PromptHeaderAutocompletion } from '../../common/promptSyntax/languageProviders/promptHeaderAutocompletion.js';
+import { PromptHoverProvider } from '../../common/promptSyntax/languageProviders/promptHovers.js';
+import { PromptHeaderDefinitionProvider } from '../../common/promptSyntax/languageProviders/PromptHeaderDefinitionProvider.js';
+import { MARKERS_OWNER_ID, PromptValidator } from '../../common/promptSyntax/languageProviders/promptValidator.js';
+import { PromptDocumentSemanticTokensProvider } from '../../common/promptSyntax/languageProviders/promptDocumentSemanticTokensProvider.js';
+import { PromptCodeActionProvider } from '../../common/promptSyntax/languageProviders/promptCodeActions.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ALL_PROMPTS_LANGUAGE_SELECTOR, getPromptsTypeForLanguageId, PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { IMarkerData, IMarkerService } from '../../../../../platform/markers/common/markers.js';
+import { ILanguageModelsService } from '../../common/languageModels.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.js';
+import { IChatModeService } from '../../common/chatModes.js';
+import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { URI } from '../../../../../base/common/uri.js';
+
+export class PromptLanguageFeaturesProvider extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'chat.promptLanguageFeatures';
+
+	constructor(
+		@ILanguageFeaturesService languageService: ILanguageFeaturesService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this._register(languageService.linkProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptLinkProvider)));
+		this._register(languageService.completionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptBodyAutocompletion)));
+		this._register(languageService.completionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptHeaderAutocompletion)));
+		this._register(languageService.hoverProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptHoverProvider)));
+		this._register(languageService.definitionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptHeaderDefinitionProvider)));
+		this._register(languageService.documentSemanticTokensProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptDocumentSemanticTokensProvider)));
+		this._register(languageService.codeActionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptCodeActionProvider)));
+
+		this._register(instantiationService.createInstance(PromptValidatorContribution));
+	}
+}
+
+/**
+ * Tracks open code editors and validates prompt models that are visible in an editor.
+ * Only emits markers for models that are currently open in an editor.
+ */
+class PromptValidatorContribution extends Disposable {
+
+	private readonly validator: PromptValidator;
+	private readonly localDisposables = this._register(new DisposableStore());
+
+	constructor(
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMarkerService private readonly markerService: IMarkerService,
+		@IPromptsService private readonly promptsService: IPromptsService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ILanguageModelToolsService private readonly languageModelToolsService: ILanguageModelToolsService,
+		@IChatModeService private readonly chatModeService: IChatModeService,
+	) {
+		super();
+		this.validator = instantiationService.createInstance(PromptValidator);
+
+		this.updateRegistration();
+	}
+
+	updateRegistration(): void {
+		this.localDisposables.clear();
+		const trackers = new ResourceMap<ModelTracker>();
+		this.localDisposables.add(toDisposable(() => {
+			trackers.forEach(tracker => tracker.dispose());
+			trackers.clear();
+		}));
+
+		// Increment the ref count for a model, creating a tracker if needed
+		const acquire = (editor: ICodeEditor): void => {
+			const model = editor.getModel();
+			if (!model) {
+				return;
+			}
+			const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
+			if (promptType) {
+				const existing = trackers.get(model.uri);
+				if (existing) {
+					existing.refCount++;
+					return;
+				}
+				trackers.set(model.uri, new ModelTracker(model, promptType, this.validator, this.promptsService, this.markerService));
+			}
+		};
+
+		// Decrement the ref count, disposing the tracker when it reaches zero
+		const release = (uri: URI): void => {
+			const tracker = trackers.get(uri);
+			if (tracker && --tracker.refCount === 0) {
+				tracker.dispose();
+				trackers.delete(uri);
+			}
+		};
+
+		const perEditorDisposables = new DisposableMap<string, DisposableStore>();
+		this.localDisposables.add(perEditorDisposables);
+
+		const onCodeEditorAdd = (editor: ICodeEditor) => {
+			acquire(editor);
+			const store = new DisposableStore();
+			// Track model changes within the editor (e.g. when a different file is opened in the same editor)
+			store.add(editor.onDidChangeModel((e) => {
+				if (e.oldModelUrl) {
+					release(e.oldModelUrl);
+				}
+				acquire(editor);
+			}));
+			store.add(editor.onDidChangeModelLanguage((e) => {
+				const model = editor.getModel();
+				if (model) {
+					release(model.uri);
+					acquire(editor);
+				}
+			}));
+			perEditorDisposables.set(editor.getId(), store);
+		};
+
+		// Track models from editors that are currently open
+		for (const editor of this.codeEditorService.listCodeEditors()) {
+			onCodeEditorAdd(editor);
+		}
+
+		// When an editor is added, start tracking its model
+		this.localDisposables.add(this.codeEditorService.onCodeEditorAdd((editor: ICodeEditor) => {
+			onCodeEditorAdd(editor);
+		}));
+
+		// When an editor is removed, clean up its per-editor listeners and release its model
+		this.localDisposables.add(this.codeEditorService.onCodeEditorRemove((editor: ICodeEditor) => {
+			perEditorDisposables.deleteAndDispose(editor.getId());
+			const model = editor.getModel();
+			if (model) {
+				release(model.uri);
+			}
+		}));
+
+		const validateAll = (): void => trackers.forEach(tracker => tracker.validate());
+		this.localDisposables.add(this.languageModelToolsService.onDidChangeTools(() => validateAll()));
+		this.localDisposables.add(this.chatModeService.onDidChangeChatModes(() => validateAll()));
+		this.localDisposables.add(this.languageModelsService.onDidChangeLanguageModels(() => validateAll()));
+	}
+}
+
+class ModelTracker extends Disposable {
+
+	public refCount = 1;
+	private readonly delayer: Delayer<void>;
+
+	constructor(
+		private readonly textModel: ITextModel,
+		private readonly promptType: PromptsType,
+		private readonly validator: PromptValidator,
+		private readonly promptsService: IPromptsService,
+		private readonly markerService: IMarkerService,
+	) {
+		super();
+		this.delayer = this._register(new Delayer<void>(200));
+		this._register(textModel.onDidChangeContent(() => this.validate()));
+		this.validate();
+	}
+
+	public validate(): void {
+		this.delayer.trigger(async () => {
+			const markers: IMarkerData[] = [];
+			const ast = this.promptsService.getParsedPromptFile(this.textModel);
+			await this.validator.validate(ast, this.promptType, m => markers.push(m));
+			if (!this._store.isDisposed) {
+				this.markerService.changeOne(MARKERS_OWNER_ID, this.textModel.uri, markers);
+			}
+		});
+	}
+
+	public override dispose() {
+		this.markerService.remove(MARKERS_OWNER_ID, [this.textModel.uri]);
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.ts
index b77665f2351..5e8f2943516 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.ts
@@ -84,7 +84,7 @@ export class PromptUrlHandler extends Disposable implements IWorkbenchContributi
 				return true;
 			}
 
-			const result = await this.requestService.request({ type: 'GET', url: urlString }, CancellationToken.None);
+			const result = await this.requestService.request({ type: 'GET', url: urlString, callSite: 'promptUrlHandler.resolveUrl' }, CancellationToken.None);
 			if (result.res.statusCode !== 200) {
 				this.logService.error(`[PromptUrlHandler] Failed to fetch URL: ${urlString}`);
 				this.notificationService.error(localize('failed', 'Failed to fetch URL: {0}', urlString));
diff --git a/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.ts b/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.ts
index b0d9906c3fa..85c07a6c599 100644
--- a/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.ts
@@ -14,7 +14,7 @@ import { IPromptDiscoveryInfo, IPromptsService } from '../common/promptSyntax/se
  *
  * This contribution listens for discovery events emitted by the prompts service
  * and forwards them as debug log entries. It also registers a resolve provider
- * so expanding a discovery event in the debug panel shows the full file list.
+ * so expanding a discovery event in the Agent Debug Logs shows the full file list.
  */
 export class PromptsDebugContribution extends Disposable implements IWorkbenchContribution {
 
@@ -58,7 +58,10 @@ export class PromptsDebugContribution extends Disposable implements IWorkbenchCo
 			if (entry.discoveryInfo) {
 				const info = entry.discoveryInfo;
 				const loaded = info.files.filter(f => f.status === 'loaded').map(f => f.name ?? f.uri.path.split('/').pop() ?? f.uri.toString());
-				const skipped = info.files.filter(f => f.status === 'skipped').map(f => f.name ?? f.uri.path.split('/').pop() ?? f.uri.toString());
+				const skipped = info.files.filter(f => f.status === 'skipped').map(f => {
+					const label = f.uri.toString();
+					return f.skipReason ? `${label} (${f.skipReason})` : label;
+				});
 				const folders = info.sourceFolders?.map(sf => sf.uri.path) ?? [];
 				const parts: string[] = [];
 				if (details) { parts.push(details); }
@@ -78,7 +81,7 @@ export class PromptsDebugContribution extends Disposable implements IWorkbenchCo
 		}));
 
 		// Register a resolve provider so expanding a discovery event
-		// in the debug panel shows the full file list.
+		// in the Agent Debug Logs shows the full file list.
 		this._register(chatDebugService.registerProvider({
 			provideChatDebugLog: async () => undefined,
 			resolveChatDebugLogEvent: async (eventId) => {
diff --git a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts
index 3661f5a27c3..ed9457893d3 100644
--- a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts
+++ b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts
@@ -19,11 +19,22 @@ import { IToolData, ToolDataSource } from '../../common/tools/languageModelTools
 const RUN_WITHOUT_APPROVAL = localize('runWithoutApproval', "without approval");
 const CONTINUE_WITHOUT_REVIEWING_RESULTS = localize('continueWithoutReviewingResults', "without reviewing result");
 
+/**
+ * Represents an auto-confirmation entry in the confirm store.
+ * When `confirmed` is true, the tool/combination is auto-confirmed.
+ * When `label` is set, it provides a human-readable description
+ * for display in the management UI.
+ */
+interface IAutoConfirmEntry {
+	readonly confirmed: true;
+	readonly label?: string;
+}
+
 
 class GenericConfirmStore extends Disposable {
 	private _workspaceStore: Lazy<ToolConfirmStore>;
 	private _profileStore: Lazy<ToolConfirmStore>;
-	private _memoryStore = new Set<string>();
+	private _memoryStore = new Map<string, IAutoConfirmEntry>();
 
 	constructor(
 		private readonly _storageKey: string,
@@ -34,19 +45,20 @@ class GenericConfirmStore extends Disposable {
 		this._profileStore = new Lazy(() => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.PROFILE, this._storageKey)));
 	}
 
-	public setAutoConfirmation(id: string, scope: 'workspace' | 'profile' | 'session' | 'never'): void {
+	public setAutoConfirmation(id: string, scope: 'workspace' | 'profile' | 'session' | 'never', label?: string): void {
 		// Clear from all scopes first
-		this._workspaceStore.value.setAutoConfirm(id, false);
-		this._profileStore.value.setAutoConfirm(id, false);
+		this._workspaceStore.value.setAutoConfirm(id, undefined);
+		this._profileStore.value.setAutoConfirm(id, undefined);
 		this._memoryStore.delete(id);
 
+		const entry: IAutoConfirmEntry = { confirmed: true, label };
 		// Set in the appropriate scope
 		if (scope === 'workspace') {
-			this._workspaceStore.value.setAutoConfirm(id, true);
+			this._workspaceStore.value.setAutoConfirm(id, entry);
 		} else if (scope === 'profile') {
-			this._profileStore.value.setAutoConfirm(id, true);
+			this._profileStore.value.setAutoConfirm(id, entry);
 		} else if (scope === 'session') {
-			this._memoryStore.add(id);
+			this._memoryStore.set(id, entry);
 		}
 	}
 
@@ -65,14 +77,20 @@ class GenericConfirmStore extends Disposable {
 
 	public getAutoConfirmationIn(id: string, scope: 'workspace' | 'profile' | 'session'): boolean {
 		if (scope === 'workspace') {
-			return this._workspaceStore.value.getAutoConfirm(id);
+			return !!this._workspaceStore.value.getAutoConfirm(id);
 		} else if (scope === 'profile') {
-			return this._profileStore.value.getAutoConfirm(id);
+			return !!this._profileStore.value.getAutoConfirm(id);
 		} else {
 			return this._memoryStore.has(id);
 		}
 	}
 
+	public getLabel(id: string): string | undefined {
+		return this._workspaceStore.value.getAutoConfirm(id)?.label
+			?? this._profileStore.value.getAutoConfirm(id)?.label
+			?? this._memoryStore.get(id)?.label;
+	}
+
 	public reset(): void {
 		this._workspaceStore.value.reset();
 		this._profileStore.value.reset();
@@ -100,7 +118,7 @@ class GenericConfirmStore extends Disposable {
 		for (const key of this._profileStore.value.getAll()) {
 			all.add(key);
 		}
-		for (const key of this._memoryStore) {
+		for (const key of this._memoryStore.keys()) {
 			all.add(key);
 		}
 		return all;
@@ -108,7 +126,7 @@ class GenericConfirmStore extends Disposable {
 }
 
 class ToolConfirmStore extends Disposable {
-	private _autoConfirmTools: LRUCache<string, boolean> = new LRUCache<string, boolean>(100);
+	private _autoConfirmTools: LRUCache<string, IAutoConfirmEntry> = new LRUCache<string, IAutoConfirmEntry>(100);
 	private _didChange = false;
 
 	constructor(
@@ -118,16 +136,34 @@ class ToolConfirmStore extends Disposable {
 	) {
 		super();
 
-		const stored = storageService.getObject<string[]>(this._storageKey, this._scope);
-		if (stored) {
-			for (const key of stored) {
-				this._autoConfirmTools.set(key, true);
+		// Read stored data — supports both legacy string[] and new Record<string, string | boolean> formats
+		const raw = storageService.get(this._storageKey, this._scope);
+		if (raw) {
+			try {
+				const parsed = JSON.parse(raw);
+				if (Array.isArray(parsed)) {
+					// Legacy format: string[]
+					for (const key of parsed) {
+						this._autoConfirmTools.set(key, { confirmed: true });
+					}
+				} else if (typeof parsed === 'object' && parsed !== null) {
+					// New format: Record<string, string | boolean>
+					for (const [key, value] of Object.entries(parsed)) {
+						this._autoConfirmTools.set(key, { confirmed: true, label: typeof value === 'string' ? value : undefined });
+					}
+				}
+			} catch {
+				// Ignore malformed data
 			}
 		}
 
 		this._register(storageService.onWillSaveState(() => {
 			if (this._didChange) {
-				this.storageService.store(this._storageKey, [...this._autoConfirmTools.keys()], this._scope, StorageTarget.MACHINE);
+				const data: Record<string, string | boolean> = {};
+				for (const [key, entry] of this._autoConfirmTools) {
+					data[key] = entry.label ?? true;
+				}
+				this.storageService.store(this._storageKey, JSON.stringify(data), this._scope, StorageTarget.MACHINE);
 				this._didChange = false;
 			}
 		}));
@@ -138,20 +174,20 @@ class ToolConfirmStore extends Disposable {
 		this._didChange = true;
 	}
 
-	public getAutoConfirm(id: string): boolean {
-		if (this._autoConfirmTools.get(id)) {
+	public getAutoConfirm(id: string): IAutoConfirmEntry | undefined {
+		const entry = this._autoConfirmTools.get(id);
+		if (entry) {
 			this._didChange = true;
-			return true;
+			return entry;
 		}
-
-		return false;
+		return undefined;
 	}
 
-	public setAutoConfirm(id: string, autoConfirm: boolean): void {
-		if (autoConfirm) {
-			this._autoConfirmTools.set(id, true);
-		} else {
+	public setAutoConfirm(id: string, entry: IAutoConfirmEntry | undefined): void {
+		if (!entry) {
 			this._autoConfirmTools.delete(id);
+		} else {
+			this._autoConfirmTools.set(id, entry);
 		}
 		this._didChange = true;
 	}
@@ -168,6 +204,7 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 	private _postExecutionToolConfirmStore: GenericConfirmStore;
 	private _preExecutionServerConfirmStore: GenericConfirmStore;
 	private _postExecutionServerConfirmStore: GenericConfirmStore;
+	private _combinationConfirmStore: GenericConfirmStore;
 
 	private _contributions = new Map<string, ILanguageModelToolConfirmationContribution>();
 
@@ -181,6 +218,7 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 		this._postExecutionToolConfirmStore = this._register(new GenericConfirmStore('chat/autoconfirm-post', this._instantiationService));
 		this._preExecutionServerConfirmStore = this._register(new GenericConfirmStore('chat/servers/autoconfirm', this._instantiationService));
 		this._postExecutionServerConfirmStore = this._register(new GenericConfirmStore('chat/servers/autoconfirm-post', this._instantiationService));
+		this._combinationConfirmStore = this._register(new GenericConfirmStore('chat/autoconfirm-combination', this._instantiationService));
 	}
 
 	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
@@ -198,6 +236,14 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 			return undefined;
 		}
 
+		// Check combination-level confirmation
+		if (ref.combination) {
+			const combinationResult = this._combinationConfirmStore.checkAutoConfirmation(ref.combination.key);
+			if (combinationResult) {
+				return combinationResult;
+			}
+		}
+
 		// Check tool-level confirmation
 		const toolResult = this._preExecutionToolConfirmStore.checkAutoConfirmation(ref.toolId);
 		if (toolResult) {
@@ -261,6 +307,41 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 			return actions;
 		}
 
+		// Add combination-level actions when approveCombination is provided
+		if (ref.combination) {
+			const { label: combinationLabel, key: combinationKey } = ref.combination;
+			actions.push(
+				{
+					label: localize('allowCombinationSession', '{0} in this Session', combinationLabel),
+					detail: localize('allowCombinationSessionTooltip', 'Allow this particular combination of tool and arguments in this session without confirmation.'),
+					divider: !!actions.length,
+					scope: 'session',
+					select: async () => {
+						this._combinationConfirmStore.setAutoConfirmation(combinationKey, 'session', combinationLabel);
+						return true;
+					}
+				},
+				{
+					label: localize('allowCombinationWorkspace', '{0} in this Workspace', combinationLabel),
+					detail: localize('allowCombinationWorkspaceTooltip', 'Allow this particular combination of tool and arguments in this workspace without confirmation.'),
+					scope: 'workspace',
+					select: async () => {
+						this._combinationConfirmStore.setAutoConfirmation(combinationKey, 'workspace', combinationLabel);
+						return true;
+					}
+				},
+				{
+					label: localize('allowCombinationGlobally', 'Always {0}', combinationLabel),
+					detail: localize('allowCombinationGloballyTooltip', 'Always allow this particular combination of tool and arguments without confirmation.'),
+					scope: 'profile',
+					select: async () => {
+						this._combinationConfirmStore.setAutoConfirmation(combinationKey, 'profile', combinationLabel);
+						return true;
+					}
+				},
+			);
+		}
+
 		// Add default tool-level actions
 		actions.push(
 			{
@@ -429,15 +510,39 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 			|| !!tool.canRequestPostApproval
 			|| this._contributions.has(tool.id)
 			|| !!this._preExecutionToolConfirmStore.checkAutoConfirmation(tool.id)
-			|| !!this._postExecutionToolConfirmStore.checkAutoConfirmation(tool.id);
+			|| !!this._postExecutionToolConfirmStore.checkAutoConfirmation(tool.id)
+			|| this._hasCombinationApprovalsForTool(tool.id);
+	}
+
+	private _hasCombinationApprovalsForTool(toolId: string): boolean {
+		const prefix = toolId + ':combination:';
+		for (const key of this._combinationConfirmStore.getAllConfirmed()) {
+			if (key.startsWith(prefix)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private _getCombinationApprovalsForTool(toolId: string, scope: 'workspace' | 'profile' | 'session'): { key: string; label: string }[] {
+		const prefix = toolId + ':combination:';
+		const results: { key: string; label: string }[] = [];
+		for (const key of this._combinationConfirmStore.getAllConfirmed()) {
+			if (key.startsWith(prefix) && this._combinationConfirmStore.getAutoConfirmationIn(key, scope)) {
+				const label = this._combinationConfirmStore.getLabel(key) ?? key;
+				results.push({ key, label });
+			}
+		}
+		return results;
 	}
 
 	manageConfirmationPreferences(tools: readonly IToolData[], options?: { defaultScope?: 'workspace' | 'profile' | 'session'; focusToolId?: string }): void {
 		interface IToolTreeItem extends IQuickTreeItem {
-			type: 'tool' | 'server' | 'tool-pre' | 'tool-post' | 'server-pre' | 'server-post' | 'manage';
+			type: 'tool' | 'server' | 'tool-pre' | 'tool-post' | 'server-pre' | 'server-post' | 'manage' | 'combination';
 			toolId?: string;
 			serverId?: string;
 			scope?: 'workspace' | 'profile';
+			combinationKey?: string;
 		}
 
 		// Helper to track tools under servers
@@ -491,6 +596,14 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 			}
 		}
 
+		// Add tools that have combination approvals
+		for (const tool of tools) {
+			if (!relevantTools.has(tool.id) && this._hasCombinationApprovalsForTool(tool.id)) {
+				relevantTools.add(tool.id);
+				addServerToolFromSource(tool.source, tool.id, serversWithTools);
+			}
+		}
+
 		if (relevantTools.size === 0) {
 			return; // Nothing to show
 		}
@@ -546,6 +659,18 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 						});
 					}
 
+					// Add combination approval children
+					const combinationApprovals = this._getCombinationApprovalsForTool(tool.id, currentScope);
+					for (const { key, label } of combinationApprovals) {
+						toolChildren.push({
+							type: 'combination',
+							toolId: tool.id,
+							combinationKey: key,
+							label,
+							checked: true,
+						});
+					}
+
 					// Tool item always has a checkbox
 					const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
 					const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
@@ -561,6 +686,9 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 					} else if (hasPost) {
 						checked = postApproval;
 						description = CONTINUE_WITHOUT_REVIEWING_RESULTS;
+					} else if (toolChildren.length > 0) {
+						// Tool has combination approvals only
+						checked = false;
 					} else {
 						continue;
 					}
@@ -672,6 +800,18 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 						});
 					}
 
+					// Add combination approval children
+					const combinationApprovals = this._getCombinationApprovalsForTool(tool.id, currentScope);
+					for (const { key, label } of combinationApprovals) {
+						toolChildren.push({
+							type: 'combination',
+							toolId: tool.id,
+							combinationKey: key,
+							label,
+							checked: true,
+						});
+					}
+
 					// Tool item always has a checkbox
 					const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
 					const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
@@ -760,6 +900,15 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 				if (tool?.canRequestPreApproval || newState === 'never') {
 					this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
 				}
+				// Also clear combination approvals when unchecking the tool
+				if (newState === 'never') {
+					for (const key of this._combinationConfirmStore.getAllConfirmed()) {
+						if (key.startsWith(item.toolId + ':combination:')) {
+							this._combinationConfirmStore.setAutoConfirmation(key, 'never');
+						}
+					}
+				}
+				quickTree.setItemTree(buildTreeItems());
 			} else if (item.type === 'tool-pre' && item.toolId) {
 				this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
 			} else if (item.type === 'tool-post' && item.toolId) {
@@ -772,6 +921,9 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 				quickTree.setItemTree(buildTreeItems());
 			} else if (item.type === 'manage') {
 				(item as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidChangeChecked?.(!!item.checked);
+			} else if (item.type === 'combination' && item.combinationKey) {
+				this._combinationConfirmStore.setAutoConfirmation(item.combinationKey, newState);
+				quickTree.setItemTree(buildTreeItems());
 			}
 		}));
 
@@ -787,6 +939,8 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 				quickTree.hide();
 				await (manageItem as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidOpen?.();
 				this.manageConfirmationPreferences(tools, options);
+			} else {
+				quickTree.hide();
 			}
 		}));
 
@@ -819,6 +973,7 @@ export class LanguageModelToolsConfirmationService extends Disposable implements
 		this._postExecutionToolConfirmStore.reset();
 		this._preExecutionServerConfirmStore.reset();
 		this._postExecutionServerConfirmStore.reset();
+		this._combinationConfirmStore.reset();
 
 		// Reset all contributions
 		for (const contribution of this._contributions.values()) {
diff --git a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts
index 5deef252f00..0692eb9db67 100644
--- a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts
@@ -16,6 +16,7 @@ import { Emitter, Event } from '../../../../../base/common/event.js';
 import { createMarkdownCommandLink, MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
 import { combinedDisposable, Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { getMediaMime } from '../../../../../base/common/mime.js';
 import { derived, derivedOpts, IObservable, IReader, observableFromEventOpts, ObservableSet, observableSignal, transaction } from '../../../../../base/common/observable.js';
 import Severity from '../../../../../base/common/severity.js';
 import { StopWatch } from '../../../../../base/common/stopwatch.js';
@@ -41,10 +42,11 @@ import { ChatRequestToolReferenceEntry, toToolSetVariableEntry, toToolVariableEn
 import { IVariableReference } from '../../common/chatModes.js';
 import { ConfirmedReason, IChatService, IChatToolInvocation, ToolConfirmKind } from '../../common/chatService/chatService.js';
 import { ChatConfiguration, isAutoApproveLevel } from '../../common/constants.js';
+import { localChatSessionType } from '../../common/chatSessionsService.js';
 import { ILanguageModelChatMetadata } from '../../common/languageModels.js';
 import { IChatModel, IChatRequestModel } from '../../common/model/chatModel.js';
 import { ChatToolInvocation } from '../../common/model/chatProgressTypes/chatToolInvocation.js';
-import { chatSessionResourceToId } from '../../common/model/chatUri.js';
+import { chatSessionResourceToId, getChatSessionType } from '../../common/model/chatUri.js';
 import { HookType } from '../../common/promptSyntax/hookTypes.js';
 import { ILanguageModelToolsConfirmationService } from '../../common/tools/languageModelToolsConfirmationService.js';
 import { CountTokensCallback, createToolSchemaUri, IBeginToolCallOptions, IExternalPreToolUseHookResult, ILanguageModelToolsService, IPreparedToolInvocation, isToolSet, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolInvokedEvent, IToolResult, IToolResultInputOutputDetails, IToolSet, SpecedToolAliases, stringifyPromptTsxPart, ToolDataSource, ToolInvocationPresentation, toolMatchesModel, ToolSet, ToolSetForModel, VSCodeToolReference } from '../../common/tools/languageModelToolsService.js';
@@ -580,7 +582,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 					toolInvocation.transitionFromStreaming(preparedInvocation, dto.parameters, autoConfirmed);
 				} else {
 					// Create a new tool invocation (no streaming phase)
-					toolInvocation = new ChatToolInvocation(preparedInvocation, tool.data, dto.callId, dto.subAgentInvocationId, dto.parameters);
+					toolInvocation = new ChatToolInvocation(preparedInvocation, tool.data, dto.chatStreamToolCallId ?? dto.callId, dto.subAgentInvocationId, dto.parameters);
 					if (autoConfirmed) {
 						IChatToolInvocation.confirmWith(toolInvocation, autoConfirmed);
 					}
@@ -643,7 +645,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 				}
 			}, token);
 			invocationTimeWatch.stop();
-			this.ensureToolDetails(dto, toolResult, tool.data);
+			this.ensureToolDetails(dto, toolResult, tool.data, toolInvocation);
 
 			const afterExecuteState = await toolInvocation?.didExecuteTool(toolResult, undefined, () =>
 				this.shouldAutoConfirmPostExecution(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters, dto.context?.sessionResource, dto.chatRequestId));
@@ -796,7 +798,15 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		}
 
 		// No hook decision - use normal auto-confirm logic
-		const autoConfirmed = await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters, sessionResource, dto.chatRequestId);
+		const approveCombination = preparedInvocation?.confirmationMessages?.approveCombination;
+		let combination: { label: string; key: string } | undefined;
+		if (approveCombination) {
+			combination = {
+				label: typeof approveCombination.label === 'string' ? approveCombination.label : approveCombination.label.value,
+				key: approveCombination.key,
+			};
+		}
+		const autoConfirmed = await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters, sessionResource, dto.chatRequestId, combination);
 		return { autoConfirmed, preparedInvocation };
 	}
 
@@ -983,8 +993,8 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		}
 	}
 
-	private ensureToolDetails(dto: IToolInvocation, toolResult: IToolResult, toolData: IToolData): void {
-		if (!toolResult.toolResultDetails && toolData.alwaysDisplayInputOutput) {
+	private ensureToolDetails(dto: IToolInvocation, toolResult: IToolResult, toolData: IToolData, toolInvocation: ChatToolInvocation | undefined): void {
+		if (!toolResult.toolResultDetails && (toolData.alwaysDisplayInputOutput || (this.toolResultHasImages(toolResult) && !this.toolResultMessageHasImageFileWidgets(toolResult, toolInvocation)))) {
 			toolResult.toolResultDetails = {
 				input: this.formatToolInput(dto),
 				output: this.toolResultToIO(toolResult),
@@ -992,6 +1002,41 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		}
 	}
 
+	private toolResultHasImages(toolResult: IToolResult): boolean {
+		return toolResult.content.some(part => part.kind === 'data' && part.value.mimeType?.startsWith('image/'));
+	}
+
+	/**
+	 * Returns true if the tool result message (or falling back to the tool invocation's
+	 * pastTenseMessage from streaming) contains empty markdown links pointing to image
+	 * files (the `[](imageUri)` pattern) that will be rendered as file pills by renderFileWidgets.
+	 */
+	private toolResultMessageHasImageFileWidgets(toolResult: IToolResult, toolInvocation: ChatToolInvocation | undefined): boolean {
+		// Check toolResult.toolResultMessage first — this is what didExecuteTool will
+		// copy into pastTenseMessage, and it's already available at this point.
+		// Fall back to pastTenseMessage which may have been set during the streaming phase.
+		const message = toolResult.toolResultMessage ?? toolInvocation?.pastTenseMessage;
+		if (!message) {
+			return false;
+		}
+		const value = typeof message === 'string' ? message : message.value;
+		// Match empty-text markdown links: [](uri) or [ ](uri), capturing the uri
+		const linkPattern = /\[\s*\]\((?<uri>[^)]+)\)/g;
+		let match: RegExpExecArray | null;
+		while ((match = linkPattern.exec(value)) !== null) {
+			try {
+				const parsed = URI.parse(match.groups!.uri);
+				const mime = getMediaMime(parsed.path);
+				if (mime?.startsWith('image/')) {
+					return true;
+				}
+			} catch {
+				// Invalid URI, skip
+			}
+		}
+		return false;
+	}
+
 	private formatToolInput(dto: IToolInvocation): string {
 		return JSON.stringify(dto.parameters, undefined, 2);
 	}
@@ -1074,7 +1119,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		return true;
 	}
 
-	private async shouldAutoConfirm(toolId: string, runsInWorkspace: boolean | undefined, source: ToolDataSource, parameters: unknown, chatSessionResource: URI | undefined, chatRequestId: string | undefined): Promise<ConfirmedReason | undefined> {
+	private async shouldAutoConfirm(toolId: string, runsInWorkspace: boolean | undefined, source: ToolDataSource, parameters: unknown, chatSessionResource: URI | undefined, chatRequestId: string | undefined, combination?: { label: string; key: string }): Promise<ConfirmedReason | undefined> {
 		const tool = this._tools.get(toolId);
 		if (!tool) {
 			return undefined;
@@ -1088,7 +1133,11 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 			const model = this._chatService.getSession(chatSessionResource);
 			const request = model?.getRequests().at(-1);
 			if (isAutoApproveLevel(request?.modeInfo?.permissionLevel) || this._isSessionLiveAutoApproveLevel(chatSessionResource)) {
-				return { type: ToolConfirmKind.ConfirmationNotNeeded, reason: 'auto-approve-all' };
+				// CLI sessions must always show their multi-option confirmation dialogs
+				// (e.g. uncommitted-changes prompt) even under Bypass Approvals
+				if (!(toolIdsThatCannotBeAutoApproved.has(tool.data.id) && getChatSessionType(chatSessionResource) !== localChatSessionType)) {
+					return { type: ToolConfirmKind.ConfirmationNotNeeded, reason: 'auto-approve-all' };
+				}
 			}
 		}
 
@@ -1096,7 +1145,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 			return undefined;
 		}
 
-		const reason = this._confirmationService.getPreConfirmAction({ toolId, source, parameters, chatSessionResource });
+		const reason = this._confirmationService.getPreConfirmAction({ toolId, source, parameters, chatSessionResource, combination });
 		if (reason) {
 			return reason;
 		}
@@ -1131,7 +1180,9 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 			const model = this._chatService.getSession(chatSessionResource);
 			const request = model?.getRequests().at(-1);
 			if (isAutoApproveLevel(request?.modeInfo?.permissionLevel) || this._isSessionLiveAutoApproveLevel(chatSessionResource)) {
-				return { type: ToolConfirmKind.ConfirmationNotNeeded, reason: 'auto-approve-all' };
+				if (!(toolIdsThatCannotBeAutoApproved.has(toolId) && getChatSessionType(chatSessionResource) !== localChatSessionType)) {
+					return { type: ToolConfirmKind.ConfirmationNotNeeded, reason: 'auto-approve-all' };
+				}
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/tools/renameTool.ts b/src/vs/workbench/contrib/chat/browser/tools/renameTool.ts
index fef06150ff0..0ddb27fa1ff 100644
--- a/src/vs/workbench/contrib/chat/browser/tools/renameTool.ts
+++ b/src/vs/workbench/contrib/chat/browser/tools/renameTool.ts
@@ -15,6 +15,7 @@ import { TextEdit } from '../../../../../editor/common/languages.js';
 import { IBulkEditService, ResourceTextEdit } from '../../../../../editor/browser/services/bulkEditService.js';
 import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { rename } from '../../../../../editor/contrib/rename/browser/rename.js';
 import { localize } from '../../../../../nls.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -53,6 +54,7 @@ export class RenameTool extends Disposable implements IToolImpl {
 
 	constructor(
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@ILanguageService private readonly _languageService: ILanguageService,
 		@ITextModelService private readonly _textModelService: ITextModelService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 		@IChatService private readonly _chatService: IChatService,
@@ -67,26 +69,31 @@ export class RenameTool extends Disposable implements IToolImpl {
 		)((() => this._onDidUpdateToolData.fire())));
 	}
 
-	getToolData(): IToolData {
+	getToolData(): IToolData | undefined {
 		const languageIds = this._languageFeaturesService.renameProvider.registeredLanguageIds;
 
-		let modelDescription = BaseModelDescription;
-		if (languageIds.has('*')) {
-			modelDescription += '\n\nSupported for all languages.';
-		} else if (languageIds.size > 0) {
-			const sorted = [...languageIds].sort();
-			modelDescription += `\n\nCurrently supported for: ${sorted.join(', ')}.`;
-		} else {
-			modelDescription += '\n\nNo languages currently have rename providers registered.';
+		if (languageIds.size === 0) {
+			return undefined;
 		}
 
+		let modelDescription = BaseModelDescription;
+		let userDescription: string;
+		if (languageIds.has('*')) {
+			modelDescription += '\n\nSupported for all languages.';
+			userDescription = localize('tool.rename.userDescription', 'Rename a symbol across the workspace');
+		} else {
+			const sorted = [...languageIds].sort();
+			modelDescription += `\n\nCurrently supported for: ${sorted.join(', ')}.`;
+			const niceNames = sorted.map(id => this._languageService.getLanguageName(id) ?? id);
+			userDescription = localize('tool.rename.userDescriptionWithLanguages', 'Rename a symbol across the workspace ({0})', niceNames.join(', '));
+		}
 		return {
 			id: RenameToolId,
 			toolReferenceName: 'rename',
 			canBeReferencedInPrompt: false,
 			icon: ThemeIcon.fromId(Codicon.rename.id),
 			displayName: localize('tool.rename.displayName', 'Rename Symbol'),
-			userDescription: localize('tool.rename.userDescription', 'Rename a symbol across the workspace'),
+			userDescription,
 			modelDescription,
 			source: ToolDataSource.Internal,
 			when: ContextKeyExpr.has('config.chat.tools.renameTool.enabled'),
@@ -251,9 +258,12 @@ export class RenameToolContribution extends Disposable implements IWorkbenchCont
 		let registration: IDisposable | undefined;
 		const registerRenameTool = () => {
 			registration?.dispose();
+			registration = undefined;
 			toolsService.flushToolUpdates();
 			const toolData = renameTool.getToolData();
-			registration = toolsService.registerTool(toolData, renameTool);
+			if (toolData) {
+				registration = toolsService.registerTool(toolData, renameTool);
+			}
 		};
 		registerRenameTool();
 		this._store.add(renameTool.onDidUpdateToolData(registerRenameTool));
diff --git a/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts b/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
index 1360fbcba5c..96618b9afc4 100644
--- a/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
@@ -14,7 +14,7 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { assertType, isObject } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize, localize2 } from '../../../../../nls.js';
-import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
@@ -37,6 +37,7 @@ import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ChatViewId } from '../chat.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ChatConfiguration } from '../../common/constants.js';
 
 
 const toolEnumValues: string[] = [];
@@ -323,12 +324,18 @@ export class ConfigureToolSets extends Action2 {
 			category: CHAT_CATEGORY,
 			f1: true,
 			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0)),
-			menu: {
+			menu: [{
 				id: CHAT_CONFIG_MENU_ID,
 				when: ContextKeyExpr.equals('view', ChatViewId),
 				order: 11,
 				group: '2_level'
 			},
+			{
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId), ContextKeyExpr.has(`config.${ChatConfiguration.ChatCustomizationMenuEnabled}`)),
+				order: 11,
+				group: '2_level'
+			}],
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/tools/usagesTool.ts b/src/vs/workbench/contrib/chat/browser/tools/usagesTool.ts
index 075977bc799..6f8f708ee01 100644
--- a/src/vs/workbench/contrib/chat/browser/tools/usagesTool.ts
+++ b/src/vs/workbench/contrib/chat/browser/tools/usagesTool.ts
@@ -11,13 +11,14 @@ import { escapeRegExpCharacters } from '../../../../../base/common/strings.js';
 import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { relativePath } from '../../../../../base/common/resources.js';
+import { isEqual, relativePath } from '../../../../../base/common/resources.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { Location, LocationLink } from '../../../../../editor/common/languages.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
 import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { getDefinitionsAtPosition, getImplementationsAtPosition, getReferencesAtPosition } from '../../../../../editor/contrib/gotoSymbol/browser/goToSymbol.js';
 import { localize } from '../../../../../nls.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -50,6 +51,7 @@ export class UsagesTool extends Disposable implements IToolImpl {
 
 	constructor(
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@ILanguageService private readonly _languageService: ILanguageService,
 		@IModelService private readonly _modelService: IModelService,
 		@ISearchService private readonly _searchService: ISearchService,
 		@ITextModelService private readonly _textModelService: ITextModelService,
@@ -64,17 +66,23 @@ export class UsagesTool extends Disposable implements IToolImpl {
 		)((() => this._onDidUpdateToolData.fire())));
 	}
 
-	getToolData(): IToolData {
+	getToolData(): IToolData | undefined {
 		const languageIds = this._languageFeaturesService.referenceProvider.registeredLanguageIds;
 
+		if (languageIds.size === 0) {
+			return undefined;
+		}
+
 		let modelDescription = BaseModelDescription;
+		let userDescription: string;
 		if (languageIds.has('*')) {
 			modelDescription += '\n\nSupported for all languages.';
-		} else if (languageIds.size > 0) {
+			userDescription = localize('tool.usages.userDescription', 'Find references, definitions, and implementations of a symbol');
+		} else {
 			const sorted = [...languageIds].sort();
 			modelDescription += `\n\nCurrently supported for: ${sorted.join(', ')}.`;
-		} else {
-			modelDescription += '\n\nNo languages currently have reference providers registered.';
+			const niceNames = sorted.map(id => this._languageService.getLanguageName(id) ?? id);
+			userDescription = localize('tool.usages.userDescriptionWithLanguages', 'Find references, definitions, and implementations of a symbol ({0})', niceNames.join(', '));
 		}
 
 		return {
@@ -83,7 +91,7 @@ export class UsagesTool extends Disposable implements IToolImpl {
 			canBeReferencedInPrompt: false,
 			icon: ThemeIcon.fromId(Codicon.references.id),
 			displayName: localize('tool.usages.displayName', 'List Code Usages'),
-			userDescription: localize('tool.usages.userDescription', 'Find references, definitions, and implementations of a symbol'),
+			userDescription,
 			modelDescription,
 			source: ToolDataSource.Internal,
 			when: ContextKeyExpr.has('config.chat.tools.usagesTool.enabled'),
@@ -297,7 +305,7 @@ export class UsagesTool extends Disposable implements IToolImpl {
 	}
 
 	private _overlaps(a: LocationLink, b: LocationLink): boolean {
-		if (a.uri.toString() !== b.uri.toString()) {
+		if (!isEqual(a.uri, b.uri)) {
 			return false;
 		}
 		return Range.areIntersectingOrTouching(a.range, b.range);
@@ -320,9 +328,12 @@ export class UsagesToolContribution extends Disposable implements IWorkbenchCont
 		let registration: IDisposable | undefined;
 		const registerUsagesTool = () => {
 			registration?.dispose();
+			registration = undefined;
 			toolsService.flushToolUpdates();
 			const toolData = usagesTool.getToolData();
-			registration = toolsService.registerTool(toolData, usagesTool);
+			if (toolData) {
+				registration = toolsService.registerTool(toolData, usagesTool);
+			}
 		};
 		registerUsagesTool();
 		this._store.add(usagesTool.onDidUpdateToolData(registerUsagesTool));
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatArtifactsWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatArtifactsWidget.ts
new file mode 100644
index 00000000000..d13f0c86346
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatArtifactsWidget.ts
@@ -0,0 +1,394 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { IObjectTreeElement, ITreeNode, ITreeRenderer } from '../../../../../base/browser/ui/tree/tree.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, IReader } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
+import { WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { IChatArtifact, IChatArtifacts, IChatArtifactsService } from '../../common/tools/chatArtifactsService.js';
+import { IChatImageCarouselService } from '../chatImageCarouselService.js';
+import { getEditorOverrideForChatResource } from './chatContentParts/chatInlineAnchorWidget.js';
+
+const ARTIFACT_TYPE_ICONS: Record<string, ThemeIcon> = {
+	devServer: Codicon.globe,
+	screenshot: Codicon.file,
+	plan: Codicon.book,
+};
+
+/**
+ * A group node in the artifact tree. Groups artifacts by `groupName`.
+ */
+interface IArtifactGroupNode {
+	readonly kind: 'group';
+	readonly groupName: string;
+	readonly artifacts: IChatArtifact[];
+	readonly onlyShowGroup: boolean;
+}
+
+type ArtifactTreeElement = IArtifactGroupNode | IChatArtifact;
+
+function isGroupNode(element: ArtifactTreeElement): element is IArtifactGroupNode {
+	return 'kind' in element && element.kind === 'group';
+}
+
+export class ChatArtifactsWidget extends Disposable {
+	readonly domNode: HTMLElement;
+
+	private readonly _autorunDisposable = this._register(new MutableDisposable());
+	private _currentArtifacts: IChatArtifacts | undefined;
+	private _isCollapsed = false;
+	private _tree: WorkbenchObjectTree<ArtifactTreeElement> | undefined;
+	private readonly _treeStore = this._register(new DisposableStore());
+	private _expandIcon!: HTMLElement;
+	private _titleElement!: HTMLElement;
+	private _clearButton!: Button;
+
+	public static readonly ELEMENT_HEIGHT = 22;
+	private static readonly MAX_ITEMS_SHOWN = 6;
+
+	constructor(
+		@IChatArtifactsService private readonly _chatArtifactsService: IChatArtifactsService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IOpenerService private readonly _openerService: IOpenerService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
+		@IFileDialogService private readonly _fileDialogService: IFileDialogService,
+		@IChatImageCarouselService private readonly _chatImageCarouselService: IChatImageCarouselService,
+	) {
+		super();
+		this.domNode = dom.$('.chat-artifacts-widget');
+		this.domNode.style.display = 'none';
+	}
+
+	render(sessionResource: URI): void {
+		this._currentArtifacts = this._chatArtifactsService.getArtifacts(sessionResource);
+
+		dom.clearNode(this.domNode);
+		this._treeStore.clear();
+
+		const expandoContainer = dom.$('.chat-artifacts-expand');
+		const headerButton = this._treeStore.add(new Button(expandoContainer, { supportIcons: true }));
+		headerButton.element.setAttribute('aria-expanded', String(!this._isCollapsed));
+
+		const titleSection = dom.$('.chat-artifacts-title-section');
+		this._expandIcon = dom.$('.expand-icon.codicon');
+		this._expandIcon.classList.add(this._isCollapsed ? 'codicon-chevron-right' : 'codicon-chevron-down');
+		this._expandIcon.setAttribute('aria-hidden', 'true');
+		this._titleElement = dom.$('.chat-artifacts-title');
+
+		titleSection.appendChild(this._expandIcon);
+		titleSection.appendChild(this._titleElement);
+		headerButton.element.appendChild(titleSection);
+
+		// Add clear button container
+		const clearButtonContainer = dom.$('.artifacts-clear-button-container');
+		this._clearButton = this._treeStore.add(new Button(clearButtonContainer, {
+			supportIcons: true,
+			ariaLabel: localize('chat.artifacts.clearButton', 'Clear all artifacts'),
+		}));
+		this._clearButton.element.tabIndex = 0;
+		this._clearButton.icon = Codicon.clearAll;
+		this._treeStore.add(this._clearButton.onDidClick(() => {
+			this._clearAllArtifacts();
+		}));
+		headerButton.element.appendChild(clearButtonContainer);
+
+		this.domNode.appendChild(expandoContainer);
+
+		const listContainer = dom.$('.chat-artifacts-list');
+		listContainer.style.display = this._isCollapsed ? 'none' : 'block';
+		this.domNode.appendChild(listContainer);
+
+		this._tree = this._treeStore.add(this._instantiationService.createInstance(
+			WorkbenchObjectTree<ArtifactTreeElement>,
+			'ChatArtifactsTree',
+			listContainer,
+			new ChatArtifactsTreeDelegate(),
+			[
+				new ChatArtifactGroupRenderer(),
+				new ChatArtifactLeafRenderer(artifact => this._saveArtifact(artifact)),
+			],
+			{
+				alwaysConsumeMouseWheel: false,
+				accessibilityProvider: new ChatArtifactsAccessibilityProvider(),
+			},
+		));
+
+		this._treeStore.add(this._tree.onDidOpen(e => {
+			if (!e.element) {
+				return;
+			}
+			if (isGroupNode(e.element)) {
+				if (e.element.onlyShowGroup) {
+					this._openGroupInCarousel(e.element);
+				}
+			} else {
+				const artifact = e.element;
+				if (artifact.type === 'screenshot' && this._configurationService.getValue<boolean>(ChatConfiguration.ImageCarouselEnabled)) {
+					this._openScreenshotInCarousel(artifact);
+				} else if (artifact.uri) {
+					const uri = URI.parse(artifact.uri);
+					const editorOverride = getEditorOverrideForChatResource(uri, this._configurationService);
+					this._openerService.open(uri, {
+						fromUserGesture: true,
+						editorOptions: { override: editorOverride },
+					});
+				}
+			}
+		}));
+
+		this._treeStore.add(headerButton.onDidClick(() => {
+			this._isCollapsed = !this._isCollapsed;
+			this._expandIcon.classList.toggle('codicon-chevron-down', !this._isCollapsed);
+			this._expandIcon.classList.toggle('codicon-chevron-right', this._isCollapsed);
+			headerButton.element.setAttribute('aria-expanded', String(!this._isCollapsed));
+			listContainer.style.display = this._isCollapsed ? 'none' : 'block';
+		}));
+
+		this._autorunDisposable.value = autorun((reader: IReader) => {
+			const artifacts: readonly IChatArtifact[] = this._currentArtifacts!.artifacts.read(reader);
+			const mutable = this._currentArtifacts!.mutable.read(reader);
+			if (artifacts.length === 0) {
+				this.domNode.style.display = 'none';
+				return;
+			}
+			this.domNode.style.display = '';
+			this._clearButton.element.style.display = mutable ? '' : 'none';
+
+			this._titleElement.textContent = artifacts.length === 1
+				? localize('chat.artifacts.one', "1 Artifact")
+				: localize('chat.artifacts.count', "{0} Artifacts", artifacts.length);
+
+			const treeElements = buildTreeElements(artifacts);
+			const visibleCount = countVisibleRows(treeElements);
+			const itemsShown = Math.min(visibleCount, ChatArtifactsWidget.MAX_ITEMS_SHOWN);
+			const treeHeight = itemsShown * ChatArtifactsWidget.ELEMENT_HEIGHT;
+			this._tree!.layout(treeHeight);
+			this._tree!.getHTMLElement().style.height = `${treeHeight}px`;
+			this._tree!.setChildren(null, treeElements);
+		});
+	}
+
+	private async _openGroupInCarousel(group: IArtifactGroupNode): Promise<void> {
+		// Open the first artifact in the group — the carousel service will collect
+		// all images from the chat widget session automatically.
+		const first = group.artifacts[0];
+		if (first?.uri) {
+			await this._chatImageCarouselService.openCarouselAtResource(URI.parse(first.uri));
+		}
+	}
+
+	private async _openScreenshotInCarousel(clicked: IChatArtifact): Promise<void> {
+		if (clicked.uri) {
+			await this._chatImageCarouselService.openCarouselAtResource(URI.parse(clicked.uri));
+		}
+	}
+
+	private _clearAllArtifacts(): void {
+		if (!this._currentArtifacts?.mutable.get()) {
+			return;
+		}
+		this._currentArtifacts.clear();
+	}
+
+	private async _saveArtifact(artifact: IChatArtifact): Promise<void> {
+		const sourceUri = URI.parse(artifact.uri);
+		const defaultFileName = sourceUri.path.split('/').pop() ?? artifact.label;
+		const defaultPath = await this._fileDialogService.defaultFilePath();
+		const defaultUri = URI.joinPath(defaultPath, defaultFileName);
+
+		const targetUri = await this._fileDialogService.showSaveDialog({
+			defaultUri,
+			title: localize('chat.artifacts.saveDialog.title', "Save Artifact"),
+		});
+
+		if (targetUri) {
+			const content = await this._fileService.readFile(sourceUri);
+			await this._fileService.writeFile(targetUri, content.value);
+		}
+	}
+
+	hide(): void {
+		this._autorunDisposable.clear();
+		this.domNode.style.display = 'none';
+	}
+}
+
+// --- Tree infrastructure ---
+
+function buildTreeElements(artifacts: readonly IChatArtifact[]): IObjectTreeElement<ArtifactTreeElement>[] {
+	const groups = new Map<string, { config: { groupName: string; onlyShowGroup: boolean }; artifacts: IChatArtifact[] }>();
+	const ungrouped: IChatArtifact[] = [];
+
+	for (const artifact of artifacts) {
+		if (artifact.groupName) {
+			let group = groups.get(artifact.groupName);
+			if (!group) {
+				group = { config: { groupName: artifact.groupName, onlyShowGroup: artifact.onlyShowGroup ?? false }, artifacts: [] };
+				groups.set(artifact.groupName, group);
+			}
+			group.artifacts.push(artifact);
+		} else {
+			ungrouped.push(artifact);
+		}
+	}
+
+	const elements: IObjectTreeElement<ArtifactTreeElement>[] = [];
+
+	for (const [, group] of groups) {
+		const groupNode: IArtifactGroupNode = {
+			kind: 'group',
+			groupName: group.config.groupName,
+			artifacts: group.artifacts,
+			onlyShowGroup: group.config.onlyShowGroup,
+		};
+
+		if (group.config.onlyShowGroup) {
+			// Only show group header, no children
+			elements.push({ element: groupNode, collapsible: false, collapsed: false });
+		} else {
+			// Show group with children
+			elements.push({
+				element: groupNode,
+				collapsible: true,
+				collapsed: false,
+				children: group.artifacts.map(a => ({ element: a })),
+			});
+		}
+	}
+
+	for (const artifact of ungrouped) {
+		elements.push({ element: artifact });
+	}
+
+	return elements;
+}
+
+function countVisibleRows(elements: IObjectTreeElement<ArtifactTreeElement>[]): number {
+	let count = 0;
+	for (const el of elements) {
+		count++; // The element itself
+		if (el.children && !el.collapsed) {
+			count += countVisibleRows([...el.children]);
+		}
+	}
+	return count;
+}
+
+class ChatArtifactsTreeDelegate implements IListVirtualDelegate<ArtifactTreeElement> {
+	getHeight(): number {
+		return ChatArtifactsWidget.ELEMENT_HEIGHT;
+	}
+	getTemplateId(element: ArtifactTreeElement): string {
+		return isGroupNode(element)
+			? ChatArtifactGroupRenderer.TEMPLATE_ID
+			: ChatArtifactLeafRenderer.TEMPLATE_ID;
+	}
+}
+
+class ChatArtifactsAccessibilityProvider implements IListAccessibilityProvider<ArtifactTreeElement> {
+	getAriaLabel(element: ArtifactTreeElement): string | null {
+		if (isGroupNode(element)) {
+			return localize('chat.artifacts.group.aria', "{0} ({1} items)", element.groupName, element.artifacts.length);
+		}
+		return element.label;
+	}
+	getWidgetAriaLabel(): string {
+		return localize('chat.artifacts.widget.aria', "Chat Artifacts");
+	}
+}
+
+// --- Group renderer ---
+
+interface IArtifactGroupTemplate {
+	readonly container: HTMLElement;
+	readonly iconElement: HTMLElement;
+	readonly labelElement: HTMLElement;
+}
+
+class ChatArtifactGroupRenderer implements ITreeRenderer<ArtifactTreeElement, void, IArtifactGroupTemplate> {
+	static readonly TEMPLATE_ID = 'chatArtifactGroupRenderer';
+	readonly templateId = ChatArtifactGroupRenderer.TEMPLATE_ID;
+
+	renderTemplate(container: HTMLElement): IArtifactGroupTemplate {
+		const row = dom.append(container, dom.$('.chat-artifacts-list-row'));
+		const iconElement = dom.append(row, dom.$('.chat-artifacts-list-icon'));
+		const labelElement = dom.append(row, dom.$('.chat-artifacts-list-label'));
+		return { container: row, iconElement, labelElement };
+	}
+
+	renderElement(node: ITreeNode<ArtifactTreeElement>, _index: number, templateData: IArtifactGroupTemplate): void {
+		const group = node.element;
+		if (!isGroupNode(group)) {
+			return;
+		}
+
+		// Pick an icon based on the first artifact's type
+		const firstType = group.artifacts[0]?.type;
+		const icon = (firstType && ARTIFACT_TYPE_ICONS[firstType]) || Codicon.archive;
+		templateData.iconElement.className = 'chat-artifacts-list-icon ' + ThemeIcon.asClassName(icon);
+		templateData.labelElement.textContent = `${group.groupName} (${group.artifacts.length})`;
+		templateData.container.title = group.groupName;
+	}
+
+	disposeTemplate(): void { }
+}
+
+// --- Leaf artifact renderer ---
+
+interface IArtifactLeafTemplate {
+	readonly container: HTMLElement;
+	readonly iconElement: HTMLElement;
+	readonly labelElement: HTMLElement;
+	readonly saveButton: HTMLElement;
+}
+
+class ChatArtifactLeafRenderer implements ITreeRenderer<ArtifactTreeElement, void, IArtifactLeafTemplate> {
+	static readonly TEMPLATE_ID = 'chatArtifactLeafRenderer';
+	readonly templateId = ChatArtifactLeafRenderer.TEMPLATE_ID;
+
+	constructor(private readonly _onSave: (artifact: IChatArtifact) => void) { }
+
+	renderTemplate(container: HTMLElement): IArtifactLeafTemplate {
+		const row = dom.append(container, dom.$('.chat-artifacts-list-row'));
+		const iconElement = dom.append(row, dom.$('.chat-artifacts-list-icon'));
+		const labelElement = dom.append(row, dom.$('.chat-artifacts-list-label'));
+		const saveButton = dom.append(row, dom.$('.chat-artifacts-list-save' + ThemeIcon.asCSSSelector(Codicon.save)));
+		saveButton.title = localize('chat.artifacts.save', "Save artifact");
+		return { container: row, iconElement, labelElement, saveButton };
+	}
+
+	renderElement(node: ITreeNode<ArtifactTreeElement>, _index: number, templateData: IArtifactLeafTemplate): void {
+		const artifact = node.element;
+		if (isGroupNode(artifact)) {
+			return;
+		}
+		const icon = (artifact.type && ARTIFACT_TYPE_ICONS[artifact.type]) || Codicon.archive;
+		templateData.iconElement.className = 'chat-artifacts-list-icon ' + ThemeIcon.asClassName(icon);
+		templateData.labelElement.textContent = artifact.label;
+		templateData.container.title = artifact.uri;
+
+		templateData.saveButton.onclick = (e) => {
+			e.stopPropagation();
+			this._onSave(artifact);
+		};
+	}
+
+	disposeTemplate(): void { }
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts
index 5a7f98614d6..adeb31756e9 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts
@@ -14,6 +14,9 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import product from '../../../../../platform/product/common/product.js';
+import { CHAT_INTERNAL_SCHEME } from '../../common/promptSyntax/internalCustomizations/internalPromptFileSystem.js';
+
+const _remoteImageDisallowed = () => false;
 
 export const allowedChatMarkdownHtmlTags = Object.freeze([
 	'b',
@@ -78,8 +81,8 @@ export class ChatContentMarkdownRenderer implements IMarkdownRenderer {
 					override: allowedChatMarkdownHtmlTags,
 				},
 				...options?.sanitizerConfig,
-				allowedLinkSchemes: { augment: [product.urlProtocol] },
-				remoteImageIsAllowed: (_uri) => false,
+				allowedLinkSchemes: { augment: [product.urlProtocol, CHAT_INTERNAL_SCHEME, 'copilot-skill'] },
+				remoteImageIsAllowed: _remoteImageDisallowed,
 			}
 		};
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts
index 07358906a3f..9b40177fedf 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts
@@ -10,6 +10,7 @@ import { IChatRendererDelegate } from '../chatListRenderer.js';
 import { ChatEditorOptions } from '../chatOptions.js';
 import { CodeBlockPart, CodeCompareBlockPart } from './codeBlockPart.js';
 import { ResourcePool, IDisposableReference } from './chatCollections.js';
+import { createSingleCallFunction } from '../../../../../../base/common/functional.js';
 
 export class EditorPool extends Disposable {
 
@@ -38,11 +39,11 @@ export class EditorPool extends Disposable {
 		return {
 			object: codeBlock,
 			isStale: () => stale,
-			dispose: () => {
+			dispose: createSingleCallFunction(() => {
 				codeBlock.reset();
 				stale = true;
 				this._pool.release(codeBlock);
-			}
+			})
 		};
 	}
 
@@ -78,11 +79,11 @@ export class DiffEditorPool extends Disposable {
 		return {
 			object: codeBlock,
 			isStale: () => stale,
-			dispose: () => {
+			dispose: createSingleCallFunction(() => {
 				codeBlock.reset();
 				stale = true;
 				this._pool.release(codeBlock);
-			}
+			})
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts
index 1e589ede366..fa3a8838e9b 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts
@@ -44,16 +44,18 @@ import { ExplorerFolderContext } from '../../../../files/common/files.js';
 import { IWorkspaceSymbol } from '../../../../search/common/search.js';
 import { IChatContentInlineReference } from '../../../common/chatService/chatService.js';
 import { IChatWidgetService } from '../../chat.js';
+import { IChatImageCarouselService } from '../../chatImageCarouselService.js';
 import { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from '../../attachments/chatAttachmentWidgets.js';
 import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { ChatConfiguration } from '../../../common/constants.js';
+import { getMediaMime } from '../../../../../../base/common/mime.js';
 
 /**
  * Returns the editor ID to use when opening a resource from chat pills (inline anchors), based on the
  * `chat.editorAssociations` setting. Returns undefined if no association matches.
  */
-function getEditorOverrideForChatResource(resource: URI, configurationService: IConfigurationService): string | undefined {
+export function getEditorOverrideForChatResource(resource: URI, configurationService: IConfigurationService): string | undefined {
 	const associations = configurationService.getValue<Record<string, string>>(ChatConfiguration.EditorAssociations) ?? {};
 	// Sort patterns by length (longer patterns are more specific)
 	const sortedPatterns = Object.keys(associations).sort((a, b) => b.length - a.length);
@@ -110,6 +112,11 @@ export function renderFileWidgets(element: HTMLElement, instantiationService: II
 					linkText
 				};
 				shouldRenderWidget = true;
+
+				// Strip vscodeLinkType from the URI once we've extracted the metadata for better compatibility with different FS
+				searchParams.delete('vscodeLinkType');
+				const remainingQuery = searchParams.toString();
+				uri = uri.with({ query: remainingQuery });
 			}
 		}
 
@@ -131,6 +138,7 @@ export class InlineAnchorWidget extends Disposable {
 		private readonly element: HTMLAnchorElement | HTMLElement,
 		public readonly inlineReference: IChatContentInlineReference,
 		private readonly metadata: InlineAnchorWidgetMetadata | undefined,
+		@IChatImageCarouselService private readonly chatImageCarouselService: IChatImageCarouselService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IContextKeyService originalContextKeyService: IContextKeyService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -272,14 +280,6 @@ export class InlineAnchorWidget extends Disposable {
 		const relativeLabel = labelService.getUriLabel(location.uri, { relative: true });
 		this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('element'), element, relativeLabel));
 
-		// Apply link-style if configured
-		this.updateAppearance();
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.InlineReferencesStyle)) {
-				this.updateAppearance();
-			}
-		}));
-
 		// Drag and drop
 		if (this.data.kind !== 'symbol') {
 			element.draggable = true;
@@ -298,6 +298,14 @@ export class InlineAnchorWidget extends Disposable {
 		// Click handler to open with custom editor association from chat.editorAssociations setting
 		this._register(dom.addDisposableListener(element, 'click', async (e) => {
 			dom.EventHelper.stop(e, true);
+
+			// If the reference is an image file and the carousel is enabled, open the carousel
+			const mimeType = getMediaMime(location.uri.path);
+			if (mimeType?.startsWith('image/') && this.configurationService.getValue<boolean>(ChatConfiguration.ImageCarouselEnabled)) {
+				await this.chatImageCarouselService.openCarouselAtResource(location.uri);
+				return;
+			}
+
 			const editorOverride = getEditorOverrideForChatResource(location.uri, this.configurationService);
 			const editorOptions: { override: string | undefined; selection?: IRange } = {
 				override: editorOverride,
@@ -316,12 +324,6 @@ export class InlineAnchorWidget extends Disposable {
 		return this.element;
 	}
 
-	private updateAppearance(): void {
-		const style = this.configurationService.getValue<string>(ChatConfiguration.InlineReferencesStyle);
-		const useLinkStyle = style === 'link';
-		this.element.classList.toggle('link-style', useLinkStyle);
-	}
-
 	private getCellIndex(location: URI) {
 		const notebook = this.notebookDocumentService.getNotebook(location);
 		const index = notebook?.getCellIndex(location) ?? -1;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts
index 8f388e7ebb5..0478a144675 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts
@@ -15,12 +15,13 @@ import { coalesce } from '../../../../../../base/common/arrays.js';
 import { findLast } from '../../../../../../base/common/arraysFind.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Lazy } from '../../../../../../base/common/lazy.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose, IDisposable, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { autorun, autorunSelfDisposable, derived } from '../../../../../../base/common/observable.js';
 import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
 import { equalsIgnoreCase } from '../../../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
@@ -46,7 +47,7 @@ import { AccessibilityWorkbenchSettingId } from '../../../../accessibility/brows
 import { IAiEditTelemetryService } from '../../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
 import { MarkedKatexSupport } from '../../../../markdown/browser/markedKatexSupport.js';
 import { extractCodeblockUrisFromText, IMarkdownVulnerability } from '../../../common/widget/annotations.js';
-import { IEditSessionEntryDiff } from '../../../common/editing/chatEditingService.js';
+import { IEditSessionDiffStats, IEditSessionEntryDiff } from '../../../common/editing/chatEditingService.js';
 import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
 import { IChatMarkdownContent, IChatService, IChatUndoStop } from '../../../common/chatService/chatService.js';
 import { isRequestVM, isResponseVM } from '../../../common/model/chatViewModel.js';
@@ -95,6 +96,13 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
 	readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
 
+	private readonly _onDidChangeDiff = this._register(new Emitter<IEditSessionDiffStats>());
+	/**
+	 * Fires when any edit pill (CollapsedCodeBlock) in this markdown part updates its diff.
+	 * The aggregated stats reflect the total added/removed across all edit pills.
+	 */
+	readonly onDidChangeDiff: Event<IEditSessionDiffStats> = this._onDidChangeDiff.event;
+
 	private readonly allRefs: IDisposableReference<CodeBlockPart | CollapsedCodeBlock | MarkdownDiffBlockPart>[] = [];
 
 	private readonly _codeblocks: IMarkdownPartCodeBlockInfo[] = [];
@@ -300,7 +308,6 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 								this._codeblocks[codeBlockInfo.codeBlockPartIndex].codemapperUri = e.codemapperUri;
 							});
 						}
-						this.allRefs.push(ref);
 						const ownerMarkdownPartId = this.codeblocksPartId;
 						const info: IMarkdownPartCodeBlockInfo = new class implements IMarkdownPartCodeBlockInfo {
 							readonly ownerMarkdownPartId = ownerMarkdownPartId;
@@ -395,16 +402,46 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 		}
 	}
 
+	override dispose(): void {
+		super.dispose();
+
+		dispose(this.allRefs);
+		this.allRefs.length = 0;
+	}
+
 	private renderCodeBlockPill(sessionResource: URI, requestId: string, inUndoStop: string | undefined, codemapperUri: URI | undefined): IDisposableReference<CollapsedCodeBlock> {
 		const codeBlock = this.instantiationService.createInstance(CollapsedCodeBlock, sessionResource, requestId, inUndoStop);
+		const diffListenerStore = new DisposableStore();
+		const ref: IDisposableReference<CollapsedCodeBlock> = {
+			object: codeBlock,
+			isStale: () => false,
+			dispose: () => {
+				codeBlock.dispose();
+				diffListenerStore.dispose();
+			}
+		};
+
+		// Push to allRefs and register the diff listener before calling render(),
+		// since diff observables may fire synchronously when the editing session
+		// already has finalized diff data (e.g. on session restore).
+		this.allRefs.push(ref);
+		diffListenerStore.add(codeBlock.onDidChangeDiff(() => this.fireAggregatedDiff()));
 		if (codemapperUri) {
 			codeBlock.render(codemapperUri);
 		}
-		return {
-			object: codeBlock,
-			isStale: () => false,
-			dispose: () => codeBlock.dispose()
-		};
+		return ref;
+	}
+
+	private fireAggregatedDiff(): void {
+		let totalAdded = 0;
+		let totalRemoved = 0;
+		for (const ref of this.allRefs) {
+			if (ref.object instanceof CollapsedCodeBlock && ref.object.diff) {
+				totalAdded += ref.object.diff.added;
+				totalRemoved += ref.object.diff.removed;
+			}
+		}
+		this._onDidChangeDiff.fire({ added: totalAdded, removed: totalRemoved });
 	}
 
 	private renderCodeBlock(data: ICodeBlockData, text: string, isComplete: boolean, currentWidth: number): IDisposableReference<CodeBlockPart> {
@@ -453,7 +490,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 				ref.object.layout(width);
 			} else if (ref.object instanceof CollapsedCodeBlock) {
 				const codeblockModel = this._codeblocks[index];
-				if (codeblockModel.codemapperUri && ref.object.uri?.toString() !== codeblockModel.codemapperUri.toString()) {
+				if (codeblockModel.codemapperUri && !isEqual(ref.object.uri, codeblockModel.codemapperUri)) {
 					ref.object.render(codeblockModel.codemapperUri);
 				}
 			}
@@ -493,6 +530,12 @@ export class CollapsedCodeBlock extends Disposable {
 	private tooltip: string | undefined;
 
 	private currentDiff: IEditSessionEntryDiff | undefined;
+	get diff(): IEditSessionEntryDiff | undefined {
+		return this.currentDiff;
+	}
+
+	private readonly _onDidChangeDiff = this._register(new Emitter<IEditSessionEntryDiff>());
+	readonly onDidChangeDiff: Event<IEditSessionEntryDiff> = this._onDidChangeDiff.event;
 
 	private readonly progressStore = this._store.add(new DisposableStore());
 
@@ -525,15 +568,6 @@ export class CollapsedCodeBlock extends Disposable {
 		this.element.appendChild(this.statusIndicatorContainer);
 		this.element.appendChild(this.pillElement);
 
-		// Toggle show-checkmarks class for the accessibility setting
-		const updateCheckmarks = () => this.element.classList.toggle('show-checkmarks', !!this.configurationService.getValue<boolean>(AccessibilityWorkbenchSettingId.ShowChatCheckmarks));
-		updateCheckmarks();
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-				updateCheckmarks();
-			}
-		}));
-
 		this.registerListeners();
 	}
 
@@ -673,6 +707,7 @@ export class CollapsedCodeBlock extends Disposable {
 			const labelRemoved = this.pillElement.querySelector('.label-removed') ?? this.pillElement.appendChild(dom.$('span.label-removed'));
 			if (changes && !changes?.identical && !changes?.quitEarly) {
 				this.currentDiff = changes;
+				this._onDidChangeDiff.fire(changes);
 				labelAdded.textContent = `+${changes.added}`;
 				labelRemoved.textContent = `-${changes.removed}`;
 				const insertionsFragment = changes.added === 1 ? localize('chat.codeblock.insertions.one', "1 insertion") : localize('chat.codeblock.insertions', "{0} insertions", changes.added);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.ts
index 4a3ec940760..54cd2d4693d 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.ts
@@ -27,6 +27,7 @@ import { IHoverService } from '../../../../../../platform/hover/browser/hover.js
 import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
 import { ILanguageModelToolsService } from '../../../common/tools/languageModelToolsService.js';
 import { isEqual } from '../../../../../../base/common/resources.js';
+import { buildPhrasePool } from './chatThinkingContentPart.js';
 
 export class ChatProgressContentPart extends Disposable implements IChatContentPart {
 	public readonly domNode: HTMLElement;
@@ -174,9 +175,13 @@ export class ChatWorkingProgressContentPart extends ChatProgressContentPart impl
 		@IConfigurationService configurationService: IConfigurationService,
 		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService
 	) {
+		const defaultLabel = localize('workingMessage', "Working");
+		const pool = buildPhrasePool([defaultLabel], configurationService);
+		const label = pool[Math.floor(Math.random() * pool.length)];
+
 		const progressMessage: IChatProgressMessage = {
 			kind: 'progressMessage',
-			content: new MarkdownString().appendText(localize('workingMessage', "Working"))
+			content: new MarkdownString().appendText(label)
 		};
 		super(progressMessage, chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, true, instantiationService, chatMarkdownAnchorService, configurationService);
 		this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts
index c3d240b5a30..2105d647822 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts
@@ -11,6 +11,7 @@ import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../.
 import { KeyCode } from '../../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../../../base/common/platform.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { hasKey } from '../../../../../../base/common/types.js';
 import { localize } from '../../../../../../nls.js';
 import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
@@ -49,13 +50,16 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 
 	private _currentIndex = 0;
 	private readonly _answers = new Map<string, IChatQuestionAnswerValue>();
+	private _isCollapsed = false;
 
 	private _questionContainer: HTMLElement | undefined;
+	private _headerActionsContainer: HTMLElement | undefined;
 	private _closeButtonContainer: HTMLElement | undefined;
 	private _footerRow: HTMLElement | undefined;
 	private _stepIndicator: HTMLElement | undefined;
 	private _submitHint: HTMLElement | undefined;
 	private _submitButton: Button | undefined;
+	private _collapseButton: Button | undefined;
 	private _prevButton: Button | undefined;
 	private _nextButton: Button | undefined;
 	private _skipAllButton: Button | undefined;
@@ -92,6 +96,7 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 		super();
 
 		this.domNode = dom.$('.chat-question-carousel-container');
+		this.domNode.id = generateUuid();
 		this._inChatQuestionCarouselContextKey = ChatContextKeys.inChatQuestionCarousel.bindTo(this._contextKeyService);
 		const focusTracker = this._register(dom.trackFocus(this.domNode));
 		this._register(focusTracker.onDidFocus(() => this._inChatQuestionCarouselContextKey.set(true)));
@@ -110,6 +115,10 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 				this._currentIndex = Math.max(0, Math.min(carousel.draftCurrentIndex, carousel.questions.length - 1));
 			}
 
+			if (typeof carousel.draftCollapsed === 'boolean') {
+				this._isCollapsed = carousel.draftCollapsed;
+			}
+
 			if (carousel.draftAnswers) {
 				for (const [key, value] of Object.entries(carousel.draftAnswers)) {
 					this._answers.set(key, value);
@@ -141,6 +150,13 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 		// Question container
 		this._questionContainer = dom.$('.chat-question-carousel-content');
 		this.domNode.append(this._questionContainer);
+		this._headerActionsContainer = dom.$('.chat-question-header-actions');
+
+		const collapseToggleTitle = localize('chat.questionCarousel.collapseTitle', 'Collapse Questions');
+		const collapseButton = interactiveStore.add(new Button(this._headerActionsContainer, { ...defaultButtonStyles, secondary: true, supportIcons: true }));
+		collapseButton.element.classList.add('chat-question-collapse-toggle');
+		collapseButton.element.setAttribute('aria-label', collapseToggleTitle);
+		this._collapseButton = collapseButton;
 
 		// Close/skip button (X) - placed in header row, only shown when allowSkip is true
 		if (carousel.allowSkip) {
@@ -155,6 +171,8 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 		}
 
 		// Register event listeners
+		interactiveStore.add(collapseButton.onDidClick(() => this.toggleCollapsed()));
+
 		if (this._skipAllButton) {
 			interactiveStore.add(this._skipAllButton.onDidClick(() => this.ignore()));
 		}
@@ -224,6 +242,31 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 
 		this.carousel.draftAnswers = Object.fromEntries(this._answers.entries());
 		this.carousel.draftCurrentIndex = this._currentIndex;
+		this.carousel.draftCollapsed = this._isCollapsed;
+	}
+
+	private toggleCollapsed(): void {
+		this._isCollapsed = !this._isCollapsed;
+		this.persistDraftState();
+		this.updateCollapsedPresentation();
+		this._onDidChangeHeight.fire();
+	}
+
+	private updateCollapsedPresentation(): void {
+		this.domNode.classList.toggle('chat-question-carousel-collapsed', this._isCollapsed);
+
+		if (this._collapseButton) {
+			const collapsed = this._isCollapsed;
+			const buttonTitle = collapsed
+				? localize('chat.questionCarousel.expandTitle', 'Expand Questions')
+				: localize('chat.questionCarousel.collapseTitle', 'Collapse Questions');
+			const contentId = this.domNode.id;
+			this._collapseButton.label = collapsed ? `$(${Codicon.chevronUp.id})` : `$(${Codicon.chevronDown.id})`;
+			this._collapseButton.element.setAttribute('aria-label', buttonTitle);
+			this._collapseButton.element.setAttribute('aria-expanded', String(!collapsed));
+			this._collapseButton.element.setAttribute('aria-controls', contentId);
+			this._collapseButton.setTitle(buttonTitle);
+		}
 	}
 
 	/**
@@ -335,7 +378,9 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 		this._submitButton = undefined;
 		this._skipAllButton = undefined;
 		this._questionContainer = undefined;
+		this._headerActionsContainer = undefined;
 		this._closeButtonContainer = undefined;
+		this._collapseButton = undefined;
 		this._footerRow = undefined;
 		this._stepIndicator = undefined;
 		this._submitHint = undefined;
@@ -609,9 +654,15 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 
 		headerRow.appendChild(titleRow);
 
-		// Always keep the close button in the title row so it does not overlap content.
-		if (this._closeButtonContainer) {
-			titleRow.appendChild(this._closeButtonContainer);
+		if (this._headerActionsContainer) {
+			dom.clearNode(this._headerActionsContainer);
+			if (this._closeButtonContainer) {
+				this._headerActionsContainer.appendChild(this._closeButtonContainer);
+			}
+			if (this._collapseButton) {
+				this._headerActionsContainer.appendChild(this._collapseButton.element);
+			}
+			titleRow.appendChild(this._headerActionsContainer);
 		}
 
 		this._questionContainer.appendChild(headerRow);
@@ -669,6 +720,7 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 		const inputResizeObserver = questionRenderStore.add(new dom.DisposableResizeObserver(() => scheduleLayoutInputScrollable()));
 		questionRenderStore.add(inputResizeObserver.observe(inputScrollableNode));
 		questionRenderStore.add(inputResizeObserver.observe(inputContainer));
+		questionRenderStore.add(dom.addDisposableListener(dom.getWindow(this.domNode), dom.EventType.RESIZE, () => scheduleLayoutInputScrollable()));
 		scheduleLayoutInputScrollable();
 		questionRenderStore.add(dom.runAtThisOrScheduleAtNextAnimationFrame(dom.getWindow(this.domNode), () => {
 			inputContainer.scrollTop = 0;
@@ -679,6 +731,7 @@ export class ChatQuestionCarouselPart extends Disposable implements IChatContent
 
 		// Update aria-label to reflect the current question
 		this._updateAriaLabel();
+		this.updateCollapsedPresentation();
 
 		// In screen reader mode, focus the container and announce the question
 		// This must happen after all render calls to avoid focus being stolen
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatResourceGroupWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatResourceGroupWidget.ts
index dcd85778a0e..cfa95551f1a 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatResourceGroupWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatResourceGroupWidget.ts
@@ -7,6 +7,7 @@ import * as dom from '../../../../../../base/browser/dom.js';
 import { disposableTimeout } from '../../../../../../base/common/async.js';
 import { decodeBase64 } from '../../../../../../base/common/buffer.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Emitter } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { basename, joinPath } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
@@ -47,6 +48,8 @@ const IMAGE_DECODE_DELAY_MS = 100;
  */
 export class ChatResourceGroupWidget extends Disposable {
 	public readonly domNode: HTMLElement;
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
 
 	constructor(
 		parts: IChatCollapsibleIODataPart[],
@@ -124,6 +127,7 @@ export class ChatResourceGroupWidget extends Disposable {
 		};
 
 		itemsContainer.appendChild(attachments.domNode!);
+		this._onDidChangeHeight.fire();
 
 		const toolbar = this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, actionsContainer, MenuId.ChatToolOutputResourceToolbar, {
 			menuOptions: {
@@ -146,6 +150,7 @@ export class ChatResourceGroupWidget extends Disposable {
 
 				// Update attachments in place
 				attachments.updateVariables(entries);
+				this._onDidChangeHeight.fire();
 			}, IMAGE_DECODE_DELAY_MS));
 		}
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts
index 7a4f6d0a129..788af39eecd 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts
@@ -102,7 +102,7 @@ export class ChatSubagentContentPart extends ChatCollapsibleContentPart implemen
 	// Persistent title elements for shimmer
 	private titleShimmerSpan: HTMLElement | undefined;
 	private titleDetailContainer: HTMLElement | undefined;
-	private titleDetailRendered: IRenderedMarkdown | undefined;
+	private readonly _titleDetailRendered = this._register(new MutableDisposable<IRenderedMarkdown>());
 
 	/**
 	 * Check if a tool invocation is the parent subagent tool (the tool that spawns a subagent).
@@ -116,7 +116,7 @@ export class ChatSubagentContentPart extends ChatCollapsibleContentPart implemen
 	 * Extracts subagent info (description, agentName, prompt) from a tool invocation.
 	 */
 	private static extractSubagentInfo(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): { description: string; agentName: string | undefined; prompt: string | undefined; modelName: string | undefined } {
-		const defaultDescription = localize('chat.subagent.defaultDescription', 'Running subagent...');
+		const defaultDescription = localize('chat.subagent.defaultDescription', 'Running subagent');
 
 		// Only parent subagent tools contain the full subagent info
 		if (!ChatSubagentContentPart.isParentSubagentTool(toolInvocation)) {
@@ -383,10 +383,7 @@ export class ChatSubagentContentPart extends ChatCollapsibleContentPart implemen
 			labelElement.textContent = '';
 			this.titleShimmerSpan = undefined;
 
-			if (this.titleDetailRendered) {
-				this.titleDetailRendered.dispose();
-				this.titleDetailRendered = undefined;
-			}
+			this._titleDetailRendered.clear();
 			this.titleDetailContainer = undefined;
 
 			const prefixSpan = $('span');
@@ -411,10 +408,7 @@ export class ChatSubagentContentPart extends ChatCollapsibleContentPart implemen
 		this.titleShimmerSpan.textContent = shimmerText;
 
 		// Dispose previous detail rendering
-		if (this.titleDetailRendered) {
-			this.titleDetailRendered.dispose();
-			this.titleDetailRendered = undefined;
-		}
+		this._titleDetailRendered.clear();
 
 		if (!toolCallText) {
 			if (this.titleDetailContainer) {
@@ -425,7 +419,7 @@ export class ChatSubagentContentPart extends ChatCollapsibleContentPart implemen
 			const result = this.chatContentMarkdownRenderer.render(new MarkdownString(toolCallText));
 			result.element.classList.add('collapsible-title-content', 'chat-thinking-title-detail');
 			renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
-			this.titleDetailRendered = result;
+			this._titleDetailRendered.value = result;
 
 			if (this.titleDetailContainer) {
 				this.titleDetailContainer.replaceWith(result.element);
@@ -809,7 +803,7 @@ export class ChatSubagentContentPart extends ChatCollapsibleContentPart implemen
 
 		// Wrap with icon like thinking parts do
 		const itemWrapper = $('.chat-thinking-tool-wrapper');
-		const icon = getToolInvocationIcon(toolInvocation.toolId);
+		const icon = getToolInvocationIcon(toolInvocation.toolId, toolInvocation.icon);
 		const iconElement = createThinkingIcon(icon);
 		itemWrapper.appendChild(content);
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingContentPart.ts
index d695b515e88..a1a053d2968 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingContentPart.ts
@@ -7,7 +7,7 @@ import { $, clearNode, getWindow, hide, scheduleAtNextAnimationFrame } from '../
 import { alert } from '../../../../../../base/browser/ui/aria/aria.js';
 import { DomScrollableElement } from '../../../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
-import { IChatMarkdownContent, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService/chatService.js';
+import { IChatMarkdownContent, IChatTerminalToolInvocationData, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService/chatService.js';
 import { IChatContentPartRenderContext, IChatContentPart } from './chatContentParts.js';
 import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
 import { ChatConfiguration, ThinkingDisplayMode } from '../../../common/constants.js';
@@ -26,14 +26,20 @@ import { localize } from '../../../../../../nls.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Lazy } from '../../../../../../base/common/lazy.js';
-import { Emitter } from '../../../../../../base/common/event.js';
-import { DisposableMap, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { DisposableMap, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../../../base/common/observable.js';
 import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
 import { ChatMessageRole, ILanguageModelsService } from '../../../common/languageModels.js';
 import './media/chatThinkingContent.css';
 import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { extractImagesFromToolInvocationOutputDetails } from '../../../common/chatImageExtraction.js';
+import { IChatCollapsibleIODataPart } from './chatToolInputOutputContentPart.js';
+import { ChatThinkingExternalResourceWidget } from './chatThinkingExternalResourcesWidget.js';
+import { LocalChatSessionUri, chatSessionResourceToId } from '../../../common/model/chatUri.js';
+import { IEditSessionDiffStats } from '../../../common/editing/chatEditingService.js';
 
 
 function extractTextFromPart(content: IChatThinkingPart): string {
@@ -41,7 +47,36 @@ function extractTextFromPart(content: IChatThinkingPart): string {
 	return raw.trim();
 }
 
-export function getToolInvocationIcon(toolId: string): ThemeIcon {
+function isEditToolId(toolId: string): boolean {
+	const lowerToolId = toolId.toLowerCase();
+	return lowerToolId.includes('edit') ||
+		lowerToolId.includes('create') ||
+		lowerToolId.includes('replace') ||
+		lowerToolId.includes('patch');
+}
+
+/**
+ * Returns true for edit tools whose generic display name should be replaced
+ * with "Editing files" while streaming (e.g. replace, multi-replace, patch, insertEdit).
+ * Excludes create and notebook tools which already have good labels.
+ */
+function isGenericEditToolId(toolId: string): boolean {
+	const lowerToolId = toolId.toLowerCase();
+	if (lowerToolId.includes('create') || lowerToolId.includes('notebook')) {
+		return false;
+	}
+	return lowerToolId.includes('replace') ||
+		lowerToolId.includes('patch') ||
+		lowerToolId.includes('insertedit') ||
+		lowerToolId.includes('insert_edit') ||
+		lowerToolId.includes('editfile');
+}
+
+export function getToolInvocationIcon(toolId: string, registeredIcon?: ThemeIcon): ThemeIcon {
+	if (registeredIcon) {
+		return registeredIcon;
+	}
+
 	const lowerToolId = toolId.toLowerCase();
 
 	if (
@@ -64,11 +99,7 @@ export function getToolInvocationIcon(toolId: string): ThemeIcon {
 		return Codicon.book;
 	}
 
-	if (
-		lowerToolId.includes('edit') ||
-		lowerToolId.includes('create') ||
-		lowerToolId.includes('replace')
-	) {
+	if (isEditToolId(toolId)) {
 		return Codicon.pencil;
 	}
 
@@ -111,6 +142,10 @@ interface ILazyThinkingItem {
 type ILazyItem = ILazyToolItem | ILazyThinkingItem;
 const THINKING_SCROLL_MAX_HEIGHT = 200;
 
+const TITLE_CACHE_STORAGE_KEY = 'chat.thinkingTitleCache';
+const TITLE_CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000; // 7 days
+const TITLE_CACHE_MAX_ENTRIES = 1000;
+
 const enum WorkingMessageCategory {
 	Thinking = 'thinking',
 	Terminal = 'terminal',
@@ -139,19 +174,48 @@ const toolMessages = [
 	localize('chat.thinking.tool.5', 'Evaluating'),
 ];
 
+/**
+ * Builds a phrase pool from defaults and user-configured custom phrases.
+ * In 'replace' mode, only custom phrases are used; in 'append' mode (default),
+ * custom phrases are added to the defaults.
+ */
+export function buildPhrasePool(defaults: string[], configurationService: IConfigurationService): string[] {
+	const config = configurationService.getValue<{ mode?: 'replace' | 'append'; phrases?: string[] }>(ChatConfiguration.ThinkingPhrases);
+	const customPhrases = Array.isArray(config?.phrases)
+		? config.phrases
+			.filter((phrase): phrase is string => typeof phrase === 'string')
+			.map(phrase => phrase.trim())
+			.filter(phrase => phrase.length > 0)
+		: [];
+
+	if (customPhrases.length > 0) {
+		return config?.mode === 'replace' ? [...customPhrases] : [...defaults, ...customPhrases];
+	}
+	return [...defaults];
+}
+
 export class ChatThinkingContentPart extends ChatCollapsibleContentPart implements IChatContentPart {
+
+	private static _codeBlockRendererSync(_languageId: string, text: string, _raw?: string): HTMLElement {
+		const codeElement = $('code');
+		codeElement.textContent = text;
+		return codeElement;
+	}
+
 	public readonly codeblocks: undefined;
 	public readonly codeblocksPartId: undefined;
 
 	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	private readonly _asyncRenderCallback = () => this._onDidChangeHeight.fire();
 
 	private id: string | undefined;
 	private content: IChatThinkingPart;
 	private currentThinkingValue: string;
 	private currentTitle: string;
-	private defaultTitle = localize('chat.thinking.header', 'Working');
+	private defaultTitle = localize('chat.thinking.header', 'Thinking');
+	private readonly workingTitle = localize('chat.thinking.header.working', 'Working');
 	private textContainer!: HTMLElement;
-	private markdownResult: IRenderedMarkdown | undefined;
+	private readonly _markdownResult = this._register(new MutableDisposable<IRenderedMarkdown>());
 	private wrapper!: HTMLElement;
 	private fixedScrollingMode: boolean = false;
 	private autoScrollEnabled: boolean = true;
@@ -164,22 +228,32 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 	private toolInvocations: (IChatToolInvocation | IChatToolInvocationSerialized)[] = [];
 	private allThinkingParts: IChatThinkingPart[] = [];
 	private hookCount: number = 0;
-	private singleItemInfo: { element: HTMLElement; originalParent: HTMLElement; originalNextSibling: Node | null } | undefined;
+	private singleItemInfo: { element: HTMLElement; originalParent: HTMLElement; originalNextSibling: Node | null; toolInvocation?: IChatToolInvocation | IChatToolInvocationSerialized } | undefined;
 	private lazyItems: ILazyItem[] = [];
 	private hasExpandedOnce: boolean = false;
 	private workingSpinnerElement: HTMLElement | undefined;
 	private workingSpinnerLabel: HTMLElement | undefined;
 	private availableMessagesByCategory = new Map<WorkingMessageCategory, string[]>();
 	private readonly toolWrappersByCallId = new Map<string, HTMLElement>();
+	private readonly toolIconsByCallId = new Map<string, HTMLElement>();
+	private readonly toolLabelsByCallId = new Map<string, string>();
 	private readonly toolDisposables = this._register(new DisposableMap<string, DisposableStore>());
+	private readonly ownedToolParts = new Map<string, IDisposable>();
 	private pendingRemovals: { toolCallId: string; toolLabel: string }[] = [];
 	private pendingRemovalFlushDisposable: IDisposable | undefined;
 	private pendingScrollDisposable: IDisposable | undefined;
 	private mutationObserverDisposable: IDisposable | undefined;
 	private isUpdatingDimensions: boolean = false;
+	private lastKnownContentHeight: number = 0;
+	private lastKnownScrollTop: number = 0;
 	private titleShimmerSpan: HTMLElement | undefined;
 	private titleDetailContainer: HTMLElement | undefined;
-	private titleDetailRendered: IRenderedMarkdown | undefined;
+	private readonly _externalResourceWidget: ChatThinkingExternalResourceWidget;
+	private readonly _titleDetailRendered = this._register(new MutableDisposable<IRenderedMarkdown>());
+	private readonly diffStatsByPartId = new Map<string, IEditSessionDiffStats>();
+	private _aggregatedDiff: IEditSessionDiffStats = { added: 0, removed: 0 };
+
+	get aggregatedDiff(): IEditSessionDiffStats { return this._aggregatedDiff; }
 
 	private getRandomWorkingMessage(category: WorkingMessageCategory = WorkingMessageCategory.Tool): string {
 		let pool = this.availableMessagesByCategory.get(category);
@@ -187,38 +261,18 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			let defaults: string[];
 			switch (category) {
 				case WorkingMessageCategory.Thinking:
-					defaults = [...defaultThinkingMessages];
+					defaults = defaultThinkingMessages;
 					break;
 				case WorkingMessageCategory.Terminal:
-					defaults = [...terminalMessages];
+					defaults = terminalMessages;
 					break;
 				case WorkingMessageCategory.Tool:
 				default:
-					defaults = [...toolMessages];
+					defaults = toolMessages;
 					break;
 			}
 
-			// Read configured phrases from the single setting
-			const config = this.configurationService.getValue<{ mode?: 'replace' | 'append'; phrases?: string[] }>(ChatConfiguration.ThinkingPhrases);
-			const customPhrases = Array.isArray(config?.phrases)
-				? config.phrases
-					.filter((phrase): phrase is string => typeof phrase === 'string')
-					.map(phrase => phrase.trim())
-					.filter(phrase => phrase.length > 0)
-				: [];
-			const mode = config?.mode === 'replace' ? 'replace' : 'append';
-
-			if (customPhrases.length > 0) {
-				if (mode === 'replace') {
-					// Replace mode: use only custom phrases for all categories
-					pool = [...customPhrases];
-				} else {
-					// Append mode: add custom phrases to defaults for this category
-					pool = [...defaults, ...customPhrases];
-				}
-			} else {
-				pool = defaults;
-			}
+			pool = buildPhrasePool(defaults, this.configurationService);
 
 			this.availableMessagesByCategory.set(category, pool);
 		}
@@ -236,10 +290,11 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@IHoverService hoverService: IHoverService,
+		@IStorageService private readonly storageService: IStorageService,
 	) {
 		const initialText = extractTextFromPart(content);
 		const extractedTitle = extractTitleFromThinkingContent(initialText)
-			?? 'Working';
+			?? localize('chat.thinking.header.initial', 'Thinking');
 
 		super(extractedTitle, context, undefined, hoverService, configurationService);
 
@@ -268,10 +323,9 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 		if (configuredMode === ThinkingDisplayMode.Collapsed) {
 			this.setExpanded(false);
 		} else if (configuredMode === ThinkingDisplayMode.CollapsedPreview) {
-			// Start expanded if still in progress
-			// Use streamingCompleted to support look-ahead completion: when we know
-			// this thinking part is done (based on subsequent non-pinnable parts)
-			// even though the overall response is not complete
+			// Start expanded if still in progress.
+			// streamingCompleted is true when look-ahead finds subsequent non-pinnable
+			// parts, meaning this thinking part won't receive more content.
 			this.setExpanded(!this.streamingCompleted && !this.element.isComplete);
 		} else {
 			this.setExpanded(false);
@@ -280,6 +334,10 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 		const node = this.domNode;
 		node.classList.add('chat-thinking-box');
 
+		this._externalResourceWidget = this._register(this.instantiationService.createInstance(ChatThinkingExternalResourceWidget));
+		this._register(this._externalResourceWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+		node.appendChild(this._externalResourceWidget.domNode);
+
 		if (!this.streamingCompleted && !this.element.isComplete) {
 			if (!this.fixedScrollingMode) {
 				node.classList.add('chat-thinking-active');
@@ -299,6 +357,13 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			this.currentTitle = this.defaultTitle;
 		}
 
+		this._register(toDisposable(() => {
+			for (const d of this.ownedToolParts.values()) {
+				d.dispose();
+			}
+			this.ownedToolParts.clear();
+		}));
+
 		// override for codicon chevron in the collapsible part
 		this._register(autorun(r => {
 			const isExpanded = this.expanded.read(r);
@@ -320,17 +385,22 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			// Materialize lazy items when first expanded
 			if (isExpanded && !this.hasExpandedOnce && this.lazyItems.length > 0) {
 				this.hasExpandedOnce = true;
+				// Flush pending removals so that completed hidden tools are removed from lazyItems before materialization
+				this.processPendingRemovals();
 				for (const item of this.lazyItems) {
 					this.materializeLazyItem(item);
 				}
 			}
 
-			// If expanded but content matches title and there's nothing else to show, revert immediately
-			if (isExpanded && !this.shouldAllowExpansion()) {
+			// If expanded but content matches title and there's nothing else to show, revert immediately.
+			// Skip this check while still streaming — more content will arrive.
+			if (isExpanded && !this.shouldAllowExpansion() && (this.streamingCompleted || this.element.isComplete)) {
 				this.setExpanded(false);
 				return;
 			}
 
+			this._externalResourceWidget.setCollapsed(!isExpanded);
+
 			// Fire when expanded/collapsed
 			this._onDidChangeHeight.fire();
 		}));
@@ -408,7 +478,7 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 
 			// check for content changes to update scroll dimensions
 			const mutationObserver = new MutationObserver(() => {
-				if (!this.streamingCompleted) {
+				if (!this.streamingCompleted && this.domNode.classList.contains('chat-used-context-collapsed')) {
 					this.syncDimensionsAndScheduleScroll();
 				}
 			});
@@ -439,31 +509,35 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			return;
 		}
 
-		const scrollDimensions = this.scrollableElement.getScrollDimensions();
-		const maxScrollTop = scrollDimensions.scrollHeight - scrollDimensions.height;
-		const isAtBottom = maxScrollTop <= 0 || scrollTop >= maxScrollTop - 10;
+		this.lastKnownScrollTop = scrollTop;
+		const contentHeight = this.lastKnownContentHeight;
+		const viewportHeight = Math.min(contentHeight, THINKING_SCROLL_MAX_HEIGHT);
+		const maxScrollTop = contentHeight - viewportHeight;
+		this.autoScrollEnabled = maxScrollTop <= 0 || scrollTop >= maxScrollTop - 10;
 
-		if (isAtBottom) {
-			this.autoScrollEnabled = true;
-		} else {
-			this.autoScrollEnabled = false;
-		}
+		this.updateFadeClasses(scrollTop, contentHeight, viewportHeight);
 	}
 
-	// try to schedule scroll
-	private syncDimensionsAndScheduleScroll(): void {
-		if (this.autoScrollEnabled && this.scrollableElement) {
-			this.isUpdatingDimensions = true;
-			try {
-				this.updateScrollDimensions();
-				this.scrollToBottom();
-			} finally {
-				this.isUpdatingDimensions = false;
-			}
+	private updateFadeClasses(scrollTop?: number, contentHeight?: number, viewportHeight?: number): void {
+		if (!this.fixedScrollingMode || this.streamingCompleted) {
+			this.domNode.classList.remove('chat-thinking-fade-top', 'chat-thinking-fade-bottom');
 			return;
 		}
 
-		// debounce animation
+		const currentScrollTop = scrollTop ?? this.lastKnownScrollTop;
+		const currentContentHeight = contentHeight ?? this.lastKnownContentHeight;
+		const currentViewportHeight = viewportHeight ?? Math.min(currentContentHeight, THINKING_SCROLL_MAX_HEIGHT);
+		const maxScrollTop = currentContentHeight - currentViewportHeight;
+
+		this.domNode.classList.toggle('chat-thinking-fade-top', currentScrollTop > 5);
+		this.domNode.classList.toggle('chat-thinking-fade-bottom', maxScrollTop > 0 && currentScrollTop < maxScrollTop - 5);
+	}
+
+	// Schedule a batched scroll dimension update for the next animation frame.
+	// All calls during a single frame (from updateThinking, MutationObserver, etc.)
+	// are coalesced into one layout read, avoiding forced synchronous layouts
+	// during tree splice operations.
+	private syncDimensionsAndScheduleScroll(): void {
 		if (this.pendingScrollDisposable) {
 			return;
 		}
@@ -474,24 +548,30 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			}
 			this.isUpdatingDimensions = true;
 			try {
-				this.updateScrollDimensions();
+				const contentHeight = this.updateScrollDimensions();
+				if (this.autoScrollEnabled && contentHeight !== undefined) {
+					this.scrollToBottom(contentHeight);
+				}
 			} finally {
 				this.isUpdatingDimensions = false;
 			}
+			// Use the cached values from updateScrollDimensions to avoid extra layout reads
+			this.updateFadeClasses(this.lastKnownScrollTop, this.lastKnownContentHeight);
 		});
 	}
 
-	private updateScrollDimensions(): void {
+	private updateScrollDimensions(): number | undefined {
 		if (!this.scrollableElement) {
-			return;
+			return undefined;
 		}
 
 		const isCollapsed = this.domNode.classList.contains('chat-used-context-collapsed');
 		if (!isCollapsed) {
-			return;
+			return undefined;
 		}
 
 		const contentHeight = this.wrapper.scrollHeight;
+		this.lastKnownContentHeight = contentHeight;
 		const viewportHeight = Math.min(contentHeight, THINKING_SCROLL_MAX_HEIGHT);
 
 		this.scrollableElement.setScrollDimensions({
@@ -501,21 +581,27 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			scrollHeight: contentHeight
 		});
 
+		// Cache the scroll position after dimension update
+		this.lastKnownScrollTop = this.scrollableElement.getScrollPosition().scrollTop;
+
 		// Re-evaluate hover feedback as content grows past the max height,
 		// reusing the already-measured contentHeight to avoid an extra layout read.
 		this.updateDropdownClickability(contentHeight);
+
+		return contentHeight;
 	}
 
-	private scrollToBottom(): void {
+	private scrollToBottom(contentHeight: number): void {
 		if (!this.scrollableElement) {
 			return;
 		}
 
-		const contentHeight = this.wrapper.scrollHeight;
 		const viewportHeight = Math.min(contentHeight, THINKING_SCROLL_MAX_HEIGHT);
 
 		if (contentHeight > viewportHeight) {
-			this.scrollableElement.setScrollPosition({ scrollTop: contentHeight - viewportHeight });
+			const newScrollTop = contentHeight - viewportHeight;
+			this.lastKnownScrollTop = newScrollTop;
+			this.scrollableElement.setScrollPosition({ scrollTop: newScrollTop });
 		}
 	}
 
@@ -549,10 +635,7 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 		}
 		const cleanedContent = content.trim();
 		if (!cleanedContent) {
-			if (this.markdownResult) {
-				this.markdownResult.dispose();
-				this.markdownResult = undefined;
-			}
+			this._markdownResult.clear();
 			if (this.textContainer) {
 				clearNode(this.textContainer);
 			}
@@ -565,22 +648,14 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			contentToRender = cleanedContent.slice(2, -2);
 		}
 
-		const target = reuseExisting ? this.markdownResult?.element : undefined;
-		if (this.markdownResult) {
-			this.markdownResult.dispose();
-			this.markdownResult = undefined;
-		}
+		const target = reuseExisting ? this._markdownResult.value?.element : undefined;
 
-		const rendered = this._register(this.chatContentMarkdownRenderer.render(new MarkdownString(contentToRender), {
+		const rendered = this.chatContentMarkdownRenderer.render(new MarkdownString(contentToRender), {
 			fillInIncompleteTokens: true,
-			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
-			codeBlockRendererSync: (_languageId, text, raw) => {
-				const codeElement = $('code');
-				codeElement.textContent = text;
-				return codeElement;
-			}
-		}, target));
-		this.markdownResult = rendered;
+			asyncRenderCallback: this._asyncRenderCallback,
+			codeBlockRendererSync: ChatThinkingContentPart._codeBlockRendererSync,
+		}, target);
+		this._markdownResult.value = rendered;
 		if (!target) {
 			if (this.textContainer) {
 				clearNode(this.textContainer);
@@ -615,7 +690,20 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			labelElement.appendChild(restSpan);
 		}
 
-		this._collapseButton.element.ariaLabel = title;
+		// Show aggregated diff stats from edit pills
+		if (this.diffStatsByPartId.size > 0) {
+			const { added, removed } = this._aggregatedDiff;
+			const diffContainer = $('span.chat-thinking-title-diff');
+			diffContainer.appendChild($('span.label-added', {}, `+${added}`));
+			diffContainer.appendChild($('span.label-removed', {}, `-${removed}`));
+			labelElement.appendChild(diffContainer);
+
+			const insertionsFragment = added === 1 ? localize('chat.thinking.insertions.one', "1 insertion") : localize('chat.thinking.insertions', "{0} insertions", added);
+			const deletionsFragment = removed === 1 ? localize('chat.thinking.deletions.one', "1 deletion") : localize('chat.thinking.deletions', "{0} deletions", removed);
+			this._collapseButton.element.ariaLabel = localize('chat.thinking.titleWithDiff', "{0}, {1}, {2}", title, insertionsFragment, deletionsFragment);
+		} else {
+			this._collapseButton.element.ariaLabel = title;
+		}
 	}
 
 	private setDropdownClickable(clickable: boolean): void {
@@ -666,7 +754,7 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			}
 		}
 
-		if (!allowExpansion && this.isExpanded()) {
+		if (!allowExpansion && this.isExpanded() && (this.streamingCompleted || this.element.isComplete)) {
 			this.setExpanded(false);
 		}
 		this.setDropdownClickable(allowExpansion);
@@ -713,7 +801,7 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			return;
 		}
 		const previousValue = this.currentThinkingValue;
-		const reuseExisting = !!(this.markdownResult && next.startsWith(previousValue) && next.length > previousValue.length);
+		const reuseExisting = !!(this._markdownResult.value && next.startsWith(previousValue) && next.length > previousValue.length);
 		this.currentThinkingValue = next;
 		this.renderMarkdown(next, reuseExisting);
 
@@ -745,15 +833,37 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 		return this.isActive;
 	}
 
+	/**
+	 * Returns true when this thinking part has no meaningful content to display:
+	 * no tool invocations, no lazy items, no hooks, and no thinking text.
+	 * This happens when a tool is removed from thinking (e.g. due to confirmation)
+	 * and the thinking part was only created to hold that tool.
+	 */
+	public isEffectivelyEmpty(): boolean {
+		if (this.toolInvocationCount > 0 || this.lazyItems.length > 0 || this.hookCount > 0) {
+			return false;
+		}
+		if (this.currentThinkingValue.trim().length > 0) {
+			return false;
+		}
+		return true;
+	}
+
 	public markAsInactive(): void {
 		this.isActive = false;
 		this.domNode.classList.remove('chat-thinking-active');
+		this.domNode.classList.remove('chat-thinking-fade-top', 'chat-thinking-fade-bottom');
 		this.processPendingRemovals();
 		if (this.workingSpinnerElement) {
 			this.workingSpinnerElement.remove();
 			this.workingSpinnerElement = undefined;
 			this.workingSpinnerLabel = undefined;
 		}
+
+		// Clear the attached-to-thinking flag on all tool invocations
+		for (const toolInvocation of this.toolInvocations) {
+			toolInvocation.isAttachedToThinking = false;
+		}
 	}
 
 	public finalizeTitleIfDefault(): void {
@@ -764,6 +874,7 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			this.wrapper.classList.remove('chat-thinking-streaming');
 		}
 		this.domNode.classList.remove('chat-thinking-active');
+		this.domNode.classList.remove('chat-thinking-fade-top', 'chat-thinking-fade-bottom');
 		this.streamingCompleted = true;
 
 		if (this.mutationObserverDisposable) {
@@ -793,6 +904,7 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			return;
 		}
 
+		// Reuse any existing generated title from tool invocations or thinking parts.
 		const existingTitle = this.toolInvocations.find(t => t.generatedTitle)?.generatedTitle
 			?? this.allThinkingParts.find(t => t.generatedTitle)?.generatedTitle;
 		if (existingTitle) {
@@ -803,24 +915,54 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 			return;
 		}
 
+		// Only check the persisted cache when re-rendering
+		// (all tool invocations are serialized), not during live streaming.
+		const allSerialized = this.toolInvocations.length > 0
+			&& this.toolInvocations.every(t => t.kind === 'toolInvocationSerialized');
+		if (allSerialized) {
+			// Fallback: check the persisted title cache using the last tool call (non-local sessions only)
+			if (!LocalChatSessionUri.isLocalSession(this.element.sessionResource)) {
+				const lastToolInvocation = this.toolInvocations[this.toolInvocations.length - 1];
+				if (lastToolInvocation) {
+					const cachedTitle = this.getCachedTitle(lastToolInvocation.toolCallId);
+					if (cachedTitle) {
+						this.currentTitle = cachedTitle;
+						this.content.generatedTitle = cachedTitle;
+						this.setGeneratedTitleOnAllParts(cachedTitle);
+						this.setFinalizedTitle(cachedTitle);
+						return;
+					}
+				}
+			}
+		}
+
 		// case where we only have one item (tool or edit) in the thinking container and no thinking parts, we want to move it back to its original position
-		if (this.appendedItemCount === 1 && this.currentThinkingValue.trim() === '') {
+		if (this.toolInvocationCount === 1 && this.hookCount === 0 && this.currentThinkingValue.trim() === '') {
 			// If singleItemInfo wasn't set (item was lazy/deferred), materialize it now
 			if (!this.singleItemInfo) {
 				const lazyItem = this.lazyItems.find(item => item.kind === 'tool' && item.originalParent);
 				if (lazyItem && lazyItem.kind === 'tool') {
+					const toolInvocation = lazyItem.toolInvocationOrMarkdown && (lazyItem.toolInvocationOrMarkdown.kind === 'toolInvocation' || lazyItem.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? lazyItem.toolInvocationOrMarkdown : undefined;
 					const result = lazyItem.lazy.value;
 					this.singleItemInfo = {
 						element: result.domNode,
 						originalParent: lazyItem.originalParent!,
-						originalNextSibling: this.domNode
+						originalNextSibling: this.domNode,
+						toolInvocation
 					};
 					if (result.disposable) {
-						this._register(result.disposable);
+						const toolCallId = toolInvocation?.toolCallId;
+						if (toolCallId) {
+							this.ownedToolParts.set(toolCallId, result.disposable);
+						} else {
+							this._register(result.disposable);
+						}
 					}
 				}
 			}
-			if (this.singleItemInfo && this.restoreSingleItemToOriginalPosition()) {
+			// Only restore if the tool is complete so the progress spinner is resolved
+			const toolIsComplete = !this.singleItemInfo?.toolInvocation || IChatToolInvocation.isComplete(this.singleItemInfo.toolInvocation);
+			if (toolIsComplete && this.singleItemInfo && this.restoreSingleItemToOriginalPosition()) {
 				return;
 			}
 		}
@@ -853,6 +995,55 @@ export class ChatThinkingContentPart extends ChatCollapsibleContentPart implemen
 		}
 	}
 
+	private loadTitleCache(): Record<string, { title: string; storedAt: number }> {
+		return this.storageService.getObject<Record<string, { title: string; storedAt: number }>>(TITLE_CACHE_STORAGE_KEY, StorageScope.PROFILE) ?? {};
+	}
+
+	private saveTitleCache(cache: Record<string, { title: string; storedAt: number }>): void {
+		if (Object.keys(cache).length === 0) {
+			this.storageService.remove(TITLE_CACHE_STORAGE_KEY, StorageScope.PROFILE);
+		} else {
+			this.storageService.store(TITLE_CACHE_STORAGE_KEY, JSON.stringify(cache), StorageScope.PROFILE, StorageTarget.MACHINE);
+		}
+	}
+
+	private getTitleCacheKey(toolCallId: string): string {
+		return `${chatSessionResourceToId(this.element.sessionResource)}:${toolCallId}`;
+	}
+
+	private getCachedTitle(toolCallId: string): string | undefined {
+		const entry = this.loadTitleCache()[this.getTitleCacheKey(toolCallId)];
+		if (!entry || (Date.now() - entry.storedAt) > TITLE_CACHE_TTL_MS) {
+			return undefined;
+		}
+		return entry.title;
+	}
+
+	private setCachedTitle(toolCallId: string, title: string): void {
+		const cache = this.loadTitleCache();
+		const now = Date.now();
+
+		// Evict expired entries on write
+		for (const key of Object.keys(cache)) {
+			if ((now - cache[key].storedAt) > TITLE_CACHE_TTL_MS) {
+				delete cache[key];
+			}
+		}
+
+		cache[this.getTitleCacheKey(toolCallId)] = { title, storedAt: now };
+
+		// Cap size by dropping oldest entries
+		const keys = Object.keys(cache);
+		if (keys.length > TITLE_CACHE_MAX_ENTRIES) {
+			const sorted = keys.sort((a, b) => cache[a].storedAt - cache[b].storedAt);
+			for (let i = 0; i < sorted.length - TITLE_CACHE_MAX_ENTRIES; i++) {
+				delete cache[sorted[i]];
+			}
+		}
+
+		this.saveTitleCache(cache);
+	}
+
 	private async generateTitleViaLLM(): Promise<void> {
 		const cts = new CancellationTokenSource();
 		const timeout = setTimeout(() => cts.cancel(), 5000);
@@ -1010,6 +1201,15 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 				this.setFinalizedTitle(generatedTitle);
 				this.content.generatedTitle = generatedTitle;
 				this.setGeneratedTitleOnAllParts(generatedTitle);
+
+				// Persist to storage for non-local sessions only
+				if (!LocalChatSessionUri.isLocalSession(this.element.sessionResource)) {
+					const lastTool = this.toolInvocations[this.toolInvocations.length - 1];
+					if (lastTool) {
+						this.setCachedTitle(lastTool.toolCallId, generatedTitle);
+					}
+				}
+
 				return;
 			}
 		} catch (error) {
@@ -1027,7 +1227,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			return false;
 		}
 
-		const { element, originalParent, originalNextSibling } = this.singleItemInfo;
+		const { element, originalParent, originalNextSibling, toolInvocation } = this.singleItemInfo;
 
 		// don't restore it to original position - it contains multiple rendered elements
 		if (element.childElementCount > 1) {
@@ -1041,11 +1241,31 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			originalParent.appendChild(element);
 		}
 
+		if (toolInvocation) {
+			toolInvocation.isAttachedToThinking = false;
+		}
+
 		hide(this.domNode);
 		this.singleItemInfo = undefined;
 		return true;
 	}
 
+	private updateAggregatedDiff(): void {
+		let totalAdded = 0;
+		let totalRemoved = 0;
+		for (const stats of this.diffStatsByPartId.values()) {
+			totalAdded += stats.added;
+			totalRemoved += stats.removed;
+		}
+		this._aggregatedDiff = { added: totalAdded, removed: totalRemoved };
+
+		// Re-render the finalized title if streaming is already complete,
+		// since diff events from edit pills may arrive after the title was set.
+		if (this.streamingCompleted || this.element.isComplete) {
+			this.setFinalizedTitle(this.currentTitle);
+		}
+	}
+
 	private setFallbackTitle(): void {
 		const finalLabel = this.appendedItemCount > 0
 			? localize('chat.thinking.finished.withSteps', 'Finished with {0} step{1}', this.appendedItemCount, this.appendedItemCount === 1 ? '' : 's')
@@ -1076,7 +1296,8 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		factory: () => { domNode: HTMLElement; disposable?: IDisposable },
 		toolInvocationId?: string,
 		toolInvocationOrMarkdown?: IChatToolInvocation | IChatToolInvocationSerialized | IChatMarkdownContent,
-		originalParent?: HTMLElement
+		originalParent?: HTMLElement,
+		onDidChangeDiff?: Event<IEditSessionDiffStats>
 	): void {
 		this.processPendingRemovals();
 
@@ -1084,6 +1305,14 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		this.trackToolMetadata(toolInvocationId, toolInvocationOrMarkdown);
 		this.appendedItemCount++;
 
+		// Listen for diff changes from edit pills
+		if (onDidChangeDiff && toolInvocationId) {
+			this._register(onDidChangeDiff(stats => {
+				this.diffStatsByPartId.set(toolInvocationId, stats);
+				this.updateAggregatedDiff();
+			}));
+		}
+
 		// get random message based on tool type
 		if (this.workingSpinnerLabel) {
 			const isTerminalTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') && toolInvocationOrMarkdown.toolSpecificData?.kind === 'terminal';
@@ -1098,7 +1327,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			if (result.disposable) {
 				const toolCallId = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? toolInvocationOrMarkdown.toolCallId : undefined;
 				if (toolCallId) {
-					this.toolDisposables.get(toolCallId)?.add(result.disposable);
+					this.ownedToolParts.set(toolCallId, result.disposable);
 				} else {
 					this._register(result.disposable);
 				}
@@ -1119,6 +1348,42 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		this.updateDropdownClickability();
 	}
 
+	public removeMaterializedItem(toolCallId: string): void {
+		this.toolDisposables.deleteAndDispose(toolCallId);
+		this.ownedToolParts.delete(toolCallId);
+
+		const wrapper = this.toolWrappersByCallId.get(toolCallId);
+		if (wrapper) {
+			this.toolWrappersByCallId.delete(toolCallId);
+			this.toolIconsByCallId.delete(toolCallId);
+		}
+
+		this.appendedItemCount = Math.max(0, this.appendedItemCount - 1);
+		this.toolInvocationCount = Math.max(0, this.toolInvocationCount - 1);
+
+		const toolInvocationsIndex = this.toolInvocations.findIndex(t =>
+			(t.kind === 'toolInvocation' || t.kind === 'toolInvocationSerialized') && t.toolCallId === toolCallId
+		);
+		if (toolInvocationsIndex !== -1) {
+			// Use the tracked displayed label (which may differ from invocationMessage
+			// for streaming edit tools that show "Editing files")
+			const label = this.toolLabelsByCallId.get(toolCallId);
+			if (label) {
+				const titleIndex = this.extractedTitles.indexOf(label);
+				if (titleIndex !== -1) {
+					this.extractedTitles.splice(titleIndex, 1);
+				}
+			}
+			this.toolInvocations.splice(toolInvocationsIndex, 1);
+		}
+		this.toolLabelsByCallId.delete(toolCallId);
+
+		this._externalResourceWidget.removeToolInvocation(toolCallId);
+
+		this.updateDropdownClickability();
+		this._onDidChangeHeight.fire();
+	}
+
 	/**
 	 * removes/re-establishes a lazy item from the thinking container
 	 * this is needed so we can check if there are confirmations still needed
@@ -1138,6 +1403,25 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			this.toolInvocationCount--;
 		}
 
+		// Clear the attached-to-thinking flag on the removed tool invocation
+		if (removedItem.kind === 'tool' && removedItem.toolInvocationOrMarkdown && (removedItem.toolInvocationOrMarkdown.kind === 'toolInvocation' || removedItem.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized')) {
+			removedItem.toolInvocationOrMarkdown.isAttachedToThinking = false;
+
+			// Keep extractedTitles in sync when a lazy tool leaves the thinking container.
+			// Use the tracked displayed label (which may differ from invocationMessage
+			// for streaming edit tools that show "Editing files")
+			const toolCallId = removedItem.toolInvocationOrMarkdown.toolCallId;
+			this._externalResourceWidget.removeToolInvocation(toolCallId);
+			const label = this.toolLabelsByCallId.get(toolCallId);
+			if (label) {
+				const titleIndex = this.extractedTitles.indexOf(label);
+				if (titleIndex !== -1) {
+					this.extractedTitles.splice(titleIndex, 1);
+				}
+			}
+			this.toolLabelsByCallId.delete(toolCallId);
+		}
+
 		const toolInvocationsIndex = this.toolInvocations.findIndex(t =>
 			(t.kind === 'toolInvocation' || t.kind === 'toolInvocationSerialized') && t.toolId === toolInvocationId
 		);
@@ -1183,11 +1467,14 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 	// removes the tool entry that was previously streaming and now is not. removes item from dom and internal tracking.
 	private removeStreamingToolEntry(toolCallId: string, toolLabel: string): void {
 		this.toolDisposables.deleteAndDispose(toolCallId);
+		this.ownedToolParts.get(toolCallId)?.dispose();
+		this.ownedToolParts.delete(toolCallId);
 
 		const wrapper = this.toolWrappersByCallId.get(toolCallId);
 		if (wrapper) {
 			wrapper.remove();
 			this.toolWrappersByCallId.delete(toolCallId);
+			this.toolIconsByCallId.delete(toolCallId);
 		}
 
 		// make sure to remove any lazy item as well
@@ -1198,6 +1485,10 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			item.toolInvocationOrMarkdown.toolCallId === toolCallId
 		);
 		if (lazyIndex !== -1) {
+			const removedLazyItem = this.lazyItems[lazyIndex];
+			if (removedLazyItem.kind === 'tool' && removedLazyItem.toolInvocationOrMarkdown && (removedLazyItem.toolInvocationOrMarkdown.kind === 'toolInvocation' || removedLazyItem.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized')) {
+				removedLazyItem.toolInvocationOrMarkdown.isAttachedToThinking = false;
+			}
 			this.lazyItems.splice(lazyIndex, 1);
 		}
 
@@ -1214,7 +1505,8 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		if (titleIndex !== -1) {
 			this.extractedTitles.splice(titleIndex, 1);
 		}
-
+		this.toolLabelsByCallId.delete(toolCallId);
+		this._externalResourceWidget.removeToolInvocation(toolCallId);
 		this.updateDropdownClickability();
 		this._onDidChangeHeight.fire();
 	}
@@ -1235,15 +1527,37 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			this.toolInvocationCount++;
 		}
 
+		// Shift default title from 'Thinking' to 'Working' once we have tool calls
+		if (this.toolInvocationCount === 1) {
+			this.defaultTitle = this.workingTitle;
+		}
+
 		let toolCallLabel: string;
 
 		const isToolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized');
 		if (isToolInvocation && toolInvocationOrMarkdown.invocationMessage) {
 			const message = typeof toolInvocationOrMarkdown.invocationMessage === 'string' ? toolInvocationOrMarkdown.invocationMessage : toolInvocationOrMarkdown.invocationMessage.value;
-			toolCallLabel = message;
+
+			// For edit-type tools that are still streaming, use a friendlier label
+			// instead of the generic tool display name (e.g. "Replace String in File")
+			const isStreamingEditTool = toolInvocationOrMarkdown.kind === 'toolInvocation' && IChatToolInvocation.isStreaming(toolInvocationOrMarkdown) && isGenericEditToolId(toolInvocationOrMarkdown.toolId);
+			if (isStreamingEditTool) {
+				toolCallLabel = localize('chat.thinking.editingFiles', 'Editing files');
+			} else {
+				toolCallLabel = message;
+			}
 
 			this.toolInvocations.push(toolInvocationOrMarkdown);
 
+			// Track the displayed label for consistent cleanup
+			const toolCallId = toolInvocationOrMarkdown.toolCallId;
+			this.toolLabelsByCallId.set(toolCallId, toolCallLabel);
+
+			// Render external image pills for serialized (already-completed) tool invocations
+			if (toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') {
+				this.updateExternalResourceParts(toolInvocationOrMarkdown);
+			}
+
 			// track state for live/still streaming tools, excluding serialized tools
 			if (toolInvocationOrMarkdown.kind === 'toolInvocation') {
 				let currentToolLabel = toolCallLabel;
@@ -1269,6 +1583,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 							this.extractedTitles.push(updatedMessage);
 						}
 						currentToolLabel = updatedMessage;
+						this.toolLabelsByCallId.set(toolCallId, updatedMessage);
 						this.lastExtractedTitle = updatedMessage;
 
 						// make sure not to set title if expanded
@@ -1288,6 +1603,18 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 					// queue item to be removed if it was streaming and presentation is hidden
 					if (isStreaming && currentState.type !== IChatToolInvocation.StateKind.Streaming) {
 						isStreaming = false;
+
+						// Update terminal tool icon based on sandbox wrapping state
+						const termData = toolInvocationOrMarkdown.toolSpecificData as IChatTerminalToolInvocationData | undefined;
+						if (termData?.kind === 'terminal') {
+							const iconEl = this.toolIconsByCallId.get(toolCallId);
+							if (iconEl) {
+								const newIcon = termData.commandLine?.isSandboxWrapped ? Codicon.terminalSecure : Codicon.terminal;
+								iconEl.className = 'chat-thinking-icon';
+								iconEl.classList.add(...ThemeIcon.asClassNameArray(newIcon));
+							}
+						}
+
 						if (toolInvocationOrMarkdown.presentation === 'hidden') {
 							this.pendingRemovals.push({ toolCallId: toolInvocationOrMarkdown.toolCallId, toolLabel: currentToolLabel });
 							this.schedulePendingRemovalsFlush();
@@ -1298,6 +1625,17 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 
 					if (currentState.type === IChatToolInvocation.StateKind.Completed ||
 						currentState.type === IChatToolInvocation.StateKind.Cancelled) {
+						// Remove tools that should be hidden now or after completion.
+						if (toolInvocationOrMarkdown.presentation === 'hidden' || toolInvocationOrMarkdown.presentation === 'hiddenAfterComplete') {
+							this.pendingRemovals.push({ toolCallId: toolInvocationOrMarkdown.toolCallId, toolLabel: currentToolLabel });
+							this.schedulePendingRemovalsFlush();
+						}
+
+						// Render image pills outside the collapsible area for completed tools
+						if (currentState.type === IChatToolInvocation.StateKind.Completed) {
+							this.updateExternalResourceParts(toolInvocationOrMarkdown);
+						}
+
 						isComplete = true;
 						return;
 					}
@@ -1362,6 +1700,22 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		}
 	}
 
+	private updateExternalResourceParts(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): void {
+		const extractedImages = extractImagesFromToolInvocationOutputDetails(toolInvocation, this.element.sessionResource);
+		if (extractedImages.length === 0) {
+			return;
+		}
+
+		const parts: IChatCollapsibleIODataPart[] = extractedImages.map(image => ({
+			kind: 'data',
+			value: image.data.buffer,
+			mimeType: image.mimeType,
+			uri: image.uri,
+		}));
+
+		this._externalResourceWidget.setToolInvocationParts(toolInvocation.toolCallId, parts);
+	}
+
 	private appendItemToDOM(
 		content: HTMLElement,
 		toolInvocationId?: string,
@@ -1373,11 +1727,13 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		}
 
 		// Save the first item info for potential restoration later
-		if (this.appendedItemCount === 1 && originalParent) {
+		if (this.toolInvocationCount === 1 && this.hookCount === 0 && originalParent) {
+			const toolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? toolInvocationOrMarkdown : undefined;
 			this.singleItemInfo = {
 				element: content,
 				originalParent,
-				originalNextSibling: this.domNode
+				originalNextSibling: this.domNode,
+				toolInvocation
 			};
 		} else {
 			this.singleItemInfo = undefined;
@@ -1386,20 +1742,28 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		const itemWrapper = $('.chat-thinking-tool-wrapper');
 		const isMarkdownEdit = toolInvocationOrMarkdown?.kind === 'markdownContent';
 		const isTerminalTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') && toolInvocationOrMarkdown.toolSpecificData?.kind === 'terminal';
+		const toolInvocationIcon = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? toolInvocationOrMarkdown.icon : undefined;
 
 		let icon: ThemeIcon;
 		if (isMarkdownEdit) {
 			icon = Codicon.pencil;
 		} else if (isTerminalTool) {
-			const terminalData = (toolInvocationOrMarkdown as IChatToolInvocation | IChatToolInvocationSerialized).toolSpecificData as { kind: 'terminal'; terminalCommandState?: { exitCode?: number } };
+			const terminalData = (toolInvocationOrMarkdown as IChatToolInvocation | IChatToolInvocationSerialized).toolSpecificData as { kind: 'terminal'; terminalCommandState?: { exitCode?: number }; commandLine?: { isSandboxWrapped?: boolean } };
 			const exitCode = terminalData?.terminalCommandState?.exitCode;
-			icon = exitCode !== undefined && exitCode !== 0 ? Codicon.error : Codicon.terminal;
+			const isSandboxWrapped = terminalData?.commandLine?.isSandboxWrapped;
+			if (exitCode !== undefined && exitCode !== 0) {
+				icon = Codicon.error;
+			} else if (isSandboxWrapped) {
+				icon = Codicon.terminalSecure;
+			} else {
+				icon = toolInvocationIcon ?? Codicon.terminal;
+			}
 		} else if (content.classList.contains('chat-hook-outcome-blocked')) {
 			icon = Codicon.error;
 		} else if (content.classList.contains('chat-hook-outcome-warning')) {
 			icon = Codicon.warning;
 		} else {
-			icon = toolInvocationId ? getToolInvocationIcon(toolInvocationId) : Codicon.tools;
+			icon = toolInvocationId ? getToolInvocationIcon(toolInvocationId, toolInvocationIcon) : Codicon.tools;
 		}
 
 		const iconElement = createThinkingIcon(icon);
@@ -1409,6 +1773,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		const isToolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized');
 		if (isToolInvocation && toolInvocationOrMarkdown.toolCallId) {
 			this.toolWrappersByCallId.set(toolInvocationOrMarkdown.toolCallId, itemWrapper);
+			this.toolIconsByCallId.set(toolInvocationOrMarkdown.toolCallId, iconElement);
 		}
 
 		this.appendToWrapper(itemWrapper);
@@ -1447,7 +1812,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 		if (result.disposable) {
 			const toolCallId = item.toolInvocationOrMarkdown && (item.toolInvocationOrMarkdown.kind === 'toolInvocation' || item.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? item.toolInvocationOrMarkdown.toolCallId : undefined;
 			if (toolCallId) {
-				this.toolDisposables.get(toolCallId)?.add(result.disposable);
+				this.ownedToolParts.set(toolCallId, result.disposable);
 			} else {
 				this._register(result.disposable);
 			}
@@ -1507,16 +1872,13 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			}
 			this.titleShimmerSpan = undefined;
 			this.titleDetailContainer = undefined;
-			if (this.titleDetailRendered) {
-				this.titleDetailRendered.dispose();
-				this.titleDetailRendered = undefined;
-			}
+			this._titleDetailRendered.clear();
 			this.currentTitle = title;
 			return;
 		}
 
 		this.lastExtractedTitle = title;
-		const thinkingLabel = `Working: ${title}`;
+		const thinkingLabel = localize('chat.thinking.label', "{0}: {1}", this.defaultTitle, title);
 		this.currentTitle = thinkingLabel;
 
 		if (!this._collapseButton) {
@@ -1531,18 +1893,15 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 			this.titleShimmerSpan = $('span.chat-thinking-title-shimmer');
 			labelElement.appendChild(this.titleShimmerSpan);
 		}
-		this.titleShimmerSpan.textContent = 'Working: ';
+		this.titleShimmerSpan.textContent = localize('chat.thinking.shimmer', "{0}: ", this.defaultTitle);
 
 		// Dispose previous detail rendering
-		if (this.titleDetailRendered) {
-			this.titleDetailRendered.dispose();
-			this.titleDetailRendered = undefined;
-		}
+		this._titleDetailRendered.clear();
 
 		const result = this.chatContentMarkdownRenderer.render(new MarkdownString(title));
 		result.element.classList.add('collapsible-title-content', 'chat-thinking-title-detail');
 		renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
-		this.titleDetailRendered = result;
+		this._titleDetailRendered.value = result;
 
 		if (this.titleDetailContainer) {
 			// Replace old detail in-place
@@ -1557,6 +1916,11 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 	}
 
 	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+
+		if (_element.isComplete) {
+			return true;
+		}
+
 		if (other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized' || other.kind === 'markdownContent' || other.kind === 'hook') {
 			return true;
 		}
@@ -1570,14 +1934,6 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
 
 	override dispose(): void {
 		this.isActive = false;
-		if (this.markdownResult) {
-			this.markdownResult.dispose();
-			this.markdownResult = undefined;
-		}
-		if (this.titleDetailRendered) {
-			this.titleDetailRendered.dispose();
-			this.titleDetailRendered = undefined;
-		}
 		if (this.workingSpinnerElement) {
 			this.workingSpinnerElement.remove();
 			this.workingSpinnerElement = undefined;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingExternalResourcesWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingExternalResourcesWidget.ts
new file mode 100644
index 00000000000..732ff270de5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingExternalResourcesWidget.ts
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { $, clearNode, hide, show } from '../../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ChatResourceGroupWidget } from './chatResourceGroupWidget.js';
+import { IChatCollapsibleIODataPart } from './chatToolInputOutputContentPart.js';
+
+export class ChatThinkingExternalResourceWidget extends Disposable {
+
+	public readonly domNode: HTMLElement;
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	private readonly resourcePartsByToolCallId = new Map<string, IChatCollapsibleIODataPart[]>();
+	private readonly resourceGroupWidget = this._register(new MutableDisposable<ChatResourceGroupWidget>());
+	private readonly resourceGroupWidgetHeightListener = this._register(new MutableDisposable<IDisposable>());
+	private isCollapsed = true;
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+		this.domNode = $('.chat-thinking-external-resources');
+		hide(this.domNode);
+	}
+
+	public setToolInvocationParts(toolCallId: string, parts: IChatCollapsibleIODataPart[]): void {
+		if (parts.length === 0) {
+			return;
+		}
+
+		this.resourcePartsByToolCallId.set(toolCallId, parts);
+
+		this.rebuild();
+	}
+
+	public removeToolInvocation(toolCallId: string): void {
+		if (!this.resourcePartsByToolCallId.delete(toolCallId)) {
+			return;
+		}
+
+		this.rebuild();
+	}
+
+	public setCollapsed(collapsed: boolean): void {
+		this.isCollapsed = collapsed;
+
+		if (!this.resourceGroupWidget.value) {
+			hide(this.domNode);
+			return;
+		}
+
+		if (this.isCollapsed) {
+			show(this.domNode);
+		} else {
+			hide(this.domNode);
+		}
+	}
+
+	private rebuild(): void {
+		const allParts: IChatCollapsibleIODataPart[] = [];
+		for (const parts of this.resourcePartsByToolCallId.values()) {
+			allParts.push(...parts);
+		}
+
+		this.resourceGroupWidgetHeightListener.clear();
+		this.resourceGroupWidget.clear();
+		clearNode(this.domNode);
+
+		if (allParts.length === 0) {
+			hide(this.domNode);
+			this._onDidChangeHeight.fire();
+			return;
+		}
+
+		const widget = this.instantiationService.createInstance(ChatResourceGroupWidget, allParts);
+		this.resourceGroupWidgetHeightListener.value = widget.onDidChangeHeight(() => this._onDidChangeHeight.fire());
+		this.resourceGroupWidget.value = widget;
+		this.domNode.appendChild(widget.domNode);
+		this.setCollapsed(this.isCollapsed);
+		this._onDidChangeHeight.fire();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts
index f73c7cbe8f7..4b1b92693d5 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts
@@ -96,6 +96,7 @@ export class ChatCollapsibleInputOutputContentPart extends Disposable {
 		private readonly output: IChatCollapsibleOutputData | undefined,
 		isError: boolean,
 		initiallyExpanded: boolean,
+		shimmer: boolean,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IHoverService hoverService: IHoverService,
@@ -140,6 +141,7 @@ export class ChatCollapsibleInputOutputContentPart extends Disposable {
 			const checkmarksEnabled = showCheckmarks.read(r);
 			elements.root.classList.toggle('collapsed', !value);
 
+			const isInProgress = !output && !isError;
 			if (isError) {
 				btn.icon = Codicon.error;
 			} else {
@@ -147,6 +149,7 @@ export class ChatCollapsibleInputOutputContentPart extends Disposable {
 					? Codicon.check
 					: ThemeIcon.modify(Codicon.loading, 'spin');
 			}
+			elements.root.classList.toggle('shimmer-progress', shimmer && isInProgress);
 
 			container.root.classList.toggle('show-checkmarks', checkmarksEnabled);
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
index 43efe1b98e0..eca483d44ba 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
@@ -504,4 +504,23 @@
 		padding-left: 2px;
 	}
 
+	/* shimmer animation for collapsible tool widgets (e.g. MCP tools) */
+	.chat-confirmation-widget.shimmer-progress .chat-confirmation-widget-title > .codicon:first-child:not(.chat-collapsible-hover-chevron) {
+		display: none;
+	}
+
+	.chat-confirmation-widget.shimmer-progress .chat-confirmation-widget-title-inner > .rendered-markdown > p {
+		background: linear-gradient(90deg,
+				var(--vscode-descriptionForeground) 0%,
+				var(--vscode-descriptionForeground) 30%,
+				var(--vscode-chat-thinkingShimmer) 50%,
+				var(--vscode-descriptionForeground) 70%,
+				var(--vscode-descriptionForeground) 100%);
+		background-size: 400% 100%;
+		background-clip: text;
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		animation: chat-thinking-shimmer 2s linear infinite;
+	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css
index d93bea631ad..5f14c5bd2b1 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css
@@ -60,9 +60,9 @@
 	flex-shrink: 0;
 }
 
-/* Link-style appearance - no box, no icon */
-.chat-inline-anchor-widget.link-style,
-.interactive-item-container .value .rendered-markdown .chat-inline-anchor-widget.link-style {
+/* Link-style appearance - no box, no icon (controlled by parent container class) */
+.chat-inline-references-link-style .chat-inline-anchor-widget,
+.chat-inline-references-link-style .interactive-item-container .value .rendered-markdown .chat-inline-anchor-widget {
 	border: none;
 	background-color: transparent;
 	padding: 0;
@@ -70,15 +70,15 @@
 	color: var(--vscode-textLink-foreground);
 }
 
-.chat-inline-anchor-widget.link-style:hover {
+.chat-inline-references-link-style .chat-inline-anchor-widget:hover {
 	background-color: transparent;
 	text-decoration: underline;
 }
 
-.chat-inline-anchor-widget.link-style .icon {
+.chat-inline-references-link-style .chat-inline-anchor-widget .icon {
 	display: none;
 }
 
-.chat-inline-anchor-widget.link-style .icon-label {
+.chat-inline-references-link-style .chat-inline-anchor-widget .icon-label {
 	padding: 0;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
index 62d2a0a03b7..656af1f8bf1 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
@@ -99,6 +99,13 @@
 			}
 		}
 
+		.chat-question-header-actions {
+			display: flex;
+			align-items: center;
+			gap: 4px;
+			flex-shrink: 0;
+		}
+
 		.chat-question-close-container {
 			flex-shrink: 0;
 
@@ -117,6 +124,35 @@
 				background: var(--vscode-toolbar-hoverBackground) !important;
 			}
 		}
+
+		.monaco-button.chat-question-collapse-toggle {
+			min-width: 22px;
+			width: 22px;
+			height: 22px;
+			padding: 0;
+			border: none !important;
+			box-shadow: none !important;
+			background: transparent !important;
+			color: var(--vscode-icon-foreground) !important;
+		}
+
+		.monaco-button.chat-question-collapse-toggle:hover:not(.disabled) {
+			background: var(--vscode-toolbar-hoverBackground) !important;
+		}
+	}
+}
+
+.interactive-session .chat-question-carousel-container.chat-question-carousel-collapsed {
+	.chat-question-carousel-content {
+		.chat-question-description,
+		.chat-question-input-scrollable,
+		.chat-question-validation-message {
+			display: none;
+		}
+	}
+
+	.chat-question-footer-row {
+		display: none;
 	}
 }
 
@@ -211,31 +247,52 @@
 			background-color: var(--vscode-list-hoverBackground);
 		}
 
-		/* Single-select: highlight entire row when selected */
+		/* Single-select: highlight entire row when selected (list not focused) */
 		.chat-question-list-item.selected {
-			background-color: var(--vscode-list-hoverBackground);
-			color: var(--vscode-list-activeSelectionForeground);
+			background-color: var(--vscode-list-inactiveSelectionBackground, var(--vscode-list-hoverBackground));
+			color: var(--vscode-list-inactiveSelectionForeground, var(--vscode-foreground));
 
-			.chat-question-label {
-				color: var(--vscode-list-activeSelectionForeground);
+			.chat-question-list-label,
+			.chat-question-list-label-title {
+				color: var(--vscode-list-inactiveSelectionForeground, var(--vscode-foreground));
 			}
 
 			.chat-question-list-label-desc {
-				color: var(--vscode-list-activeSelectionForeground);
-				opacity: 0.8;
+				color: var(--vscode-list-inactiveSelectionForeground, var(--vscode-foreground));
 			}
 
 			.chat-question-list-indicator.codicon-check {
-				color: var(--vscode-list-activeSelectionForeground);
+				color: var(--vscode-list-inactiveSelectionForeground, var(--vscode-foreground));
 			}
 
 			.chat-question-list-number {
-				color: var(--vscode-list-activeSelectionForeground);
+				color: var(--vscode-list-inactiveSelectionForeground, var(--vscode-foreground));
 			}
 		}
 
+		/* When the question list has focus, use active selection styling */
+		.chat-question-list:focus .chat-question-list-item.selected {
+			background-color: var(--vscode-list-activeSelectionBackground, var(--vscode-list-hoverBackground));
+			color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
+
+			.chat-question-label {
+				color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
+			}
+
+			.chat-question-list-label-desc {
+				color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
+			}
+
+			.chat-question-list-indicator.codicon-check {
+				color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
+			}
+
+			.chat-question-list-number {
+				color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
+			}
+		}
 		.chat-question-list-item.selected:hover {
-			background-color: var(--vscode-list-hoverBackground);
+			background-color: var(--vscode-list-inactiveSelectionBackground, var(--vscode-list-hoverBackground));
 		}
 
 		/* Checkbox for multi-select */
@@ -391,6 +448,9 @@
 	padding: 8px 16px 0;
 	font-size: var(--vscode-chat-font-size-body-s);
 	color: var(--vscode-descriptionForeground);
+	max-height: min(220px, 25vh);
+	overflow-y: auto;
+	overscroll-behavior: contain;
 
 	.rendered-markdown p {
 		margin: 0;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css
index 4447aa118e6..198f0f4f3b4 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css
@@ -132,7 +132,6 @@
 	}
 }
 
-.chat-terminal-output-container.collapsed { display: none; }
 .chat-terminal-output-container {
 	border: 1px solid var(--vscode-chat-requestBorder);
 	border-bottom-left-radius: var(--vscode-cornerRadius-medium);
@@ -145,6 +144,12 @@
 	padding: 0;
 }
 
+/* Keep collapsed output fully hidden so it cannot contribute an extra border line. */
+.chat-terminal-output-container.collapsed,
+.chat-terminal-output-container:not(.expanded) {
+	display: none;
+}
+
 .chat-terminal-content-part .chat-terminal-content-title.chat-terminal-content-title-no-bottom-radius {
 	border-bottom-left-radius: 0px;
 	border-bottom-right-radius: 0px;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css
index df4551eaa35..83ca717ea27 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css
@@ -13,6 +13,11 @@
 	position: relative;
 	color: var(--vscode-descriptionForeground);
 
+	.chat-thinking-external-resources {
+		margin-top: 4px;
+		margin-left: 5px;
+	}
+
 	.chat-used-context {
 		margin: 0px;
 	}
@@ -49,6 +54,19 @@
 		.chat-thinking-title-detail-text {
 			opacity: 0.7;
 		}
+
+		.chat-thinking-title-diff {
+			padding-left: 6px;
+
+			> .label-added {
+				color: var(--vscode-chat-linesAddedForeground);
+			}
+
+			> .label-removed {
+				padding-left: 4px;
+				color: var(--vscode-chat-linesRemovedForeground);
+			}
+		}
 	}
 
 	&.chat-thinking-active > .chat-used-context-label .monaco-button.monaco-icon-button {
@@ -56,6 +74,9 @@
 		.codicon.codicon-circle-filled {
 			display: none;
 		}
+	}
+
+	&.chat-thinking-active.chat-used-context-collapsed > .chat-used-context-label .monaco-button.monaco-icon-button {
 
 		.chat-thinking-title-shimmer {
 			background: linear-gradient(90deg,
@@ -92,17 +113,32 @@
 		max-height: none;
 	}
 
+	/* Curved connector from the header to the first thinking item */
+	&:not(.chat-used-context-collapsed)::after {
+		content: '';
+		position: absolute;
+		left: 3px;
+		top: 22px;
+		height: 16px;
+		width: 5px;
+		border-left: 1px solid var(--vscode-chat-requestBorder);
+		border-bottom: 1px solid var(--vscode-chat-requestBorder);
+		border-bottom-left-radius: 5px;
+	}
+
 	.monaco-button.hidden,
 	.chat-pinned-preview.hidden {
 		display: none;
 	}
 
 	.chat-used-context-list.chat-thinking-collapsible {
-		border: 1px solid var(--vscode-chat-requestBorder);
-		border-radius: var(--vscode-cornerRadius-medium);
+		border: none;
+		border-radius: 0;
 		margin-bottom: 0;
 		position: relative;
 		overflow: hidden;
+		padding-top: 0;
+		margin-left: 5px;
 
 		.chat-tool-invocation-part {
 			padding: 4px 12px 4px 18px;
@@ -161,15 +197,16 @@
 
 			.chat-used-context.chat-hook-outcome-blocked,
 			.chat-used-context.chat-hook-outcome-warning {
-					padding: 4px 12px 4px 20px;
-					margin-bottom: 0;
-				}
+				padding: 4px 12px 4px 20px;
+				margin-bottom: 0;
+			}
 		}
 
 		.chat-thinking-item.markdown-content {
 			padding: 6px 12px 6px 24px;
 			position: relative;
 			font-size: var(--vscode-chat-font-size-body-s);
+
 			.progress-container {
 				margin-bottom: 0px;
 				padding-top: 0px;
@@ -255,7 +292,6 @@
 			> .chat-thinking-icon .codicon.codicon-book {
 				top: 10px;
 			}
-
 		}
 
 		.chat-thinking-spinner-item {
@@ -326,10 +362,31 @@
 .interactive-session .interactive-response .value .chat-thinking-fixed-mode {
 	outline: none;
 
+	/* Hide the header/collapse button while streaming — it reappears when chat-thinking-streaming is removed */
+	&:has(.chat-thinking-streaming) > .chat-used-context-label {
+		display: none;
+	}
+
 	> .monaco-scrollable-element > .shadow {
 		display: none;
 	}
 
+	/* Directional fade indicators via mask-image on the scrollable viewport */
+	&.chat-thinking-fade-top > .monaco-scrollable-element {
+		mask-image: linear-gradient(to bottom, transparent 0px, black 20px);
+		-webkit-mask-image: linear-gradient(to bottom, transparent 0px, black 20px);
+	}
+
+	&.chat-thinking-fade-bottom > .monaco-scrollable-element {
+		mask-image: linear-gradient(to top, transparent 0px, black 20px);
+		-webkit-mask-image: linear-gradient(to top, transparent 0px, black 20px);
+	}
+
+	&.chat-thinking-fade-top.chat-thinking-fade-bottom > .monaco-scrollable-element {
+		mask-image: linear-gradient(to bottom, transparent 0px, black 20px, black calc(100% - 20px), transparent 100%);
+		-webkit-mask-image: linear-gradient(to bottom, transparent 0px, black 20px, black calc(100% - 20px), transparent 100%);
+	}
+
 	&.chat-used-context-collapsed > .monaco-scrollable-element:has(.chat-used-context-list.chat-thinking-collapsible:not(.chat-thinking-streaming)) {
 		display: none;
 	}
@@ -338,6 +395,42 @@
 		max-height: 200px;
 		overflow: hidden;
 		display: block;
+		margin-left: 0px;
+		padding-left: 0px;
+
+		.chat-tool-invocation-part {
+			padding-left: 13px;
+		}
+
+		.chat-thinking-spinner-item {
+			padding-left: 19px;
+		}
+
+		.chat-used-context.chat-hook-outcome-blocked,
+		.chat-used-context.chat-hook-outcome-warning {
+			padding-left: 15px;
+		}
+
+		.chat-thinking-item.markdown-content {
+			padding-left: 19px;
+		}
+
+		.chat-thinking-tool-wrapper .chat-markdown-part.rendered-markdown {
+			padding-left: 19px;
+		}
+
+		/* chain of thought lines */
+		.chat-thinking-tool-wrapper,
+		.chat-thinking-item.markdown-content,
+		.chat-thinking-spinner-item {
+			&::before {
+				left: 5.5px;
+			}
+
+			> .chat-thinking-icon {
+				left: 0px;
+			}
+		}
 	}
 
 	&:not(.chat-used-context-collapsed) .chat-used-context-list.chat-thinking-collapsible.chat-thinking-streaming {
@@ -349,10 +442,6 @@
 	&:not(.chat-used-context-collapsed) > .monaco-scrollable-element {
 		overflow: visible;
 		height: auto;
-
-		> .scrollbar {
-			display: none;
-		}
 	}
 
 	.chat-used-context-list.chat-thinking-collapsible:not(.chat-thinking-streaming) {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts
index e736777479d..3a9ac0a040f 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts
@@ -81,7 +81,7 @@ export abstract class AbstractToolConfirmationSubPart extends BaseChatToolInvoca
 			const additionalActions = this.additionalPrimaryActions();
 
 			// find session scoped action
-			const sessionAction = additionalActions.find(
+			const sessionAction = this.useAllowOnceAsPrimary() ? undefined : additionalActions.find(
 				(action): action is IAbstractToolPrimaryAction => 'scope' in action && action.scope === 'session'
 			);
 
@@ -157,6 +157,16 @@ export abstract class AbstractToolConfirmationSubPart extends BaseChatToolInvoca
 		return [];
 	}
 
+	/**
+	 * When true, "Allow Once" stays the primary button even when a
+	 * session-scoped action is available. Subclasses override this
+	 * to keep the simple allow-once default (e.g. when combination
+	 * approval options are present).
+	 */
+	protected useAllowOnceAsPrimary(): boolean {
+		return false;
+	}
+
 	protected abstract createContentElement(): HTMLElement | string;
 	protected abstract getTitle(): string;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
index c9327e5097f..724922571dc 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
@@ -22,7 +22,7 @@ import { IChatCodeBlockInfo } from '../../../chat.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { ChatCollapsibleInputOutputContentPart, ChatCollapsibleIOPart, IChatCollapsibleIOCodePart } from '../chatToolInputOutputContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-import { getToolApprovalMessage } from './chatToolPartUtilities.js';
+import { getToolApprovalMessage, shouldShimmerForTool } from './chatToolPartUtilities.js';
 
 export class ChatInputOutputMarkdownProgressPart extends BaseChatToolInvocationSubPart {
 	/** Remembers expanded tool parts on re-render */
@@ -116,6 +116,7 @@ export class ChatInputOutputMarkdownProgressPart extends BaseChatToolInvocationS
 			// otherwise use the stored expanded state (defaulting to false)
 			(isError && configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures)) ||
 			(ChatInputOutputMarkdownProgressPart._expandedByDefault.get(toolInvocation) ?? false),
+			shouldShimmerForTool(toolInvocation),
 		));
 		this._register(toDisposable(() => ChatInputOutputMarkdownProgressPart._expandedByDefault.set(toolInvocation, collapsibleListPart.expanded)));
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatModifiedFilesConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatModifiedFilesConfirmationSubPart.ts
index 8bf86a6b9d1..710087171ca 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatModifiedFilesConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatModifiedFilesConfirmationSubPart.ts
@@ -92,11 +92,6 @@ export class ChatModifiedFilesConfirmationSubPart extends AbstractToolConfirmati
 					label: option,
 					data: () => this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction, selectedButton: option }),
 				}))
-			},
-			{
-				label: localize('cancel', 'Cancel'),
-				data: () => this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.Skipped }),
-				isSecondary: true,
 			}
 		];
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatSimpleToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatSimpleToolProgressPart.ts
index 84f8b070647..fd87efc42cd 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatSimpleToolProgressPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatSimpleToolProgressPart.ts
@@ -18,7 +18,7 @@ import { IChatCodeBlockInfo } from '../../../chat.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { ChatCollapsibleInputOutputContentPart, ChatCollapsibleIOPart, IChatCollapsibleIOCodePart } from '../chatToolInputOutputContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-import { getToolApprovalMessage } from './chatToolPartUtilities.js';
+import { getToolApprovalMessage, shouldShimmerForTool } from './chatToolPartUtilities.js';
 
 export class ChatSimpleToolProgressPart extends BaseChatToolInvocationSubPart {
 	/** Remembers expanded tool parts on re-render */
@@ -84,6 +84,7 @@ export class ChatSimpleToolProgressPart extends BaseChatToolInvocationSubPart {
 			// otherwise use the stored expanded state (defaulting to false)
 			(isError && configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures)) ||
 			(ChatSimpleToolProgressPart._expandedByDefault.get(toolInvocation) ?? false),
+			shouldShimmerForTool(toolInvocation),
 		));
 		this._register(toDisposable(() => ChatSimpleToolProgressPart._expandedByDefault.set(toolInvocation, collapsibleListPart.expanded)));
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
index 2386b799b6c..f3acc772b0f 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
@@ -211,6 +211,15 @@ export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationS
 			},
 		));
 
+		if (terminalData.requestUnsandboxedExecution) {
+			const reasonText = (terminalData.requestUnsandboxedExecutionReason && terminalData.requestUnsandboxedExecutionReason.trim())
+				|| localize('chat.terminal.unsandboxedExecution.defaultReason', "The model did not provide a reason for requesting unsandboxed execution.");
+			const unsandboxedReasonMarkdown = new MarkdownString(undefined, { supportThemeIcons: true });
+			unsandboxedReasonMarkdown.appendMarkdown(`$(${Codicon.info.id}) `);
+			unsandboxedReasonMarkdown.appendText(reasonText);
+			this._appendMarkdownPart(elements.disclaimer, unsandboxedReasonMarkdown, codeBlockRenderOptions);
+		}
+
 		if (disclaimer) {
 			this._appendMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
index 4fc2868f40f..da42cf8d77b 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
@@ -17,7 +17,10 @@ import { ChatQueryTitlePart } from '../chatConfirmationWidget.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { ChatMarkdownContentPart, type IChatMarkdownContentPartOptions } from '../chatMarkdownContentPart.js';
 import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { ChatResourceGroupWidget } from '../chatResourceGroupWidget.js';
+import { IChatCollapsibleIODataPart } from '../chatToolInputOutputContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { extractImagesFromToolInvocationOutputDetails } from '../../../../common/chatImageExtraction.js';
 import { TerminalToolAutoExpand } from './terminalToolAutoExpand.js';
 import { ChatCollapsibleContentPart } from '../chatCollapsibleContentPart.js';
 import { IChatRendererContent } from '../../../../common/model/chatViewModel.js';
@@ -42,7 +45,7 @@ import { URI } from '../../../../../../../base/common/uri.js';
 import { stripIcons } from '../../../../../../../base/common/iconLabels.js';
 import { IAccessibleViewService } from '../../../../../../../platform/accessibility/browser/accessibleView.js';
 import { IContextKey, IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
-import { AccessibilityVerbositySettingId, AccessibilityWorkbenchSettingId } from '../../../../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityVerbositySettingId } from '../../../../../accessibility/browser/accessibilityConfiguration.js';
 import { ChatContextKeys } from '../../../../common/actions/chatContextKeys.js';
 import { EditorPool } from '../chatContentCodePools.js';
 import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';
@@ -419,16 +422,10 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 			this.domNode = this._createCollapsibleWrapper(progressPart.domNode, displayCommand, toolInvocation, context);
 		} else {
 			this.domNode = progressPart.domNode;
-			// Toggle show-checkmarks class on the progress container for accessibility setting
-			const updateCheckmarks = () => this.domNode.classList.toggle('show-checkmarks', !!this._configurationService.getValue<boolean>(AccessibilityWorkbenchSettingId.ShowChatCheckmarks));
-			updateCheckmarks();
-			this._register(this._configurationService.onDidChangeConfiguration(e => {
-				if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-					updateCheckmarks();
-				}
-			}));
 		}
 
+		this._renderImagePills(toolInvocation, context, elements.container);
+
 		// Only auto-expand in thinking containers if there's actual output to show
 		const hasStoredOutput = !!terminalData.terminalCommandOutput;
 		if (expandedStateByInvocation.get(toolInvocation) || (this._isInThinkingContainer && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
@@ -437,6 +434,57 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 		this._register(this._terminalChatService.registerProgressPart(this));
 	}
 
+	/**
+	 * Renders image attachment pills below the terminal output when the tool
+	 * result contains image data parts. For collapsible wrappers, the single
+	 * widget is reparented between inside/outside based on expanded state.
+	 */
+	private _renderImagePills(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, innerContainer: HTMLElement): void {
+		const renderImages = () => {
+			const extracted = extractImagesFromToolInvocationOutputDetails(toolInvocation, context.element.sessionResource);
+			const imageParts: IChatCollapsibleIODataPart[] = extracted.map(img => ({
+				kind: 'data',
+				value: img.data.buffer,
+				mimeType: img.mimeType,
+				uri: img.uri,
+			}));
+			if (imageParts.length === 0) {
+				return;
+			}
+
+			const widget = this._register(this._instantiationService.createInstance(ChatResourceGroupWidget, imageParts));
+
+			if (this._thinkingCollapsibleWrapper) {
+				// Reparent the single widget between inner (expanded) and outer (collapsed)
+				const wrapper = this._thinkingCollapsibleWrapper;
+				const placeWidget = (expanded: boolean) => {
+					if (expanded) {
+						innerContainer.appendChild(widget.domNode);
+					} else {
+						wrapper.domNode.appendChild(widget.domNode);
+					}
+				};
+				placeWidget(wrapper.expanded.get());
+				this._register(autorun(reader => {
+					placeWidget(wrapper.expanded.read(reader));
+				}));
+			} else {
+				innerContainer.appendChild(widget.domNode);
+			}
+		};
+
+		if (toolInvocation.kind === 'toolInvocationSerialized') {
+			renderImages();
+		} else {
+			this._register(autorun(reader => {
+				const state = toolInvocation.state.read(reader);
+				if (state.type === IChatToolInvocation.StateKind.Completed) {
+					renderImages();
+				}
+			}));
+		}
+	}
+
 	private _createCollapsibleWrapper(contentElement: HTMLElement, commandText: string, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext): HTMLElement {
 		// truncate header when it's too long
 		const truncatedCommand = commandText.length > MAX_COMMAND_TITLE_LENGTH
@@ -451,6 +499,7 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 		const wrapper = this._register(this._instantiationService.createInstance(
 			ChatTerminalThinkingCollapsibleWrapper,
 			truncatedCommand,
+			this._terminalData.commandLine.isSandboxWrapped === true,
 			contentElement,
 			context,
 			initialExpanded,
@@ -1575,13 +1624,15 @@ export class ContinueInBackgroundAction extends Action implements IAction {
 	}
 }
 
-class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
+export class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
 	private readonly _terminalContentElement: HTMLElement;
 	private readonly _commandText: string;
+	private readonly _isSandboxWrapped: boolean;
 	private _isComplete: boolean;
 
 	constructor(
 		commandText: string,
+		isSandboxWrapped: boolean,
 		contentElement: HTMLElement,
 		context: IChatContentPartRenderContext,
 		initialExpanded: boolean,
@@ -1589,11 +1640,14 @@ class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart
 		@IHoverService hoverService: IHoverService,
 		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		const title = isComplete ? `Ran \`${commandText}\`` : `Running \`${commandText}\``;
+		const title = isComplete
+			? localize('chat.terminal.ran.plain', "Ran {0}", commandText)
+			: localize('chat.terminal.running.plain', "Running {0}", commandText);
 		super(title, context, undefined, hoverService, configurationService);
 
 		this._terminalContentElement = contentElement;
 		this._commandText = commandText;
+		this._isSandboxWrapped = isSandboxWrapped;
 		this._isComplete = isComplete;
 
 		this.domNode.classList.add('chat-terminal-thinking-collapsible');
@@ -1614,6 +1668,19 @@ class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart
 		const labelElement = this._collapseButton.labelElement;
 		labelElement.textContent = '';
 
+		if (this._isSandboxWrapped) {
+			const prefixText = this._isComplete
+				? localize('chat.terminal.ranInSandbox.prefix', "Ran ")
+				: localize('chat.terminal.runningInSandbox.prefix', "Running ");
+			const suffixText = localize('chat.terminal.sandbox.suffix', " in sandbox");
+			labelElement.appendChild(document.createTextNode(prefixText));
+			const codeElement = document.createElement('code');
+			codeElement.textContent = this._commandText;
+			labelElement.appendChild(codeElement);
+			labelElement.appendChild(document.createTextNode(suffixText));
+			return;
+		}
+
 		const prefixText = this._isComplete
 			? localize('chat.terminal.ran.prefix', "Ran ")
 			: localize('chat.terminal.running.prefix', "Running ");
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
index 93eb27ff036..fcd46cea03e 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
@@ -87,12 +87,22 @@ export class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {
 		}
 
 		if (state.confirmationMessages?.allowAutoConfirm !== false) {
+			// Get combination label and precomputed key if present
+			const approveCombination = state.confirmationMessages?.approveCombination;
+			const combination = approveCombination
+				? {
+					label: typeof approveCombination.label === 'string' ? approveCombination.label : approveCombination.label.value,
+					key: approveCombination.key,
+				}
+				: undefined;
+
 			// Get actions from confirmation service
 			const confirmActions = this.confirmationService.getPreConfirmActions({
 				toolId: this.toolInvocation.toolId,
 				source: this.toolInvocation.source,
 				parameters: state.parameters,
-				chatSessionResource: this.context.element.sessionResource
+				chatSessionResource: this.context.element.sessionResource,
+				combination,
 			});
 
 			for (const action of confirmActions) {
@@ -128,6 +138,14 @@ export class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {
 		return actions;
 	}
 
+	protected override useAllowOnceAsPrimary(): boolean {
+		const state = this.toolInvocation.state.get();
+		if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+			return !!state.confirmationMessages?.approveCombination;
+		}
+		return false;
+	}
+
 	protected createContentElement(): HTMLElement | string {
 		const state = this.toolInvocation.state.get();
 		if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation) {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.ts
index 0aba9ec84a9..9ba9846de1a 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.ts
@@ -7,6 +7,24 @@ import { createMarkdownCommandLink, IMarkdownString, MarkdownString } from '../.
 import { localize } from '../../../../../../../nls.js';
 import { ConfirmedReason, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
 
+export function isMcpToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): boolean {
+	return toolInvocation.source?.type === 'mcp' || toolInvocation.toolId.toLowerCase().includes('mcp');
+}
+
+/**
+ * Determines whether a tool invocation's progress text should shimmer.
+ * MCP tools shimmer; askQuestions defers to the caller's default; all others opt out.
+ */
+export function shouldShimmerForTool(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): boolean {
+	if (isMcpToolInvocation(toolInvocation)) {
+		return !IChatToolInvocation.isComplete(toolInvocation);
+	}
+	if (toolInvocation.toolId === 'copilot_askQuestions' || toolInvocation.toolId === 'vscode_askQuestions') {
+		return false;
+	}
+	return false;
+}
+
 /**
  * Creates a markdown message explaining why a tool was auto-approved.
  * @param toolInvocation The tool invocation to get the approval message for
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
index f142f629438..b19c0ce3e3c 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
@@ -18,6 +18,7 @@ import { IChatCodeBlockInfo } from '../../../chat.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { ChatProgressContentPart } from '../chatProgressContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { shouldShimmerForTool } from './chatToolPartUtilities.js';
 
 export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
 	public readonly domNode: HTMLElement;
@@ -35,15 +36,6 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
 		super(toolInvocation);
 
 		this.domNode = this.createProgressPart();
-
-		// Toggle show-checkmarks class for the accessibility setting
-		const updateCheckmarks = () => this.domNode.classList.toggle('show-checkmarks', !!this.configurationService.getValue<boolean>(AccessibilityWorkbenchSettingId.ShowChatCheckmarks));
-		updateCheckmarks();
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-				updateCheckmarks();
-			}
-		}));
 	}
 
 	private createProgressPart(): HTMLElement {
@@ -114,8 +106,7 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
 			this.provideScreenReaderStatus(content);
 		}
 
-		const isAskQuestionsTool = this.toolInvocation.toolId === 'copilot_askQuestions' || this.toolInvocation.toolId === 'vscode_askQuestions';
-		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon(), this.toolInvocation, isAskQuestionsTool ? undefined : false);
+		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon(), this.toolInvocation, shouldShimmerForTool(this.toolInvocation));
 	}
 
 	private getAnnouncementKey(kind: 'progress' | 'complete'): string {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
index b9174190449..d840ad32a87 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
@@ -23,7 +23,6 @@ import { FuzzyScore } from '../../../../../base/common/filters.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
-import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Disposable, DisposableStore, IDisposable, dispose, thenIfNotDisposed, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { ScrollEvent } from '../../../../../base/common/scrollable.js';
@@ -64,7 +63,7 @@ import { IChatRequestVariableEntry } from '../../common/attachments/chatVariable
 import { IChatChangesSummaryPart, IChatCodeCitations, IChatErrorDetailsPart, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, isRequestVM, isResponseVM, IChatPendingDividerViewModel, isPendingDividerVM } from '../../common/model/chatViewModel.js';
 import { getNWords } from '../../common/model/chatWordCounter.js';
 import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatPermissionLevel, CollapsedToolsDisplayMode, ThinkingDisplayMode } from '../../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind, CollapsedToolsDisplayMode, ThinkingDisplayMode } from '../../common/constants.js';
 import { ClickAnimation } from '../../../../../base/browser/ui/animations/animations.js';
 import { MarkHelpfulActionId, MarkUnhelpfulActionId } from '../actions/chatTitleActions.js';
 import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidgetService } from '../chat.js';
@@ -108,13 +107,14 @@ import { IAccessibilityService } from '../../../../../platform/accessibility/com
 import { ChatHookContentPart } from './chatContentParts/chatHookContentPart.js';
 import { ChatPendingDragController } from './chatPendingDragAndDrop.js';
 import { HookType } from '../../common/promptSyntax/hookTypes.js';
-import { ChatQuestionCarouselAutoReply } from './chatQuestionCarouselAutoReply.js';
 import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
 import { AccessibilityWorkbenchSettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { isMcpToolInvocation } from './chatContentParts/toolInvocationParts/chatToolPartUtilities.js';
 
 const $ = dom.$;
 
 const COPILOT_USERNAME = 'GitHub Copilot';
+const WORKING_CAUGHT_UP_DEBOUNCE_MS = 50;
 
 export interface IChatListItemTemplate {
 	currentElement?: ChatTreeItem;
@@ -196,9 +196,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	/** Track pending question carousels by session resource for auto-skip on chat submission */
 	private readonly pendingQuestionCarousels = new ResourceMap<Set<ChatQuestionCarouselPart>>();
-	private readonly _autoRepliedQuestionCarousels = new Set<string>();
-	private readonly _autoReply: ChatQuestionCarouselAutoReply;
-
 	private readonly _notifiedQuestionCarousels = new Set<string>();
 
 	private readonly chatContentMarkdownRenderer: IMarkdownRenderer;
@@ -285,8 +282,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this._register(this.instantiationService.createInstance(ChatCodeBlockContentProvider));
 		this._inlineTextModels = this._register(this.instantiationService.createInstance(InlineTextModelCollection));
 		this._toolInvocationCodeBlockCollection = this._register(this.instantiationService.createInstance(CodeBlockModelCollection, 'tools'));
-		this._autoReply = this._register(this.instantiationService.createInstance(ChatQuestionCarouselAutoReply));
-
 		// Auto-skip pending question carousels when user submits a new chat message
 		this._register(this.chatService.onDidSubmitRequest(e => {
 			const carousels = this.pendingQuestionCarousels.get(e.chatSessionResource);
@@ -297,6 +292,18 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				carousels.clear();
 			}
 		}));
+
+		// Auto-skip all pending question carousels when auto-reply is enabled mid-session
+		this._register(this.configService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.AutoReply) && this.configService.getValue<boolean>(ChatConfiguration.AutoReply)) {
+				for (const [, carousels] of this.pendingQuestionCarousels) {
+					for (const carousel of carousels) {
+						carousel.skip();
+					}
+					carousels.clear();
+				}
+			}
+		}));
 	}
 
 	private _pendingDragController: ChatPendingDragController | undefined;
@@ -379,7 +386,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	updateViewModel(viewModel: IChatViewModel | undefined): void {
 		this.viewModel = viewModel;
 		this._announcedToolProgressKeys.clear();
-		this._autoRepliedQuestionCarousels.clear();
 		this._notifiedQuestionCarousels.clear();
 		this.codeBlocksByEditorUri.clear();
 		this.codeBlocksByResponseId.clear();
@@ -740,6 +746,17 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		templateData.rowContainer.classList.toggle('interactive-response', isResponseVM(element));
 		const progressMessageAtBottomOfResponse = checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse);
 		templateData.rowContainer.classList.toggle('show-detail-progress', isResponseVM(element) && !element.isComplete && !element.progressMessages.length && !progressMessageAtBottomOfResponse);
+
+		// Toggle show-checkmarks class at the container level for the accessibility setting,
+		// so child content parts can use CSS descendant selectors instead of each subscribing individually.
+		const updateContainerCheckmarks = () => templateData.rowContainer.classList.toggle('show-checkmarks', !!this.configService.getValue<boolean>(AccessibilityWorkbenchSettingId.ShowChatCheckmarks));
+		updateContainerCheckmarks();
+		templateData.elementDisposables.add(this.configService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
+				updateContainerCheckmarks();
+			}
+		}));
+
 		if (!this.rendererOptions.noHeader) {
 			this.renderAvatar(element, templateData);
 		}
@@ -755,8 +772,9 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		}
 
 		templateData.checkpointToolbar.context = element;
+		const supportsForkOrRestoration = this.rendererOptions.supportsFork || (this.rendererOptions.restorable ?? true);
 		const checkpointEnabled = this.configService.getValue<boolean>(ChatConfiguration.CheckpointsEnabled)
-			&& (this.rendererOptions.restorable ?? true);
+			&& supportsForkOrRestoration;
 		const isPendingRequest = isRequestVM(element) && !!element.pendingKind;
 
 		templateData.checkpointContainer.classList.toggle('hidden', isResponseVM(element) || isPendingRequest || !(checkpointEnabled));
@@ -924,14 +942,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			dom.append(templateData.detail, $('span.confirmation-text', undefined, localize('chatConfirmationAction', 'Selected "{0}"', element.confirmation)));
 			templateData.header?.classList.remove('header-disabled');
 			templateData.header?.classList.add('partially-disabled');
-
-			const updateCheckmarks = () => templateData.detail.classList.toggle('show-checkmarks', !!this.configService.getValue<boolean>(AccessibilityWorkbenchSettingId.ShowChatCheckmarks));
-			updateCheckmarks();
-			templateData.elementDisposables.add(this.configService.onDidChangeConfiguration(e => {
-				if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-					updateCheckmarks();
-				}
-			}));
 		}
 	}
 
@@ -1006,7 +1016,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this.renderChatContentDiff(diff, content, element, index, templateData);
 	}
 
-	private shouldShowWorkingProgress(element: IChatResponseViewModel, partsToRender: IChatRendererContent[], templateData: IChatListItemTemplate): boolean {
+	private shouldShowWorkingProgress(element: IChatResponseViewModel, partsToRender: IChatRendererContent[], moreContentAvailable: boolean, templateData: IChatListItemTemplate): boolean {
 		if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === 'minimal' || element.isComplete || !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
 			return false;
 		}
@@ -1016,13 +1026,14 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			return false;
 		}
 
+		// Don't show working spinner when there's an in-progress MCP tool - MCP tools have their own progress indicator
+		if (partsToRender.some(part => part.kind === 'toolInvocation' && !IChatToolInvocation.isComplete(part) && isMcpToolInvocation(part))) {
+			return false;
+		}
+
 		// Show if no content, only "used references", ends with a complete tool call, or ends with complete text edits and there is no incomplete tool call (edits are still being applied some time after they are all generated)
 		const lastPart = findLast(partsToRender, part => part.kind !== 'markdownContent' || part.content.value.trim().length > 0);
 
-		// don't show working progress when there is thinking content in partsToRender (about to be rendered)
-		if (partsToRender.some(part => part.kind === 'thinking')) {
-			return false;
-		}
 
 		// never show working progress when there is an active thinking piece
 		const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
@@ -1030,13 +1041,16 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			return false;
 		}
 
-		const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
-		if (collapsedToolsMode !== CollapsedToolsDisplayMode.Off &&
-			partsToRender.some(part =>
-				(part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') &&
-				this.shouldPinPart(part, element)
-			)) {
-			return false;
+		// Never show working when the last part is a tool invocation that is attached to thinking,
+		// or *will be* attached to thinking during the upcoming render pass
+		if (lastPart && (lastPart.kind === 'toolInvocation' || lastPart.kind === 'toolInvocationSerialized')) {
+			if (lastPart.isAttachedToThinking) {
+				return false;
+			}
+			const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
+			if (collapsedToolsMode !== CollapsedToolsDisplayMode.Off && this.shouldPinPart(lastPart, isResponseVM(element) ? element : undefined)) {
+				return false;
+			}
 		}
 
 
@@ -1054,6 +1068,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		if (
 			!lastPart ||
 			lastPart.kind === 'references' ||
+			(lastPart.kind === 'markdownContent' && !moreContentAvailable && this.hasBeenCaughtUpLongEnough(element)) ||
 			((lastPart.kind === 'toolInvocation' || lastPart.kind === 'toolInvocationSerialized') && (IChatToolInvocation.isComplete(lastPart) || lastPart.presentation === 'hidden')) ||
 			((lastPart.kind === 'textEditGroup' || lastPart.kind === 'notebookEditGroup') && lastPart.done && !partsToRender.some(part => part.kind === 'toolInvocation' && !IChatToolInvocation.isComplete(part))) ||
 			(lastPart.kind === 'progressTask' && lastPart.deferred.isSettled) ||
@@ -1067,6 +1082,17 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		return false;
 	}
 
+	/**
+	 *  Adds a debounce on when to show "working" shimmer.
+	 */
+	private hasBeenCaughtUpLongEnough(element: IChatResponseViewModel): boolean {
+		const lastRenderTime = element.renderData?.lastRenderTime;
+		if (typeof lastRenderTime !== 'number' || lastRenderTime === 0) {
+			return false;
+		}
+		return (Date.now() - lastRenderTime) >= WORKING_CAUGHT_UP_DEBOUNCE_MS;
+	}
+
 
 	private getChatFileChangesSummaryPart(element: IChatResponseViewModel): IChatChangesSummaryPart | undefined {
 		if (!this.shouldShowFileChangesSummary(element)) {
@@ -1133,6 +1159,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const parts: IChatContentPart[] = [];
 
 		let inlineSlashCommandRendered = false;
+		let codeBlockStartIndex = 0;
 		content.forEach((data, contentIndex) => {
 			const context: IChatContentPartRenderContext = {
 				element,
@@ -1146,12 +1173,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				currentWidth: this._currentLayoutWidth,
 				onDidChangeVisibility: this._onDidChangeVisibility.event,
 				inlineTextModels: this._inlineTextModels,
-				get codeBlockStartIndex() {
-					return parts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
-				},
-				get treeStartIndex() {
-					return parts.filter(part => part instanceof ChatTreeContentPart).length;
-				}
+				codeBlockStartIndex,
+				treeStartIndex: 0, // no trees in requests
 			};
 			const newPart = this.renderChatContentPart(data, templateData, context);
 			if (newPart) {
@@ -1174,6 +1197,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 					templateData.value.appendChild(newPart.domNode);
 				}
 				parts.push(newPart);
+				codeBlockStartIndex += newPart.codeblocks?.length ?? 0;
 			}
 		});
 
@@ -1241,10 +1265,21 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	private renderChatContentDiff(partsToRender: ReadonlyArray<IChatRendererContent | null>, contentForThisTurn: ReadonlyArray<IChatRendererContent>, element: IChatResponseViewModel, elementIndex: number, templateData: IChatListItemTemplate): void {
 		const renderedParts = templateData.renderedParts ?? [];
 		templateData.renderedParts = renderedParts;
-		const lastMarkdownIndex = partsToRender.findLastIndex(part => part?.kind === 'markdownContent');
+		let codeBlockStartIndex = 0;
+		let treeStartIndex = 0;
 		partsToRender.forEach((partToRender, contentIndex) => {
+			// Accumulate counts from the part that ended up at the previous index
+			if (contentIndex > 0) {
+				const prevPart = renderedParts[contentIndex - 1];
+				if (prevPart) {
+					codeBlockStartIndex += prevPart.codeblocks?.length ?? 0;
+					if (prevPart instanceof ChatTreeContentPart) {
+						treeStartIndex++;
+					}
+				}
+			}
+
 			const alreadyRenderedPart = templateData.renderedParts?.[contentIndex];
-			const isFinalAnswerPart = partToRender?.kind === 'markdownContent' && contentIndex === lastMarkdownIndex && element.isComplete;
 
 			if (!partToRender) {
 				// null=no change
@@ -1262,7 +1297,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 					}
 					renderedParts[contentIndex] = alreadyRenderedPart;
 					return;
-				} else if (alreadyRenderedPart instanceof ChatThinkingContentPart && this.shouldPinPart(partToRender, element) && !isFinalAnswerPart) {
+				} else if (alreadyRenderedPart instanceof ChatThinkingContentPart && this.shouldPinPart(partToRender, element)) {
 					// keep existing thinking part if we are pinning it (combining tool calls into it)
 					renderedParts[contentIndex] = alreadyRenderedPart;
 					return;
@@ -1280,7 +1315,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				}
 			}
 
-			const preceedingContentParts = renderedParts.slice(0, contentIndex);
 			const context: IChatContentPartRenderContext = {
 				element,
 				elementIndex: elementIndex,
@@ -1293,17 +1327,13 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				currentWidth: this._currentLayoutWidth,
 				onDidChangeVisibility: this._onDidChangeVisibility.event,
 				inlineTextModels: this._inlineTextModels,
-				get codeBlockStartIndex() {
-					return preceedingContentParts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
-				},
-				get treeStartIndex() {
-					return preceedingContentParts.filter(part => part instanceof ChatTreeContentPart).length;
-				}
+				codeBlockStartIndex,
+				treeStartIndex,
 			};
 
 			// combine tool invocations into thinking part if needed. render the tool, but do not replace the working spinner with the new part's dom node since it is already inside the thinking part.
 			const lastThinking = this.getLastThinkingPart(renderedParts);
-			if (lastThinking && (partToRender.kind === 'toolInvocation' || partToRender.kind === 'toolInvocationSerialized' || partToRender.kind === 'markdownContent' || partToRender.kind === 'textEditGroup' || partToRender.kind === 'hook') && this.shouldPinPart(partToRender, element) && !isFinalAnswerPart) {
+			if (lastThinking && (partToRender.kind === 'toolInvocation' || partToRender.kind === 'toolInvocationSerialized' || partToRender.kind === 'markdownContent' || partToRender.kind === 'textEditGroup' || partToRender.kind === 'hook') && this.shouldPinPart(partToRender, element)) {
 				const newPart = this.renderChatContentPart(partToRender, templateData, context);
 				if (newPart) {
 					renderedParts[contentIndex] = newPart;
@@ -1415,7 +1445,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			element.renderData = { lastRenderTime: Date.now(), renderedWordCount: newRenderedWordCount, renderedParts: partsToRender };
 		}
 
-		if (this.shouldShowWorkingProgress(element, partsToRender, templateData)) {
+		if (this.shouldShowWorkingProgress(element, partsToRender, moreContentAvailable, templateData)) {
 			partsToRender.push({ kind: 'working' });
 		}
 
@@ -1463,17 +1493,9 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	private diff(renderedParts: ReadonlyArray<IChatContentPart>, contentToRender: ReadonlyArray<IChatRendererContent>, element: ChatTreeItem): ReadonlyArray<IChatRendererContent | null> {
 		const diff: (IChatRendererContent | null)[] = [];
-		const elementIsComplete = isResponseVM(element) && element.isComplete;
-		const lastMarkdownContentIndex = contentToRender.findLastIndex(part => part.kind === 'markdownContent');
 		for (let i = 0; i < contentToRender.length; i++) {
 			const content = contentToRender[i];
 			const renderedPart = renderedParts[i];
-			const isFinalAnswerPart = content.kind === 'markdownContent' && i === lastMarkdownContentIndex && elementIsComplete;
-
-			if (isFinalAnswerPart && this.isRenderedPartInsideThinking(renderedPart)) {
-				diff.push(content);
-				continue;
-			}
 
 			if (!renderedPart || !renderedPart.hasSameContent(content, contentToRender.slice(i + 1), element)) {
 				diff.push(content);
@@ -1486,13 +1508,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		return diff;
 	}
 
-	private isRenderedPartInsideThinking(renderedPart: IChatContentPart | undefined): boolean {
-		if (!renderedPart?.domNode) {
-			return false;
-		}
-		return !!dom.findParentWithClass(renderedPart.domNode, 'chat-thinking-box');
-	}
-
 	private hasEditCodeblockUri(part: IChatRendererContent): boolean {
 		if (part.kind !== 'markdownContent') {
 			return false;
@@ -1538,8 +1553,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			return true;
 		}
 
-		// Don't pin MCP tools
-		const isMcpTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && part.source?.type === 'mcp';
+		// Don't pin MCP tools + for CLI specficially, we parse tool name since CLI tools are "external" tools.
+		const isMcpTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && isMcpToolInvocation(part);
 		if (isMcpTool) {
 			return false;
 		}
@@ -1958,10 +1973,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		// Factory that creates the tool invocation part with all necessary setup
 		let lazilyCreatedPart: ChatToolInvocationPart | undefined = undefined;
-		const createToolPart = (): { domNode: HTMLElement; part: ChatToolInvocationPart } => {
+		const createToolPart = (): { domNode: HTMLElement; disposable: ChatToolInvocationPart; part: ChatToolInvocationPart } => {
 			lazilyCreatedPart = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.chatContentMarkdownRenderer, this._contentReferencesListPool, this._toolEditorPool, () => this._currentLayoutWidth.get(), this._toolInvocationCodeBlockCollection, this._announcedToolProgressKeys, codeBlockStartIndex);
 			this.handleRenderedCodeblocks(context.element, lazilyCreatedPart, codeBlockStartIndex);
-			return { domNode: lazilyCreatedPart.domNode, part: lazilyCreatedPart };
+			return { domNode: lazilyCreatedPart.domNode, disposable: lazilyCreatedPart, part: lazilyCreatedPart };
 		};
 
 		// handling for when we want to put tool invocations inside a thinking part
@@ -1977,6 +1992,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 				if (thinkingPart instanceof ChatThinkingContentPart) {
 					// Append using factory - thinking part decides whether to render lazily
+					toolInvocation.isAttachedToThinking = true;
 					thinkingPart.appendItem(createToolPart, toolInvocation.toolId, toolInvocation, templateData.value);
 					this.setupConfirmationTransitionWatcher(toolInvocation, thinkingPart, () => lazilyCreatedPart, createToolPart, context, templateData);
 				}
@@ -1987,6 +2003,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			if (this.shouldPinPart(toolInvocation, context.element)) {
 				if (lastThinking && toolInvocation.presentation !== 'hidden') {
 					// Append using factory - thinking part decides whether to render lazily
+					toolInvocation.isAttachedToThinking = true;
 					lastThinking.appendItem(createToolPart, toolInvocation.toolId, toolInvocation, templateData.value);
 					this.setupConfirmationTransitionWatcher(toolInvocation, lastThinking, () => lazilyCreatedPart, createToolPart, context, templateData);
 					return this.renderNoContent((other, followingContent, element) => lazilyCreatedPart ?
@@ -2015,7 +2032,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
 		thinkingPart: ChatThinkingContentPart,
 		getCreatedPart: () => ChatToolInvocationPart | undefined,
-		createToolPart: () => { domNode: HTMLElement; part: ChatToolInvocationPart },
+		createToolPart: () => { domNode: HTMLElement; disposable: ChatToolInvocationPart; part: ChatToolInvocationPart },
 		context: IChatContentPartRenderContext,
 		templateData: IChatListItemTemplate
 	): void {
@@ -2026,18 +2043,27 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const removeConfirmationWidget = () => {
 			const createdPart = getCreatedPart();
 			// move the created part out of thinking and into the main template
+			toolInvocation.isAttachedToThinking = false;
 			if (createdPart?.domNode) {
 				const wrapper = createdPart.domNode.parentElement;
 				if (wrapper?.classList.contains('chat-thinking-tool-wrapper')) {
 					wrapper.remove();
 				}
 				templateData.value.appendChild(createdPart.domNode);
+				// Decrement thinking part counters for the materialized item that was moved out
+				thinkingPart.removeMaterializedItem(toolInvocation.toolCallId);
 			} else {
 				thinkingPart.removeLazyItem(toolInvocation.toolId);
 				const { domNode } = createToolPart();
 				templateData.value.appendChild(domNode);
 			}
 			this.finalizeCurrentThinkingPart(context, templateData);
+
+			// if the thinking part is now completely empty (no tools, no thinking text)
+			if (thinkingPart.isEffectivelyEmpty()) {
+				thinkingPart.domNode?.remove();
+				thinkingPart.dispose();
+			}
 		};
 
 		const currentState = toolInvocation.state.get();
@@ -2160,9 +2186,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		const widget = isResponseVM(context.element) ? this.chatWidgetService.getWidgetBySessionResource(context.element.sessionResource) : undefined;
 		const shouldAutoFocus = widget ? widget.getInput() === '' : true;
-		const modelName = widget?.input.currentLanguageModel;
 		const responseId = isResponseVM(context.element) ? context.element.requestId : undefined;
-		const requestMessageText = isResponseVM(context.element) ? this.getRequestMessageText(context.element) : undefined;
 
 		const handleSubmit = async (answers: Map<string, IChatQuestionAnswerValue> | undefined, part: ChatQuestionCarouselPart) => {
 			// Mark the carousel as used and store the answers
@@ -2231,12 +2255,9 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				shouldAutoFocus,
 				onSubmit: async (answers) => handleSubmit(answers, fallbackPart)
 			});
-			this.maybeAutoReplyToQuestionCarousel(context, carousel, fallbackPart, answers => handleSubmit(answers, fallbackPart), modelName, requestMessageText);
 			return fallbackPart;
 		}
 
-		this.maybeAutoReplyToQuestionCarousel(context, carousel, part, answers => handleSubmit(answers, part), modelName, requestMessageText);
-
 		// Track the carousel for auto-skip when user submits a new message
 		// Only add tracking if not already tracked (prevents duplicate tracking on re-render)
 		if (isResponseVM(context.element) && carousel.allowSkip && !carousel.isUsed) {
@@ -2314,80 +2335,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		// OS toast notification is handled by ChatWindowNotifier
 	}
 
-	private maybeAutoReplyToQuestionCarousel(
-		context: IChatContentPartRenderContext,
-		carousel: IChatQuestionCarousel,
-		part: ChatQuestionCarouselPart,
-		submit: (answers: Map<string, IChatQuestionAnswerValue> | undefined) => Promise<void>,
-		modelName: string | undefined,
-		requestMessageText: string | undefined,
-	): void {
-		if (carousel.isUsed) {
-			return;
-		}
-
-		// Use a stable key based on requestId + resolveId to prevent duplicate
-		// auto-replies across re-renders of the same logical carousel.
-		const stableKey = this._getCarouselStableKey(context, carousel);
-		if (stableKey) {
-			if (this._autoRepliedQuestionCarousels.has(stableKey)) {
-				return;
-			}
-			// Mark as in-progress before the async opt-in check to prevent
-			// duplicate prompts/requests from concurrent re-renders.
-			this._autoRepliedQuestionCarousels.add(stableKey);
-		}
-
-		void this._autoReply.shouldAutoReply().then(shouldAutoReply => {
-			// always autoreply in autopilot mode.
-			const isAutopilot = this._isAutopilotForContext(context);
-			if (!shouldAutoReply && !isAutopilot) {
-				// Roll back the in-progress mark if auto-reply is not enabled.
-				if (stableKey) {
-					this._autoRepliedQuestionCarousels.delete(stableKey);
-				}
-				return;
-			}
-
-			const cts = new CancellationTokenSource();
-			part.addDisposable(toDisposable(() => {
-				cts.cancel();
-				cts.dispose();
-			}));
-
-			this._autoReply.autoReply(carousel, submit, modelName, requestMessageText, cts.token).catch(err => {
-				this.logService.debug('#ChatQuestionCarousel: Auto reply failed', toErrorMessage(err));
-			});
-		});
-	}
-
-
-	private getRequestMessageText(response: IChatResponseViewModel): string | undefined {
-		const requestId = response.requestId;
-		const items = response.session.getItems();
-		const request = items.find(item => isRequestVM(item) && item.id === requestId) as IChatRequestViewModel | undefined;
-		return request?.messageText;
-	}
-
-	// session scoped picker
-	private _isAutopilotForContext(context: IChatContentPartRenderContext): boolean {
-		// Check request-stamped level
-		if (isResponseVM(context.element) && context.element.model.request?.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot) {
-			return true;
-		}
-		// Check live widget picker level (handles mid-session switches)
-		if (isResponseVM(context.element)) {
-			const widget = this.chatWidgetService.getWidgetBySessionResource(context.element.sessionResource)
-				?? this.chatWidgetService.lastFocusedWidget;
-			if (widget?.input.currentModeInfo.permissionLevel === ChatPermissionLevel.Autopilot) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-
 	private removeCarouselFromTracking(context: IChatContentPartRenderContext, part: ChatQuestionCarouselPart): void {
 		if (isResponseVM(context.element)) {
 			const carousels = this.pendingQuestionCarousels.get(context.element.sessionResource);
@@ -2417,9 +2364,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	private renderMarkdown(markdown: IChatMarkdownContent, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
 		const element = context.element;
-		const isFinalRenderPass = isResponseVM(element) && element.isComplete && !element.renderData;
-		const lastPinnedPartIndex = isFinalRenderPass ? context.content.findLastIndex(c => c.kind === 'thinking' || c.kind === 'toolInvocation' || c.kind === 'toolInvocationSerialized') : -1;
-		const isFinalAnswerPart = isFinalRenderPass && context.contentIndex > lastPinnedPartIndex;
 		const isBlankMarkdown = !markdown.content.value.trim();
 		// Don't finalize thinking if the markdown has an incomplete codeblock with a
 		// vscode_codeblock_uri tag — the isEdit annotation may not have arrived yet.
@@ -2427,7 +2371,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const hasPendingEditCodeblock = isResponseVM(element) && !element.isComplete
 			&& hasCodeblockUriTag(markdown.content.value)
 			&& !codeblockHasClosingBackticks(markdown.content.value);
-		if ((!this.hasEditCodeblockUri(markdown) || isFinalAnswerPart) && !isBlankMarkdown && !hasPendingEditCodeblock) {
+		if (!this.hasEditCodeblockUri(markdown) && !isBlankMarkdown && !hasPendingEditCodeblock) {
 			this.finalizeCurrentThinkingPart(context, templateData);
 		}
 		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete || !!element.renderData);
@@ -2483,7 +2427,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this.handleRenderedCodeblocks(element, markdownPart, codeBlockStartIndex);
 
 		const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
-		if (isResponseVM(context.element) && collapsedToolsMode !== CollapsedToolsDisplayMode.Off && !isFinalAnswerPart) {
+		if (isResponseVM(context.element) && collapsedToolsMode !== CollapsedToolsDisplayMode.Off) {
 
 			// append to thinking part when the codeblock is complete
 			const isComplete = this.isCodeblockComplete(markdown, context.element);
@@ -2516,7 +2460,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 						() => ({ domNode: markdownPart.domNode, disposable: markdownPart }),
 						markdownPart.codeblocksPartId,
 						markdown,
-						templateData.value
+						templateData.value,
+						markdownPart.onDidChangeDiff
 					);
 				}
 
@@ -2530,7 +2475,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 						() => ({ domNode: markdownPart.domNode, disposable: markdownPart }),
 						markdownPart.codeblocksPartId,
 						markdown,
-						templateData.value
+						templateData.value,
+						markdownPart.onDidChangeDiff
 					);
 				}
 			} else if (!this.shouldPinPart(markdown, context.element) && !isBlankMarkdown && !hasPendingEditCodeblock) {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
index 376d670c21d..f183207775d 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
@@ -271,6 +271,18 @@ export class ChatListWidget extends Disposable {
 		this._lastItemIdContextKey = ChatContextKeys.lastItemId.bindTo(this.contextKeyService);
 		this._container = container;
 
+		// Toggle link-style for inline reference widgets based on configuration (single listener for all widgets)
+		const updateInlineReferencesStyle = () => {
+			const style = this.configurationService.getValue<string>(ChatConfiguration.InlineReferencesStyle);
+			this._container.classList.toggle('chat-inline-references-link-style', style === 'link');
+		};
+		updateInlineReferencesStyle();
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.InlineReferencesStyle)) {
+				updateInlineReferencesStyle();
+			}
+		}));
+
 		const scopedInstantiationService = this._register(this.instantiationService.createChild(
 			new ServiceCollection([IContextKeyService, this.contextKeyService])
 		));
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatQuestionCarouselAutoReply.ts b/src/vs/workbench/contrib/chat/browser/widget/chatQuestionCarouselAutoReply.ts
deleted file mode 100644
index 04c0619459c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/widget/chatQuestionCarouselAutoReply.ts
+++ /dev/null
@@ -1,454 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import Severity from '../../../../../base/common/severity.js';
-import { hasKey } from '../../../../../base/common/types.js';
-import { localize } from '../../../../../nls.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
-import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
-import { IChatQuestion, IChatQuestionAnswerValue, IChatQuestionCarousel, IChatSingleSelectAnswer } from '../../common/chatService/chatService.js';
-import { ChatConfiguration } from '../../common/constants.js';
-import { ChatMessageRole, getTextResponseFromStream, ILanguageModelsService } from '../../common/languageModels.js';
-import { Event } from '../../../../../base/common/event.js';
-
-const enum AutoReplyStorageKeys {
-	AutoReplyOptIn = 'chat.autoReply.optIn'
-}
-
-/**
- * Encapsulates the logic for automatically replying to question carousels,
- * including opt-in state management, LLM-based answer resolution, fallback
- * answer generation, and answer parsing/merging.
- */
-export class ChatQuestionCarouselAutoReply extends Disposable {
-
-	constructor(
-		@IConfigurationService private readonly configService: IConfigurationService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@ILogService private readonly logService: ILogService,
-		@IStorageService private readonly storageService: IStorageService,
-		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
-	) {
-		super();
-
-		// Clear out warning accepted state if the setting is disabled
-		this._register(Event.runAndSubscribe(this.configService.onDidChangeConfiguration, e => {
-			if (!e || e.affectsConfiguration(ChatConfiguration.AutoReply)) {
-				if (this.configService.getValue(ChatConfiguration.AutoReply) !== true) {
-					this.storageService.remove(AutoReplyStorageKeys.AutoReplyOptIn, StorageScope.APPLICATION);
-				}
-			}
-		}));
-	}
-
-	async shouldAutoReply(): Promise<boolean> {
-		if (!this.configService.getValue<boolean>(ChatConfiguration.AutoReply)) {
-			return false;
-		}
-		return this.checkOptIn();
-	}
-
-	async autoReply(
-		carousel: IChatQuestionCarousel,
-		submit: (answers: Map<string, IChatQuestionAnswerValue> | undefined) => Promise<void>,
-		modelName: string | undefined,
-		requestMessageText: string | undefined,
-		token: CancellationToken,
-	): Promise<void> {
-		if (token.isCancellationRequested || carousel.isUsed || carousel.questions.length === 0) {
-			return;
-		}
-
-		const fallbackAnswers = this.buildFallbackCarouselAnswers(carousel, requestMessageText);
-		let resolvedAnswers = fallbackAnswers;
-
-		const modelId = await this.getModelId(modelName);
-		if (modelId && !token.isCancellationRequested) {
-			try {
-				const parsedAnswers = await this.requestAnswers(modelId, carousel, requestMessageText, token);
-				if (parsedAnswers.size > 0) {
-					resolvedAnswers = this.mergeAnswers(carousel, parsedAnswers, fallbackAnswers);
-				}
-			} catch (err) {
-				this.logService.debug('#ChatQuestionCarousel: Failed to resolve auto reply', toErrorMessage(err));
-			}
-		}
-
-		if (token.isCancellationRequested || carousel.isUsed) {
-			return;
-		}
-
-		await submit(resolvedAnswers);
-	}
-
-	// #region Opt-in
-
-	private async checkOptIn(): Promise<boolean> {
-		const optedIn = this.storageService.getBoolean(AutoReplyStorageKeys.AutoReplyOptIn, StorageScope.APPLICATION, false);
-		if (optedIn) {
-			return true;
-		}
-
-		const promptResult = await this.dialogService.prompt({
-			type: Severity.Warning,
-			message: localize('chat.autoReply.enable.title', 'Enable chat auto reply?'),
-			buttons: [
-				{
-					label: localize('chat.autoReply.enable', 'Enable'),
-					run: () => true
-				},
-				{
-					label: localize('chat.autoReply.disable', 'Disable'),
-					run: () => false
-				},
-			],
-			custom: {
-				icon: Codicon.warning,
-				disableCloseAction: true,
-				markdownDetails: [{
-					markdown: new MarkdownString(localize('chat.autoReply.enable.details', 'Chat auto reply answers question carousels using the current model and may make unintended choices. Review your settings and outputs carefully.')),
-				}],
-			}
-		});
-
-		if (promptResult.result !== true) {
-			await this.configService.updateValue(ChatConfiguration.AutoReply, false);
-			return false;
-		}
-
-		this.storageService.store(AutoReplyStorageKeys.AutoReplyOptIn, true, StorageScope.APPLICATION, StorageTarget.USER);
-		return true;
-	}
-
-	// #endregion
-
-	// #region LLM interaction
-
-	private async getModelId(modelName: string | undefined): Promise<string | undefined> {
-		if (!modelName) {
-			return undefined;
-		}
-
-		let models = await this.languageModelsService.selectLanguageModels({ id: modelName });
-		if (models.length > 0) {
-			return models[0];
-		}
-
-		if (modelName.startsWith('copilot/')) {
-			models = await this.languageModelsService.selectLanguageModels({ vendor: 'copilot', family: modelName.replace(/^copilot\//, '') });
-			return models[0];
-		}
-
-		return undefined;
-	}
-
-	private buildPrompt(carousel: IChatQuestionCarousel, requestMessageText: string | undefined, strict: boolean): string {
-		const questions = carousel.questions.map(question => ({
-			id: question.id,
-			type: question.type,
-			title: question.title,
-			message: typeof question.message === 'string' ? question.message : question.message?.value,
-			options: question.options?.map(option => ({ id: option.id, label: option.label })) ?? [],
-			allowFreeformInput: question.allowFreeformInput ?? false,
-		}));
-
-		const contextLines: string[] = [];
-		if (requestMessageText) {
-			contextLines.push(`Original user request: ${JSON.stringify(requestMessageText)}`);
-		}
-
-		return [
-			'Choose default answers for the following questions.',
-			'Return a JSON object keyed by question id.',
-			'For text questions, the value should be a string.',
-			'For singleSelect questions, the value should be { "selectedId": string } or { "freeform": string }.',
-			'For multiSelect questions, the value should be { "selectedIds": string[] } and may include { "freeform": string }.',
-			'If a question allows freeform input and has no options, return a freeform answer based on the user request when possible.',
-			'Use option ids from the provided options.',
-			...contextLines,
-			'Questions:',
-			JSON.stringify(questions),
-			strict ? 'Return ONLY valid JSON. Do not include markdown or explanations.' : undefined,
-		].filter(Boolean).join('\n');
-	}
-
-	private async requestAnswers(
-		modelId: string,
-		carousel: IChatQuestionCarousel,
-		requestMessageText: string | undefined,
-		token: CancellationToken,
-	): Promise<Map<string, IChatQuestionAnswerValue>> {
-		const prompt = this.buildPrompt(carousel, requestMessageText, false);
-		const response = await this.languageModelsService.sendChatRequest(
-			modelId,
-			undefined,
-			[{ role: ChatMessageRole.User, content: [{ type: 'text', value: prompt }] }],
-			{},
-			token,
-		);
-		const responseText = await getTextResponseFromStream(response);
-		const parsedAnswers = this.parseAnswers(responseText, carousel);
-		if (parsedAnswers.size > 0 || token.isCancellationRequested) {
-			return parsedAnswers;
-		}
-
-		const retryPrompt = this.buildPrompt(carousel, requestMessageText, true);
-		const retryResponse = await this.languageModelsService.sendChatRequest(
-			modelId,
-			undefined,
-			[{ role: ChatMessageRole.User, content: [{ type: 'text', value: retryPrompt }] }],
-			{},
-			token,
-		);
-		const retryText = await getTextResponseFromStream(retryResponse);
-		return this.parseAnswers(retryText, carousel);
-	}
-
-	// #endregion
-
-	// #region Answer parsing and resolution
-
-	private parseAnswers(responseText: string, carousel: IChatQuestionCarousel): Map<string, IChatQuestionAnswerValue> {
-		const parsed = this.tryParseJsonObject(responseText);
-		if (!parsed) {
-			return new Map();
-		}
-
-		const answers = new Map<string, IChatQuestionAnswerValue>();
-		for (const question of carousel.questions) {
-			const rawAnswer = parsed[question.id];
-			const resolved = this.resolveAnswerFromRaw(question, rawAnswer);
-			if (resolved !== undefined) {
-				answers.set(question.id, resolved);
-			}
-		}
-		return answers;
-	}
-
-	private mergeAnswers(
-		carousel: IChatQuestionCarousel,
-		resolvedAnswers: Map<string, IChatQuestionAnswerValue>,
-		fallbackAnswers: Map<string, IChatQuestionAnswerValue>,
-	): Map<string, IChatQuestionAnswerValue> {
-		const merged = new Map<string, IChatQuestionAnswerValue>();
-		for (const question of carousel.questions) {
-			const fallback = fallbackAnswers.get(question.id);
-			if (this.hasDefaultValue(question) && fallback !== undefined) {
-				merged.set(question.id, fallback);
-				continue;
-			}
-			if (resolvedAnswers.has(question.id)) {
-				merged.set(question.id, resolvedAnswers.get(question.id)!);
-				continue;
-			}
-			if (fallback !== undefined) {
-				merged.set(question.id, fallback);
-			}
-		}
-		return merged;
-	}
-
-	private hasDefaultValue(question: IChatQuestion): boolean {
-		switch (question.type) {
-			case 'text':
-				return question.defaultValue !== undefined;
-			case 'singleSelect':
-				return typeof question.defaultValue === 'string';
-			case 'multiSelect':
-				return Array.isArray(question.defaultValue)
-					? question.defaultValue.length > 0
-					: typeof question.defaultValue === 'string';
-		}
-	}
-
-	private resolveAnswerFromRaw(question: IChatQuestion, raw: unknown): IChatQuestionAnswerValue | undefined {
-		switch (question.type) {
-			case 'text': {
-				if (typeof raw === 'string') {
-					const value = raw.trim();
-					return value.length > 0 ? value : undefined;
-				}
-				if (raw && typeof raw === 'object' && hasKey(raw, { value: true }) && typeof (raw as { value: unknown }).value === 'string') {
-					const value = (raw as { value: string }).value.trim();
-					return value.length > 0 ? value : undefined;
-				}
-				return undefined;
-			}
-			case 'singleSelect': {
-				let selectedInput: string | undefined;
-				let freeformInput: string | undefined;
-				if (typeof raw === 'string') {
-					selectedInput = raw;
-				} else if (raw && typeof raw === 'object') {
-					if (hasKey(raw, { selectedId: true }) && typeof (raw as { selectedId: unknown }).selectedId === 'string') {
-						selectedInput = (raw as { selectedId: string }).selectedId;
-					} else if (hasKey(raw, { selectedLabel: true }) && typeof (raw as { selectedLabel: unknown }).selectedLabel === 'string') {
-						selectedInput = (raw as { selectedLabel: string }).selectedLabel;
-					}
-					if (hasKey(raw, { freeform: true }) && typeof (raw as { freeform: unknown }).freeform === 'string') {
-						freeformInput = (raw as { freeform: string }).freeform;
-					}
-				}
-
-				if (freeformInput && freeformInput.trim().length > 0) {
-					return { selectedValue: undefined, freeformValue: freeformInput.trim() };
-				}
-
-				const match = selectedInput ? this.matchQuestionOption(question, selectedInput) : undefined;
-				if (match) {
-					return { selectedValue: match.value, freeformValue: undefined } satisfies IChatSingleSelectAnswer;
-				}
-				return undefined;
-			}
-			case 'multiSelect': {
-				let selectedInputs: string[] = [];
-				let freeformInput: string | undefined;
-				if (Array.isArray(raw)) {
-					selectedInputs = raw.filter(item => typeof item === 'string') as string[];
-				} else if (typeof raw === 'string') {
-					selectedInputs = raw.split(',').map(item => item.trim()).filter(item => item.length > 0);
-				} else if (raw && typeof raw === 'object') {
-					if (hasKey(raw, { selectedIds: true })) {
-						const selectedIdsValue = (raw as { selectedIds?: unknown }).selectedIds;
-						if (Array.isArray(selectedIdsValue)) {
-							selectedInputs = selectedIdsValue.filter((item: unknown): item is string => typeof item === 'string');
-						}
-					}
-					if (hasKey(raw, { freeform: true }) && typeof (raw as { freeform?: unknown }).freeform === 'string') {
-						freeformInput = (raw as { freeform: string }).freeform;
-					}
-				}
-
-				const selectedValues = selectedInputs
-					.map(input => this.matchQuestionOption(question, input)?.value)
-					.filter(value => value !== undefined);
-				const freeformValue = freeformInput?.trim();
-
-				if (selectedValues.length > 0 || (freeformValue && freeformValue.length > 0)) {
-					return { selectedValues, freeformValue };
-				}
-				return undefined;
-			}
-		}
-	}
-
-	private matchQuestionOption(question: IChatQuestion, rawInput: string): { id: string; value: string } | undefined {
-		const options = question.options ?? [];
-		if (!options.length) {
-			return undefined;
-		}
-
-		const normalized = rawInput.trim().toLowerCase();
-		const numeric = Number.parseInt(normalized, 10);
-		if (!Number.isNaN(numeric) && numeric > 0 && numeric <= options.length) {
-			const option = options[numeric - 1];
-			return { id: option.id, value: option.value };
-		}
-
-		const exactId = options.find(option => option.id.toLowerCase() === normalized);
-		if (exactId) {
-			return { id: exactId.id, value: exactId.value };
-		}
-		const exactLabel = options.find(option => option.label.toLowerCase() === normalized);
-		if (exactLabel) {
-			return { id: exactLabel.id, value: exactLabel.value };
-		}
-		const partialLabel = options.find(option => option.label.toLowerCase().includes(normalized));
-		if (partialLabel) {
-			return { id: partialLabel.id, value: partialLabel.value };
-		}
-
-		return undefined;
-	}
-
-	// #endregion
-
-	// #region Fallback answers
-
-	buildFallbackCarouselAnswers(carousel: IChatQuestionCarousel, requestMessageText: string | undefined): Map<string, IChatQuestionAnswerValue> {
-		const answers = new Map<string, IChatQuestionAnswerValue>();
-		for (const question of carousel.questions) {
-			const answer = this.getFallbackAnswerForQuestion(question, requestMessageText);
-			if (answer !== undefined) {
-				answers.set(question.id, answer);
-			}
-		}
-		return answers;
-	}
-
-	private getFallbackAnswerForQuestion(question: IChatQuestion, requestMessageText: string | undefined): IChatQuestionAnswerValue | undefined {
-		const fallbackFreeform = requestMessageText?.trim() || localize('chat.questionCarousel.autoReplyFallback', 'OK');
-
-		switch (question.type) {
-			case 'text':
-				return typeof question.defaultValue === 'string' ? question.defaultValue : Array.isArray(question.defaultValue) ? { selectedValues: question.defaultValue } : fallbackFreeform;
-			case 'singleSelect': {
-				const defaultOptionId = typeof question.defaultValue === 'string' ? question.defaultValue : undefined;
-				const defaultOption = defaultOptionId ? question.options?.find(opt => opt.id === defaultOptionId) : undefined;
-				if (defaultOption) {
-					return { selectedValue: defaultOption.value, freeformValue: undefined };
-				}
-				if (question.options && question.options.length > 0) {
-					return { selectedValue: question.options[0].value, freeformValue: undefined };
-				}
-				if (question.allowFreeformInput) {
-					return { selectedValue: undefined, freeformValue: fallbackFreeform };
-				}
-				return undefined;
-			}
-			case 'multiSelect': {
-				const defaultIds = Array.isArray(question.defaultValue)
-					? question.defaultValue
-					: (typeof question.defaultValue === 'string' ? [question.defaultValue] : []);
-				const selectedValues = question.options
-					?.filter(opt => defaultIds.includes(opt.id))
-					.map(opt => opt.value)
-					.filter(value => value !== undefined) ?? [];
-				if (selectedValues.length > 0) {
-					return { selectedValues, freeformValue: undefined };
-				}
-				if (question.options && question.options.length > 0) {
-					return { selectedValues: [question.options[0].value], freeformValue: undefined };
-				}
-				if (question.allowFreeformInput) {
-					return { selectedValues: [], freeformValue: fallbackFreeform };
-				}
-				return undefined;
-			}
-		}
-	}
-
-	// #endregion
-
-	// #region Utilities
-
-	private tryParseJsonObject(text: string): Record<string, unknown> | undefined {
-		const trimmed = text.trim();
-		if (!trimmed) {
-			return undefined;
-		}
-		const start = trimmed.indexOf('{');
-		const end = trimmed.lastIndexOf('}');
-		const candidate = start >= 0 && end > start ? trimmed.slice(start, end + 1) : trimmed;
-		try {
-			const parsed = JSON.parse(candidate) as unknown;
-			if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-				return parsed as Record<string, unknown>;
-			}
-		} catch {
-			return undefined;
-		}
-		return undefined;
-	}
-
-	// #endregion
-}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
index 056229ddb23..404683efb10 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
@@ -64,7 +64,7 @@ import { IChatTodoListService } from '../../common/tools/chatTodoListService.js'
 import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isWorkspaceVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../../common/attachments/chatVariableEntries.js';
 import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
 import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatPermissionLevel } from '../../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatPermissionLevel, ThinkingDisplayMode } from '../../common/constants.js';
 import { ILanguageModelToolsService, isToolSet } from '../../common/tools/languageModelToolsService.js';
 import { ComputeAutomaticInstructions } from '../../common/promptSyntax/computeAutomaticInstructions.js';
 import { IHandOff, PromptHeader } from '../../common/promptSyntax/promptFileParser.js';
@@ -172,6 +172,20 @@ type ChatPromptRunClassification = {
 	promptNameHash?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Hashed name of local or user prompt for privacy.' };
 };
 
+type ChatThinkingStyleUsageEvent = {
+	thinkingStyle: ThinkingDisplayMode;
+	location: ChatAgentLocation;
+	requestKind: 'submit' | 'rerun';
+};
+
+type ChatThinkingStyleUsageClassification = {
+	owner: 'justschen';
+	comment: 'Event fired when a chat request uses the configured thinking style rendering mode.';
+	thinkingStyle: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The configured rendering mode for thinking content.' };
+	location: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The location where the request was made.' };
+	requestKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the request was a new submit or a rerun.' };
+};
+
 const supportsAllAttachments: Required<IChatAgentAttachmentCapabilities> = {
 	supportsFileAttachments: true,
 	supportsToolAttachments: true,
@@ -245,6 +259,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	private listWidget!: ChatListWidget;
 	private readonly _codeBlockModelCollection: CodeBlockModelCollection;
+	private inputPartMaxHeightOverride: number | undefined;
 
 	private readonly visibilityTimeoutDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
 	private readonly visibilityAnimationFrameDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
@@ -287,6 +302,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	};
 	private readonly _lockedToCodingAgentContextKey: IContextKey<boolean>;
 	private readonly _lockedCodingAgentIdContextKey: IContextKey<string>;
+	private readonly _chatSessionSupportsForkContextKey: IContextKey<boolean>;
 	private readonly _agentSupportsAttachmentsContextKey: IContextKey<boolean>;
 	private readonly _sessionIsEmptyContextKey: IContextKey<boolean>;
 	private readonly _hasPendingRequestsContextKey: IContextKey<boolean>;
@@ -402,6 +418,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		this._lockedToCodingAgentContextKey = ChatContextKeys.lockedToCodingAgent.bindTo(this.contextKeyService);
 		this._lockedCodingAgentIdContextKey = ChatContextKeys.lockedCodingAgentId.bindTo(this.contextKeyService);
+		this._chatSessionSupportsForkContextKey = ChatContextKeys.chatSessionSupportsFork.bindTo(this.contextKeyService);
 		this._agentSupportsAttachmentsContextKey = ChatContextKeys.agentSupportsAttachments.bindTo(this.contextKeyService);
 		this._sessionIsEmptyContextKey = ChatContextKeys.chatSessionIsEmpty.bindTo(this.contextKeyService);
 		this._hasPendingRequestsContextKey = ChatContextKeys.hasPendingRequests.bindTo(this.contextKeyService);
@@ -589,6 +606,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				this.inputPart.renderChatTodoListWidget(sessionResource);
 			}
 		}));
+
 	}
 
 	private _lastSelectedAgent: IChatAgentData | undefined;
@@ -903,6 +921,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		}
 
 		this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
+		this.inputPart.clearArtifactsWidget();
 		this.chatSuggestNextWidget.hide();
 		await this.viewOptions.clear?.();
 	}
@@ -1047,7 +1066,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			tip,
 			renderer,
 		));
-		tipContainer.appendChild(tipPart.domNode);
 		this._gettingStartedTipPartRef = tipPart;
 
 		store.add(tipPart.onDidHide(() => {
@@ -1058,7 +1076,14 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.focusInput();
 		}));
 
+		// Set the guard before appending to DOM so that any re-entrant calls
+		// triggered by context-key changes during construction see the guard
+		// and return early without adding a duplicate tip node.
 		this._gettingStartedTipPart.value = store;
+		// Clear any stale nodes left from a previous tip that was not properly
+		// removed (e.g. if re-entrancy bypassed the guard above).
+		dom.clearNode(tipContainer);
+		tipContainer.appendChild(tipPart.domNode);
 		dom.setVisibility(true, tipContainer);
 	}
 
@@ -1258,6 +1283,17 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			autoSend: Boolean(handoff.send)
 		});
 
+		this.executeHandoff(handoff, agentId).catch(e => {
+			const target = agentId ?? handoff.agent ?? 'unknown';
+			this.logService.error(`[Handoff] Failed to execute handoff '${handoff.label}' to '${target}'`, e);
+		});
+	}
+
+	async executeHandoff(handoff: IHandOff, agentId?: string): Promise<void> {
+		this.chatSuggestNextWidget.hide();
+
+		const promptToUse = handoff.prompt;
+
 		// If agentId is provided (from chevron dropdown), delegate to that chat session
 		// Otherwise, switch to the handoff agent
 		if (agentId) {
@@ -1265,7 +1301,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.input.setValue(`@${agentId} ${promptToUse}`, false);
 			this.input.focus();
 			// Auto-submit for delegated chat sessions
-			this.acceptInput().catch(e => this.logService.error('Failed to handle handoff continueOn', e));
+			this.acceptInput().catch(e => this.logService.error(`[Handoff] Failed to submit delegated handoff to '@${agentId}'`, e));
 		} else if (handoff.agent) {
 			// Regular handoff to specified agent
 			this._switchToAgentByName(handoff.agent);
@@ -1794,7 +1830,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				}
 
 				if (this.bodyDimension) {
-					this.layout(this.bodyDimension.height, this.bodyDimension.width);
+					// Only re-layout the list/containers to match the new input
+					// height. Do NOT re-call this.layout() here: the input part
+					// has already laid itself out and re-entering inputPart.layout
+					// creates a layout loop when the viewPane also reacts.
+					this._layoutListForInputHeight();
 				}
 
 				this._onDidChangeContentHeight.fire();
@@ -1944,6 +1984,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.finishedEditing();
 		}
 		this.inputPart.clearTodoListWidget(model.sessionResource, false);
+		this.inputPart.clearArtifactsWidget();
 		this.chatSuggestNextWidget.hide();
 		this.chatTipService.resetSession();
 
@@ -1969,7 +2010,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		if (this._lockedAgent) {
 			let placeholder = this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id)?.inputPlaceholder;
 			if (!placeholder) {
-				placeholder = localize('chat.input.placeholder.lockedToAgent', "Chat with {0}", this._lockedAgent.id);
+				placeholder = localize('chat.input.placeholder.lockedToAgent', "Chat with {0}", this._lockedAgent.displayName || this._lockedAgent.name);
 			}
 			this.viewModel.setInputPlaceholder(placeholder);
 			this.inputEditor.updateOptions({ placeholder });
@@ -2007,6 +2048,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.onDidChangeItems();
 		}));
 		this._sessionIsEmptyContextKey.set(model.getRequests().length === 0);
+		const supportsFork = this.chatSessionsService.sessionSupportsFork(model.sessionResource);
+		this._chatSessionSupportsForkContextKey.set(supportsFork);
+		this.listWidget?.updateRendererOptions({ supportsFork });
 		this._sessionHasDebugDataContextKey.set(this.chatDebugService.getEvents(model.sessionResource).length > 0);
 		let lastSteeringCount = 0;
 		const updatePendingRequestKeys = (announceSteering: boolean) => {
@@ -2066,6 +2110,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.renderChatSuggestNextWidget();
 		this.updateChatInputContext();
 		this.input.renderChatTodoListWidget(this.viewModel.sessionResource);
+		this.input.renderArtifactsWidget(this.viewModel.sessionResource);
 	}
 
 	getFocus(): ChatTreeItem | undefined {
@@ -2130,6 +2175,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._lockedAgent = undefined;
 		this._lockedToCodingAgentContextKey.set(false);
 		this._lockedCodingAgentIdContextKey.set('');
+		this._chatSessionSupportsForkContextKey.set(false);
 		this._updateAgentCapabilitiesContextKeys(undefined);
 
 		// Explicitly update the DOM to reflect unlocked state
@@ -2179,7 +2225,29 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			userSelectedModelId: this.input.currentLanguageModel,
 			modeInfo: this.input.currentModeInfo,
 		};
-		return await this.chatService.resendRequest(lastRequest, options);
+		const result = await this.chatService.resendRequest(lastRequest, options);
+		this.logThinkingStyleUsage('rerun');
+		return result;
+	}
+
+	private getConfiguredThinkingStyle(): ThinkingDisplayMode {
+		const thinkingStyle = this.configurationService.getValue<ThinkingDisplayMode>(ChatConfiguration.ThinkingStyle);
+		switch (thinkingStyle) {
+			case ThinkingDisplayMode.Collapsed:
+			case ThinkingDisplayMode.CollapsedPreview:
+			case ThinkingDisplayMode.FixedScrolling:
+				return thinkingStyle;
+			default:
+				return ThinkingDisplayMode.FixedScrolling;
+		}
+	}
+
+	private logThinkingStyleUsage(requestKind: ChatThinkingStyleUsageEvent['requestKind']): void {
+		this.telemetryService.publicLog2<ChatThinkingStyleUsageEvent, ChatThinkingStyleUsageClassification>('chat.thinkingStyleUsage', {
+			thinkingStyle: this.getConfiguredThinkingStyle(),
+			location: this.location,
+			requestKind,
+		});
 	}
 
 	private async _applyPromptFileIfSet(requestInput: IChatRequestInputOptions): Promise<void> {
@@ -2283,9 +2351,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		// discard them or need a prompt (as in `confirmPendingRequestsBeforeSend`)
 		// which could be a surprising behavior if the user finishes typing a steering
 		// request just as confirmation is triggered.
-		if (options.alwaysQueue) {
-			options.queue ??= ChatRequestQueueKind.Queued;
-		}
 		if (model.requestNeedsInput.get() && !model.getPendingRequests().length) {
 			await this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource, 'acceptInput-needsInput');
 			options.queue ??= ChatRequestQueueKind.Queued;
@@ -2293,7 +2358,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		if (requestInProgress) {
 			options.queue ??= ChatRequestQueueKind.Queued;
 		}
-		if (!options.alwaysQueue && !requestInProgress && !isEditing && !(await this.confirmPendingRequestsBeforeSend(model, options))) {
+		if (!requestInProgress && !isEditing && !(await this.confirmPendingRequestsBeforeSend(model, options))) {
 			return;
 		}
 
@@ -2360,13 +2425,15 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			modeInfo: this.input.currentModeInfo,
 			agentIdSilent: this._lockedAgent?.id,
 			queue: options?.queue,
-			pauseQueue: options?.alwaysQueue,
+
 		});
 
 		if (ChatSendResult.isRejected(result)) {
 			return;
 		}
 
+		this.logThinkingStyleUsage('submit');
+
 		// visibility sync before firing events to hide the welcome view
 		this.updateChatViewVisibility();
 		this.input.acceptInput(options?.storeToHistory ?? isUserQuery);
@@ -2378,6 +2445,15 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		this._onDidSubmitAgent.fire({ agent: sent.data.agent, slashCommand: sent.data.slashCommand });
 		this.handleDelegationExitIfNeeded(this._lockedAgent, sent.data.agent);
+
+		// If the session was replaced (untitled -> real contributed session), swap the widget's model
+		if (sent.newSessionResource) {
+			const newModel = this.chatService.getSession(sent.newSessionResource);
+			if (newModel) {
+				this.setModel(newModel);
+			}
+		}
+
 		sent.data.responseCreatedPromise.then(() => {
 			// Only start accessibility progress once a real request/response model exists.
 			this.chatAccessibilityService.acceptRequest(submittedSessionResource);
@@ -2460,15 +2536,17 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	getModeRequestOptions(): Partial<IChatSendRequestOptions> {
 		const sessionResource = this.viewModel?.sessionResource;
+		const capturedModeId = this.input.currentModeObs.get().id;
 		const userSelectedTools = this.input.selectedToolsModel.userSelectedTools;
 
 		let lastToolsSnapshot = userSelectedTools.get();
 
 		// When the widget has loaded a new session, return a snapshot of the tools for this session.
-		// Only sync with the tools model when this session is shown.
+		// Only sync with the tools model when this session is shown with the same mode.
 		const scopedTools = derived(reader => {
 			const activeSession = this._viewModelObs.read(reader)?.sessionResource;
-			if (isEqual(activeSession, sessionResource)) {
+			const currentModeId = this.input.currentModeObs.read(reader).id;
+			if (isEqual(activeSession, sessionResource) && currentModeId === capturedModeId) {
 				const tools = userSelectedTools.read(reader);
 				lastToolsSnapshot = tools;
 				return tools;
@@ -2502,6 +2580,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.listWidget.focusLastItem(lastFocused);
 	}
 
+	setInputPartMaxHeightOverride(maxHeight: number | undefined): void {
+		this.inputPartMaxHeightOverride = maxHeight;
+	}
+
 	layout(height: number, width: number): void {
 		width = Math.min(width, this.viewOptions.renderStyle === 'minimal' ? width : 950); // no min width of inline chat
 
@@ -2511,10 +2593,33 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.inlineInputPart?.layout(width);
 		}
 
+		const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
+		const inputMaxHeight = this._dynamicMessageLayoutData || this.location !== ChatAgentLocation.Chat
+			? undefined
+			: this.inputPartMaxHeightOverride !== undefined
+				? Math.max(0, this.inputPartMaxHeightOverride - chatSuggestNextWidgetHeight - MIN_LIST_HEIGHT)
+				: Math.max(0, height - chatSuggestNextWidgetHeight - MIN_LIST_HEIGHT);
+		this.inputPart.setMaxHeight(inputMaxHeight);
 		this.inputPart.layout(width);
 
-		const inputHeight = this.inputPart.height.get();
+		this._layoutListForInputHeight();
+	}
+
+	/**
+	 * Re-layout just the list, welcome container, and list container to match
+	 * the current input-part height. Called both from {@link layout} and from
+	 * the inputPart.height autorun so we never re-enter inputPart.layout when
+	 * only the input height changed.
+	 */
+	private _layoutListForInputHeight(): void {
+		if (!this.bodyDimension) {
+			return;
+		}
+
+		const { height, width } = this.bodyDimension;
 		const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
+
+		const inputHeight = this.inputPart.height.get();
 		const lastElementVisible = this.listWidget.isScrolledToBottom;
 		const lastItem = this.listWidget.lastItem;
 
@@ -2697,7 +2802,19 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	 * - instructions referenced in an already included instruction file
 	 */
 	private async _autoAttachInstructions({ attachedContext }: IChatRequestInputOptions): Promise<void> {
-		this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are always enabled`);
+		const contribution = this._lockedAgent ? this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id) : undefined;
+
+		// For contributed session types, default to false for autoAttachReferences.
+		const isContributedSession = !!contribution;
+		const autoAttachEnabled = isContributedSession ?
+			contribution.autoAttachReferences === true : true;
+
+		if (!autoAttachEnabled) {
+			this.logService.debug(`ChatWidget#_autoAttachInstructions: skipped, autoAttachReferences is disabled`);
+			return;
+		}
+
+		this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are enabled`);
 		const enabledTools = this.input.currentModeKind === ChatModeKind.Agent ? this.input.selectedToolsModel.userSelectedTools.get() : undefined;
 		const enabledSubAgents = this.input.currentModeKind === ChatModeKind.Agent ? this.input.currentModeObs.get().agents?.get() : undefined;
 		const sessionResource = this._viewModel?.model.sessionResource;
@@ -2709,3 +2826,5 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.listWidget.delegateScrollFromMouseWheelEvent(browserEvent);
 	}
 }
+
+const MIN_LIST_HEIGHT = 50;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
index 86ba0bd181c..7523b23ee6e 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
@@ -85,7 +85,7 @@ import { ChatRequestVariableSet, IChatRequestVariableEntry, isElementVariableEnt
 import { ChatMode, getModeNameForTelemetry, IChatMode, IChatModeService } from '../../../common/chatModes.js';
 import { IChatFollowup, IChatQuestionCarousel, IChatService, IChatSessionContext } from '../../../common/chatService/chatService.js';
 import { agentOptionId, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsService, isIChatSessionFileChange2, localChatSessionType } from '../../../common/chatSessionsService.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatPermissionLevel, isAutoApproveLevel, validateChatMode } from '../../../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatPermissionLevel, validateChatMode } from '../../../common/constants.js';
 import { IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
 import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../../common/languageModels.js';
 import { IChatModelInputState, IChatRequestModeInfo, IInputModel } from '../../../common/model/chatModel.js';
@@ -114,6 +114,7 @@ import { ChatQuestionCarouselPart, IChatQuestionCarouselOptions } from '../chatC
 import { IChatContentPartRenderContext } from '../chatContentParts/chatContentParts.js';
 import { CollapsibleListPool, IChatCollapsibleListItem } from '../chatContentParts/chatReferencesContentPart.js';
 import { ChatTodoListWidget } from '../chatContentParts/chatTodoListWidget.js';
+import { ChatArtifactsWidget } from '../chatArtifactsWidget.js';
 import { ChatDragAndDrop } from '../chatDragAndDrop.js';
 import { ChatFollowups } from './chatFollowups.js';
 import { ChatInputPartWidgetController } from './chatInputPartWidgets.js';
@@ -128,6 +129,8 @@ import { WorkspacePickerActionItem } from './workspacePickerActionItem.js';
 import { ChatContextUsageWidget } from '../../widgetHosts/viewPane/chatContextUsageWidget.js';
 import { Target } from '../../../common/promptSyntax/promptTypes.js';
 import { EnhancedModelPickerActionItem } from './modelPickerActionItem2.js';
+import { findLast } from '../../../../../../base/common/arraysFind.js';
+import { ConfigureToolsAction } from '../../actions/chatToolActions.js';
 
 const $ = dom.$;
 
@@ -218,6 +221,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private _workingSetCollapsed = observableValue('chatInputPart.workingSetCollapsed', true);
 	private _stableInputPartWidth = observableValue('chatInputPart.stableInputPartWidth', 0);
 	private readonly _chatInputTodoListWidget = this._register(new MutableDisposable<ChatTodoListWidget>());
+	private readonly _chatArtifactsWidget = this._register(new MutableDisposable<ChatArtifactsWidget>());
 	private readonly _chatQuestionCarouselWidgets = this._register(new DisposableMap<string, ChatQuestionCarouselPart>());
 	private readonly _questionCarouselResponseIds = new Map<string, string>();
 	private readonly _questionCarouselSessionResources = new Map<string, URI>();
@@ -289,6 +293,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private readonly inputEditorMaxHeight: number;
 	private readonly inputEditorMinHeight: number | undefined;
 	private inputEditorHeight: number = 0;
+	private _maxHeight: number | undefined;
 	private container!: HTMLElement;
 
 	private inputSideToolbarContainer?: HTMLElement;
@@ -308,6 +313,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	private chatEditingSessionWidgetContainer!: HTMLElement;
 	private chatInputTodoListWidgetContainer!: HTMLElement;
+	private chatArtifactsWidgetContainer!: HTMLElement;
 	private chatGettingStartedTipContainer!: HTMLElement;
 	private chatQuestionCarouselContainer!: HTMLElement;
 	private chatInputWidgetsContainer!: HTMLElement;
@@ -372,6 +378,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private chatSessionHasOptions: IContextKey<boolean>;
 	private chatSessionOptionsValid: IContextKey<boolean>;
 	private agentSessionTypeKey: IContextKey<string>;
+	private chatSessionSupportsDelegationKey: IContextKey<boolean>;
 	private chatSessionHasCustomAgentTarget: IContextKey<boolean>;
 	private chatSessionHasTargetedModels: IContextKey<boolean>;
 	private modelWidget: EnhancedModelPickerActionItem | undefined;
@@ -559,7 +566,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		// React to chat session option changes for the active session
 		this._register(this.chatSessionsService.onDidChangeSessionOptions(e => {
 			const sessionResource = this._widget?.viewModel?.model.sessionResource;
-			if (sessionResource && isEqual(sessionResource, e)) {
+			if (sessionResource && isEqual(sessionResource, e.sessionResource)) {
 				// Options changed for our current session - refresh pickers
 				this.refreshChatSessionPickers();
 			}
@@ -581,6 +588,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this._register(this.options.sessionTypePickerDelegate.onDidChangeActiveSessionProvider(async (newSessionType) => {
 				this.computeVisibleOptionGroups();
 				this.agentSessionTypeKey.set(newSessionType);
+				this.chatSessionSupportsDelegationKey.set(this.chatSessionsService.supportsDelegationForSessionType(newSessionType));
 				this.updateWidgetLockStateFromSessionType(newSessionType);
 				this.refreshChatSessionPickers();
 			}));
@@ -608,12 +616,14 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.chatSessionHasOptions = ChatContextKeys.chatSessionHasModels.bindTo(contextKeyService);
 		this.chatSessionOptionsValid = ChatContextKeys.chatSessionOptionsValid.bindTo(contextKeyService);
 		this.agentSessionTypeKey = ChatContextKeys.agentSessionType.bindTo(contextKeyService);
+		this.chatSessionSupportsDelegationKey = ChatContextKeys.chatSessionSupportsDelegation.bindTo(contextKeyService);
 
 		// Initialize agentSessionType from delegate if available
 		if (this.options.sessionTypePickerDelegate?.getActiveSessionProvider) {
 			const initialSessionType = this.options.sessionTypePickerDelegate.getActiveSessionProvider();
 			if (initialSessionType) {
 				this.agentSessionTypeKey.set(initialSessionType);
+				this.chatSessionSupportsDelegationKey.set(this.chatSessionsService.supportsDelegationForSessionType(initialSessionType));
 			}
 		}
 		this.chatSessionHasCustomAgentTarget = ChatContextKeys.chatSessionHasCustomAgentTarget.bindTo(contextKeyService);
@@ -697,10 +707,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 							: mode.label.read(undefined) !== agentId; // Extensions use Label (name) as identifier for custom agents.
 					}
 					if (needsUpdate) {
-						this.chatSessionsService.notifySessionOptionsChange(
+						this.chatSessionsService.updateSessionOptions(
 							ctx.chatSessionResource,
-							[{ optionId: agentOptionId, value: mode.isBuiltin ? '' : modeName }]
-						).catch(err => this.logService.error('Failed to notify extension of agent change:', err));
+							new Map([[agentOptionId, mode.isBuiltin ? '' : modeName]])
+						);
 					}
 				}
 			}
@@ -821,6 +831,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this._currentPermissionLevel.set(level, undefined);
 		this.permissionLevelKey.set(level);
 		this.permissionWidget?.refresh();
+		this._syncInputStateToModel();
 	}
 
 	public openSessionTargetPicker(): void {
@@ -875,10 +886,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					const sessionResource = this._widget?.viewModel?.model.sessionResource;
 					const currentCtx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
 					if (currentCtx) {
-						this.chatSessionsService.notifySessionOptionsChange(
-							currentCtx.chatSessionResource,
-							[{ optionId: optionGroup.id, value: option }]
-						).catch(err => this.logService.error(`Failed to notify extension of ${optionGroup.id} change:`, err));
+						this.chatSessionsService.setSessionOption(currentCtx.chatSessionResource, optionGroup.id, option);
 					}
 
 					// Refresh pickers to re-evaluate visibility of other option groups
@@ -905,19 +913,17 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	 * Set the input model reference for syncing input state
 	 */
 	setInputModel(model: IInputModel, chatSessionIsEmpty: boolean): void {
+		// Flush current state to the outgoing model before switching,
+		// so it preserves the latest permission level and other picker state.
+		if (this._inputModel) {
+			this._syncInputStateToModel();
+		}
+
 		this._inputModel = model;
 		this._modelSyncDisposables.clear();
 		this.selectedToolsModel.resetSessionEnablementState();
 		this._chatSessionIsEmpty = chatSessionIsEmpty;
 
-		// Reset permission level on new sessions, unless global auto-approve is on
-		// or the current permission level is already auto-approve/autopilot
-		if (chatSessionIsEmpty && !this.configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove) && !isAutoApproveLevel(this._currentPermissionLevel.get())) {
-			this._currentPermissionLevel.set(ChatPermissionLevel.Default, undefined);
-			this.permissionLevelKey.set(ChatPermissionLevel.Default);
-			this.permissionWidget?.refresh();
-		}
-
 		// TODO@roblourens This is for an experiment which will be obsolete in a month or two and can then be removed.
 		if (chatSessionIsEmpty) {
 			this._setEmptyModelState();
@@ -1014,6 +1020,16 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				}
 			}
 
+			// Sync permission level (skip if global auto-approve is on, so the picker stays unchanged)
+			if (!this.configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove)) {
+				const targetLevel = state?.permissionLevel ?? ChatPermissionLevel.Default;
+				if (this._currentPermissionLevel.get() !== targetLevel) {
+					this._currentPermissionLevel.set(targetLevel, undefined);
+					this.permissionLevelKey.set(targetLevel);
+					this.permissionWidget?.refresh();
+				}
+			}
+
 			if (state) {
 				this._widget?.contribs.forEach(contrib => {
 					contrib.setInputState?.(state.contrib);
@@ -1040,6 +1056,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 		this._inputModel?.setState(state);
 		this._isSyncingToOrFromInputModel = false;
+
+		// Some picker label changed size; re-evaluate toolbar overflow
+		queueMicrotask(() => this.inputActionsToolbar?.relayout());
 	}
 
 	public setCurrentLanguageModel(model: ILanguageModelChatMetadataAndIdentifier) {
@@ -1167,27 +1186,18 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	 * that was last used - providing continuity.
 	 */
 	private preselectModelFromSessionHistory(): void {
-		const sessionResource = this._widget?.viewModel?.model.sessionResource;
-		const ctx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
-		const requiresCustomModels = ctx && this.chatSessionsService.requiresCustomModelsForSessionType(getChatSessionType(ctx.chatSessionResource));
-		if (!requiresCustomModels) {
-			return;
-		}
-
 		const requests = this._widget?.viewModel?.model.getRequests();
 		if (!requests || requests.length === 0) {
 			return;
 		}
 
-		// Find the modelId from the last request that has one
-		let lastModelId: string | undefined;
-		for (let i = requests.length - 1; i >= 0; i--) {
-			if (requests[i].modelId) {
-				lastModelId = requests[i].modelId;
-				break;
-			}
+		const modeInfo = findLast(requests, req => !!req.modeInfo)?.modeInfo;
+		if (modeInfo && modeInfo.modeInstructions?.uri) {
+			this.setChatMode(modeInfo.modeInstructions.uri.toString());
 		}
 
+		// Find the modelId from the last request that has one
+		const lastModelId = findLast(requests, req => !!req.modelId)?.modelId;
 		if (!lastModelId) {
 			return;
 		}
@@ -1241,6 +1251,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			},
 			selectedModel: this._currentLanguageModel.get(),
 			selections: this._inputEditor?.getSelections() || [],
+			permissionLevel: this._currentPermissionLevel.get(),
 			contrib: {},
 		};
 
@@ -1614,8 +1625,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		// Handle agent option from session - set initial mode
 		if (customAgentTarget) {
+			const contribution = ctx && this.chatSessionsService.getChatSessionContribution(getChatSessionType(ctx.chatSessionResource));
 			const agentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, agentOptionId);
-			if (typeof agentOption !== 'undefined') {
+			if (typeof agentOption !== 'undefined' && !contribution?.useRequestToPopulateBuiltInPickers) {
 				const agentId = (typeof agentOption === 'string' ? agentOption : agentOption.id) || ChatMode.Agent.id;
 				const currentMode = this._currentModeObservable.get();
 				const isDefaultAgent = agentId === ChatMode.Agent.id;
@@ -1834,6 +1846,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const sessionType = delegateSessionType || (sessionResource ? getChatSessionType(sessionResource) : '');
 
 		this.agentSessionTypeKey.set(sessionType);
+		this.chatSessionSupportsDelegationKey.set(this.chatSessionsService.supportsDelegationForSessionType(sessionType));
 	}
 
 	/**
@@ -1968,6 +1981,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					dom.h('.chat-question-carousel-widget-container@chatQuestionCarouselContainer'),
 					dom.h('.chat-input-widgets-container@chatInputWidgetsContainer'),
 					dom.h('.chat-todo-list-widget-container@chatInputTodoListWidgetContainer'),
+					dom.h('.chat-artifacts-widget-container@chatArtifactsWidgetContainer'),
 					dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
 					dom.h('.chat-getting-started-tip-container@chatGettingStartedTipContainer'),
 					dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
@@ -1991,6 +2005,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				dom.h('.interactive-input-followups@followupsContainer'),
 				dom.h('.chat-input-widgets-container@chatInputWidgetsContainer'),
 				dom.h('.chat-todo-list-widget-container@chatInputTodoListWidgetContainer'),
+				dom.h('.chat-artifacts-widget-container@chatArtifactsWidgetContainer'),
 				dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
 				dom.h('.chat-getting-started-tip-container@chatGettingStartedTipContainer'),
 				dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
@@ -2031,6 +2046,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
 		this.chatInputTodoListWidgetContainer = elements.chatInputTodoListWidgetContainer;
+		this.chatArtifactsWidgetContainer = elements.chatArtifactsWidgetContainer;
 		this.chatGettingStartedTipContainer = elements.chatGettingStartedTipContainer;
 		this.chatGettingStartedTipContainer.style.display = 'none';
 		this.chatQuestionCarouselContainer = elements.chatQuestionCarouselContainer;
@@ -2143,7 +2159,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}));
 
 		this._register(this._inputEditor.onDidChangeModelContent(() => {
-			const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+			const currentHeight = Math.min(this._inputEditor.getContentHeight(), this._effectiveInputEditorMaxHeight);
 			if (currentHeight !== this.inputEditorHeight) {
 				this.inputEditorHeight = currentHeight;
 				// Directly update editor layout - ResizeObserver will notify parent about height change
@@ -2200,6 +2216,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		this._register(dom.addStandardDisposableListener(toolbarsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
 		this._register(dom.addStandardDisposableListener(this.attachmentsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
+		const shorterChatInputActionIds = new Set<string>([
+			OpenModePickerAction.ID,
+			ConfigureToolsAction.ID,
+		]);
 		this.inputActionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, this.options.renderInputToolbarBelowInput ? this.attachmentsContainer : toolbarsContainer, MenuId.ChatInput, {
 			telemetrySource: this.options.menus.telemetrySource,
 			menuOptions: { shouldForwardArgs: true },
@@ -2209,7 +2229,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				enabled: true,
 				kind: 'last',
 				minItems: 1,
-				actionMinWidth: 22
+				actionMinWidth: 48,
+				getActionMinWidth: action => shorterChatInputActionIds.has(action.id) ? 22 : undefined,
 			},
 			actionViewItemProvider: (action, options) => {
 				if (action.id === OpenModelPickerAction.ID && action instanceof MenuItemAction) {
@@ -2225,11 +2246,22 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 							this.renderAttachedContext();
 						},
 						getModels: () => this.getModels(),
-						useGroupedModelPicker: () => true,
+						useGroupedModelPicker: () => {
+							const sessionType = this.getCurrentSessionType();
+							return !sessionType || sessionType === localChatSessionType;
+						},
 						showManageModelsAction: () => {
 							const sessionType = this.getCurrentSessionType();
 							return !sessionType || sessionType === localChatSessionType;
-						}
+						},
+						showUnavailableFeatured: () => {
+							const sessionType = this.getCurrentSessionType();
+							return !sessionType || sessionType === localChatSessionType;
+						},
+						showFeatured: () => {
+							const sessionType = this.getCurrentSessionType();
+							return !sessionType || sessionType === localChatSessionType;
+						},
 					};
 					return this.modelWidget = this.instantiationService.createInstance(EnhancedModelPickerActionItem, action, itemDelegate, pickerOptions);
 				} else if (action.id === OpenModePickerAction.ID && action instanceof MenuItemAction) {
@@ -2247,7 +2279,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					// Use provided delegate if available, otherwise create default delegate
 					const getActiveSessionType = () => {
 						const sessionResource = this._widget?.viewModel?.sessionResource;
-						return sessionResource ? getAgentSessionProvider(sessionResource) : undefined;
+						// TODO: Remove hardcoded providers from core
+						return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
 					};
 					const delegate: ISessionTypePickerDelegate = this.options.sessionTypePickerDelegate ?? {
 						getActiveSessionProvider: () => {
@@ -2297,6 +2330,16 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				this._toolbarRelayoutScheduler.schedule();
 			}
 		}));
+		// When hideChevrons changes, picker items change their rendered size
+		// but the toolbar's ResizeObserver won't fire (the toolbar element size
+		// didn't change, only its children did). Force a relayout so the
+		// responsive overflow logic re-evaluates with the correct item widths.
+		// The relayout is deferred by a microtask so the picker action view
+		// items' own autoruns have a chance to re-render their labels first.
+		this._register(autorun(reader => {
+			pickerOptions.hideChevrons.read(reader);
+			queueMicrotask(() => this.inputActionsToolbar.relayout());
+		}));
 		this.executeToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, toolbarsContainer, this.options.menus.executeToolbar, {
 			telemetrySource: this.options.menus.telemetrySource,
 			menuOptions: {
@@ -2335,7 +2378,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
 					const getActiveSessionType = () => {
 						const sessionResource = this._widget?.viewModel?.sessionResource;
-						return sessionResource ? getAgentSessionProvider(sessionResource) : undefined;
+						// TODO: Remove hardcoded providers from core
+						return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
 					};
 					const delegate: ISessionTypePickerDelegate = this.options.sessionTypePickerDelegate ?? {
 						getActiveSessionProvider: () => {
@@ -2369,8 +2413,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					const delegate: IPermissionPickerDelegate = {
 						currentPermissionLevel: this._currentPermissionLevel,
 						setPermissionLevel: (level: ChatPermissionLevel) => {
-							this._currentPermissionLevel.set(level, undefined);
-							this.permissionLevelKey.set(level);
+							this.setPermissionLevel(level);
 						},
 					};
 					return this.permissionWidget = this.instantiationService.createInstance(PermissionPickerActionItem, action, delegate, pickerOptions);
@@ -2670,6 +2713,24 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this._chatInputTodoListWidget.value?.clear(sessionResource, force);
 	}
 
+	renderArtifactsWidget(chatSessionResource: URI): void {
+		if (!this.configurationService.getValue<boolean>(ChatConfiguration.ArtifactsEnabled)) {
+			return;
+		}
+
+		if (!this._chatArtifactsWidget.value) {
+			const widget = this._register(this.instantiationService.createInstance(ChatArtifactsWidget));
+			this._chatArtifactsWidget.value = widget;
+			dom.clearNode(this.chatArtifactsWidgetContainer);
+			dom.append(this.chatArtifactsWidgetContainer, widget.domNode);
+		}
+		this._chatArtifactsWidget.value.render(chatSessionResource);
+	}
+
+	clearArtifactsWidget(): void {
+		this._chatArtifactsWidget.value?.hide();
+	}
+
 	renderQuestionCarousel(carousel: IChatQuestionCarousel, context: IChatContentPartRenderContext, options: IChatQuestionCarouselOptions): ChatQuestionCarouselPart {
 
 		const carouselKey = carousel.resolveId ?? `${isResponseVM(context.element) ? context.element.requestId : ''}_${context.contentIndex}`;
@@ -3098,6 +3159,15 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
+	/**
+	 * Sets the maximum height budget for the input part. The editor height will be
+	 * clamped so it does not grow beyond what this budget allows after accounting
+	 * for non-editor chrome such as attachments, toolbars, and widgets.
+	 */
+	setMaxHeight(maxHeight: number | undefined): void {
+		this._maxHeight = maxHeight;
+	}
+
 	/**
 	 * Layout the input part with the given width. Height is intrinsic - determined by content
 	 * and detected via ResizeObserver, which updates `inputPartHeight` for the parent to observe.
@@ -3109,6 +3179,19 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this._layout(width);
 	}
 
+	private get _effectiveInputEditorMaxHeight(): number {
+		if (this._maxHeight === undefined) {
+			return this.inputEditorMaxHeight;
+		}
+
+		// Compute non-editor height from the cached container height (updated by ResizeObserver)
+		// minus the current editor height. This avoids a forced reflow from reading offsetHeight.
+		const currentEditorHeight = this.previousInputEditorDimension?.height ?? 0;
+		const nonEditorHeight = Math.max(0, this.height.get() - currentEditorHeight);
+		const budgetForEditor = this._maxHeight - nonEditorHeight;
+		return Math.min(this.inputEditorMaxHeight, Math.max(0, budgetForEditor));
+	}
+
 	private previousInputEditorDimension: IDimension | undefined;
 	private _layout(width: number, allowRecurse = true): void {
 		const data = this.getLayoutData();
@@ -3118,7 +3201,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
 		const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.inputPartHorizontalPaddingInside - data.toolbarsWidth - data.sideToolbarWidth;
-		const inputEditorHeight = this.inputEditorMinHeight ? Math.max(this.inputEditorMinHeight, Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight)) : Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+		const effectiveMaxHeight = this._effectiveInputEditorMaxHeight;
+		const clampedContentHeight = Math.min(this._inputEditor.getContentHeight(), effectiveMaxHeight);
+		const inputEditorHeight = this.inputEditorMinHeight ? Math.min(Math.max(this.inputEditorMinHeight, clampedContentHeight), effectiveMaxHeight) : clampedContentHeight;
 		const newDimension = { width: newEditorWidth, height: inputEditorHeight };
 		if (!this.previousInputEditorDimension || (this.previousInputEditorDimension.width !== newDimension.width || this.previousInputEditorDimension.height !== newDimension.height)) {
 			// This layout call has side-effects that are hard to understand. eg if we are calling this inside a onDidChangeContent handler, this can trigger the next onDidChangeContent handler
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.ts
index 5a4968973f9..415ba99cdce 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.ts
@@ -14,12 +14,14 @@ import { KeyCode } from '../../../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun, IObservable } from '../../../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import { localize } from '../../../../../../nls.js';
 import { ActionListItemKind, IActionListItem } from '../../../../../../platform/actionWidget/browser/actionList.js';
 import { IHoverPositionOptions } from '../../../../../../base/browser/ui/hover/hover.js';
 import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
 import { IActionWidgetDropdownAction } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
 import { IProductService } from '../../../../../../platform/product/common/productService.js';
 import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
 import { TelemetryTrustedValue } from '../../../../../../platform/telemetry/common/telemetryUtils.js';
@@ -28,6 +30,7 @@ import { IModelControlEntry, ILanguageModelChatMetadataAndIdentifier, ILanguageM
 import { ChatEntitlement, IChatEntitlementService, isProUser } from '../../../../../services/chat/common/chatEntitlementService.js';
 import * as semver from '../../../../../../base/common/semver/semver.js';
 import { IModelPickerDelegate } from './modelPickerActionItem.js';
+import { IUriIdentityService } from '../../../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IUpdateService, StateType } from '../../../../../../platform/update/common/update.js';
 
 function isVersionAtLeast(current: string, required: string): boolean {
@@ -74,10 +77,23 @@ type ChatModelChangeEvent = {
 	toModel: string | TelemetryTrustedValue<string>;
 };
 
+type ChatModelPickerInteraction = 'disabledModelContactAdminClicked' | 'premiumModelUpgradePlanClicked' | 'otherModelsExpanded' | 'otherModelsCollapsed';
+
+type ChatModelPickerInteractionClassification = {
+	owner: 'sandy081';
+	comment: 'Reporting interactions in the chat model picker';
+	interaction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The model picker interaction that occurred' };
+};
+
+type ChatModelPickerInteractionEvent = {
+	interaction: ChatModelPickerInteraction;
+};
+
 function createModelItem(
 	action: IActionWidgetDropdownAction & { section?: string },
 	model?: ILanguageModelChatMetadataAndIdentifier,
 	hoverPosition?: IHoverPositionOptions,
+	languageModelsService?: ILanguageModelsService,
 ): IActionListItem<IActionWidgetDropdownAction> {
 	return {
 		item: action,
@@ -87,26 +103,65 @@ function createModelItem(
 		group: { title: '', icon: action.icon ?? ThemeIcon.fromId(action.checked ? Codicon.check.id : Codicon.blank.id) },
 		hideIcon: false,
 		section: action.section,
-		hover: model ? { content: getModelHoverContent(model), position: hoverPosition } : undefined,
+		hover: model ? { content: getModelHoverContent(model, languageModelsService), position: hoverPosition } : undefined,
+		submenuActions: action.toolbarActions,
 	};
 }
 
+/**
+ * Returns a short description summarizing the model's current configuration values
+ * for properties marked with group 'navigation' (e.g., "High", "Medium").
+ */
+function getModelConfigurationDescription(model: ILanguageModelChatMetadataAndIdentifier, languageModelsService: ILanguageModelsService): string | undefined {
+	const schema = model.metadata.configurationSchema;
+	if (!schema?.properties) {
+		return undefined;
+	}
+
+	const currentConfig = languageModelsService.getModelConfiguration(model.identifier) ?? {};
+	const parts: string[] = [];
+
+	for (const [key, propSchema] of Object.entries(schema.properties)) {
+		if (propSchema.group !== 'navigation') {
+			continue;
+		}
+		const value = currentConfig[key] ?? propSchema.default;
+		if (value === undefined) {
+			continue;
+		}
+		const enumItemLabels = propSchema.enumItemLabels;
+		const enumIndex = propSchema.enum?.indexOf(value) ?? -1;
+		const label = enumItemLabels?.[enumIndex] ?? String(value);
+		parts.push(label);
+	}
+
+	return parts.length > 0 ? parts.join(', ') : undefined;
+}
+
 function createModelAction(
 	model: ILanguageModelChatMetadataAndIdentifier,
 	selectedModelId: string | undefined,
 	onSelect: (model: ILanguageModelChatMetadataAndIdentifier) => void,
+	languageModelsService: ILanguageModelsService,
 	section?: string,
 ): IActionWidgetDropdownAction & { section?: string } {
+	const toolbarActions = languageModelsService.getModelConfigurationActions(model.identifier);
+	const configDescription = getModelConfigurationDescription(model, languageModelsService);
+	const baseDescription = model.metadata.multiplier ?? model.metadata.detail;
+	const description = configDescription && baseDescription
+		? `${configDescription} · ${baseDescription}`
+		: configDescription ?? baseDescription;
 	return {
 		id: model.identifier,
 		enabled: true,
 		icon: model.metadata.statusIcon,
 		checked: model.identifier === selectedModelId,
 		class: undefined,
-		description: model.metadata.multiplier ?? model.metadata.detail,
+		description,
 		tooltip: model.metadata.name,
 		label: model.metadata.name,
 		section,
+		toolbarActions: toolbarActions && toolbarActions.length > 0 ? toolbarActions : undefined,
 		run: () => onSelect(model),
 	};
 }
@@ -155,7 +210,10 @@ export function buildModelPickerItems(
 	useGroupedModelPicker: boolean,
 	manageModelsAction: IActionWidgetDropdownAction | undefined,
 	chatEntitlementService: IChatEntitlementService,
+	showUnavailableFeatured: boolean,
+	showFeatured: boolean,
 	hoverPosition?: IHoverPositionOptions,
+	languageModelsService?: ILanguageModelsService,
 ): IActionListItem<IActionWidgetDropdownAction>[] {
 	const items: IActionListItem<IActionWidgetDropdownAction>[] = [];
 	if (models.length === 0) {
@@ -171,7 +229,6 @@ export function buildModelPickerItems(
 	}
 
 	if (useGroupedModelPicker) {
-		const isPro = isProUser(chatEntitlementService.entitlement);
 		let otherModels: ILanguageModelChatMetadataAndIdentifier[] = [];
 		if (models.length) {
 			// Collect all available models into lookup maps
@@ -194,7 +251,8 @@ export function buildModelPickerItems(
 			const resolveModel = (id: string) => allModelsMap.get(id) ?? modelsByMetadataId.get(id);
 
 			const getUnavailableReason = (entry: IModelControlEntry): 'upgrade' | 'update' | 'admin' => {
-				if (!isPro) {
+				const isBusinessOrEnterpriseUser = chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise;
+				if (!isBusinessOrEnterpriseUser) {
 					return 'upgrade';
 				}
 				if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
@@ -207,7 +265,7 @@ export function buildModelPickerItems(
 			const autoModel = models.find(m => m.metadata.id === 'auto' && m.metadata.vendor === 'copilot');
 			if (autoModel) {
 				markPlaced(autoModel.identifier, autoModel.metadata.id);
-				items.push(createModelItem(createModelAction(autoModel, selectedModelId, onSelect), autoModel, hoverPosition));
+				items.push(createModelItem(createModelAction(autoModel, selectedModelId, onSelect, languageModelsService!), autoModel, hoverPosition, languageModelsService));
 			}
 
 			// --- 2. Promoted section (selected + recently used + featured) ---
@@ -255,21 +313,28 @@ export function buildModelPickerItems(
 			}
 
 			// Featured models from control manifest
-			for (const [entryId, entry] of Object.entries(controlModels)) {
-				if (!entry.featured || placed.has(entryId)) {
-					continue;
-				}
-				const model = resolveModel(entryId);
-				if (model && !placed.has(model.identifier)) {
-					markPlaced(model.identifier, model.metadata.id);
-					if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
-						promotedItems.push({ kind: 'unavailable', id: entryId, entry, reason: 'update' });
-					} else {
-						promotedItems.push({ kind: 'available', model });
+			if (showFeatured) {
+				for (const [entryId, entry] of Object.entries(controlModels)) {
+					if (!entry.featured || placed.has(entryId)) {
+						continue;
+					}
+					const model = resolveModel(entryId);
+					if (model && !placed.has(model.identifier)) {
+						if (entry.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
+							if (showUnavailableFeatured) {
+								markPlaced(model.identifier, model.metadata.id);
+								promotedItems.push({ kind: 'unavailable', id: entryId, entry, reason: 'update' });
+							}
+						} else {
+							markPlaced(model.identifier, model.metadata.id);
+							promotedItems.push({ kind: 'available', model });
+						}
+					} else if (!model && !entry.exists) {
+						if (showUnavailableFeatured) {
+							markPlaced(entryId);
+							promotedItems.push({ kind: 'unavailable', id: entryId, entry, reason: getUnavailableReason(entry) });
+						}
 					}
-				} else if (!model && !entry.exists) {
-					markPlaced(entryId);
-					promotedItems.push({ kind: 'unavailable', id: entryId, entry, reason: getUnavailableReason(entry) });
 				}
 			}
 
@@ -288,7 +353,7 @@ export function buildModelPickerItems(
 
 				for (const item of promotedItems) {
 					if (item.kind === 'available') {
-						items.push(createModelItem(createModelAction(item.model, selectedModelId, onSelect), item.model, hoverPosition));
+						items.push(createModelItem(createModelAction(item.model, selectedModelId, onSelect, languageModelsService!), item.model, hoverPosition, languageModelsService));
 					} else {
 						items.push(createUnavailableModelItem(item.id, item.entry, item.reason, manageSettingsUrl, updateStateType, undefined, hoverPosition));
 					}
@@ -341,7 +406,7 @@ export function buildModelPickerItems(
 					if (entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
 						items.push(createUnavailableModelItem(model.metadata.id, entry, 'update', manageSettingsUrl, updateStateType, ModelPickerSection.Other, hoverPosition));
 					} else {
-						items.push(createModelItem(createModelAction(model, selectedModelId, onSelect, ModelPickerSection.Other), model, hoverPosition));
+						items.push(createModelItem(createModelAction(model, selectedModelId, onSelect, languageModelsService!, ModelPickerSection.Other), model, hoverPosition, languageModelsService));
 					}
 				}
 			}
@@ -363,7 +428,7 @@ export function buildModelPickerItems(
 		// Flat list: auto first, then all models sorted alphabetically
 		const autoModel = models.find(m => m.metadata.id === 'auto' && m.metadata.vendor === 'copilot');
 		if (autoModel) {
-			items.push(createModelItem(createModelAction(autoModel, selectedModelId, onSelect), autoModel, hoverPosition));
+			items.push(createModelItem(createModelAction(autoModel, selectedModelId, onSelect, languageModelsService!), autoModel, hoverPosition, languageModelsService));
 		}
 		const sortedModels = models
 			.filter(m => m !== autoModel)
@@ -372,7 +437,7 @@ export function buildModelPickerItems(
 				return vendorCmp !== 0 ? vendorCmp : a.metadata.name.localeCompare(b.metadata.name);
 			});
 		for (const model of sortedModels) {
-			items.push(createModelItem(createModelAction(model, selectedModelId, onSelect), model, hoverPosition));
+			items.push(createModelItem(createModelAction(model, selectedModelId, onSelect, languageModelsService!), model, hoverPosition, languageModelsService));
 		}
 	}
 
@@ -487,13 +552,19 @@ export class ModelPickerWidget extends Disposable {
 		private readonly _hoverPosition: IHoverPositionOptions | undefined,
 		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
 		@ICommandService private readonly _commandService: ICommandService,
+		@IOpenerService private readonly _openerService: IOpenerService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ILanguageModelsService private readonly _languageModelsService: ILanguageModelsService,
 		@IProductService private readonly _productService: IProductService,
 		@IChatEntitlementService private readonly _entitlementService: IChatEntitlementService,
 		@IUpdateService private readonly _updateService: IUpdateService,
+		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService,
 	) {
 		super();
+
+		this._register(this._languageModelsService.onDidChangeLanguageModels(() => {
+			this._renderLabel();
+		}));
 	}
 
 	setHideChevrons(hideChevrons: IObservable<boolean>): void {
@@ -512,6 +583,13 @@ export class ModelPickerWidget extends Disposable {
 		this._renderLabel();
 	}
 
+	setEnabled(enabled: boolean): void {
+		if (this._domNode) {
+			this._domNode.classList.toggle('disabled', !enabled);
+			this._domNode.setAttribute('aria-disabled', String(!enabled));
+		}
+	}
+
 	setBadge(badge: ModelPickerBadge | undefined): void {
 		this._badge = badge;
 		this._updateBadge();
@@ -555,7 +633,7 @@ export class ModelPickerWidget extends Disposable {
 
 	show(anchor?: HTMLElement): void {
 		const anchorElement = anchor ?? this._domNode;
-		if (!anchorElement) {
+		if (!anchorElement || this._domNode?.classList.contains('disabled')) {
 			return;
 		}
 
@@ -578,6 +656,10 @@ export class ModelPickerWidget extends Disposable {
 		const controlModelsForTier = isPro ? manifest.paid : manifest.free;
 		const canShowManageModelsAction = this._delegate.showManageModelsAction() && shouldShowManageModelsAction(this._entitlementService);
 		const manageModelsAction = canShowManageModelsAction ? createManageModelsAction(this._commandService) : undefined;
+		const logModelPickerInteraction = (interaction: ChatModelPickerInteraction) => {
+			this._telemetryService.publicLog2<ChatModelPickerInteractionEvent, ChatModelPickerInteractionClassification>('chat.modelPickerInteraction', { interaction });
+		};
+		const manageSettingsUrl = this._productService.defaultChatAgent?.manageSettingsUrl;
 		const items = buildModelPickerItems(
 			models,
 			this._selectedModel?.identifier,
@@ -586,11 +668,14 @@ export class ModelPickerWidget extends Disposable {
 			this._productService.version,
 			this._updateService.state.type,
 			onSelect,
-			this._productService.defaultChatAgent?.manageSettingsUrl,
+			manageSettingsUrl,
 			this._delegate.useGroupedModelPicker(),
 			!showFilter ? manageModelsAction : undefined,
 			this._entitlementService,
+			this._delegate.showUnavailableFeatured(),
+			this._delegate.showFeatured(),
 			this._hoverPosition,
+			this._languageModelsService,
 		);
 
 		const listOptions = {
@@ -599,6 +684,19 @@ export class ModelPickerWidget extends Disposable {
 			filterActions: showFilter && manageModelsAction ? [manageModelsAction] : undefined,
 			focusFilterOnOpen: true,
 			collapsedByDefault: new Set([ModelPickerSection.Other]),
+			onDidToggleSection: (section: string, collapsed: boolean) => {
+				if (section === ModelPickerSection.Other) {
+					logModelPickerInteraction(collapsed ? 'otherModelsCollapsed' : 'otherModelsExpanded');
+				}
+			},
+			linkHandler: (uri: URI) => {
+				if (uri.scheme === 'command' && uri.path === 'workbench.action.chat.upgradePlan') {
+					logModelPickerInteraction('premiumModelUpgradePlanClicked');
+				} else if (manageSettingsUrl && this._uriIdentityService.extUri.isEqual(uri, URI.parse(manageSettingsUrl))) {
+					logModelPickerInteraction('disabledModelContactAdminClicked');
+				}
+				void this._openerService.open(uri, { allowCommands: true });
+			},
 			minWidth: 200,
 		};
 		const previouslyFocusedElement = dom.getActiveElement();
@@ -663,7 +761,14 @@ export class ModelPickerWidget extends Disposable {
 			domChildren.push(iconElement);
 		}
 
-		domChildren.push(dom.$('span.chat-input-picker-label', undefined, name ?? localize('chat.modelPicker.auto', "Auto")));
+		const modelLabel = name ?? localize('chat.modelPicker.auto', "Auto");
+		const configDescription = this._selectedModel
+			? getModelConfigurationDescription(this._selectedModel, this._languageModelsService)
+			: undefined;
+		const fullLabel = configDescription
+			? `${modelLabel} · ${configDescription}`
+			: modelLabel;
+		domChildren.push(dom.$('span.chat-input-picker-label', undefined, fullLabel));
 
 		// Badge icon between label and chevron
 		if (this._badgeIcon) {
@@ -675,13 +780,12 @@ export class ModelPickerWidget extends Disposable {
 		dom.reset(this._domNode, ...domChildren);
 
 		// Aria
-		const modelName = this._selectedModel?.metadata.name ?? localize('chat.modelPicker.auto', "Auto");
-		this._domNode.ariaLabel = localize('chat.modelPicker.ariaLabel', "Pick Model, {0}", modelName);
+		this._domNode.ariaLabel = localize('chat.modelPicker.ariaLabel', "Pick Model, {0}", fullLabel);
 	}
 }
 
 
-function getModelHoverContent(model: ILanguageModelChatMetadataAndIdentifier): MarkdownString {
+function getModelHoverContent(model: ILanguageModelChatMetadataAndIdentifier, languageModelsService?: ILanguageModelsService): MarkdownString {
 	const isAuto = model.metadata.id === 'auto' && model.metadata.vendor === 'copilot';
 	const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
 	markdown.appendMarkdown(`**${model.metadata.name}**`);
@@ -707,6 +811,25 @@ function getModelHoverContent(model: ILanguageModelChatMetadataAndIdentifier): M
 		markdown.appendText(`\n`);
 	}
 
+	if (languageModelsService) {
+		const schema = model.metadata.configurationSchema;
+		if (schema?.properties) {
+			const currentConfig = languageModelsService.getModelConfiguration(model.identifier) ?? {};
+			for (const [key, propSchema] of Object.entries(schema.properties)) {
+				const value = currentConfig[key] ?? propSchema.default;
+				if (value === undefined) {
+					continue;
+				}
+				const enumItemLabels = propSchema.enumItemLabels;
+				const enumIndex = propSchema.enum?.indexOf(value) ?? -1;
+				const displayValue = enumItemLabels?.[enumIndex] ?? String(value);
+				const label = propSchema.title ?? key;
+				markdown.appendText(`${label}: ${displayValue}`);
+				markdown.appendText(`\n`);
+			}
+		}
+	}
+
 	return markdown;
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.ts
index f7d921a4245..ef053989f15 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.ts
@@ -5,6 +5,7 @@
 
 import { IAction } from '../../../../../../base/common/actions.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Iterable } from '../../../../../../base/common/iterator.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { localize } from '../../../../../../nls.js';
 import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
@@ -18,10 +19,11 @@ import { ITelemetryService } from '../../../../../../platform/telemetry/common/t
 import { IsSessionsWindowContext } from '../../../../../common/contextkeys.js';
 import { IChatSessionsService } from '../../../common/chatSessionsService.js';
 import { ACTION_ID_NEW_CHAT } from '../../actions/chatActions.js';
-import { AgentSessionProviders, getAgentCanContinueIn, getAgentSessionProvider, isFirstPartyAgentSessionProvider } from '../../agentSessions/agentSessions.js';
+import { AgentSessionProviders, AgentSessionTarget, getAgentCanContinueIn, getAgentSessionProvider, isFirstPartyAgentSessionProvider } from '../../agentSessions/agentSessions.js';
 import { ISessionTypePickerDelegate } from '../../chat.js';
 import { IChatInputPickerOptions } from './chatInputPickerActionItem.js';
 import { ISessionTypeItem, SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
+import { IGitService } from '../../../../git/common/gitService.js';
 
 /**
  * Action view item for delegating to a remote session (Background or Cloud).
@@ -43,6 +45,7 @@ export class DelegationSessionPickerActionItem extends SessionTypePickerActionIt
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
 		@ITelemetryService telemetryService: ITelemetryService,
+		@IGitService private readonly gitService: IGitService,
 	) {
 		super(action, chatSessionPosition, delegate, pickerOptions, actionWidgetService, keybindingService, contextKeyService, chatSessionsService, commandService, openerService, telemetryService);
 		this._isSessionsWindow = IsSessionsWindowContext.getValue(contextKeyService) === true;
@@ -57,7 +60,7 @@ export class DelegationSessionPickerActionItem extends SessionTypePickerActionIt
 		}
 	}
 
-	protected override _getSelectedSessionType(): AgentSessionProviders | undefined {
+	protected override _getSelectedSessionType(): AgentSessionTarget | undefined {
 		const delegationTarget = this.delegate.getPendingDelegationTarget ? this.delegate.getPendingDelegationTarget() : undefined;
 		if (delegationTarget) {
 			return delegationTarget;
@@ -65,7 +68,7 @@ export class DelegationSessionPickerActionItem extends SessionTypePickerActionIt
 		return this.delegate.getActiveSessionProvider();
 	}
 
-	protected override _isSessionTypeEnabled(type: AgentSessionProviders): boolean {
+	protected override _isSessionTypeEnabled(type: AgentSessionTarget): boolean {
 		const allContributions = this.chatSessionsService.getAllChatSessionContributions();
 		const contribution = allContributions.find(contribution => getAgentSessionProvider(contribution.type) === type);
 
@@ -79,6 +82,11 @@ export class DelegationSessionPickerActionItem extends SessionTypePickerActionIt
 			return false;
 		}
 
+		// In the sessions window, cloud delegation requires a git repository
+		if (this._isSessionsWindow && type === AgentSessionProviders.Cloud && !this._hasGitRepository()) {
+			return false;
+		}
+
 		if (contribution && !contribution.canDelegate && activeProvider !== type /* Allow switching back to active type */) {
 			return false;
 		}
@@ -86,7 +94,11 @@ export class DelegationSessionPickerActionItem extends SessionTypePickerActionIt
 		return this._getSelectedSessionType() !== type; // Always allow switching back to active session
 	}
 
-	protected override _isVisible(type: AgentSessionProviders): boolean {
+	private _hasGitRepository(): boolean {
+		return !Iterable.isEmpty(this.gitService.repositories);
+	}
+
+	protected override _isVisible(type: AgentSessionTarget): boolean {
 		// In the sessions window, only show Background and Cloud targets
 		if (this._isSessionsWindow && type === AgentSessionProviders.Local) {
 			return false;
@@ -106,6 +118,13 @@ export class DelegationSessionPickerActionItem extends SessionTypePickerActionIt
 		return { label: localize('continueInThirdParty', "Continue In (Third Party)"), order: 2, showHeader: false };
 	}
 
+	protected override _getSessionDescription(sessionTypeItem: ISessionTypeItem): string | undefined {
+		if (this._isSessionsWindow && sessionTypeItem.type === AgentSessionProviders.Cloud && !this._hasGitRepository()) {
+			return localize('chat.cloudRequiresGit', "Requires a Git repository");
+		}
+		return undefined;
+	}
+
 	protected override _getLearnMore(): IAction {
 		const learnMoreUrl = 'https://aka.ms/vscode-continue-chat-in';
 		return {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
index 0a068f1b964..9295f3e8a19 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
@@ -68,6 +68,7 @@ import { IChatDebugService } from '../../../../common/chatDebugService.js';
 import { createDebugEventsAttachment } from '../../../chatDebug/chatDebugAttachment.js';
 import { getPromptFileType } from '../../../../common/promptSyntax/config/promptFileLocations.js';
 import { getChatSessionType } from '../../../../common/model/chatUri.js';
+import { getAgentSessionProviderIcon, AgentSessionProviders } from '../../../agentSessions/agentSessions.js';
 
 /**
  * Regex matching a slash command word (e.g. `/foo`). Uses `\p{L}` for Unicode
@@ -104,9 +105,6 @@ class SlashCommandCompletions extends Disposable {
 
 				let customAgentTarget: Target | undefined = undefined;
 				if (widget.lockedAgentId) {
-					if (!widget.attachmentCapabilities.supportsPromptAttachments) {
-						return null;
-					}
 					const sessionResource = widget.viewModel.model.sessionResource;
 					const ctx = sessionResource && chatService.getChatSessionFromInternalUri(sessionResource);
 					customAgentTarget = (ctx ? chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource)) : undefined) ?? Target.Undefined;
@@ -137,13 +135,22 @@ class SlashCommandCompletions extends Disposable {
 				return {
 					suggestions: slashCommands
 						.filter(c => {
+							// silent commands are client-side only... so they're not "attaching anything"
+							// so this check can be scoped to when the command _does_ attach something before
+							// checking if the widget supports attachments at all
+							if (!c.silent && !widget.attachmentCapabilities.supportsPromptAttachments) {
+								return false;
+							}
+							if (c.when && !widget.scopedContextKeyService.contextMatchesRules(c.when)) {
+								return false;
+							}
 							if (!widget.lockedAgentId) {
 								return true;
 							}
 							if (c.modes && c.modes.length && !c.modes.includes(ChatModeKind.Agent)) {
 								return false;
 							}
-							if (c.target && customAgentTarget && c.target !== customAgentTarget) {
+							if (c.targets && customAgentTarget && !c.targets.includes(customAgentTarget)) {
 								return false;
 							}
 							return true;
@@ -192,19 +199,21 @@ class SlashCommandCompletions extends Disposable {
 				}
 
 				return {
-					suggestions: slashCommands.map((c, i): CompletionItem => {
-						const withSlash = `${chatSubcommandLeader}${c.command}`;
-						return {
-							label: { label: withSlash, description: c.detail },
-							insertText: c.executeImmediately ? '' : `${withSlash} `,
-							documentation: c.detail,
-							range,
-							filterText: `${chatAgentLeader}${c.command}`,
-							sortText: c.sortText ?? 'z'.repeat(i + 1),
-							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
-							command: c.executeImmediately ? { id: ChatSubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` } satisfies IChatExecuteActionContext] } : undefined,
-						};
-					})
+					suggestions: slashCommands
+						.filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when))
+						.map((c, i): CompletionItem => {
+							const withSlash = `${chatSubcommandLeader}${c.command}`;
+							return {
+								label: { label: withSlash, description: c.detail },
+								insertText: c.executeImmediately ? '' : `${withSlash} `,
+								documentation: c.detail,
+								range,
+								filterText: `${chatAgentLeader}${c.command}`,
+								sortText: c.sortText ?? 'z'.repeat(i + 1),
+								kind: CompletionItemKind.Text, // The icons are disabled here anyway,
+								command: c.executeImmediately ? { id: ChatSubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` } satisfies IChatExecuteActionContext] } : undefined,
+							};
+						})
 				};
 			}
 		}));
@@ -263,7 +272,8 @@ class SlashCommandCompletions extends Disposable {
 						}
 						return true;
 					})
-					.filter(c => c.parsedPromptFile?.header?.userInvocable !== false);
+					.filter(c => c.parsedPromptFile?.header?.userInvocable !== false)
+					.filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when));
 				if (userInvocableCommands.length === 0) {
 					return null;
 				}
@@ -869,6 +879,7 @@ class BuiltinDynamicCompletions extends Disposable {
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IChatDebugService private readonly chatDebugService: IChatDebugService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
 	) {
 		super();
 
@@ -954,6 +965,77 @@ class BuiltinDynamicCompletions extends Disposable {
 			return result;
 		});
 
+		// Session Reference completion
+		const sessionWordPattern = new RegExp(`${chatVariableLeader}[^\\s]*`, 'g');
+		this.registerVariableCompletions('sessionReference', async ({ widget, range }, token) => {
+			if (widget.location !== ChatAgentLocation.Chat) {
+				return;
+			}
+
+			const typedWord = range.varWord?.word ?? '';
+			const sessionPrefix = `${chatVariableLeader}session`;
+			const result: CompletionList = { suggestions: [] };
+
+			if (typedWord.toLowerCase().startsWith(`${sessionPrefix}:`)) {
+				// User has typed #session: — fetch all sessions and show them inline
+				const allSessions: { title: string; sessionResource: URI; lastMessageDate: number; icon: ThemeIcon }[] = [];
+
+				const sessionProviderFilter = [AgentSessionProviders.Local, AgentSessionProviders.Background, AgentSessionProviders.Claude];
+				for await (const group of this.chatSessionsService.getChatSessionItems(sessionProviderFilter, token)) {
+					if (token.isCancellationRequested) {
+						return;
+					}
+					const providerIcon = getAgentSessionProviderIcon(group.chatSessionType);
+					for (const item of group.items) {
+						allSessions.push({
+							title: item.label,
+							sessionResource: item.resource,
+							lastMessageDate: item.timing.lastRequestEnded ?? item.timing.created,
+							icon: item.iconPath ?? providerIcon,
+						});
+					}
+				}
+
+				const currentSessionResource = widget.viewModel?.sessionResource;
+				const filteredSessions = allSessions
+					.filter(s => !currentSessionResource || s.sessionResource.toString() !== currentSessionResource.toString())
+					.sort((a, b) => b.lastMessageDate - a.lastMessageDate);
+
+				for (const session of filteredSessions) {
+					const text = `${sessionPrefix}:${session.title}`;
+					const dateStr = new Date(session.lastMessageDate).toLocaleString();
+					result.suggestions.push({
+						label: { label: session.title, description: dateStr },
+						filterText: `${sessionPrefix}:${session.title}`,
+						insertText: range.varWord?.endColumn === range.replace.endColumn ? `${text} ` : text,
+						range,
+						kind: CompletionItemKind.Text,
+						sortText: `z${String(Number.MAX_SAFE_INTEGER - session.lastMessageDate).padStart(20, '0')}`,
+						command: {
+							id: BuiltinDynamicCompletions.addReferenceCommand, title: '', arguments: [new ReferenceArgument(widget, {
+								id: session.sessionResource.toString(),
+								icon: session.icon,
+								range: { startLineNumber: range.replace.startLineNumber, startColumn: range.replace.startColumn, endLineNumber: range.replace.endLineNumber, endColumn: range.replace.startColumn + text.length },
+								data: session.sessionResource
+							})]
+						}
+					});
+				}
+			} else {
+				// User typed # or #s etc — show single #session entry that inserts #session: and re-triggers suggest
+				result.suggestions.push({
+					label: { label: sessionPrefix, description: localize('session.description', 'Attach a chat session') },
+					filterText: sessionPrefix,
+					insertText: `${sessionPrefix}:`,
+					range,
+					kind: CompletionItemKind.Text,
+					sortText: 'z',
+					command: { id: 'editor.action.triggerSuggest', title: '' },
+				});
+			}
+			return result;
+		}, sessionWordPattern);
+
 		// Debug Events Snapshot completion
 		this.registerVariableCompletions('debugEventsSnapshot', ({ widget, range }) => {
 			if (widget.location !== ChatAgentLocation.Chat) {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts
index 0bf73505e4e..d22c7463cf9 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts
@@ -8,7 +8,9 @@ import { Disposable, MutableDisposable } from '../../../../../../../base/common/
 import { autorun } from '../../../../../../../base/common/observable.js';
 import { themeColorFromId } from '../../../../../../../base/common/themables.js';
 import { URI } from '../../../../../../../base/common/uri.js';
+import { MouseTargetType } from '../../../../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../../../../editor/browser/services/codeEditorService.js';
+import { Position } from '../../../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../../../editor/common/core/range.js';
 import { IDecorationOptions } from '../../../../../../../editor/common/editorCommon.js';
 import { TrackedRangeStickiness } from '../../../../../../../editor/common/model.js';
@@ -17,6 +19,7 @@ import { ILabelService } from '../../../../../../../platform/label/common/label.
 import { inputPlaceholderForeground } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
 import { IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../../../common/participants/chatAgents.js';
+import { localize } from '../../../../../../../nls.js';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '../../../../common/widget/chatColors.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from '../../../../common/requestParser/chatParserTypes.js';
 import { ChatRequestParser } from '../../../../common/requestParser/chatRequestParser.js';
@@ -29,10 +32,12 @@ import { NativeEditContextRegistry } from '../../../../../../../editor/browser/c
 import { TextAreaEditContextRegistry } from '../../../../../../../editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.js';
 import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
 import { ThrottledDelayer } from '../../../../../../../base/common/async.js';
+import { IEditorService } from '../../../../../../services/editor/common/editorService.js';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';
 const slashCommandTextDecorationType = 'chat-session-text';
+const clickableSlashPromptTextDecorationType = 'chat-session-clickable-text';
 const variableTextDecorationType = 'chat-variable-text';
 
 function agentAndCommandToKey(agent: IChatAgentData, subcommand: string | undefined): string {
@@ -69,6 +74,8 @@ class InputEditorDecorations extends Disposable {
 	public readonly id = 'inputEditorDecorations';
 
 	private readonly previouslyUsedAgents = new Set<string>();
+	private clickablePromptSlashCommand: { range: Range; uri: URI } | undefined;
+	private mouseDownPromptSlashCommand: { position: Position; uri: URI; range: Range } | undefined;
 
 	private readonly viewModelDisposables = this._register(new MutableDisposable());
 
@@ -82,6 +89,7 @@ class InputEditorDecorations extends Disposable {
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IPromptsService private readonly promptsService: IPromptsService,
+		@IEditorService private readonly editorService: IEditorService,
 	) {
 		super();
 
@@ -97,6 +105,38 @@ class InputEditorDecorations extends Disposable {
 		this._register(this.widget.onDidSubmitAgent((e) => {
 			this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent, e.slashCommand?.name));
 		}));
+		this._register(this.widget.inputEditor.onMouseDown(e => {
+			this.mouseDownPromptSlashCommand = undefined;
+
+			if (!e.event.leftButton || e.target.type !== MouseTargetType.CONTENT_TEXT || !e.target.position) {
+				return;
+			}
+
+			const clickablePromptSlashCommand = this.clickablePromptSlashCommand;
+			if (!clickablePromptSlashCommand || !clickablePromptSlashCommand.range.containsPosition(e.target.position)) {
+				return;
+			}
+
+			this.mouseDownPromptSlashCommand = {
+				position: Position.lift(e.target.position),
+				uri: clickablePromptSlashCommand.uri,
+				range: clickablePromptSlashCommand.range,
+			};
+		}));
+		this._register(this.widget.inputEditor.onMouseUp(e => {
+			const mouseDownPromptSlashCommand = this.mouseDownPromptSlashCommand;
+			this.mouseDownPromptSlashCommand = undefined;
+
+			if (!mouseDownPromptSlashCommand || e.target.type !== MouseTargetType.CONTENT_TEXT || !e.target.position) {
+				return;
+			}
+
+			if (!mouseDownPromptSlashCommand.range.containsPosition(e.target.position) || !Position.equals(mouseDownPromptSlashCommand.position, e.target.position)) {
+				return;
+			}
+
+			void this.editorService.openEditor({ resource: mouseDownPromptSlashCommand.uri });
+		}));
 		this._register(this.chatAgentService.onDidChangeAgents(() => this.triggerInputEditorDecorationsUpdate()));
 		this._register(this.promptsService.onDidChangeSlashCommands(() => this.triggerInputEditorDecorationsUpdate()));
 		this._register(autorun(reader => {
@@ -128,6 +168,12 @@ class InputEditorDecorations extends Disposable {
 			backgroundColor: themeColorFromId(chatSlashCommandBackground),
 			borderRadius: '3px'
 		}));
+		this._register(this.codeEditorService.registerDecorationType(decorationDescription, clickableSlashPromptTextDecorationType, {
+			color: themeColorFromId(chatSlashCommandForeground),
+			backgroundColor: themeColorFromId(chatSlashCommandBackground),
+			borderRadius: '3px',
+			cursor: 'pointer'
+		}));
 		this._register(this.codeEditorService.registerDecorationType(decorationDescription, variableTextDecorationType, {
 			color: themeColorFromId(chatSlashCommandForeground),
 			backgroundColor: themeColorFromId(chatSlashCommandBackground),
@@ -253,6 +299,8 @@ class InputEditorDecorations extends Disposable {
 	}
 
 	private async updateAsyncInputEditorDecorations(token: CancellationToken): Promise<void> {
+		this.clickablePromptSlashCommand = undefined;
+		this.widget.inputEditor.setDecorationsByType(decorationDescription, clickableSlashPromptTextDecorationType, []);
 
 		const parsedRequest = this.widget.parsedInput.parts;
 
@@ -299,7 +347,21 @@ class InputEditorDecorations extends Disposable {
 		}
 
 		if (slashPromptPart && promptSlashCommand) {
-			textDecorations.push({ range: slashPromptPart.editorRange });
+			this.clickablePromptSlashCommand = {
+				range: Range.lift(slashPromptPart.editorRange),
+				uri: promptSlashCommand.promptPath.uri,
+			};
+			const promptHoverMessage = new MarkdownString();
+			promptHoverMessage.appendText(localize(
+				'chatInput.promptSlashCommand.open',
+				"Click to open {0}",
+				this.labelService.getUriLabel(promptSlashCommand.promptPath.uri, { relative: true })
+			));
+			const promptDecoration = {
+				range: slashPromptPart.editorRange,
+				hoverMessage: promptHoverMessage,
+			};
+			this.widget.inputEditor.setDecorationsByType(decorationDescription, clickableSlashPromptTextDecorationType, [promptDecoration]);
 		}
 
 		this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts
index fbd4a16a579..0e69047f704 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts
@@ -99,7 +99,7 @@ export class ModePickerActionItem extends ChatInputPickerActionViewItem {
 				if (mode.uri) {
 					let label, icon, id;
 					if (mode.source?.storage === PromptsStorage.extension) {
-						icon = Codicon.eye;
+						icon = Codicon.file;
 						id = `viewAgent:${mode.id}`;
 						label = localize('viewModeConfiguration', "View {0} agent", mode.label.get());
 					} else {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts
index bae01a07ca3..adeaa775f49 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts
@@ -31,6 +31,8 @@ export interface IModelPickerDelegate {
 	getModels(): ILanguageModelChatMetadataAndIdentifier[];
 	useGroupedModelPicker(): boolean;
 	showManageModelsAction(): boolean;
+	showUnavailableFeatured(): boolean;
+	showFeatured(): boolean;
 }
 
 type ChatModelChangeClassification = {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem2.ts b/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem2.ts
index dfc1510a2c8..c1597b47694 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem2.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem2.ts
@@ -76,6 +76,10 @@ export class EnhancedModelPickerActionItem extends BaseActionViewItem {
 		this._showPicker();
 	}
 
+	public setEnabled(enabled: boolean): void {
+		this._pickerWidget.setEnabled(enabled);
+	}
+
 	private _showPicker(): void {
 		this._pickerWidget.show(this._getAnchorElement());
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/permissionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/permissionPickerActionItem.ts
index b3c674193bc..293764ad739 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/permissionPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/permissionPickerActionItem.ts
@@ -22,6 +22,8 @@ import { IDialogService } from '../../../../../../platform/dialogs/common/dialog
 import Severity from '../../../../../../base/common/severity.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { ChatInputPickerActionViewItem, IChatInputPickerOptions } from './chatInputPickerActionItem.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../../../base/common/uri.js';
 
 // Track whether warnings have been shown this VS Code session
 const shownWarnings = new Set<ChatPermissionLevel>();
@@ -54,10 +56,10 @@ export class PermissionPickerActionItem extends ChatInputPickerActionViewItem {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IDialogService private readonly dialogService: IDialogService,
+		@IOpenerService openerService: IOpenerService,
 	) {
 		const isAutoApprovePolicyRestricted = () => configurationService.inspect<boolean>(ChatConfiguration.GlobalAutoApprove).policyValue === false;
 		const isAutopilotEnabled = () => configurationService.getValue<boolean>(ChatConfiguration.AutopilotEnabled) !== false;
-		const isBackgroundProvider = contextKeyService.getContextKeyValue<string>('lockedCodingAgentId') === 'copilotcli';
 		const actionProvider: IActionWidgetDropdownActionProvider = {
 			getActions: () => {
 				const currentLevel = delegate.currentPermissionLevel.get();
@@ -131,7 +133,7 @@ export class PermissionPickerActionItem extends ChatInputPickerActionViewItem {
 						},
 					} satisfies IActionWidgetDropdownAction,
 				];
-				if (isAutopilotEnabled() && !isBackgroundProvider) {
+				if (isAutopilotEnabled()) {
 					actions.push({
 						...action,
 						id: 'chat.permissions.autopilot',
@@ -165,7 +167,7 @@ export class PermissionPickerActionItem extends ChatInputPickerActionViewItem {
 									custom: {
 										icon: Codicon.rocket,
 										markdownDetails: [{
-											markdown: new MarkdownString(localize('permissions.autopilot.warning.detail', "Autopilot will auto-approve all tool calls and continue working autonomously until the task is complete. The agent will make decisions on your behalf without asking for confirmation.\n\nYou can stop the agent at any time by clicking the stop button. This applies to the current session only.")),
+											markdown: new MarkdownString(localize('permissions.autopilot.warning.detail', "Autopilot will auto-approve all tool calls and continue working autonomously until the task is complete. This includes terminal commands, file edits, and external tool calls. The agent will make decisions on your behalf without asking for confirmation.\n\nYou can stop the agent at any time by clicking the stop button. This applies to the current session only.")),
 										}],
 									},
 								});
@@ -187,6 +189,16 @@ export class PermissionPickerActionItem extends ChatInputPickerActionViewItem {
 
 		super(action, {
 			actionProvider,
+			actionBarActions: [{
+				id: 'chat.permissions.learnMore',
+				label: localize('permissions.learnMore', "Learn More about Permissions"),
+				tooltip: localize('permissions.learnMore', "Learn More about Permissions"),
+				class: undefined,
+				enabled: true,
+				run: async () => {
+					await openerService.open(URI.parse('https://code.visualstudio.com/docs/copilot/agents/agent-tools#_permission-levels'));
+				}
+			}],
 			reporter: { id: 'ChatPermissionPicker', name: 'ChatPermissionPicker', includeOptions: true },
 			listOptions: { descriptionBelow: true, minWidth: 255 },
 		}, pickerOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.ts
index d70bfd59695..660efa7d567 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.ts
@@ -6,7 +6,9 @@
 import * as dom from '../../../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { IAction } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { localize } from '../../../../../../nls.js';
 import { MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
@@ -18,14 +20,14 @@ import { IKeybindingService } from '../../../../../../platform/keybinding/common
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
 import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
 import { IChatSessionsService } from '../../../common/chatSessionsService.js';
-import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isFirstPartyAgentSessionProvider } from '../../agentSessions/agentSessions.js';
+import { AgentSessionProviders, AgentSessionTarget, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isFirstPartyAgentSessionProvider } from '../../agentSessions/agentSessions.js';
 import { ChatInputPickerActionViewItem, IChatInputPickerOptions } from './chatInputPickerActionItem.js';
 import { ISessionTypePickerDelegate } from '../../chat.js';
 import { IActionProvider } from '../../../../../../base/browser/ui/dropdown/dropdown.js';
 
 
 export interface ISessionTypeItem {
-	type: AgentSessionProviders;
+	type: AgentSessionTarget;
 	label: string;
 	hoverDescription: string;
 	commandId: string;
@@ -70,7 +72,7 @@ export class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
 						id: sessionTypeItem.commandId,
 						label: sessionTypeItem.label,
 						checked: currentType === sessionTypeItem.type,
-						icon: getAgentSessionProviderIcon(sessionTypeItem.type),
+						icon: this._getSessionIcon(sessionTypeItem),
 						enabled: this._isSessionTypeEnabled(sessionTypeItem.type),
 						category: this._getSessionCategory(sessionTypeItem),
 						description: this._getSessionDescription(sessionTypeItem),
@@ -121,7 +123,7 @@ export class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
 		}
 	}
 
-	protected _getSelectedSessionType(): AgentSessionProviders | undefined {
+	protected _getSelectedSessionType(): AgentSessionTarget | undefined {
 		return this.delegate.getActiveSessionProvider();
 	}
 
@@ -155,28 +157,38 @@ export class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
 
 		const contributions = this.chatSessionsService.getAllChatSessionContributions();
 		for (const contribution of contributions) {
+			// TODO: Remove hardcoded providers from core
 			const agentSessionType = getAgentSessionProvider(contribution.type);
-			if (!agentSessionType) {
-				continue;
+			if (agentSessionType) {
+				// Well-known session type — use hardcoded metadata
+				agentSessionItems.push({
+					type: agentSessionType,
+					label: getAgentSessionProviderName(agentSessionType),
+					hoverDescription: getAgentSessionProviderDescription(agentSessionType),
+					commandId: contribution.canDelegate ?
+						`workbench.action.chat.openNewChatSessionInPlace.${contribution.type}` :
+						`workbench.action.chat.openNewChatSessionExternal.${contribution.type}`,
+				});
+			} else {
+				// Extension-contributed session type — always use in-place
+				// (openNewChatSessionExternal requires a menu action registered
+				// by _registerMenuItems, which may not exist for extensions)
+				agentSessionItems.push({
+					type: contribution.type,
+					label: contribution.displayName ?? contribution.name ?? contribution.type,
+					hoverDescription: contribution.description ?? '',
+					commandId: `workbench.action.chat.openNewChatSessionInPlace.${contribution.type}`,
+				});
 			}
-
-			agentSessionItems.push({
-				type: agentSessionType,
-				label: getAgentSessionProviderName(agentSessionType),
-				hoverDescription: getAgentSessionProviderDescription(agentSessionType),
-				commandId: contribution.canDelegate ?
-					`workbench.action.chat.openNewChatSessionInPlace.${contribution.type}` :
-					`workbench.action.chat.openNewChatSessionExternal.${contribution.type}`,
-			});
 		}
 		this._sessionTypeItems = agentSessionItems;
 	}
 
-	protected _isVisible(type: AgentSessionProviders): boolean {
+	protected _isVisible(_type: AgentSessionTarget): boolean {
 		return true;
 	}
 
-	protected _isSessionTypeEnabled(type: AgentSessionProviders): boolean {
+	protected _isSessionTypeEnabled(type: AgentSessionTarget): boolean {
 		if (type === AgentSessionProviders.Local) {
 			return true; // Local is always available
 		}
@@ -185,13 +197,29 @@ export class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
 	}
 
 	protected _getSessionCategory(sessionTypeItem: ISessionTypeItem) {
-		return isFirstPartyAgentSessionProvider(sessionTypeItem.type) ? firstPartyCategory : otherCategory;
+		// TODO: Remove hardcoded providers from core
+		const knownType = getAgentSessionProvider(sessionTypeItem.type);
+		return knownType && isFirstPartyAgentSessionProvider(knownType) ? firstPartyCategory : otherCategory;
 	}
 
 	protected _getSessionDescription(sessionTypeItem: ISessionTypeItem): string | undefined {
 		return undefined;
 	}
 
+	private _getSessionIcon(sessionTypeItem: ISessionTypeItem): ThemeIcon {
+		// TODO: Remove hardcoded providers from core
+		const knownType = getAgentSessionProvider(sessionTypeItem.type);
+		if (knownType) {
+			return getAgentSessionProviderIcon(knownType);
+		}
+		// Extension-contributed: look up icon from the contribution
+		const contribution = this.chatSessionsService.getChatSessionContribution(sessionTypeItem.type);
+		if (contribution && ThemeIcon.isThemeIcon(contribution.icon)) {
+			return contribution.icon;
+		}
+		return Codicon.extensions;
+	}
+
 	override render(container: HTMLElement): void {
 		super.render(container);
 		container.classList.add('chat-session-target-picker-item');
@@ -199,10 +227,14 @@ export class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
 
 	protected override renderLabel(element: HTMLElement): IDisposable | null {
 		this.setAriaLabelAttributes(element);
-		const currentType = this._getSelectedSessionType();
+		const currentType = this._getSelectedSessionType() ?? AgentSessionProviders.Local;
 
-		const label = getAgentSessionProviderName(currentType ?? AgentSessionProviders.Local);
-		const icon = getAgentSessionProviderIcon(currentType ?? AgentSessionProviders.Local);
+		// TODO: Remove hardcoded providers from core
+		const knownType = getAgentSessionProvider(currentType);
+		const label = knownType
+			? getAgentSessionProviderName(knownType)
+			: (this.chatSessionsService.getChatSessionContribution(currentType)?.displayName ?? currentType);
+		const icon = this._getSessionIcon({ type: currentType, label, hoverDescription: '', commandId: '' });
 
 		const labelElements = [];
 		labelElements.push(...renderLabelWithIcons(`$(${icon.id})`));
diff --git a/src/vs/workbench/contrib/chat/browser/widget/media/chat.css b/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
index cfbf53ea6d8..5618337afc4 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
@@ -9,7 +9,8 @@
 	max-width: 950px;
 	height: 100%;
 	margin: auto;
-	position: relative; /* Enable absolute positioning for child elements */
+	position: relative;
+	/* Enable absolute positioning for child elements */
 
 	/* 11px when base font is 13px */
 	--vscode-chat-font-size-body-xs: 0.846em;
@@ -282,7 +283,7 @@
 }
 
 .interactive-item-container > .value .chat-used-context {
-	margin-bottom: 16px;
+	margin-bottom: 14px;
 }
 
 .interactive-item-container > .value .chat-used-context .chat-used-context-list {
@@ -624,7 +625,7 @@
 	}
 
 	&:not(:last-child) {
-		margin-bottom: 16px;
+		margin-bottom: 14px;
 	}
 }
 
@@ -849,6 +850,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 .interactive-input-part:has(.chat-editing-session > .chat-editing-session-container) .chat-input-container,
 .interactive-input-part:has(.chat-todo-list-widget-container > .chat-todo-list-widget.has-todos) .chat-input-container,
+.interactive-input-part:has(.chat-artifacts-widget-container > .chat-artifacts-widget:not([style*="display: none"])) .chat-input-container,
 .interactive-input-part:has(.chat-input-widgets-container > .chat-status-widget:not([style*="display: none"])) .chat-input-container,
 .interactive-input-part:has(.chat-getting-started-tip-container > .chat-tip-widget) .chat-input-container {
 	/* Remove top border radius when editing session, todo list, or status widget is present */
@@ -877,11 +879,16 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	overflow: hidden;
 }
 
-.interactive-session .interactive-input-part > .chat-todo-list-widget-container:has(.chat-todo-list-widget.has-todos) + .chat-editing-session .chat-editing-session-container {
+/* Remove top radius from widgets that follow another visible widget */
+.interactive-session .interactive-input-part > .chat-todo-list-widget-container:has(.chat-todo-list-widget.has-todos) + .chat-artifacts-widget-container .chat-artifacts-widget,
+.interactive-session .interactive-input-part > .chat-todo-list-widget-container:has(.chat-todo-list-widget.has-todos) + .chat-editing-session .chat-editing-session-container,
+.interactive-session .interactive-input-part > .chat-todo-list-widget-container:has(.chat-todo-list-widget.has-todos) + .chat-artifacts-widget-container + .chat-editing-session .chat-editing-session-container,
+.interactive-session .interactive-input-part > .chat-artifacts-widget-container:has(.chat-artifacts-widget:not([style*="display: none"])) + .chat-editing-session .chat-editing-session-container {
 	border-top-left-radius: 0;
 	border-top-right-radius: 0;
 }
 
+
 .interactive-session .chat-editing-session .monaco-list-row .chat-collapsible-list-action-bar {
 	padding-left: 5px;
 	display: none;
@@ -1105,6 +1112,14 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	position: relative;
 }
 
+
+.interactive-session .interactive-input-part > .chat-artifacts-widget-container {
+	margin-bottom: -4px;
+	width: 100%;
+	position: relative;
+}
+
+
 /* Chat Todo List Widget Container - mirrors chat-editing-session styling */
 .interactive-session .interactive-input-part > .chat-todo-list-widget-container {
 	margin-bottom: -4px;
@@ -2145,6 +2160,152 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	border: none;
 }
 
+/* Chat artifacts widget — collapsible list of session artifacts */
+.chat-artifacts-widget {
+	padding: 4px 3px 4px 3px;
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-input-border, transparent);
+	background-color: var(--vscode-editor-background);
+	border-bottom: none;
+	border-radius: var(--vscode-cornerRadius-large) var(--vscode-cornerRadius-large) 0 0;
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+	overflow: hidden;
+}
+
+.chat-artifacts-widget .chat-artifacts-expand {
+	width: 100%;
+}
+
+.chat-artifacts-widget .chat-artifacts-expand .monaco-button {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	cursor: pointer;
+	justify-content: space-between;
+	width: 100%;
+	background-color: transparent;
+	border-color: transparent;
+	color: var(--vscode-foreground);
+	padding: 0;
+	min-width: unset;
+}
+
+.chat-artifacts-widget .chat-artifacts-expand .monaco-button:focus:not(:focus-visible) {
+	outline: none;
+}
+
+.chat-artifacts-widget .chat-artifacts-expand .chat-artifacts-title-section {
+	padding-left: 3px;
+	display: flex;
+	align-items: center;
+	flex: 1;
+	font-size: 12px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	line-height: 22px;
+}
+
+.chat-artifacts-widget .chat-artifacts-expand .chat-artifacts-title-section .codicon {
+	font-size: 16px;
+	line-height: 22px;
+	flex-shrink: 0;
+	margin-right: 3px;
+}
+
+.chat-artifacts-widget .chat-artifacts-list {
+	width: 100%;
+	padding: 0;
+	box-sizing: border-box;
+}
+
+.chat-artifacts-widget .chat-artifacts-list .monaco-list .monaco-list-row {
+	border-radius: var(--vscode-cornerRadius-small);
+}
+
+.chat-artifacts-widget .chat-artifacts-list .monaco-list .monaco-list-row:hover {
+	background-color: var(--vscode-list-hoverBackground) !important;
+}
+
+.chat-artifacts-widget .chat-artifacts-list-row {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 0 6px;
+	height: 100%;
+	cursor: pointer;
+}
+
+.chat-artifacts-widget .chat-artifacts-list-icon {
+	font-size: 14px;
+	display: flex;
+	align-items: center;
+}
+
+.chat-artifacts-widget .chat-artifacts-list-label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 13px;
+	flex: 1;
+}
+
+.chat-artifacts-widget .chat-artifacts-list-save {
+	display: none;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	padding: 2px;
+	border-radius: 2px;
+	margin-left: auto;
+}
+
+.chat-artifacts-widget .chat-artifacts-list-row:hover .chat-artifacts-list-save {
+	display: flex;
+}
+
+.chat-artifacts-widget .chat-artifacts-list-save:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.chat-artifacts-widget .artifacts-clear-button-container {
+	padding-right: 2px;
+	display: flex;
+	align-items: center;
+	height: 18px;
+	opacity: 1;
+}
+
+.chat-artifacts-widget .artifacts-clear-button-container .monaco-button {
+	background-color: transparent;
+	border-color: transparent;
+	color: var(--vscode-foreground);
+	cursor: pointer;
+	height: 16px;
+	padding: 3px;
+	border-radius: 2px;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	min-width: unset;
+}
+
+.chat-artifacts-widget .artifacts-clear-button-container .monaco-button:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.chat-artifacts-widget .artifacts-clear-button-container .monaco-button:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: 1px;
+}
+
+.chat-artifacts-widget .artifacts-clear-button-container .monaco-button .codicon {
+	font-size: 10px;
+	color: var(--vscode-foreground);
+}
+
 .interactive-session .checkpoint-file-changes-summary {
 	display: flex;
 	flex-direction: column;
@@ -2407,7 +2568,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: flex;
 	align-items: center;
 	gap: 4px;
-	margin: 0 0 6px 0;
+	margin: 0 0 14px 0;
 	font-size: 13px;
 
 	/* Tool calls transition from a progress to a collapsible list part, which needs to have this top padding.
@@ -2462,14 +2623,12 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 	/* shimmer animation for shimmer progress */
 	&.shimmer-progress .rendered-markdown.progress-step > p {
-		background: linear-gradient(
-			90deg,
-			var(--vscode-descriptionForeground) 0%,
-			var(--vscode-descriptionForeground) 30%,
-			var(--vscode-chat-thinkingShimmer) 50%,
-			var(--vscode-descriptionForeground) 70%,
-			var(--vscode-descriptionForeground) 100%
-		);
+		background: linear-gradient(90deg,
+				var(--vscode-descriptionForeground) 0%,
+				var(--vscode-descriptionForeground) 30%,
+				var(--vscode-chat-thinkingShimmer) 50%,
+				var(--vscode-descriptionForeground) 70%,
+				var(--vscode-descriptionForeground) 100%);
 		background-size: 400% 100%;
 		background-clip: text;
 		-webkit-background-clip: text;
@@ -2705,7 +2864,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	outline: none;
 	border: none;
 
-	.codicon.codicon-file-media, .codicon.codicon-warning {
+	.codicon.codicon-file-media,
+	.codicon.codicon-warning {
 		font-size: 12px;
 		margin-right: 2px;
 	}
@@ -2900,7 +3060,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		display: none;
 	}
 
-	.interactive-item-container .header.partially-disabled .detail.show-checkmarks {
+	.interactive-item-container.show-checkmarks .header.partially-disabled .detail {
 		margin-left: 4px;
 
 		.codicon-check {
@@ -3210,7 +3370,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	align-items: center;
 	justify-content: center;
 	height: 100%;
-	margin: -1px -8px -1px 0; /* Extend to button edge, accounting for button padding */
+	margin: -1px -8px -1px 0;
+	/* Extend to button edge, accounting for button padding */
 	padding: 0 4px 0 2px;
 	gap: 4px;
 	cursor: pointer;
@@ -3295,7 +3456,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	opacity: 0;
 	transition: opacity 0.15s;
 	color: var(--vscode-descriptionForeground);
-	margin-top: -4px; /* visually center with overlaid top controls */
+	margin-top: -4px;
+	/* visually center with overlaid top controls */
 }
 
 .interactive-item-container.pending-request:hover .chat-pending-drag-handle {
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.ts
index 47fe2a59f2c..15127efd3ad 100644
--- a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.ts
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.ts
@@ -136,13 +136,11 @@ export class ChatContextUsageDetails extends Disposable {
 			this.outputBufferLegend.style.display = 'none';
 		}
 
-		// Color classes based on total spoken-for percentage
-		// (actual usage + remaining reserve)
-		const effectivePercentage = percentage + (outputBufferPercentage ?? 0);
+		// Color classes based on actual usage percentage
 		this.quotaItem.classList.remove('warning', 'error');
-		if (effectivePercentage >= 90) {
+		if (percentage >= 90) {
 			this.quotaItem.classList.add('error');
-		} else if (effectivePercentage >= 75) {
+		} else if (percentage >= 75) {
 			this.quotaItem.classList.add('warning');
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts
index 0bd56a8fe13..f81c8d79f90 100644
--- a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts
@@ -295,21 +295,19 @@ export class ChatContextUsageWidget extends Disposable {
 		// Store current data for use in details popup
 		this.currentData = { usedTokens, completionTokens, totalContextWindow, percentage, outputBufferPercentage, promptTokenDetails };
 
-		// Pie chart shows actual usage + remaining reserve so the user can see
-		// how much of the context window is spoken for.
-		this.progressIndicator.setProgress(percentage + (outputBufferPercentage ?? 0));
+		// Pie chart shows actual usage percentage only
+		this.progressIndicator.setProgress(percentage);
 
 		// Update percentage label and aria-label (clamp display to 100)
 		const roundedPercentage = Math.min(100, Math.round(percentage));
 		this.percentageLabel.textContent = `${roundedPercentage}%`;
 		this.domNode.setAttribute('aria-label', localize('contextUsagePercentageLabel', "Context window usage: {0}%", roundedPercentage));
 
-		// Color based on total spoken-for percentage (usage + remaining reserve)
-		const effectivePercentage = percentage + (outputBufferPercentage ?? 0);
+		// Color based on actual usage percentage
 		this.domNode.classList.remove('warning', 'error');
-		if (effectivePercentage >= 90) {
+		if (percentage >= 90) {
 			this.domNode.classList.add('error');
-		} else if (effectivePercentage >= 75) {
+		} else if (percentage >= 75) {
 			this.domNode.classList.add('warning');
 		}
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts
index e1184c2f82b..10088ac9547 100644
--- a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts
@@ -8,11 +8,12 @@ import { $, addDisposableListener, append, EventHelper, EventType, getWindow, se
 import { StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 import { Button } from '../../../../../../base/browser/ui/button/button.js';
 import { Orientation, Sash } from '../../../../../../base/browser/ui/sash/sash.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { MutableDisposable, toDisposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { autorun, IReader } from '../../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { localize } from '../../../../../../nls.js';
 import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
@@ -97,7 +98,9 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 	private welcomeController: ChatViewWelcomeController | undefined;
 
 	private restoringSession: Promise<void> | undefined;
+	private readonly loadSessionCts = this._register(new MutableDisposable<CancellationTokenSource>());
 	private readonly modelRef = this._register(new MutableDisposable<IChatModelReference>());
+	private readonly _previousModelRef = this._register(new MutableDisposable<IChatModelReference>());
 
 	private readonly activityBadge = this._register(new MutableDisposable());
 
@@ -262,7 +265,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 						try {
 							this._widget.setVisible(false);
 
-							await this.showModel(modelRef);
+							await this.showModel(CancellationToken.None, modelRef);
 						} finally {
 							this._widget.setVisible(wasVisible);
 						}
@@ -627,6 +630,16 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 			}
 		}));
 
+		// When the currently displayed session is archived, start a new session
+		this._register(this.agentSessionsService.model.onDidChangeSessionArchivedState(e => {
+			if (e.isArchived()) {
+				const currentSessionResource = chatWidget.viewModel?.sessionResource;
+				if (currentSessionResource && isEqual(currentSessionResource, e.resource)) {
+					this.clear();
+				}
+			}
+		}));
+
 		// When showing sessions stacked, adjust the height of the sessions list to make room for chat input
 		this._register(autorun(reader => {
 			chatWidget.inputPart.height.read(reader);
@@ -687,29 +700,48 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 	private async _applyModel(): Promise<void> {
 		const sessionResource = this.getTransferredOrPersistedSessionInfo();
 		const modelRef = sessionResource ? await this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, CancellationToken.None) : undefined;
-		await this.showModel(modelRef);
+		await this.showModel(CancellationToken.None, modelRef);
 	}
 
-	private async showModel(modelRef?: IChatModelReference | undefined, startNewSession = true): Promise<IChatModel | undefined> {
+	private async showModel(token: CancellationToken, modelRef?: IChatModelReference | undefined, startNewSession = true): Promise<IChatModel | undefined> {
 		const oldModelResource = this.modelRef.value?.object.sessionResource;
+
+		// Keep the previous model reference alive so its InputModel state (permission level, etc.)
+		// survives until the next session switch. Only the most recent previous session is kept.
+		this._previousModelRef.value = this.modelRef.value;
 		this.modelRef.value = undefined;
 
 		let ref: IChatModelReference | undefined;
 		if (startNewSession) {
 			ref = modelRef ?? (this.chatService.transferredSessionResource
-				? await this.chatService.acquireOrLoadSession(this.chatService.transferredSessionResource, ChatAgentLocation.Chat, CancellationToken.None)
+				? await this.chatService.acquireOrLoadSession(this.chatService.transferredSessionResource, ChatAgentLocation.Chat, token)
 				: this.chatService.startNewLocalSession(ChatAgentLocation.Chat));
 			if (!ref) {
 				throw new Error('Could not start chat session');
 			}
 		}
 
+		if (token.isCancellationRequested) {
+			ref?.dispose();
+			return undefined;
+		}
+
 		this.modelRef.value = ref;
 		const model = ref?.object;
 
+		// If we're switching back to the previously cached model, clear the cache
+		if (model && this._previousModelRef.value?.object.sessionResource.toString() === model.sessionResource.toString()) {
+			this._previousModelRef.value = undefined;
+		}
+
 		if (model) {
 			await this.updateWidgetLockState(getChatSessionType(model.sessionResource)); // Update widget lock state based on session type
 
+			if (token.isCancellationRequested) {
+				this.modelRef.value = undefined;
+				return undefined;
+			}
+
 			// remember as model to restore in view state
 			this.viewState.sessionResource = model.sessionResource;
 		}
@@ -722,9 +754,12 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		// Update the toolbar context with new sessionId
 		this.updateActions();
 
-		// Mark the old model as read when closing
+		// Mark the old model as read when closing unless explicitly marked unread
 		if (oldModelResource) {
-			this.agentSessionsService.model.getSession(oldModelResource)?.setRead(true);
+			const oldSession = this.agentSessionsService.model.getSession(oldModelResource);
+			if (oldSession && !oldSession.isMarkedUnread()) {
+				oldSession.setRead(true);
+			}
 		}
 
 		return model;
@@ -757,46 +792,75 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 	}
 
 	private async clear(): Promise<void> {
+		// Cancel any in-flight loadSession call to prevent it from
+		// overwriting the fresh session we are about to create.
+		this.loadSessionCts.value?.cancel();
 
 		// Grab the widget's latest view state because it will be loaded back into the widget
 		this.updateViewState();
-		await this.showModel(undefined);
+		await this.showModel(CancellationToken.None);
 
 		// Update the toolbar context with new sessionId
 		this.updateActions();
 	}
 
 	async loadSession(sessionResource: URI): Promise<IChatModel | undefined> {
+		// Cancel any in-flight loadSession call so the last one always wins
+		this.loadSessionCts.value?.cancel();
+		const cts = this.loadSessionCts.value = new CancellationTokenSource();
+		const token = cts.token;
+
 		// Wait for any in-progress session restore (e.g. from onDidChangeAgents)
 		// to finish first, so our showModel call is guaranteed to be the last one.
 		if (this.restoringSession) {
 			await this.restoringSession;
 		}
 
+		if (token.isCancellationRequested) {
+			return undefined;
+		}
+
 		return this.progressService.withProgress({ location: ChatViewId, delay: 200 }, async () => {
 			let queue: Promise<void> = Promise.resolve();
 
 			// A delay here to avoid blinking because only Cloud sessions are slow, most others are fast
 			const clearWidget = disposableTimeout(() => {
+				// Only clear the current model if this loadSession call is still the active one
+				// and has not been cancelled. This preserves the "last call wins" behavior.
+				if (token.isCancellationRequested || this.loadSessionCts.value !== cts) {
+					return;
+				}
 				// clear current model without starting a new one
-				queue = this.showModel(undefined, false).then(() => { });
+				queue = this.showModel(token, undefined, false).then(() => { });
 			}, 100);
+			const clearWidgetCancellationListener = token.onCancellationRequested(() => clearWidget.dispose());
 
 			try {
-				const newModelRef = await this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, CancellationToken.None);
+				const newModelRef = await this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, token);
 				clearWidget.dispose();
 				await queue;
 
-				return this.showModel(newModelRef);
+				if (token.isCancellationRequested) {
+					newModelRef?.dispose();
+					return undefined;
+				}
+
+				return this.showModel(token, newModelRef);
 			} catch (err) {
 				clearWidget.dispose();
 				await queue;
 
+				if (token.isCancellationRequested) {
+					return undefined;
+				}
+
 				// Recover by starting a fresh empty session so the widget
 				// is not left in a broken state without title or back button.
 				this.logService.error(`Failed to load chat session '${sessionResource.toString()}'`, err);
 				this.notificationService.error(localize('chat.loadSessionFailed', "Failed to open chat session: {0}", toErrorMessage(err)));
-				return this.showModel(undefined);
+				return this.showModel(token, undefined);
+			} finally {
+				clearWidgetCancellationListener.dispose();
 			}
 		});
 	}
@@ -852,18 +916,25 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		this.lastDimensions = { height, width };
 
 		let remainingHeight = height;
-		let remainingWidth = width;
+		const remainingWidth = width;
+
+		// Title Control
+		const titleHeight = this.titleControl?.getHeight() ?? 0;
+		remainingHeight -= titleHeight;
 
 		// Sessions Control
 		const { heightReduction, widthReduction } = this.layoutSessionsControl(remainingHeight, remainingWidth);
-		remainingHeight -= heightReduction;
-		remainingWidth -= widthReduction;
 
-		// Title Control
-		remainingHeight -= this.titleControl?.getHeight() ?? 0;
+		// In stacked mode the sessions viewer sits above the chat widget, so the
+		// widget's layout height is reduced by `heightReduction`. However, the input
+		// part's max-height needs to be based on the full `remainingHeight` (before
+		// the sessions viewer deduction) so the input can grow freely. As the input
+		// grows, an autorun triggers relayout which shrinks the sessions viewer,
+		// giving the widget more space and converging to the right sizes.
+		this._widget.setInputPartMaxHeightOverride(this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked ? remainingHeight : undefined);
 
 		// Chat Widget
-		this._widget.layout(remainingHeight, remainingWidth);
+		this._widget.layout(remainingHeight - heightReduction, remainingWidth - widthReduction);
 
 		// Remember last dimensions per orientation
 		this.lastDimensionsPerOrientation.set(this.sessionsViewerOrientation, { height, width });
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css
index 53344c162f3..9eecdcc1c5f 100644
--- a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css
@@ -101,6 +101,16 @@
 	flex-shrink: 0;
 }
 
+.chat-context-usage-details .quota-indicator.warning .output-buffer-swatch {
+	background: repeating-linear-gradient(
+		-45deg,
+		var(--vscode-gauge-warningForeground),
+		var(--vscode-gauge-warningForeground) 2px,
+		transparent 2px,
+		transparent 4px
+	);
+}
+
 .chat-context-usage-details .quota-indicator.warning .quota-bar {
 	background-color: var(--vscode-gauge-warningBackground);
 }
@@ -119,6 +129,16 @@
 	);
 }
 
+.chat-context-usage-details .quota-indicator.error .output-buffer-swatch {
+	background: repeating-linear-gradient(
+		-45deg,
+		var(--vscode-gauge-errorForeground),
+		var(--vscode-gauge-errorForeground) 2px,
+		transparent 2px,
+		transparent 4px
+	);
+}
+
 .chat-context-usage-details .quota-indicator.error .quota-bar {
 	background-color: var(--vscode-gauge-errorBackground);
 }
diff --git a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
index b249c635261..64b70535c91 100644
--- a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
@@ -92,7 +92,7 @@ export namespace ChatContextKeys {
 	export const chatSessionIsEmpty = new RawContextKey<boolean>('chatSessionIsEmpty', true, { type: 'boolean', description: localize('chatSessionIsEmpty', "True when the current chat session has no requests.") });
 	export const hasPendingRequests = new RawContextKey<boolean>('chatHasPendingRequests', false, { type: 'boolean', description: localize('chatHasPendingRequests', "True when there are pending requests in the queue.") });
 	export const chatSessionHasDebugData = new RawContextKey<boolean>('chatSessionHasDebugData', false, { type: 'boolean', description: localize('chatSessionHasDebugData', "True when the current chat session has debug log data.") });
-	export const chatSessionHasAttachedDebugData = new RawContextKey<boolean>('chatSessionHasAttachedDebugData', false, { type: 'boolean', description: localize('chatSessionHasAttachedDebugData', "True when a debug events snapshot has been attached in the current chat session.") });
+	export const chatSessionHasDebugTools = new RawContextKey<boolean>('chatSessionHasDebugTools', false, { type: 'boolean', description: localize('chatSessionHasDebugTools', "True when debug tools are enabled in the current chat session.") });
 
 	export const remoteJobCreating = new RawContextKey<boolean>('chatRemoteJobCreating', false, { type: 'boolean', description: localize('chatRemoteJobCreating', "True when a remote coding agent job is being created.") });
 	export const hasRemoteCodingAgent = new RawContextKey<boolean>('hasRemoteCodingAgent', false, localize('hasRemoteCodingAgent', "Whether any remote coding agent is available"));
@@ -131,8 +131,11 @@ export namespace ChatContextKeys {
 	export const agentSessionsViewerPosition = new RawContextKey<number>('agentSessionsViewerPosition', undefined, { type: 'number', description: localize('agentSessionsViewerPosition', "Position of the agent sessions view in the chat view.") });
 	export const agentSessionsViewerVisible = new RawContextKey<boolean>('agentSessionsViewerVisible', undefined, { type: 'boolean', description: localize('agentSessionsViewerVisible', "Visibility of the agent sessions view in the chat view.") });
 	export const agentSessionType = new RawContextKey<string>('chatSessionType', '', { type: 'string', description: localize('agentSessionType', "The type of the current agent session item.") });
+	export const chatSessionSupportsDelegation = new RawContextKey<boolean>('chatSessionSupportsDelegation', true, { type: 'boolean', description: localize('chatSessionSupportsDelegation', "True when the current session type supports delegation.") });
+	export const chatSessionSupportsFork = new RawContextKey<boolean>('chatSessionSupportsFork', false, { type: 'boolean', description: localize('chatSessionSupportsFork', "True when the current chat session provider supports forking conversations.") });
 	export const agentSessionSection = new RawContextKey<string>('agentSessionSection', '', { type: 'string', description: localize('agentSessionSection', "The section of the current agent session section item.") });
 	export const isArchivedAgentSession = new RawContextKey<boolean>('agentSessionIsArchived', false, { type: 'boolean', description: localize('agentSessionIsArchived', "True when the agent session item is archived.") });
+	export const isPinnedAgentSession = new RawContextKey<boolean>('agentSessionIsPinned', false, { type: 'boolean', description: localize('agentSessionIsPinned', "True when the agent session item is pinned.") });
 	export const isReadAgentSession = new RawContextKey<boolean>('agentSessionIsRead', false, { type: 'boolean', description: localize('agentSessionIsRead', "True when the agent session item is read.") });
 	export const hasMultipleAgentSessionsSelected = new RawContextKey<boolean>('agentSessionHasMultipleSelected', false, { type: 'boolean', description: localize('agentSessionHasMultipleSelected', "True when multiple agent sessions are selected.") });
 	export const hasAgentSessionChanges = new RawContextKey<boolean>('agentSessionHasChanges', false, { type: 'boolean', description: localize('agentSessionHasChanges', "True when the current agent session item has changes.") });
diff --git a/src/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.ts b/src/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.ts
index 2b6c01066fe..9b2aadb806a 100644
--- a/src/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.ts
+++ b/src/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.ts
@@ -13,6 +13,17 @@ import { IChatPromptSlashCommand, PromptsStorage } from './promptSyntax/service/
 
 export const IAICustomizationWorkspaceService = createDecorator<IAICustomizationWorkspaceService>('aiCustomizationWorkspaceService');
 
+/**
+ * Extended storage type for AI Customization that includes built-in prompts
+ * shipped with the application, alongside the core `PromptsStorage` values.
+ */
+export type AICustomizationPromptsStorage = PromptsStorage | 'builtin';
+
+/**
+ * Storage type discriminator for built-in customizations shipped with the application.
+ */
+export const BUILTIN_STORAGE: AICustomizationPromptsStorage = 'builtin';
+
 /**
  * Possible section IDs for the AI Customization Management Editor sidebar.
  */
diff --git a/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts b/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts
index f03eea0f2a1..30f30a4c60b 100644
--- a/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts
+++ b/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts
@@ -306,6 +306,9 @@ export interface IAgentFeedbackVariableEntry extends IBaseChatRequestVariableEnt
 		readonly resourceUri: URI;
 		readonly range: IRange;
 		readonly codeSelection?: string;
+		readonly diffHunks?: string;
+		/** When this item was converted from a PR review comment, the original thread ID. */
+		readonly sourcePRReviewCommentId?: string;
 	}>;
 }
 
@@ -317,6 +320,11 @@ export interface IChatRequestDebugEventsVariableEntry extends IBaseChatRequestVa
 	readonly sessionResource: URI;
 }
 
+export interface IChatRequestSessionReferenceVariableEntry extends IBaseChatRequestVariableEntry {
+	readonly kind: 'sessionReference';
+	readonly value: URI;
+}
+
 export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry
 	| ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry
 	| IChatRequestToolEntry | IChatRequestToolSetEntry
@@ -324,7 +332,7 @@ export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChat
 	| IPromptFileVariableEntry | IPromptTextVariableEntry
 	| ISCMHistoryItemVariableEntry | ISCMHistoryItemChangeVariableEntry | ISCMHistoryItemChangeRangeVariableEntry | ITerminalVariableEntry
 	| IChatRequestStringVariableEntry | IChatRequestWorkspaceVariableEntry | IDebugVariableEntry | IAgentFeedbackVariableEntry
-	| IChatRequestDebugEventsVariableEntry;
+	| IChatRequestDebugEventsVariableEntry | IChatRequestSessionReferenceVariableEntry;
 
 export namespace IChatRequestVariableEntry {
 
diff --git a/src/vs/workbench/contrib/chat/common/chatArtifactExtraction.ts b/src/vs/workbench/contrib/chat/common/chatArtifactExtraction.ts
new file mode 100644
index 00000000000..6be6bf9bca4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatArtifactExtraction.ts
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { match as globMatch } from '../../../../base/common/glob.js';
+import { getExtensionForMimeType } from '../../../../base/common/mime.js';
+import { basename as pathBasename } from '../../../../base/common/path.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IChatToolInvocation, IToolResultOutputDetailsSerialized } from './chatService/chatService.js';
+import { ChatResponseResource, IResponse } from './model/chatModel.js';
+import { IArtifactGroupConfig, IChatArtifact } from './tools/chatArtifactsService.js';
+import { isToolResultInputOutputDetails } from './tools/languageModelToolsService.js';
+
+/**
+ * Matches a MIME type against a pattern supporting wildcards.
+ * E.g. `image/*` matches `image/png`, `image/jpeg`, etc.
+ */
+function matchMimeType(pattern: string, mimeType: string): boolean {
+	if (pattern === mimeType) {
+		return true;
+	}
+	const [patternType, patternSubtype] = pattern.split('/');
+	const [type] = mimeType.split('/');
+	return patternSubtype === '*' && patternType === type;
+}
+
+/**
+ * Finds the first matching rule for a file path from byFilePath rules.
+ */
+function findFilePathRule(
+	filePath: string,
+	byFilePath: Record<string, IArtifactGroupConfig>
+): IArtifactGroupConfig | undefined {
+	const fileBasename = pathBasename(filePath);
+	for (const [pattern, config] of Object.entries(byFilePath)) {
+		if (globMatch(pattern, filePath) || globMatch(pattern, fileBasename)) {
+			return config;
+		}
+	}
+	return undefined;
+}
+
+/**
+ * Finds the first matching rule for a MIME type from byMimeType rules.
+ */
+function findMimeTypeRule(
+	mimeType: string,
+	byMimeType: Record<string, IArtifactGroupConfig>
+): IArtifactGroupConfig | undefined {
+	for (const [pattern, config] of Object.entries(byMimeType)) {
+		if (matchMimeType(pattern, mimeType)) {
+			return config;
+		}
+	}
+	return undefined;
+}
+
+function isToolResultOutputDetailsSerialized(obj: unknown): obj is IToolResultOutputDetailsSerialized {
+	return typeof obj === 'object' && obj !== null
+		&& 'output' in obj && typeof (obj as IToolResultOutputDetailsSerialized).output === 'object'
+		&& (obj as IToolResultOutputDetailsSerialized).output?.type === 'data'
+		&& typeof (obj as IToolResultOutputDetailsSerialized).output?.mimeType === 'string';
+}
+
+/**
+ * Extracts artifacts from a single response's content parts, applying the given rules.
+ * Pure function, no side effects.
+ */
+export function extractArtifactsFromResponse(
+	response: IResponse,
+	sessionResource: URI,
+	byMimeType: Record<string, IArtifactGroupConfig>,
+	byFilePath: Record<string, IArtifactGroupConfig>,
+): IChatArtifact[] {
+	const artifacts: IChatArtifact[] = [];
+	const seenUris = new Set<string>();
+
+	for (const part of response.value) {
+		// File writes: codeblockUri
+		if (part.kind === 'codeblockUri') {
+			const uri = part.uri;
+			const uriStr = uri.toString();
+			if (seenUris.has(uriStr)) {
+				continue;
+			}
+			const rule = findFilePathRule(uri.path, byFilePath);
+			if (rule) {
+				seenUris.add(uriStr);
+				artifacts.push({
+					label: basename(uri),
+					uri: uriStr,
+					type: 'plan',
+					groupName: rule.groupName,
+					onlyShowGroup: rule.onlyShowGroup,
+				});
+			}
+		}
+
+		// File writes: textEditGroup
+		if (part.kind === 'textEditGroup') {
+			const uri = part.uri;
+			const uriStr = uri.toString();
+			if (seenUris.has(uriStr)) {
+				continue;
+			}
+			const rule = findFilePathRule(uri.path, byFilePath);
+			if (rule) {
+				seenUris.add(uriStr);
+				artifacts.push({
+					label: basename(uri),
+					uri: uriStr,
+					type: 'plan',
+					groupName: rule.groupName,
+					onlyShowGroup: rule.onlyShowGroup,
+				});
+			}
+		}
+
+		// File writes: workspaceEdit
+		if (part.kind === 'workspaceEdit') {
+			for (const edit of part.edits) {
+				const uri = edit.newResource ?? edit.oldResource;
+				if (!uri) {
+					continue;
+				}
+				const uriStr = uri.toString();
+				if (seenUris.has(uriStr)) {
+					continue;
+				}
+				const rule = findFilePathRule(uri.path, byFilePath);
+				if (rule) {
+					seenUris.add(uriStr);
+					artifacts.push({
+						label: basename(uri),
+						uri: uriStr,
+						type: 'plan',
+						groupName: rule.groupName,
+						onlyShowGroup: rule.onlyShowGroup,
+					});
+				}
+			}
+		}
+
+		// Image results from tool invocations
+		if (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
+			const details = IChatToolInvocation.resultDetails(part);
+			if (!details) {
+				continue;
+			}
+
+			// IToolResultInputOutputDetails — has output array with embedded data parts
+			if (isToolResultInputOutputDetails(details)) {
+				for (let i = 0; i < details.output.length; i++) {
+					const outputPart = details.output[i];
+					if (outputPart.type === 'embed' && !outputPart.isText && outputPart.mimeType) {
+						const rule = findMimeTypeRule(outputPart.mimeType, byMimeType);
+						if (rule) {
+							const key = `${part.toolCallId}:${i}`;
+							if (!seenUris.has(key)) {
+								seenUris.add(key);
+								const ext = getExtensionForMimeType(outputPart.mimeType);
+								const permalinkBasename = ext ? `file${ext}` : 'file.bin';
+								const artifactUri = ChatResponseResource.createUri(sessionResource, part.toolCallId, i, permalinkBasename);
+								artifacts.push({
+									label: outputPart.uri?.path.split('/').pop() ?? `${rule.groupName} ${i + 1}`,
+									uri: artifactUri.toString(),
+									toolCallId: part.toolCallId,
+									dataPartIndex: i,
+									type: 'screenshot',
+									groupName: rule.groupName,
+									onlyShowGroup: rule.onlyShowGroup,
+								});
+							}
+						}
+					}
+				}
+			}
+
+			// IToolResultOutputDetailsSerialized — single output with mimeType + base64Data
+			if (isToolResultOutputDetailsSerialized(details)) {
+				const rule = findMimeTypeRule(details.output.mimeType, byMimeType);
+				if (rule) {
+					const key = `${part.toolCallId}:0`;
+					if (!seenUris.has(key)) {
+						seenUris.add(key);
+						const ext = getExtensionForMimeType(details.output.mimeType);
+						const permalinkBasename = ext ? `file${ext}` : 'file.bin';
+						const artifactUri = ChatResponseResource.createUri(sessionResource, part.toolCallId, 0, permalinkBasename);
+						artifacts.push({
+							label: `${rule.groupName}`,
+							uri: artifactUri.toString(),
+							toolCallId: part.toolCallId,
+							dataPartIndex: 0,
+							type: 'screenshot',
+							groupName: rule.groupName,
+							onlyShowGroup: rule.onlyShowGroup,
+						});
+					}
+				}
+			}
+		}
+	}
+
+	return artifacts;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatDebugEvents.ts b/src/vs/workbench/contrib/chat/common/chatDebugEvents.ts
new file mode 100644
index 00000000000..cd7cdee3a55
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatDebugEvents.ts
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IChatDebugEvent } from './chatDebugService.js';
+
+/**
+ * Descriptions of each debug event kind for the model. Adding a new event kind
+ * to {@link IChatDebugEvent} without adding an entry here will cause a compile error.
+ */
+export const debugEventKindDescriptions: Record<IChatDebugEvent['kind'], string> = {
+	generic: '- generic (category: "discovery"): File discovery for instructions, skills, agents, hooks. Resolving returns a fileList with full file paths, load status, skip reasons, and source folders. Always resolve these for questions about customization files.\n'
+		+ '- generic (other): Miscellaneous logs. Resolving returns additional text details.',
+	toolCall: '- toolCall: A tool invocation. Resolving returns tool name, input, output, status, and duration.',
+	modelTurn: '- modelTurn: An LLM round-trip. Resolving returns model name, token usage, timing, errors, and prompt sections.',
+	subagentInvocation: '- subagentInvocation: A sub-agent spawn. Resolving returns agent name, status, duration, and counts.',
+	userMessage: '- userMessage: The full prompt sent to the model. Resolving returns the complete message and all prompt sections (system prompt, instructions, context). Essential for understanding what the model received.',
+	agentResponse: '- agentResponse: The model\'s response. Resolving returns the full response text and sections.',
+};
+
+/**
+ * Formats debug events into a compact log-style summary for context attachment.
+ */
+export function formatDebugEventsForContext(events: readonly IChatDebugEvent[]): string {
+	const lines: string[] = [];
+	for (const event of events) {
+		const ts = event.created.toISOString();
+		const id = event.id ? ` [id=${event.id}]` : '';
+		switch (event.kind) {
+			case 'generic':
+				lines.push(`[${ts}]${id} ${event.level >= 3 ? 'ERROR' : event.level >= 2 ? 'WARN' : 'INFO'}: ${event.name}${event.details ? ' - ' + event.details : ''}${event.category ? ' (category: ' + event.category + ')' : ''}`);
+				break;
+			case 'toolCall':
+				lines.push(`[${ts}]${id} TOOL_CALL: ${event.toolName}${event.result ? ' result=' + event.result : ''}${event.durationInMillis !== undefined ? ' duration=' + event.durationInMillis + 'ms' : ''}`);
+				break;
+			case 'modelTurn':
+				lines.push(`[${ts}]${id} MODEL_TURN: ${event.requestName ?? 'unknown'}${event.model ? ' model=' + event.model : ''}${event.inputTokens !== undefined ? ' tokens(in=' + event.inputTokens + ',out=' + (event.outputTokens ?? '?') + ')' : ''}${event.durationInMillis !== undefined ? ' duration=' + event.durationInMillis + 'ms' : ''}`);
+				break;
+			case 'subagentInvocation':
+				lines.push(`[${ts}]${id} SUBAGENT: ${event.agentName}${event.status ? ' status=' + event.status : ''}${event.durationInMillis !== undefined ? ' duration=' + event.durationInMillis + 'ms' : ''}`);
+				break;
+			case 'userMessage':
+				lines.push(`[${ts}]${id} USER_MESSAGE: ${event.message.substring(0, 200)}${event.message.length > 200 ? '...' : ''} (${event.sections.length} sections)`);
+				break;
+			case 'agentResponse':
+				lines.push(`[${ts}]${id} AGENT_RESPONSE: ${event.message.substring(0, 200)}${event.message.length > 200 ? '...' : ''} (${event.sections.length} sections)`);
+				break;
+			default: {
+				const _: never = event;
+				void _;
+				break;
+			}
+		}
+	}
+	return lines.join('\n');
+}
+
+/**
+ * Constructs the model description for the debug events attachment,
+ * explaining to the model how to use the resolveDebugEventDetails tool.
+ */
+export function getDebugEventsModelDescription(): string {
+	return 'These are the debug event logs from the current chat conversation. Analyze them to help answer the user\'s troubleshooting question.\n'
+		+ '\n'
+		+ 'CRITICAL INSTRUCTION: You MUST call the resolveDebugEventDetails tool on relevant events BEFORE answering. The log lines below are only summaries — they do NOT contain the actual data (file paths, prompt content, tool I/O, etc.). The real information is only available by resolving events. Never answer based solely on the summary lines. Always resolve first, then answer.\n'
+		+ '\n'
+		+ 'Call resolveDebugEventDetails in parallel on all events that could be relevant to the user\'s question. When in doubt, resolve more events rather than fewer.\n'
+		+ '\n'
+		+ 'IMPORTANT: Do NOT mention event IDs, tool resolution steps, or internal debug mechanics in your response. The user does not know about debug events or event IDs. Present your findings directly and naturally, as if you simply know the answer. Never say things like "I need to resolve events" or show event IDs.\n'
+		+ '\n'
+		+ 'Event types and what resolving them returns:\n'
+		+ Object.values(debugEventKindDescriptions).join('\n');
+}
+
+/**
+ * Checks whether a debug event matches a single text search term.
+ * Used by both the debug panel filter and the listDebugEvents tool.
+ */
+export function debugEventMatchesText(event: IChatDebugEvent, term: string): boolean {
+	if (event.kind.toLowerCase().includes(term)) {
+		return true;
+	}
+	switch (event.kind) {
+		case 'toolCall':
+			return event.toolName.toLowerCase().includes(term)
+				|| (event.input?.toLowerCase().includes(term) ?? false)
+				|| (event.output?.toLowerCase().includes(term) ?? false);
+		case 'modelTurn':
+			return (event.model?.toLowerCase().includes(term) ?? false)
+				|| (event.requestName?.toLowerCase().includes(term) ?? false);
+		case 'generic':
+			return event.name.toLowerCase().includes(term)
+				|| (event.details?.toLowerCase().includes(term) ?? false)
+				|| (event.category?.toLowerCase().includes(term) ?? false);
+		case 'subagentInvocation':
+			return event.agentName.toLowerCase().includes(term)
+				|| (event.description?.toLowerCase().includes(term) ?? false);
+		case 'userMessage':
+		case 'agentResponse':
+			return event.message.toLowerCase().includes(term)
+				|| event.sections.some(s => s.name.toLowerCase().includes(term) || s.content.toLowerCase().includes(term));
+	}
+}
+
+/**
+ * Regex used to match `before:` and `after:` timestamp tokens inside filter text.
+ */
+const timestampTokenPattern = /\b(?:before|after):\d{4}(?:-\d{2}(?:-\d{2}(?:t\d{1,2}(?::\d{2}(?::\d{2})?)?)?)?)?(\b|$)/g;
+
+/**
+ * Parse a `before:YYYY[-MM[-DD[THH[:MM[:SS]]]]]` or `after:…` token from
+ * free-form filter text. Each component after the year is optional.
+ *
+ * For `before:`, the timestamp is rounded **up** to the end of the most
+ * specific unit given (e.g. `before:2026-03` → end-of-March).
+ * For `after:`, the timestamp is the **start** of the most specific unit.
+ */
+export function parseTimeToken(text: string, prefix: string): number | undefined {
+	const regex = new RegExp(`${prefix}:(\\d{4})(?:-(\\d{2})(?:-(\\d{2})(?:t(\\d{1,2})(?::(\\d{2})(?::(\\d{2}))?)?)?)?)?(?!\\w)`);
+	const m = regex.exec(text);
+	if (!m) {
+		return undefined;
+	}
+
+	const year = parseInt(m[1], 10);
+	const month = m[2] !== undefined ? parseInt(m[2], 10) - 1 : undefined;
+	const day = m[3] !== undefined ? parseInt(m[3], 10) : undefined;
+	const hour = m[4] !== undefined ? parseInt(m[4], 10) : undefined;
+	const minute = m[5] !== undefined ? parseInt(m[5], 10) : undefined;
+	const second = m[6] !== undefined ? parseInt(m[6], 10) : undefined;
+
+	if (prefix === 'before') {
+		if (second !== undefined) {
+			return new Date(year, month!, day!, hour!, minute!, second, 999).getTime();
+		} else if (minute !== undefined) {
+			return new Date(year, month!, day!, hour!, minute, 59, 999).getTime();
+		} else if (hour !== undefined) {
+			return new Date(year, month!, day!, hour, 59, 59, 999).getTime();
+		} else if (day !== undefined) {
+			return new Date(year, month!, day, 23, 59, 59, 999).getTime();
+		} else if (month !== undefined) {
+			return new Date(year, month + 1, 0, 23, 59, 59, 999).getTime();
+		} else {
+			return new Date(year, 11, 31, 23, 59, 59, 999).getTime();
+		}
+	} else {
+		return new Date(
+			year,
+			month ?? 0,
+			day ?? 1,
+			hour ?? 0,
+			minute ?? 0,
+			second ?? 0,
+			0,
+		).getTime();
+	}
+}
+
+/**
+ * Strips `before:…` and `after:…` timestamp tokens from filter text,
+ * returning only the plain text search portion.
+ */
+export function stripTimestampTokens(text: string): string {
+	return text.replace(timestampTokenPattern, '').trim();
+}
+
+/**
+ * Filters debug events by comma-separated text terms and optional
+ * `before:`/`after:` timestamp tokens.
+ *
+ * Terms prefixed with `!` are exclusions; all others are inclusions.
+ * At least one inclusion term must match (if any are present).
+ * Timestamp tokens are parsed and applied as date-range bounds, then
+ * stripped before text matching.
+ */
+export function filterDebugEventsByText(events: readonly IChatDebugEvent[], filterText: string): readonly IChatDebugEvent[] {
+	const beforeTimestamp = parseTimeToken(filterText, 'before');
+	const afterTimestamp = parseTimeToken(filterText, 'after');
+
+	// Strip timestamp tokens before splitting into text search terms
+	const textOnly = stripTimestampTokens(filterText);
+	const terms = textOnly.split(/\s*,\s*/).filter(t => t.length > 0);
+	const includeTerms = terms.filter(t => !t.startsWith('!')).map(t => t.trim());
+	const excludeTerms = terms.filter(t => t.startsWith('!')).map(t => t.slice(1).trim()).filter(t => t.length > 0);
+
+	return events.filter(e => {
+		// Timestamp bounds
+		const time = e.created.getTime();
+		if (beforeTimestamp !== undefined && time > beforeTimestamp) {
+			return false;
+		}
+		if (afterTimestamp !== undefined && time < afterTimestamp) {
+			return false;
+		}
+		// Text matching
+		if (excludeTerms.some(term => debugEventMatchesText(e, term))) {
+			return false;
+		}
+		if (includeTerms.length > 0) {
+			return includeTerms.some(term => debugEventMatchesText(e, term));
+		}
+		return true;
+	});
+}
+
+/**
+ * Description of the text filter syntax for tool schemas and documentation.
+ */
+export const debugEventFilterDescription = 'Comma-separated text search terms. Prefix a term with ! to exclude it. Matches against event kind, tool names, model names, agent names, categories, event names, and message content. Also supports before:YYYY[-MM[-DD[THH[:MM[:SS]]]]] and after:YYYY[-MM[-DD[THH[:MM[:SS]]]]] to filter by timestamp.';
+
+export interface DebugEventFilterOptions {
+	readonly kind?: string;
+	readonly filter?: string;
+	readonly limit?: number;
+}
+
+/**
+ * Applies kind, text, and limit filters to debug events.
+ * Used by the listDebugEvents tool to consolidate all filtering in one place.
+ */
+export function filterDebugEvents(events: readonly IChatDebugEvent[], options: DebugEventFilterOptions): readonly IChatDebugEvent[] {
+	let result = events;
+
+	if (options.kind) {
+		result = result.filter(e => e.kind === options.kind);
+	}
+
+	if (options.filter) {
+		result = filterDebugEventsByText(result, options.filter);
+	}
+
+	if (options.limit !== undefined && options.limit > 0 && result.length > options.limit) {
+		result = result.slice(result.length - options.limit);
+	}
+
+	return result;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatDebugService.ts b/src/vs/workbench/contrib/chat/common/chatDebugService.ts
index d97213d3f3e..e54c6abc168 100644
--- a/src/vs/workbench/contrib/chat/common/chatDebugService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatDebugService.ts
@@ -19,6 +19,18 @@ export enum ChatDebugLogLevel {
 	Error = 3
 }
 
+/**
+ * The result of a hook execution.
+ */
+export enum ChatDebugHookResult {
+	/** The hook executed successfully (exit code 0). */
+	Success = 0,
+	/** The hook returned a blocking error (exit code 2). */
+	Error = 1,
+	/** The hook returned a non-blocking warning (other non-zero exit codes). */
+	NonBlockingError = 2
+}
+
 /**
  * Common properties shared by all chat debug event types.
  */
@@ -331,10 +343,26 @@ export interface IChatDebugEventModelTurnContent {
 	readonly sections?: readonly IChatDebugMessageSection[];
 }
 
+/**
+ * Structured hook execution content for a resolved debug event.
+ * Contains the hook type, command, input, output, and result for rich rendering.
+ */
+export interface IChatDebugEventHookContent {
+	readonly kind: 'hook';
+	readonly hookType: string;
+	readonly command?: string;
+	readonly result?: ChatDebugHookResult;
+	readonly durationInMillis?: number;
+	readonly input?: string;
+	readonly output?: string;
+	readonly exitCode?: number;
+	readonly errorMessage?: string;
+}
+
 /**
  * Union of all resolved event content types.
  */
-export type IChatDebugResolvedEventContent = IChatDebugEventTextContent | IChatDebugEventFileListContent | IChatDebugEventMessageContent | IChatDebugEventToolCallContent | IChatDebugEventModelTurnContent;
+export type IChatDebugResolvedEventContent = IChatDebugEventTextContent | IChatDebugEventFileListContent | IChatDebugEventMessageContent | IChatDebugEventToolCallContent | IChatDebugEventModelTurnContent | IChatDebugEventHookContent;
 
 /**
  * Provider interface for debug events.
diff --git a/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.ts
index c80186d968d..60d45fe1f8d 100644
--- a/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.ts
@@ -3,24 +3,94 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { timeout } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
+import { extUri } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ChatDebugLogLevel, IChatDebugEvent, IChatDebugLogProvider, IChatDebugResolvedEventContent, IChatDebugService } from './chatDebugService.js';
 import { LocalChatSessionUri } from './model/chatUri.js';
 
+/**
+ * Per-session circular buffer for debug events.
+ * Stores up to `capacity` events using a ring buffer.
+ */
+class SessionEventBuffer {
+	private readonly _buffer: (IChatDebugEvent | undefined)[];
+	private _head = 0;
+	private _size = 0;
+
+	constructor(readonly capacity: number) {
+		this._buffer = new Array(capacity);
+	}
+
+	get size(): number {
+		return this._size;
+	}
+
+	push(event: IChatDebugEvent): void {
+		const idx = (this._head + this._size) % this.capacity;
+		this._buffer[idx] = event;
+		if (this._size < this.capacity) {
+			this._size++;
+		} else {
+			this._head = (this._head + 1) % this.capacity;
+		}
+	}
+
+	/** Return events in insertion order. */
+	toArray(): IChatDebugEvent[] {
+		const result: IChatDebugEvent[] = [];
+		for (let i = 0; i < this._size; i++) {
+			const event = this._buffer[(this._head + i) % this.capacity];
+			if (event) {
+				result.push(event);
+			}
+		}
+		return result;
+	}
+
+	/** Remove events matching the predicate and compact in-place. */
+	removeWhere(predicate: (event: IChatDebugEvent) => boolean): void {
+		let write = 0;
+		for (let i = 0; i < this._size; i++) {
+			const idx = (this._head + i) % this.capacity;
+			const event = this._buffer[idx];
+			if (event && predicate(event)) {
+				continue;
+			}
+			if (write !== i) {
+				const writeIdx = (this._head + write) % this.capacity;
+				this._buffer[writeIdx] = event;
+			}
+			write++;
+		}
+		for (let i = write; i < this._size; i++) {
+			this._buffer[(this._head + i) % this.capacity] = undefined;
+		}
+		this._size = write;
+	}
+
+	clear(): void {
+		this._buffer.fill(undefined);
+		this._head = 0;
+		this._size = 0;
+	}
+}
+
 export class ChatDebugServiceImpl extends Disposable implements IChatDebugService {
 	declare readonly _serviceBrand: undefined;
 
-	private static readonly MAX_EVENTS = 10_000;
+	static readonly MAX_EVENTS_PER_SESSION = 10_000;
+	static readonly MAX_SESSIONS = 5;
 
-	// Circular buffer: fixed-size array with head/size tracking for O(1) append.
-	private readonly _buffer: (IChatDebugEvent | undefined)[] = new Array(ChatDebugServiceImpl.MAX_EVENTS);
-	private _head = 0;  // index of the oldest element
-	private _size = 0;  // number of elements currently stored
+	/** Per-session event buffers. Ordered from oldest to newest session (LRU). */
+	private readonly _sessionBuffers = new ResourceMap<SessionEventBuffer>();
+	/** Ordered list of session URIs for LRU eviction. */
+	private readonly _sessionOrder: URI[] = [];
 
 	private readonly _onDidAddEvent = this._register(new Emitter<IChatDebugEvent>());
 	readonly onDidAddEvent: Event<IChatDebugEvent> = this._onDidAddEvent.event;
@@ -39,7 +109,7 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 	/** Events that were returned by providers (not internally logged). */
 	private readonly _providerEvents = new WeakSet<IChatDebugEvent>();
 
-	/** Session URIs created via import, allowed through the invokeProviders guard. */
+	/** Session URIs created via import. */
 	private readonly _importedSessions = new ResourceMap<boolean>();
 
 	/** Human-readable titles for imported sessions. */
@@ -47,8 +117,20 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 
 	activeSessionResource: URI | undefined;
 
+	/** Schemes eligible for debug logging and provider invocation. */
+	private static readonly _debugEligibleSchemes = new Set([
+		LocalChatSessionUri.scheme,	// vscode-chat-session (local sessions)
+		'copilotcli',				// Copilot CLI background sessions
+		'claude-code',				// Claude Code CLI sessions
+	]);
+
+	private _isDebugEligibleSession(sessionResource: URI): boolean {
+		return ChatDebugServiceImpl._debugEligibleSchemes.has(sessionResource.scheme)
+			|| this._importedSessions.has(sessionResource);
+	}
+
 	log(sessionResource: URI, name: string, details?: string, level: ChatDebugLogLevel = ChatDebugLogLevel.Info, options?: { id?: string; category?: string; parentEventId?: string }): void {
-		if (!LocalChatSessionUri.isLocalSession(sessionResource)) {
+		if (!this._isDebugEligibleSession(sessionResource)) {
 			return;
 		}
 		this.addEvent({
@@ -65,13 +147,25 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 	}
 
 	addEvent(event: IChatDebugEvent): void {
-		const idx = (this._head + this._size) % ChatDebugServiceImpl.MAX_EVENTS;
-		this._buffer[idx] = event;
-		if (this._size < ChatDebugServiceImpl.MAX_EVENTS) {
-			this._size++;
+		let buffer = this._sessionBuffers.get(event.sessionResource);
+		if (!buffer) {
+			// Evict least-recently-used session if we are at the session cap.
+			if (this._sessionOrder.length >= ChatDebugServiceImpl.MAX_SESSIONS) {
+				const evicted = this._sessionOrder.shift()!;
+				this._evictSession(evicted);
+			}
+			buffer = new SessionEventBuffer(ChatDebugServiceImpl.MAX_EVENTS_PER_SESSION);
+			this._sessionBuffers.set(event.sessionResource, buffer);
+			this._sessionOrder.push(event.sessionResource);
 		} else {
-			this._head = (this._head + 1) % ChatDebugServiceImpl.MAX_EVENTS;
+			// Move to end of LRU order so actively-used sessions are not evicted.
+			const idx = this._sessionOrder.findIndex(u => extUri.isEqual(u, event.sessionResource));
+			if (idx !== -1 && idx !== this._sessionOrder.length - 1) {
+				this._sessionOrder.splice(idx, 1);
+				this._sessionOrder.push(event.sessionResource);
+			}
 		}
+		buffer.push(event);
 		this._onDidAddEvent.fire(event);
 	}
 
@@ -81,15 +175,14 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 	}
 
 	getEvents(sessionResource?: URI): readonly IChatDebugEvent[] {
-		const result: IChatDebugEvent[] = [];
-		const key = sessionResource?.toString();
-		for (let i = 0; i < this._size; i++) {
-			const event = this._buffer[(this._head + i) % ChatDebugServiceImpl.MAX_EVENTS];
-			if (!event) {
-				continue;
-			}
-			if (!key || event.sessionResource.toString() === key) {
-				result.push(event);
+		let result: IChatDebugEvent[];
+		if (sessionResource) {
+			const buffer = this._sessionBuffers.get(sessionResource);
+			result = buffer ? buffer.toArray() : [];
+		} else {
+			result = [];
+			for (const buffer of this._sessionBuffers.values()) {
+				result.push(...buffer.toArray());
 			}
 		}
 		result.sort((a, b) => a.created.getTime() - b.created.getTime());
@@ -97,26 +190,29 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 	}
 
 	getSessionResources(): readonly URI[] {
-		const seen = new ResourceMap<boolean>();
-		const result: URI[] = [];
-		for (let i = 0; i < this._size; i++) {
-			const event = this._buffer[(this._head + i) % ChatDebugServiceImpl.MAX_EVENTS];
-			if (!event) {
-				continue;
-			}
-			if (!seen.has(event.sessionResource)) {
-				seen.set(event.sessionResource, true);
-				result.push(event.sessionResource);
-			}
-		}
-		return result;
+		return [...this._sessionOrder];
 	}
 
 	clear(): void {
-		this._buffer.fill(undefined);
-		this._head = 0;
-		this._size = 0;
+		this._sessionBuffers.clear();
+		this._sessionOrder.length = 0;
 		this._debugDataAttachedSessions.clear();
+		this._importedSessions.clear();
+		this._importedSessionTitles.clear();
+	}
+
+	/** Remove all ancillary state for an evicted session. */
+	private _evictSession(sessionResource: URI): void {
+		this._sessionBuffers.delete(sessionResource);
+		this._importedSessions.delete(sessionResource);
+		this._importedSessionTitles.delete(sessionResource);
+		this._debugDataAttachedSessions.delete(sessionResource);
+		const cts = this._invocationCts.get(sessionResource);
+		if (cts) {
+			cts.cancel();
+			cts.dispose();
+			this._invocationCts.delete(sessionResource);
+		}
 	}
 
 	registerProvider(provider: IChatDebugLogProvider): IDisposable {
@@ -142,7 +238,7 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 
 	async invokeProviders(sessionResource: URI): Promise<void> {
 
-		if (!LocalChatSessionUri.isLocalSession(sessionResource) && !this._importedSessions.has(sessionResource)) {
+		if (!this._isDebugEligibleSession(sessionResource)) {
 			return;
 		}
 		// Cancel only the previous invocation for THIS session, not others.
@@ -180,11 +276,21 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 		try {
 			const events = await provider.provideChatDebugLog(sessionResource, token);
 			if (events) {
-				for (const event of events) {
+				// Yield to the event loop periodically so the UI stays
+				// responsive when a provider returns a large batch of events
+				// (e.g. importing a multi-MB log file).
+				const BATCH_SIZE = 500;
+				for (let i = 0; i < events.length; i++) {
+					if (token.isCancellationRequested) {
+						break;
+					}
 					this.addProviderEvent({
-						...event,
-						sessionResource: event.sessionResource ?? sessionResource,
+						...events[i],
+						sessionResource: events[i].sessionResource ?? sessionResource,
 					});
+					if (i > 0 && i % BATCH_SIZE === 0) {
+						await timeout(0);
+					}
 				}
 			}
 		} catch (err) {
@@ -203,26 +309,10 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 	}
 
 	private _clearProviderEvents(sessionResource: URI): void {
-		const key = sessionResource.toString();
-		// Compact the ring buffer in-place, removing matching provider events.
-		let write = 0;
-		for (let i = 0; i < this._size; i++) {
-			const idx = (this._head + i) % ChatDebugServiceImpl.MAX_EVENTS;
-			const event = this._buffer[idx];
-			if (event && this._providerEvents.has(event) && event.sessionResource.toString() === key) {
-				continue; // skip — this event is removed
-			}
-			if (write !== i) {
-				const writeIdx = (this._head + write) % ChatDebugServiceImpl.MAX_EVENTS;
-				this._buffer[writeIdx] = event;
-			}
-			write++;
+		const buffer = this._sessionBuffers.get(sessionResource);
+		if (buffer) {
+			buffer.removeWhere(event => this._providerEvents.has(event));
 		}
-		// Clear trailing slots and update size
-		for (let i = write; i < this._size; i++) {
-			this._buffer[(this._head + i) % ChatDebugServiceImpl.MAX_EVENTS] = undefined;
-		}
-		this._size = write;
 		this._onDidClearProviderEvents.fire(sessionResource);
 	}
 
@@ -304,6 +394,8 @@ export class ChatDebugServiceImpl extends Disposable implements IChatDebugServic
 			cts.dispose();
 		}
 		this._invocationCts.clear();
+		this.clear();
+		this._providers.clear();
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatImageExtraction.ts b/src/vs/workbench/contrib/chat/common/chatImageExtraction.ts
new file mode 100644
index 00000000000..08af9fbd6d2
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatImageExtraction.ts
@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { decodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
+import { getExtensionForMimeType, getMediaMime } from '../../../../base/common/mime.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { isLocation } from '../../../../editor/common/languages.js';
+import { IChatResponseViewModel, IChatRequestViewModel, isRequestVM } from './model/chatViewModel.js';
+import { ChatResponseResource } from './model/chatModel.js';
+import { IChatContentInlineReference, IChatToolInvocation, IChatToolInvocationSerialized, IToolResultOutputDetailsSerialized } from './chatService/chatService.js';
+import { isToolResultInputOutputDetails, isToolResultOutputDetails, IToolResultOutputDetails } from './tools/languageModelToolsService.js';
+import { isImageVariableEntry } from './attachments/chatVariableEntries.js';
+
+export interface IChatExtractedImage {
+	readonly id: string;
+	readonly uri: URI;
+	readonly name: string;
+	readonly mimeType: string;
+	readonly data: VSBuffer;
+	readonly source: string;
+	readonly caption: string | undefined;
+}
+
+export interface IChatExtractedImageCollection {
+	readonly id: string;
+	readonly title: string;
+	readonly images: IChatExtractedImage[];
+}
+
+/**
+ * Extract all images from a chat response's tool invocations and inline references.
+ * Tool invocation images are extracted from output details and message URIs.
+ * Inline reference images (file URIs) are read via the provided {@link readFile} callback.
+ */
+export async function extractImagesFromChatResponse(
+	response: IChatResponseViewModel,
+	readFile: (uri: URI) => Promise<VSBuffer>,
+): Promise<IChatExtractedImageCollection> {
+	const allImages: IChatExtractedImage[] = [];
+
+	for (const item of response.response.value) {
+		if (item.kind === 'toolInvocation' || item.kind === 'toolInvocationSerialized') {
+			const images = extractImagesFromToolInvocationOutputDetails(item, response.sessionResource);
+			allImages.push(...images);
+			const messageImages = await extractImagesFromToolInvocationMessages(item, readFile);
+			allImages.push(...messageImages);
+		} else if (item.kind === 'inlineReference') {
+			const image = await extractImageFromInlineReference(item, readFile);
+			if (image) {
+				allImages.push(image);
+			}
+		}
+	}
+
+	// Use the corresponding user request as the carousel title
+	const request = response.session.getItems().find((item): item is IChatRequestViewModel => isRequestVM(item) && item.id === response.requestId);
+	const title = request ? request.messageText : localize('chatImageExtraction.defaultTitle', "Images");
+
+	return {
+		id: response.sessionResource.toString() + '_' + response.id,
+		title,
+		images: allImages,
+	};
+}
+
+export function extractImagesFromToolInvocationOutputDetails(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, sessionResource: URI): IChatExtractedImage[] {
+	const images: IChatExtractedImage[] = [];
+
+	const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
+
+	const msg = toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage;
+	const caption = msg ? (typeof msg === 'string' ? msg : msg.value) : undefined;
+	const pushImage = (mimeType: string, data: VSBuffer, outputIndex: number) => {
+		const ext = getExtensionForMimeType(mimeType);
+		const permalinkBasename = ext ? `file${ext}` : 'file.bin';
+		const uri = ChatResponseResource.createUri(sessionResource, toolInvocation.toolCallId, outputIndex, permalinkBasename);
+		images.push({
+			id: `${toolInvocation.toolCallId}_${outputIndex}`,
+			uri,
+			name: localize('chatImageExtraction.imageName', "Image {0}", images.length + 1),
+			mimeType,
+			data,
+			source: localize('chatImageExtraction.toolSource', "Tool: {0}", toolInvocation.toolId),
+			caption,
+		});
+	};
+
+	if (isToolResultInputOutputDetails(resultDetails)) {
+		for (let i = 0; i < resultDetails.output.length; i++) {
+			const outputItem = resultDetails.output[i];
+			if (outputItem.type === 'embed' && outputItem.mimeType?.startsWith('image/') && !outputItem.isText) {
+				pushImage(outputItem.mimeType, decodeBase64(outputItem.value), i);
+			}
+		}
+	}
+	else if (isToolResultOutputDetails(resultDetails)) {
+		const output = resultDetails.output;
+		if (output.mimeType?.startsWith('image/')) {
+			const data = getImageDataFromOutputDetails(resultDetails, toolInvocation);
+			if (data) {
+				pushImage(output.mimeType, data, 0);
+			}
+		}
+	}
+
+	return images;
+}
+
+export async function extractImagesFromToolInvocationMessages(
+	toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+	readFile: (uri: URI) => Promise<VSBuffer>
+): Promise<IChatExtractedImage[]> {
+	// Use pastTenseMessage if available, otherwise fall back to invocationMessage.
+	// When pastTenseMessage exists it visually replaces invocationMessage in the UI,
+	// so we only look at its URIs — we don't fall back to invocationMessage URIs.
+	const message = toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage;
+	if (!message || typeof message === 'string' || !message.uris || Object.keys(message.uris).length === 0) {
+		return [];
+	}
+
+	const images: IChatExtractedImage[] = [];
+	for (const uriComponents of Object.values(message.uris)) {
+		const uri = URI.revive(uriComponents);
+		const mimeType = getMediaMime(uri.path);
+		if (mimeType?.startsWith('image/')) {
+			let data: VSBuffer;
+			try {
+				data = await readFile(uri);
+			} catch {
+				continue;
+			}
+			const name = uri.path.split('/').pop() ?? 'image';
+			images.push({
+				id: uri.toString(),
+				uri,
+				name,
+				mimeType,
+				data,
+				source: localize('chatImageExtraction.toolSource', "Tool: {0}", toolInvocation.toolId),
+				caption: message.value,
+			});
+		}
+	}
+	return images;
+}
+
+function getImageDataFromOutputDetails(resultDetails: IToolResultOutputDetails, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): VSBuffer | undefined {
+	if (toolInvocation.kind === 'toolInvocationSerialized') {
+		const serializedDetails = resultDetails as unknown as IToolResultOutputDetailsSerialized;
+		if (serializedDetails.output.base64Data) {
+			return decodeBase64(serializedDetails.output.base64Data);
+		}
+		return undefined;
+	} else {
+		return resultDetails.output.value;
+	}
+}
+
+async function extractImageFromInlineReference(
+	part: IChatContentInlineReference,
+	readFile: (uri: URI) => Promise<VSBuffer>,
+): Promise<IChatExtractedImage | undefined> {
+	const ref = part.inlineReference;
+	const refUri = URI.isUri(ref) ? ref : isLocation(ref) ? ref.uri : ref.location.uri;
+	const mime = getMediaMime(refUri.path);
+	if (!mime?.startsWith('image/')) {
+		return undefined;
+	}
+
+	let data: VSBuffer;
+	try {
+		data = await readFile(refUri);
+	} catch {
+		return undefined;
+	}
+	const name = part.name ?? refUri.path.split('/').pop() ?? 'image';
+	return {
+		id: refUri.toString(),
+		uri: refUri,
+		name,
+		mimeType: mime,
+		data,
+		source: localize('chatImageExtraction.inlineReference', "File"),
+		caption: undefined,
+	};
+}
+
+export function coerceImageBuffer(value: unknown): Uint8Array | undefined {
+	return value instanceof Uint8Array
+		? value
+		: value instanceof ArrayBuffer
+			? new Uint8Array(value)
+			: (value && typeof value === 'object' && !Array.isArray(value))
+				? new Uint8Array(
+					Object.keys(value as Record<string, number>)
+						.sort((a, b) => Number(a) - Number(b))
+						.map(key => (value as Record<string, number>)[key])
+				)
+				: undefined;
+}
+
+/**
+ * Extract images from a chat request's variable attachments (user-attached images).
+ */
+export function extractImagesFromChatRequest(
+	request: IChatRequestViewModel,
+): IChatExtractedImage[] {
+	const images: IChatExtractedImage[] = [];
+	for (const variable of request.variables) {
+		if (!isImageVariableEntry(variable)) {
+			continue;
+		}
+		const buffer = coerceImageBuffer(variable.value);
+		if (!buffer) {
+			continue;
+		}
+		const mimeType = variable.mimeType ?? getMediaMime(variable.name) ?? 'image/png';
+		const uri = variable.references?.[0]?.reference;
+		const imageUri = URI.isUri(uri) ? uri : URI.from({ scheme: 'data', path: variable.name });
+		images.push({
+			id: imageUri.toString(),
+			uri: imageUri,
+			name: variable.name,
+			mimeType,
+			data: VSBuffer.wrap(buffer),
+			source: localize('chatImageExtraction.userAttachment', "Attachment"),
+			caption: undefined,
+		});
+	}
+	return images;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatModes.ts b/src/vs/workbench/contrib/chat/common/chatModes.ts
index c13b64519ee..3cc258c5d9c 100644
--- a/src/vs/workbench/contrib/chat/common/chatModes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModes.ts
@@ -452,7 +452,7 @@ export class CustomChatMode implements IChatMode {
 
 type IChatModeSourceData =
 	| { readonly storage: PromptsStorage.extension; readonly extensionId: string; type?: ExtensionAgentSourceType }
-	| { readonly storage: PromptsStorage.local | PromptsStorage.user }
+	| { readonly storage: PromptsStorage.local | PromptsStorage.user | PromptsStorage.internal }
 	| { readonly storage: PromptsStorage.plugin; readonly pluginUri: URI };
 
 function isChatModeSourceData(value: unknown): value is IChatModeSourceData {
@@ -466,7 +466,7 @@ function isChatModeSourceData(value: unknown): value is IChatModeSourceData {
 	if (data.storage === PromptsStorage.plugin) {
 		return isUriComponents(data.pluginUri);
 	}
-	return data.storage === PromptsStorage.local || data.storage === PromptsStorage.user;
+	return data.storage === PromptsStorage.local || data.storage === PromptsStorage.user || data.storage === PromptsStorage.internal;
 }
 
 function serializeChatModeSource(source: IAgentSource | undefined): IChatModeSourceData | undefined {
@@ -492,6 +492,9 @@ function reviveChatModeSource(data: IChatModeSourceData | undefined): IAgentSour
 	if (data.storage === PromptsStorage.plugin) {
 		return { storage: PromptsStorage.plugin, pluginUri: URI.revive(data.pluginUri) };
 	}
+	if (data.storage === PromptsStorage.internal) {
+		return { storage: PromptsStorage.internal };
+	}
 	return { storage: data.storage };
 }
 
@@ -560,3 +563,82 @@ export function getModeNameForTelemetry(mode: IChatMode): string {
 	}
 	return mode.name.get();
 }
+
+/**
+ * Generates a stable identifier for a handoff by combining the target agent
+ * name with a slugified version of the display label.
+ *
+ * Within a single source agent, the combination of `agent` + `label` must be
+ * unique for IDs to be unambiguous.
+ *
+ * @example
+ * ```
+ * getHandoffId({ agent: 'agent', label: 'Continue', prompt: '...' })
+ * // => 'agent:continue'
+ * ```
+ */
+export function getHandoffId(handoff: IHandOff): string {
+	const slug = handoff.label.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
+	return `${handoff.agent}:${slug}`;
+}
+
+/**
+ * Describes a single handoff defined in a custom agent's `.agent.md` file.
+ */
+export interface IHandoffInfo {
+	/** Stable identifier for programmatic matching (format: `<agent>:<slugified-label>`). */
+	readonly id: string;
+	readonly label: string;
+	readonly agent: string;
+	readonly prompt: string;
+	readonly send?: boolean;
+	readonly showContinueOn?: boolean;
+	readonly model?: string;
+}
+
+/**
+ * Describes a custom agent (or built-in mode) and the handoffs it defines.
+ */
+export interface ICustomAgentInfo {
+	readonly id: string;
+	readonly name: string;
+	readonly isBuiltin: boolean;
+	readonly visibility: {
+		readonly userInvocable: boolean;
+		readonly agentInvocable: boolean;
+	};
+	readonly handoffs: IHandoffInfo[];
+}
+
+/**
+ * Builds an array of {@link ICustomAgentInfo} with handoff metadata for the given agents/modes.
+ *
+ * @param modes - The set of agents/modes to include. Pass all modes to get a
+ *   complete picture, or a filtered subset to scope the result.
+ * @returns One entry per agent/mode, each containing the agent's metadata and
+ *   its declared handoffs.
+ */
+export function buildCustomAgentHandoffsInfo(modes: readonly IChatMode[]): ICustomAgentInfo[] {
+	return modes.map(mode => {
+		const handoffs = mode.handOffs?.get() ?? [];
+		const visibility = mode.visibility?.get();
+		return {
+			id: mode.id,
+			name: mode.name.get(),
+			isBuiltin: mode.isBuiltin,
+			visibility: {
+				userInvocable: visibility?.userInvocable ?? true,
+				agentInvocable: visibility?.agentInvocable ?? true,
+			},
+			handoffs: handoffs.map(h => ({
+				id: getHandoffId(h),
+				label: h.label,
+				agent: h.agent,
+				prompt: h.prompt,
+				...(h.send !== undefined ? { send: h.send } : {}),
+				...(h.showContinueOn !== undefined ? { showContinueOn: h.showContinueOn } : {}),
+				...(h.model !== undefined ? { model: h.model } : {}),
+			})),
+		};
+	});
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatService/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService/chatService.ts
index a083e6212a5..26426bb3213 100644
--- a/src/vs/workbench/contrib/chat/common/chatService/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService/chatService.ts
@@ -31,6 +31,7 @@ import { IChatRequestVariableEntry } from '../attachments/chatVariableEntries.js
 import { IChatRequestVariableValue } from '../attachments/chatVariables.js';
 import { ChatAgentLocation } from '../constants.js';
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from '../tools/languageModelToolsService.js';
+import { ReadonlyChatSessionOptionsMap } from '../chatSessionsService.js';
 
 export interface IChatRequest {
 	message: string;
@@ -255,6 +256,13 @@ export interface IChatExternalEditsDto {
 	undoStopId: string;
 	start: boolean; /** true=start, false=stop */
 	resources: UriComponents[];
+	/**
+	 * When present, these URIs are read instead of the `resources` URIs
+	 * (by-index) when capturing file snapshots. Used by the agent host
+	 * to provide before/after content from the remote filesystem
+	 * or from stored snapshots.
+	 */
+	contentFor?: UriComponents[];
 }
 
 export interface IChatTaskDto {
@@ -488,6 +496,8 @@ export interface IChatTerminalToolInvocationData {
 		toolEdited?: string;
 		// command to show in the chat UI (potentially different from what is actually run in the terminal)
 		forDisplay?: string;
+		// isSandboxWrapped boolean to run in the terminal (potentially different from original command)
+		isSandboxWrapped?: boolean;
 	};
 	/** The working directory URI for the terminal */
 	cwd?: UriComponents;
@@ -523,6 +533,10 @@ export interface IChatTerminalToolInvocationData {
 	terminalCommandId?: string;
 	/** Whether the terminal command was started as a background execution */
 	isBackground?: boolean;
+	/** Whether the command was explicitly approved to run outside the sandbox */
+	requestUnsandboxedExecution?: boolean;
+	/** The model-provided reason for requesting sandbox bypass */
+	requestUnsandboxedExecutionReason?: string;
 	/** Serialized URI for the command that was executed in the terminal */
 	terminalCommandUri?: UriComponents;
 	/** Serialized output of the executed command */
@@ -603,8 +617,10 @@ export interface IChatToolInvocation {
 	readonly toolId: string;
 	readonly toolCallId: string;
 	readonly subAgentInvocationId?: string;
+	readonly icon?: ThemeIcon;
 	readonly state: IObservable<IChatToolInvocation.State>;
 	generatedTitle?: string;
+	isAttachedToThinking: boolean;
 
 	kind: 'toolInvocation';
 
@@ -865,9 +881,11 @@ export interface IChatToolInvocationSerialized {
 	isComplete: boolean;
 	toolCallId: string;
 	toolId: string;
+	readonly icon?: undefined;
 	source: ToolDataSource | undefined; // undefined on pre-1.104 versions
 	readonly subAgentInvocationId?: string;
 	generatedTitle?: string;
+	isAttachedToThinking?: boolean;
 	kind: 'toolInvocationSerialized';
 }
 
@@ -1195,35 +1213,35 @@ export interface IChatCompleteResponse {
 }
 
 export interface IChatSessionStats {
-	fileCount: number;
-	added: number;
-	removed: number;
+	readonly fileCount: number;
+	readonly added: number;
+	readonly removed: number;
 }
 
 export type IChatSessionTiming = {
 	/**
 	 * Timestamp when the session was created in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
 	 */
-	created: number;
+	readonly created: number;
 
 	/**
 	 * Timestamp when the most recent request started in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
 	 *
 	 * Should be undefined if no requests have been made yet.
 	 */
-	lastRequestStarted: number | undefined;
+	readonly lastRequestStarted: number | undefined;
 
 	/**
 	 * Timestamp when the most recent request completed in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
 	 *
 	 * Should be undefined if the most recent request is still in progress or if no requests have been made yet.
 	 */
-	lastRequestEnded: number | undefined;
+	readonly lastRequestEnded: number | undefined;
 };
 
 interface ILegacyChatSessionTiming {
-	startTime: number;
-	endTime?: number;
+	readonly startTime: number;
+	readonly endTime?: number;
 }
 
 export function convertLegacyChatSessionTiming(timing: IChatSessionTiming | ILegacyChatSessionTiming): IChatSessionTiming {
@@ -1286,6 +1304,8 @@ export interface ChatSendResultRejected {
 export interface ChatSendResultSent {
 	readonly kind: 'sent';
 	readonly data: IChatSendRequestData;
+	/** Set when the session was replaced by a new one (e.g. untitled -> real contributed session). */
+	readonly newSessionResource?: URI;
 }
 
 export interface ChatSendResultQueued {
@@ -1462,6 +1482,12 @@ export interface IChatService {
 	adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void>;
 	removeRequest(sessionResource: URI, requestId: string): Promise<void>;
 	cancelCurrentRequestForSession(sessionResource: URI, source?: string): Promise<void>;
+	/**
+	 * Migrates all in-flight and queued pending requests from one session to another.
+	 * Cancels the in-flight request on the original session, removes queued requests,
+	 * and re-sends them all on the target session preserving their original send options.
+	 */
+	migrateRequests(originalResource: URI, targetResource: URI): void;
 	/**
 	 * Sets yieldRequested on the active request for the given session.
 	 */
@@ -1499,7 +1525,7 @@ export interface IChatService {
 	readonly onDidReceiveQuestionCarouselAnswer: Event<{ requestId: string; resolveId: string; answers: IChatQuestionAnswers | undefined }>;
 	notifyQuestionCarouselAnswer(requestId: string, resolveId: string, answers: IChatQuestionAnswers | undefined): void;
 
-	readonly onDidDisposeSession: Event<{ readonly sessionResource: URI[]; readonly reason: 'cleared' }>;
+	readonly onDidDisposeSession: Event<{ readonly sessionResource: readonly URI[]; readonly reason: 'cleared' }>;
 
 	transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void>;
 
@@ -1510,7 +1536,7 @@ export interface IChatService {
 	/**
 	 * @deprecated
 	 */
-	registerChatModelChangeListeners(chatSessionType: string, onChange: () => void): IDisposable;
+	registerChatModelChangeListeners(chatSessionType: string, onChange: (chatSessionResource: URI) => void): IDisposable;
 
 	/**
 	 * For tests only!
@@ -1525,7 +1551,7 @@ export interface IChatService {
 
 export interface IChatSessionContext {
 	readonly chatSessionResource: URI;
-	readonly initialSessionOptions?: ReadonlyArray<{ optionId: string; value: string | { id: string; name: string } }>;
+	readonly initialSessionOptions?: ReadonlyChatSessionOptionsMap;
 }
 
 export const KEYWORD_ACTIVIATION_SETTING_ID = 'accessibility.voice.keywordActivation';
diff --git a/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts
index 2d554ce0f8e..1a1dd8bd7e5 100644
--- a/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts
@@ -36,25 +36,28 @@ import { IMcpService } from '../../../mcp/common/mcpTypes.js';
 import { awaitStatsForSession } from '../chat.js';
 import { IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../participants/chatAgents.js';
 import { chatEditingSessionIsReady } from '../editing/chatEditingService.js';
-import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, ISerializedChatDataReference, normalizeSerializableChatData, toChatHistoryContent, updateRanges } from '../model/chatModel.js';
+import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, IChatModel, IChatRequestModel, IChatRequestModeInfo, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, ISerializedChatDataReference, normalizeSerializableChatData, toChatHistoryContent, updateRanges, ISerializableChatModelInputState } from '../model/chatModel.js';
 import { ChatModelStore, IStartSessionProps } from '../model/chatModelStore.js';
 import { chatAgentLeader, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, chatSubcommandLeader, getPromptText, IParsedChatRequest } from '../requestParser/chatParserTypes.js';
 import { ChatRequestParser } from '../requestParser/chatRequestParser.js';
 import { ChatMcpServersStarting, ChatPendingRequestChangeClassification, ChatPendingRequestChangeEvent, ChatPendingRequestChangeEventName, ChatRequestQueueKind, ChatSendResult, ChatSendResultQueued, ChatSendResultSent, ChatStopCancellationNoopClassification, ChatStopCancellationNoopEvent, ChatStopCancellationNoopEventName, IChatCompleteResponse, IChatDetail, IChatFollowup, IChatModelReference, IChatProgress, IChatQuestionAnswers, IChatSendRequestOptions, IChatSendRequestResponseState, IChatService, IChatSessionContext, IChatSessionStartOptions, IChatUserActionEvent, ResponseModelState } from './chatService.js';
 import { ChatRequestTelemetry, ChatServiceTelemetry } from './chatServiceTelemetry.js';
-import { IChatSessionsService } from '../chatSessionsService.js';
+import { IChatSessionsService, localChatSessionType } from '../chatSessionsService.js';
 import { ChatSessionStore, IChatSessionEntryMetadata } from '../model/chatSessionStore.js';
 import { IChatSlashCommandService } from '../participants/chatSlashCommands.js';
 import { IChatTransferService } from '../model/chatTransferService.js';
-import { chatSessionResourceToId, LocalChatSessionUri } from '../model/chatUri.js';
+import { chatSessionResourceToId, getChatSessionType, isUntitledChatSession, LocalChatSessionUri } from '../model/chatUri.js';
 import { IChatRequestVariableEntry } from '../attachments/chatVariableEntries.js';
 import { ChatAgentLocation, ChatModeKind } from '../constants.js';
 import { ChatMessageRole, IChatMessage, ILanguageModelsService } from '../languageModels.js';
 import { ILanguageModelToolsService } from '../tools/languageModelToolsService.js';
 import { ChatSessionOperationLog } from '../model/chatSessionOperationLog.js';
 import { IPromptsService } from '../promptSyntax/service/promptsService.js';
+import { AGENT_DEBUG_LOG_ENABLED_SETTING, AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_COMMAND_NAME, TROUBLESHOOT_SKILL_PATH, COPILOT_SKILL_URI_SCHEME } from '../promptSyntax/promptTypes.js';
 import { ChatRequestHooks, mergeHooks } from '../promptSyntax/hookSchema.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
+import { findLast } from '../../../../../base/common/arraysFind.js';
+import { ChatMode } from '../chatModes.js';
 
 const serializedChatKey = 'interactive.sessions';
 
@@ -65,10 +68,12 @@ class CancellableRequest implements IDisposable {
 		return this._yieldRequested;
 	}
 
+
 	constructor(
 		public readonly cancellationTokenSource: CancellationTokenSource,
 		public requestId: string | undefined,
 		public readonly responseCompletePromise: Promise<void> | undefined,
+		public sendOptions: IChatSendRequestOptions | undefined,
 		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService
 	) { }
 
@@ -581,9 +586,8 @@ export class ChatService extends Disposable implements IChatService {
 	}
 
 	private async loadRemoteSession(sessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined> {
-		await this.chatSessionService.canResolveChatSession(sessionResource.scheme);
-
-		// Check if session already exists
+		// Check if session already exists before resolving the provider,
+		// so we can return a cached model even if the provider was unregistered.
 		{
 			const existingRef = this.acquireExistingSession(sessionResource);
 			if (existingRef) {
@@ -591,6 +595,10 @@ export class ChatService extends Disposable implements IChatService {
 			}
 		}
 
+		if (!await this.chatSessionService.canResolveChatSession(sessionResource.scheme)) {
+			return undefined;
+		}
+
 		const providedSession = await this.chatSessionService.getOrCreateChatSession(sessionResource, token);
 
 		// Make sure we haven't created this in the meantime
@@ -601,12 +609,46 @@ export class ChatService extends Disposable implements IChatService {
 				return existingRef;
 			}
 		}
-
-		const chatSessionType = sessionResource.scheme;
+		const chatSessionType = getChatSessionType(sessionResource);
+		const contribution = this.chatSessionService.getChatSessionContribution(chatSessionType);
+		const modelId = findLast(providedSession.history.filter(m => m.type === 'request'), req => req.modelId)?.modelId;
+		const agentUri = findLast(providedSession.history.filter(m => m.type === 'request'), req => req.modeInstructions?.uri)?.modeInstructions?.uri;
+		const storedPermissionLevel = this._chatSessionStore.getMetadataForSessionSync(sessionResource)?.permissionLevel;
+		let initialData: ISerializedChatDataReference | undefined = undefined;
+		if ((modelId || agentUri) && contribution?.useRequestToPopulateBuiltInPickers) {
+			const mode: ISerializableChatModelInputState['mode'] = agentUri ? { kind: ChatModeKind.Agent, id: agentUri.toString() } : { kind: ChatModeKind.Agent, id: ChatMode.Agent.id };
+			const modelMetadata = modelId ? this.languageModelsService.lookupLanguageModel(modelId) : undefined;
+			const selectedModel: ISerializableChatModelInputState['selectedModel'] = modelId && modelMetadata ? { identifier: modelId, metadata: modelMetadata } : undefined;
+			// This is used to initialize the state of the chat input box, with the selected model, mode, etc
+			initialData = {
+				serializer: new ChatSessionOperationLog(),
+				value: {
+					creationDate: Date.now(),
+					initialLocation: undefined,
+					customTitle: undefined,
+					requests: [],
+					responderUsername: '',
+					sessionId: '',
+					version: 3,
+					hasPendingEdits: undefined,
+					inputState: {
+						attachments: [],
+						contrib: {},
+						inputText: '',
+						mode,
+						selectedModel: selectedModel,
+						selections: [],
+						permissionLevel: storedPermissionLevel,
+					},
+					pendingRequests: undefined,
+					repoData: undefined
+				}
+			};
+		}
 
 		// Contributed sessions do not use UI tools
 		const modelRef = this._sessionModels.acquireOrCreate({
-			initialData: undefined,
+			initialData,
 			location,
 			sessionResource: sessionResource,
 			canUseTools: false,
@@ -614,6 +656,11 @@ export class ChatService extends Disposable implements IChatService {
 			inputState: providedSession.transferredState?.inputState,
 		});
 
+		// Restore permission level from metadata even when initialData was not constructed
+		if (storedPermissionLevel && !initialData) {
+			modelRef.object.inputModel.setState({ permissionLevel: storedPermissionLevel });
+		}
+
 		modelRef.object.setContributedChatSession({
 			chatSessionResource: sessionResource,
 		});
@@ -650,10 +697,17 @@ export class ChatService extends Disposable implements IChatService {
 					message.participant
 						? this.chatAgentService.getAgent(message.participant) // TODO(jospicer): Remove and always hardcode?
 						: this.chatAgentService.getAgent(chatSessionType);
+				const modeInfo = message.modeInstructions ? {
+					kind: ChatModeKind.Agent,
+					isBuiltin: message.modeInstructions.isBuiltin ?? false,
+					modeInstructions: message.modeInstructions,
+					modeId: 'custom',
+					applyCodeBlockSuggestionId: undefined,
+				} satisfies IChatRequestModeInfo : undefined;
 				lastRequest = model.addRequest(parsedRequest,
 					message.variableData ?? { variables: [] },
 					0, // attempt
-					undefined,
+					modeInfo,
 					agent,
 					undefined, // slashCommand
 					undefined, // confirmation
@@ -678,18 +732,20 @@ export class ChatService extends Disposable implements IChatService {
 			lastRequest?.response?.complete();
 		}
 
-		if (providedSession.progressObs && lastRequest && providedSession.interruptActiveResponseCallback) {
-			const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined, undefined);
-			this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
-			this.telemetryService.publicLog2<ChatPendingRequestChangeEvent, ChatPendingRequestChangeClassification>(ChatPendingRequestChangeEventName, { action: 'add', source: 'remoteSession', chatSessionId: chatSessionResourceToId(model.sessionResource) });
-			const cancellationListener = disposables.add(new MutableDisposable());
+		// Set up progress streaming and cancellation for contributed sessions.
+		// This handles both the initial in-flight response (from session load)
+		// and any subsequent server-initiated turns (e.g. consumed queued messages).
+		const hasProgressStreaming = providedSession.progressObs && providedSession.interruptActiveResponseCallback;
+		if (hasProgressStreaming) {
+			let lastProgressLength = 0;
 
+			const cancellationListener = disposables.add(new MutableDisposable());
 			const createCancellationListener = (token: CancellationToken) => {
 				return token.onCancellationRequested(() => {
 					providedSession.interruptActiveResponseCallback?.().then(userConfirmedInterruption => {
 						if (!userConfirmedInterruption) {
 							// User cancelled the interruption
-							const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined, undefined);
+							const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined, undefined, undefined);
 							this._pendingRequests.set(model.sessionResource, newCancellationRequest);
 							this.telemetryService.publicLog2<ChatPendingRequestChangeEvent, ChatPendingRequestChangeClassification>(ChatPendingRequestChangeEventName, { action: 'add', source: 'remoteSession', chatSessionId: chatSessionResourceToId(model.sessionResource) });
 							cancellationListener.value = createCancellationListener(newCancellationRequest.cancellationTokenSource.token);
@@ -698,15 +754,58 @@ export class ChatService extends Disposable implements IChatService {
 				});
 			};
 
-			cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
+			const ensureCancellationTracking = () => {
+				if (!this._pendingRequests.has(model.sessionResource)) {
+					const cts = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined, undefined, undefined);
+					this._pendingRequests.set(model.sessionResource, cts);
+					this.telemetryService.publicLog2<ChatPendingRequestChangeEvent, ChatPendingRequestChangeClassification>(ChatPendingRequestChangeEventName, { action: 'add', source: 'remoteSession', chatSessionId: chatSessionResourceToId(model.sessionResource) });
+					cancellationListener.value = createCancellationListener(cts.cancellationTokenSource.token);
+				}
+			};
 
-			let lastProgressLength = 0;
+			if (lastRequest) {
+				const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined, undefined, undefined);
+				this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
+				this.telemetryService.publicLog2<ChatPendingRequestChangeEvent, ChatPendingRequestChangeClassification>(ChatPendingRequestChangeEventName, { action: 'add', source: 'remoteSession', chatSessionId: chatSessionResourceToId(model.sessionResource) });
+				cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
+			}
+
+			// Handle server-initiated requests (e.g. consumed queued messages).
+			if (providedSession.onDidStartServerRequest) {
+				disposables.add(providedSession.onDidStartServerRequest(({ prompt }) => {
+					// Complete any in-flight request
+					if (lastRequest?.response && !lastRequest.response.isComplete) {
+						lastRequest.response.complete();
+					}
+
+					// Create a new request in the model
+					const requestText = prompt;
+					const parsedRequest: IParsedChatRequest = {
+						text: requestText,
+						parts: [new ChatRequestTextPart(
+							new OffsetRange(0, requestText.length),
+							{ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: requestText.length + 1 },
+							requestText
+						)]
+					};
+					const agent = this.chatAgentService.getAgent(chatSessionType);
+					lastRequest = model.addRequest(parsedRequest, { variables: [] }, 0, undefined, agent);
+
+					// Reset progress tracking for the new turn
+					lastProgressLength = 0;
+
+					// Ensure cancellation tracking is active
+					ensureCancellationTracking();
+				}));
+			}
+
+			// Single autorun that streams progress for whichever request is current.
 			disposables.add(autorun(reader => {
 				const progressArray = providedSession.progressObs?.read(reader) ?? [];
 				const isComplete = providedSession.isCompleteObs?.read(reader) ?? false;
 
 				// Process only new progress items
-				if (progressArray.length > lastProgressLength) {
+				if (lastRequest && progressArray.length > lastProgressLength) {
 					const newProgress = progressArray.slice(lastProgressLength);
 					for (const progress of newProgress) {
 						model?.acceptResponseProgress(lastRequest, progress);
@@ -715,7 +814,7 @@ export class ChatService extends Disposable implements IChatService {
 				}
 
 				// Handle completion
-				if (isComplete) {
+				if (isComplete && lastRequest) {
 					lastRequest.response?.complete();
 					cancellationListener.clear();
 				}
@@ -805,11 +904,49 @@ export class ChatService extends Disposable implements IChatService {
 			return { kind: 'rejected', reason: 'Empty message' };
 		}
 
-		const model = this._sessionModels.get(sessionResource);
+		let model = this._sessionModels.get(sessionResource);
 		if (!model) {
 			throw new Error(`Unknown session: ${sessionResource}`);
 		}
 
+		let newSessionResource: URI | undefined;
+
+		// Workaround for the contributed chat sessions
+		//
+		// Internally blank widgets uses special sessions with an untitled- path. We do not want these leaking out
+		// to the rest of code. Instead use `createNewChatSessionItem` to make sure the session gets properly initialized with a real resource before processing the first request.
+		if (!model.hasRequests && isUntitledChatSession(sessionResource) && getChatSessionType(sessionResource) !== localChatSessionType) {
+
+			const parsedRequest = this.parseChatRequest(sessionResource, request, options?.location ?? model.initialLocation, options);
+			const commandPart = parsedRequest.parts.find((r): r is ChatRequestSlashCommandPart => r instanceof ChatRequestSlashCommandPart);
+			const requestText = getPromptText(parsedRequest).message;
+
+			// Capture session options before loading the remote session,
+			// since the alias registration below may change the lookup.
+			const initialSessionOptions = this.chatSessionService.getSessionOptions(sessionResource);
+
+			const newItem = await this.chatSessionService.createNewChatSessionItem(getChatSessionType(sessionResource), { prompt: requestText, command: commandPart?.text, initialSessionOptions }, CancellationToken.None);
+			if (newItem) {
+				model = (await this.loadRemoteSession(newItem.resource, model.initialLocation, CancellationToken.None))?.object as ChatModel | undefined;
+				if (!model) {
+					throw new Error(`Failed to load session for resource: ${newItem.resource}`);
+				}
+
+				// Register alias so session-option lookups work with the new resource
+				this.chatSessionService.registerSessionResourceAlias(sessionResource, newItem.resource);
+
+				// Update the new model's contributed session with initialSessionOptions
+				// so that the agent receives them when invoked.
+				model.setContributedChatSession({
+					chatSessionResource: newItem.resource,
+					initialSessionOptions: initialSessionOptions,
+				});
+
+				sessionResource = newItem.resource;
+				newSessionResource = newItem.resource;
+			}
+		}
+
 		const hasPendingRequest = this._pendingRequests.has(sessionResource);
 
 		if (options?.queue) {
@@ -847,6 +984,7 @@ export class ChatService extends Disposable implements IChatService {
 		// This method is only returning whether the request was accepted - don't block on the actual request
 		return {
 			kind: 'sent',
+			newSessionResource,
 			data: {
 				...this._sendRequestAsync(model, sessionResource, parsedRequest, attempt, !options?.noCommandDetection, silentAgent ?? defaultAgent, location, options),
 				agent,
@@ -946,6 +1084,49 @@ export class ChatService extends Disposable implements IChatService {
 			let detectedAgent: IChatAgentData | undefined;
 			let detectedCommand: IChatAgentCommand | undefined;
 
+			// Gate /troubleshoot and the troubleshoot skill behind the feature flags
+			{
+				const debugLogEnabled = this.configurationService.getValue<boolean>(AGENT_DEBUG_LOG_ENABLED_SETTING);
+				const fileLoggingEnabled = this.configurationService.getValue<boolean>(AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING);
+				if (!debugLogEnabled || !fileLoggingEnabled) {
+					const isTroubleshootCommand = agentSlashCommandPart?.command.name === TROUBLESHOOT_COMMAND_NAME;
+					const hasTroubleshootSkill = options?.attachedContext?.some(v => {
+						const uri = IChatRequestVariableEntry.toUri(v);
+						return uri && (uri.scheme === COPILOT_SKILL_URI_SCHEME || uri.path.includes(TROUBLESHOOT_SKILL_PATH));
+					});
+					if (isTroubleshootCommand || hasTroubleshootSkill) {
+						request = model.addRequest(parsedRequest, { variables: [] }, attempt, options?.modeInfo);
+						completeResponseCreated();
+
+						const missingSettings: string[] = [];
+						if (!debugLogEnabled) {
+							missingSettings.push('`' + AGENT_DEBUG_LOG_ENABLED_SETTING + '`');
+						}
+						if (!fileLoggingEnabled) {
+							missingSettings.push('`' + AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING + '`');
+						}
+
+						const settingsQuery = !debugLogEnabled && !fileLoggingEnabled
+							? AGENT_DEBUG_LOG_ENABLED_SETTING
+							: !debugLogEnabled ? '@id:' + AGENT_DEBUG_LOG_ENABLED_SETTING : '@id:' + AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING;
+						const settingsArg = encodeURIComponent(JSON.stringify(settingsQuery));
+						model.acceptResponseProgress(request, {
+							kind: 'markdownContent',
+							content: new MarkdownString(localize(
+								'agentDebugLog.troubleshootDisabled',
+								"The `{0}` skill requires the following settings to be enabled: {1}. After enabling, reload the window to apply. [Enable in Settings](command:workbench.action.openSettings?{2})",
+								TROUBLESHOOT_COMMAND_NAME,
+								missingSettings.join(', '),
+								settingsArg
+							), { isTrusted: { enabledCommands: ['workbench.action.openSettings'] } }),
+						});
+						model.setResponse(request, {});
+						request.response?.complete();
+						return;
+					}
+				}
+			}
+
 			// Collect hooks from hook .json files
 			let collectedHooks: ChatRequestHooks | undefined;
 			let hasDisabledClaudeHooks = false;
@@ -1036,6 +1217,7 @@ export class ChatService extends Disposable implements IChatService {
 							acceptedConfirmationData: options?.acceptedConfirmationData,
 							rejectedConfirmationData: options?.rejectedConfirmationData,
 							userSelectedModelId: options?.userSelectedModelId,
+							modelConfiguration: options?.userSelectedModelId ? this.languageModelsService.getModelConfiguration(options.userSelectedModelId) : undefined,
 							userSelectedTools: options?.userSelectedTools?.get(),
 							modeInstructions: options?.modeInfo?.modeInstructions,
 							permissionLevel: options?.modeInfo?.permissionLevel,
@@ -1114,13 +1296,13 @@ export class ChatService extends Disposable implements IChatService {
 					}
 					completeResponseCreated();
 
-					// Check for disabled Claude Code hooks and notify the user once per workspace
+					// Check for disabled Claude Code hooks and notify the user once per workspace.
+					// Only set the flag when actually showing the hint, so the setup agent flow
+					// (which may resend requests) doesn't consume the flag before the real request runs.
 					const disabledClaudeHooksDismissedKey = 'chat.disabledClaudeHooks.notification';
-					if (!this.storageService.getBoolean(disabledClaudeHooksDismissedKey, StorageScope.WORKSPACE)) {
+					if (hasDisabledClaudeHooks && !this.storageService.getBoolean(disabledClaudeHooksDismissedKey, StorageScope.WORKSPACE)) {
 						this.storageService.store(disabledClaudeHooksDismissedKey, true, StorageScope.WORKSPACE, StorageTarget.USER);
-						if (hasDisabledClaudeHooks) {
-							progressCallback([{ kind: 'disabledClaudeHooks' }]);
-						}
+						progressCallback([{ kind: 'disabledClaudeHooks' }]);
 					}
 
 					// MCP autostart: only run for native VS Code sessions (sidebar, new editors) but not for extension contributed sessions that have inputType set.
@@ -1230,7 +1412,7 @@ export class ChatService extends Disposable implements IChatService {
 		let shouldProcessPending = false;
 		const rawResponsePromise = sendRequestInternal();
 		// Note- requestId is not known at this point, assigned later
-		const cancellableRequest = this.instantiationService.createInstance(CancellableRequest, source, undefined, rawResponsePromise);
+		const cancellableRequest = this.instantiationService.createInstance(CancellableRequest, source, undefined, rawResponsePromise, options);
 		this._pendingRequests.set(model.sessionResource, cancellableRequest);
 		this.telemetryService.publicLog2<ChatPendingRequestChangeEvent, ChatPendingRequestChangeClassification>(ChatPendingRequestChangeEventName, { action: 'add', source: 'sendRequest', chatSessionId: chatSessionResourceToId(model.sessionResource) });
 		rawResponsePromise.finally(() => {
@@ -1260,12 +1442,27 @@ export class ChatService extends Disposable implements IChatService {
 		}
 	}
 
+	/**
+	 * Returns true if the session is backed by an agent host server, which
+	 * controls queued-message dequeuing on the server side.
+	 */
+	private _isServerManagedQueue(sessionResource: URI): boolean {
+		return sessionResource.scheme.startsWith('agent-host-');
+	}
+
 	/**
 	 * Process the next pending request from the model's queue, if any.
 	 * Called after a request completes to continue processing queued requests.
 	 * Multiple consecutive steering requests are combined into a single request.
 	 */
 	private processNextPendingRequest(model: ChatModel): void {
+		// Agent host sessions delegate queue management to the server.
+		// The server dispatches SessionTurnStarted with queuedMessageId when
+		// it consumes a queued message, so the client should not dequeue eagerly.
+		if (this._isServerManagedQueue(model.sessionResource)) {
+			return;
+		}
+
 		// Dequeue all consecutive steering requests and combine them into one
 		const steeringRequests = model.dequeueAllSteeringRequests();
 
@@ -1420,6 +1617,7 @@ export class ChatService extends Disposable implements IChatService {
 				variables: updateRanges(request.variableData, promptTextResult.diff), // TODO bit of a hack
 				location: ChatAgentLocation.Chat,
 				editedFileEvents: request.editedFileEvents,
+				modeInstructions: request.modeInfo?.modeInstructions,
 			};
 			history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
 		}
@@ -1531,6 +1729,32 @@ export class ChatService extends Disposable implements IChatService {
 		}
 	}
 
+	migrateRequests(originalResource: URI, targetResource: URI): void {
+		const model = this._sessionModels.get(originalResource);
+		if (!model) {
+			return;
+		}
+
+		const pendingRequests = [...model.getPendingRequests()];
+
+		if (pendingRequests.length === 0) {
+			return;
+		}
+
+		// Remove each remaining pending request from the original session
+		for (const pending of pendingRequests) {
+			this.removePendingRequest(originalResource, pending.request.id);
+		}
+
+		// Re-send remaining queued requests
+		for (const pending of pendingRequests) {
+			void this.sendRequest(targetResource, pending.request.message.text, {
+				...pending.sendOptions,
+				queue: pending.kind,
+			});
+		}
+	}
+
 	removePendingRequest(sessionResource: URI, requestId: string): void {
 		const model = this._sessionModels.get(sessionResource) as ChatModel | undefined;
 		if (model) {
@@ -1615,7 +1839,7 @@ export class ChatService extends Disposable implements IChatService {
 		return localSessionId;
 	}
 
-	public registerChatModelChangeListeners(chatSessionType: string, onChange: () => void): IDisposable {
+	public registerChatModelChangeListeners(chatSessionType: string, onChange: (chatSessionResource: URI) => void): IDisposable {
 		const disposableStore = new DisposableStore();
 		const chatModelsICareAbout = this.chatModels.map(models =>
 			Array.from(models).filter((model: IChatModel) => model.sessionResource.scheme === chatSessionType)
@@ -1638,7 +1862,7 @@ export class ChatService extends Disposable implements IChatService {
 					listeners.set(added.sessionResource, autorun(reader => {
 						requestChangeListener.read(reader)?.read(reader);
 						modelChangeListener.read(reader);
-						onChange();
+						onChange(added.sessionResource);
 					}));
 				});
 			}
diff --git a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
index 65834a4303e..55702d4e90d 100644
--- a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Event, IWaitUntil } from '../../../../base/common/event.js';
+import { Event } from '../../../../base/common/event.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable } from '../../../../base/common/observable.js';
@@ -13,7 +13,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from './participants/chatAgents.js';
 import { IChatEditingSession } from './editing/chatEditingService.js';
-import { IChatModel, IChatRequestVariableData, ISerializableChatModelInputState } from './model/chatModel.js';
+import { IChatModel, IChatRequestModeInstructions, IChatRequestVariableData, ISerializableChatModelInputState } from './model/chatModel.js';
 import { IChatProgress, IChatSessionTiming } from './chatService/chatService.js';
 import { Target } from './promptSyntax/promptTypes.js';
 
@@ -25,48 +25,48 @@ export const enum ChatSessionStatus {
 }
 
 export interface IChatSessionCommandContribution {
-	name: string;
-	description: string;
-	when?: string;
+	readonly name: string;
+	readonly description: string;
+	readonly when?: string;
 }
 
 export interface IChatSessionProviderOptionItem {
-	id: string;
-	name: string;
-	description?: string;
-	locked?: boolean;
-	icon?: ThemeIcon;
-	default?: boolean;
+	readonly id: string;
+	readonly name: string;
+	readonly description?: string;
+	readonly locked?: boolean;
+	readonly icon?: ThemeIcon;
+	readonly default?: boolean;
 	// [key: string]: any;
 }
 
 export interface IChatSessionProviderOptionGroupCommand {
-	command: string;
-	title: string;
-	tooltip?: string;
-	arguments?: unknown[];
+	readonly command: string;
+	readonly title: string;
+	readonly tooltip?: string;
+	readonly arguments?: readonly unknown[];
 }
 
 export interface IChatSessionProviderOptionGroup {
-	id: string;
-	name: string;
-	description?: string;
-	items: IChatSessionProviderOptionItem[];
-	searchable?: boolean;
-	onSearch?: (query: string, token: CancellationToken) => Thenable<IChatSessionProviderOptionItem[]>;
+	readonly id: string;
+	readonly name: string;
+	readonly description?: string;
+	readonly items: readonly IChatSessionProviderOptionItem[];
+	readonly searchable?: boolean;
+	readonly onSearch?: (query: string, token: CancellationToken) => Thenable<IChatSessionProviderOptionItem[]>;
 	/**
 	 * A context key expression that controls visibility of this option group picker.
 	 * When specified, the picker is only visible when the expression evaluates to true.
 	 * The expression can reference other option group values via `chatSessionOption.<groupId>`.
 	 * Example: `"chatSessionOption.models == 'gpt-4'"`
 	 */
-	when?: string;
-	icon?: ThemeIcon;
+	readonly when?: string;
+	readonly icon?: ThemeIcon;
 	/**
 	 * Custom commands to show in the option group's picker UI.
 	 * These will be shown in a separate section at the end of the picker.
 	 */
-	commands?: IChatSessionProviderOptionGroupCommand[];
+	readonly commands?: readonly IChatSessionProviderOptionGroupCommand[];
 }
 
 export interface IChatSessionsExtensionPoint {
@@ -94,31 +94,45 @@ export interface IChatSessionsExtensionPoint {
 	 */
 	readonly customAgentTarget?: Target;
 	readonly requiresCustomModels?: boolean;
+	/**
+	 * When false, the delegation picker is hidden for this session type.
+	 * Defaults to true.
+	 */
+	readonly supportsDelegation?: boolean;
+	/**
+	 * Decides whether to automatically attach instruction files to chat requests
+	 * for this session type. Defaults to false when not specified.
+	 */
+	readonly autoAttachReferences?: boolean;
+	/**
+	 * When true, uses the incoming request's mode instructions to populate the built-in pickers such as Agent and Model pickers. When false, the pickers are populated based on the session type as they have been before. This is useful for testing the new ChatRequestTurn2-based flow for populating pickers.
+	 */
+	readonly useRequestToPopulateBuiltInPickers?: boolean;
 }
 
 export interface IChatSessionItem {
-	resource: URI;
-	label: string;
-	iconPath?: ThemeIcon;
-	badge?: string | IMarkdownString;
-	description?: string | IMarkdownString;
-	status?: ChatSessionStatus;
-	tooltip?: string | IMarkdownString;
-	timing: IChatSessionTiming;
-	changes?: {
-		files: number;
-		insertions: number;
-		deletions: number;
+	readonly resource: URI;
+	readonly label: string;
+	readonly iconPath?: ThemeIcon;
+	readonly badge?: string | IMarkdownString;
+	readonly description?: string | IMarkdownString;
+	readonly status?: ChatSessionStatus;
+	readonly tooltip?: string | IMarkdownString;
+	readonly timing: IChatSessionTiming;
+	readonly changes?: {
+		readonly files: number;
+		readonly insertions: number;
+		readonly deletions: number;
 	} | readonly IChatSessionFileChange[] | readonly IChatSessionFileChange2[];
-	archived?: boolean;
-	metadata?: { readonly [key: string]: unknown };
+	readonly archived?: boolean;
+	readonly metadata?: { readonly [key: string]: unknown };
 }
 
 export interface IChatSessionFileChange {
-	modifiedUri: URI;
-	originalUri?: URI;
-	insertions: number;
-	deletions: number;
+	readonly modifiedUri: URI;
+	readonly originalUri?: URI;
+	readonly insertions: number;
+	readonly deletions: number;
 }
 
 export interface IChatSessionFileChange2 {
@@ -137,12 +151,15 @@ export type IChatSessionHistoryItem = {
 	command?: string;
 	variableData?: IChatRequestVariableData;
 	modelId?: string;
+	modeInstructions?: IChatRequestModeInstructions;
 } | {
 	type: 'response';
 	parts: IChatProgress[];
 	participant: string;
 };
 
+export type IChatSessionRequestHistoryItem = Extract<IChatSessionHistoryItem, { type: 'request' }>;
+
 /**
  * The session type used for local agent chat sessions.
  */
@@ -162,22 +179,26 @@ export interface IChatSession extends IDisposable {
 
 	readonly history: readonly IChatSessionHistoryItem[];
 
-	/**
-	 * Session options as key-value pairs. Keys correspond to option group IDs (e.g., 'models', 'subagents')
-	 * and values are either the selected option item IDs (string) or full option items (for locked state).
-	 */
-	readonly options?: Record<string, string | IChatSessionProviderOptionItem>;
+
+	readonly options?: ReadonlyChatSessionOptionsMap;
 
 	readonly progressObs?: IObservable<IChatProgress[]>;
 	readonly isCompleteObs?: IObservable<boolean>;
 	readonly interruptActiveResponseCallback?: () => Promise<boolean>;
 
+	/**
+	 * Event fired when the server initiates a new request (e.g. from a consumed
+	 * queued message). The consumer should create a new request+response pair in
+	 * the model and prepare to receive progress via {@link progressObs}.
+	 */
+	readonly onDidStartServerRequest?: Event<{ prompt: string }>;
+
 	/**
 	 * Editing session transferred from a previously-untitled chat session in `onDidCommitChatSessionItem`.
 	 */
 	transferredState?: {
-		editingSession: IChatEditingSession | undefined;
-		inputState: ISerializableChatModelInputState | undefined;
+		readonly editingSession: IChatEditingSession | undefined;
+		readonly inputState: ISerializableChatModelInputState | undefined;
 	};
 
 	requestHandler?: (
@@ -187,6 +208,14 @@ export interface IChatSession extends IDisposable {
 		history: any[], // TODO: Nail down types
 		token: CancellationToken
 	) => Promise<void>;
+
+	/**
+	 * Forks the session from the given request point.
+	 * @param request The request history item to fork from, or undefined to fork from the end.
+	 * @param token Cancellation token.
+	 * @returns The forked session item. The promise is rejected if forking fails.
+	 */
+	forkSession?: (request: IChatSessionRequestHistoryItem | undefined, token: CancellationToken) => Promise<IChatSessionItem>;
 }
 
 export interface IChatSessionContentProvider {
@@ -196,11 +225,18 @@ export interface IChatSessionContentProvider {
 export interface IChatNewSessionRequest {
 	readonly prompt: string;
 	readonly command?: string;
+
+	readonly initialSessionOptions?: ReadonlyChatSessionOptionsMap;
+}
+
+export interface IChatSessionItemsDelta {
+	readonly addedOrUpdated?: readonly IChatSessionItem[];
+	readonly removed?: readonly URI[];
 }
 
 export interface IChatSessionItemController {
 
-	readonly onDidChangeChatSessionItems: Event<void>;
+	readonly onDidChangeChatSessionItems: Event<IChatSessionItemsDelta>;
 
 	get items(): readonly IChatSessionItem[];
 
@@ -209,19 +245,69 @@ export interface IChatSessionItemController {
 	newChatSessionItem?(request: IChatNewSessionRequest, token: CancellationToken): Promise<IChatSessionItem | undefined>;
 }
 
-/**
- * Event fired when session options need to be sent to the extension.
- * Extends IWaitUntil to allow listeners to register async work that will be awaited.
- */
-export interface IChatSessionOptionsWillNotifyExtensionEvent extends IWaitUntil {
+export interface IChatSessionOptionsChangeEvent {
 	readonly sessionResource: URI;
-	readonly updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>;
+	readonly updates: ReadonlyMap<string, string | IChatSessionProviderOptionItem | undefined>;
 }
 
 export type ResolvedChatSessionsExtensionPoint = Omit<IChatSessionsExtensionPoint, 'icon'> & {
 	readonly icon: ThemeIcon | URI | undefined;
 };
 
+/**
+ * Session options as key-value pairs.
+ *
+ * Keys correspond to option group IDs (e.g., 'models', 'subagents') and values are either the selected option item IDs (string) or full option items (for locked state).
+ */
+export type ChatSessionOptionsMap = Map<string, string | IChatSessionProviderOptionItem>;
+
+export namespace ChatSessionOptionsMap {
+	export function fromRecord(obj: { [key: string]: string | IChatSessionProviderOptionItem }): ChatSessionOptionsMap {
+		return new Map(Object.entries(obj));
+	}
+
+	export function toRecord(map: ReadonlyChatSessionOptionsMap): Record<string, string | IChatSessionProviderOptionItem> {
+		const record: Record<string, string | IChatSessionProviderOptionItem> = Object.create(null);
+		for (const [key, value] of map) {
+			record[key] = value;
+		}
+		return record;
+	}
+
+	export function toStrValueArray(map: ReadonlyChatSessionOptionsMap | undefined): Array<{ optionId: string; value: string }> | undefined {
+		if (!map) {
+			return undefined;
+		}
+		return Array.from(map, ([optionId, value]) => ({ optionId, value: typeof value === 'string' ? value : value.id }));
+	}
+}
+
+/**
+ * Readonly version of {@link ChatSessionOptionsMap}
+ */
+export type ReadonlyChatSessionOptionsMap = ReadonlyMap<string, string | IChatSessionProviderOptionItem>;
+
+export interface IChatSessionCustomizationItem {
+	readonly label: string;
+	readonly description?: string;
+	readonly uri: URI;
+	readonly storageLocation: number;
+	readonly icon?: ThemeIcon;
+}
+
+export interface IChatSessionCustomizationItemGroup {
+	readonly id: string;
+	readonly items: IChatSessionCustomizationItem[];
+	readonly commands?: readonly { readonly id: string; readonly title: string; readonly arguments?: readonly unknown[] }[];
+	readonly itemCommands?: readonly { readonly id: string; readonly title: string; readonly arguments?: readonly unknown[] }[];
+}
+
+export interface IChatSessionCustomizationsProvider {
+	readonly onDidChangeCustomizations: Event<void>;
+	provideCustomizations(token: CancellationToken): Promise<IChatSessionCustomizationItemGroup[] | undefined>;
+}
+
+
 export const IChatSessionsService = createDecorator<IChatSessionsService>('chatSessionsService');
 
 export interface IChatSessionsService {
@@ -229,7 +315,7 @@ export interface IChatSessionsService {
 
 	// #region Chat session item provider support
 	readonly onDidChangeItemsProviders: Event<{ readonly chatSessionType: string }>;
-	readonly onDidChangeSessionItems: Event<{ readonly chatSessionType: string }>;
+	readonly onDidChangeSessionItems: Event<IChatSessionItemsDelta>;
 
 	readonly onDidChangeAvailability: Event<void>;
 	readonly onDidChangeInProgress: Event<void>;
@@ -237,7 +323,14 @@ export interface IChatSessionsService {
 	getChatSessionContribution(chatSessionType: string): ResolvedChatSessionsExtensionPoint | undefined;
 	getAllChatSessionContributions(): ResolvedChatSessionsExtensionPoint[];
 
+	/**
+	 * Programmatically register a chat session contribution (for internal session types
+	 * that don't go through the extension point).
+	 */
+	registerChatSessionContribution(contribution: IChatSessionsExtensionPoint): IDisposable;
+
 	registerChatSessionItemController(chatSessionType: string, controller: IChatSessionItemController): IDisposable;
+	getRegisteredChatSessionItemProviders(): readonly string[];
 	activateChatSessionItemProvider(chatSessionType: string): Promise<void>;
 
 	/**
@@ -254,8 +347,8 @@ export interface IChatSessionsService {
 	 */
 	refreshChatSessionItems(providerTypeFilter: readonly string[] | undefined, token: CancellationToken): Promise<void>;
 
-	reportInProgress(chatSessionType: string, count: number): void;
-	getInProgress(): { displayName: string; count: number }[];
+	/** @deprecated Use `getChatSessionItems` */
+	getInProgress(): { chatSessionType: string; count: number }[];
 
 	// #endregion
 
@@ -268,14 +361,15 @@ export interface IChatSessionsService {
 	canResolveChatSession(sessionType: string): Promise<boolean>;
 	getOrCreateChatSession(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
 
-	hasAnySessionOptions(sessionResource: URI): boolean;
+	getSessionOptions(sessionResource: URI): ReadonlyChatSessionOptionsMap | undefined;
 	getSessionOption(sessionResource: URI, optionId: string): string | IChatSessionProviderOptionItem | undefined;
 	setSessionOption(sessionResource: URI, optionId: string, value: string | IChatSessionProviderOptionItem): boolean;
+	updateSessionOptions(sessionResource: URI, updates: ReadonlyChatSessionOptionsMap): boolean;
 
 	/**
 	 * Fired when options for a chat session change.
 	 */
-	readonly onDidChangeSessionOptions: Event<URI>;
+	readonly onDidChangeSessionOptions: Event<IChatSessionOptionsChangeEvent>;
 
 	/**
 	 * Get the capabilities for a specific session type
@@ -292,20 +386,34 @@ export interface IChatSessionsService {
 	 * Returns whether the session type requires custom models. When true, the model picker should show filtered custom models.
 	 */
 	requiresCustomModelsForSessionType(chatSessionType: string): boolean;
+
+	/**
+	 * Returns whether the session type supports delegation.
+	 * Defaults to true when not explicitly set.
+	 */
+	supportsDelegationForSessionType(chatSessionType: string): boolean;
+
+	/**
+	 * Returns whether the loaded session supports forking conversations.
+	 */
+	sessionSupportsFork(sessionResource: URI): boolean;
+
+	/**
+	 * Forks a contributed chat session from the given request point.
+	 * @param sessionResource The session resource to fork.
+	 * @param request The request history item to fork from, or undefined to fork from the end.
+	 * @param token Cancellation token.
+	 * @returns The forked session item, or undefined if forking failed.
+	 */
+	forkChatSession(sessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, token: CancellationToken): Promise<IChatSessionItem>;
+
 	readonly onDidChangeOptionGroups: Event<string>;
 
 	getOptionGroupsForSessionType(chatSessionType: string): IChatSessionProviderOptionGroup[] | undefined;
 	setOptionGroupsForSessionType(chatSessionType: string, handle: number, optionGroups?: IChatSessionProviderOptionGroup[]): void;
 
-	getNewSessionOptionsForSessionType(chatSessionType: string): Record<string, string | IChatSessionProviderOptionItem> | undefined;
-	setNewSessionOptionsForSessionType(chatSessionType: string, options: Record<string, string | IChatSessionProviderOptionItem>): void;
-	/**
-	 * Event fired when session options change and need to be sent to the extension.
-	 * MainThreadChatSessions subscribes to this to forward changes to the extension host.
-	 * Uses IWaitUntil pattern to allow listeners to register async work.
-	 */
-	readonly onRequestNotifyExtension: Event<IChatSessionOptionsWillNotifyExtensionEvent>;
-	notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>): Promise<void>;
+	getNewSessionOptionsForSessionType(chatSessionType: string): ReadonlyChatSessionOptionsMap | undefined;
+	setNewSessionOptionsForSessionType(chatSessionType: string, options: ReadonlyChatSessionOptionsMap): void;
 
 	getInProgressSessionDescription(chatModel: IChatModel): string | undefined;
 
@@ -320,6 +428,13 @@ export interface IChatSessionsService {
 	 * are redirected to the canonical (untitled) resource in the internal session map.
 	 */
 	registerSessionResourceAlias(untitledResource: URI, realResource: URI): void;
+
+	// #region Customizations provider support
+	readonly onDidChangeCustomizations: Event<{ readonly chatSessionType: string }>;
+	registerCustomizationsProvider(chatSessionType: string, provider: IChatSessionCustomizationsProvider): IDisposable;
+	hasCustomizationsProvider(chatSessionType: string): boolean;
+	getCustomizations(chatSessionType: string, token: CancellationToken): Promise<IChatSessionCustomizationItemGroup[] | undefined>;
+	// #endregion
 }
 
 export function isSessionInProgressStatus(state: ChatSessionStatus): boolean {
@@ -330,4 +445,3 @@ export function isIChatSessionFileChange2(obj: unknown): obj is IChatSessionFile
 	const candidate = obj as IChatSessionFileChange2;
 	return candidate && candidate.uri instanceof URI && typeof candidate.insertions === 'number' && typeof candidate.deletions === 'number';
 }
-
diff --git a/src/vs/workbench/contrib/chat/common/constants.ts b/src/vs/workbench/contrib/chat/common/constants.ts
index 1cc89241a27..64f333769b5 100644
--- a/src/vs/workbench/contrib/chat/common/constants.ts
+++ b/src/vs/workbench/contrib/chat/common/constants.ts
@@ -48,13 +48,22 @@ export enum ChatConfiguration {
 	ChatViewProgressBadgeEnabled = 'chat.viewProgressBadge.enabled',
 	ChatContextUsageEnabled = 'chat.contextUsage.enabled',
 	SubagentToolCustomAgents = 'chat.customAgentInSubagent.enabled',
+	SubagentsAllowInvocationsFromSubagents = 'chat.subagents.allowInvocationsFromSubagents',
 	ShowCodeBlockProgressAnimation = 'chat.agent.codeBlockProgress',
 	RestoreLastPanelSession = 'chat.restoreLastPanelSession',
 	ExitAfterDelegation = 'chat.exitAfterDelegation',
 	ExplainChangesEnabled = 'chat.editing.explainChanges.enabled',
+	RevealNextChangeOnResolve = 'chat.editing.revealNextChangeOnResolve',
 	GrowthNotificationEnabled = 'chat.growthNotification.enabled',
 	ChatCustomizationMenuEnabled = 'chat.customizationsMenu.enabled',
+	ChatCustomizationHarnessSelectorEnabled = 'chat.customizations.harnessSelector.enabled',
 	AutopilotEnabled = 'chat.autopilot.enabled',
+	ImageCarouselEnabled = 'imageCarousel.chat.enabled',
+	ArtifactsEnabled = 'chat.artifacts.enabled',
+	ArtifactsMode = 'chat.artifacts.mode',
+	ArtifactsRulesByMimeType = 'chat.artifacts.rules.byMimeType',
+	ArtifactsRulesByFilePath = 'chat.artifacts.rules.byFilePath',
+	CustomizationsProviderApi = 'chat.customizations.providerApi.enabled',
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/common/customizationHarnessService.ts b/src/vs/workbench/contrib/chat/common/customizationHarnessService.ts
new file mode 100644
index 00000000000..8ab06b5762f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/customizationHarnessService.ts
@@ -0,0 +1,434 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { constObservable, derived, IObservable, ISettableObservable, observableValue } from '../../../../base/common/observable.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { AICustomizationManagementSection, IStorageSourceFilter } from './aiCustomizationWorkspaceService.js';
+import { PromptsType } from './promptSyntax/promptTypes.js';
+import { PromptsStorage } from './promptSyntax/service/promptsService.js';
+import { AGENT_MD_FILENAME } from './promptSyntax/config/promptFileLocations.js';
+
+export const ICustomizationHarnessService = createDecorator<ICustomizationHarnessService>('customizationHarnessService');
+
+/**
+ * Override for a management section's create-button behavior.
+ */
+export interface ISectionOverride {
+	/**
+	 * Label for the primary button. Required when `commandId` or `rootFile`
+	 * is set. Ignored otherwise (the widget uses its default label).
+	 */
+	readonly label?: string;
+	/** When set, the primary button invokes this command (e.g. hooks quick pick). */
+	readonly commandId?: string;
+	/** When set, the primary button creates this file at the workspace root. */
+	readonly rootFile?: string;
+	/**
+	 * Custom type label for the dropdown workspace/user create actions
+	 * (e.g. "Rule" instead of "Instruction"). When undefined, the
+	 * section's default type label is used.
+	 */
+	readonly typeLabel?: string;
+	/**
+	 * Root-level file shortcuts added to the dropdown (e.g. `['AGENTS.md']`).
+	 * Each entry creates a "New {filename}" action that creates the file at
+	 * the workspace root. Harnesses that don't support a file simply omit it.
+	 */
+	readonly rootFileShortcuts?: readonly string[];
+	/**
+	 * File extension override for new files created under this section.
+	 * When set, files are created with this extension (e.g. `.md` for
+	 * Claude rules) instead of the default for the prompt type
+	 * (e.g. `.instructions.md`).
+	 */
+	readonly fileExtension?: string;
+}
+
+/**
+ * Identifies the AI harness (execution environment) that customizations
+ * are filtered for. Storage answers "where did this come from?"; harness
+ * answers "who consumes it?".
+ */
+export enum CustomizationHarness {
+	VSCode = 'vscode',
+	CLI = 'cli',
+	Claude = 'claude',
+}
+
+/**
+ * Describes a single harness option for the UI toggle.
+ */
+export interface IHarnessDescriptor {
+	readonly id: string;
+	readonly label: string;
+	readonly icon: ThemeIcon;
+	/**
+	 * Management sections that should be hidden when this harness is active.
+	 * For example, Claude does not support prompt files so the Prompts
+	 * section is hidden.
+	 */
+	readonly hiddenSections?: readonly string[];
+	/**
+	 * Workspace sub-paths that this harness recognizes for file creation.
+	 * When set, the directory picker for new customization files only offers
+	 * workspace directories under these sub-paths (e.g. `.claude` for Claude).
+	 * When `undefined`, all workspace directories are shown (Local harness).
+	 */
+	readonly workspaceSubpaths?: readonly string[];
+	/**
+	 * When `true`, the "Generate with AI" sparkle button is hidden and replaced
+	 * with a plain "New X" manual-creation button (like sessions).
+	 */
+	readonly hideGenerateButton?: boolean;
+	/**
+	 * Per-section overrides for the create button behavior.
+	 *
+	 * A `commandId` entry replaces the button entirely with a command
+	 * invocation (e.g. Claude hooks → `copilot.claude.hooks`).
+	 *
+	 * A `rootFile` entry makes the primary button create a specific file
+	 * at the workspace root (e.g. Claude instructions → `CLAUDE.md`).
+	 * When combined with `typeLabel`, the dropdown create actions use
+	 * that label instead of the section's default (e.g. "Rule" instead
+	 * of "Instruction").
+	 */
+	readonly sectionOverrides?: ReadonlyMap<string, ISectionOverride>;
+	/**
+	 * The chat agent ID that must be registered for this harness to appear.
+	 * When `undefined`, the harness is always available (e.g. Local).
+	 */
+	readonly requiredAgentId?: string;
+	/**
+	 * Instruction file patterns that this harness recognizes.
+	 * Each entry is either an exact filename (e.g. `'CLAUDE.md'`) or a
+	 * path prefix ending with `/` (e.g. `'.claude/rules/'`).
+	 * When set, instruction items that don't match any pattern are filtered out.
+	 * When `undefined`, all instruction files are shown.
+	 */
+	readonly instructionFileFilter?: readonly string[];
+	/**
+	 * Returns the storage source filter that should be applied to customization
+	 * items of the given type when this harness is active.
+	 */
+	getStorageSourceFilter(type: PromptsType): IStorageSourceFilter;
+}
+
+/**
+ * Service that manages the active customization harness and provides
+ * per-type storage source filters based on the selected harness.
+ *
+ * The default (core) registration exposes a single "VS Code" harness
+ * that shows all storage sources. The sessions window overrides this
+ * to provide CLI-scoped harnesses.
+ */
+export interface ICustomizationHarnessService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * The currently active harness.
+	 */
+	readonly activeHarness: IObservable<string>;
+
+	/**
+	 * All harnesses available in this window.
+	 * When only one harness is available the UI should hide the toggle.
+	 */
+	readonly availableHarnesses: IObservable<readonly IHarnessDescriptor[]>;
+
+	/**
+	 * Changes the active harness. The new id must be present in
+	 * `availableHarnesses`.
+	 */
+	setActiveHarness(id: string): void;
+
+	/**
+	 * Registers a harness descriptor contributed by an extension's
+	 * customizations provider. Returns a disposable that removes the harness.
+	 */
+	registerContributedHarness(descriptor: IHarnessDescriptor): IDisposable;
+
+	/**
+	 * Convenience: returns the storage source filter for the active harness
+	 * and the given customization type.
+	 */
+	getStorageSourceFilter(type: PromptsType): IStorageSourceFilter;
+
+	/**
+	 * Returns the descriptor of the currently active harness.
+	 */
+	getActiveDescriptor(): IHarnessDescriptor;
+}
+
+// #region Shared filter constants
+
+/**
+ * Hooks filter — local, user, and plugin sources.
+ */
+const HOOKS_FILTER: IStorageSourceFilter = {
+	sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.plugin],
+};
+
+// #endregion
+
+// #region Well-known user directories
+
+/**
+ * Returns the user-home directories accessible to the Copilot CLI harness.
+ */
+export function getCliUserRoots(userHome: URI): readonly URI[] {
+	return [
+		joinPath(userHome, '.copilot'),
+		joinPath(userHome, '.claude'),
+		joinPath(userHome, '.agents'),
+	];
+}
+
+/**
+ * Returns the user-home directories accessible to the Claude harness.
+ */
+export function getClaudeUserRoots(userHome: URI): readonly URI[] {
+	return [joinPath(userHome, '.claude')];
+}
+
+// #endregion
+
+// #region Harness descriptor factories
+
+/**
+ * Builds the full source list from the base set (local, user, plugin)
+ * plus any additional sources specific to the window type.
+ *
+ * Core passes `[PromptsStorage.extension]`; sessions passes its
+ * BUILTIN_STORAGE constant.
+ */
+function buildAllSources(extras: readonly string[]): readonly string[] {
+	return [PromptsStorage.local, PromptsStorage.user, PromptsStorage.plugin, ...extras];
+}
+
+/**
+ * Creates a "VS Code" harness descriptor that shows all storage sources
+ * with no user-root restrictions.
+ */
+export function createVSCodeHarnessDescriptor(extras: readonly string[]): IHarnessDescriptor {
+	const filter: IStorageSourceFilter = { sources: buildAllSources(extras) };
+	return {
+		id: CustomizationHarness.VSCode,
+		label: localize('harness.local', "Local"),
+		icon: ThemeIcon.fromId(Codicon.vm.id),
+		sectionOverrides: new Map([
+			[AICustomizationManagementSection.Instructions, {
+				rootFileShortcuts: [AGENT_MD_FILENAME],
+			}],
+		]),
+		getStorageSourceFilter: () => filter,
+	};
+}
+
+/**
+ * Creates a harness descriptor that restricts user-file roots for most
+ * types (agents, skills, instructions) while leaving hooks and prompts
+ * unrestricted. Used for CLI and Claude harnesses.
+ */
+interface IRestrictedHarnessOptions {
+	readonly hiddenSections?: readonly string[];
+	readonly workspaceSubpaths?: readonly string[];
+	readonly hideGenerateButton?: boolean;
+	readonly sectionOverrides?: ReadonlyMap<string, ISectionOverride>;
+	readonly requiredAgentId?: string;
+	readonly instructionFileFilter?: readonly string[];
+}
+
+function createRestrictedHarnessDescriptor(
+	id: string,
+	label: string,
+	icon: ThemeIcon,
+	restrictedUserRoots: readonly URI[],
+	extras: readonly string[],
+	options?: IRestrictedHarnessOptions,
+): IHarnessDescriptor {
+	const allSources = buildAllSources(extras);
+	const allRootsFilter: IStorageSourceFilter = { sources: allSources };
+	const restrictedFilter: IStorageSourceFilter = { sources: allSources, includedUserFileRoots: restrictedUserRoots };
+	return {
+		id,
+		label,
+		icon,
+		hiddenSections: options?.hiddenSections,
+		workspaceSubpaths: options?.workspaceSubpaths,
+		hideGenerateButton: options?.hideGenerateButton,
+		sectionOverrides: options?.sectionOverrides,
+		requiredAgentId: options?.requiredAgentId,
+		instructionFileFilter: options?.instructionFileFilter,
+		getStorageSourceFilter(type: PromptsType): IStorageSourceFilter {
+			if (type === PromptsType.hook) {
+				return HOOKS_FILTER;
+			}
+			if (type === PromptsType.prompt) {
+				return allRootsFilter;
+			}
+			return restrictedFilter;
+		},
+	};
+}
+
+/**
+ * Creates a "Copilot CLI" harness descriptor.
+ */
+export function createCliHarnessDescriptor(cliUserRoots: readonly URI[], extras: readonly string[]): IHarnessDescriptor {
+	return createRestrictedHarnessDescriptor(
+		CustomizationHarness.CLI,
+		localize('harness.cli', "Copilot CLI"),
+		ThemeIcon.fromId(Codicon.worktree.id),
+		cliUserRoots,
+		extras,
+		{
+			hideGenerateButton: true,
+			requiredAgentId: 'copilotcli',
+			workspaceSubpaths: ['.github', '.copilot', '.agents', '.claude'],
+			sectionOverrides: new Map([
+				[AICustomizationManagementSection.Instructions, {
+					rootFileShortcuts: [AGENT_MD_FILENAME],
+				}],
+			]),
+		},
+	);
+}
+
+/**
+ * Creates a "Claude" harness descriptor.
+ * Claude does not support prompt files (.prompt.md), AGENTS.md, or extension-contributed plugins.
+ * It supports agents (.claude/agents/), instructions (CLAUDE.md, .claude/rules/),
+ * skills (.claude/skills/), and hooks (.claude/settings.json).
+ */
+export function createClaudeHarnessDescriptor(claudeRoots: readonly URI[], extras: readonly string[]): IHarnessDescriptor {
+	return createRestrictedHarnessDescriptor(
+		CustomizationHarness.Claude,
+		localize('harness.claude', "Claude"),
+		ThemeIcon.fromId(Codicon.claude.id),
+		claudeRoots,
+		extras,
+		{
+			hiddenSections: [AICustomizationManagementSection.Prompts, AICustomizationManagementSection.Plugins],
+			workspaceSubpaths: ['.claude'],
+			hideGenerateButton: true,
+			requiredAgentId: 'claude-code',
+			sectionOverrides: new Map([
+				[AICustomizationManagementSection.Hooks, {
+					label: localize('claudeHooks', "Configure Claude Hooks"),
+					commandId: 'copilot.claude.hooks',
+				}],
+				[AICustomizationManagementSection.Instructions, {
+					label: localize('addClaudeMd', "Add CLAUDE.md"),
+					rootFile: 'CLAUDE.md',
+					typeLabel: localize('rule', "Rule"),
+					fileExtension: '.md',
+				}],
+			]),
+			instructionFileFilter: ['CLAUDE.md', 'CLAUDE.local.md', '.claude/rules/', 'copilot-instructions.md'],
+		},
+	);
+}
+
+// #endregion
+
+// #region Helpers
+
+/**
+ * Tests whether a file path belongs to one of the given workspace sub-paths.
+ * Matches on path segment boundaries to avoid false positives
+ * (e.g. `.claude` must appear as `/.claude/` in the path, not as part of
+ * a longer segment like `not.claude`).
+ */
+export function matchesWorkspaceSubpath(filePath: string, subpaths: readonly string[]): boolean {
+	return subpaths.some(sp => filePath.includes(`/${sp}/`) || filePath.endsWith(`/${sp}`));
+}
+
+/**
+ * Tests whether an instruction file matches one of the harness's recognized
+ * instruction file patterns. Patterns can be exact filenames (e.g. `CLAUDE.md`)
+ * or path prefixes ending with `/` (e.g. `.claude/rules/`).
+ */
+export function matchesInstructionFileFilter(filePath: string, filters: readonly string[]): boolean {
+	const name = filePath.substring(filePath.lastIndexOf('/') + 1);
+	return filters.some(f => {
+		if (f.endsWith('/')) {
+			// Path prefix: check if the file is under this directory
+			return filePath.includes(`/${f}`) || filePath.startsWith(f);
+		}
+		return name === f;
+	});
+}
+
+// #endregion
+
+// #region Base implementation
+
+/**
+ * Reusable base implementation of {@link ICustomizationHarnessService}.
+ * Concrete registrations only need to supply the list of harness
+ * descriptors and a default harness id.
+ */
+export class CustomizationHarnessServiceBase implements ICustomizationHarnessService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _activeHarness: ISettableObservable<string>;
+	readonly activeHarness: IObservable<string>;
+	readonly availableHarnesses: IObservable<readonly IHarnessDescriptor[]>;
+
+	private readonly _allHarnesses: readonly IHarnessDescriptor[];
+	private readonly _contributedHarnesses = observableValue<readonly IHarnessDescriptor[]>(this, []);
+
+	constructor(
+		harnesses: readonly IHarnessDescriptor[],
+		defaultHarness: string,
+		builtInAvailable?: IObservable<readonly IHarnessDescriptor[]>,
+	) {
+		this._allHarnesses = harnesses;
+		this._activeHarness = observableValue<string>(this, defaultHarness);
+		this.activeHarness = this._activeHarness;
+
+		const builtIn = builtInAvailable ?? constObservable(harnesses);
+		this.availableHarnesses = derived(this, reader => {
+			const built = builtIn.read(reader);
+			const contributed = this._contributedHarnesses.read(reader);
+			return [...built, ...contributed];
+		});
+	}
+
+	setActiveHarness(id: string): void {
+		const available = this.availableHarnesses.get();
+		if (available.some(h => h.id === id)) {
+			this._activeHarness.set(id, undefined);
+		}
+	}
+
+	registerContributedHarness(descriptor: IHarnessDescriptor): IDisposable {
+		const current = this._contributedHarnesses.get();
+		this._contributedHarnesses.set([...current, descriptor], undefined);
+		return toDisposable(() => {
+			const updated = this._contributedHarnesses.get().filter(h => h !== descriptor);
+			this._contributedHarnesses.set(updated, undefined);
+		});
+	}
+
+	getStorageSourceFilter(type: PromptsType): IStorageSourceFilter {
+		const descriptor = this.getActiveDescriptor();
+		return descriptor.getStorageSourceFilter(type);
+	}
+
+	getActiveDescriptor(): IHarnessDescriptor {
+		const activeId = this._activeHarness.get();
+		const available = this.availableHarnesses.get();
+		return available.find(h => h.id === activeId) ?? available[0] ?? this._allHarnesses[0];
+	}
+}
+
+// #endregion
diff --git a/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts
index 58b49b13fa5..0572f62a498 100644
--- a/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts
@@ -110,8 +110,8 @@ export interface IChatEditingSession extends IDisposable {
 	 * agents that make changes on-disk rather than streaming edits through the
 	 * chat session.
 	 */
-	startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string): Promise<IChatProgress[]>;
-	stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]>;
+	startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string, contentFor?: URI[]): Promise<IChatProgress[]>;
+	stopExternalEdits(responseModel: IChatResponseModel, operationId: number, contentFor?: URI[]): Promise<IChatProgress[]>;
 
 	/**
 	 * Gets the snapshot URI of a file at the request and _after_ changes made in the undo stop.
diff --git a/src/vs/workbench/contrib/chat/common/enablement.ts b/src/vs/workbench/contrib/chat/common/enablement.ts
index e8cb2d26c7b..a6e3b90ff75 100644
--- a/src/vs/workbench/contrib/chat/common/enablement.ts
+++ b/src/vs/workbench/contrib/chat/common/enablement.ts
@@ -26,6 +26,7 @@ export function isContributionDisabled(state: ContributionEnablementState): bool
 export interface IEnablementModel {
 	readEnabled(key: string, reader?: IReader): ContributionEnablementState;
 	setEnabled(key: string, state: ContributionEnablementState): void;
+	remove(key: string): void;
 }
 
 type EnablementMap = ReadonlyMap<string, boolean>;
@@ -120,6 +121,11 @@ export class EnablementModel extends Disposable implements IEnablementModel {
 		}
 	}
 
+	remove(key: string): void {
+		this._deleteFromMap(this._profileState, key);
+		this._deleteFromMap(this._workspaceState, key);
+	}
+
 	private _setInMap(memento: ObservableMemento<EnablementMap>, key: string, value: boolean): void {
 		const current = memento.get();
 		if (current.get(key) === value) {
diff --git a/src/vs/workbench/contrib/chat/common/languageModels.ts b/src/vs/workbench/contrib/chat/common/languageModels.ts
index 08912e24f66..a0dd5106900 100644
--- a/src/vs/workbench/contrib/chat/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModels.ts
@@ -18,6 +18,7 @@ import { equals } from '../../../../base/common/objects.js';
 import Severity from '../../../../base/common/severity.js';
 import { format, isFalsyOrWhitespace } from '../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IAction, SubmenuAction } from '../../../../base/common/actions.js';
 import { isObject, isString } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
@@ -169,6 +170,17 @@ export type IChatResponsePart = IChatResponseTextPart | IChatResponseToolUsePart
 
 export type IExtendedChatResponsePart = IChatResponsePullRequestPart;
 
+export interface ILanguageModelConfigurationSchema extends IJSONSchema {
+	properties?: {
+		[key: string]: IJSONSchema & {
+			/** When set to `'navigation'`, the property is shown as a primary action in the model picker. */
+			group?: string;
+			/** Labels for enum values. If provided, these are shown instead of the raw enum values. */
+			enumItemLabels?: string[];
+		};
+	};
+}
+
 export interface ILanguageModelChatMetadata {
 	readonly extension: ExtensionIdentifier;
 
@@ -204,6 +216,11 @@ export interface ILanguageModelChatMetadata {
 	 * when the user is in a session matching this type.
 	 */
 	readonly targetChatSessionType?: string;
+	/**
+	 * An optional JSON schema describing the per-model configuration options.
+	 * Used to validate user-provided per-model configuration in `chatLanguageModels.json`.
+	 */
+	readonly configurationSchema?: ILanguageModelConfigurationSchema;
 }
 
 export namespace ILanguageModelChatMetadata {
@@ -263,13 +280,13 @@ export async function getTextResponseFromStream(response: ILanguageModelChatResp
 export interface ILanguageModelChatProvider {
 	readonly onDidChange: Event<void>;
 	provideLanguageModelChatInfo(options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
-	sendChatRequest(modelId: string, messages: IChatMessage[], from: ExtensionIdentifier | undefined, options: { [name: string]: unknown }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
+	sendChatRequest(modelId: string, messages: IChatMessage[], from: ExtensionIdentifier | undefined, options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 	provideTokenCount(modelId: string, message: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
 
 export interface ILanguageModelChat {
 	metadata: ILanguageModelChatMetadata;
-	sendChatRequest(messages: IChatMessage[], from: ExtensionIdentifier | undefined, options: { [name: string]: unknown }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
+	sendChatRequest(messages: IChatMessage[], from: ExtensionIdentifier | undefined, options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 	provideTokenCount(message: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
 
@@ -313,6 +330,13 @@ export interface ILanguageModelChatInfoOptions {
 	readonly configuration?: IStringDictionary<unknown>;
 }
 
+export interface ILanguageModelChatRequestOptions {
+	readonly modelOptions?: IStringDictionary<unknown>;
+	readonly configuration?: IStringDictionary<unknown>;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	readonly [name: string]: any;
+}
+
 export interface ILanguageModelsGroup {
 	readonly group?: ILanguageModelsProviderGroup;
 	readonly modelIdentifiers: string[];
@@ -354,17 +378,42 @@ export interface ILanguageModelsService {
 
 	deltaLanguageModelChatProviderDescriptors(added: IUserFriendlyLanguageModel[], removed: IUserFriendlyLanguageModel[]): void;
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	sendChatRequest(modelId: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
+	sendChatRequest(modelId: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 
 	computeTokenLength(modelId: string, message: string | IChatMessage, token: CancellationToken): Promise<number>;
 
+	/**
+	 * Returns the resolved per-model configuration for the given model identifier.
+	 * Includes schema defaults with user overrides applied on top.
+	 * Returns undefined if the model has no configuration schema and no user config.
+	 */
+	getModelConfiguration(modelId: string): IStringDictionary<unknown> | undefined;
+
+	/**
+	 * Updates the per-model configuration for the given model.
+	 * Merges the provided values into the existing configuration.
+	 */
+	setModelConfiguration(modelId: string, values: IStringDictionary<unknown>): Promise<void>;
+
+	/**
+	 * Returns actions for configuring the given model based on its configuration schema.
+	 * For enum properties, returns submenu actions with checkable values.
+	 * Returns an empty array if the model has no configuration schema.
+	 */
+	getModelConfigurationActions(modelId: string): IAction[];
+
 	addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void>;
 
 	removeLanguageModelsProviderGroup(vendorId: string, providerGroupName: string): Promise<void>;
 
 	configureLanguageModelsProviderGroup(vendorId: string, name?: string): Promise<void>;
 
+	/**
+	 * Opens the language models configuration file and navigates to
+	 * or creates the per-model configuration for the given model.
+	 */
+	configureModel(modelId: string): Promise<void>;
+
 	migrateLanguageModelsProviderGroup(languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void>;
 
 	/**
@@ -531,6 +580,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 	private readonly _modelCache = new Map<string, ILanguageModelChatMetadata>();
 	private readonly _resolveLMSequencer = new SequencerByKey<string>();
 	private _modelPickerUserPreferences: IStringDictionary<boolean> = {};
+	private readonly _modelConfigurations = new Map<string, IStringDictionary<unknown>>();
 	private readonly _hasUserSelectableModels: IContextKey<boolean>;
 
 	private readonly _onLanguageModelChange = this._store.add(new Emitter<string>());
@@ -821,11 +871,29 @@ export class LanguageModelsService implements ILanguageModelsService {
 			}
 
 			const groups = this._languageModelsConfigurationService.getLanguageModelsProviderGroups();
+			const perModelConfigurations = new Map<string, IStringDictionary<unknown>>();
 			for (const group of groups) {
 				if (group.vendor !== vendorId) {
 					continue;
 				}
 
+				// For the default vendor, groups that only have per-model config
+				// should not trigger a separate model resolution call.
+				// Instead, apply the per-model config to the already-resolved models.
+				if (vendor.isDefault && !vendor.configuration) {
+					if (group.settings) {
+						for (const model of allModels) {
+							const modelConfig = group.settings[model.metadata.id];
+							if (modelConfig) {
+								// Store raw config (without resolving secrets) to avoid leaking secrets on persist
+								perModelConfigurations.set(model.identifier, { ...modelConfig });
+							}
+						}
+					}
+					languageModelsGroups.push({ group, modelIdentifiers: [] });
+					continue;
+				}
+
 				const configuration = await this._resolveConfiguration(group, vendor.configuration);
 
 				try {
@@ -834,6 +902,17 @@ export class LanguageModelsService implements ILanguageModelsService {
 						allModels.push(...models);
 						languageModelsGroups.push({ group, modelIdentifiers: models.map(m => m.identifier) });
 					}
+
+					// Collect per-model configurations from the group
+					if (group.settings) {
+						for (const model of models) {
+							const modelConfig = group.settings[model.metadata.id];
+							if (modelConfig) {
+								// Store raw config (without resolving secrets) to avoid leaking secrets on persist
+								perModelConfigurations.set(model.identifier, { ...modelConfig });
+							}
+						}
+					}
 				} catch (error) {
 					languageModelsGroups.push({
 						group,
@@ -861,6 +940,14 @@ export class LanguageModelsService implements ILanguageModelsService {
 			this._logService.trace(`[LM] Resolved language models for vendor ${vendorId}`, allModels);
 			hasChanges = hasChanges || oldModels.size > 0;
 
+			// Update per-model configurations for this vendor
+			this._clearModelConfigurations(vendorId);
+			for (const [identifier, config] of perModelConfigurations) {
+				if (this._modelCache.has(identifier)) {
+					this._modelConfigurations.set(identifier, config);
+				}
+			}
+
 			if (hasChanges) {
 				this._onLanguageModelChange.fire(vendorId);
 			} else {
@@ -926,13 +1013,41 @@ export class LanguageModelsService implements ILanguageModelsService {
 		});
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	async sendChatRequest(modelId: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse> {
-		const provider = this._providers.get(this._modelCache.get(modelId)?.vendor || '');
+	async sendChatRequest(modelId: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<ILanguageModelChatResponse> {
+		const metadata = this._modelCache.get(modelId);
+		const provider = this._providers.get(metadata?.vendor || '');
 		if (!provider) {
 			throw new Error(`Chat provider for model ${modelId} is not registered.`);
 		}
-		return provider.sendChatRequest(modelId, messages, from, options, token);
+		const configuration = this.getModelConfiguration(modelId);
+		const mergedOptions = configuration ? { ...options, configuration: { ...configuration, ...options.configuration } } : options;
+		return provider.sendChatRequest(modelId, messages, from, mergedOptions, token);
+	}
+
+	private _resolveModelConfigurationWithDefaults(modelId: string, metadata: ILanguageModelChatMetadata | undefined): IStringDictionary<unknown> | undefined {
+		const userConfig = this._modelConfigurations.get(modelId);
+		const schema = metadata?.configurationSchema;
+
+		if (!schema?.properties && !userConfig) {
+			return undefined;
+		}
+
+		// Start with schema defaults
+		const defaults: IStringDictionary<unknown> = {};
+		if (schema?.properties) {
+			for (const [key, propSchema] of Object.entries(schema.properties)) {
+				if (propSchema.default !== undefined) {
+					defaults[key] = propSchema.default;
+				}
+			}
+		}
+
+		if (!userConfig && Object.keys(defaults).length === 0) {
+			return undefined;
+		}
+
+		// User config overrides defaults
+		return { ...defaults, ...userConfig };
 	}
 
 	computeTokenLength(modelId: string, message: string | IChatMessage, token: CancellationToken): Promise<number> {
@@ -947,6 +1062,127 @@ export class LanguageModelsService implements ILanguageModelsService {
 		return provider.provideTokenCount(modelId, message, token);
 	}
 
+	getModelConfiguration(modelId: string): IStringDictionary<unknown> | undefined {
+		const metadata = this._modelCache.get(modelId);
+		return this._resolveModelConfigurationWithDefaults(modelId, metadata);
+	}
+
+	async setModelConfiguration(modelId: string, values: IStringDictionary<unknown>): Promise<void> {
+		const metadata = this._modelCache.get(modelId);
+		if (!metadata) {
+			return;
+		}
+
+		// Find the group from the configuration service (source of truth)
+		const allGroups = this._languageModelsConfigurationService.getLanguageModelsProviderGroups();
+		let group: ILanguageModelsProviderGroup | undefined;
+
+		// First try to find a group that already has config for this model
+		group = allGroups.find(g => g.vendor === metadata.vendor && g.settings?.[metadata.id] !== undefined);
+
+		// If not found, find any group for this vendor
+		if (!group) {
+			group = allGroups.find(g => g.vendor === metadata.vendor);
+		}
+
+		// Merge new values into existing config, removing properties set to their schema default
+		const existingConfig = this._modelConfigurations.get(modelId) ?? {};
+		const updatedConfig = { ...existingConfig, ...values };
+		const schema = metadata.configurationSchema;
+		if (schema?.properties) {
+			for (const [key, value] of Object.entries(updatedConfig)) {
+				const propSchema = schema.properties[key];
+				if (propSchema?.default !== undefined && propSchema.default === value) {
+					delete updatedConfig[key];
+				}
+			}
+		}
+
+		if (group) {
+			const existingSettings = (group.settings as IStringDictionary<IStringDictionary<unknown>> | undefined) ?? {};
+			let updatedSettings: IStringDictionary<IStringDictionary<unknown>>;
+			if (Object.keys(updatedConfig).length === 0) {
+				updatedSettings = { ...existingSettings };
+				delete updatedSettings[metadata.id];
+			} else {
+				updatedSettings = { ...existingSettings, [metadata.id]: updatedConfig };
+			}
+			const updatedGroup: ILanguageModelsProviderGroup = {
+				...group,
+				settings: Object.keys(updatedSettings).length > 0 ? updatedSettings : undefined
+			};
+			if (!updatedGroup.settings && Object.keys(updatedGroup).filter(k => k !== 'name' && k !== 'vendor' && k !== 'range' && k !== 'settings').length === 0) {
+				// Remove the group entirely if it only had model config
+				await this._languageModelsConfigurationService.removeLanguageModelsProviderGroup(group);
+			} else {
+				await this._languageModelsConfigurationService.updateLanguageModelsProviderGroup(group, updatedGroup);
+			}
+		} else if (Object.keys(updatedConfig).length > 0) {
+			// Only create a new group if there's non-default config
+			const vendor = this.getVendors().find(v => v.vendor === metadata.vendor);
+			if (!vendor) {
+				return;
+			}
+			const newGroup: ILanguageModelsProviderGroup = {
+				name: vendor.displayName,
+				vendor: metadata.vendor,
+				settings: { [metadata.id]: updatedConfig }
+			};
+			await this._languageModelsConfigurationService.addLanguageModelsProviderGroup(newGroup);
+		}
+
+		// Update the in-memory cache
+		if (Object.keys(updatedConfig).length > 0) {
+			this._modelConfigurations.set(modelId, updatedConfig);
+		} else {
+			this._modelConfigurations.delete(modelId);
+		}
+
+		// Notify listeners so UI (e.g., model picker label) updates
+		this._onLanguageModelChange.fire(metadata.vendor);
+	}
+
+	getModelConfigurationActions(modelId: string): IAction[] {
+		const metadata = this._modelCache.get(modelId);
+		const schema = metadata?.configurationSchema;
+		if (!schema?.properties) {
+			return [];
+		}
+
+		const actions: IAction[] = [];
+		const currentConfig = this._modelConfigurations.get(modelId) ?? {};
+
+		for (const [key, propSchema] of Object.entries(schema.properties)) {
+			if (!propSchema.enum || !Array.isArray(propSchema.enum)) {
+				continue;
+			}
+			const currentValue = currentConfig[key] ?? propSchema.default;
+			const label = (typeof propSchema.title === 'string' ? propSchema.title : undefined)
+				?? key.replace(/([a-z])([A-Z])/g, '$1 $2')
+					.replace(/^./, s => s.toUpperCase());
+			const defaultValue = propSchema.default;
+			const enumItemLabels = propSchema.enumItemLabels;
+			const enumDescriptions = propSchema.enumDescriptions;
+			const enumActions: IAction[] = propSchema.enum.map((value: unknown, index: number) => {
+				const itemLabel = enumItemLabels?.[index] ?? String(value);
+				const displayLabel = value === defaultValue ? localize('models.enumDefault', "{0} (default)", itemLabel) : itemLabel;
+				const tooltip = enumDescriptions?.[index] ?? '';
+				return {
+					id: `configureModel.${key}.${value}`,
+					label: displayLabel,
+					class: undefined,
+					enabled: true,
+					tooltip,
+					checked: currentValue === value,
+					run: () => this.setModelConfiguration(modelId, { [key]: value })
+				};
+			});
+			actions.push(new SubmenuAction(`configureModel.${key}`, label, enumActions));
+		}
+
+		return actions;
+	}
+
 	async configureLanguageModelsProviderGroup(vendorId: string, providerGroupName?: string): Promise<void> {
 
 		const vendor = this.getVendors().find(({ vendor }) => vendor === vendorId);
@@ -992,6 +1228,63 @@ export class LanguageModelsService implements ILanguageModelsService {
 		}
 	}
 
+	async configureModel(modelId: string): Promise<void> {
+		const metadata = this._modelCache.get(modelId);
+		if (!metadata || !metadata.configurationSchema) {
+			return;
+		}
+
+		// Find the group that contains this model
+		const vendorGroups = this._modelsGroups.get(metadata.vendor);
+		let group: ILanguageModelsProviderGroup | undefined;
+		if (vendorGroups) {
+			for (const vg of vendorGroups) {
+				if (vg.modelIdentifiers.includes(modelId) && vg.group) {
+					group = vg.group;
+					break;
+				}
+			}
+		}
+
+		// If the model doesn't belong to any configured group, create one
+		if (!group) {
+			const vendor = this.getVendors().find(v => v.vendor === metadata.vendor);
+			if (!vendor) {
+				return;
+			}
+			const groupName = vendor.displayName;
+			const newGroup: ILanguageModelsProviderGroup = { name: groupName, vendor: metadata.vendor, settings: { [metadata.id]: {} } };
+			group = await this._languageModelsConfigurationService.addLanguageModelsProviderGroup(newGroup);
+			await this._resolveAllLanguageModels(metadata.vendor, true);
+		}
+
+		// Generate a snippet for the model's configuration schema
+		const snippet = this._getModelConfigurationSnippet(metadata.id, metadata.configurationSchema);
+		await this._languageModelsConfigurationService.configureLanguageModels({ group, snippet });
+	}
+
+	private _getModelConfigurationSnippet(modelId: string, schema: ILanguageModelConfigurationSchema): string {
+		const properties: string[] = [];
+		if (schema.properties) {
+			for (const [key, propSchema] of Object.entries(schema.properties)) {
+				if (propSchema.defaultSnippets?.[0]) {
+					const snippet = propSchema.defaultSnippets[0];
+					let bodyText = snippet.bodyText ?? JSON.stringify(snippet.body, null, '\t\t\t');
+					bodyText = bodyText.replace(/"(\^[^"]*)"/g, (_, value) => value.substring(1));
+					properties.push(`\t\t\t"${key}": ${bodyText}`);
+				} else if (propSchema.default !== undefined) {
+					properties.push(`\t\t\t"${key}": ${JSON.stringify(propSchema.default)}`);
+				} else {
+					properties.push(`\t\t\t"${key}": $\{${key}\}`);
+				}
+			}
+		}
+		const modelContent = properties.length > 0
+			? `{\n${properties.join(',\n')}\n\t\t}`
+			: '{\n\t\t\t$0\n\t\t}';
+		return `"settings": {\n\t\t"${modelId}": ${modelContent}\n\t}`;
+	}
+
 	async addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void> {
 		const vendor = this.getVendors().find(({ vendor }) => vendor === vendorId);
 		if (!vendor) {
@@ -1292,6 +1585,14 @@ export class LanguageModelsService implements ILanguageModelsService {
 		return removed;
 	}
 
+	private _clearModelConfigurations(vendor: string): void {
+		for (const [id] of this._modelConfigurations) {
+			if (this._modelCache.get(id)?.vendor === vendor || id.startsWith(`${vendor}/`)) {
+				this._modelConfigurations.delete(id);
+			}
+		}
+	}
+
 	private async _resolveConfiguration(group: ILanguageModelsProviderGroup, schema: IJSONSchema | undefined): Promise<IStringDictionary<unknown>> {
 		if (!schema) {
 			return {};
@@ -1299,7 +1600,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 
 		const result: IStringDictionary<unknown> = {};
 		for (const key in group) {
-			if (key === 'vendor' || key === 'name' || key === 'range') {
+			if (key === 'vendor' || key === 'name' || key === 'range' || key === 'settings') {
 				continue;
 			}
 			let value = group[key];
@@ -1439,7 +1740,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 				if (!entry || !isObject(entry)) {
 					continue;
 				}
-				free[entry.id] = { label: entry.label, featured: entry.featured, exists: this._modelExistsInCache(entry.id) };
+				free[entry.id] = { label: entry.label, featured: entry.featured, exists: this._modelCache.has(`copilot/${entry.id}`) };
 			}
 		}
 
@@ -1449,7 +1750,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 				if (!entry || !isObject(entry)) {
 					continue;
 				}
-				paid[entry.id] = { label: entry.label, featured: entry.featured, minVSCodeVersion: entry.minVSCodeVersion, exists: this._modelExistsInCache(entry.id) };
+				paid[entry.id] = { label: entry.label, featured: entry.featured, minVSCodeVersion: entry.minVSCodeVersion, exists: this._modelCache.has(`copilot/${entry.id}`) };
 			}
 		}
 
@@ -1457,17 +1758,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 		this._onDidChangeModelsControlManifest.fire(this._modelsControlManifest);
 	}
 
-	private _modelExistsInCache(metadataId: string): boolean {
-		for (const model of this._modelCache.values()) {
-			if (model.id === metadataId) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	//#region Chat control data
-
 	private _initChatControlData(): void {
 		this._chatControlUrl = this._productService.chatParticipantRegistry;
 		if (!this._chatControlUrl) {
@@ -1512,7 +1803,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 
 		let context;
 		try {
-			context = await this._requestService.request({ type: 'GET', url: this._chatControlUrl! }, CancellationToken.None);
+			context = await this._requestService.request({ type: 'GET', url: this._chatControlUrl!, callSite: 'languageModels.fetchChatControlData' }, CancellationToken.None);
 		} catch (err) {
 			this._logService.warn('[LM] Failed to request chat control data', getErrorMessage(err));
 			return;
diff --git a/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts b/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts
index 4f0dfa41691..86c0d307537 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts
@@ -38,4 +38,5 @@ export interface ILanguageModelsProviderGroup extends IStringDictionary<unknown>
 	readonly name: string;
 	readonly vendor: string;
 	readonly range?: IRange;
+	readonly settings?: IStringDictionary<IStringDictionary<unknown>>;
 }
diff --git a/src/vs/workbench/contrib/chat/common/model/chatModel.ts b/src/vs/workbench/contrib/chat/common/model/chatModel.ts
index 8d433ce3efd..755fdd2ffb6 100644
--- a/src/vs/workbench/contrib/chat/common/model/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatModel.ts
@@ -437,13 +437,15 @@ class AbstractResponse implements IResponse {
 
 	/**
 	 * A stringified representation of response data which might be presented to a screenreader or used when copying a response.
+	 * Computed lazily on demand to avoid expensive string rebuilding during streaming.
 	 */
-	protected _responseRepr = '';
+	private _responseRepr: string | undefined;
 
 	/**
-	 * Just the markdown content of the response, used for determining the rendering rate of markdown
+	 * Just the markdown content of the response, used for determining the rendering rate of markdown.
+	 * Computed lazily on demand to avoid expensive string rebuilding during streaming.
 	 */
-	protected _markdownContent = '';
+	private _markdownContent: string | undefined;
 
 	get value(): IChatProgressResponseContent[] {
 		return this._responseParts;
@@ -451,10 +453,12 @@ class AbstractResponse implements IResponse {
 
 	constructor(value: IChatProgressResponseContent[]) {
 		this._responseParts = value;
-		this._updateRepr();
 	}
 
 	toString(): string {
+		if (this._responseRepr === undefined) {
+			this._responseRepr = this.computeRepr();
+		}
 		return this._responseRepr;
 	}
 
@@ -462,23 +466,36 @@ class AbstractResponse implements IResponse {
 	 * _Just_ the content of markdown parts in the response
 	 */
 	getMarkdown(): string {
+		if (this._markdownContent === undefined) {
+			this._markdownContent = this.computeMarkdownContent();
+		}
 		return this._markdownContent;
 	}
 
-	protected _updateRepr() {
-		this._responseRepr = this.partsToRepr(this._responseParts);
+	/**
+	 * Invalidate cached representations so they are recomputed on next access.
+	 */
+	protected _invalidateRepr() {
+		this._responseRepr = undefined;
+		this._markdownContent = undefined;
+	}
 
-		this._markdownContent = this._responseParts.map(part => {
+	private computeMarkdownContent(): string {
+		const segments: string[] = [];
+		for (const part of this._responseParts) {
 			if (part.kind === 'inlineReference') {
-				return this.inlineRefToRepr(part);
+				segments.push(this.inlineRefToRepr(part));
 			} else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
-				return part.content.value;
-			} else {
-				return '';
+				if (part.content.value.length > 0) {
+					segments.push(part.content.value);
+				}
 			}
-		})
-			.filter(s => s.length > 0)
-			.join('');
+		}
+		return segments.join('');
+	}
+
+	protected computeRepr(): string {
+		return this.partsToRepr(this._responseParts);
 	}
 
 	private partsToRepr(parts: readonly IChatProgressResponseContent[]): string {
@@ -674,7 +691,7 @@ export class Response extends AbstractResponse implements IDisposable {
 
 	clear(): void {
 		this._responseParts = [];
-		this._updateRepr(true);
+		this._contentChanged(true);
 	}
 
 	clearToPreviousToolInvocation(message?: string): void {
@@ -695,7 +712,7 @@ export class Response extends AbstractResponse implements IDisposable {
 		if (message) {
 			this._responseParts.push({ kind: 'warning', content: new MarkdownString(message) });
 		}
-		this._updateRepr(true);
+		this._contentChanged(true);
 	}
 
 	updateContent(progress: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit | IChatTask | IChatExternalToolInvocationUpdate, quiet?: boolean): void {
@@ -724,7 +741,7 @@ export class Response extends AbstractResponse implements IDisposable {
 				const idx = this._responseParts.indexOf(lastResponsePart);
 				this._responseParts[idx] = { ...lastResponsePart, content: appendMarkdownString(lastResponsePart.content, progress.content) };
 			}
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 		} else if (progress.kind === 'thinking') {
 
 			// tries to split thinking chunks if it is an array. only while certain models give us array chunks.
@@ -752,7 +769,7 @@ export class Response extends AbstractResponse implements IDisposable {
 					value: appendMarkdownString(new MarkdownString(lastText), new MarkdownString(currText)).value
 				};
 			}
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 		} else if (progress.kind === 'textEdit' || progress.kind === 'notebookEdit') {
 			// merge edits for the same file no matter when they come in
 			const notebookUri = CellUri.parse(progress.uri)?.notebook;
@@ -770,14 +787,14 @@ export class Response extends AbstractResponse implements IDisposable {
 				// Notebook cell edits (ICellEditOperation)
 				this._mergeOrPushNotebookEditGroup(uri, progress.edits, progress.done, isExternalEdit);
 			}
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 		} else if (progress.kind === 'progressTask') {
 			// Add a new resolving part
 			const responsePosition = this._responseParts.push(progress) - 1;
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 
 			const disp = progress.onDidAddProgress(() => {
-				this._updateRepr(false);
+				this._contentChanged(false);
 			});
 
 			progress.task?.().then((content) => {
@@ -788,32 +805,32 @@ export class Response extends AbstractResponse implements IDisposable {
 				if (typeof content === 'string') {
 					(this._responseParts[responsePosition] as IChatTask).content = new MarkdownString(content);
 				}
-				this._updateRepr(false);
+				this._contentChanged(false);
 			});
 
 		} else if (progress.kind === 'toolInvocation') {
 			autorunSelfDisposable(reader => {
 				progress.state.read(reader); // update repr when state changes
-				this._updateRepr(false);
+				this._contentChanged(false);
 
 				if (IChatToolInvocation.isComplete(progress, reader)) {
 					reader.dispose();
 				}
 			});
 			this._responseParts.push(progress);
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 		} else if (progress.kind === 'externalToolInvocationUpdate') {
 			this._handleExternalToolInvocationUpdate(progress);
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 		} else {
 			this._responseParts.push(progress);
-			this._updateRepr(quiet);
+			this._contentChanged(quiet);
 		}
 	}
 
 	public addCitation(citation: IChatCodeCitation) {
 		this._citations.push(citation);
-		this._updateRepr();
+		this._contentChanged();
 	}
 
 	private _mergeOrPushTextEditGroup(uri: URI, edits: TextEdit[], done: boolean | undefined, isExternalEdit: boolean | undefined): void {
@@ -845,6 +862,9 @@ export class Response extends AbstractResponse implements IDisposable {
 		);
 
 		if (existingInvocation) {
+			if (progress.toolSpecificData !== undefined) {
+				existingInvocation.toolSpecificData = progress.toolSpecificData;
+			}
 			if (progress.isComplete) {
 				existingInvocation.didExecuteTool({
 					content: [],
@@ -853,9 +873,6 @@ export class Response extends AbstractResponse implements IDisposable {
 					toolResultDetails: progress.resultDetails
 				});
 			}
-			if (progress.toolSpecificData !== undefined) {
-				existingInvocation.toolSpecificData = progress.toolSpecificData;
-			}
 			return;
 		}
 
@@ -883,28 +900,30 @@ export class Response extends AbstractResponse implements IDisposable {
 
 		if (progress.isComplete) {
 			// Already completed on first push
+			if (progress.toolSpecificData !== undefined) {
+				invocation.toolSpecificData = progress.toolSpecificData;
+			}
 			invocation.didExecuteTool({
 				content: [],
 				toolResultMessage: progress.pastTenseMessage,
 				toolResultError: progress.errorMessage,
 				toolResultDetails: progress.resultDetails
 			});
-			if (progress.toolSpecificData !== undefined) {
-				invocation.toolSpecificData = progress.toolSpecificData;
-			}
 		}
 
 		this._responseParts.push(invocation);
 	}
 
-	protected override _updateRepr(quiet?: boolean) {
-		super._updateRepr();
-		if (!this._onDidChangeValue) {
-			return; // called from parent constructor
+	protected override computeRepr(): string {
+		let repr = super.computeRepr();
+		if (this._citations.length) {
+			repr += '\n\n' + getCodeCitationsMessage(this._citations);
 		}
+		return repr;
+	}
 
-		this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
-
+	private _contentChanged(quiet?: boolean) {
+		this._invalidateRepr();
 		if (!quiet) {
 			this._onDidChangeValue.fire();
 		}
@@ -1645,6 +1664,9 @@ export interface IChatModelInputState {
 	/** Current selection ranges */
 	selections: ISelection[];
 
+	/** Current permission level for tool auto-approval */
+	permissionLevel?: ChatPermissionLevel;
+
 	/** Contributed stored state */
 	contrib: Record<string, unknown>;
 }
@@ -1664,6 +1686,7 @@ export interface ISerializableChatModelInputState {
 	} | undefined;
 	inputText: string;
 	selections: ISelection[];
+	permissionLevel?: ChatPermissionLevel;
 	contrib: Record<string, unknown>;
 }
 
@@ -1886,7 +1909,8 @@ class InputModel implements IInputModel {
 				metadata: value.selectedModel.metadata
 			} : undefined,
 			inputText: value.inputText,
-			selections: value.selections
+			selections: value.selections,
+			permissionLevel: value.permissionLevel,
 		};
 	}
 }
@@ -2178,7 +2202,8 @@ export class ChatModel extends Disposable implements IChatModel {
 			},
 			contrib: serializedInputState.contrib,
 			inputText: serializedInputState.inputText,
-			selections: serializedInputState.selections
+			selections: serializedInputState.selections,
+			permissionLevel: serializedInputState.permissionLevel,
 		});
 
 		this.dataSerializer = dataRef?.serializer;
@@ -2790,7 +2815,7 @@ export namespace ChatResponseResource {
 		}
 
 		const parts = uri.path.split('/');
-		if (parts.length < 5) {
+		if (parts.length < 4) {
 			return undefined;
 		}
 
diff --git a/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData.ts b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData.ts
index 5feb507b755..7cc5a5425ff 100644
--- a/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData.ts
@@ -18,6 +18,7 @@ export class ChatQuestionCarouselData implements IChatQuestionCarousel {
 	public readonly completion = new DeferredPromise<{ answers: IChatQuestionAnswers | undefined }>();
 	public draftAnswers: IChatQuestionAnswers | undefined;
 	public draftCurrentIndex: number | undefined;
+	public draftCollapsed: boolean | undefined;
 
 	constructor(
 		public questions: IChatQuestion[],
diff --git a/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts
index a18f4db9d93..0879932c884 100644
--- a/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts
@@ -6,6 +6,7 @@
 import { encodeBase64 } from '../../../../../../base/common/buffer.js';
 import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { IObservable, ISettableObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { localize } from '../../../../../../nls.js';
 import { ConfirmedReason, IChatExtensionsContent, IChatModifiedFilesConfirmationData, IChatSimpleToolInvocationData, IChatSubagentToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind, type IChatTerminalToolInvocationData } from '../../chatService/chatService.js';
 import { IPreparedToolInvocation, isToolResultOutputDetails, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from '../../tools/languageModelToolsService.js';
@@ -27,11 +28,13 @@ export class ChatToolInvocation implements IChatToolInvocation {
 	public confirmationMessages: IToolConfirmationMessages | undefined;
 	public presentation: IPreparedToolInvocation['presentation'];
 	public readonly toolId: string;
+	public readonly icon?: ThemeIcon;
 	public source: ToolDataSource;
 	public readonly subAgentInvocationId: string | undefined;
 	public parameters: unknown;
 	public generatedTitle?: string;
 	public readonly chatRequestId?: string;
+	public isAttachedToThinking: boolean = false;
 
 	public toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatModifiedFilesConfirmationData;
 
@@ -74,7 +77,7 @@ export class ChatToolInvocation implements IChatToolInvocation {
 		// For streaming invocations, use a default message until handleToolStream provides one
 		let defaultMessage: string | IMarkdownString = '';
 		if (startOptions.startInStreaming) {
-			defaultMessage = localize('toolInvocationMessage', "Using \"{0}\"", toolData.displayName);
+			defaultMessage = toolData.displayName;
 		} else if (startOptions.startInCancelled) {
 			defaultMessage = startOptions.cancelReasonMessage ?? localize('toolDeniedMessage', "Tool \"{0}\" was denied", toolData.displayName);
 		}
@@ -85,6 +88,7 @@ export class ChatToolInvocation implements IChatToolInvocation {
 		this.presentation = preparedInvocation?.presentation;
 		this.toolSpecificData = preparedInvocation?.toolSpecificData;
 		this.toolId = toolData.id;
+		this.icon = preparedInvocation?.icon ?? (toolData.icon && ThemeIcon.isThemeIcon(toolData.icon) ? toolData.icon : undefined);
 		this.source = toolData.source;
 		this.subAgentInvocationId = subAgentInvocationId;
 		this.parameters = parameters;
diff --git a/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts b/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts
index 9c69890c9a7..ab760e3bb3e 100644
--- a/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts
@@ -161,6 +161,7 @@ const inputStateSchema = Adapt.object<ISerializableChatModelInputState, ISeriali
 	selectedModel: Adapt.v(i => i.selectedModel, (a, b) => a?.identifier === b?.identifier),
 	inputText: Adapt.v(i => i.inputText),
 	selections: Adapt.v(i => i.selections, objectsEqual),
+	permissionLevel: Adapt.v(i => i.permissionLevel),
 	contrib: Adapt.v(i => i.contrib, objectsEqual),
 });
 
diff --git a/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts b/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts
index 28253d0586e..1d1991e324d 100644
--- a/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts
@@ -9,7 +9,7 @@ import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { revive } from '../../../../../base/common/marshalling.js';
-import { joinPath } from '../../../../../base/common/resources.js';
+import { isEqual, joinPath } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -27,7 +27,7 @@ import { ILifecycleService } from '../../../../services/lifecycle/common/lifecyc
 import { IWorkspaceEditingService } from '../../../../services/workspaces/common/workspaceEditing.js';
 import { awaitStatsForSession } from '../chat.js';
 import { IChatSessionStats, IChatSessionTiming, ResponseModelState } from '../chatService/chatService.js';
-import { ChatAgentLocation } from '../constants.js';
+import { ChatAgentLocation, ChatPermissionLevel } from '../constants.js';
 import { ModifiedFileEntryState } from '../editing/chatEditingService.js';
 import { ChatModel, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, ISerializedChatDataReference, normalizeSerializableChatData } from './chatModel.js';
 import { ChatSessionOperationLog } from './chatSessionOperationLog.js';
@@ -115,7 +115,7 @@ export class ChatSessionStore extends Disposable {
 			joinPath(this.environmentService.workspaceStorageHome, newWorkspaceId, 'chatSessions');
 
 		// If the storage roots are identical, there is nothing to migrate
-		if (oldStorageRoot.toString() === newStorageRoot.toString()) {
+		if (isEqual(oldStorageRoot, newStorageRoot)) {
 			this.storageRoot = newStorageRoot;
 			return;
 		}
@@ -752,6 +752,11 @@ export interface IChatSessionEntryMetadata {
 	 * Whether this session was loaded from an external provider (eg background/cloud sessions).
 	 */
 	isExternal?: boolean;
+
+	/**
+	 * The permission level for tool auto-approval, if not default.
+	 */
+	permissionLevel?: ChatPermissionLevel;
 }
 
 function isChatSessionEntryMetadata(obj: unknown): obj is IChatSessionEntryMetadata {
@@ -836,6 +841,7 @@ async function getSessionMetadata(session: ChatModel | ISerializableChatData): P
 		stats,
 		isExternal: session instanceof ChatModel && !LocalChatSessionUri.parseLocalSessionId(session.sessionResource),
 		lastResponseState,
+		permissionLevel: session instanceof ChatModel ? session.inputModel.state.get()?.permissionLevel : undefined,
 	};
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/model/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/model/chatViewModel.ts
index 5c53cac197f..0c799d61f20 100644
--- a/src/vs/workbench/contrib/chat/common/model/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatViewModel.ts
@@ -7,6 +7,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { IObservable } from '../../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -645,11 +646,13 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 			this.liveUpdateTracker = this.instantiationService.createInstance(ChatStreamStatsTracker);
 		}
 
+		const wordCountScheduler = this.liveUpdateTracker ? this._register(new RunOnceScheduler(() => {
+			const wordCount = countWords(_model.entireResponse.getMarkdown());
+			this.liveUpdateTracker!.update({ totalWordCount: wordCount });
+		}, 0)) : undefined;
+
 		this._register(_model.onDidChange(() => {
-			if (this.liveUpdateTracker) {
-				const wordCount = countWords(_model.entireResponse.getMarkdown());
-				this.liveUpdateTracker.update({ totalWordCount: wordCount });
-			}
+			wordCountScheduler?.schedule();
 
 			// new data -> new id, new content to render
 			this._modelChangeCount++;
diff --git a/src/vs/workbench/contrib/chat/common/participants/chatAgents.ts b/src/vs/workbench/contrib/chat/common/participants/chatAgents.ts
index e8f4fbe4a03..e6cdfd9e005 100644
--- a/src/vs/workbench/contrib/chat/common/participants/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/participants/chatAgents.ts
@@ -5,6 +5,7 @@
 
 import { findLast } from '../../../../../base/common/arraysFind.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../../../base/common/collections.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
@@ -146,6 +147,7 @@ export interface IChatAgentRequest {
 	acceptedConfirmationData?: unknown[];
 	rejectedConfirmationData?: unknown[];
 	userSelectedModelId?: string;
+	modelConfiguration?: IStringDictionary<unknown>;
 	userSelectedTools?: UserSelectedTools;
 	modeInstructions?: IChatRequestModeInstructions;
 	editedFileEvents?: IChatAgentEditedFileEvent[];
diff --git a/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts b/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts
index 35c609e3c7d..d517710e084 100644
--- a/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts
+++ b/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts
@@ -6,6 +6,7 @@
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ContextKeyExpression } from '../../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IProgress } from '../../../../../platform/progress/common/progress.js';
 import { IChatMessage } from '../languageModels.js';
@@ -38,7 +39,13 @@ export interface IChatSlashData {
 
 	locations: ChatAgentLocation[];
 	modes?: ChatModeKind[];
-	target?: Target;
+	targets?: Target[];
+
+	/**
+	 * Optional context key expression that controls visibility of this command.
+	 * When set, the command is only shown if the expression evaluates to true.
+	 */
+	when?: ContextKeyExpression;
 }
 
 export interface IChatSlashFragment {
diff --git a/src/vs/workbench/contrib/chat/common/plugins/AGENTS_PLUGINS.md b/src/vs/workbench/contrib/chat/common/plugins/AGENTS_PLUGINS.md
new file mode 100644
index 00000000000..74bd0ab92f6
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/plugins/AGENTS_PLUGINS.md
@@ -0,0 +1,205 @@
+# Agent Plugins Architecture
+
+Agent plugins are a modular extension system that allows external packages of prompts, hooks, skills, agents, and MCP server definitions to be discovered, installed, and contributed into the chat experience. This document describes the architecture of the `src/vs/workbench/contrib/chat/common/plugins/` layer and its browser-side implementations.
+
+## Directory Structure
+
+### Common layer (`common/plugins/`)
+| File | Role |
+|------|------|
+| `agentPluginService.ts` | Core interfaces (`IAgentPlugin`, `IAgentPluginService`, `IAgentPluginDiscovery`) and the discovery registry singleton |
+| `agentPluginServiceImpl.ts` | `AgentPluginService` implementation, `AbstractAgentPluginDiscovery` base class, format adapters (Copilot / Claude / Open Plugin) |
+| `agentPluginRepositoryService.ts` | `IAgentPluginRepositoryService` — abstract repository clone/pull/cache operations |
+| `pluginMarketplaceService.ts` | `IPluginMarketplaceService` — marketplace metadata, installed-plugin storage, trusted-marketplace tracking, periodic update checks |
+| `pluginInstallService.ts` | `IPluginInstallService` — install/update orchestration interface |
+| `pluginSource.ts` | `IPluginSource` — per-source-kind strategy interface (install path, ensure, update, cleanup) |
+
+### Browser layer (`browser/`)
+| File | Role |
+|------|------|
+| `agentPluginRepositoryService.ts` | Browser implementation of `IAgentPluginRepositoryService` (git clone/pull via Git service) |
+| `pluginSources.ts` | Concrete `IPluginSource` implementations: `GitHubPluginSource`, `GitUrlPluginSource`, `NpmPluginSource`, `PipPluginSource`, `RelativePathPluginSource` |
+| `pluginInstallService.ts` | Browser implementation of `IPluginInstallService` |
+| `agentPluginsView.ts` | Installed-plugins tree view UI |
+| `agentPluginActions.ts` | Context-menu actions for plugins |
+| `agentPluginEditor/` | Rich editor for browsing a single plugin's contents |
+
+## Core Interfaces
+
+### IAgentPlugin
+
+Represents a single discovered plugin:
+
+```
+uri              – Unique filesystem URI for the plugin root
+label            – Human-readable display name
+enablement       – Observable enable/disable state (ContributionEnablementState)
+hooks            – Observable list of IAgentPluginHook
+commands         – Observable list of IAgentPluginCommand  (*.md files in commands/)
+skills           – Observable list of IAgentPluginSkill    (dirs with SKILL.md in skills/)
+agents           – Observable list of IAgentPluginAgent    (*.md files in agents/)
+mcpServerDefinitions – Observable list of IAgentPluginMcpServerDefinition
+fromMarketplace  – Set when the plugin was installed from a marketplace
+remove()         – Removes this plugin from its discovery source
+```
+
+### IAgentPluginService
+
+Main entry point consumed by the rest of the workbench:
+
+```
+plugins          – IObservable<readonly IAgentPlugin[]>  (aggregate of all discoveries, deduped by URI)
+enablementModel  – Shared IEnablementModel for plugin enable/disable state
+```
+
+Registered as `InstantiationType.Delayed` — only instantiated when first injected.
+
+### IAgentPluginDiscovery
+
+Strategy for finding plugins from a particular source:
+
+```
+plugins  – IObservable<readonly IAgentPlugin[]>
+start(enablementModel) – Begin watching the source
+```
+
+Discoveries are registered into the global `agentPluginDiscoveryRegistry` singleton and instantiated by `AgentPluginService` on startup.
+
+## Discovery & Plugin Reading
+
+### AbstractAgentPluginDiscovery
+
+Shared base class that handles:
+
+1. **Format detection** — auto-detects whether a plugin uses the Copilot, Claude, or Open Plugin format based on path conventions and manifest existence.
+2. **Content reading** — reads commands, skills, agents, hooks, and MCP server definitions from the filesystem.
+3. **File watching** — watches plugin directories for changes and re-reads contents on a 200 ms debounced scheduler.
+4. **Observable propagation** — sets the `plugins` observable on each refresh cycle.
+
+Subclasses implement `_discoverPluginSources()` to determine *which* plugin URIs exist.
+
+### Discovery Implementations
+
+**ConfiguredAgentPluginDiscovery** — resolves `chat.pluginLocations` configuration entries (absolute, tilde-expanded, or workspace-relative paths) and watches for config changes.
+
+**MarketplaceAgentPluginDiscovery** — discovers plugins from `IPluginMarketplaceService.installedPlugins` and delegates to the install/repository services for on-disk availability.
+
+### Plugin Formats
+
+Three format adapters implement `IAgentPluginFormatAdapter`:
+
+| | Copilot | Claude | Open Plugin |
+|-|---------|--------|-------------|
+| Manifest | `plugin.json` | `.claude-plugin/plugin.json` | `.plugin/plugin.json` |
+| Hooks config | `hooks.json` | `hooks/hooks.json` | `hooks/hooks.json` |
+| Hook parser | `parseCopilotHooks()` | `parseClaudeHooks()` | `parseClaudeHooks()` |
+| Special handling | — | `${CLAUDE_PLUGIN_ROOT}` token replacement, `CLAUDE_PLUGIN_ROOT` env var injection | `${PLUGIN_ROOT}` token replacement, `PLUGIN_ROOT` env var injection |
+
+Auto-detection logic: if a `.plugin/plugin.json` manifest exists, the Open Plugin adapter is used; if the plugin URI path contains `.claude` or a `.claude-plugin/plugin.json` manifest exists, the Claude adapter is used; otherwise, the Copilot adapter is used.
+
+### Plugin Contents (Filesystem Layout)
+
+```
+<plugin-root>/
+├── plugin.json                                    # Copilot manifest
+├── .claude-plugin/plugin.json                     # Claude manifest
+├── .plugin/plugin.json                            # Open Plugin manifest
+├── hooks.json   OR  hooks/hooks.json              # hook definitions
+├── .mcp.json                                      # MCP server definitions (optional)
+├── commands/
+│   ├── do-thing.md                                # → IAgentPluginCommand
+│   └── other.md
+├── skills/
+│   └── my-skill/
+│       └── SKILL.md                               # → IAgentPluginSkill
+└── agents/
+    └── helper.md                                  # → IAgentPluginAgent
+```
+
+## Marketplace & Installation
+
+### IPluginMarketplaceService
+
+Manages the catalog of available and installed plugins:
+
+- **Fetch** — reads `chat.pluginMarketplaces` config (GitHub shorthand, Git URLs, or file URIs), fetches `marketplace.json` from each, and returns parsed `IMarketplacePlugin` entries.
+- **Installed storage** — persists installed plugins in application-scoped storage (`chat.plugins.installed.v1`). Each entry tracks `{ pluginUri, plugin, enabled }`.
+- **Trust** — marketplace canonical IDs must be explicitly trusted before install proceeds (`chat.plugins.trustedMarketplaces.v1`).
+- **Auto-update** — checks for upstream changes approximately every 24 hours when `extensions.autoUpdate` is enabled; sets `hasUpdatesAvailable` observable.
+- **GitHub caching** — caches raw GitHub API responses with an 8-hour TTL to avoid repeated fetches.
+
+### Marketplace Definition Files
+
+Checked in order per repository:
+1. `marketplace.json` → `MarketplaceType.OpenPlugin`
+2. `.plugin/marketplace.json` → `MarketplaceType.OpenPlugin`
+3. `.github/plugin/marketplace.json` → `MarketplaceType.Copilot`
+4. `.claude-plugin/marketplace.json` → `MarketplaceType.Claude`
+
+### IPluginInstallService
+
+Orchestrates install and update workflows:
+
+- `installPlugin()` — checks marketplace trust, delegates to the appropriate source strategy to ensure files are locally available, and registers the plugin in installed storage.
+- `updatePlugin()` / `updateAllPlugins()` — pulls latest changes for cloned repositories and re-runs package-manager installs where applicable.
+
+### Plugin Source Strategies (IPluginSource)
+
+Each `PluginSourceKind` has a strategy that knows how to compute cache paths, provision files, update, and clean up:
+
+| Kind | Provisioning | Cache path |
+|------|-------------|------------|
+| `RelativePath` | No-op (lives inside marketplace repo) | `<cacheRoot>/github.com/<owner>/<repo>/<path>` |
+| `GitHub` | `git clone` / `git pull` | `<cacheRoot>/github.com/<owner>/<repo>[/ref_<ref>]` |
+| `GitUrl` | `git clone` / `git pull` | `<cacheRoot>/<host>/<path>[/ref_<ref>]` |
+| `Npm` | `npm install` in terminal | `<cacheRoot>/npm/<sanitized-package>/` |
+| `Pip` | `pip install` in terminal | `<cacheRoot>/pip/<package>/` |
+
+## Configuration & Storage Keys
+
+### Configuration
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| `chat.pluginsEnabled` | boolean | `true` | Master switch for the plugin system |
+| `chat.pluginLocations` | `Record<string, boolean>` | `{}` | Local plugin directories to discover |
+| `chat.pluginMarketplaces` | `string[]` | `[]` | Marketplace references to fetch from |
+
+### Storage (ApplicationScope, MachineTarget)
+| Key | Description |
+|-----|-------------|
+| `chat.plugins.installed.v1` | Installed marketplace plugins |
+| `chat.plugins.trustedMarketplaces.v1` | User-trusted marketplace canonical IDs |
+| `chat.plugins.lastFetchedPlugins.v2` | Last marketplace fetch results (persisted until next fetch) |
+| `chat.plugins.marketplaces.githubCache.v1` | GitHub API response cache (8 hour TTL) |
+| `chat.plugins.lastUpdateCheck.v1` | Timestamp of last periodic update check |
+
+### Enablement Storage
+| Key | Description |
+|-----|-------------|
+| `agentPlugins.enablement` | Per-plugin enable/disable state (shared `EnablementModel`) |
+
+## Reactivity Model
+
+The entire system is built on `IObservable`:
+
+1. **Configuration observables** (`observableConfigValue`) — push changes when settings are modified.
+2. **Discovery observables** — each `IAgentPluginDiscovery` exposes an `IObservable<readonly IAgentPlugin[]>` updated on filesystem changes.
+3. **Service-level derived** — `AgentPluginService.plugins` is a `derived()` that aggregates all discovery observables, dedupes by URI, and sorts.
+4. **Per-plugin observables** — each `IAgentPlugin` has observable properties for hooks, commands, skills, agents, and MCP definitions that update independently on file changes.
+5. **UI bindings** — views and editors use `autorun()` / `derived()` to reactively render plugin state.
+
+## Integration Points
+
+- **Chat prompts** — plugin hooks are contributed to the prompt system via the hook infrastructure.
+- **MCP servers** — plugins can define MCP server configurations (stdio or SSE) that are registered with the MCP platform.
+- **AI Customization UI** — the AI customization views aggregate plugin stats alongside MCP servers, prompts, and other customization surfaces.
+- **Extension API** — the plugin system is internal; there is no public `vscode` API surface for third-party access.
+
+## Key Design Patterns
+
+- **Strategy pattern** — format adapters (`IAgentPluginFormatAdapter`) and source strategies (`IPluginSource`) allow the system to support multiple plugin formats and installation mechanisms without coupling.
+- **Discovery registry** — `agentPluginDiscoveryRegistry` decouples discovery implementations from the core service via `SyncDescriptor0<IAgentPluginDiscovery>` registration.
+- **Disposable management** — plugin entries are tracked in a `Map` keyed by URI string, each with its own `DisposableStore` for file watchers. Removal or format changes dispose the store.
+- **Debounced refresh** — filesystem changes trigger a 200 ms `RunOnceScheduler` to batch rapid edits into a single re-read.
+- **Deduplication** — multiple discoveries may produce the same plugin URI; the service dedupes via `ResourceSet` and sorts by URI for stable ordering.
+- **Lazy instantiation** — the service is registered as `InstantiationType.Delayed` and only created on first injection.
diff --git a/src/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.ts b/src/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.ts
index ea90fb6f832..7ad90d2fd26 100644
--- a/src/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.ts
+++ b/src/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.ts
@@ -102,9 +102,13 @@ export interface IAgentPluginRepositoryService {
 	 * the marketplace repository cache). For direct sources (github, url, npm,
 	 * pip) the cache directory is deleted.
 	 *
+	 * When {@link otherInstalledDescriptors} is provided, deletion is skipped
+	 * if any of those descriptors share the same cleanup target directory
+	 * (e.g. multiple plugins installed from the same cloned repository).
+	 *
 	 * This is best-effort: failures are logged but do not throw.
 	 */
-	cleanupPluginSource(plugin: IMarketplacePlugin): Promise<void>;
+	cleanupPluginSource(plugin: IMarketplacePlugin, otherInstalledDescriptors?: readonly IPluginSourceDescriptor[]): Promise<void>;
 
 	/**
 	 * Silently fetches remote refs for a cloned marketplace repository and
diff --git a/src/vs/workbench/contrib/chat/common/plugins/agentPluginService.ts b/src/vs/workbench/contrib/chat/common/plugins/agentPluginService.ts
index 348cf81f5f5..3f531617166 100644
--- a/src/vs/workbench/contrib/chat/common/plugins/agentPluginService.ts
+++ b/src/vs/workbench/contrib/chat/common/plugins/agentPluginService.ts
@@ -20,6 +20,8 @@ export const IAgentPluginService = createDecorator<IAgentPluginService>('agentPl
 export interface IAgentPluginHook {
 	readonly type: HookType;
 	readonly hooks: readonly IHookCommand[];
+	/** URI where this hook is defined -- not unique, multiple hooks may be in a manifest */
+	readonly uri: URI;
 	readonly originalId: string;
 }
 
@@ -38,9 +40,15 @@ export interface IAgentPluginAgent {
 	readonly name: string;
 }
 
+export interface IAgentPluginInstruction {
+	readonly uri: URI;
+	readonly name: string;
+}
+
 export interface IAgentPluginMcpServerDefinition {
 	readonly name: string;
 	readonly configuration: IMcpServerConfiguration;
+	readonly uri: URI;
 }
 
 export interface IAgentPlugin {
@@ -54,6 +62,7 @@ export interface IAgentPlugin {
 	readonly commands: IObservable<readonly IAgentPluginCommand[]>;
 	readonly skills: IObservable<readonly IAgentPluginSkill[]>;
 	readonly agents: IObservable<readonly IAgentPluginAgent[]>;
+	readonly instructions: IObservable<readonly IAgentPluginInstruction[]>;
 	readonly mcpServerDefinitions: IObservable<readonly IAgentPluginMcpServerDefinition[]>;
 	/** Set when the plugin was installed from a marketplace repository. */
 	readonly fromMarketplace?: IMarketplacePlugin;
diff --git a/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.ts b/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.ts
index 71f88c2d67f..b9906118a81 100644
--- a/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.ts
@@ -4,58 +4,73 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
 import { parse as parseJSONC } from '../../../../../base/common/json.js';
 import { untildify } from '../../../../../base/common/labels.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
-import { cloneAndChange } from '../../../../../base/common/objects.js';
-import { autorun, derived, IObservable, observableValue } from '../../../../../base/common/observable.js';
+import { cloneAndChange, equals } from '../../../../../base/common/objects.js';
+import { autorun, derived, derivedOpts, IObservable, ObservablePromise, observableSignal, observableValue } from '../../../../../base/common/observable.js';
 import {
 	posix,
 	win32
 } from '../../../../../base/common/path.js';
 import {
 	basename,
-	extname, joinPath
+	extname, isEqualOrParent, joinPath, normalizePath
 } from '../../../../../base/common/resources.js';
 import { escapeRegExpCharacters } from '../../../../../base/common/strings.js';
-import { Mutable } from '../../../../../base/common/types.js';
+import { hasKey, Mutable } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ConfigurationTarget, getConfigValueInTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IMcpServerConfiguration, IMcpStdioServerConfiguration, McpServerType } from '../../../../../platform/mcp/common/mcpPlatformTypes.js';
+import { IMcpRemoteServerConfiguration, IMcpServerConfiguration, IMcpStdioServerConfiguration, McpServerType } from '../../../../../platform/mcp/common/mcpPlatformTypes.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { localize } from '../../../../../nls.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { ExtensionIdentifier, IExtensionManifest } from '../../../../../platform/extensions/common/extensions.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { Extensions, IExtensionFeaturesRegistry, IExtensionFeatureTableRenderer, IRenderedData, IRowData, ITableData } from '../../../../services/extensionManagement/common/extensionFeatures.js';
+import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
 import { IPathService } from '../../../../services/path/common/pathService.js';
 import { ChatConfiguration } from '../constants.js';
+import { EnablementModel, IEnablementModel } from '../enablement.js';
 import { parseClaudeHooks } from '../promptSyntax/hookClaudeCompat.js';
 import { parseCopilotHooks } from '../promptSyntax/hookCompatibility.js';
 import { IHookCommand } from '../promptSyntax/hookSchema.js';
-import { agentPluginDiscoveryRegistry, IAgentPlugin, IAgentPluginAgent, IAgentPluginCommand, IAgentPluginDiscovery, IAgentPluginHook, IAgentPluginMcpServerDefinition, IAgentPluginService, IAgentPluginSkill } from './agentPluginService.js';
-import { EnablementModel, IEnablementModel } from '../enablement.js';
 import { IAgentPluginRepositoryService } from './agentPluginRepositoryService.js';
+import { agentPluginDiscoveryRegistry, IAgentPlugin, IAgentPluginDiscovery, IAgentPluginHook, IAgentPluginInstruction, IAgentPluginMcpServerDefinition, IAgentPluginService, IAgentPluginSkill } from './agentPluginService.js';
 import { IMarketplacePlugin, IPluginMarketplaceService } from './pluginMarketplaceService.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.js';
 
 const COMMAND_FILE_SUFFIX = '.md';
 
+/** File suffixes accepted for rule/instruction files (longest first for correct name stripping). */
+const RULE_FILE_SUFFIXES = ['.instructions.md', '.mdc', '.md'];
+
 const enum AgentPluginFormat {
 	Copilot,
 	Claude,
+	OpenPlugin,
 }
 
 interface IAgentPluginFormatAdapter {
 	readonly format: AgentPluginFormat;
-	readonly manifestPaths: readonly string[];
-	readonly hookConfigPaths: readonly string[];
-	readonly hookWatchPaths: readonly string[];
-	parseHooks(json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[];
+	readonly manifestPath: string;
+	readonly hookConfigPath: string;
+	readonly pluginRootToken: string | undefined;
+	readonly pluginRootEnvVar: string | undefined;
+	parseHooks(hookURI: URI, json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[];
 }
 
-function mapParsedHooks(parsed: Map<IAgentPluginHook['type'], { hooks: IAgentPluginHook['hooks']; originalId: string }>): IAgentPluginHook[] {
-	return [...parsed.entries()].map(([type, { hooks, originalId }]) => ({ type, hooks, originalId }));
+function mapParsedHooks(uri: URI, parsed: Map<IAgentPluginHook['type'], { hooks: IAgentPluginHook['hooks']; originalId: string }>): IAgentPluginHook[] {
+	return [...parsed.entries()].map(([type, { hooks, originalId }]) => ({ type, uri, hooks, originalId }));
 }
 
 /**
@@ -70,17 +85,18 @@ function resolveWorkspaceRoot(pluginUri: URI, workspaceContextService: IWorkspac
 
 class CopilotPluginFormatAdapter implements IAgentPluginFormatAdapter {
 	readonly format = AgentPluginFormat.Copilot;
-	readonly manifestPaths = ['plugin.json'];
-	readonly hookConfigPaths = ['hooks.json'];
-	readonly hookWatchPaths = ['hooks.json'];
+	readonly manifestPath = 'plugin.json';
+	readonly hookConfigPath = 'hooks.json';
+	readonly pluginRootToken = undefined;
+	readonly pluginRootEnvVar = undefined;
 
 	constructor(
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 	) { }
 
-	parseHooks(json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[] {
+	parseHooks(hookURI: URI, json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[] {
 		const workspaceRoot = resolveWorkspaceRoot(pluginUri, this._workspaceContextService);
-		return mapParsedHooks(parseCopilotHooks(json, workspaceRoot, userHome));
+		return mapParsedHooks(hookURI, parseCopilotHooks(json, workspaceRoot, userHome));
 	}
 }
 
@@ -100,7 +116,7 @@ const shellUnsafeChars = /[\s&|<>()^;!`"']/;
  * (including suffix) is quoted as one unit.
  *
  */
-export function shellQuotePluginRootInCommand(command: string, fsPath: string, token: string = '${CLAUDE_PLUGIN_ROOT}'): string {
+export function shellQuotePluginRootInCommand(command: string, fsPath: string, token: string) {
 	if (!command.includes(token)) {
 		return command;
 	}
@@ -130,69 +146,280 @@ export function shellQuotePluginRootInCommand(command: string, fsPath: string, t
 	});
 }
 
+/**
+ * Extracts the MCP server map from a raw JSON value. Accepts both the
+ * wrapped format `{ mcpServers: { … } }` (Claude `.mcp.json`) and the
+ * flat format where server entries are at the top level.
+ * Returns `undefined` when the input is not a usable object.
+ */
+export function resolveMcpServersMap(raw: unknown): Record<string, unknown> | undefined {
+	if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+		return undefined;
+	}
+	const obj = raw as Record<string, unknown>;
+	return Object.hasOwn(obj, 'mcpServers')
+		? (obj.mcpServers as Record<string, unknown>)
+		: obj;
+}
+
+/**
+ * Replaces `${token}` references in MCP server definition string fields
+ * (command, args, cwd, env values, url, envFile, headers) with the plugin
+ * root filesystem path. No shell quoting is needed because args are already
+ * a string array.
+ */
+function interpolateMcpPluginRoot(
+	def: IAgentPluginMcpServerDefinition,
+	fsPath: string,
+	token: string,
+	envVar: string,
+): IAgentPluginMcpServerDefinition {
+	const replace = (s: string) => s.replaceAll(token, fsPath);
+
+	const config = def.configuration;
+	let interpolated: IMcpServerConfiguration;
+
+	if (config.type === McpServerType.LOCAL) {
+		const local: Mutable<IMcpStdioServerConfiguration> = { ...config };
+		local.command = replace(local.command);
+		if (local.args) {
+			local.args = local.args.map(replace);
+		}
+		if (local.cwd) {
+			local.cwd = replace(local.cwd);
+		}
+		local.env = { ...local.env };
+		for (const [k, v] of Object.entries(local.env)) {
+			if (typeof v === 'string') {
+				local.env[k] = replace(v);
+			}
+		}
+		local.env[envVar] = fsPath;
+		if (local.envFile) {
+			local.envFile = replace(local.envFile);
+		}
+		interpolated = local;
+	} else {
+		const remote: Mutable<IMcpRemoteServerConfiguration> = { ...config };
+		remote.url = replace(remote.url);
+		if (remote.headers) {
+			remote.headers = Object.fromEntries(
+				Object.entries(remote.headers).map(([k, v]) => [k, replace(v)])
+			);
+		}
+		interpolated = remote;
+	}
+
+	return { name: def.name, configuration: interpolated, uri: def.uri };
+}
+
+/**
+ * Regular expression matching bare `${VAR_NAME}` references that are NOT
+ * already using VS Code's `${env:VAR}` colon-delimited syntax. Only matches
+ * uppercase letters, digits, and underscores — the characters valid in POSIX
+ * environment variable names.
+ *
+ * Negative lookbehind ensures we skip tokens that already carry a namespace
+ * prefix (e.g. `${env:HOME}`, `${config:editor.fontSize}`).
+ */
+const BARE_ENV_VAR_RE = /\$\{(?![A-Za-z]+:)([A-Z_][A-Z0-9_]*)\}/g;
+
+/**
+ * Converts bare `${VAR}` environment-variable references found in MCP server
+ * definition strings to the VS Code `${env:VAR}` syntax so that the
+ * `configurationResolverService` can resolve them later in the pipeline.
+ *
+ * The MCP ecosystem (Claude Desktop, Copilot CLI) uses bare `${VAR}` to
+ * reference environment variables, while VS Code's resolver expects the
+ * `${env:VAR}` form. This function bridges that gap for all plugin-provided
+ * MCP server definitions.
+ *
+ * Only references whose name consists of uppercase letters, digits, and
+ * underscores are converted — this avoids transforming VS Code's own variable
+ * tokens (e.g. `${workspaceFolder}`) which use lowercase/camelCase names.
+ */
+export function convertBareEnvVarsToVsCodeSyntax(
+	def: IAgentPluginMcpServerDefinition,
+): IAgentPluginMcpServerDefinition {
+	return cloneAndChange(def, (value) => {
+		if (URI.isUri(value)) {
+			return value;
+		}
+		if (typeof value === 'string') {
+			const replaced = value.replace(BARE_ENV_VAR_RE, '${env:$1}');
+			return replaced !== value ? replaced : undefined;
+		}
+		return undefined;
+	});
+}
+
+/**
+ * Shared hook-parsing logic for plugin formats that use the Claude/open-plugin
+ * hook schema. Replaces `${token}` references in hook commands with the plugin
+ * root path (shell-quoted when necessary), injects an environment variable, and
+ * delegates to {@link parseClaudeHooks} for the actual hook resolution.
+ */
+function parsePluginRootHooks(
+	hookURI: URI,
+	json: unknown,
+	pluginUri: URI,
+	userHome: string,
+	workspaceContextService: IWorkspaceContextService,
+	token: string,
+	envVar: string,
+): IAgentPluginHook[] {
+	const fsPath = pluginUri.fsPath;
+	const typedJson = json as { hooks?: Record<string, unknown[]> };
+
+	const mutateHookCommand = (hook: Mutable<IHookCommand>): void => {
+		for (const field of ['command', 'windows', 'linux', 'osx'] as const) {
+			if (typeof hook[field] === 'string') {
+				hook[field] = shellQuotePluginRootInCommand(hook[field], fsPath, token);
+			}
+		}
+
+		hook.env ??= {};
+		hook.env[envVar] = fsPath;
+	};
+
+	for (const lifecycle of Object.values(typedJson.hooks ?? {})) {
+		if (!Array.isArray(lifecycle)) {
+			continue;
+		}
+
+		for (const lifecycleEntry of lifecycle) {
+			if (!lifecycleEntry || typeof lifecycleEntry !== 'object') {
+				continue;
+			}
+
+			const entry = lifecycleEntry as { hooks?: Mutable<IHookCommand>[] } & Mutable<IHookCommand>;
+			if (Array.isArray(entry.hooks)) {
+				for (const hook of entry.hooks) {
+					mutateHookCommand(hook);
+				}
+			} else {
+				mutateHookCommand(entry);
+			}
+		}
+	}
+
+	const replacer = (v: unknown): unknown => {
+		return typeof v === 'string'
+			? v.replaceAll(token, pluginUri.fsPath)
+			: undefined;
+	};
+
+	const workspaceRoot = resolveWorkspaceRoot(pluginUri, workspaceContextService);
+	const { hooks, disabledAllHooks } = parseClaudeHooks(cloneAndChange(json, replacer), workspaceRoot, userHome);
+	if (disabledAllHooks) {
+		return [];
+	}
+
+	return mapParsedHooks(hookURI, hooks);
+}
+
 class ClaudePluginFormatAdapter implements IAgentPluginFormatAdapter {
 	readonly format = AgentPluginFormat.Claude;
-	readonly manifestPaths = ['.claude-plugin/plugin.json'];
-	readonly hookConfigPaths = ['hooks/hooks.json'];
-	readonly hookWatchPaths = ['hooks'];
+	readonly manifestPath = '.claude-plugin/plugin.json';
+	readonly hookConfigPath = 'hooks/hooks.json';
+	readonly pluginRootToken = '${CLAUDE_PLUGIN_ROOT}';
+	readonly pluginRootEnvVar = 'CLAUDE_PLUGIN_ROOT';
 
 	constructor(
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 	) { }
 
-	parseHooks(json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[] {
-		const token = '${CLAUDE_PLUGIN_ROOT}';
-		const fsPath = pluginUri.fsPath;
-		const typedJson = json as { hooks?: Record<string, unknown[]> };
-
-		const mutateHookCommand = (hook: Mutable<IHookCommand>): void => {
-			for (const field of ['command', 'windows', 'linux', 'osx'] as const) {
-				if (typeof hook[field] === 'string') {
-					hook[field] = shellQuotePluginRootInCommand(hook[field], fsPath, token);
-				}
-			}
-
-			hook.env ??= {};
-			hook.env.CLAUDE_PLUGIN_ROOT = fsPath;
-		};
-
-		for (const lifecycle of Object.values(typedJson.hooks ?? {})) {
-			if (!Array.isArray(lifecycle)) {
-				continue;
-			}
-
-			for (const lifecycleEntry of lifecycle) {
-				if (!lifecycleEntry || typeof lifecycleEntry !== 'object') {
-					continue;
-				}
-
-				const entry = lifecycleEntry as { hooks?: Mutable<IHookCommand>[] } & Mutable<IHookCommand>;
-				if (Array.isArray(entry.hooks)) {
-					for (const hook of entry.hooks) {
-						mutateHookCommand(hook);
-					}
-				} else {
-					mutateHookCommand(entry);
-				}
-			}
-		}
-
-		const replacer = (v: unknown): unknown => {
-			return typeof v === 'string'
-				? v.replaceAll('${CLAUDE_PLUGIN_ROOT}', pluginUri.fsPath)
-				: undefined;
-		};
-
-		const workspaceRoot = resolveWorkspaceRoot(pluginUri, this._workspaceContextService);
-		const { hooks, disabledAllHooks } = parseClaudeHooks(cloneAndChange(json, replacer), workspaceRoot, userHome);
-		if (disabledAllHooks) {
-			return [];
-		}
-
-		return mapParsedHooks(hooks);
+	parseHooks(hookURI: URI, json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[] {
+		return parsePluginRootHooks(hookURI, json, pluginUri, userHome, this._workspaceContextService, '${CLAUDE_PLUGIN_ROOT}', 'CLAUDE_PLUGIN_ROOT');
 	}
 }
 
+class OpenPluginFormatAdapter implements IAgentPluginFormatAdapter {
+	readonly format = AgentPluginFormat.OpenPlugin;
+	readonly manifestPath = '.plugin/plugin.json';
+	readonly hookConfigPath = 'hooks/hooks.json';
+	readonly pluginRootToken = '${PLUGIN_ROOT}';
+	readonly pluginRootEnvVar = 'PLUGIN_ROOT';
+
+	constructor(
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+	) { }
+
+	parseHooks(hookURI: URI, json: unknown, pluginUri: URI, userHome: string): IAgentPluginHook[] {
+		return parsePluginRootHooks(hookURI, json, pluginUri, userHome, this._workspaceContextService, '${PLUGIN_ROOT}', 'PLUGIN_ROOT');
+	}
+}
+
+interface IComponentPathConfig {
+	readonly paths: readonly string[];
+	readonly exclusive: boolean;
+}
+
+const emptyComponentPathConfig: IComponentPathConfig = { paths: [], exclusive: false };
+
+/**
+ * Parses a manifest component path field (e.g. `commands`, `skills`, `agents`)
+ * into a normalized config. Supports:
+ * - `undefined` → empty supplemental config
+ * - `string` → single supplemental path
+ * - `string[]` → multiple supplemental paths
+ * - `{ paths: string[], exclusive?: boolean }` → as-is
+ *
+ * Paths that resolve outside the plugin root are silently dropped
+ * in {@link resolveComponentDirs}.
+ */
+function parseComponentPathConfig(raw: unknown): IComponentPathConfig {
+	if (raw === undefined || raw === null) {
+		return emptyComponentPathConfig;
+	}
+
+	if (typeof raw === 'string') {
+		const trimmed = raw.trim();
+		return trimmed ? { paths: [trimmed], exclusive: false } : emptyComponentPathConfig;
+	}
+
+	if (Array.isArray(raw)) {
+		const paths = raw
+			.filter(v => typeof v === 'string')
+			.map(v => v.trim())
+			.filter(v => v.length > 0);
+		return { paths, exclusive: false };
+	}
+
+	if (typeof raw === 'object') {
+		const obj = raw as Record<string, unknown>;
+		if (Array.isArray(obj['paths'])) {
+			const paths = (obj['paths'] as unknown[])
+				.filter(v => typeof v === 'string')
+				.map(v => v.trim())
+				.filter(v => v.length > 0);
+			const exclusive = obj['exclusive'] === true;
+			return { paths, exclusive };
+		}
+	}
+
+	return emptyComponentPathConfig;
+}
+
+/**
+ * Resolves the directories to scan for a given component type, combining
+ * the default directory with any custom paths from the manifest config.
+ * Paths that resolve outside the plugin root are silently ignored.
+ */
+function resolveComponentDirs(pluginUri: URI, defaultDir: string, config: IComponentPathConfig): readonly URI[] {
+	const dirs: URI[] = [];
+	if (!config.exclusive) {
+		dirs.push(joinPath(pluginUri, defaultDir));
+	}
+	for (const p of config.paths) {
+		const resolved = normalizePath(joinPath(pluginUri, p));
+		if (isEqualOrParent(resolved, pluginUri)) {
+			dirs.push(resolved);
+		}
+	}
+	return dirs;
+}
+
 export class AgentPluginService extends Disposable implements IAgentPluginService {
 
 	declare readonly _serviceBrand: undefined;
@@ -274,7 +501,7 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 	private readonly _plugins = observableValue<readonly IAgentPlugin[]>('discoveredAgentPlugins', []);
 	public readonly plugins: IObservable<readonly IAgentPlugin[]> = this._plugins;
 
-	protected _discoverVersion = 0;
+	private _discoverVersion = 0;
 	protected _enablementModel!: IEnablementModel;
 
 	constructor(
@@ -322,6 +549,10 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 	}
 
 	private async _detectPluginFormatAdapter(pluginUri: URI): Promise<IAgentPluginFormatAdapter> {
+		if (await this._pathExists(joinPath(pluginUri, '.plugin', 'plugin.json'))) {
+			return this._instantiationService.createInstance(OpenPluginFormatAdapter);
+		}
+
 		const isInClaudeDirectory = pluginUri.path.split('/').includes('.claude');
 		if (isInClaudeDirectory || await this._pathExists(joinPath(pluginUri, '.claude-plugin', 'plugin.json'))) {
 			return this._instantiationService.createInstance(ClaudePluginFormatAdapter);
@@ -352,58 +583,92 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 		}
 
 		const store = new DisposableStore();
-		const commands = observableValue<readonly IAgentPluginCommand[]>('agentPluginCommands', []);
-		const skills = observableValue<readonly IAgentPluginSkill[]>('agentPluginSkills', []);
-		const agents = observableValue<readonly IAgentPluginAgent[]>('agentPluginAgents', []);
-		const hooks = observableValue<readonly IAgentPluginHook[]>('agentPluginHooks', []);
-		const mcpServerDefinitions = observableValue<readonly IAgentPluginMcpServerDefinition[]>('agentPluginMcpServerDefinitions', []);
 		const enablement = derived(r => this._enablementModel.readEnabled(key, r));
 
-		const commandsDir = joinPath(uri, 'commands');
-		const skillsDir = joinPath(uri, 'skills');
-		const agentsDir = joinPath(uri, 'agents');
+		// Track current component directories for the file watcher. These are
+		// updated whenever the manifest is read (inside each component reader).
+		const manifest = observableValue<Record<string, unknown> | undefined>('agentPluginManifest', undefined);
 
-		const commandsScheduler = store.add(new RunOnceScheduler(async () => {
-			commands.set(await this._readCommands(uri), undefined);
-		}, 200));
-		const skillsScheduler = store.add(new RunOnceScheduler(async () => {
-			skills.set(await this._readSkills(uri), undefined);
-		}, 200));
-		const agentsScheduler = store.add(new RunOnceScheduler(async () => {
-			agents.set(await this._readAgents(uri), undefined);
-		}, 200));
-		const hooksScheduler = store.add(new RunOnceScheduler(async () => {
-			hooks.set(await this._readHooks(uri, adapter), undefined);
-		}, 200));
-		const mcpScheduler = store.add(new RunOnceScheduler(async () => {
-			mcpServerDefinitions.set(await this._readMcpDefinitions(uri, adapter), undefined);
-		}, 200));
+		const observeComponent = <T>(
+			prop: string,
+			doRead: (uris: readonly URI[]) => Promise<readonly T[]>,
+			tryReadEmbedded?: (section: unknown) => Promise<T[] | undefined>,
+			defaultPath = prop,
+		): IObservable<readonly T[]> => {
+			const secondObs = derivedOpts({ equalsFn: equals }, reader => manifest.read(reader)?.[prop]);
 
-		store.add(this._fileService.watch(uri, { recursive: true, excludes: [] }));
-		store.add(this._fileService.onDidFilesChange(e => {
-			if (e.affects(commandsDir)) {
-				commandsScheduler.schedule();
-			}
-			if (e.affects(skillsDir)) {
-				skillsScheduler.schedule();
-			}
-			if (e.affects(agentsDir)) {
-				agentsScheduler.schedule();
-			}
-			if (adapter.hookWatchPaths.some(path => e.affects(joinPath(uri, path)))) {
-				hooksScheduler.schedule();
-			}
-			if (e.affects(joinPath(uri, '.mcp.json')) || adapter.manifestPaths.some(path => e.affects(joinPath(uri, path)))) {
-				mcpScheduler.schedule();
-				hooksScheduler.schedule();
-			}
-		}));
+			const wrapped = derived(reader => {
+				const section = secondObs.read(reader);
+				if (tryReadEmbedded) {
+					if (section && typeof section === 'object' && !Array.isArray(section) && !(hasKey(section, { paths: true }))) {
+						return { kind: 'const', data: new ObservablePromise(tryReadEmbedded(section)) } as const;
+					}
+				}
 
-		commandsScheduler.schedule();
-		skillsScheduler.schedule();
-		agentsScheduler.schedule();
-		hooksScheduler.schedule();
-		mcpScheduler.schedule();
+				const paths = parseComponentPathConfig(section);
+				const dirs = resolveComponentDirs(uri, defaultPath, paths);
+				for (const d of dirs) {
+					const watcher = this._fileService.createWatcher(d, { recursive: false, excludes: [] });
+					reader.store.add(watcher);
+					reader.store.add(watcher.onDidChange(() => changeTrigger.trigger(undefined)));
+				}
+
+				return { kind: 'dirs', dirs: dirs } as const;
+			});
+
+			const changeTrigger = observableSignal('fileChange');
+
+			const promised = derived(reader => {
+				const w = wrapped.read(reader);
+				if (w.kind === 'const') {
+					return w.data.promiseResult;
+				} else {
+					changeTrigger.read(reader); // re-run when a relevant file change occurs
+					const promise = new ObservablePromise(doRead(w.dirs));
+					return promise.promiseResult;
+				}
+			});
+
+			const result = promised.map((w, r) => w.read(r)?.data ?? Iterable.empty());
+
+			return result.recomputeInitiallyAndOnChange(store);
+		};
+
+		const manifestUri = joinPath(uri, adapter.manifestPath);
+		const commands = observeComponent('commands', d => this._readMarkdownComponents(d));
+		const skills = observeComponent('skills', d => this._readSkills(uri, d));
+		const agents = observeComponent('agents', d => this._readMarkdownComponents(d));
+		const instructions = observeComponent('rules', d => this._readRules(d));
+		const hooks = observeComponent(
+			'hooks',
+			paths => this._readHooksFromPaths(uri, paths, adapter),
+			async section => {
+				const userHome = (await this._pathService.userHome()).fsPath;
+				return adapter.parseHooks(manifestUri, section, uri, userHome);
+			},
+			adapter.hookConfigPath,
+		);
+
+		const mcpServerDefinitions = observeComponent(
+			'mcpServers',
+			paths => this._readMcpDefinitionsFromPaths(paths, uri.fsPath, adapter),
+			async section => this._parseMcpServerDefinitionMap(manifestUri, { mcpServers: section }, uri.fsPath, adapter),
+			'.mcp.json',
+		);
+
+		// Read the manifest initially and re-read whenever manifest files change.
+		const readManifest = async () => {
+			manifest.set(await this._readManifest(uri, adapter), undefined);
+		};
+
+		const manifestWatcher = this._fileService.createWatcher(
+			manifestUri,
+			{ recursive: false, excludes: [] },
+		);
+		store.add(manifestWatcher);
+		store.add(manifestWatcher.onDidChange(() => readManifest()));
+
+		readManifest();
 
 		const plugin: PluginEntry = {
 			uri,
@@ -414,6 +679,7 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 			commands,
 			skills,
 			agents,
+			instructions,
 			mcpServerDefinitions,
 			fromMarketplace,
 		};
@@ -423,60 +689,71 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 		return plugin;
 	}
 
-	private async _readMcpDefinitions(pluginUri: URI, adapter: IAgentPluginFormatAdapter): Promise<readonly IAgentPluginMcpServerDefinition[]> {
-		const mcpUri = joinPath(pluginUri, '.mcp.json');
-
-		const mcpFileConfig = await this._readJsonFile(mcpUri);
-		const fileDefinitions = this._parseMcpServerDefinitionMap(mcpFileConfig);
-
-		const pluginJsonDefinitions = await this._readInlinePluginJsonMcpDefinitions(pluginUri, adapter);
-
-		const merged = new Map<string, IMcpServerConfiguration>();
-		for (const definition of fileDefinitions) {
-			merged.set(definition.name, definition.configuration);
+	private async _readManifest(pluginUri: URI, adapter: IAgentPluginFormatAdapter): Promise<Record<string, unknown> | undefined> {
+		const json = await this._readJsonFile(joinPath(pluginUri, adapter.manifestPath));
+		if (json && typeof json === 'object') {
+			return json as Record<string, unknown>;
 		}
-		for (const definition of pluginJsonDefinitions) {
-			if (!merged.has(definition.name)) {
-				merged.set(definition.name, definition.configuration);
-			}
-		}
-
-		const definitions = [...merged.entries()]
-			.map(([name, configuration]) => ({ name, configuration } satisfies IAgentPluginMcpServerDefinition))
-			.sort((a, b) => a.name.localeCompare(b.name));
-
-		return definitions;
+		return undefined;
 	}
 
-	private async _readInlinePluginJsonMcpDefinitions(pluginUri: URI, adapter: IAgentPluginFormatAdapter): Promise<readonly IAgentPluginMcpServerDefinition[]> {
-		for (const manifestPath of adapter.manifestPaths.map(path => joinPath(pluginUri, path))) {
-			const manifest = await this._readJsonFile(manifestPath);
-			if (!manifest || typeof manifest !== 'object') {
-				continue;
-			}
-
-			const definitions = this._parseMcpServerDefinitionMap(manifest);
-			if (definitions.length > 0) {
-				return definitions;
+	/**
+	 * Reads hook definitions from a list of resolved paths (JSON files).
+	 * Each path is tried in order; the first one that contains valid hook
+	 * JSON is used.
+	 */
+	private async _readHooksFromPaths(pluginUri: URI, paths: readonly URI[], adapter: IAgentPluginFormatAdapter): Promise<readonly IAgentPluginHook[]> {
+		const userHome = (await this._pathService.userHome()).fsPath;
+		for (const hookPath of paths) {
+			const json = await this._readJsonFile(hookPath);
+			if (json) {
+				try {
+					return adapter.parseHooks(hookPath, json, pluginUri, userHome);
+				} catch (e) {
+					this._logService.info(`[AgentPluginDiscovery] Failed to parse hooks from ${hookPath.toString()}:`, e);
+				}
 			}
 		}
-
 		return [];
 	}
 
-	private _parseMcpServerDefinitionMap(raw: unknown): IAgentPluginMcpServerDefinition[] {
-		if (!raw || typeof raw !== 'object' || !raw.hasOwnProperty('mcpServers')) {
+	/**
+	 * Reads MCP server definitions from a list of resolved paths (JSON files).
+	 * Definitions from all files are merged; the first definition for a given
+	 * server name wins.
+	 */
+	private async _readMcpDefinitionsFromPaths(paths: readonly URI[], pluginFsPath: string, adapter: IAgentPluginFormatAdapter): Promise<readonly IAgentPluginMcpServerDefinition[]> {
+		const merged = new Map<string, IAgentPluginMcpServerDefinition>();
+		for (const mcpPath of paths) {
+			const json = await this._readJsonFile(mcpPath);
+			for (const def of this._parseMcpServerDefinitionMap(mcpPath, json, pluginFsPath, adapter)) {
+				if (!merged.has(def.name)) {
+					merged.set(def.name, def);
+				}
+			}
+		}
+		return [...merged.values()].sort((a, b) => a.name.localeCompare(b.name));
+	}
+
+	private _parseMcpServerDefinitionMap(definitionURI: URI, raw: unknown, pluginFsPath: string, adapter: IAgentPluginFormatAdapter): IAgentPluginMcpServerDefinition[] {
+		const mcpServers = resolveMcpServersMap(raw);
+		if (!mcpServers) {
 			return [];
 		}
 
 		const definitions: IAgentPluginMcpServerDefinition[] = [];
-		for (const [name, configValue] of Object.entries((raw as { mcpServers: Record<string, unknown> }).mcpServers)) {
+		for (const [name, configValue] of Object.entries(mcpServers)) {
 			const configuration = this._normalizeMcpServerConfiguration(configValue);
 			if (!configuration) {
 				continue;
 			}
 
-			definitions.push({ name, configuration });
+			let def: IAgentPluginMcpServerDefinition = { name, configuration, uri: definitionURI };
+			if (adapter.pluginRootToken && adapter.pluginRootEnvVar) {
+				def = interpolateMcpPluginRoot(def, pluginFsPath, adapter.pluginRootToken, adapter.pluginRootEnvVar);
+			}
+			def = convertBareEnvVarsToVsCodeSyntax(def);
+			definitions.push(def);
 		}
 
 		return definitions;
@@ -543,36 +820,6 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 		return undefined;
 	}
 
-	private async _readHooks(pluginUri: URI, adapter: IAgentPluginFormatAdapter): Promise<readonly IAgentPluginHook[]> {
-		const userHome = (await this._pathService.userHome()).fsPath;
-		for (const hooksUri of adapter.hookConfigPaths.map(path => joinPath(pluginUri, path))) {
-			const json = await this._readJsonFile(hooksUri);
-			if (json) {
-				try {
-					return adapter.parseHooks(json, pluginUri, userHome);
-				} catch (e) {
-					this._logService.info(`[ConfiguredAgentPluginDiscovery] Failed to parse hooks from ${hooksUri.toString()}:`, e);
-				}
-			}
-		}
-
-		for (const manifestPath of adapter.manifestPaths.map(path => joinPath(pluginUri, path))) {
-			const manifest = await this._readJsonFile(manifestPath);
-			if (manifest && typeof manifest === 'object') {
-				const hooks = (manifest as Record<string, unknown>)['hooks'];
-				if (hooks && typeof hooks === 'object') {
-					try {
-						return adapter.parseHooks({ hooks }, pluginUri, userHome);
-					} catch (e) {
-						this._logService.info(`[ConfiguredAgentPluginDiscovery] Failed to parse hooks from manifest ${manifestPath.toString()}:`, e);
-					}
-				}
-			}
-		}
-
-		return [];
-	}
-
 	private async _readJsonFile(uri: URI): Promise<unknown | undefined> {
 		try {
 			const fileContents = await this._fileService.readFile(uri);
@@ -582,96 +829,160 @@ export abstract class AbstractAgentPluginDiscovery extends Disposable implements
 		}
 	}
 
-	private async _readSkills(uri: URI): Promise<readonly IAgentPluginSkill[]> {
-		const skillsDir = joinPath(uri, 'skills');
-		let stat;
-		try {
-			stat = await this._fileService.resolve(skillsDir);
-		} catch {
-			return [];
-		}
-
-		if (!stat.isDirectory || !stat.children) {
-			return [];
-		}
-
+	private async _readSkills(pluginRoot: URI, dirs: readonly URI[]): Promise<readonly IAgentPluginSkill[]> {
+		const seen = new Set<string>();
 		const skills: IAgentPluginSkill[] = [];
-		for (const child of stat.children) {
-			const skillMd = URI.joinPath(child.resource, 'SKILL.md');
-			if (!(await this._pathExists(skillMd))) {
+
+		const addSkill = (name: string, skillMd: URI) => {
+			if (!seen.has(name)) {
+				seen.add(name);
+				skills.push({ uri: skillMd, name });
+			}
+		};
+
+		for (const dir of dirs) {
+			// If the path points directly to a skill directory (contains SKILL.md),
+			// add it as a single skill instead of scanning its children.
+			const skillMd = URI.joinPath(dir, 'SKILL.md');
+			if (await this._pathExists(skillMd)) {
+				addSkill(basename(dir), skillMd);
 				continue;
 			}
 
-			skills.push({
-				uri: skillMd,
-				name: basename(child.resource),
-			});
+			let stat;
+			try {
+				stat = await this._fileService.resolve(dir);
+			} catch {
+				continue;
+			}
+
+			if (!stat.isDirectory || !stat.children) {
+				continue;
+			}
+
+			for (const child of stat.children) {
+				const childSkillMd = URI.joinPath(child.resource, 'SKILL.md');
+				if (await this._pathExists(childSkillMd)) {
+					addSkill(basename(child.resource), childSkillMd);
+				}
+			}
+		}
+
+		// Fallback: support single-skill plugins with SKILL.md at the plugin root
+		if (skills.length === 0) {
+			const rootSkillMd = URI.joinPath(pluginRoot, 'SKILL.md');
+			if (await this._pathExists(rootSkillMd)) {
+				addSkill(basename(pluginRoot), rootSkillMd);
+			}
 		}
 
 		skills.sort((a, b) => a.name.localeCompare(b.name));
 		return skills;
 	}
 
-	private async _readAgents(uri: URI): Promise<readonly IAgentPluginAgent[]> {
-		const agentsDir = joinPath(uri, 'agents');
-		let stat;
-		try {
-			stat = await this._fileService.resolve(agentsDir);
-		} catch {
-			return [];
-		}
+	/**
+	 * Scans directories for rule/instruction files (`.mdc`, `.md`,
+	 * `.instructions.md`), returning `{ uri, name }` entries where name is
+	 * derived from the filename minus the matched suffix.
+	 */
+	private async _readRules(dirs: readonly URI[]): Promise<readonly IAgentPluginInstruction[]> {
+		const seen = new Set<string>();
+		const items: IAgentPluginInstruction[] = [];
 
-		if (!stat.isDirectory || !stat.children) {
-			return [];
-		}
+		const matchSuffix = (filename: string): string | undefined => {
+			const lower = filename.toLowerCase();
+			return RULE_FILE_SUFFIXES.find(s => lower.endsWith(s));
+		};
 
-		const agents: IAgentPluginAgent[] = [];
-		for (const child of stat.children) {
-			if (!child.isFile || extname(child.resource).toLowerCase() !== COMMAND_FILE_SUFFIX) {
+		const addItem = (name: string, uri: URI) => {
+			if (!seen.has(name)) {
+				seen.add(name);
+				items.push({ uri, name });
+			}
+		};
+
+		for (const dir of dirs) {
+			let stat;
+			try {
+				stat = await this._fileService.resolve(dir);
+			} catch {
 				continue;
 			}
 
-			const name = basename(child.resource).slice(0, -COMMAND_FILE_SUFFIX.length);
+			if (stat.isFile) {
+				const suffix = matchSuffix(basename(dir));
+				if (suffix) {
+					addItem(basename(dir).slice(0, -suffix.length), dir);
+				}
+				continue;
+			}
 
-			agents.push({
-				uri: child.resource,
-				name,
-			});
+			if (!stat.isDirectory || !stat.children) {
+				continue;
+			}
+
+			for (const child of stat.children) {
+				if (!child.isFile) {
+					continue;
+				}
+				const suffix = matchSuffix(child.name);
+				if (suffix) {
+					addItem(child.name.slice(0, -suffix.length), child.resource);
+				}
+			}
 		}
 
-		agents.sort((a, b) => a.name.localeCompare(b.name));
-		return agents;
+		items.sort((a, b) => a.name.localeCompare(b.name));
+		return items;
 	}
 
-	private async _readCommands(uri: URI): Promise<readonly IAgentPluginCommand[]> {
-		const commandsDir = joinPath(uri, 'commands');
-		let stat;
-		try {
-			stat = await this._fileService.resolve(commandsDir);
-		} catch {
-			return [];
-		}
+	/**
+	 * Scans directories for `.md` files, returning `{ uri, name }` entries
+	 * where name is derived from the filename (minus the `.md` extension).
+	 * If a path points to a specific `.md` file, it is included directly.
+	 * Used for both commands and agents.
+	 */
+	private async _readMarkdownComponents(dirs: readonly URI[]): Promise<readonly { uri: URI; name: string }[]> {
+		const seen = new Set<string>();
+		const items: { uri: URI; name: string }[] = [];
 
-		if (!stat.isDirectory || !stat.children) {
-			return [];
-		}
+		const addItem = (name: string, uri: URI) => {
+			if (!seen.has(name)) {
+				seen.add(name);
+				items.push({ uri, name });
+			}
+		};
 
-		const commands: IAgentPluginCommand[] = [];
-		for (const child of stat.children) {
-			if (!child.isFile || extname(child.resource).toLowerCase() !== COMMAND_FILE_SUFFIX) {
+		for (const dir of dirs) {
+			let stat;
+			try {
+				stat = await this._fileService.resolve(dir);
+			} catch {
 				continue;
 			}
 
-			const name = basename(child.resource).slice(0, -COMMAND_FILE_SUFFIX.length);
 
-			commands.push({
-				uri: child.resource,
-				name,
-			});
+			// If the path points to a specific .md file, include it directly.
+			if (stat.isFile && extname(dir).toLowerCase() === COMMAND_FILE_SUFFIX) {
+				addItem(basename(dir).slice(0, -COMMAND_FILE_SUFFIX.length), dir);
+				continue;
+			}
+
+
+			if (!stat.isDirectory || !stat.children) {
+				continue;
+			}
+
+			for (const child of stat.children) {
+				if (!child.isFile || extname(child.resource).toLowerCase() !== COMMAND_FILE_SUFFIX) {
+					continue;
+				}
+				addItem(basename(child.resource).slice(0, -COMMAND_FILE_SUFFIX.length), child.resource);
+			}
 		}
 
-		commands.sort((a, b) => a.name.localeCompare(b.name));
-		return commands;
+		items.sort((a, b) => a.name.localeCompare(b.name));
+		return items;
 	}
 
 	private _disposePluginEntriesExcept(keep: Set<string>): void {
@@ -857,8 +1168,16 @@ export class MarketplaceAgentPluginDiscovery extends AbstractAgentPluginDiscover
 				uri: stat.resource,
 				fromMarketplace: entry.plugin,
 				remove: () => {
+					this._enablementModel.remove(stat.resource.toString());
 					this._pluginMarketplaceService.removeInstalledPlugin(entry.pluginUri);
-					this._pluginRepositoryService.cleanupPluginSource(entry.plugin).catch(error => {
+
+					// Pass remaining installed descriptors so the repository service
+					// can skip deletion when other plugins share the same cache dir.
+					const remaining = this._pluginMarketplaceService.installedPlugins.get();
+					this._pluginRepositoryService.cleanupPluginSource(
+						entry.plugin,
+						remaining.map(e => e.plugin.sourceDescriptor),
+					).catch(error => {
 						this._logService.error('[MarketplaceAgentPluginDiscovery] Failed to clean up plugin source', error);
 					});
 				},
@@ -868,3 +1187,188 @@ export class MarketplaceAgentPluginDiscovery extends AbstractAgentPluginDiscover
 		return sources;
 	}
 }
+
+// ---------------------------------------------------------------------------
+// Extension-contributed plugin discovery
+// ---------------------------------------------------------------------------
+
+interface IRawChatPluginContribution {
+	readonly path: string;
+	readonly when?: string;
+}
+
+const epPlugins = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawChatPluginContribution[]>({
+	extensionPoint: 'chatPlugins',
+	jsonSchema: {
+		description: localize('chatPlugins.schema.description', 'Contributes agent plugins for chat.'),
+		type: 'array',
+		items: {
+			additionalProperties: false,
+			type: 'object',
+			defaultSnippets: [{
+				body: {
+					path: './relative/path/to/plugin/',
+				}
+			}],
+			required: ['path'],
+			properties: {
+				path: {
+					description: localize('chatPlugins.property.path', 'Path to the agent plugin root directory relative to the extension root.'),
+					type: 'string'
+				},
+				when: {
+					description: localize('chatPlugins.property.when', '(Optional) A condition which must be true to enable this plugin.'),
+					type: 'string'
+				}
+			}
+		}
+	}
+});
+
+export class ExtensionAgentPluginDiscovery extends AbstractAgentPluginDiscovery {
+
+	private readonly _extensionPlugins = new Map<string, { uri: URI; when: ContextKeyExpression | undefined; extensionId: string }>();
+	private readonly _whenKeys = new Set<string>();
+
+	constructor(
+		@ICommandService private readonly _commandService: ICommandService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IFileService fileService: IFileService,
+		@IPathService pathService: IPathService,
+		@ILogService logService: ILogService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super(fileService, pathService, logService, instantiationService);
+	}
+
+	public override start(enablementModel: IEnablementModel): void {
+		this._enablementModel = enablementModel;
+		const scheduler = this._register(new RunOnceScheduler(() => this._refreshPlugins(), 0));
+		this._register(this._contextKeyService.onDidChangeContext(e => {
+			if (e.affectsSome(this._whenKeys)) {
+				scheduler.schedule();
+			}
+		}));
+		epPlugins.setHandler((_extensions, delta) => {
+			for (const ext of delta.added) {
+				for (const raw of ext.value) {
+					if (!raw.path) {
+						ext.collector.error(localize('extension.plugin.missing.path', "Extension '{0}' cannot register a chatPlugins entry without a path.", ext.description.identifier.value));
+						continue;
+					}
+					const pluginUri = joinPath(ext.description.extensionLocation, raw.path);
+					if (!isEqualOrParent(pluginUri, ext.description.extensionLocation)) {
+						ext.collector.error(localize('extension.plugin.invalid.path', "Extension '{0}' chatPlugins entry '{1}' resolves outside the extension.", ext.description.identifier.value, raw.path));
+						continue;
+					}
+					let whenExpr: ContextKeyExpression | undefined;
+					if (raw.when) {
+						whenExpr = ContextKeyExpr.deserialize(raw.when);
+						if (!whenExpr) {
+							ext.collector.error(localize('extension.plugin.invalid.when', "Extension '{0}' chatPlugins entry '{1}' has an invalid when clause: '{2}'.", ext.description.identifier.value, raw.path, raw.when));
+							continue;
+						}
+					}
+					this._extensionPlugins.set(extensionPluginKey(ext.description.identifier, raw.path), { uri: pluginUri, when: whenExpr, extensionId: ext.description.identifier.value });
+				}
+			}
+			for (const ext of delta.removed) {
+				for (const raw of ext.value) {
+					this._extensionPlugins.delete(extensionPluginKey(ext.description.identifier, raw.path));
+				}
+			}
+			this._rebuildWhenKeys();
+			scheduler.schedule();
+		});
+	}
+
+	private _rebuildWhenKeys(): void {
+		this._whenKeys.clear();
+		for (const { when } of this._extensionPlugins.values()) {
+			if (when) {
+				for (const key of when.keys()) {
+					this._whenKeys.add(key);
+				}
+			}
+		}
+	}
+
+	protected override async _discoverPluginSources(): Promise<readonly IPluginSource[]> {
+		const sources: IPluginSource[] = [];
+		for (const [, entry] of this._extensionPlugins) {
+			if (entry.when && !this._contextKeyService.contextMatchesRules(entry.when)) {
+				continue;
+			}
+			let stat;
+			try {
+				stat = await this._fileService.resolve(entry.uri);
+			} catch {
+				this._logService.debug(`[ExtensionAgentPluginDiscovery] Could not resolve extension plugin path: ${entry.uri.toString()}`);
+				continue;
+			}
+			if (!stat.isDirectory) {
+				this._logService.debug(`[ExtensionAgentPluginDiscovery] Extension plugin path is not a directory: ${entry.uri.toString()}`);
+				continue;
+			}
+			sources.push({
+				uri: stat.resource,
+				fromMarketplace: undefined,
+				remove: () => this._promptUninstallExtension(entry.extensionId),
+			});
+		}
+		return sources;
+	}
+
+	private async _promptUninstallExtension(extensionId: string): Promise<void> {
+		const { confirmed } = await this._dialogService.confirm({
+			message: localize('uninstallExtensionForPlugin', "This plugin is provided by the extension '{0}'. Do you want to uninstall the extension?", extensionId),
+		});
+		if (confirmed) {
+			await this._commandService.executeCommand('workbench.extensions.uninstallExtension', extensionId);
+		}
+	}
+}
+
+function extensionPluginKey(extensionId: ExtensionIdentifier, path: string): string {
+	return `${extensionId.value}/${path}`;
+}
+
+class ChatPluginsDataRenderer extends Disposable implements IExtensionFeatureTableRenderer {
+	readonly type = 'table' as const;
+
+	shouldRender(manifest: IExtensionManifest): boolean {
+		return !!manifest.contributes?.chatPlugins?.length;
+	}
+
+	render(manifest: IExtensionManifest): IRenderedData<ITableData> {
+		const contributions = manifest.contributes?.chatPlugins ?? [];
+		if (!contributions.length) {
+			return { data: { headers: [], rows: [] }, dispose: () => { } };
+		}
+
+		const headers = [
+			localize('chatPluginsPath', "Path"),
+			localize('chatPluginsWhen', "When"),
+		];
+
+		const rows: IRowData[][] = contributions.map(d => [
+			d.path,
+			d.when ?? '-',
+		]);
+
+		return {
+			data: { headers, rows },
+			dispose: () => { }
+		};
+	}
+}
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: 'chatPlugins',
+	label: localize('chatPlugins', "Chat Plugins"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ChatPluginsDataRenderer),
+});
diff --git a/src/vs/workbench/contrib/chat/common/plugins/marketplaceReference.ts b/src/vs/workbench/contrib/chat/common/plugins/marketplaceReference.ts
new file mode 100644
index 00000000000..daab4c6523c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/plugins/marketplaceReference.ts
@@ -0,0 +1,221 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../../base/common/uri.js';
+
+export const enum MarketplaceReferenceKind {
+	GitHubShorthand = 'githubShorthand',
+	GitUri = 'gitUri',
+	LocalFileUri = 'localFileUri',
+}
+
+export interface IMarketplaceReference {
+	readonly rawValue: string;
+	readonly displayLabel: string;
+	readonly cloneUrl: string;
+	readonly canonicalId: string;
+	readonly cacheSegments: readonly string[];
+	readonly kind: MarketplaceReferenceKind;
+	readonly githubRepo?: string;
+	readonly localRepositoryUri?: URI;
+}
+
+export function parseMarketplaceReferences(values: readonly unknown[]): IMarketplaceReference[] {
+	const byCanonicalId = new Map<string, IMarketplaceReference>();
+
+	for (const value of values) {
+		if (typeof value !== 'string') {
+			continue;
+		}
+
+		const parsed = parseMarketplaceReference(value);
+		if (!parsed) {
+			continue;
+		}
+
+		if (!byCanonicalId.has(parsed.canonicalId)) {
+			byCanonicalId.set(parsed.canonicalId, parsed);
+		}
+	}
+
+	return [...byCanonicalId.values()];
+}
+
+/**
+ * Merges two sets of marketplace references, deduplicating by canonical ID.
+ * The first set takes precedence when IDs collide.
+ */
+export function deduplicateMarketplaceReferences(primary: readonly IMarketplaceReference[], secondary: readonly IMarketplaceReference[]): IMarketplaceReference[] {
+	const byCanonicalId = new Map<string, IMarketplaceReference>();
+	for (const ref of primary) {
+		byCanonicalId.set(ref.canonicalId, ref);
+	}
+	for (const ref of secondary) {
+		if (!byCanonicalId.has(ref.canonicalId)) {
+			byCanonicalId.set(ref.canonicalId, ref);
+		}
+	}
+	return [...byCanonicalId.values()];
+}
+
+export function parseMarketplaceReference(value: string): IMarketplaceReference | undefined {
+	const rawValue = value.trim();
+	if (!rawValue) {
+		return undefined;
+	}
+
+	const uriReference = parseUriMarketplaceReference(rawValue);
+	if (uriReference) {
+		return uriReference;
+	}
+
+	const scpReference = parseScpMarketplaceReference(rawValue);
+	if (scpReference) {
+		return scpReference;
+	}
+
+	const shorthandMatch = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(rawValue);
+	if (shorthandMatch) {
+		const owner = shorthandMatch[1];
+		const repo = shorthandMatch[2];
+		return {
+			rawValue,
+			displayLabel: `${owner}/${repo}`,
+			cloneUrl: `https://github.com/${owner}/${repo}.git`,
+			canonicalId: getGitHubCanonicalId(owner, repo),
+			cacheSegments: ['github.com', owner, repo],
+			kind: MarketplaceReferenceKind.GitHubShorthand,
+			githubRepo: `${owner}/${repo}`,
+		};
+	}
+
+	return undefined;
+}
+
+function parseUriMarketplaceReference(rawValue: string): IMarketplaceReference | undefined {
+	let uri: URI;
+	try {
+		uri = URI.parse(rawValue);
+	} catch {
+		return undefined;
+	}
+
+	const scheme = uri.scheme.toLowerCase();
+	if (scheme === 'file' && /^file:\/\//i.test(rawValue)) {
+		const localRepositoryUri = URI.file(uri.fsPath);
+		return {
+			rawValue,
+			displayLabel: localRepositoryUri.fsPath,
+			cloneUrl: rawValue,
+			canonicalId: `file:${localRepositoryUri.toString().toLowerCase()}`,
+			cacheSegments: [],
+			kind: MarketplaceReferenceKind.LocalFileUri,
+			localRepositoryUri,
+		};
+	}
+
+	if (scheme !== 'http' && scheme !== 'https' && scheme !== 'ssh') {
+		return undefined;
+	}
+
+	if (!uri.authority) {
+		return undefined;
+	}
+
+	const normalizedPath = normalizeGitRepoPath(uri.path);
+	if (!normalizedPath) {
+		return undefined;
+	}
+
+	const gitSuffix = '.git';
+	const sanitizedAuthority = sanitizePathSegment(uri.authority.toLowerCase());
+	const pathHasGitSuffix = normalizedPath.toLowerCase().endsWith(gitSuffix);
+	const pathWithoutGit = pathHasGitSuffix ? normalizedPath.slice(1, normalizedPath.length - gitSuffix.length) : normalizedPath.slice(1);
+	const pathSegments = pathWithoutGit.split('/').map(sanitizePathSegment);
+	// Always normalize the canonical path to include .git so that URLs with and without the suffix deduplicate.
+	const canonicalPath = pathHasGitSuffix ? normalizedPath.slice(1).toLowerCase() : `${normalizedPath.slice(1).toLowerCase()}${gitSuffix}`;
+
+	// Extract githubRepo for GitHub URLs so the editor can render a clickable link
+	const githubRepo = extractGitHubRepo(uri.authority, pathWithoutGit);
+
+	return {
+		rawValue,
+		displayLabel: rawValue,
+		cloneUrl: rawValue,
+		canonicalId: `git:${uri.authority.toLowerCase()}/${canonicalPath}`,
+		cacheSegments: [sanitizedAuthority, ...pathSegments],
+		kind: MarketplaceReferenceKind.GitUri,
+		githubRepo,
+	};
+}
+
+function parseScpMarketplaceReference(rawValue: string): IMarketplaceReference | undefined {
+	const match = /^([^@\s]+)@([^:\s]+):(.+\.git)$/i.exec(rawValue);
+	if (!match) {
+		return undefined;
+	}
+
+	const gitSuffix = '.git';
+	const authority = match[2];
+	const pathWithGit = match[3].replace(/^\/+/, '');
+	if (!pathWithGit.toLowerCase().endsWith(gitSuffix)) {
+		return undefined;
+	}
+
+	const pathWithoutGit = pathWithGit.slice(0, -gitSuffix.length);
+	const pathSegments = pathWithoutGit.split('/').map(sanitizePathSegment);
+	const githubRepo = extractGitHubRepo(authority, pathWithoutGit);
+
+	return {
+		rawValue,
+		displayLabel: rawValue,
+		cloneUrl: rawValue,
+		canonicalId: `git:${authority.toLowerCase()}/${pathWithGit.toLowerCase()}`,
+		cacheSegments: [sanitizePathSegment(authority.toLowerCase()), ...pathSegments],
+		kind: MarketplaceReferenceKind.GitUri,
+		githubRepo,
+	};
+}
+
+/**
+ * Normalizes a Git repository path and validates that it has at least two segments
+ * (i.e., at least one owner/repo pair below the root). Accepts paths with or without
+ * a `.git` suffix — the suffix is preserved in the returned value so callers can decide
+ * how to treat it.
+ */
+function normalizeGitRepoPath(path: string): string | undefined {
+	const gitSuffix = '.git';
+	const trimmed = path.replace(/\/+/g, '/').replace(/\/+$/g, '');
+
+	const withLeadingSlash = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
+	// Strip .git suffix (if present) only for the purposes of validating path depth.
+	const pathWithoutGit = withLeadingSlash.toLowerCase().endsWith(gitSuffix)
+		? withLeadingSlash.slice(1, withLeadingSlash.length - gitSuffix.length)
+		: withLeadingSlash.slice(1);
+	if (!pathWithoutGit || !pathWithoutGit.includes('/')) {
+		return undefined;
+	}
+
+	return withLeadingSlash;
+}
+
+function extractGitHubRepo(authority: string, pathWithoutGit: string): string | undefined {
+	if (authority.toLowerCase() !== 'github.com') {
+		return undefined;
+	}
+	const parts = pathWithoutGit.split('/');
+	if (parts.length >= 2 && parts[0] && parts[1]) {
+		return `${parts[0]}/${parts[1]}`;
+	}
+	return undefined;
+}
+
+function getGitHubCanonicalId(owner: string, repo: string): string {
+	return `github:${owner.toLowerCase()}/${repo.toLowerCase()}`;
+}
+
+function sanitizePathSegment(value: string): string {
+	return value.replace(/[\\/:*?"<>|]/g, '_');
+}
diff --git a/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.ts b/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.ts
index 4748070ce18..3174d30853e 100644
--- a/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.ts
+++ b/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.ts
@@ -33,6 +33,25 @@ export interface IUpdateAllPluginsResult {
 	readonly failedNames: readonly string[];
 }
 
+export interface IInstallPluginFromSourceOptions {
+	/**
+	 * When set, targets a specific plugin by name within the marketplace
+	 * instead of installing all or prompting the user. The matched plugin
+	 * is installed and returned in the result.
+	 */
+	readonly plugin?: string;
+}
+
+export interface IInstallPluginFromSourceResult {
+	readonly success: boolean;
+	readonly message?: string;
+	/**
+	 * When {@link IInstallPluginFromSourceOptions.plugin} is set and the
+	 * plugin was found, this contains the discovered marketplace plugin.
+	 */
+	readonly matchedPlugin?: IMarketplacePlugin;
+}
+
 export interface IPluginInstallService {
 	readonly _serviceBrand: undefined;
 
@@ -42,6 +61,33 @@ export interface IPluginInstallService {
 	 */
 	installPlugin(plugin: IMarketplacePlugin): Promise<void>;
 
+	/**
+	 * Installs a plugin directly from a source location string. Accepts
+	 * GitHub shorthand (`owner/repo`) or a full git clone URL. Clones the
+	 * repository, reads marketplace metadata to discover plugins, and
+	 * registers the selected plugin.
+	 *
+	 * When {@link IInstallPluginFromSourceOptions.plugin} is set, targets
+	 * a specific plugin, installs it, and returns it.
+	 */
+	installPluginFromSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<void>;
+
+	/**
+	 * Synchronously validates the format of a plugin source string.
+	 * Returns an error message if the format is invalid, or undefined if valid.
+	 */
+	validatePluginSource(source: string): string | undefined;
+
+	/**
+	 * Installs a plugin from an already-validated source string.
+	 * Handles trust, cloning, scanning, and registration. Returns a result
+	 * with an optional error message (e.g. no plugins found).
+	 *
+	 * When {@link IInstallPluginFromSourceOptions.plugin} is set, targets
+	 * a specific plugin, installs it, and returns it in
+	 * {@link IInstallPluginFromSourceResult.matchedPlugin}.
+	 */
+	installPluginFromValidatedSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<IInstallPluginFromSourceResult>;
 
 	/**
 	 * Pulls the latest changes for an already-cloned marketplace repository.
diff --git a/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.ts b/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.ts
index d67472945cb..b67baada8a6 100644
--- a/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.ts
+++ b/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.ts
@@ -10,7 +10,7 @@ import { parse as parseJSONC } from '../../../../../base/common/json.js';
 import { Lazy } from '../../../../../base/common/lazy.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { revive } from '../../../../../base/common/marshalling.js';
-import { IObservable, observableValue } from '../../../../../base/common/observable.js';
+import { derived, IObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
 import { isEqual, isEqualOrParent, joinPath, normalizePath, relativePath } from '../../../../../base/common/resources.js';
 import { URI, UriComponents } from '../../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -24,27 +24,18 @@ import type { Dto } from '../../../../services/extensions/common/proxyIdentifier
 import { AutoUpdateConfigurationKey, AutoUpdateConfigurationValue } from '../../../extensions/common/extensions.js';
 import { ChatConfiguration } from '../constants.js';
 import { IAgentPluginRepositoryService } from './agentPluginRepositoryService.js';
+import { IWorkspacePluginSettingsService } from './workspacePluginSettingsService.js';
+import { IWorkspaceTrustManagementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { type IMarketplaceReference, deduplicateMarketplaceReferences, MarketplaceReferenceKind, parseMarketplaceReference, parseMarketplaceReferences } from './marketplaceReference.js';
+
+// Re-export marketplace reference types for downstream consumers.
+export { deduplicateMarketplaceReferences, MarketplaceReferenceKind, parseMarketplaceReference, parseMarketplaceReferences } from './marketplaceReference.js';
+export type { IMarketplaceReference } from './marketplaceReference.js';
 
 export const enum MarketplaceType {
 	Copilot = 'copilot',
 	Claude = 'claude',
-}
-
-export const enum MarketplaceReferenceKind {
-	GitHubShorthand = 'githubShorthand',
-	GitUri = 'gitUri',
-	LocalFileUri = 'localFileUri',
-}
-
-export interface IMarketplaceReference {
-	readonly rawValue: string;
-	readonly displayLabel: string;
-	readonly cloneUrl: string;
-	readonly canonicalId: string;
-	readonly cacheSegments: readonly string[];
-	readonly kind: MarketplaceReferenceKind;
-	readonly githubRepo?: string;
-	readonly localRepositoryUri?: URI;
+	OpenPlugin = 'openPlugin',
 }
 
 export const enum PluginSourceKind {
@@ -66,6 +57,7 @@ export interface IGitHubPluginSource {
 	readonly repo: string;
 	readonly ref?: string;
 	readonly sha?: string;
+	readonly path?: string;
 }
 
 export interface IGitUrlPluginSource {
@@ -122,6 +114,7 @@ interface IJsonPluginSource {
 	readonly package?: string;
 	readonly ref?: string;
 	readonly sha?: string;
+	readonly path?: string;
 	readonly version?: string;
 	readonly registry?: string;
 }
@@ -163,6 +156,12 @@ export interface IPluginMarketplaceService {
 	 * synchronous outdated-detection instead of calling fetchMarketplacePlugins.
 	 */
 	readonly lastFetchedPlugins: IObservable<readonly IMarketplacePlugin[]>;
+	/**
+	 * Set of recommended plugin keys (`"pluginName@marketplaceName"`) aggregated
+	 * from workspace-defined settings (e.g. `.claude/settings.json`). Providers
+	 * may be added over time; consumers should not assume a specific source.
+	 */
+	readonly recommendedPlugins: IObservable<ReadonlySet<string>>;
 	/** Resets {@link hasUpdatesAvailable} to `false`. */
 	clearUpdatesAvailable(): void;
 	fetchMarketplacePlugins(token: CancellationToken): Promise<IMarketplacePlugin[]>;
@@ -174,6 +173,12 @@ export interface IPluginMarketplaceService {
 	isMarketplaceTrusted(ref: IMarketplaceReference): boolean;
 	/** Records that the user trusts the given marketplace, persisted permanently. */
 	trustMarketplace(ref: IMarketplaceReference): void;
+	/**
+	 * Reads marketplace definition files from an already-cloned repository
+	 * directory and returns the declared plugins. Used by direct-install flows
+	 * that clone a repo first, then need to discover its plugins.
+	 */
+	readPluginsFromDirectory(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin[]>;
 }
 
 /**
@@ -181,6 +186,8 @@ export interface IPluginMarketplaceService {
  * The first match determines the marketplace type.
  */
 const MARKETPLACE_DEFINITIONS: { type: MarketplaceType; path: string }[] = [
+	{ type: MarketplaceType.OpenPlugin, path: 'marketplace.json' },
+	{ type: MarketplaceType.OpenPlugin, path: '.plugin/marketplace.json' },
 	{ type: MarketplaceType.Copilot, path: '.github/plugin/marketplace.json' },
 	{ type: MarketplaceType.Claude, path: '.claude-plugin/marketplace.json' },
 ];
@@ -192,9 +199,6 @@ const GITHUB_MARKETPLACE_CACHE_STORAGE_KEY = 'chat.plugins.marketplaces.githubCa
 const PLUGIN_UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 const PLUGIN_UPDATE_LAST_CHECK_STORAGE_KEY = 'chat.plugins.lastUpdateCheck.v1';
 
-/** TTL for the lastFetchedPlugins cache (5 minutes). */
-const LAST_FETCHED_PLUGINS_TTL_MS = 5 * 60 * 1000;
-
 interface IGitHubMarketplaceCacheEntry {
 	readonly plugins: readonly IMarketplacePlugin[];
 	readonly expiresAt: number;
@@ -249,11 +253,10 @@ const trustedMarketplacesMemento = observableMemento<readonly string[]>({
 interface IStoredLastFetchedPlugins {
 	readonly plugins: readonly IMarketplacePlugin[];
 	readonly fetchedAt: number;
-	readonly configFingerprint: string;
 }
 
 const lastFetchedPluginsMemento = observableMemento<IStoredLastFetchedPlugins>({
-	defaultValue: { plugins: [], fetchedAt: 0, configFingerprint: '' },
+	defaultValue: { plugins: [], fetchedAt: 0 },
 	key: 'chat.plugins.lastFetchedPlugins.v2',
 	toStorage: value => JSON.stringify(value),
 	fromStorage: value => {
@@ -261,7 +264,7 @@ const lastFetchedPluginsMemento = observableMemento<IStoredLastFetchedPlugins>({
 		if (parsed && Array.isArray(parsed.plugins)) {
 			return parsed;
 		}
-		return { plugins: [], fetchedAt: 0, configFingerprint: '' };
+		return { plugins: [], fetchedAt: 0 };
 	},
 });
 
@@ -279,6 +282,7 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 	readonly installedPlugins: IObservable<readonly IMarketplaceInstalledPlugin[]>;
 	readonly hasUpdatesAvailable: IObservable<boolean> = this._hasUpdatesAvailable;
 	readonly lastFetchedPlugins: IObservable<readonly IMarketplacePlugin[]>;
+	readonly recommendedPlugins: IObservable<ReadonlySet<string>>;
 
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -287,6 +291,8 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 		@IAgentPluginRepositoryService private readonly _pluginRepositoryService: IAgentPluginRepositoryService,
 		@ILogService private readonly _logService: ILogService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@IWorkspacePluginSettingsService private readonly _workspacePluginSettingsService: IWorkspacePluginSettingsService,
+		@IWorkspaceTrustManagementService private readonly _workspaceTrustService: IWorkspaceTrustManagementService,
 	) {
 		super();
 
@@ -314,10 +320,33 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 			}))
 		);
 
-		this.onDidChangeMarketplaces = Event.filter(
-			_configurationService.onDidChangeConfiguration,
-			e => e.affectsConfiguration(ChatConfiguration.PluginsEnabled) || e.affectsConfiguration(ChatConfiguration.PluginMarketplaces),
-		) as Event<unknown> as Event<void>;
+		// Aggregate recommended plugin keys from all providers.
+		// Currently sourced from Claude workspace settings; more providers can be
+		// added here via additional observables in the derived computation.
+		// Only expose recommendations when the workspace is trusted.
+		const workspaceTrusted = observableFromEvent(this, this._workspaceTrustService.onDidChangeTrust, () => this._workspaceTrustService.isWorkspaceTrusted());
+		this.recommendedPlugins = derived(reader => {
+			if (!workspaceTrusted.read(reader)) {
+				return new Set<string>();
+			}
+			const enabledMap = this._workspacePluginSettingsService.enabledPlugins.read(reader);
+			const keys = new Set<string>();
+			for (const [key, value] of enabledMap) {
+				if (value) {
+					keys.add(key);
+				}
+			}
+			return keys;
+		});
+
+		this.onDidChangeMarketplaces = Event.any(
+			Event.filter(
+				_configurationService.onDidChangeConfiguration,
+				e => e.affectsConfiguration(ChatConfiguration.PluginsEnabled) || e.affectsConfiguration(ChatConfiguration.PluginMarketplaces),
+			) as Event<unknown> as Event<void>,
+			Event.fromObservableLight(this._workspacePluginSettingsService.extraMarketplaces),
+			Event.map(this._workspaceTrustService.onDidChangeTrust, () => { }),
+		);
 
 		this._register(runWhenGlobalIdle(() => {
 			// Schedule periodic update checks when auto-update is enabled.
@@ -347,16 +376,18 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 		}
 
 		const configuredRefs = this._configurationService.getValue<unknown[]>(ChatConfiguration.PluginMarketplaces) ?? [];
-		const refs = parseMarketplaceReferences(configuredRefs);
+		const configRefs = parseMarketplaceReferences(configuredRefs);
 
-		// Return cached results if recent and the marketplace config is unchanged.
-		const configFingerprint = refs.map(r => r.canonicalId).sort().join('\n');
-		const stored = this._lastFetchedPluginsStore.get();
-		if (stored.configFingerprint === configFingerprint && Date.now() - stored.fetchedAt < LAST_FETCHED_PLUGINS_TTL_MS) {
-			const cached = this.lastFetchedPlugins.get();
-			if (cached.length > 0) {
-				return [...cached];
-			}
+		// Merge marketplace references from Claude workspace settings.
+		// Workspace-defined refs take precedence (are primary) so that their
+		// displayLabel overrides any matching global marketplace entry.
+		// Only include workspace-sourced refs when the workspace is trusted.
+		let allRefs: IMarketplaceReference[];
+		if (this._workspaceTrustService.isWorkspaceTrusted()) {
+			const workspaceEntries = this._workspacePluginSettingsService.extraMarketplaces.get();
+			allRefs = deduplicateMarketplaceReferences(workspaceEntries.map(e => e.reference), configRefs);
+		} else {
+			allRefs = configRefs;
 		}
 
 		for (const value of configuredRefs) {
@@ -366,7 +397,7 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 		}
 
 		const results = await Promise.all(
-			refs.map(ref => {
+			allRefs.map(ref => {
 				if (ref.kind === MarketplaceReferenceKind.GitHubShorthand && ref.githubRepo) {
 					return this._fetchFromGitHubRepo(ref, ref.githubRepo, token);
 				}
@@ -374,7 +405,7 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 			})
 		);
 		const plugins = results.flat();
-		this._lastFetchedPluginsStore.set({ plugins, fetchedAt: Date.now(), configFingerprint }, undefined);
+		this._lastFetchedPluginsStore.set({ plugins, fetchedAt: Date.now() }, undefined);
 		return plugins;
 	}
 
@@ -383,7 +414,11 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 
 		const cached = this._getCachedGitHubMarketplacePlugins(cache, reference.canonicalId);
 		if (cached) {
-			return cached;
+			return cached.map(c => ({
+				...c,
+				marketplace: reference.displayLabel,
+				marketplaceReference: reference,
+			}));
 		}
 
 		let repoMayBePrivate = true;
@@ -394,7 +429,7 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 			}
 			const url = `https://raw.githubusercontent.com/${repo}/main/${def.path}`;
 			try {
-				const context = await this._requestService.request({ type: 'GET', url }, token);
+				const context = await this._requestService.request({ type: 'GET', url, callSite: 'pluginMarketplaceService.fetchPluginList' }, token);
 				const statusCode = context.res.statusCode;
 				if (statusCode !== 200) {
 					repoMayBePrivate &&= statusCode !== undefined && statusCode >= 400 && statusCode < 500;
@@ -663,8 +698,16 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 			return [];
 		}
 
+		return this._readPluginsFromDirectory(repoDir, reference, token);
+	}
+
+	async readPluginsFromDirectory(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin[]> {
+		return this._readPluginsFromDirectory(repoDir, reference);
+	}
+
+	private async _readPluginsFromDirectory(repoDir: URI, reference: IMarketplaceReference, token?: CancellationToken): Promise<IMarketplacePlugin[]> {
 		for (const def of MARKETPLACE_DEFINITIONS) {
-			if (token.isCancellationRequested) {
+			if (token?.isCancellationRequested) {
 				return [];
 			}
 
@@ -717,166 +760,6 @@ export class PluginMarketplaceService extends Disposable implements IPluginMarke
 	}
 }
 
-export function parseMarketplaceReferences(values: readonly unknown[]): IMarketplaceReference[] {
-	const byCanonicalId = new Map<string, IMarketplaceReference>();
-
-	for (const value of values) {
-		if (typeof value !== 'string') {
-			continue;
-		}
-
-		const parsed = parseMarketplaceReference(value);
-		if (!parsed) {
-			continue;
-		}
-
-		if (!byCanonicalId.has(parsed.canonicalId)) {
-			byCanonicalId.set(parsed.canonicalId, parsed);
-		}
-	}
-
-	return [...byCanonicalId.values()];
-}
-
-export function parseMarketplaceReference(value: string): IMarketplaceReference | undefined {
-	const rawValue = value.trim();
-	if (!rawValue) {
-		return undefined;
-	}
-
-	const uriReference = parseUriMarketplaceReference(rawValue);
-	if (uriReference) {
-		return uriReference;
-	}
-
-	const scpReference = parseScpMarketplaceReference(rawValue);
-	if (scpReference) {
-		return scpReference;
-	}
-
-	const shorthandMatch = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(rawValue);
-	if (shorthandMatch) {
-		const owner = shorthandMatch[1];
-		const repo = shorthandMatch[2];
-		return {
-			rawValue,
-			displayLabel: `${owner}/${repo}`,
-			cloneUrl: `https://github.com/${owner}/${repo}.git`,
-			canonicalId: getGitHubCanonicalId(owner, repo),
-			cacheSegments: ['github.com', owner, repo],
-			kind: MarketplaceReferenceKind.GitHubShorthand,
-			githubRepo: `${owner}/${repo}`,
-		};
-	}
-
-	return undefined;
-}
-
-function parseUriMarketplaceReference(rawValue: string): IMarketplaceReference | undefined {
-	let uri: URI;
-	try {
-		uri = URI.parse(rawValue);
-	} catch {
-		return undefined;
-	}
-
-	const scheme = uri.scheme.toLowerCase();
-	if (scheme === 'file' && /^file:\/\//i.test(rawValue)) {
-		const localRepositoryUri = URI.file(uri.fsPath);
-		return {
-			rawValue,
-			displayLabel: localRepositoryUri.fsPath,
-			cloneUrl: rawValue,
-			canonicalId: `file:${localRepositoryUri.toString().toLowerCase()}`,
-			cacheSegments: [],
-			kind: MarketplaceReferenceKind.LocalFileUri,
-			localRepositoryUri,
-		};
-	}
-
-	if (scheme !== 'http' && scheme !== 'https' && scheme !== 'ssh') {
-		return undefined;
-	}
-
-	if (!uri.authority) {
-		return undefined;
-	}
-
-	const normalizedPath = normalizeGitRepoPath(uri.path);
-	if (!normalizedPath) {
-		return undefined;
-	}
-
-	const gitSuffix = '.git';
-	const sanitizedAuthority = sanitizePathSegment(uri.authority.toLowerCase());
-	const pathHasGitSuffix = normalizedPath.toLowerCase().endsWith(gitSuffix);
-	const pathWithoutGit = pathHasGitSuffix ? normalizedPath.slice(1, normalizedPath.length - gitSuffix.length) : normalizedPath.slice(1);
-	const pathSegments = pathWithoutGit.split('/').map(sanitizePathSegment);
-	// Always normalize the canonical path to include .git so that URLs with and without the suffix deduplicate.
-	const canonicalPath = pathHasGitSuffix ? normalizedPath.slice(1).toLowerCase() : `${normalizedPath.slice(1).toLowerCase()}${gitSuffix}`;
-	return {
-		rawValue,
-		displayLabel: rawValue,
-		cloneUrl: rawValue,
-		canonicalId: `git:${uri.authority.toLowerCase()}/${canonicalPath}`,
-		cacheSegments: [sanitizedAuthority, ...pathSegments],
-		kind: MarketplaceReferenceKind.GitUri,
-	};
-}
-
-function parseScpMarketplaceReference(rawValue: string): IMarketplaceReference | undefined {
-	const match = /^([^@\s]+)@([^:\s]+):(.+\.git)$/i.exec(rawValue);
-	if (!match) {
-		return undefined;
-	}
-
-	const authority = match[2];
-	const pathWithGit = match[3].replace(/^\/+/, '');
-	if (!pathWithGit.toLowerCase().endsWith('.git')) {
-		return undefined;
-	}
-
-	const pathSegments = pathWithGit.slice(0, -4).split('/').map(sanitizePathSegment);
-	return {
-		rawValue,
-		displayLabel: rawValue,
-		cloneUrl: rawValue,
-		canonicalId: `git:${authority.toLowerCase()}/${pathWithGit.toLowerCase()}`,
-		cacheSegments: [sanitizePathSegment(authority.toLowerCase()), ...pathSegments],
-		kind: MarketplaceReferenceKind.GitUri,
-	};
-}
-
-/**
- * Normalizes a Git repository path and validates that it has at least two segments
- * (i.e., at least one owner/repo pair below the root). Accepts paths with or without
- * a `.git` suffix — the suffix is preserved in the returned value so callers can decide
- * how to treat it.
- */
-function normalizeGitRepoPath(path: string): string | undefined {
-	const gitSuffix = '.git';
-	const trimmed = path.replace(/\/+/g, '/').replace(/\/+$/g, '');
-
-	const withLeadingSlash = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
-	// Strip .git suffix (if present) only for the purposes of validating path depth.
-	const pathWithoutGit = withLeadingSlash.toLowerCase().endsWith(gitSuffix)
-		? withLeadingSlash.slice(1, withLeadingSlash.length - gitSuffix.length)
-		: withLeadingSlash.slice(1);
-	if (!pathWithoutGit || !pathWithoutGit.includes('/')) {
-		return undefined;
-	}
-
-	return withLeadingSlash;
-}
-
-function getGitHubCanonicalId(owner: string, repo: string): string {
-	return `github:${owner.toLowerCase()}/${repo.toLowerCase()}`;
-}
-
-function sanitizePathSegment(value: string): string {
-	return value.replace(/[\\/:*?"<>|]/g, '_');
-}
-
 function normalizeMarketplacePath(value: string): string {
 	let normalized = value.trim().replace(/\\/g, '/');
 	normalized = normalized.replace(/^\.?\/+/, '').replace(/\/+$/g, '');
@@ -959,11 +842,16 @@ export function parsePluginSource(
 				logContext.logService.warn(`${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': github source 'sha' must be a full 40-character commit hash when provided`);
 				return undefined;
 			}
+			if (!isOptionalString(rawSource.path)) {
+				logContext.logService.warn(`${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': github source 'path' must be a string when provided`);
+				return undefined;
+			}
 			return {
 				kind: PluginSourceKind.GitHub,
 				repo: rawSource.repo,
 				ref: rawSource.ref,
 				sha: rawSource.sha,
+				path: rawSource.path,
 			};
 		}
 		case 'url': {
@@ -1049,7 +937,7 @@ export function getPluginSourceLabel(descriptor: IPluginSourceDescriptor): strin
 		case PluginSourceKind.RelativePath:
 			return descriptor.path || '.';
 		case PluginSourceKind.GitHub:
-			return descriptor.repo;
+			return descriptor.path ? `${descriptor.repo}/${descriptor.path}` : descriptor.repo;
 		case PluginSourceKind.GitUrl:
 			return descriptor.url;
 		case PluginSourceKind.Npm:
@@ -1071,7 +959,8 @@ export function hasSourceChanged(installed: IPluginSourceDescriptor, marketplace
 	switch (installed.kind) {
 		case PluginSourceKind.GitHub:
 			return installed.ref !== (marketplace as typeof installed).ref
-				|| installed.sha !== (marketplace as typeof installed).sha;
+				|| installed.sha !== (marketplace as typeof installed).sha
+				|| installed.path !== (marketplace as typeof installed).path;
 		case PluginSourceKind.GitUrl:
 			return installed.ref !== (marketplace as typeof installed).ref
 				|| installed.sha !== (marketplace as typeof installed).sha;
diff --git a/src/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.ts b/src/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.ts
new file mode 100644
index 00000000000..4ccf86b083c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.ts
@@ -0,0 +1,312 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { parse as parseJSONC } from '../../../../../base/common/json.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
+import { joinPath } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { CLAUDE_CONFIG_FOLDER } from '../promptSyntax/config/promptFileLocations.js';
+import { IMarketplaceReference, parseMarketplaceReference } from './marketplaceReference.js';
+
+const SETTINGS_FILENAME = 'settings.json';
+const SETTINGS_LOCAL_FILENAME = 'settings.local.json';
+
+/** Copilot CLI settings folder inside `.github/`. */
+const COPILOT_CONFIG_FOLDER = '.github/copilot';
+
+/**
+ * Minimal representation of a marketplace entry from `extraKnownMarketplaces`.
+ */
+export interface IWorkspaceMarketplaceEntry {
+	readonly name: string;
+	readonly reference: IMarketplaceReference;
+}
+
+export const IWorkspacePluginSettingsService = createDecorator<IWorkspacePluginSettingsService>('workspacePluginSettingsService');
+
+export interface IWorkspacePluginSettingsService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Marketplace references parsed from `extraKnownMarketplaces` in workspace
+	 * settings files (`.claude/settings.json`, `.github/copilot/settings.json`).
+	 */
+	readonly extraMarketplaces: IObservable<readonly IWorkspaceMarketplaceEntry[]>;
+
+	/**
+	 * Plugin recommendation map parsed from `enabledPlugins` in workspace
+	 * settings files.
+	 * Keys are `"pluginName@marketplaceName"`, values indicate recommendation.
+	 */
+	readonly enabledPlugins: IObservable<ReadonlyMap<string, boolean>>;
+}
+
+// --- Parsing helpers ---------------------------------------------------------
+
+interface IMarketplaceSourceJson {
+	readonly source?: string;
+	readonly repo?: string;
+	readonly url?: string;
+	readonly path?: string;
+}
+
+interface IExtraMarketplaceJson {
+	readonly source?: string | IMarketplaceSourceJson;
+	readonly repo?: string;
+	readonly url?: string;
+	readonly path?: string;
+}
+
+/**
+ * Converts a single `extraKnownMarketplaces` entry into an
+ * {@link IMarketplaceReference} by mapping the source format to
+ * existing marketplace reference parsing.
+ */
+function marketplaceEntryToReference(entry: IExtraMarketplaceJson): IMarketplaceReference | undefined {
+	// Two shapes supported:
+	// 1. { source: "github", repo: "owner/repo" }   →  GitHub shorthand
+	// 2. { source: { source: "github", repo: "owner/repo" } }  →  nested
+	// 3. { source: "git", url: "https://..." }       →  Git URI
+
+	let sourceType: string | undefined;
+	let repo: string | undefined;
+	let url: string | undefined;
+
+	if (typeof entry.source === 'object' && entry.source !== null) {
+		const nested = entry.source;
+		sourceType = nested.source;
+		repo = nested.repo;
+		url = nested.url;
+	} else {
+		sourceType = entry.source as string | undefined;
+		repo = entry.repo;
+		url = entry.url;
+	}
+
+	if (sourceType === 'github' && typeof repo === 'string') {
+		return parseMarketplaceReference(repo);
+	}
+
+	if (sourceType === 'git' && typeof url === 'string') {
+		return parseMarketplaceReference(url);
+	}
+
+	return undefined;
+}
+
+/**
+ * Parses `enabledPlugins` from a JSON object.
+ */
+function parseEnabledPlugins(json: unknown): ReadonlyMap<string, boolean> {
+	const result = new Map<string, boolean>();
+
+	if (!json || typeof json !== 'object' || Array.isArray(json)) {
+		return result;
+	}
+
+	const obj = json as Record<string, unknown>;
+	for (const [key, value] of Object.entries(obj)) {
+		if (typeof value === 'boolean') {
+			result.set(key, value);
+		}
+	}
+
+	return result;
+}
+
+/**
+ * Parses `extraKnownMarketplaces` from a JSON object.
+ */
+function parseExtraMarketplaces(json: unknown, logPrefix: string, logService: ILogService): readonly IWorkspaceMarketplaceEntry[] {
+	const entries: IWorkspaceMarketplaceEntry[] = [];
+
+	if (!json || typeof json !== 'object' || Array.isArray(json)) {
+		return entries;
+	}
+
+	const obj = json as Record<string, unknown>;
+	for (const [name, value] of Object.entries(obj)) {
+		if (!value || typeof value !== 'object') {
+			logService.debug(`${logPrefix} Ignoring non-object extraKnownMarketplaces entry: ${name}`);
+			continue;
+		}
+
+		const reference = marketplaceEntryToReference(value as IExtraMarketplaceJson);
+		if (!reference) {
+			logService.debug(`${logPrefix} Could not parse marketplace reference for: ${name}`);
+			continue;
+		}
+
+		// Override displayLabel with the user-chosen marketplace name so that
+		// fetched plugins use this name in their `marketplace` field, which is
+		// what `enabledPlugins` keys reference (e.g. "plugin@claude-settings").
+		entries.push({ name, reference: { ...reference, displayLabel: name } });
+	}
+
+	return entries;
+}
+
+// --- Settings reader (reusable per config folder) ----------------------------
+
+interface IWorkspaceSettingsData {
+	readonly marketplaces: readonly IWorkspaceMarketplaceEntry[];
+	readonly enabledPlugins: ReadonlyMap<string, boolean>;
+}
+
+const EMPTY_DATA: IWorkspaceSettingsData = { marketplaces: [], enabledPlugins: new Map() };
+
+/**
+ * Reads `enabledPlugins` and `extraKnownMarketplaces` from a pair of
+ * `settings.json` / `settings.local.json` files inside a given config
+ * folder (e.g. `.claude/` or `.github/copilot/`) across all workspace
+ * folders. Watches for changes and exposes results as an observable.
+ */
+class WorkspaceSettingsReader extends Disposable {
+
+	private readonly _data = observableValue<IWorkspaceSettingsData>('data', EMPTY_DATA);
+	readonly data: IObservable<IWorkspaceSettingsData> = this._data;
+
+	constructor(
+		/** Workspace-relative config folder (e.g. `.claude`). */
+		configFolder: string,
+		logPrefix: string,
+		fileService: IFileService,
+		workspaceContextService: IWorkspaceContextService,
+		private readonly _logService: ILogService,
+	) {
+		super();
+
+		const settingsDirs = observableFromEvent(
+			this,
+			workspaceContextService.onDidChangeWorkspaceFolders,
+			() => workspaceContextService.getWorkspace().folders.map(f => joinPath(f.uri, configFolder)),
+		);
+
+		const watcherStore = this._register(new DisposableStore());
+		this._register(autorun(reader => {
+			const dirs = settingsDirs.read(reader);
+			watcherStore.clear();
+
+			// Coalesce rapid file-change events into a single read.
+			const scheduler = new RunOnceScheduler(() => this._readSettings(dirs, logPrefix, fileService), 100);
+			watcherStore.add(scheduler);
+
+			for (const dir of dirs) {
+				const watcher = fileService.createWatcher(dir, { recursive: false, excludes: [] });
+				watcherStore.add(watcher);
+				watcherStore.add(watcher.onDidChange(e => {
+					if (e.affects(joinPath(dir, SETTINGS_FILENAME)) || e.affects(joinPath(dir, SETTINGS_LOCAL_FILENAME))) {
+						scheduler.schedule();
+					}
+				}));
+			}
+
+			// Perform initial read immediately.
+			this._readSettings(dirs, logPrefix, fileService);
+		}));
+	}
+
+	private async _readSettings(dirs: readonly URI[], logPrefix: string, fileService: IFileService): Promise<void> {
+		const allMarketplaces: IWorkspaceMarketplaceEntry[] = [];
+		const mergedEnabled = new Map<string, boolean>();
+
+		for (const dir of dirs) {
+			const sharedUri = joinPath(dir, SETTINGS_FILENAME);
+			const localUri = joinPath(dir, SETTINGS_LOCAL_FILENAME);
+
+			for (const uri of [sharedUri, localUri]) {
+				try {
+					const content = await fileService.readFile(uri);
+					const json = parseJSONC(content.value.toString());
+
+					if (!json || typeof json !== 'object') {
+						continue;
+					}
+
+					const root = json as Record<string, unknown>;
+
+					const marketplaces = parseExtraMarketplaces(root.extraKnownMarketplaces, logPrefix, this._logService);
+					for (const entry of marketplaces) {
+						if (!allMarketplaces.some(e => e.reference.canonicalId === entry.reference.canonicalId)) {
+							allMarketplaces.push(entry);
+						}
+					}
+
+					const enabled = parseEnabledPlugins(root.enabledPlugins);
+					for (const [key, value] of enabled) {
+						mergedEnabled.set(key, value);
+					}
+				} catch {
+					this._logService.debug(`${logPrefix} Could not read ${uri.toString()}`);
+				}
+			}
+		}
+
+		this._data.set({ marketplaces: allMarketplaces, enabledPlugins: mergedEnabled }, undefined);
+	}
+}
+
+// --- Aggregating service implementation --------------------------------------
+
+export class WorkspacePluginSettingsService extends Disposable implements IWorkspacePluginSettingsService {
+	declare readonly _serviceBrand: undefined;
+
+	readonly extraMarketplaces: IObservable<readonly IWorkspaceMarketplaceEntry[]>;
+	readonly enabledPlugins: IObservable<ReadonlyMap<string, boolean>>;
+
+	constructor(
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+		@ILogService logService: ILogService,
+	) {
+		super();
+
+		const claudeReader = this._register(new WorkspaceSettingsReader(
+			CLAUDE_CONFIG_FOLDER, '[ClaudePluginSettings]',
+			fileService, workspaceContextService, logService,
+		));
+
+		const copilotReader = this._register(new WorkspaceSettingsReader(
+			COPILOT_CONFIG_FOLDER, '[CopilotPluginSettings]',
+			fileService, workspaceContextService, logService,
+		));
+
+		// Merge marketplaces from all readers, deduplicating by canonical ID.
+		this.extraMarketplaces = derived(reader => {
+			const claude = claudeReader.data.read(reader).marketplaces;
+			const copilot = copilotReader.data.read(reader).marketplaces;
+			const byCanonicalId = new Map<string, IWorkspaceMarketplaceEntry>();
+			for (const entry of [...claude, ...copilot]) {
+				if (!byCanonicalId.has(entry.reference.canonicalId)) {
+					byCanonicalId.set(entry.reference.canonicalId, entry);
+				}
+			}
+			return [...byCanonicalId.values()];
+		});
+
+		// Merge enabledPlugins from all readers. Claude entries take
+		// precedence for keys that exist in both (first-writer wins).
+		this.enabledPlugins = derived(reader => {
+			const claude = claudeReader.data.read(reader).enabledPlugins;
+			const copilot = copilotReader.data.read(reader).enabledPlugins;
+			const merged = new Map<string, boolean>();
+			for (const [key, value] of claude) {
+				merged.set(key, value);
+			}
+			for (const [key, value] of copilot) {
+				if (!merged.has(key)) {
+					merged.set(key, value);
+				}
+			}
+			return merged;
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts
index f3fbb1a8c1e..dafa487c65b 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts
@@ -12,6 +12,7 @@ import { basename, dirname } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
@@ -22,8 +23,9 @@ import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariable
 import { ILanguageModelToolsService, IToolData, VSCodeToolReference } from '../tools/languageModelToolsService.js';
 import { PromptsConfig } from './config/config.js';
 import { isInClaudeAgentsFolder, isInClaudeRulesFolder, isPromptOrInstructionsFile } from './config/promptFileLocations.js';
-import { ParsedPromptFile } from './promptFileParser.js';
+import { ParsedPromptFile, PromptHeader } from './promptFileParser.js';
 import { AgentFileType, ICustomAgent, IPromptPath, IPromptsService } from './service/promptsService.js';
+import { AGENT_DEBUG_LOG_ENABLED_SETTING, AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_SKILL_PATH } from './promptTypes.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
 import { ChatConfiguration, ChatModeKind } from '../constants.js';
 import { UserSelectedTools } from '../participants/chatAgents.js';
@@ -68,6 +70,7 @@ export class ComputeAutomaticInstructions {
 		@ILogService public readonly _logService: ILogService,
 		@ILabelService private readonly _labelService: ILabelService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
 		@IFileService private readonly _fileService: IFileService,
 		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
@@ -230,21 +233,6 @@ export class ComputeAutomaticInstructions {
 		}
 	}
 
-	/**
-	 * Combines the `applyTo` and `paths` attributes into a single comma-separated
-	 * pattern string that can be matched by {@link _matches}.
-	 * Used for the instructions list XML output where both should be shown.
-	 */
-	private _getApplyToPattern(applyTo: string | undefined, paths: readonly string[] | undefined): string | undefined {
-		if (applyTo) {
-			return applyTo;
-		}
-		if (paths && paths.length > 0) {
-			return paths.join(', ');
-		}
-		return undefined;
-	}
-
 	private _matches(files: ResourceSet, applyToPattern: string): { pattern: string; file?: URI } | undefined {
 		const patterns = splitGlobAware(applyToPattern, ',');
 		const patterMatches = (pattern: string): { pattern: string; file?: URI } | undefined => {
@@ -319,12 +307,12 @@ export class ComputeAutomaticInstructions {
 				if (parsedFile) {
 					entries.push('<instruction>');
 					if (parsedFile.header) {
-						const { description, applyTo, paths } = parsedFile.header;
+						const { description } = parsedFile.header;
 						if (description) {
 							entries.push(`<description>${description}</description>`);
 						}
 						entries.push(`<file>${filePath(uri)}</file>`);
-						const applyToPattern = this._getApplyToPattern(applyTo, paths);
+						const applyToPattern = evaluateApplyToPattern(parsedFile.header, isInClaudeRulesFolder(uri));
 						if (applyToPattern) {
 							entries.push(`<applyTo>${applyToPattern}</applyTo>`);
 						}
@@ -356,7 +344,22 @@ export class ComputeAutomaticInstructions {
 
 			const agentSkills = await this._promptsService.findAgentSkills(token, this._sessionResource);
 			// Filter out skills with disableModelInvocation=true (they can only be triggered manually via /name)
-			const modelInvocableSkills = agentSkills?.filter(skill => !skill.disableModelInvocation);
+			// Also filter by `when` clause using the scoped context key service
+			// Also filter out the troubleshoot skill when the feature flags are disabled
+			const isDebugLogEnabled = this._configurationService.getValue<boolean>(AGENT_DEBUG_LOG_ENABLED_SETTING);
+			const isFileLoggingEnabled = this._configurationService.getValue<boolean>(AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING);
+			const modelInvocableSkills = agentSkills?.filter(skill => {
+				if (skill.disableModelInvocation) {
+					return false;
+				}
+				if (skill.when && !this._contextKeyService.contextMatchesRules(skill.when)) {
+					return false;
+				}
+				if ((!isDebugLogEnabled || !isFileLoggingEnabled) && skill.uri.path.includes(TROUBLESHOOT_SKILL_PATH)) {
+					return false;
+				}
+				return true;
+			});
 			if (modelInvocableSkills && modelInvocableSkills.length > 0) {
 				const useSkillAdherencePrompt = this._configurationService.getValue(PromptsConfig.USE_SKILL_ADHERENCE_PROMPT);
 				entries.push('<skills>');
@@ -515,3 +518,14 @@ export function getFilePath(uri: URI, remoteOS: OperatingSystem | undefined): st
 	}
 	return uri.toString();
 }
+
+/**
+ * Returns `applyTo` or `paths` attributes based on whether the instruction file is a Claude rules file or a regular instruction file
+ */
+export function evaluateApplyToPattern(header: PromptHeader | undefined, isClaudeRules: boolean): string | undefined {
+	if (isClaudeRules) {
+		// For Claude rules files, `paths` is the primary attribute (defaulting to '**' when omitted)
+		return header?.paths?.join(', ') ?? '**';
+	}
+	return header?.applyTo ?? undefined; // For regular instruction files, only show `applyTo` patterns, and skip if it's omitted
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts
index 4c7497b9f7d..d72cc6b32a6 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts
@@ -135,6 +135,11 @@ export namespace PromptsConfig {
 	 */
 	export const INCLUDE_REFERENCED_INSTRUCTIONS = 'chat.includeReferencedInstructions';
 
+	/**
+	 * Search for configuration files in parent repositories of the workspace folder
+	 */
+	export const USE_CUSTOMIZATIONS_IN_PARENT_REPOS = 'chat.useCustomizationsInParentRepositories';
+
 	/**
 	 * Get value of the `reusable prompt locations` configuration setting.
 	 * @see {@link PROMPT_LOCATIONS_CONFIG_KEY}, {@link INSTRUCTIONS_LOCATIONS_CONFIG_KEY}, {@link MODE_LOCATIONS_CONFIG_KEY}, {@link SKILLS_LOCATION_KEY}.
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts
index 779974e1e63..bc63b772fe5 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts
@@ -4,12 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../../../base/common/uri.js';
-import { posix } from '../../../../../../base/common/path.js';
+import { basename, dirname } from '../../../../../../base/common/resources.js';
 import { PromptsType } from '../promptTypes.js';
 import { PromptsStorage } from '../service/promptsService.js';
 
-const { basename, dirname } = posix;
-
 /**
  * File extension for the reusable prompt files.
  */
@@ -35,6 +33,11 @@ export const AGENT_FILE_EXTENSION = '.agent.md';
  */
 export const SKILL_FILENAME = 'SKILL.md';
 
+/**
+ * Regex for valid skill names: lowercase alphanumeric and hyphens only.
+ */
+export const VALID_SKILL_NAME_REGEX = /^[a-z0-9-]+$/;
+
 /**
  * AGENT file name
  */
@@ -60,6 +63,10 @@ export const CLAUDE_CONFIG_FOLDER = '.claude';
  */
 export const COPILOT_CUSTOM_INSTRUCTIONS_FILENAME = 'copilot-instructions.md';
 
+/**
+ * GitHub configuration folder name.
+ */
+export const GITHUB_CONFIG_FOLDER = '.github';
 
 /**
  * Default reusable prompt files source folder.
@@ -117,6 +124,7 @@ export enum PromptFileSource {
 	ExtensionContribution = 'extension-contribution',
 	ExtensionAPI = 'extension-api',
 	Plugin = 'plugin',
+	Internal = 'internal',
 }
 
 /**
@@ -133,6 +141,8 @@ export interface IPromptSourceFolder {
  */
 export interface IResolvedPromptSourceFolder {
 	readonly uri: URI;
+	readonly parent: URI; // matches the URI when no glob pattern is used
+	readonly filePattern: string | undefined; // the part of the path with the glob pattern, or undefined if no glob pattern is used
 	readonly source: PromptFileSource;
 	readonly storage: PromptsStorage;
 	/**
@@ -202,6 +212,7 @@ export const DEFAULT_HOOK_FILE_PATHS: readonly IPromptSourceFolder[] = [
 	{ path: '.github/hooks', source: PromptFileSource.GitHubWorkspace, storage: PromptsStorage.local },
 	{ path: '.claude/settings.local.json', source: PromptFileSource.ClaudeWorkspaceLocal, storage: PromptsStorage.local },
 	{ path: '.claude/settings.json', source: PromptFileSource.ClaudeWorkspace, storage: PromptsStorage.local },
+	{ path: '~/.copilot/hooks', source: PromptFileSource.CopilotPersonal, storage: PromptsStorage.user },
 	{ path: '~/.claude/settings.json', source: PromptFileSource.ClaudePersonal, storage: PromptsStorage.user },
 ];
 
@@ -209,7 +220,7 @@ export const DEFAULT_HOOK_FILE_PATHS: readonly IPromptSourceFolder[] = [
  * Helper function to check if a file is directly in the .github/agents/ folder (not in subfolders).
  */
 function isInAgentsFolder(fileUri: URI): boolean {
-	const dir = dirname(fileUri.path);
+	const dir = dirname(fileUri).path;
 	return dir.endsWith('/' + AGENTS_SOURCE_FOLDER) || dir.endsWith('/' + CLAUDE_AGENTS_SOURCE_FOLDER) || isInCopilotAgentsFolder(fileUri);
 }
 
@@ -217,7 +228,7 @@ function isInAgentsFolder(fileUri: URI): boolean {
  * Helper function to check if a file is directly in the .claude/agents/ folder.
  */
 export function isInClaudeAgentsFolder(fileUri: URI): boolean {
-	const dir = dirname(fileUri.path);
+	const dir = dirname(fileUri).path;
 	return dir.endsWith('/' + CLAUDE_AGENTS_SOURCE_FOLDER);
 }
 
@@ -225,7 +236,7 @@ export function isInClaudeAgentsFolder(fileUri: URI): boolean {
  * Helper function to check if a file is directly in the ~/.copilot/agents/ folder.
  */
 export function isInCopilotAgentsFolder(fileUri: URI): boolean {
-	const dir = dirname(fileUri.path);
+	const dir = dirname(fileUri).path;
 	return dir.endsWith(COPILOT_USER_AGENTS_SOURCE_FOLDER.substring(1));
 }
 
@@ -247,7 +258,7 @@ export function isInClaudeRulesFolder(fileUri: URI): boolean {
  * PromptsType.hook regardless of its location.
  */
 export function getPromptFileType(fileUri: URI): PromptsType | undefined {
-	const filename = basename(fileUri.path);
+	const filename = basename(fileUri);
 
 	if (filename.endsWith(PROMPT_FILE_EXTENSION)) {
 		return PromptsType.prompt;
@@ -327,12 +338,15 @@ export function getPromptFileDefaultLocations(type: PromptsType): readonly IProm
 	}
 }
 
+export function getSkillFolderName(fileUri: URI): string {
+	return basename(dirname(fileUri));
+}
 
 /**
  * Gets clean prompt name without file extension.
  */
 export function getCleanPromptName(fileUri: URI): string {
-	const fileName = basename(fileUri.path);
+	const fileName = basename(fileUri);
 
 	const extensions = [
 		PROMPT_FILE_EXTENSION,
@@ -343,33 +357,33 @@ export function getCleanPromptName(fileUri: URI): string {
 
 	for (const ext of extensions) {
 		if (fileName.endsWith(ext)) {
-			return basename(fileUri.path, ext);
+			return basename(fileUri, ext);
 		}
 	}
 
 	if (fileName === COPILOT_CUSTOM_INSTRUCTIONS_FILENAME) {
-		return basename(fileUri.path, '.md');
+		return basename(fileUri, '.md');
 	}
 
 	// For SKILL.md files (case insensitive), return 'SKILL'
 	if (fileName.toLowerCase() === SKILL_FILENAME.toLowerCase()) {
-		return basename(fileUri.path, '.md');
+		return basename(fileUri, '.md');
 	}
 
 	// For .md files in .github/agents/ folder, treat them as agent files
 	// Exclude README.md to allow documentation files
 	if (fileName.endsWith('.md') && fileName !== 'README.md' && isInAgentsFolder(fileUri)) {
-		return basename(fileUri.path, '.md');
+		return basename(fileUri, '.md');
 	}
 
 	// For .md files in .claude/rules/ folder, treat them as instruction files
 	if (fileName.endsWith('.md') && fileName !== 'README.md' && isInClaudeRulesFolder(fileUri)) {
-		return basename(fileUri.path, '.md');
+		return basename(fileUri, '.md');
 	}
 
 	// because we now rely on the `prompt` language ID that can be explicitly
 	// set for any document in the editor, any file can be a "prompt" file, so
 	// to account for that, we return the full file name including the file
 	// extension for all other cases
-	return basename(fileUri.path);
+	return basename(fileUri);
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalCustomizations.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalCustomizations.ts
new file mode 100644
index 00000000000..2d13b4be1f4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalCustomizations.ts
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { IAgentSkill, IInternalPromptPath, PromptsStorage } from '../service/promptsService.js';
+import { PromptsType } from '../promptTypes.js';
+import { registerChatInternalFileSystem } from './internalPromptFileSystem.js';
+import { InternalSkill } from './internalSkill.js';
+export { InternalSkill } from './internalSkill.js';
+
+/**
+ * Manages built-in internal customizations (skills, instructions, agents, etc.)
+ * backed by a readonly virtual filesystem.
+ *
+ * To add a new internal skill, create an {@link InternalSkill} instance and
+ * register it in the constructor.
+ */
+export class ChatInternalCustomizations extends Disposable {
+
+	private readonly skills: readonly InternalSkill[];
+	private readonly skillsByUri = new Map<string, InternalSkill>();
+
+	constructor(fileService: IFileService) {
+		super();
+
+		const { provider, disposable: fsDisposable } = registerChatInternalFileSystem(fileService);
+		this._register(fsDisposable);
+
+		// --- Built-in skills (add new entries here) ---
+		this.skills = [];
+
+		for (const skill of this.skills) {
+			provider.registerFile(skill.uri, skill.content);
+			this.skillsByUri.set(skill.uri.toString(), skill);
+			this._register(skill);
+		}
+
+	}
+
+	/**
+	 * Returns the {@link IAgentSkill} metadata for all internal skills,
+	 * for injection into the skills list.
+	 */
+	getSkills(): readonly IAgentSkill[] {
+		return this.skills.map(s => s.skill);
+	}
+
+	/**
+	 * Looks up the {@link InternalSkill} instance for a given URI,
+	 * e.g. to check its {@link InternalSkill.when} clause.
+	 */
+	getInternalSkillByUri(uri: URI): InternalSkill | undefined {
+		return this.skillsByUri.get(uri.toString());
+	}
+
+	/**
+	 * Returns internal prompt file paths for a given customization type.
+	 */
+	getPromptPaths(type: PromptsType): readonly IInternalPromptPath[] {
+		if (type === PromptsType.skill) {
+			return this.skills.map(s => ({
+				uri: s.uri,
+				storage: PromptsStorage.internal as const,
+				type,
+				name: s.name,
+				description: s.description,
+			}));
+		}
+		return [];
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalPromptFileSystem.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalPromptFileSystem.ts
new file mode 100644
index 00000000000..c75a1759b8a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalPromptFileSystem.ts
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { createFileSystemProviderError, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileDeleteOptions, IFileOverwriteOptions, IFileService, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat } from '../../../../../../platform/files/common/files.js';
+
+/**
+ * URI scheme for internal chat prompt files (skills, instructions, agents, etc.)
+ * backed by a readonly virtual filesystem.
+ */
+export const CHAT_INTERNAL_SCHEME = 'vscode-chat-internal';
+
+/**
+ * A readonly virtual filesystem provider for internal chat prompt files.
+ *
+ * Files are registered at startup via {@link registerFile} and cannot be
+ * modified or deleted afterwards.
+ */
+export class ChatInternalFileSystemProvider extends Disposable implements IFileSystemProviderWithFileReadWriteCapability {
+
+	private readonly files = new Map<string, Uint8Array>();
+
+	readonly onDidChangeCapabilities = Event.None;
+	readonly onDidChangeFile = Event.None;
+
+	readonly capabilities = FileSystemProviderCapabilities.FileReadWrite
+		| FileSystemProviderCapabilities.Readonly
+		| FileSystemProviderCapabilities.PathCaseSensitive;
+
+	/**
+	 * Register a file with static content. Must be called before the
+	 * file can be read. Typically called once at startup.
+	 */
+	registerFile(uri: URI, content: string): void {
+		this.files.set(uri.toString(), VSBuffer.fromString(content).buffer);
+	}
+
+	// --- IFileSystemProvider ---
+
+	watch(): IDisposable {
+		return Disposable.None;
+	}
+
+	async stat(resource: URI): Promise<IStat> {
+		const data = this.files.get(resource.toString());
+		if (data) {
+			return {
+				type: FileType.File,
+				ctime: 0,
+				mtime: 0,
+				size: data.byteLength,
+			};
+		}
+		// Check if this is a directory (any registered file has this as prefix)
+		const prefix = resource.toString() + '/';
+		for (const key of this.files.keys()) {
+			if (key.startsWith(prefix)) {
+				return { type: FileType.Directory, ctime: 0, mtime: 0, size: 0 };
+			}
+		}
+		throw createFileSystemProviderError('file not found', FileSystemProviderErrorCode.FileNotFound);
+	}
+
+	async mkdir(): Promise<void> {
+		throw createFileSystemProviderError('readonly filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	async readdir(resource: URI): Promise<[string, FileType][]> {
+		const prefix = resource.toString() + '/';
+		const entries = new Map<string, FileType>();
+		for (const key of this.files.keys()) {
+			if (key.startsWith(prefix)) {
+				const rest = key.substring(prefix.length);
+				const slash = rest.indexOf('/');
+				if (slash === -1) {
+					entries.set(rest, FileType.File);
+				} else {
+					entries.set(rest.substring(0, slash), FileType.Directory);
+				}
+			}
+		}
+		return [...entries.entries()];
+	}
+
+	async delete(_resource: URI, _opts: IFileDeleteOptions): Promise<void> {
+		throw createFileSystemProviderError('readonly filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	async rename(_from: URI, _to: URI, _opts: IFileOverwriteOptions): Promise<void> {
+		throw createFileSystemProviderError('readonly filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+
+	async readFile(resource: URI): Promise<Uint8Array> {
+		const data = this.files.get(resource.toString());
+		if (data) {
+			return data;
+		}
+		throw createFileSystemProviderError('file not found', FileSystemProviderErrorCode.FileNotFound);
+	}
+
+	async writeFile(_resource: URI, _content: Uint8Array, _opts: IFileWriteOptions): Promise<void> {
+		throw createFileSystemProviderError('readonly filesystem', FileSystemProviderErrorCode.NoPermissions);
+	}
+}
+
+/**
+ * Registers the internal chat filesystem provider with the file service,
+ * populates it with built-in files, and returns both the provider (for
+ * event subscription) and a disposable for cleanup.
+ */
+export function registerChatInternalFileSystem(fileService: IFileService): { provider: ChatInternalFileSystemProvider; disposable: IDisposable } {
+	const provider = new ChatInternalFileSystemProvider();
+	const registration = fileService.registerProvider(CHAT_INTERNAL_SCHEME, provider);
+
+	return {
+		provider,
+		disposable: {
+			dispose() {
+				registration.dispose();
+				provider.dispose();
+			}
+		}
+	};
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalSkill.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalSkill.ts
new file mode 100644
index 00000000000..7303fceefa4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/internalCustomizations/internalSkill.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ContextKeyExpression } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IAgentSkill, PromptsStorage } from '../service/promptsService.js';
+import { CHAT_INTERNAL_SCHEME } from './internalPromptFileSystem.js';
+
+/**
+ * A built-in skill backed by the internal readonly virtual filesystem.
+ *
+ * To add a new internal skill, create an instance documenting the skill
+ * name, description and SKILL.md content, then add it to the
+ * {@link internalSkills} array in {@link internalCustomizations.ts}.
+ */
+export class InternalSkill extends Disposable {
+
+	/** Virtual filesystem URI for the SKILL.md file. */
+	readonly uri: URI;
+
+	/** The skill metadata exposed to the skills list and system prompt. */
+	readonly skill: IAgentSkill;
+
+	/**
+	 * Optional context key expression. When set, the skill is only included
+	 * in the system prompt when this expression evaluates to true.
+	 */
+	readonly when: ContextKeyExpression | undefined;
+
+	constructor(
+		readonly name: string,
+		readonly description: string,
+		readonly content: string,
+		options?: {
+			disableModelInvocation?: boolean;
+			userInvocable?: boolean;
+			when?: ContextKeyExpression;
+		},
+	) {
+		super();
+		this.uri = URI.from({
+			scheme: CHAT_INTERNAL_SCHEME,
+			path: `/skills/${name}/SKILL.md`,
+		});
+		this.skill = {
+			uri: this.uri,
+			storage: PromptsStorage.internal,
+			name,
+			description,
+			disableModelInvocation: options?.disableModelInvocation ?? false,
+			userInvocable: options?.userInvocable ?? true,
+		};
+		this.when = options?.when;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
index d814c0b866a..d61027cb00c 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
@@ -6,25 +6,19 @@
 import { isEmptyPattern, parse, splitGlobAware } from '../../../../../../base/common/glob.js';
 import { Iterable } from '../../../../../../base/common/iterator.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
-import { ITextModel } from '../../../../../../editor/common/model.js';
-import { IModelService } from '../../../../../../editor/common/services/model.js';
 import { localize } from '../../../../../../nls.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IMarkerData, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
 import { ChatMode, IChatMode, IChatModeService } from '../../chatModes.js';
-import { ChatModeKind } from '../../constants.js';
+import { ChatConfiguration, ChatModeKind } from '../../constants.js';
 import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../languageModels.js';
 import { ILanguageModelToolsService, SpecedToolAliases } from '../../tools/languageModelToolsService.js';
-import { getPromptsTypeForLanguageId, PromptsType, Target } from '../promptTypes.js';
+import { PromptsType, Target } from '../promptTypes.js';
 import { ISequenceValue, IHeaderAttribute, IScalarValue, parseCommaSeparatedList, ParsedPromptFile, PromptHeader, IValue, PromptHeaderAttributes } from '../promptFileParser.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { Delayer } from '../../../../../../base/common/async.js';
-import { ResourceMap } from '../../../../../../base/common/map.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
-import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IPromptsService } from '../service/promptsService.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
-import { AGENTS_SOURCE_FOLDER, CLAUDE_AGENTS_SOURCE_FOLDER, isInClaudeRulesFolder, LEGACY_MODE_FILE_EXTENSION } from '../config/promptFileLocations.js';
+import { AGENTS_SOURCE_FOLDER, CLAUDE_AGENTS_SOURCE_FOLDER, isInClaudeRulesFolder, LEGACY_MODE_FILE_EXTENSION, VALID_SKILL_NAME_REGEX } from '../config/promptFileLocations.js';
 import { Lazy } from '../../../../../../base/common/lazy.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { dirname } from '../../../../../../base/common/resources.js';
@@ -52,7 +46,7 @@ export class PromptValidator {
 		await this.validateHeader(promptAST, promptType, target, report);
 		await this.validateBody(promptAST, target, report);
 		await this.validateFileName(promptAST, promptType, report);
-		await this.validateSkillFolderName(promptAST, promptType, report);
+		await this.validateSkillAttributes(promptAST, promptType, report);
 	}
 
 	private async validateFileName(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
@@ -66,32 +60,55 @@ export class PromptValidator {
 		}
 	}
 
-	private async validateSkillFolderName(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
+	private async validateSkillAttributes(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
 		if (promptType !== PromptsType.skill) {
 			return;
 		}
 
 		const nameAttribute = promptAST.header?.attributes.find(attr => attr.key === PromptHeaderAttributes.name);
-		if (!nameAttribute || nameAttribute.value.type !== 'scalar') {
+		if (!nameAttribute) {
+			report(toMarker(
+				localize('promptValidator.skillNameMissing', "Skill must provide a name."),
+				new Range(1, 1, 1, 4),
+				MarkerSeverity.Error
+			));
 			return;
 		}
 
-		const skillName = nameAttribute.value.value.trim();
-		if (!skillName) {
+		const descriptionAttribute = promptAST.header?.attributes.find(attr => attr.key === PromptHeaderAttributes.description);
+		if (!descriptionAttribute) {
+			report(toMarker(
+				localize('promptValidator.skillDescriptionMissing', "Skill must provide a description."),
+				new Range(1, 1, 1, 4),
+				MarkerSeverity.Error
+			));
 			return;
 		}
 
-		// Extract folder name from path (e.g., .github/skills/my-skill/SKILL.md -> my-skill)
-		const pathParts = promptAST.uri.path.split('/');
-		const skillIndex = pathParts.findIndex(part => part === 'SKILL.md');
-		if (skillIndex > 0) {
-			const folderName = pathParts[skillIndex - 1];
-			if (folderName && skillName !== folderName) {
-				report(toMarker(
-					localize('promptValidator.skillNameFolderMismatch', "The skill name '{0}' should match the folder name '{1}'.", skillName, folderName),
-					nameAttribute.value.range,
-					MarkerSeverity.Warning
-				));
+		if (nameAttribute.value.type === 'scalar') {
+			const skillName = nameAttribute.value.value.trim();
+			if (skillName.length > 0) {
+				if (!VALID_SKILL_NAME_REGEX.test(skillName)) {
+					report(toMarker(
+						localize('promptValidator.skillNameInvalidChars', "Skill name may only contain lowercase letters, numbers, and hyphens."),
+						nameAttribute.value.range,
+						MarkerSeverity.Error
+					));
+				}
+
+				// Extract folder name from path (e.g., .github/skills/my-skill/SKILL.md -> my-skill)
+				const pathParts = promptAST.uri.path.split('/');
+				const skillIndex = pathParts.findIndex(part => part === 'SKILL.md');
+				if (skillIndex > 0) {
+					const folderName = pathParts[skillIndex - 1];
+					if (folderName && skillName !== folderName) {
+						report(toMarker(
+							localize('promptValidator.skillNameFolderMismatch', "The skill name '{0}' should match the folder name '{1}'.", skillName, folderName),
+							nameAttribute.value.range,
+							MarkerSeverity.Warning
+						));
+					}
+				}
 			}
 		}
 	}
@@ -684,6 +701,7 @@ export class PromptValidator {
 			report(toMarker(localize('promptValidator.handoffsMustBeArray', "The 'handoffs' attribute must be an array."), attribute.value.range, MarkerSeverity.Error));
 			return;
 		}
+		const seenLabels = new Map<string, Range>();
 		for (const item of attribute.value.items) {
 			if (item.type !== 'map') {
 				report(toMarker(localize('promptValidator.eachHandoffMustBeObject', "Each handoff in the 'handoffs' attribute must be an object with 'label', 'agent', 'prompt' and optional 'send'."), item.range, MarkerSeverity.Error));
@@ -695,6 +713,8 @@ export class PromptValidator {
 					case 'label':
 						if (prop.value.type !== 'scalar' || prop.value.value.trim().length === 0) {
 							report(toMarker(localize('promptValidator.handoffLabelMustBeNonEmptyString', "The 'label' property in a handoff must be a non-empty string."), prop.value.range, MarkerSeverity.Error));
+						} else if (!/[a-zA-Z0-9]/.test(prop.value.value)) {
+							report(toMarker(localize('promptValidator.handoffLabelMustContainAlphanumeric', "The 'label' property in a handoff must contain at least one alphanumeric character."), prop.value.range, MarkerSeverity.Error));
 						}
 						break;
 					case 'agent':
@@ -732,6 +752,17 @@ export class PromptValidator {
 			if (required.size > 0) {
 				report(toMarker(localize('promptValidator.missingHandoffProperties', "Missing required properties {0} in handoff object.", Array.from(required).map(s => `'${s}'`).join(', ')), item.range, MarkerSeverity.Error));
 			}
+
+			// Detect duplicate labels (case-insensitive, consistent with ExecuteHandoffAction lookup)
+			const labelProp = item.properties.find(p => p.key.value === 'label');
+			if (labelProp?.value.type === 'scalar') {
+				const normalizedLabel = labelProp.value.value.toLowerCase();
+				if (normalizedLabel && seenLabels.has(normalizedLabel)) {
+					report(toMarker(localize('promptValidator.duplicateHandoffLabel', "Duplicate handoff label '{0}'. Each handoff must have a unique label.", labelProp.value.value), labelProp.value.range, MarkerSeverity.Error));
+				} else if (normalizedLabel) {
+					seenLabels.set(normalizedLabel, labelProp.value.range);
+				}
+			}
 		}
 	}
 
@@ -791,6 +822,12 @@ export class PromptValidator {
 			report(toMarker(localize('promptValidator.disableModelInvocationMustBeBoolean', "The 'disable-model-invocation' attribute must be 'true' or 'false'."), attribute.value.range, MarkerSeverity.Error));
 			return;
 		}
+
+		if (attribute.value.type === 'scalar' && attribute.value.value === 'false') {
+			if (!this.isCustomAgentInSubagentEnabled()) {
+				report(toMarker(localize('promptValidator.inferRequiresConfig', "For agents to be used as subagent you also need to enable the 'chat.customAgentInSubagent.enabled' setting."), attribute.value.range, MarkerSeverity.Warning));
+			}
+		}
 	}
 
 	private async validateAgentsAttribute(attributes: IHeaderAttribute[], header: PromptHeader, report: (markers: IMarkerData) => void): Promise<undefined> {
@@ -803,6 +840,11 @@ export class PromptValidator {
 			return;
 		}
 
+		// Check if the configuration setting is enabled
+		if (!this.isCustomAgentInSubagentEnabled()) {
+			report(toMarker(localize('promptValidator.agentsRequiresConfig', "For agents to be used as subagent you also need to enable the 'chat.customAgentInSubagent.enabled' setting."), attribute.range, MarkerSeverity.Warning));
+		}
+
 		// Collect available agent names
 		const agents = await this.promptsService.getCustomAgents(CancellationToken.None);
 		const availableAgentNames = new Set<string>(agents.map(agent => agent.name));
@@ -830,6 +872,10 @@ export class PromptValidator {
 		}
 	}
 
+	private isCustomAgentInSubagentEnabled(): boolean {
+		return !!this.configurationService.getValue<boolean>(ChatConfiguration.SubagentToolCustomAgents);
+	}
+
 	private validateGithubPermissions(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): void {
 		const attribute = attributes.find(attr => attr.key === GithubPromptHeaderAttributes.github);
 		if (!attribute) {
@@ -1178,102 +1224,3 @@ export function getTarget(promptType: PromptsType, header: PromptHeader | URI):
 function toMarker(message: string, range: Range, severity = MarkerSeverity.Error): IMarkerData {
 	return { severity, message, ...range };
 }
-
-export class PromptValidatorContribution extends Disposable {
-
-	private readonly validator: PromptValidator;
-	private readonly localDisposables = this._register(new DisposableStore());
-
-	constructor(
-		@IModelService private modelService: IModelService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IMarkerService private readonly markerService: IMarkerService,
-		@IPromptsService private readonly promptsService: IPromptsService,
-		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
-		@ILanguageModelToolsService private readonly languageModelToolsService: ILanguageModelToolsService,
-		@IChatModeService private readonly chatModeService: IChatModeService,
-	) {
-		super();
-		this.validator = instantiationService.createInstance(PromptValidator);
-
-		this.updateRegistration();
-	}
-
-	updateRegistration(): void {
-		this.localDisposables.clear();
-		const trackers = new ResourceMap<ModelTracker>();
-		this.localDisposables.add(toDisposable(() => {
-			trackers.forEach(tracker => tracker.dispose());
-			trackers.clear();
-		}));
-		this.modelService.getModels().forEach(model => {
-			const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
-			if (promptType) {
-				trackers.set(model.uri, new ModelTracker(model, promptType, this.validator, this.promptsService, this.markerService));
-			}
-		});
-
-		this.localDisposables.add(this.modelService.onModelAdded((model) => {
-			const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
-			if (promptType && !trackers.has(model.uri)) {
-				trackers.set(model.uri, new ModelTracker(model, promptType, this.validator, this.promptsService, this.markerService));
-			}
-		}));
-		this.localDisposables.add(this.modelService.onModelRemoved((model) => {
-			const tracker = trackers.get(model.uri);
-			if (tracker) {
-				tracker.dispose();
-				trackers.delete(model.uri);
-			}
-		}));
-		this.localDisposables.add(this.modelService.onModelLanguageChanged((event) => {
-			const { model } = event;
-			const tracker = trackers.get(model.uri);
-			if (tracker) {
-				tracker.dispose();
-				trackers.delete(model.uri);
-			}
-			const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
-			if (promptType) {
-				trackers.set(model.uri, new ModelTracker(model, promptType, this.validator, this.promptsService, this.markerService));
-			}
-		}));
-
-		const validateAll = (): void => trackers.forEach(tracker => tracker.validate());
-		this.localDisposables.add(this.languageModelToolsService.onDidChangeTools(() => validateAll()));
-		this.localDisposables.add(this.chatModeService.onDidChangeChatModes(() => validateAll()));
-		this.localDisposables.add(this.languageModelsService.onDidChangeLanguageModels(() => validateAll()));
-	}
-}
-
-class ModelTracker extends Disposable {
-
-	private readonly delayer: Delayer<void>;
-
-	constructor(
-		private readonly textModel: ITextModel,
-		private readonly promptType: PromptsType,
-		private readonly validator: PromptValidator,
-		@IPromptsService private readonly promptsService: IPromptsService,
-		@IMarkerService private readonly markerService: IMarkerService,
-	) {
-		super();
-		this.delayer = this._register(new Delayer<void>(200));
-		this._register(textModel.onDidChangeContent(() => this.validate()));
-		this.validate();
-	}
-
-	public validate(): void {
-		this.delayer.trigger(async () => {
-			const markers: IMarkerData[] = [];
-			const ast = this.promptsService.getParsedPromptFile(this.textModel);
-			await this.validator.validate(ast, this.promptType, m => markers.push(m));
-			this.markerService.changeOne(MARKERS_OWNER_ID, this.textModel.uri, markers);
-		});
-	}
-
-	public override dispose() {
-		this.markerService.remove(MARKERS_OWNER_ID, [this.textModel.uri]);
-		super.dispose();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileContributions.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileContributions.ts
deleted file mode 100644
index 66cee497434..00000000000
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileContributions.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { PromptLinkProvider } from './languageProviders/promptLinkProvider.js';
-import { PromptBodyAutocompletion } from './languageProviders/promptBodyAutocompletion.js';
-import { PromptHeaderAutocompletion } from './languageProviders/promptHeaderAutocompletion.js';
-import { PromptHoverProvider } from './languageProviders/promptHovers.js';
-import { PromptHeaderDefinitionProvider } from './languageProviders/PromptHeaderDefinitionProvider.js';
-import { PromptValidatorContribution } from './languageProviders/promptValidator.js';
-import { PromptDocumentSemanticTokensProvider } from './languageProviders/promptDocumentSemanticTokensProvider.js';
-import { PromptCodeActionProvider } from './languageProviders/promptCodeActions.js';
-import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ALL_PROMPTS_LANGUAGE_SELECTOR } from './promptTypes.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-
-export class PromptLanguageFeaturesProvider extends Disposable implements IWorkbenchContribution {
-	static readonly ID = 'chat.promptLanguageFeatures';
-
-	constructor(
-		@ILanguageFeaturesService languageService: ILanguageFeaturesService,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		this._register(languageService.linkProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptLinkProvider)));
-		this._register(languageService.completionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptBodyAutocompletion)));
-		this._register(languageService.completionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptHeaderAutocompletion)));
-		this._register(languageService.hoverProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptHoverProvider)));
-		this._register(languageService.definitionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptHeaderDefinitionProvider)));
-		this._register(languageService.documentSemanticTokensProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptDocumentSemanticTokensProvider)));
-		this._register(languageService.codeActionProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, instantiationService.createInstance(PromptCodeActionProvider)));
-
-		this._register(instantiationService.createInstance(PromptValidatorContribution));
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts
index 240265152cf..836e27a3cbf 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts
@@ -250,7 +250,7 @@ export class PromptHeader {
 							model = prop.value.value;
 						}
 					}
-					if (agent && label && prompt !== undefined) {
+					if (agent && label?.trim() && prompt !== undefined) {
 						const handoff: IHandOff = {
 							agent,
 							label,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
index c51a7123aef..c34350dcfb7 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
@@ -40,6 +40,31 @@ export const SKILL_LANGUAGE_ID = 'skill';
  */
 export const ALL_PROMPTS_LANGUAGE_SELECTOR: LanguageSelector = [PROMPT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID, AGENT_LANGUAGE_ID, SKILL_LANGUAGE_ID];
 
+/**
+ * Configuration key for enabling the agent debug log feature.
+ */
+export const AGENT_DEBUG_LOG_ENABLED_SETTING = 'github.copilot.chat.agentDebugLog.enabled';
+
+/**
+ * Configuration key for enabling file logging for the agent debug log.
+ */
+export const AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING = 'github.copilot.chat.agentDebugLog.fileLogging.enabled';
+
+/**
+ * The name of the troubleshoot slash command / skill.
+ */
+export const TROUBLESHOOT_COMMAND_NAME = 'troubleshoot';
+
+/**
+ * URI scheme used by the Copilot extension for built-in skills.
+ */
+export const COPILOT_SKILL_URI_SCHEME = 'copilot-skill';
+
+/**
+ * Path fragment that identifies the troubleshoot skill in a URI.
+ */
+export const TROUBLESHOOT_SKILL_PATH = 'troubleshoot/SKILL.md';
+
 /**
  * The language id for a prompts type.
  */
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
index 87987d457fd..84a2800ed78 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
@@ -8,6 +8,7 @@ import { Event } from '../../../../../../base/common/event.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
+import { ContextKeyExpression } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IChatModeInstructions, IVariableReference } from '../../chatModes.js';
@@ -74,6 +75,7 @@ export enum PromptsStorage {
 	user = 'user',
 	extension = 'extension',
 	plugin = 'plugin',
+	internal = 'internal',
 }
 
 /**
@@ -88,7 +90,7 @@ export enum ExtensionAgentSourceType {
  * Represents a prompt path with its type.
  * This is used for both prompt files and prompt source folders.
  */
-export type IPromptPath = IExtensionPromptPath | ILocalPromptPath | IUserPromptPath | IPluginPromptPath;
+export type IPromptPath = IExtensionPromptPath | ILocalPromptPath | IUserPromptPath | IPluginPromptPath | IInternalPromptPath;
 
 
 export interface IPromptPathBase {
@@ -137,6 +139,10 @@ export interface IPluginPromptPath extends IPromptPathBase {
 	readonly pluginUri: URI;
 }
 
+export interface IInternalPromptPath extends IPromptPathBase {
+	readonly storage: PromptsStorage.internal;
+}
+
 export type IAgentSource = {
 	readonly storage: PromptsStorage.extension;
 	readonly extensionId: ExtensionIdentifier;
@@ -146,6 +152,8 @@ export type IAgentSource = {
 } | {
 	readonly storage: PromptsStorage.plugin;
 	readonly pluginUri: URI;
+} | {
+	readonly storage: PromptsStorage.internal;
 };
 
 /**
@@ -248,6 +256,7 @@ export interface IChatPromptSlashCommand {
 	readonly argumentHint: string | undefined;
 	readonly promptPath: IPromptPath;
 	readonly parsedPromptFile: ParsedPromptFile;
+	readonly when: ContextKeyExpression | undefined;
 }
 
 export interface IAgentSkill {
@@ -265,6 +274,11 @@ export interface IAgentSkill {
 	 * Use for background knowledge users shouldn't invoke directly.
 	 */
 	readonly userInvocable: boolean;
+	/**
+	 * Optional context key expression. When set, the skill is only available
+	 * when this expression evaluates to true against a scoped context.
+	 */
+	readonly when?: ContextKeyExpression;
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts
index c9c614bf77b..28bd11ed040 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts
@@ -10,7 +10,7 @@ import { parse as parseJSONC } from '../../../../../../base/common/json.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun, IReader } from '../../../../../../base/common/observable.js';
 import { ResourceMap, ResourceSet } from '../../../../../../base/common/map.js';
-import { basename, dirname, isEqual, joinPath } from '../../../../../../base/common/resources.js';
+import { basename, dirname, isEqual } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { OffsetRange } from '../../../../../../editor/common/core/ranges/offsetRange.js';
 import { type ITextModel } from '../../../../../../editor/common/model.js';
@@ -29,9 +29,12 @@ import { ITelemetryService } from '../../../../../../platform/telemetry/common/t
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
 import { IVariableReference } from '../../chatModes.js';
 import { PromptsConfig } from '../config/config.js';
-import { AGENT_MD_FILENAME, CLAUDE_CONFIG_FOLDER, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_MD_FILENAME, getCleanPromptName, IResolvedPromptFile, IResolvedPromptSourceFolder, PromptFileSource } from '../config/promptFileLocations.js';
+import { AGENT_MD_FILENAME, CLAUDE_CONFIG_FOLDER, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_MD_FILENAME, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, getCleanPromptName, getSkillFolderName, GITHUB_CONFIG_FOLDER, IResolvedPromptFile, IResolvedPromptSourceFolder, PromptFileSource } from '../config/promptFileLocations.js';
 import { PROMPT_LANGUAGE_ID, PromptsType, Target, getPromptsTypeForLanguageId } from '../promptTypes.js';
-import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
+import {
+	IWorkspaceInstructionFile,
+	PromptFilesLocator
+} from '../utils/promptFilesLocator.js';
 import { PromptFileParser, ParsedPromptFile, PromptHeaderAttributes } from '../promptFileParser.js';
 import { IAgentInstructions, type IAgentSource, IChatPromptSlashCommand, IConfiguredHooksInfo, ICustomAgent, IExtensionPromptPath, ILocalPromptPath, IPluginPromptPath, IPromptPath, IPromptsService, IAgentSkill, IUserPromptPath, PromptsStorage, ExtensionAgentSourceType, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, IPromptFileContext, IPromptFileResource, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, SKILL_PROVIDER_ACTIVATION_EVENT, IPromptDiscoveryInfo, IPromptFileDiscoveryResult, IPromptSourceFolderResult, ICustomAgentVisibility, IResolvedAgentFile, AgentFileType, Logger, IPromptDiscoveryLogEntry } from './promptsService.js';
 import { Delayer } from '../../../../../../base/common/async.js';
@@ -48,6 +51,7 @@ import { ContextKeyExpr, IContextKeyService } from '../../../../../../platform/c
 import { getCanonicalPluginCommandId, IAgentPlugin, IAgentPluginService } from '../../plugins/agentPluginService.js';
 import { isContributionEnabled } from '../../enablement.js';
 import { assertNever } from '../../../../../../base/common/assert.js';
+import { ChatInternalCustomizations } from '../internalCustomizations/internalCustomizations.js';
 
 /**
  * Error thrown when a skill file is missing the required name attribute.
@@ -91,6 +95,11 @@ export class PromptsService extends Disposable implements IPromptsService {
 	 */
 	private readonly fileLocator: PromptFilesLocator;
 
+	/**
+	 * Built-in internal customizations (skills, instructions, etc.).
+	 */
+	private readonly internalCustomizations: ChatInternalCustomizations;
+
 	/**
 	 * Cached custom agents. Caching only happens if the `onDidChangeCustomAgents` event is used.
 	 */
@@ -180,6 +189,10 @@ export class PromptsService extends Disposable implements IPromptsService {
 		super();
 
 		this.fileLocator = this.createPromptFilesLocator();
+
+		// Register the internal readonly customizations
+		this.internalCustomizations = this._register(new ChatInternalCustomizations(this.fileService));
+
 		this._register(this.modelService.onModelRemoved((model) => {
 			this.cachedParsedPromptFromModels.delete(model.uri);
 		}));
@@ -201,6 +214,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 				Event.filter(modelChangeEvent, e => e.promptType === PromptsType.agent),
 				this._onDidContributedWhenChange.event,
 				Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(PromptsConfig.USE_CUSTOM_AGENT_HOOKS)),
+				this._onDidPluginPromptFilesChange.event,
 			)
 		));
 
@@ -246,14 +260,30 @@ export class PromptsService extends Disposable implements IPromptsService {
 			PromptsType.agent,
 			(plugin, reader) => plugin.agents.read(reader),
 		));
+		this._register(this.watchPluginPromptFilesForType(
+			PromptsType.instructions,
+			(plugin, reader) => plugin.instructions.read(reader),
+		));
 
 		this._register(autorun(reader => {
 			const plugins = this.agentPluginService.plugins.read(reader);
+			const hookFiles: IPluginPromptPath[] = [];
 			for (const plugin of plugins) {
 				if (isContributionEnabled(plugin.enablement.read(reader))) {
-					plugin.hooks.read(reader);
+					for (const hook of plugin.hooks.read(reader)) {
+						hookFiles.push({
+							uri: hook.uri,
+							storage: PromptsStorage.plugin,
+							type: PromptsType.hook,
+							name: getCanonicalPluginCommandId(plugin, hook.originalId),
+							pluginUri: plugin.uri,
+						});
+					}
 				}
 			}
+
+			this._pluginPromptFilesByType.set(PromptsType.hook, hookFiles);
+			this.cachedFileLocations[PromptsType.hook] = undefined;
 			this._onDidPluginHooksChange.fire();
 		}));
 	}
@@ -335,7 +365,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 			this._pluginPromptFilesByType.get(type) ?? [],
 		]);
 
-		return [...prompts.flat()];
+		return [...prompts.flat(), ...this.internalCustomizations.getPromptPaths(type)];
 	}
 
 	/**
@@ -473,6 +503,8 @@ export class PromptsService extends Disposable implements IPromptsService {
 				return this.fileLocator.listFiles(type, PromptsStorage.user, token).then(uris => uris.map(uri => ({ uri, storage: PromptsStorage.user, type } satisfies IUserPromptPath)));
 			case PromptsStorage.plugin:
 				return this._pluginPromptFilesByType.get(type) ?? [];
+			case PromptsStorage.internal:
+				return this.internalCustomizations.getPromptPaths(type);
 			default:
 				throw new Error(`[listPromptFilesForStorage] Unsupported prompt storage type: ${storage}`);
 		}
@@ -583,7 +615,11 @@ export class PromptsService extends Disposable implements IPromptsService {
 		const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
 		const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
 		const skills = useAgentSkills ? await this.listPromptFiles(PromptsType.skill, token) : [];
-		const slashCommandFiles = [...promptFiles, ...skills];
+		const disabledSkills = this.getDisabledPromptFiles(PromptsType.skill);
+		const slashCommandFiles = [
+			...promptFiles,
+			...skills.filter(s => !disabledSkills.has(s.uri)),
+		];
 		const details = await Promise.all(slashCommandFiles.map(async promptPath => {
 			try {
 				const parsedPromptFile = await this.parseNew(promptPath.uri, token);
@@ -622,12 +658,14 @@ export class PromptsService extends Disposable implements IPromptsService {
 	private asChatPromptSlashCommand(parsedPromptFile: ParsedPromptFile, promptPath: IPromptPath): IChatPromptSlashCommand {
 		let name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
 		name = name.replace(/[^\p{L}\d_\-\.:]+/gu, '-'); // replace spaces with dashes
+		const internalSkill = this.internalCustomizations.getInternalSkillByUri(promptPath.uri);
 		return {
 			name: name,
 			description: parsedPromptFile?.header?.description ?? promptPath.description,
 			argumentHint: parsedPromptFile?.header?.argumentHint,
 			parsedPromptFile,
-			promptPath
+			promptPath,
+			when: internalSkill?.when,
 		};
 	}
 
@@ -654,6 +692,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 			this.getFileLocatorEvent(PromptsType.instructions),
 			this._onDidContributedWhenChange.event,
 			this._onDidChangeInstructions.event,
+			this._onDidPluginPromptFilesChange.event,
 		);
 	}
 
@@ -868,6 +907,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 				return localize('extension.with.id', 'Extension: {0}', promptPath.extension.displayName ?? promptPath.extension.id);
 			}
 			case PromptsStorage.plugin: return localize('plugin.capitalized', 'Plugin');
+			case PromptsStorage.internal: return localize('internal.builtIn', 'Built-in');
 			default: assertNever(promptPath, 'Unknown prompt storage type');
 		}
 	}
@@ -884,49 +924,42 @@ export class PromptsService extends Disposable implements IPromptsService {
 		return [];
 	}
 
-	public async listAgentMDs(token: CancellationToken, logger: Logger | undefined): Promise<IResolvedAgentFile[]> {
+	public async listAgentInstructions(token: CancellationToken, logger: Logger | undefined): Promise<IResolvedAgentFile[]> {
+		const resolvedAgentFiles: IResolvedAgentFile[] = [];
+		const promises: Promise<IResolvedAgentFile[]>[] = [];
+
+		const includeParents = this.configurationService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true;
+		const rootFolders = await this.fileLocator.getWorkspaceFolderRoots(includeParents, logger);
+
+		const rootFiles: IWorkspaceInstructionFile[] = [];
 		const useAgentMD = this.configurationService.getValue(PromptsConfig.USE_AGENT_MD);
 		if (!useAgentMD) {
 			logger?.logInfo('Agent MD files are disabled via configuration.');
-			return [];
+		} else {
+			rootFiles.push({ fileName: AGENT_MD_FILENAME, type: AgentFileType.agentsMd });
 		}
-		return await this.fileLocator.findFilesInWorkspaceRoots(AGENT_MD_FILENAME, undefined, AgentFileType.agentsMd, token);
-	}
-
-	public async listClaudeMDs(token: CancellationToken, logger: Logger | undefined): Promise<IResolvedAgentFile[]> {
-		// see https://code.claude.com/docs/en/memory
 		const useClaudeMD = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_MD);
 		if (!useClaudeMD) {
 			logger?.logInfo('Claude MD files are disabled via configuration.');
-			return [];
-		}
-		const results: IResolvedAgentFile[] = [];
-		const userHome = await this.pathService.userHome();
-		const userClaudeFolder = joinPath(userHome, CLAUDE_CONFIG_FOLDER);
-		await Promise.all([
-			this.fileLocator.findFilesInWorkspaceRoots(CLAUDE_MD_FILENAME, undefined, AgentFileType.claudeMd, token, results), // in workspace roots
-			this.fileLocator.findFilesInWorkspaceRoots(CLAUDE_LOCAL_MD_FILENAME, undefined, AgentFileType.claudeMd, token, results), // CLAUDE.local in workspace roots
-			this.fileLocator.findFilesInWorkspaceRoots(CLAUDE_MD_FILENAME, CLAUDE_CONFIG_FOLDER, AgentFileType.claudeMd, token, results), // in workspace/.claude folders
-			this.fileLocator.findFilesInRoots([userClaudeFolder], CLAUDE_MD_FILENAME, AgentFileType.claudeMd, token, results) // in ~/.claude folder
-		]);
-		return results.sort((a, b) => a.uri.toString().localeCompare(b.uri.toString()));
-	}
+		} else {
+			const claudeMdFile = { fileName: CLAUDE_MD_FILENAME, type: AgentFileType.claudeMd };
+			rootFiles.push(claudeMdFile); // CLAUDE.md in workspace root
+			rootFiles.push({ fileName: CLAUDE_LOCAL_MD_FILENAME, type: AgentFileType.claudeMd }); // CLAUDE.local.md in workspace root
 
-	public async listCopilotInstructionsMDs(token: CancellationToken, logger: Logger | undefined): Promise<IResolvedAgentFile[]> {
+			promises.push(this.fileLocator.findFilesInRoots(rootFolders, CLAUDE_CONFIG_FOLDER, [claudeMdFile], token, resolvedAgentFiles)); // CLAUDE.md in .claude folder under workspace root
+			promises.push(this.fileLocator.findFilesInRoots([await this.pathService.userHome()], CLAUDE_CONFIG_FOLDER, [claudeMdFile], token, resolvedAgentFiles)); // CLAUDE.md in in ~/.claude folder
+		}
 		const useCopilotInstructionsFiles = this.configurationService.getValue(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES);
 		if (!useCopilotInstructionsFiles) {
 			logger?.logInfo('Copilot instructions files are disabled via configuration.');
-			return [];
+		} else {
+			const githubConfigFiles = [{ fileName: COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, type: AgentFileType.copilotInstructionsMd }];
+			promises.push(this.fileLocator.findFilesInRoots(rootFolders, GITHUB_CONFIG_FOLDER, githubConfigFiles, token, resolvedAgentFiles));
 		}
-		return await this.fileLocator.findCopilotInstructionsMDsInWorkspace(token);
-	}
 
-	public async listAgentInstructions(token: CancellationToken, logger: Logger | undefined): Promise<IResolvedAgentFile[]> {
-		const [agentMDs, claudeMDs, copilotInstructionsMDs] = await Promise.all([
-			this.listAgentMDs(token, logger),
-			this.listClaudeMDs(token, logger),
-			this.listCopilotInstructionsMDs(token, logger)
-		]);
+		promises.push(this.fileLocator.findFilesInRoots(rootFolders, undefined, rootFiles, token, resolvedAgentFiles));
+
+		await Promise.all(promises);
 		if (token.isCancellationRequested) {
 			return [];
 		}
@@ -943,9 +976,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 			}
 			return true;
 		};
-		agentMDs.forEach(add);
-		claudeMDs.forEach(add);
-		copilotInstructionsMDs.forEach(add);
+		resolvedAgentFiles.forEach(add);
 		for (const symlink of symlinks) {
 			if (seenFileURI.has(symlink.realPath)) {
 				logger?.logInfo(`Skipping symlinked agent instructions file ${symlink.uri} as target already included: ${symlink.realPath}`);
@@ -954,7 +985,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 				seenFileURI.add(symlink.realPath);
 			}
 		}
-		return result;
+		return result.sort((a, b) => a.uri.toString().localeCompare(b.uri.toString()));
 	}
 
 	public getAgentFileURIFromModeFile(oldURI: URI): URI | undefined {
@@ -992,6 +1023,9 @@ export class PromptsService extends Disposable implements IPromptsService {
 		this.storageService.store(this.disabledPromptsStorageKeyPrefix + type, JSON.stringify(disabled), StorageScope.PROFILE, StorageTarget.USER);
 		if (type === PromptsType.agent) {
 			this.cachedCustomAgents.refresh();
+		} else if (type === PromptsType.skill) {
+			this.cachedSkills.refresh();
+			this.cachedSlashCommands.refresh();
 		}
 	}
 
@@ -1025,8 +1059,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 		const sanitizedName = this.truncateAgentSkillName(name, uri);
 
 		// Validate that the sanitized name matches the parent folder name (per agentskills.io specification)
-		const skillFolderUri = dirname(uri);
-		const folderName = basename(skillFolderUri);
+		const folderName = getSkillFolderName(uri);
 		if (sanitizedName !== folderName) {
 			this.logger.error(`[validateAndSanitizeSkillFile] Agent skill name "${sanitizedName}" does not match folder name "${folderName}": ${uri}`);
 			throw new SkillNameMismatchError(uri, sanitizedName, folderName);
@@ -1040,10 +1073,10 @@ export class PromptsService extends Disposable implements IPromptsService {
 		const MAX_NAME_LENGTH = 64;
 		const sanitized = this.sanitizeAgentSkillText(name);
 		if (sanitized !== name) {
-			this.logger.warn(`[findAgentSkills] Agent skill name contains XML tags, removed: ${uri}`);
+			this.logger.debug(`[findAgentSkills] Agent skill name contains XML tags, removed: ${uri}`);
 		}
 		if (sanitized.length > MAX_NAME_LENGTH) {
-			this.logger.warn(`[findAgentSkills] Agent skill name exceeds ${MAX_NAME_LENGTH} characters, truncated: ${uri}`);
+			this.logger.debug(`[findAgentSkills] Agent skill name exceeds ${MAX_NAME_LENGTH} characters, truncated: ${uri}`);
 			return sanitized.substring(0, MAX_NAME_LENGTH);
 		}
 		return sanitized;
@@ -1056,10 +1089,10 @@ export class PromptsService extends Disposable implements IPromptsService {
 		const MAX_DESCRIPTION_LENGTH = 1024;
 		const sanitized = this.sanitizeAgentSkillText(description);
 		if (sanitized !== description) {
-			this.logger.warn(`[findAgentSkills] Agent skill description contains XML tags, removed: ${uri}`);
+			this.logger.debug(`[findAgentSkills] Agent skill description contains XML tags, removed: ${uri}`);
 		}
 		if (sanitized.length > MAX_DESCRIPTION_LENGTH) {
-			this.logger.warn(`[findAgentSkills] Agent skill description exceeds ${MAX_DESCRIPTION_LENGTH} characters, truncated: ${uri}`);
+			this.logger.debug(`[findAgentSkills] Agent skill description exceeds ${MAX_DESCRIPTION_LENGTH} characters, truncated: ${uri}`);
 			return sanitized.substring(0, MAX_DESCRIPTION_LENGTH);
 		}
 		return sanitized;
@@ -1103,13 +1136,15 @@ export class PromptsService extends Disposable implements IPromptsService {
 		for (const file of files) {
 			if (file.status === 'loaded' && file.name) {
 				const sanitizedDescription = this.truncateAgentSkillDescription(file.description, file.uri);
+				const internalSkill = this.internalCustomizations.getInternalSkillByUri(file.uri);
 				result.push({
 					uri: file.uri,
 					storage: file.storage,
 					name: file.name,
 					description: sanitizedDescription,
 					disableModelInvocation: file.disableModelInvocation ?? false,
-					userInvocable: file.userInvocable ?? true
+					userInvocable: file.userInvocable ?? true,
+					when: internalSkill?.when,
 				});
 			}
 		}
@@ -1266,6 +1301,11 @@ export class PromptsService extends Disposable implements IPromptsService {
 		const defaultFolder = this.workspaceService.getWorkspace().folders[0];
 
 		for (const hookFile of hookFiles) {
+			// Plugins are handled separately down below because they do their own parsing+interpolation
+			if (hookFile.storage === PromptsStorage.plugin) {
+				continue;
+			}
+
 			try {
 				const content = await this.fileService.readFile(hookFile.uri);
 				const json = parseJSONC(content.value.toString());
@@ -1357,7 +1397,8 @@ export class PromptsService extends Disposable implements IPromptsService {
 		}
 
 		const { files } = await this.computeSkillDiscoveryInfo(token);
-		return { type: PromptsType.skill, files };
+		const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
+		return { type: PromptsType.skill, files, sourceFolders };
 	}
 
 	/**
@@ -1386,7 +1427,12 @@ export class PromptsService extends Disposable implements IPromptsService {
 			fileUri: p.uri,
 			storage: p.storage,
 			source: PromptFileSource.Plugin,
-		})));
+		})), ...this.internalCustomizations.getSkills()
+			.map(s => ({
+				fileUri: s.uri,
+				storage: s.storage,
+				source: PromptFileSource.Internal,
+			})));
 
 		const getPriority = (skill: IResolvedPromptFile | IExtensionPromptPath): number => {
 			if (skill.storage === PromptsStorage.local) {
@@ -1423,34 +1469,27 @@ export class PromptsService extends Disposable implements IPromptsService {
 
 			try {
 				const parsedFile = await this.parseNew(uri, token);
-				const name = parsedFile.header?.name;
-				if (!name) {
-					this.logger.error(`[computeSkillDiscoveryInfo] Agent skill file missing name attribute: ${uri}`);
-					files.push({ uri, storage, status: 'skipped', skipReason: 'missing-name', extensionId, source });
-					continue;
-				}
+				const folderName = getSkillFolderName(uri);
 
-				const sanitizedName = this.truncateAgentSkillName(name, uri);
-				const skillFolderUri = dirname(uri);
-				const folderName = basename(skillFolderUri);
+				let name = parsedFile.header?.name;
+
+				if (!name) {
+					this.logger.debug(`[computeSkillDiscoveryInfo] Agent skill file missing name attribute, using folder name "${folderName}": ${uri}`);
+					name = folderName;
+				}
+				let sanitizedName = this.truncateAgentSkillName(name, uri);
 				if (sanitizedName !== folderName) {
-					this.logger.error(`[computeSkillDiscoveryInfo] Agent skill name "${sanitizedName}" does not match folder name "${folderName}": ${uri}`);
-					files.push({ uri, storage, status: 'skipped', skipReason: 'name-mismatch', name: sanitizedName, extensionId, source });
-					continue;
+					this.logger.debug(`[computeSkillDiscoveryInfo] Agent skill name "${sanitizedName}" does not match folder name "${folderName}", using folder name: ${uri}`);
+					sanitizedName = folderName;
 				}
 
 				if (seenNames.has(sanitizedName)) {
-					this.logger.warn(`[computeSkillDiscoveryInfo] Skipping duplicate agent skill name: ${sanitizedName} at ${uri}`);
+					this.logger.debug(`[computeSkillDiscoveryInfo] Skipping duplicate agent skill name: ${sanitizedName} at ${uri}`);
 					files.push({ uri, storage, status: 'skipped', skipReason: 'duplicate-name', name: sanitizedName, duplicateOf: nameToUri.get(sanitizedName), extensionId, source });
 					continue;
 				}
 
 				const description = parsedFile.header?.description;
-				if (!description) {
-					this.logger.error(`[computeSkillDiscoveryInfo] Agent skill file missing description attribute: ${uri}`);
-					files.push({ uri, storage, status: 'skipped', skipReason: 'missing-description', name: sanitizedName, extensionId, source });
-					continue;
-				}
 
 				seenNames.add(sanitizedName);
 				nameToUri.set(sanitizedName, uri);
@@ -1771,6 +1810,10 @@ namespace IAgentSource {
 				storage: PromptsStorage.plugin,
 				pluginUri: promptPath.pluginUri
 			};
+		} else if (promptPath.storage === PromptsStorage.internal) {
+			return {
+				storage: PromptsStorage.internal
+			};
 		} else {
 			return {
 				storage: promptPath.storage
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
index c0675b37659..21de3116a39 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
@@ -9,33 +9,42 @@ import { ResourceSet } from '../../../../../../base/common/map.js';
 import * as nls from '../../../../../../nls.js';
 import { FileOperationError, FileOperationResult, IFileService } from '../../../../../../platform/files/common/files.js';
 import { getPromptFileLocationsConfigKey, isTildePath, PromptsConfig } from '../config/config.js';
-import { basename, dirname, isEqual, isEqualOrParent, joinPath } from '../../../../../../base/common/resources.js';
+import { basename, dirname, isEqual, isEqualOrParent, joinPath, extname } from '../../../../../../base/common/resources.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../../platform/workspace/common/workspace.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, AGENTS_SOURCE_FOLDER, getPromptFileExtension, getPromptFileType, LEGACY_MODE_FILE_EXTENSION, getCleanPromptName, AGENT_FILE_EXTENSION, getPromptFileDefaultLocations, SKILL_FILENAME, IPromptSourceFolder, IResolvedPromptFile, IResolvedPromptSourceFolder, PromptFileSource } from '../config/promptFileLocations.js';
+import { AGENTS_SOURCE_FOLDER, getPromptFileExtension, getPromptFileType, LEGACY_MODE_FILE_EXTENSION, getCleanPromptName, AGENT_FILE_EXTENSION, getPromptFileDefaultLocations, SKILL_FILENAME, IPromptSourceFolder, IResolvedPromptFile, IResolvedPromptSourceFolder, PromptFileSource } from '../config/promptFileLocations.js';
 import { PromptsType } from '../promptTypes.js';
 import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 import { getExcludes, IFileQuery, ISearchConfiguration, ISearchService, QueryType } from '../../../../../services/search/common/search.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { isCancellationError } from '../../../../../../base/common/errors.js';
-import { AgentFileType, IResolvedAgentFile, PromptsStorage } from '../service/promptsService.js';
+import { AgentFileType, IResolvedAgentFile, Logger, PromptsStorage } from '../service/promptsService.js';
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
 import { IPathService } from '../../../../../services/path/common/pathService.js';
+import { equalsIgnoreCase } from '../../../../../../base/common/strings.js';
+import { IWorkspaceTrustManagementService } from '../../../../../../platform/workspace/common/workspaceTrust.js';
 
 /**
  * Maximum recursion depth when traversing subdirectories for instruction files.
  */
 const MAX_INSTRUCTIONS_RECURSION_DEPTH = 5;
 
+export interface IWorkspaceInstructionFile {
+	readonly fileName: string;
+	readonly type: AgentFileType;
+}
+
 /**
  * Utility class to locate prompt files.
  */
 export class PromptFilesLocator {
 
+	private readonly userDataFolder: IResolvedPromptSourceFolder;
+
 	constructor(
 		@IFileService private readonly fileService: IFileService,
 		@IConfigurationService private readonly configService: IConfigurationService,
@@ -45,7 +54,19 @@ export class PromptFilesLocator {
 		@IUserDataProfileService private readonly userDataService: IUserDataProfileService,
 		@ILogService private readonly logService: ILogService,
 		@IPathService private readonly pathService: IPathService,
+		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
 	) {
+
+		const userDataPromptsHome = this.userDataService.currentProfile.promptsHome;
+		this.userDataFolder = {
+			uri: userDataPromptsHome,
+			parent: userDataPromptsHome,
+			filePattern: undefined,
+			source: PromptFileSource.CopilotPersonal,
+			storage: PromptsStorage.user,
+			displayPath: nls.localize('promptsUserDataFolder', "User Data"),
+			isDefault: true
+		};
 	}
 
 	protected getWorkspaceFolders(): readonly IWorkspaceFolder[] {
@@ -60,26 +81,85 @@ export class PromptFilesLocator {
 		return Event.map(this.workspaceService.onDidChangeWorkspaceFolders, () => undefined);
 	}
 
+	public async getWorkspaceFolderRoots(includeParents: boolean, logger?: Logger): Promise<URI[]> {
+		const workspaceFolders = this.getWorkspaceFolders();
+		if (includeParents) {
+			const roots = new ResourceSet();
+			const userHome = await this.pathService.userHome();
+			for (const workspaceFolder of workspaceFolders) {
+				roots.add(workspaceFolder.uri);
+				// Walk up from the workspace folder to find the repository root
+				// (.git folder). Only include parent folders if a repo root is
+				// actually found; otherwise keep only the workspace folder.
+				const parents = await this.findParentRepoFolders(workspaceFolder.uri, userHome, roots, logger);
+				for (const parent of parents) {
+					roots.add(parent);
+				}
+			}
+			return [...roots];
+		}
+		return workspaceFolders.map(f => f.uri);
+	}
+
+	/**
+	 * Walks up from {@link folderUri} collecting parent folders until a
+	 * repository root (a folder containing `.git`) is found.  Returns the
+	 * intermediate parent folders only when a repo root is found; returns
+	 * an empty array when the walk reaches the filesystem root, the user
+	 * home directory, or a folder already present in {@link seen}.
+	 */
+	private async findParentRepoFolders(folderUri: URI, userHome: URI, seen: ResourceSet, logger?: Logger): Promise<URI[]> {
+		const candidates: URI[] = [];
+		let current = folderUri;
+		let parent = dirname(current);
+		do {
+			try {
+				const isRepoRoot = await this.fileService.exists(joinPath(current, '.git'));
+				if (isRepoRoot) {
+					if ((await this.workspaceTrustManagementService.getUriTrustInfo(current)).trusted) {
+						candidates.push(current);
+						return candidates;
+					}
+					logger?.logInfo(`Repository root found at ${current.toString()}, but it is not trusted. Skipping parent folder inclusion for this workspace folder.`);
+					return []; // if the repo root isn't trusted, don't include it or any parents
+				}
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				logger?.logInfo(`No repository root found for folder ${folderUri.toString()}. Error accessing ${joinPath(current, '.git')}: ${msg}.`);
+				return []; // if we can't access the folder, return an empty list to avoid treating it as a non-repository when we might just have a permission issue
+			}
+			candidates.push(current);
+			current = parent;
+			parent = dirname(current);
+		} while (!seen.has(current) && current.path !== '/' && !isEqual(userHome, current));
+		// no repo found
+		logger?.logInfo(`No repository root found for folder ${folderUri.toString()}.`);
+		return [];
+	}
+
 	/**
 	 * List all prompt files from the filesystem.
 	 *
 	 * @returns List of prompt files found in the workspace.
 	 */
 	public async listFiles(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly URI[]> {
-		if (storage === PromptsStorage.local) {
-			return await this.listFilesInLocal(type, token);
-		} else if (storage === PromptsStorage.user) {
-			return await this.listFilesInUserData(type, token);
+		if (storage !== PromptsStorage.user && storage !== PromptsStorage.local) {
+			throw new Error(`Unsupported prompt file storage: ${storage}`);
+		}
+
+		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+		const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations.filter(loc => loc.storage === storage));
+
+		if (storage === PromptsStorage.user && (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt)) {
+			absoluteLocations.push(this.userDataFolder);
 		}
-		throw new Error(`Unsupported prompt file storage: ${storage}`);
-	}
 
-	private async listFilesInUserData(type: PromptsType, token: CancellationToken): Promise<readonly URI[]> {
-		const userStorageFolders = await this.getUserStorageFolders(type);
 		const paths = new ResourceSet();
 
-		for (const { uri } of userStorageFolders) {
-			const files = await this.resolveFilesAtLocation(uri, type, token);
+		for (const { parent, filePattern } of absoluteLocations) {
+			const files = (filePattern === undefined)
+				? await this.resolveFilesAtLocation(parent, type, token) // if the location does not contain a glob pattern, resolve the location directly
+				: await this.searchFilesInLocation(parent, filePattern, token);
 			for (const file of files) {
 				if (getPromptFileType(file) === type) {
 					paths.add(file);
@@ -89,123 +169,57 @@ export class PromptFilesLocator {
 				return [];
 			}
 		}
-
 		return [...paths];
 	}
 
-	/**
-	 * Gets all user storage folders for the given prompt type.
-	 * This includes configured tilde paths and the VS Code user data prompts folder.
-	 */
-	private async getUserStorageFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
-		const userHome = await this.pathService.userHome();
-		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-		const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, userHome);
-
-		// Filter to only user storage locations
-		const result = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
-
-		// Also include the VS Code user data prompts folder for certain types
-		if (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt) {
-			const userDataPromptsHome = this.userDataService.currentProfile.promptsHome;
-			return [
-				...result,
-				{
-					uri: userDataPromptsHome,
-					source: PromptFileSource.CopilotPersonal,
-					storage: PromptsStorage.user,
-					displayPath: nls.localize('promptsUserDataFolder', "User Data"),
-					isDefault: true
-				}
-			];
-		}
-
-		return result;
-	}
-
-	/**
-	 * Gets all source folder URIs for a prompt type (both workspace and user home).
-	 * This is used for file watching to detect changes in all relevant locations.
-	 */
-	private getSourceFoldersSync(type: PromptsType, userHome: URI): readonly URI[] {
-		const result: URI[] = [];
-		const folders = this.getWorkspaceFolders();
-		const defaultFileOrFolders = getPromptFileDefaultLocations(type);
-
-		const getFolderUri = (type: PromptsType, fileOrFolderPath: URI): URI => {
-			// For hooks, the paths are sometimes file paths, so get the parent directory in that case
-			if (type === PromptsType.hook && fileOrFolderPath.path.toLowerCase().endsWith('.json')) {
-				return dirname(fileOrFolderPath);
-			}
-			return fileOrFolderPath;
-		};
-
-		for (const sourceFileOrFolder of defaultFileOrFolders) {
-			let fileOrFolderPath: URI;
-			if (sourceFileOrFolder.storage === PromptsStorage.local) {
-				for (const workspaceFolder of folders) {
-					fileOrFolderPath = joinPath(workspaceFolder.uri, sourceFileOrFolder.path);
-					result.push(getFolderUri(type, fileOrFolderPath));
-				}
-			} else if (sourceFileOrFolder.storage === PromptsStorage.user) {
-				// For tilde paths, strip the ~/ prefix before joining with userHome
-				const relativePath = isTildePath(sourceFileOrFolder.path) ? sourceFileOrFolder.path.substring(2) : sourceFileOrFolder.path;
-				fileOrFolderPath = joinPath(userHome, relativePath);
-				result.push(getFolderUri(type, fileOrFolderPath));
-			}
-		}
-
-		return result;
-	}
-
 	public createFilesUpdatedEvent(type: PromptsType): { readonly event: Event<void>; dispose: () => void } {
 		const disposables = new DisposableStore();
 		const eventEmitter = disposables.add(new Emitter<void>());
-
-		const userDataFolder = this.userDataService.currentProfile.promptsHome;
-
-		const key = getPromptFileLocationsConfigKey(type);
-		let parentFolders = this.getLocalParentFolders(type);
-		let allSourceFolders: URI[] = [];
+		const token = disposables.add(new CancellationTokenSource()).token; // track the disposal of the event listeners so we can cancel any in-flight async operations when the event is disposed
 
 		const externalFolderWatchers = disposables.add(new DisposableStore());
+		const key = getPromptFileLocationsConfigKey(type);
+		const userDataFolder = this.userDataService.currentProfile.promptsHome;
+
+		let parentFolders: readonly IResolvedPromptSourceFolder[] = [];
+
 		const updateExternalFolderWatchers = () => {
 			externalFolderWatchers.clear();
 			for (const folder of parentFolders) {
 				if (!this.getWorkspaceFolder(folder.parent)) {
 					// if the folder is not part of the workspace, we need to watch it
-					const recursive = folder.filePattern !== undefined;
+					const recursive = folder.filePattern !== undefined || type === PromptsType.instructions; // instructions can be in subfolders, so watch recursively
 					externalFolderWatchers.add(this.fileService.watch(folder.parent, { recursive, excludes: [] }));
 				}
 			}
-			// Watch all source folders (including user home if applicable)
-			for (const folder of allSourceFolders) {
-				if (!this.getWorkspaceFolder(folder)) {
-					externalFolderWatchers.add(this.fileService.watch(folder, { recursive: true, excludes: [] }));
-				}
-			}
 		};
 
-		// Initialize source folders (async if type has userHome locations)
-		this.pathService.userHome().then(userHome => {
-			allSourceFolders = [...this.getSourceFoldersSync(type, userHome)];
-			updateExternalFolderWatchers();
-		});
+		const update = async (emitEvent: boolean) => {
+			try {
+				const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+				parentFolders = await this.toAbsoluteLocations(type, configuredLocations, undefined);
 
+				if (token.isCancellationRequested) {
+					return;
+				}
+				updateExternalFolderWatchers();
+				if (emitEvent) {
+					eventEmitter.fire();
+				}
+			} catch (err) {
+				this.logService.error(`Error updating prompt file watchers after config change:`, err);
+			}
+		};
 		disposables.add(this.configService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(key)) {
-				parentFolders = this.getLocalParentFolders(type);
-				updateExternalFolderWatchers();
-				eventEmitter.fire();
+				void update(true);
 			}
 		}));
 		disposables.add(this.onDidChangeWorkspaceFolders()(() => {
-			parentFolders = this.getLocalParentFolders(type);
-			this.pathService.userHome().then(userHome => {
-				allSourceFolders = [...this.getSourceFoldersSync(type, userHome)];
-				updateExternalFolderWatchers();
-			});
-			eventEmitter.fire();
+			void update(true);
+		}));
+		disposables.add(this.workspaceTrustManagementService.onDidChangeTrustedFolders(() => {
+			void update(true);
 		}));
 		disposables.add(this.fileService.onDidFilesChange(e => {
 			if (e.affects(userDataFolder)) {
@@ -216,13 +230,11 @@ export class PromptFilesLocator {
 				eventEmitter.fire();
 				return;
 			}
-			if (allSourceFolders.some(folder => e.affects(folder))) {
-				eventEmitter.fire();
-				return;
-			}
 		}));
 		disposables.add(this.fileService.watch(userDataFolder));
 
+		void update(false);
+
 		return { event: eventEmitter.event, dispose: () => disposables.dispose() };
 	}
 
@@ -231,7 +243,6 @@ export class PromptFilesLocator {
 	 * Returns folders from config, excluding user storage and Claude paths (which are read-only).
 	 */
 	public async getHookSourceFolders(): Promise<readonly URI[]> {
-		const userHome = await this.pathService.userHome();
 		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.hook);
 
 		// Ignore claude folders since they aren't first-class supported, so we don't want to create invalid formats
@@ -242,19 +253,13 @@ export class PromptFilesLocator {
 
 		// Convert to absolute URIs
 		const result = new ResourceSet();
-		const absoluteLocations = this.toAbsoluteLocations(PromptsType.hook, allowedHookFolders, userHome);
+		const absoluteLocations = await this.toAbsoluteLocations(PromptsType.hook, allowedHookFolders);
 
 		for (const location of absoluteLocations) {
 			// For hook configs, entries are directories unless the path ends with .json (specific file)
 			// Default entries have filePattern, user entries don't but are still directories
-			const isSpecificFile = location.uri.path.endsWith('.json');
-			if (isSpecificFile) {
-				// It's a specific file path (like .github/hooks/hooks.json), use parent directory
-				result.add(dirname(location.uri));
-			} else {
-				// It's a directory path (like .github/hooks or .github/books)
-				result.add(location.uri);
-			}
+			// location.parent points to the directory in both cases, so we can just use that
+			result.add(location.parent);
 		}
 
 		return [...result];
@@ -273,28 +278,28 @@ export class PromptFilesLocator {
 	 * @returns List of possible unambiguous prompt file folders.
 	 */
 	public async getConfigBasedSourceFolders(type: PromptsType): Promise<readonly URI[]> {
-		const userHome = await this.pathService.userHome();
 		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-		const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, userHome).map(l => l.uri);
+		const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations);
 
 		// For anything that doesn't support glob patterns, we can return
 		if (type !== PromptsType.prompt && type !== PromptsType.instructions) {
-			return absoluteLocations;
+			return absoluteLocations.map(l => l.uri);
 		}
 
 		// locations in the settings can contain glob patterns so we need
 		// to process them to get "clean" paths; the goal here is to have
 		// a list of unambiguous folder paths where prompt files are stored
 		const result = new ResourceSet();
-		for (let absoluteLocation of absoluteLocations) {
-			const baseName = basename(absoluteLocation);
+		for (const absoluteLocation of absoluteLocations) {
+			let location = absoluteLocation.uri;
+			const baseName = basename(location);
 
 			// if a path ends with a well-known "any file" pattern, remove
 			// it so we can get the dirname path of that setting value
 			const filePatterns = ['*.md', `*${getPromptFileExtension(type)}`];
 			for (const filePattern of filePatterns) {
 				if (baseName === filePattern) {
-					absoluteLocation = dirname(absoluteLocation);
+					location = dirname(location);
 					continue;
 				}
 			}
@@ -302,16 +307,16 @@ export class PromptFilesLocator {
 			// likewise, if the pattern ends with single `*` (any file name)
 			// remove it to get the dirname path of the setting value
 			if (baseName === '*') {
-				absoluteLocation = dirname(absoluteLocation);
+				location = dirname(location);
 			}
 
 			// if after replacing the "file name" glob pattern, the path
 			// still contains a glob pattern, then ignore the path
-			if (isValidGlob(absoluteLocation.path) === true) {
+			if (isValidGlob(location.path) === true) {
 				continue;
 			}
 
-			result.add(absoluteLocation);
+			result.add(location);
 		}
 
 		return [...result];
@@ -329,8 +334,10 @@ export class PromptFilesLocator {
 	 * @returns List of resolved source folders with metadata.
 	 */
 	public async getResolvedSourceFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
-		const localFolders = await this.getLocalStorageFolders(type);
-		const userFolders = await this.getUserStorageFolders(type);
+		const absoluteLocations = await this.getLocalStorageFolders(type);
+
+		const localFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.local);
+		const userFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
 		return this.dedupeSourceFolders([...localFolders, ...userFolders]);
 	}
 
@@ -341,8 +348,9 @@ export class PromptFilesLocator {
 	 * for debug/diagnostic output so the displayed order is accurate.
 	 */
 	public async getSourceFoldersInDiscoveryOrder(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
-		const userFolders = await this.getUserStorageFolders(type);
-		const localFolders = await this.getLocalStorageFolders(type);
+		const absoluteLocations = await this.getLocalStorageFolders(type);
+		const userFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
+		const localFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.local);
 		return this.dedupeSourceFolders([...userFolders, ...localFolders]);
 	}
 
@@ -351,7 +359,6 @@ export class PromptFilesLocator {
 	 * This merges default folders with configured locations.
 	 */
 	private async getLocalStorageFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
-		const userHome = await this.pathService.userHome();
 		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
 		const defaultFolders = getPromptFileDefaultLocations(type);
 
@@ -361,7 +368,11 @@ export class PromptFilesLocator {
 			...configuredLocations.filter(loc => !defaultFolders.some(df => df.path === loc.path))
 		];
 
-		return this.toAbsoluteLocations(type, allFolders, userHome, defaultFolders);
+		const absoluteLocations = await this.toAbsoluteLocations(type, allFolders, defaultFolders);
+		if (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt) {
+			absoluteLocations.push(this.userDataFolder);
+		}
+		return absoluteLocations;
 	}
 
 	/**
@@ -379,39 +390,6 @@ export class PromptFilesLocator {
 		return result;
 	}
 
-	/**
-	 * Finds all existent prompt files in the configured local source folders.
-	 *
-	 * @returns List of prompt files found in the local source folders.
-	 */
-	private async listFilesInLocal(type: PromptsType, token: CancellationToken): Promise<readonly URI[]> {
-		// find all prompt files in the provided locations, then match
-		// the found file paths against (possible) glob patterns
-		const paths = new ResourceSet();
-
-		for (const { parent, filePattern } of this.getLocalParentFolders(type)) {
-			const files = (filePattern === undefined)
-				? await this.resolveFilesAtLocation(parent, type, token) // if the location does not contain a glob pattern, resolve the location directly
-				: await this.searchFilesInLocation(parent, filePattern, token);
-			for (const file of files) {
-				if (getPromptFileType(file) === type) {
-					paths.add(file);
-				}
-			}
-			if (token.isCancellationRequested) {
-				return [];
-			}
-		}
-
-		return [...paths];
-	}
-
-	private getLocalParentFolders(type: PromptsType): readonly { parent: URI; filePattern?: string }[] {
-		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-		const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, undefined);
-		return absoluteLocations.map((location) => firstNonGlobParentAndPattern(location.uri));
-	}
-
 	/**
 	 * Converts locations defined in `settings` to absolute filesystem path URIs with metadata.
 	 * This conversion is needed because locations in settings can be relative,
@@ -419,10 +397,12 @@ export class PromptFilesLocator {
 	 * If userHome is provided, paths starting with `~` will be expanded. Otherwise these paths are ignored.
 	 * Preserves the type and location properties from the source folder definitions.
 	 */
-	private toAbsoluteLocations(type: PromptsType, configuredLocations: readonly IPromptSourceFolder[], userHome: URI | undefined, defaultLocations?: readonly IPromptSourceFolder[]): readonly IResolvedPromptSourceFolder[] {
+	private async toAbsoluteLocations(type: PromptsType, configuredLocations: readonly IPromptSourceFolder[], defaultLocations?: readonly IPromptSourceFolder[]): Promise<IResolvedPromptSourceFolder[]> {
 		const result: IResolvedPromptSourceFolder[] = [];
 		const seen = new ResourceSet();
-		const folders = this.getWorkspaceFolders();
+
+		const userHome = await this.pathService.userHome();
+		const rootFolders = await this.getWorkspaceFolderRoots(this.configService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true);
 
 		// Create a set of default paths for quick lookup
 		const defaultPaths = new Set(defaultLocations?.map(loc => loc.path));
@@ -455,13 +435,11 @@ export class PromptFilesLocator {
 			try {
 				// Handle tilde paths when userHome is provided
 				if (isTildePath(configuredLocation)) {
-					// If userHome is not provided, we cannot resolve tilde paths so we skip this entry
-					if (userHome) {
-						const uri = joinPath(userHome, configuredLocation.substring(2));
-						if (!seen.has(uri)) {
-							seen.add(uri);
-							result.push({ uri, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
-						}
+					const uri = joinPath(userHome, configuredLocation.substring(2));
+					if (!seen.has(uri)) {
+						seen.add(uri);
+						const { parent, filePattern } = getParentFolder(type, uri);
+						result.push({ uri, parent, filePattern, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
 					}
 					continue;
 				}
@@ -476,14 +454,16 @@ export class PromptFilesLocator {
 					}
 					if (!seen.has(uri)) {
 						seen.add(uri);
-						result.push({ uri, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
+						const { parent, filePattern } = getParentFolder(type, uri);
+						result.push({ uri, parent, filePattern, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
 					}
 				} else {
-					for (const workspaceFolder of folders) {
-						const absolutePath = joinPath(workspaceFolder.uri, configuredLocation);
+					for (const folder of rootFolders) {
+						const absolutePath = joinPath(folder, configuredLocation);
 						if (!seen.has(absolutePath)) {
 							seen.add(absolutePath);
-							result.push({ uri: absolutePath, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
+							const { parent, filePattern } = getParentFolder(type, absolutePath);
+							result.push({ uri: absolutePath, parent, filePattern, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
 						}
 					}
 				}
@@ -584,24 +564,6 @@ export class PromptFilesLocator {
 		return [];
 	}
 
-	public async findCopilotInstructionsMDsInWorkspace(token: CancellationToken): Promise<IResolvedAgentFile[]> {
-		const result: IResolvedAgentFile[] = [];
-		const folders = this.getWorkspaceFolders();
-		for (const folder of folders) {
-			const file = joinPath(folder.uri, `.github/` + COPILOT_CUSTOM_INSTRUCTIONS_FILENAME);
-			try {
-				const stat = await this.fileService.stat(file);
-				if (stat.isFile) {
-					const realPath = stat.isSymbolicLink ? await this.fileService.realpath(file) : undefined;
-					result.push({ uri: file, realPath, type: AgentFileType.copilotInstructionsMd });
-				}
-			} catch (error) {
-				this.logService.trace(`[PromptFilesLocator] Skipping copilot-instructions.md at ${file.toString()}: ${error}`);
-			}
-		}
-		return result;
-	}
-
 	/**
 	 * Gets list of `AGENTS.md` files anywhere in the workspace.
 	 */
@@ -683,29 +645,24 @@ export class PromptFilesLocator {
 		return result;
 	}
 
-	/**
-	 * Gets list of files at the root workspace folder(s).
-	 */
-	public async findFilesInWorkspaceRoots(fileName: string, folder: string | undefined, type: AgentFileType, token: CancellationToken, result: IResolvedAgentFile[] = []): Promise<IResolvedAgentFile[]> {
-		const folders = this.getWorkspaceFolders();
-		if (folder) {
-			return this.findFilesInRoots(folders.map(f => joinPath(f.uri, folder)), fileName, type, token, result);
-		}
-		return this.findFilesInRoots(folders.map(f => f.uri), fileName, type, token, result);
-	}
 
-	public async findFilesInRoots(roots: URI[], fileName: string, type: AgentFileType, token: CancellationToken, result: IResolvedAgentFile[] = []): Promise<IResolvedAgentFile[]> {
-		const fileNameLower = fileName.toLowerCase();
-		const resolvedRoots = await this.fileService.resolveAll(roots.map(uri => ({ resource: uri })));
+
+	public async findFilesInRoots(roots: URI[], folder: string | undefined, paths: IWorkspaceInstructionFile[], token: CancellationToken, result: IResolvedAgentFile[] = []): Promise<IResolvedAgentFile[]> {
+		const toResolve = roots.map(root => ({ resource: folder !== undefined ? joinPath(root, folder) : root }));
+		const resolvedRoots = await this.fileService.resolveAll(toResolve);
 		if (token.isCancellationRequested) {
 			return result;
 		}
 		for (const root of resolvedRoots) {
 			if (root.success && root.stat?.children) {
-				const file = root.stat.children.find(c => c.isFile && c.name.toLowerCase() === fileNameLower);
-				if (file) {
-					const realPath = file.isSymbolicLink ? await this.fileService.realpath(file.resource) : undefined;
-					result.push({ uri: file.resource, realPath, type });
+				for (const child of root.stat.children) {
+					if (child.isFile) {
+						const matchingPath = paths.find(p => equalsIgnoreCase(p.fileName, child.name));
+						if (matchingPath) {
+							const realPath = child.isSymbolicLink ? await this.fileService.realpath(child.resource) : undefined;
+							result.push({ uri: child.resource, realPath, type: matchingPath.type });
+						}
+					}
 				}
 			}
 		}
@@ -762,9 +719,8 @@ export class PromptFilesLocator {
 	 * Searches for skills in all configured locations.
 	 */
 	public async findAgentSkills(token: CancellationToken): Promise<IResolvedPromptFile[]> {
-		const userHome = await this.pathService.userHome();
 		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.skill);
-		const absoluteLocations = this.toAbsoluteLocations(PromptsType.skill, configuredLocations, userHome);
+		const absoluteLocations = await this.toAbsoluteLocations(PromptsType.skill, configuredLocations);
 		const allResults: IResolvedPromptFile[] = [];
 
 		for (const { uri, source, storage } of absoluteLocations) {
@@ -862,6 +818,11 @@ export function isValidGlob(pattern: string): boolean {
 	return false;
 }
 
+interface IParentFolderResult {
+	readonly parent: URI;
+	readonly filePattern?: string;
+}
+
 /**
  * Finds the first parent of the provided location that does not contain a `glob pattern`.
  *
@@ -871,13 +832,21 @@ export function isValidGlob(pattern: string): boolean {
  *
  * ```typescript
  * assert.strictDeepEqual(
- *     firstNonGlobParentAndPattern(URI.file('/home/user/{folder1,folder2}/file.md')).path,
+ *     getParentFolder(PromptsType.prompt, URI.file('/home/user/{folder1,folder2}/file.md')),
  *     { parent: URI.file('/home/user'), filePattern: '{folder1,folder2}/file.md' },
  *     'Must find correct non-glob parent dirname.',
  * );
  * ```
  */
-function firstNonGlobParentAndPattern(location: URI): { parent: URI; filePattern?: string } {
+function getParentFolder(type: PromptsType, location: URI): IParentFolderResult {
+	if (type === PromptsType.hook && extname(location) === '.json') {
+		location = dirname(location);
+	}
+	if (type !== PromptsType.instructions && type !== PromptsType.prompt) {
+		// only instructions and prompts support glob patterns, so we can return the location as is
+		return { parent: location };
+	}
+
 	const segments = location.path.split('/');
 	let i = 0;
 	while (i < segments.length && isValidGlob(segments[i]) === false) {
diff --git a/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts
index bf1214267a5..2e3466f1eda 100644
--- a/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts
@@ -17,7 +17,7 @@ import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynami
 
 const agentReg = /^@([\w_\-\.]+)(?=(\s|$|\b))/i; // An @-agent
 const variableReg = /^#([\w_\-]+)(:\d+)?(?=(\s|$|\b))/i; // A #-variable with an optional numeric : arg (@response:2)
-const slashReg = /^\/([\p{L}\d_\-\.:]+)(?=(\s|$|\b))/iu; // A / command
+export const slashReg = /^\/([\p{L}\d_\-\.:]+)(?=(\s|$|\b))/iu; // A / command
 
 export interface IChatParserContext {
 	/** Used only as a disambiguator, when the query references an agent that has a duplicate with the same name. */
@@ -223,10 +223,14 @@ export class ChatRequestParser {
 			}
 		}
 
-		const capabilities = context?.attachmentCapabilities ?? usedAgent?.capabilities ?? context?.attachmentCapabilities;
-		if (!usedAgent || capabilities?.supportsPromptAttachments) {
-			const slashCommands = this.slashCommandService.getCommands(location, context?.mode ?? ChatModeKind.Ask);
-			const slashCommand = slashCommands.find(c => c.command === command);
+		const capabilities = context?.attachmentCapabilities ?? usedAgent?.capabilities;
+		const slashCommands = this.slashCommandService.getCommands(location, context?.mode ?? ChatModeKind.Ask);
+		const slashCommand = slashCommands.find(c => c.command === command);
+		// If there is no agent, we allow any slash command.
+		// If there is an agent, we let
+		// * silent ones go through since they are only UI-facing and don't influence chat history
+		// * slash commands that support prompt attachments, since those are meant to be used in conjunction with an agent and we can assume the agent can handle them.
+		if (!usedAgent || slashCommand?.silent || capabilities?.supportsPromptAttachments) {
 			if (slashCommand) {
 				// Valid standalone slash command
 				return new ChatRequestSlashCommandPart(slashRange, slashEditorRange, slashCommand);
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/askQuestionsTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/askQuestionsTool.ts
index 8dda3785b93..d6897b61fdb 100644
--- a/src/vs/workbench/contrib/chat/common/tools/builtinTools/askQuestionsTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/askQuestionsTool.ts
@@ -14,7 +14,8 @@ import { localize } from '../../../../../../nls.js';
 import { IChatQuestion, IChatQuestionAnswers, IChatQuestionAnswerValue, IChatMultiSelectAnswer, IChatService, IChatSingleSelectAnswer } from '../../chatService/chatService.js';
 import { ChatQuestionCarouselData } from '../../model/chatProgressTypes/chatQuestionCarouselData.js';
 import { IChatRequestModel } from '../../model/chatModel.js';
-import { ChatPermissionLevel } from '../../constants.js';
+import { ChatConfiguration, ChatPermissionLevel } from '../../constants.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { StopWatch } from '../../../../../../base/common/stopwatch.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
 import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
@@ -109,7 +110,7 @@ export function createAskQuestionsToolData(): IToolData {
 			},
 			allowFreeformInput: {
 				type: 'boolean',
-				description: 'Allow freeform text answers in addition to option selection.'
+				description: 'Allow freeform text answers in addition to option selection. Defaults to true; set to false to restrict to predefined options only.'
 			},
 			options: {
 				type: 'array',
@@ -158,7 +159,7 @@ export function createAskQuestionsToolData(): IToolData {
 		icon: ThemeIcon.fromId(Codicon.question.id),
 		displayName: localize('tool.askQuestions.displayName', 'Ask Clarifying Questions'),
 		userDescription: localize('tool.askQuestions.userDescription', 'Ask structured clarifying questions using single select, multi-select, or freeform inputs to collect task requirements before proceeding.'),
-		modelDescription: 'Use this tool to ask the user a small number of clarifying questions before proceeding. Provide the questions array with concise headers and prompts. Use options for fixed choices, set multiSelect when multiple selections are allowed, and set allowFreeformInput to let users supply their own answer.',
+		modelDescription: 'Use this tool to ask the user a small number of clarifying questions before proceeding. Provide the questions array with concise headers and prompts. Use options for fixed choices, set multiSelect when multiple selections are allowed. Users can always provide a freeform text answer alongside options unless you set allowFreeformInput to false.',
 		source: ToolDataSource.Internal,
 		inputSchema
 	};
@@ -172,6 +173,7 @@ export class AskQuestionsTool extends Disposable implements IToolImpl {
 		@IChatService private readonly chatService: IChatService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@ILogService private readonly logService: ILogService,
+		@IConfigurationService private readonly configService: IConfigurationService,
 	) {
 		super();
 	}
@@ -195,10 +197,12 @@ export class AskQuestionsTool extends Disposable implements IToolImpl {
 			return this.createSkippedResult(questions);
 		}
 
-		// In autopilot mode, the user is not available — auto-respond instead of blocking.
-		// Still append a completed carousel so the user can see the auto-selected answers.
-		if (request.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot) {
-			this.logService.info('[AskQuestionsTool] Autopilot mode: auto-responding to questions');
+		// In autopilot mode or when auto-reply is enabled, the user is not available —
+		// auto-respond instead of blocking. Still append a completed carousel so the
+		// user can see what was skipped.
+		if (request.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot || this.configService.getValue<boolean>(ChatConfiguration.AutoReply)) {
+			const reason = request.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot ? 'Autopilot mode' : 'Auto-reply enabled';
+			this.logService.info(`[AskQuestionsTool] ${reason}: auto-responding to questions`);
 			const { carousel, idToHeaderMap } = this.toQuestionCarousel(questions);
 			carousel.data = this.buildAutopilotCarouselAnswers(questions, carousel, idToHeaderMap);
 			carousel.isUsed = true;
@@ -333,7 +337,7 @@ export class AskQuestionsTool extends Disposable implements IToolImpl {
 				value: opt.label
 			})),
 			defaultValue,
-			allowFreeformInput: question.allowFreeformInput ?? false
+			allowFreeformInput: question.allowFreeformInput ?? true
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts
index f83c3c4e7a8..addfc96f5d6 100644
--- a/src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts
@@ -7,6 +7,7 @@ import { CancellationToken } from '../../../../../../base/common/cancellation.js
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 import { URI, UriComponents } from '../../../../../../base/common/uri.js';
 import { CellUri } from '../../../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../../../notebook/common/notebookService.js';
@@ -118,7 +119,7 @@ export class EditTool implements IToolImpl {
 			dispose = autorun((r) => {
 
 				const entries = editSession.entries.read(r);
-				const currentFile = entries?.find((e) => e.modifiedURI.toString() === uri.toString());
+				const currentFile = entries?.find((e) => isEqual(e.modifiedURI, uri));
 				if (currentFile) {
 					if (currentFile.isCurrentlyBeingModifiedBy.read(r)) {
 						wasFileBeingModified = true;
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts
index e1ba741425a..193755bde23 100644
--- a/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts
@@ -157,7 +157,11 @@ export class ManageTodoListTool extends Disposable implements IToolImpl {
 			status: todo.status
 		}));
 
+		const invocationLabel = message?.replace(/^(Starting|Completed): /i, '') ?? localize('todo.updatingList', "Updating todo list");
+		const invocationMessage = new MarkdownString(invocationLabel);
+
 		return {
+			invocationMessage,
 			pastTenseMessage: new MarkdownString(message ?? localize('todo.updatedList', "Updated todo list")),
 			toolSpecificData: {
 				kind: 'todoList',
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/resolveDebugEventDetailsTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/resolveDebugEventDetailsTool.ts
index fa690d45d61..6fda3019827 100644
--- a/src/vs/workbench/contrib/chat/common/tools/builtinTools/resolveDebugEventDetailsTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/resolveDebugEventDetailsTool.ts
@@ -6,7 +6,7 @@
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { localize } from '../../../../../../nls.js';
 import { ChatContextKeys } from '../../actions/chatContextKeys.js';
-import { IChatDebugEvent, IChatDebugResolvedEventContent, IChatDebugService } from '../../chatDebugService.js';
+import { ChatDebugHookResult, IChatDebugEvent, IChatDebugResolvedEventContent, IChatDebugService } from '../../chatDebugService.js';
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../languageModelToolsService.js';
 
 export const ResolveDebugEventDetailsToolId = 'vscode_resolveDebugEventDetails_internal';
@@ -15,7 +15,7 @@ export const ResolveDebugEventDetailsToolData: IToolData = {
 	id: ResolveDebugEventDetailsToolId,
 	toolReferenceName: 'resolveDebugEventDetails',
 	displayName: localize('resolveDebugEventDetails.displayName', "Resolve Debug Event Details"),
-	when: ChatContextKeys.chatSessionHasAttachedDebugData,
+	when: ChatContextKeys.chatSessionHasDebugTools,
 	canBeReferencedInPrompt: false,
 	modelDescription: 'Resolves the full details for a specific chat debug event by its event ID. Use this tool to get detailed information about a debug event such as tool call input/output, model turn details, user message sections, or file lists. The event ID can be found in the debug event log summary provided in the conversation context.',
 	source: ToolDataSource.Internal,
@@ -36,20 +36,27 @@ function formatResolvedContent(content: IChatDebugResolvedEventContent): string
 		case 'text':
 			return content.value;
 		case 'fileList': {
-			const lines: string[] = [`File list (${content.discoveryType}):`];
+			const lines: string[] = [localize('formatResolvedContent.fileList', "File list ({0}):", content.discoveryType)];
 			if (content.sourceFolders) {
 				for (const folder of content.sourceFolders) {
-					lines.push(`  Source folder: ${folder.uri.toString()} (${folder.storage})`);
+					lines.push(localize('formatResolvedContent.sourceFolder', "  Source folder: {0} ({1})", folder.uri.toString(), folder.storage));
 				}
 			}
 			for (const file of content.files) {
-				const status = file.status === 'loaded' ? 'loaded' : `skipped${file.skipReason ? `: ${file.skipReason}` : ''}`;
+				const status = file.status === 'loaded'
+					? localize('formatResolvedContent.loaded', "loaded")
+					: file.skipReason
+						? localize('formatResolvedContent.skippedWithReason', "skipped: {0}", file.skipReason)
+						: localize('formatResolvedContent.skipped', "skipped");
 				lines.push(`  ${file.uri.toString()} [${status}]`);
 			}
 			return lines.join('\n');
 		}
 		case 'message': {
-			const lines: string[] = [`${content.type === 'user' ? 'User' : 'Agent'} message: ${content.message}`];
+			const messageType = content.type === 'user'
+				? localize('formatResolvedContent.userMessage', "User message: {0}", content.message)
+				: localize('formatResolvedContent.agentMessage', "Agent message: {0}", content.message);
+			const lines: string[] = [messageType];
 			for (const section of content.sections) {
 				lines.push(`--- ${section.name} ---`);
 				lines.push(section.content);
@@ -57,37 +64,37 @@ function formatResolvedContent(content: IChatDebugResolvedEventContent): string
 			return lines.join('\n');
 		}
 		case 'toolCall': {
-			const lines: string[] = [`Tool call: ${content.toolName}`];
+			const lines: string[] = [localize('formatResolvedContent.toolCall', "Tool call: {0}", content.toolName)];
 			if (content.result) {
-				lines.push(`Result: ${content.result}`);
+				lines.push(localize('formatResolvedContent.result', "Result: {0}", content.result));
 			}
 			if (content.durationInMillis !== undefined) {
-				lines.push(`Duration: ${content.durationInMillis}ms`);
+				lines.push(localize('formatResolvedContent.duration', "Duration: {0}ms", content.durationInMillis));
 			}
 			if (content.input) {
-				lines.push(`Input:\n${content.input}`);
+				lines.push(localize('formatResolvedContent.input', "Input:") + '\n' + content.input);
 			}
 			if (content.output) {
-				lines.push(`Output:\n${content.output}`);
+				lines.push(localize('formatResolvedContent.output', "Output:") + '\n' + content.output);
 			}
 			return lines.join('\n');
 		}
 		case 'modelTurn': {
-			const lines: string[] = [`Model turn: ${content.requestName}`];
+			const lines: string[] = [localize('formatResolvedContent.modelTurn', "Model turn: {0}", content.requestName)];
 			if (content.model) {
-				lines.push(`Model: ${content.model}`);
+				lines.push(localize('formatResolvedContent.model', "Model: {0}", content.model));
 			}
 			if (content.status) {
-				lines.push(`Status: ${content.status}`);
+				lines.push(localize('formatResolvedContent.status', "Status: {0}", content.status));
 			}
 			if (content.durationInMillis !== undefined) {
-				lines.push(`Duration: ${content.durationInMillis}ms`);
+				lines.push(localize('formatResolvedContent.duration', "Duration: {0}ms", content.durationInMillis));
 			}
 			if (content.inputTokens !== undefined || content.outputTokens !== undefined) {
-				lines.push(`Tokens: input=${content.inputTokens ?? '?'}, output=${content.outputTokens ?? '?'}, cached=${content.cachedTokens ?? '?'}, total=${content.totalTokens ?? '?'}`);
+				lines.push(localize('formatResolvedContent.tokens', "Tokens: input={0}, output={1}, cached={2}, total={3}", content.inputTokens ?? '?', content.outputTokens ?? '?', content.cachedTokens ?? '?', content.totalTokens ?? '?'));
 			}
 			if (content.errorMessage) {
-				lines.push(`Error: ${content.errorMessage}`);
+				lines.push(localize('formatResolvedContent.error', "Error: {0}", content.errorMessage));
 			}
 			if (content.sections) {
 				for (const section of content.sections) {
@@ -97,6 +104,36 @@ function formatResolvedContent(content: IChatDebugResolvedEventContent): string
 			}
 			return lines.join('\n');
 		}
+		case 'hook': {
+			const lines: string[] = [localize('formatResolvedContent.hook', "Hook: {0}", content.hookType)];
+			if (content.command) {
+				lines.push(localize('formatResolvedContent.command', "Command: {0}", content.command));
+			}
+			if (content.result !== undefined) {
+				const resultText = content.result === ChatDebugHookResult.Success
+					? localize('formatResolvedContent.hookResult.success', "Success")
+					: content.result === ChatDebugHookResult.Error
+						? localize('formatResolvedContent.hookResult.error', "Error")
+						: localize('formatResolvedContent.hookResult.nonBlockingError', "Non-blocking Error");
+				lines.push(localize('formatResolvedContent.result', "Result: {0}", resultText));
+			}
+			if (content.exitCode !== undefined) {
+				lines.push(localize('formatResolvedContent.exitCode', "Exit Code: {0}", content.exitCode));
+			}
+			if (content.durationInMillis !== undefined) {
+				lines.push(localize('formatResolvedContent.duration', "Duration: {0}ms", content.durationInMillis));
+			}
+			if (content.input) {
+				lines.push(localize('formatResolvedContent.input', "Input:") + '\n' + content.input);
+			}
+			if (content.output) {
+				lines.push(localize('formatResolvedContent.output', "Output:") + '\n' + content.output);
+			}
+			if (content.errorMessage) {
+				lines.push(localize('formatResolvedContent.error', "Error: {0}", content.errorMessage));
+			}
+			return lines.join('\n');
+		}
 		default: {
 			const _: never = content;
 			return JSON.stringify(_);
@@ -156,28 +193,28 @@ export class ResolveDebugEventDetailsTool implements IToolImpl {
 		const eventId = invocation.parameters['eventId'];
 		if (typeof eventId !== 'string' || !eventId) {
 			return {
-				content: [{ kind: 'text', value: 'Error: eventId parameter is required.' }],
+				content: [{ kind: 'text', value: localize('resolveDebugEventDetails.errorEventIdRequired', "Error: eventId parameter is required.") }],
 			};
 		}
 
 		const sessionResource = invocation.context?.sessionResource;
 		if (!sessionResource) {
 			return {
-				content: [{ kind: 'text', value: 'Error: no chat session context available.' }],
+				content: [{ kind: 'text', value: localize('resolveDebugEventDetails.errorNoSession', "Error: no chat session context available.") }],
 			};
 		}
 
 		const sessionEvents = this.chatDebugService.getEvents(sessionResource);
 		if (!sessionEvents.some(e => e.id === eventId)) {
 			return {
-				content: [{ kind: 'text', value: `No event with ID "${eventId}" found in the current session.` }],
+				content: [{ kind: 'text', value: localize('resolveDebugEventDetails.errorEventNotFound', "No event with ID \"{0}\" found in the current session.", eventId) }],
 			};
 		}
 
 		const resolved = await this.chatDebugService.resolveEvent(eventId);
 		if (!resolved) {
 			return {
-				content: [{ kind: 'text', value: `No details found for event ID: ${eventId}` }],
+				content: [{ kind: 'text', value: localize('resolveDebugEventDetails.errorNoDetails', "No details found for event ID: {0}", eventId) }],
 			};
 		}
 
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts
index c5931a7d732..b74009f4a7d 100644
--- a/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts
@@ -21,7 +21,7 @@ import { IChatProgress, IChatService } from '../../chatService/chatService.js';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../constants.js';
 import { ILanguageModelsService } from '../../languageModels.js';
 import { ChatModel, IChatRequestModeInstructions } from '../../model/chatModel.js';
-import { IChatAgentRequest, IChatAgentService } from '../../participants/chatAgents.js';
+import { IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../../participants/chatAgents.js';
 import { ComputeAutomaticInstructions } from '../../promptSyntax/computeAutomaticInstructions.js';
 import { ChatRequestHooks, mergeHooks } from '../../promptSyntax/hookSchema.js';
 import { HookType } from '../../promptSyntax/hookTypes.js';
@@ -58,6 +58,8 @@ export interface IRunSubagentToolInputParams {
 	agentName?: string;
 }
 
+export const RUN_SUBAGENT_MAX_NESTING_DEPTH = 5;
+
 export class RunSubagentTool extends Disposable implements IToolImpl {
 
 	static readonly Id = 'runSubagent';
@@ -67,6 +69,9 @@ export class RunSubagentTool extends Disposable implements IToolImpl {
 	/** Hack to port data between prepare/invoke */
 	private readonly _resolvedModels = new Map<string, { modeModelId: string | undefined; resolvedModelName: string | undefined }>();
 
+	/** Tracks the current subagent nesting depth per session to detect and limit recursion. */
+	private readonly _sessionDepth = new Map<string, number>();
+
 	constructor(
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IChatService private readonly chatService: IChatService,
@@ -80,7 +85,9 @@ export class RunSubagentTool extends Disposable implements IToolImpl {
 		@IProductService private readonly productService: IProductService,
 	) {
 		super();
-		this.onDidUpdateToolData = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.SubagentToolCustomAgents));
+		this.onDidUpdateToolData = Event.filter(this.configurationService.onDidChangeConfiguration, e =>
+			e.affectsConfiguration(ChatConfiguration.SubagentToolCustomAgents)
+		);
 	}
 
 	getToolData(): IToolData {
@@ -210,8 +217,10 @@ export class RunSubagentTool extends Disposable implements IToolImpl {
 			// Track whether we should collect markdown (after the last tool invocation)
 			const markdownParts: string[] = [];
 
-			// Generate a stable subAgentInvocationId for routing edits to this subagent's content part
-			const subAgentInvocationId = invocation.callId ?? `subagent-${generateUuid()}`;
+			// Generate a stable subAgentInvocationId for routing edits to this subagent's content part.
+			// Use chatStreamToolCallId when available because that is what ChatToolInvocation.toolCallId
+			// uses in the renderer (see PR #302863), and the subagent grouping matches on toolCallId.
+			const subAgentInvocationId = invocation.chatStreamToolCallId ?? invocation.callId ?? `subagent-${generateUuid()}`;
 
 			let inEdit = false;
 			const progressCallback = (parts: IChatProgress[]) => {
@@ -242,14 +251,33 @@ export class RunSubagentTool extends Disposable implements IToolImpl {
 				}
 			};
 
-			if (modeTools) {
-				modeTools[RunSubagentTool.Id] = false;
-				modeTools[ManageTodoListToolToolId] = false;
-				modeTools['copilot_askQuestions'] = false;
+			// Determine whether the subagent should be allowed to spawn its own subagents.
+			const allowInvocationsFromSubagents = this.configurationService.getValue<boolean>(ChatConfiguration.SubagentsAllowInvocationsFromSubagents) ?? false;
+			const maxDepth = allowInvocationsFromSubagents ? RUN_SUBAGENT_MAX_NESTING_DEPTH : 0;
+			const sessionKey = invocation.context.sessionResource.toString();
+			const currentDepth = this._sessionDepth.get(sessionKey) ?? 0;
+			const depthAllowed = currentDepth + 1 <= maxDepth;
+
+			if (!modeTools) {
+				// Initialize modeTools so that we can still enforce the max depth restriction
+				modeTools = {};
+			}
+
+			// Only further-restrict RunSubagentTool: do not re-enable it if it was explicitly disabled.
+			const existingRunSubagentEnablement = modeTools[RunSubagentTool.Id];
+			if (existingRunSubagentEnablement !== false) {
+				modeTools[RunSubagentTool.Id] = depthAllowed; // only enable the Run Subagent tool if we are under the max depth limit
+			}
+
+			modeTools[ManageTodoListToolToolId] = false;
+			modeTools['copilot_askQuestions'] = false;
+
+			if (maxDepth > 0) {
+				this.logService.debug(`RunSubagentTool: Nested subagents enabling ${modeTools[RunSubagentTool.Id]}: session ${sessionKey}, currentDepth: ${currentDepth}, maxDepth: ${maxDepth}, allowInvocationsFromSubagents: ${allowInvocationsFromSubagents}`);
 			}
 
 			const variableSet = new ChatRequestVariableSet();
-			const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, ChatModeKind.Agent, modeTools, undefined, invocation.context.sessionResource); // agents can not call subagents
+			const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, ChatModeKind.Agent, modeTools, undefined, invocation.context.sessionResource);
 			await computer.collect(variableSet, token);
 
 			// Collect hooks from hook .json files
@@ -283,14 +311,15 @@ export class RunSubagentTool extends Disposable implements IToolImpl {
 				message: args.prompt,
 				variables: { variables: variableSet.asArray() },
 				location: ChatAgentLocation.Chat,
-				subAgentInvocationId: invocation.callId,
+				subAgentInvocationId: subAgentInvocationId,
 				subAgentName: subAgentName,
 				userSelectedModelId: modeModelId,
+				modelConfiguration: modeModelId ? this.languageModelsService.getModelConfiguration(modeModelId) : undefined,
 				userSelectedTools: modeTools,
 				modeInstructions,
 				parentRequestId: invocation.chatRequestId,
 				hooks: collectedHooks,
-				hasHooksEnabled: !!collectedHooks && Object.values(collectedHooks).some(arr => arr.length > 0),
+				hasHooksEnabled: !!collectedHooks && Object.values(collectedHooks).some(arr => arr && arr.length > 0),
 			};
 
 			// Subscribe to tool invocations to clear markdown parts when a tool is invoked
@@ -300,17 +329,28 @@ export class RunSubagentTool extends Disposable implements IToolImpl {
 				}
 			}));
 
-			// Invoke the agent
-			const result = await this.chatAgentService.invokeAgent(
-				defaultAgent.id,
-				agentRequest,
-				progressCallback,
-				[],
-				token
-			);
+			// Invoke the agent, tracking nesting depth for recursion detection
+			this._sessionDepth.set(sessionKey, currentDepth + 1);
+			let result: IChatAgentResult | undefined;
+			try {
+				result = await this.chatAgentService.invokeAgent(
+					defaultAgent.id,
+					agentRequest,
+					progressCallback,
+					[],
+					token
+				);
+			} finally {
+				const newDepth = (this._sessionDepth.get(sessionKey) ?? 1) - 1;
+				if (newDepth <= 0) {
+					this._sessionDepth.delete(sessionKey);
+				} else {
+					this._sessionDepth.set(sessionKey, newDepth);
+				}
+			}
 
 			// Check for errors
-			if (result.errorDetails) {
+			if (result?.errorDetails) {
 				return createToolSimpleTextResult(`Agent error: ${result.errorDetails.message}`);
 			}
 
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactsTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactsTool.ts
new file mode 100644
index 00000000000..bb53fd09198
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactsTool.ts
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../../../base/common/jsonSchema.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import {
+	IToolData,
+	IToolImpl,
+	IToolInvocation,
+	IToolResult,
+	ToolDataSource,
+	IToolInvocationPreparationContext,
+	IPreparedToolInvocation,
+	ToolInvocationPresentation
+} from '../languageModelToolsService.js';
+import { IChatArtifact, IChatArtifactsService } from '../chatArtifactsService.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+
+export const SetArtifactsToolId = 'setArtifacts';
+
+const inputSchema: IJSONSchema & { properties: IJSONSchemaMap } = {
+	type: 'object',
+	properties: {
+		artifacts: {
+			type: 'array',
+			description: 'The complete list of artifacts for this session. Overwrites any existing artifacts.',
+			items: {
+				type: 'object',
+				properties: {
+					label: {
+						type: 'string',
+						description: 'Display label for the artifact.'
+					},
+					uri: {
+						type: 'string',
+						description: 'Fully qualified URI of the artifact (e.g. https://localhost:3000 or file:///path/to/file). Must include the scheme.'
+					},
+					type: {
+						type: 'string',
+						enum: ['devServer', 'screenshot', 'plan'],
+						description: 'The type of artifact.'
+					}
+				},
+				required: ['label']
+			}
+		}
+	},
+	required: ['artifacts']
+};
+
+export const SetArtifactsToolData: IToolData = {
+	id: SetArtifactsToolId,
+	toolReferenceName: 'artifacts',
+	legacyToolReferenceFullNames: ['Set Session Artifacts'],
+	displayName: localize('tool.setArtifacts.displayName', 'Set Session Artifacts'),
+	modelDescription: 'Set the list of artifacts for the current session. Each artifact has a label and either a uri or a toolCallId+dataPartIndex reference, plus an optional type (devServer, screenshot, plan). This overwrites the entire artifact list. URIs must be fully qualified with a scheme (e.g. https://localhost:3000, file:///tmp/plan.md). To reference a screenshot or image from a previous tool result, use toolCallId and dataPartIndex instead of uri.\n\nWhen to use this tool:\n- When creating or updating a plan saved to session memory — set a plan artifact so the user can view it in the artifact panel\n- When taking screenshots or producing visual output — set a screenshot artifact to surface the image\n- When starting a dev server — set a devServer artifact with the URL so the user can access it\n- When producing important documents, drafts, or temporary markdown files — set an artifact to make them easily accessible\n- After verification steps that produce visual results — update artifacts with screenshots showing the outcome\n\nWorkflow:\n- Prefer artifacts over printing long content inline in chat. Save content to a file or memory, then set an artifact pointing to it.\n- When updating plans or documents, update both the underlying file AND the artifact list.\n- Keep artifact labels concise and descriptive.',
+	canBeReferencedInPrompt: true,
+	source: ToolDataSource.Internal,
+	inputSchema
+};
+
+interface ISetArtifactsToolInput {
+	artifacts: IChatArtifact[];
+}
+
+export class SetArtifactsTool implements IToolImpl {
+
+	constructor(
+		@IChatArtifactsService private readonly _chatArtifactsService: IChatArtifactsService,
+		@IFileService private readonly _fileService: IFileService,
+	) { }
+
+	async prepareToolInvocation(_context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		return {
+			pastTenseMessage: new MarkdownString(localize('tool.setArtifacts.pastTense', "Updated session artifacts")),
+			presentation: ToolInvocationPresentation.Hidden,
+		};
+	}
+
+	async invoke(invocation: IToolInvocation, _countTokens: never, _progress: never, _token: CancellationToken): Promise<IToolResult> {
+		const args = invocation.parameters as ISetArtifactsToolInput;
+		const chatSessionResource = invocation.context?.sessionResource;
+		if (!chatSessionResource) {
+			return {
+				content: [{ kind: 'text', value: 'Error: No session resource available' }]
+			};
+		}
+
+		const artifacts: IChatArtifact[] = [];
+		for (const a of args.artifacts ?? []) {
+			let uri = a.uri;
+			if (!uri) {
+				uri = '';
+			}
+
+			if (uri) {
+				const parsed = URI.parse(uri);
+				if (parsed.scheme !== 'http' && parsed.scheme !== 'https') {
+					if (!await this._fileService.exists(parsed)) {
+						throw new Error(localize('tool.setArtifacts.uriNotFound', "Artifact URI does not exist: {0}", uri));
+					}
+				}
+			}
+
+			artifacts.push({ label: a.label, uri, type: a.type });
+		}
+
+		this._chatArtifactsService.getArtifacts(chatSessionResource).set(artifacts);
+
+		return {
+			content: [{ kind: 'text', value: localize('tool.setArtifacts.success', "Set {0} artifact(s)", artifacts.length) }]
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.ts
index 41144f8be91..d49197717b2 100644
--- a/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.ts
@@ -3,16 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+import { ChatConfiguration } from '../../constants.js';
 import { ILanguageModelToolsService } from '../languageModelToolsService.js';
 import { AskQuestionsTool, AskQuestionsToolData } from './askQuestionsTool.js';
 import { ConfirmationTool, ConfirmationToolData, ConfirmationToolWithOptionsData, ModifiedFilesConfirmationTool, ModifiedFilesConfirmationToolData } from './confirmationTool.js';
 import { EditTool, EditToolData } from './editFileTool.js';
 import { createManageTodoListToolData, ManageTodoListTool } from './manageTodoListTool.js';
-import { ResolveDebugEventDetailsTool, ResolveDebugEventDetailsToolData } from './resolveDebugEventDetailsTool.js';
 import { RunSubagentTool } from './runSubagentTool.js';
+import { SetArtifactsTool, SetArtifactsToolData } from './setArtifactsTool.js';
 import { TaskCompleteTool, TaskCompleteToolData } from './taskCompleteTool.js';
 
 export class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
@@ -22,6 +24,7 @@ export class BuiltinToolsContribution extends Disposable implements IWorkbenchCo
 	constructor(
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -47,10 +50,24 @@ export class BuiltinToolsContribution extends Disposable implements IWorkbenchCo
 		const taskCompleteTool = instantiationService.createInstance(TaskCompleteTool);
 		this._register(toolsService.registerTool(TaskCompleteToolData, taskCompleteTool));
 
-		const resolveDebugEventDetailsTool = instantiationService.createInstance(ResolveDebugEventDetailsTool);
-		this._register(toolsService.registerTool(ResolveDebugEventDetailsToolData, resolveDebugEventDetailsTool));
-		this._register(toolsService.readToolSet.addTool(ResolveDebugEventDetailsToolData));
-
+		const setArtifactsTool = instantiationService.createInstance(SetArtifactsTool);
+		const setArtifactsRegistration = this._register(new MutableDisposable());
+		const updateArtifactsRegistration = () => {
+			if (configurationService.getValue<boolean>(ChatConfiguration.ArtifactsEnabled) &&
+				configurationService.getValue<string>(ChatConfiguration.ArtifactsMode) === 'tool') {
+				if (!setArtifactsRegistration.value) {
+					setArtifactsRegistration.value = toolsService.registerTool(SetArtifactsToolData, setArtifactsTool);
+				}
+			} else {
+				setArtifactsRegistration.clear();
+			}
+		};
+		updateArtifactsRegistration();
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.ArtifactsEnabled) || e.affectsConfiguration(ChatConfiguration.ArtifactsMode)) {
+				updateArtifactsRegistration();
+			}
+		}));
 
 		const runSubagentTool = this._register(instantiationService.createInstance(RunSubagentTool));
 
diff --git a/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.ts b/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.ts
new file mode 100644
index 00000000000..21c74e4c92a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.ts
@@ -0,0 +1,309 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
+import { constObservable, derived, IObservable, observableFromEvent, observableSignalFromEvent, observableValueOpts } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../../common/memento.js';
+import { extractArtifactsFromResponse } from '../chatArtifactExtraction.js';
+import { IChatToolInvocation, IChatService } from '../chatService/chatService.js';
+import { ChatConfiguration } from '../constants.js';
+import { chatSessionResourceToId } from '../model/chatUri.js';
+
+export interface IArtifactGroupConfig {
+	readonly groupName: string;
+	readonly onlyShowGroup?: boolean;
+}
+
+export interface IChatArtifact {
+	readonly label: string;
+	readonly uri: string;
+	readonly toolCallId?: string;
+	readonly dataPartIndex?: number;
+	readonly type: 'devServer' | 'screenshot' | 'plan' | undefined;
+	readonly groupName?: string;
+	readonly onlyShowGroup?: boolean;
+}
+
+export const IChatArtifactsService = createDecorator<IChatArtifactsService>('chatArtifactsService');
+
+export interface IChatArtifactsService {
+	readonly _serviceBrand: undefined;
+	getArtifacts(sessionResource: URI): IChatArtifacts;
+}
+
+export interface IChatArtifacts {
+	readonly artifacts: IObservable<readonly IChatArtifact[]>;
+	readonly mutable: IObservable<boolean>;
+	set(artifacts: IChatArtifact[]): void;
+	clear(): void;
+	migrate(target: IChatArtifacts): void;
+}
+
+interface IResponseCache {
+	readonly partsLength: number;
+	readonly completedToolCount: number;
+	readonly byMimeType: Record<string, IArtifactGroupConfig>;
+	readonly byFilePath: Record<string, IArtifactGroupConfig>;
+	readonly artifacts: IChatArtifact[];
+}
+
+class ChatArtifactsStorage {
+	private readonly _memento: Memento<Record<string, IChatArtifact[]>>;
+
+	constructor(@IStorageService storageService: IStorageService) {
+		this._memento = new Memento('chat-artifacts', storageService);
+	}
+
+	get(key: string): IChatArtifact[] {
+		const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		return storage[key] || [];
+	}
+
+	set(key: string, artifacts: IChatArtifact[]): void {
+		const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		storage[key] = artifacts;
+		this._memento.saveMemento();
+	}
+
+	delete(key: string): void {
+		const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		delete storage[key];
+		this._memento.saveMemento();
+	}
+}
+
+class RulesChatArtifacts extends Disposable implements IChatArtifacts {
+
+	readonly mutable = constObservable(false);
+	readonly artifacts: IObservable<readonly IChatArtifact[]>;
+
+	private readonly _responseCache = new Map<string, IResponseCache>();
+
+	constructor(
+		sessionResource: URI,
+		chatService: IChatService,
+		configurationService: IConfigurationService,
+	) {
+		super();
+
+		const configByMimeType = observableFromEvent<Record<string, IArtifactGroupConfig>>(
+			this,
+			configurationService.onDidChangeConfiguration,
+			() => configurationService.getValue<Record<string, IArtifactGroupConfig>>(ChatConfiguration.ArtifactsRulesByMimeType) ?? {},
+		);
+
+		const configByFilePath = observableFromEvent<Record<string, IArtifactGroupConfig>>(
+			this,
+			configurationService.onDidChangeConfiguration,
+			() => configurationService.getValue<Record<string, IArtifactGroupConfig>>(ChatConfiguration.ArtifactsRulesByFilePath) ?? {},
+		);
+
+		const modelSignal = observableFromEvent(
+			this,
+			chatService.onDidCreateModel,
+			() => chatService.getSession(sessionResource),
+		);
+
+		this.artifacts = derived<readonly IChatArtifact[]>(reader => {
+			const byMimeType = configByMimeType.read(reader);
+			const byFilePath = configByFilePath.read(reader);
+			const model = modelSignal.read(reader);
+			if (!model) {
+				return [];
+			}
+
+			const requestsSignal = observableSignalFromEvent(this, model.onDidChange);
+
+			requestsSignal.read(reader);
+			const requests = model.getRequests();
+
+			const allArtifacts: IChatArtifact[] = [];
+			const activeResponseIds = new Set<string>();
+			const seenKeys = new Set<string>();
+
+			for (const request of requests) {
+				const response = request.response;
+				if (!response) {
+					continue;
+				}
+
+				activeResponseIds.add(response.id);
+				const responseValue = response.response;
+				const partsLength = responseValue.value.length;
+
+				let completedToolCount = 0;
+				for (const part of responseValue.value) {
+					if ((part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && IChatToolInvocation.resultDetails(part) !== undefined) {
+						completedToolCount++;
+					}
+				}
+
+				const cached = this._responseCache.get(response.id);
+				let extracted: IChatArtifact[];
+				if (cached && cached.partsLength === partsLength && cached.completedToolCount === completedToolCount && cached.byMimeType === byMimeType && cached.byFilePath === byFilePath) {
+					extracted = cached.artifacts;
+				} else {
+					extracted = extractArtifactsFromResponse(responseValue, sessionResource, byMimeType, byFilePath);
+					this._responseCache.set(response.id, { partsLength, completedToolCount, byMimeType, byFilePath, artifacts: extracted });
+				}
+
+				for (const artifact of extracted) {
+					const key = artifact.toolCallId
+						? `${artifact.toolCallId}:${artifact.dataPartIndex}`
+						: artifact.uri;
+					if (seenKeys.has(key)) {
+						const idx = allArtifacts.findIndex(a =>
+							a.toolCallId ? `${a.toolCallId}:${a.dataPartIndex}` === key : a.uri === key
+						);
+						if (idx !== -1) {
+							allArtifacts.splice(idx, 1);
+						}
+					}
+					seenKeys.add(key);
+					allArtifacts.push(artifact);
+				}
+			}
+
+			for (const key of this._responseCache.keys()) {
+				if (!activeResponseIds.has(key)) {
+					this._responseCache.delete(key);
+				}
+			}
+
+			return allArtifacts;
+		});
+	}
+
+	set(): void {
+		throw new Error('Artifacts are not mutable in rules mode');
+	}
+
+	clear(): void {
+		throw new Error('Artifacts are not mutable in rules mode');
+	}
+
+	migrate(): void {
+		// Nothing to migrate — rules artifacts are derived from the model
+	}
+}
+
+class StorageChatArtifacts implements IChatArtifacts {
+
+	readonly mutable = constObservable(true);
+
+	private readonly _artifacts = observableValueOpts<readonly IChatArtifact[]>(
+		{ owner: this, equalsFn: () => false },
+		[],
+	);
+
+	readonly artifacts: IObservable<readonly IChatArtifact[]> = this._artifacts;
+
+	constructor(
+		private readonly _storageKey: string,
+		private readonly _storage: ChatArtifactsStorage,
+	) {
+		this._artifacts.set(this._storage.get(this._storageKey), undefined);
+	}
+
+	set(artifacts: IChatArtifact[]): void {
+		this._artifacts.set(artifacts, undefined);
+		this._storage.set(this._storageKey, artifacts);
+	}
+
+	clear(): void {
+		this._artifacts.set([], undefined);
+		this._storage.set(this._storageKey, []);
+	}
+
+	migrate(target: IChatArtifacts): void {
+		const current = this._artifacts.get();
+		if (current.length > 0 && target.mutable.get()) {
+			target.set([...current]);
+		}
+		this._artifacts.set([], undefined);
+		this._storage.delete(this._storageKey);
+	}
+}
+
+class SwitchingChatArtifacts extends Disposable implements IChatArtifacts {
+
+	private readonly _rules: RulesChatArtifacts;
+	private readonly _storage: StorageChatArtifacts;
+	private readonly _active: IObservable<IChatArtifacts>;
+
+	readonly mutable: IObservable<boolean>;
+	readonly artifacts: IObservable<readonly IChatArtifact[]>;
+
+	constructor(
+		sessionResource: URI,
+		storageKey: string,
+		storage: ChatArtifactsStorage,
+		chatService: IChatService,
+		configurationService: IConfigurationService,
+	) {
+		super();
+
+		this._rules = this._register(new RulesChatArtifacts(sessionResource, chatService, configurationService));
+		this._storage = new StorageChatArtifacts(storageKey, storage);
+
+		const modeObs = observableFromEvent<string>(
+			this,
+			configurationService.onDidChangeConfiguration,
+			() => configurationService.getValue<string>(ChatConfiguration.ArtifactsMode) ?? 'rules',
+		);
+
+		this._active = derived<IChatArtifacts>(reader => {
+			const mode = modeObs.read(reader);
+			return mode === 'tool' ? this._storage : this._rules;
+		});
+
+		this.mutable = derived(reader => this._active.read(reader).mutable.read(reader));
+		this.artifacts = derived(reader => this._active.read(reader).artifacts.read(reader));
+	}
+
+	set(artifacts: IChatArtifact[]): void {
+		const active = this._active.get();
+		active.set(artifacts);
+	}
+
+	clear(): void {
+		const active = this._active.get();
+		active.clear();
+	}
+
+	migrate(target: IChatArtifacts): void {
+		this._storage.migrate(target);
+	}
+}
+
+export class ChatArtifactsService extends Disposable implements IChatArtifactsService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _storage: ChatArtifactsStorage;
+	private readonly _instances = this._register(new DisposableMap<string, SwitchingChatArtifacts>());
+
+	constructor(
+		@IStorageService storageService: IStorageService,
+		@IChatService private readonly _chatService: IChatService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super();
+		this._storage = new ChatArtifactsStorage(storageService);
+	}
+
+	getArtifacts(sessionResource: URI): IChatArtifacts {
+		const key = chatSessionResourceToId(sessionResource);
+		let instance = this._instances.get(key);
+		if (!instance) {
+			instance = new SwitchingChatArtifacts(sessionResource, key, this._storage, this._chatService, this._configurationService);
+			this._instances.set(key, instance);
+		}
+		return instance;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.ts
index 2e3c66261b8..fb2e048ded0 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.ts
@@ -10,6 +10,19 @@ import { IQuickInputButton, IQuickTreeItem } from '../../../../../platform/quick
 import { ConfirmedReason } from '../chatService/chatService.js';
 import { IToolData, ToolDataSource } from './languageModelToolsService.js';
 
+/**
+ * Computes a stable, bounded key for a tool+parameters combination
+ * using SHA-256 via SubtleCrypto. The resulting hex digest ensures
+ * raw parameter values are never leaked into storage.
+ */
+export async function computeCombinationKey(toolId: string, parameters: unknown): Promise<string> {
+	const input = toolId + ':' + JSON.stringify(parameters);
+	const encoded = new TextEncoder().encode(input);
+	const buffer = await crypto.subtle.digest('SHA-256', encoded);
+	const hashHex = Array.from(new Uint8Array(buffer)).map(b => b.toString(16).padStart(2, '0')).join('');
+	return toolId + ':combination:' + hashHex;
+}
+
 export interface ILanguageModelToolConfirmationActions {
 	/** Label for the action */
 	label: string;
@@ -28,6 +41,13 @@ export interface ILanguageModelToolConfirmationRef {
 	source: ToolDataSource;
 	parameters: unknown;
 	chatSessionResource?: URI;
+	/** When set, the confirmation service will offer combination-level approval actions */
+	combination?: {
+		/** Human-readable label for the approval option */
+		label: string;
+		/** Precomputed SHA-256 key for the combination */
+		key: string;
+	};
 }
 
 export interface ILanguageModelToolConfirmationActionProducer {
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
index a17eb174f38..0728a528512 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
@@ -176,7 +176,7 @@ const languageModelToolSetsExtensionPoint = extensionsRegistry.ExtensionsRegistr
 					type: 'string'
 				},
 				icon: {
-					markdownDescription: localize('toolSetIcon', "An icon that represents this tool set, like `$(zap)`"),
+					markdownDescription: localize('toolSetIcon', "An icon that represents this tool set, like {0}", '`$(zap)`'),
 					type: 'string'
 				},
 				tools: {
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts
index 93be052e04b..318347b6be2 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts
@@ -330,6 +330,13 @@ export interface IToolConfirmationMessages {
 	confirmationNotNeededReason?: string | IMarkdownString;
 	/** Custom button labels to display instead of the default Allow/Skip buttons. */
 	customButtons?: string[];
+	/** When set, shows an additional approval option to approve this particular combination of tool and arguments */
+	approveCombination?: {
+		/** Human-readable label for the approval option */
+		label: string | IMarkdownString;
+		/** Precomputed SHA-256 key for the combination (set during tool preparation) */
+		key: string;
+	};
 }
 
 export interface IToolConfirmationAction {
@@ -365,6 +372,7 @@ export interface IPreparedToolInvocation {
 	originMessage?: string | IMarkdownString;
 	confirmationMessages?: IToolConfirmationMessages;
 	presentation?: ToolInvocationPresentation;
+	icon?: ThemeIcon;
 	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatModifiedFilesConfirmationData;
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts b/src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts
index 5236ff30add..e3f19edbf51 100644
--- a/src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts
+++ b/src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts
@@ -202,6 +202,10 @@ export class CodeBlockModelCollection extends Disposable {
 			}
 
 			newText = codeblockUri.textWithoutResult;
+		} else if (entry) {
+			entry.codemapperUri = undefined;
+			entry.isEdit = undefined;
+			entry.subAgentInvocationId = undefined;
 		}
 
 		if (content.isComplete) {
diff --git a/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.ts b/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.ts
index 16559339c6c..e581719063a 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.ts
@@ -11,6 +11,12 @@ import { ChatEntitlementContextKeys } from '../../../../services/chat/common/cha
 import { CHAT_CATEGORY } from '../../browser/actions/chatActions.js';
 import { ProductQualityContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IsSessionsWindowContext } from '../../../../common/contextkeys.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { isMacintosh, isWindows } from '../../../../../base/common/platform.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { Schemas } from '../../../../../base/common/network.js';
 
 export class OpenSessionsWindowAction extends Action2 {
 	constructor() {
@@ -24,7 +30,21 @@ export class OpenSessionsWindowAction extends Action2 {
 	}
 
 	async run(accessor: ServicesAccessor) {
-		const nativeHostService = accessor.get(INativeHostService);
-		await nativeHostService.openSessionsWindow();
+		const openerService = accessor.get(IOpenerService);
+		const productService = accessor.get(IProductService);
+		const environmentService = accessor.get(IWorkbenchEnvironmentService);
+
+		if (environmentService.isBuilt && (isMacintosh || isWindows)) {
+			const scheme = productService.quality === 'stable'
+				? 'vscode-sessions'
+				: productService.quality === 'exploration'
+					? 'vscode-sessions-exploration'
+					: 'vscode-sessions-insiders';
+
+			await openerService.open(URI.from({ scheme, authority: Schemas.file }), { openExternal: true });
+		} else {
+			const nativeHostService = accessor.get(INativeHostService);
+			await nativeHostService.openSessionsWindow();
+		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts b/src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts
index d59f63292d7..e1b59c7a695 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts
@@ -13,6 +13,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IWebContentExtractorService, WebContentExtractResult } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { detectEncodingFromBuffer } from '../../../../services/textfile/common/encoding.js';
 import { ITrustedDomainService } from '../../../url/browser/trustedDomainService.js';
 import { IChatService } from '../../common/chatService/chatService.js';
@@ -56,6 +57,7 @@ export class FetchWebPageTool implements IToolImpl {
 		@IFileService private readonly _fileService: IFileService,
 		@ITrustedDomainService private readonly _trustedDomainService: ITrustedDomainService,
 		@IChatService private readonly _chatService: IChatService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 	) { }
 
 	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
@@ -170,7 +172,15 @@ export class FetchWebPageTool implements IToolImpl {
 		}
 
 		const invalid = [...Array.from(invalidUris), ...additionalInvalidUrls];
-		const urlsNeedingConfirmation = new ResourceSet([...webUris.values(), ...validFileUris]);
+		// All valid URIs (web + file) for display in messages
+		const allFetchedUris = new ResourceSet([...webUris.values(), ...validFileUris]);
+		// File URIs that are inside the workspace don't need confirmation — they're already accessible
+		// and don't carry the web content risks (prompt injection, malicious redirects).
+		// File URIs outside the workspace are treated like web URIs and require confirmation.
+		const fileUrisOutsideWorkspace = validFileUris.filter(
+			uri => !this._workspaceContextService.getWorkspaceFolder(uri)
+		);
+		const urlsNeedingConfirmation = new ResourceSet([...webUris.values(), ...fileUrisOutsideWorkspace]);
 
 		const pastTenseMessage = invalid.length
 			? invalid.length > 1
@@ -178,7 +188,7 @@ export class FetchWebPageTool implements IToolImpl {
 				? new MarkdownString(
 					localize(
 						'fetchWebPage.pastTenseMessage.plural',
-						'Fetched {0} resources, but the following were invalid URLs:\n\n{1}\n\n', urlsNeedingConfirmation.size, invalid.map(url => `- ${url}`).join('\n')
+						'Fetched {0} resources, but the following were invalid URLs:\n\n{1}\n\n', allFetchedUris.size, invalid.map(url => `- ${url}`).join('\n')
 					))
 				// If there is only one invalid URL, show it
 				: new MarkdownString(
@@ -190,11 +200,11 @@ export class FetchWebPageTool implements IToolImpl {
 			: new MarkdownString();
 
 		const invocationMessage = new MarkdownString();
-		if (urlsNeedingConfirmation.size > 1) {
-			pastTenseMessage.appendMarkdown(localize('fetchWebPage.pastTenseMessageResult.plural', 'Fetched {0} resources', urlsNeedingConfirmation.size));
-			invocationMessage.appendMarkdown(localize('fetchWebPage.invocationMessage.plural', 'Fetching {0} resources', urlsNeedingConfirmation.size));
-		} else if (urlsNeedingConfirmation.size === 1) {
-			const url = Iterable.first(urlsNeedingConfirmation)!.toString(true);
+		if (allFetchedUris.size > 1) {
+			pastTenseMessage.appendMarkdown(localize('fetchWebPage.pastTenseMessageResult.plural', 'Fetched {0} resources', allFetchedUris.size));
+			invocationMessage.appendMarkdown(localize('fetchWebPage.invocationMessage.plural', 'Fetching {0} resources', allFetchedUris.size));
+		} else if (allFetchedUris.size === 1) {
+			const url = Iterable.first(allFetchedUris)!.toString(true);
 			// If the URL is too long or it's a file url, show it as a link... otherwise, show it as plain text
 			if (url.length > 400 || validFileUris.length === 1) {
 				pastTenseMessage.appendMarkdown(localize({
diff --git a/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts
index 8731979f149..76022ee3684 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts
@@ -4,30 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { AgentHostContribution } from '../browser/agentSessions/agentHost/agentHostChatContribution.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { resolve } from '../../../../base/common/path.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ipcRenderer } from '../../../../base/parts/sandbox/electron-browser/globals.js';
 import { localize } from '../../../../nls.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { ViewContainerLocation } from '../../../common/views.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ILifecycleService, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
 import { ACTION_ID_NEW_CHAT, CHAT_OPEN_ACTION_ID, IChatViewOpenOptions } from '../browser/actions/chatActions.js';
-import { ChatViewPaneTarget, IChatWidgetService } from '../browser/chat.js';
+import { ChatViewId, ChatViewPaneTarget, IChatWidgetService } from '../browser/chat.js';
+import { ChatEditorInput } from '../browser/widgetHosts/editor/chatEditorInput.js';
+import { ChatViewPane } from '../browser/widgetHosts/viewPane/chatViewPane.js';
 import { AgentSessionProviders } from '../browser/agentSessions/agentSessions.js';
 import { isSessionInProgressStatus } from '../browser/agentSessions/agentSessionsModel.js';
 import { IAgentSessionsService } from '../browser/agentSessions/agentSessionsService.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
 import { ChatContextKeys } from '../common/actions/chatContextKeys.js';
 import { ChatModeKind } from '../common/constants.js';
 import { IChatService } from '../common/chatService/chatService.js';
@@ -111,7 +119,9 @@ class ChatSuspendThrottlingHandler extends Disposable {
 
 	constructor(
 		@INativeHostService nativeHostService: INativeHostService,
-		@IChatService chatService: IChatService
+		@IChatService chatService: IChatService,
+		@IProductService productService: IProductService,
+		@ILogService logService: ILogService,
 	) {
 		super();
 
@@ -122,6 +132,10 @@ class ChatSuspendThrottlingHandler extends Disposable {
 			// throttling is not applied so that the chat session can continue
 			// even when the window is not in focus.
 			nativeHostService.setBackgroundThrottling(!running);
+
+			if (productService.quality === 'insider') { // TODO@bpasero remove me in the future
+				logService.info(`[ChatSuspendThrottlingHandler] background throttling ${running ? 'suspended' : 'resumed'}`);
+			}
 		}));
 	}
 }
@@ -138,6 +152,7 @@ class ChatLifecycleHandler extends Disposable {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IExtensionService extensionService: IExtensionService,
 		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
 	) {
 		super();
 
@@ -151,6 +166,10 @@ class ChatLifecycleHandler extends Disposable {
 	}
 
 	private hasNonCloudSessionInProgress(): boolean {
+		if (this.chatEntitlementService.sentiment.hidden) {
+			return false; // AI features are disabled
+		}
+
 		return this.agentSessionsService.model.sessions.some(session =>
 			isSessionInProgressStatus(session.status) &&
 			session.providerType !== AgentSessionProviders.Cloud &&
@@ -228,3 +247,31 @@ registerWorkbenchContribution2(NativeBuiltinToolsContribution.ID, NativeBuiltinT
 registerWorkbenchContribution2(ChatCommandLineHandler.ID, ChatCommandLineHandler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatSuspendThrottlingHandler.ID, ChatSuspendThrottlingHandler, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatLifecycleHandler.ID, ChatLifecycleHandler, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(AgentHostContribution.ID, AgentHostContribution, WorkbenchPhase.AfterRestored);
+
+// Register command for opening a new Agent Host session from the session type picker
+CommandsRegistry.registerCommand(
+	`workbench.action.chat.openNewChatSessionInPlace.${AgentSessionProviders.AgentHostCopilot}`,
+	async (accessor, chatSessionPosition: string) => {
+		const viewsService = accessor.get(IViewsService);
+		const resource = URI.from({
+			scheme: AgentSessionProviders.AgentHostCopilot,
+			path: `/untitled-${generateUuid()}`,
+		});
+
+		if (chatSessionPosition === 'editor') {
+			const editorService = accessor.get(IEditorService);
+			await editorService.openEditor({
+				resource,
+				options: {
+					override: ChatEditorInput.EditorID,
+					pinned: true,
+				},
+			});
+		} else {
+			const view = await viewsService.openView(ChatViewId) as ChatViewPane;
+			await view.loadSession(resource);
+			view.focus();
+		}
+	}
+);
diff --git a/src/vs/workbench/contrib/chat/test/browser/actions/chatExecuteActions.test.ts b/src/vs/workbench/contrib/chat/test/browser/actions/chatExecuteActions.test.ts
new file mode 100644
index 00000000000..3465f33300b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/actions/chatExecuteActions.test.ts
@@ -0,0 +1,320 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { constObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { CommandsRegistry } from '../../../../../../platform/commands/common/commands.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IChatWidget, IChatWidgetService } from '../../../browser/chat.js';
+import { GetHandoffsActionId, ExecuteHandoffActionId, registerChatExecuteActions } from '../../../browser/actions/chatExecuteActions.js';
+import { IChatMode, IChatModeService, ICustomAgentInfo } from '../../../common/chatModes.js';
+import { ChatModeKind } from '../../../common/constants.js';
+import { IHandOff } from '../../../common/promptSyntax/promptFileParser.js';
+import { Target } from '../../../common/promptSyntax/promptTypes.js';
+import { MockChatWidgetService } from '../widget/mockChatWidget.js';
+import { MockChatModeService } from '../../common/mockChatModeService.js';
+
+interface IExecuteHandoffResult {
+	success: boolean;
+	targetMode?: string;
+	error?: string;
+}
+
+// CommandsRegistry types all handlers as returning void, but our commands
+// return real values. This helper performs the double cast safely.
+function runCommand<T>(handler: Function, ...args: unknown[]): T {
+	return handler(...args) as unknown as T;
+}
+
+async function runCommandAsync<T>(handler: Function, ...args: unknown[]): Promise<T> {
+	return await handler(...args) as unknown as T;
+}
+
+function createMockMode(overrides: Partial<IChatMode> & { id: string; kind: ChatModeKind }): IChatMode {
+	return {
+		name: constObservable(overrides.id),
+		label: constObservable(overrides.id),
+		icon: constObservable(undefined),
+		description: constObservable(undefined),
+		isBuiltin: overrides.isBuiltin ?? false,
+		target: constObservable(Target.Undefined),
+		...overrides,
+	} as IChatMode;
+}
+
+// Register once at module level so disposables are created before suite tracking begins
+registerChatExecuteActions();
+
+suite('GetHandoffsAction', () => {
+	const store = new DisposableStore();
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		instantiationService = store.add(new TestInstantiationService());
+	});
+
+	teardown(() => {
+		store.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('should return all modes when no sourceCustomAgent is specified', () => {
+		const askMode = createMockMode({ id: 'ask', kind: ChatModeKind.Ask, isBuiltin: true });
+		const planMode = createMockMode({
+			id: 'plan',
+			kind: ChatModeKind.Agent,
+			handOffs: observableValue('handOffs', [
+				{ agent: 'implement', label: 'Start', prompt: 'go' } satisfies IHandOff,
+			]),
+		});
+
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [askMode], custom: [planMode] }));
+
+		const handler = CommandsRegistry.getCommand(GetHandoffsActionId)?.handler;
+		assert.ok(handler);
+
+		const result = runCommand<ICustomAgentInfo[]>(handler, instantiationService);
+		assert.strictEqual(result.length, 2);
+		assert.strictEqual(result[0].name, 'ask');
+		assert.strictEqual(result[0].handoffs.length, 0);
+		assert.strictEqual(result[1].name, 'plan');
+		assert.strictEqual(result[1].handoffs.length, 1);
+	});
+
+	test('should filter by sourceCustomAgent (case-insensitive)', () => {
+		const askMode = createMockMode({ id: 'ask', kind: ChatModeKind.Ask, isBuiltin: true });
+		const planMode = createMockMode({
+			id: 'plan',
+			kind: ChatModeKind.Agent,
+			handOffs: observableValue('handOffs', [
+				{ agent: 'implement', label: 'Start', prompt: 'go' } satisfies IHandOff,
+			]),
+		});
+
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [askMode], custom: [planMode] }));
+
+		const handler = CommandsRegistry.getCommand(GetHandoffsActionId)?.handler;
+		assert.ok(handler);
+
+		const result = runCommand<ICustomAgentInfo[]>(handler, instantiationService, { sourceCustomAgent: 'Plan' });
+		assert.deepStrictEqual(result.length, 1);
+		assert.strictEqual(result[0].name, 'plan');
+		assert.strictEqual(result[0].handoffs.length, 1);
+	});
+
+	test('should return empty array for non-matching sourceCustomAgent', () => {
+		const askMode = createMockMode({ id: 'ask', kind: ChatModeKind.Ask, isBuiltin: true });
+
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [askMode], custom: [] }));
+
+		const handler = CommandsRegistry.getCommand(GetHandoffsActionId)?.handler;
+		assert.ok(handler);
+
+		const result = runCommand<ICustomAgentInfo[]>(handler, instantiationService, { sourceCustomAgent: 'nonexistent' });
+		assert.deepStrictEqual(result, []);
+	});
+});
+
+suite('ExecuteHandoffAction', () => {
+	const store = new DisposableStore();
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		instantiationService = store.add(new TestInstantiationService());
+	});
+
+	teardown(() => {
+		store.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const testHandoffs: IHandOff[] = [
+		{ agent: 'implement', label: 'Start Implementation', prompt: 'Implement the plan', send: true },
+		{ agent: 'agent', label: 'Open in Editor', prompt: 'Open it' },
+	];
+
+	const planMode = createMockMode({
+		id: 'plan',
+		kind: ChatModeKind.Agent,
+		handOffs: observableValue('handOffs', testHandoffs),
+	});
+
+	function createMockWidget(currentMode: IChatMode): { widget: Partial<IChatWidget>; executeHandoffCalls: IHandOff[] } {
+		const executeHandoffCalls: IHandOff[] = [];
+		const widget: Partial<IChatWidget> = {
+			input: {
+				currentModeObs: constObservable(currentMode),
+			} as IChatWidget['input'],
+			executeHandoff: async (handoff: IHandOff) => {
+				executeHandoffCalls.push(handoff);
+			},
+		};
+		return { widget, executeHandoffCalls };
+	}
+
+	test('should return error when neither id nor label is provided', async () => {
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, {});
+		assert.deepStrictEqual(result, { success: false, error: 'Either id or label is required' });
+	});
+
+	test('should return error when no widget is found', async () => {
+		instantiationService.set(IChatWidgetService, new MockChatWidgetService());
+		instantiationService.set(IChatModeService, new MockChatModeService());
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, { id: 'implement:start-implementation' });
+		assert.strictEqual(result.success, false);
+		assert.ok(result.error?.includes('No chat widget found'));
+	});
+
+	test('should fall back to lastFocusedWidget when sessionResource is omitted', async () => {
+		const { widget, executeHandoffCalls } = createMockWidget(planMode);
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override readonly lastFocusedWidget = widget as IChatWidget;
+		};
+
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [], custom: [planMode] }));
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, { id: 'implement:start-implementation' });
+		assert.deepStrictEqual(result, { success: true, targetMode: 'implement' });
+		assert.strictEqual(executeHandoffCalls.length, 1);
+		assert.strictEqual(executeHandoffCalls[0].label, 'Start Implementation');
+	});
+
+	test('should resolve widget by sessionResource', async () => {
+		const { widget, executeHandoffCalls } = createMockWidget(planMode);
+		const sessionUri = URI.parse('test://session/1');
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override getWidgetBySessionResource(resource: URI) {
+				return resource.toString() === sessionUri.toString() ? widget as IChatWidget : undefined;
+			}
+		};
+
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [], custom: [planMode] }));
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, {
+			id: 'implement:start-implementation',
+			sessionResource: sessionUri.toString(),
+		});
+		assert.deepStrictEqual(result, { success: true, targetMode: 'implement' });
+		assert.strictEqual(executeHandoffCalls.length, 1);
+	});
+
+	test('should match by id (primary)', async () => {
+		const { widget, executeHandoffCalls } = createMockWidget(planMode);
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override readonly lastFocusedWidget = widget as IChatWidget;
+		};
+
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService());
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, { id: 'agent:open-in-editor' });
+		assert.deepStrictEqual(result, { success: true, targetMode: 'agent' });
+		assert.strictEqual(executeHandoffCalls[0].label, 'Open in Editor');
+	});
+
+	test('should fall back to label match when id is not provided', async () => {
+		const { widget, executeHandoffCalls } = createMockWidget(planMode);
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override readonly lastFocusedWidget = widget as IChatWidget;
+		};
+
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService());
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, { label: 'start implementation' });
+		assert.deepStrictEqual(result, { success: true, targetMode: 'implement' });
+		assert.strictEqual(executeHandoffCalls[0].prompt, 'Implement the plan');
+	});
+
+	test('should return error for non-matching identifier', async () => {
+		const { widget } = createMockWidget(planMode);
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override readonly lastFocusedWidget = widget as IChatWidget;
+		};
+
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService());
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, { id: 'nonexistent:thing' });
+		assert.strictEqual(result.success, false);
+		assert.ok(result.error?.includes('nonexistent:thing'));
+	});
+
+	test('should resolve sourceCustomAgent to look up handoffs from a different mode', async () => {
+		const askMode = createMockMode({ id: 'ask', kind: ChatModeKind.Ask, isBuiltin: true });
+		const { widget, executeHandoffCalls } = createMockWidget(askMode); // widget is in "ask" mode (no handoffs)
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override readonly lastFocusedWidget = widget as IChatWidget;
+		};
+
+		// The plan mode has handoffs; sourceCustomAgent overrides the widget's current mode
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [askMode], custom: [planMode] }));
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, {
+			id: 'implement:start-implementation',
+			sourceCustomAgent: 'plan',
+		});
+		assert.deepStrictEqual(result, { success: true, targetMode: 'implement' });
+		assert.strictEqual(executeHandoffCalls.length, 1);
+	});
+
+	test('should return error when source mode has no handoffs', async () => {
+		const askMode = createMockMode({ id: 'ask', kind: ChatModeKind.Ask, isBuiltin: true });
+		const { widget } = createMockWidget(askMode);
+
+		const mockWidgetService = new class extends MockChatWidgetService {
+			override readonly lastFocusedWidget = widget as IChatWidget;
+		};
+
+		instantiationService.set(IChatWidgetService, mockWidgetService);
+		instantiationService.set(IChatModeService, new MockChatModeService({ builtin: [askMode], custom: [] }));
+
+		const handler = CommandsRegistry.getCommand(ExecuteHandoffActionId)?.handler;
+		assert.ok(handler);
+
+		const result = await runCommandAsync<IExecuteHandoffResult>(handler, instantiationService, { id: 'implement:start-implementation' });
+		assert.strictEqual(result.success, false);
+		assert.ok(result.error?.includes('No handoffs available'));
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/actions/createPluginAction.test.ts b/src/vs/workbench/contrib/chat/test/browser/actions/createPluginAction.test.ts
new file mode 100644
index 00000000000..8bdbac583fb
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/actions/createPluginAction.test.ts
@@ -0,0 +1,618 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { FileService } from '../../../../../../platform/files/common/fileService.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { InMemoryFileSystemProvider } from '../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { PromptsType } from '../../../common/promptSyntax/promptTypes.js';
+import { IPromptPath, PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
+import { McpCollectionSortOrder, McpServerTransportType } from '../../../../mcp/common/mcpTypes.js';
+import {
+	validatePluginName,
+	getResourceLabel,
+	getResourceFileName,
+	serializeHookCommand,
+	serializeMcpLaunch,
+	writePluginToDisk,
+	updateMarketplaceIfNeeded,
+	type IResourceTreeItem,
+} from '../../../browser/actions/createPluginAction.js';
+
+function makePromptPath(overrides: Partial<IPromptPath> & { uri: URI; storage: PromptsStorage; type: PromptsType }): IPromptPath {
+	return overrides as IPromptPath;
+}
+
+function makeResourceItem(overrides: Partial<IResourceTreeItem> & Pick<IResourceTreeItem, 'label' | 'resourceType'>): IResourceTreeItem {
+	return { checked: false, ...overrides };
+}
+
+suite('CreatePluginAction helpers', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('validatePluginName', () => {
+
+		test('rejects empty name', () => {
+			assert.ok(validatePluginName(''));
+		});
+
+		test('accepts valid names', () => {
+			assert.deepStrictEqual(
+				['my-plugin', 'plugin1', 'a', 'code-reviewer', 'my.plugin', 'a1b2c3'].map(n => validatePluginName(n)),
+				[undefined, undefined, undefined, undefined, undefined, undefined]
+			);
+		});
+
+		test('rejects names with invalid characters', () => {
+			assert.ok(validatePluginName('My-Plugin'));
+			assert.ok(validatePluginName('my_plugin'));
+			assert.ok(validatePluginName('my plugin'));
+			assert.ok(validatePluginName('plugin!'));
+		});
+
+		test('rejects names not starting/ending with alphanumeric', () => {
+			assert.ok(validatePluginName('-plugin'));
+			assert.ok(validatePluginName('plugin-'));
+			assert.ok(validatePluginName('.plugin'));
+			assert.ok(validatePluginName('plugin.'));
+		});
+
+		test('rejects consecutive hyphens or periods', () => {
+			assert.ok(validatePluginName('my--plugin'));
+			assert.ok(validatePluginName('my..plugin'));
+		});
+
+		test('rejects names longer than 64 characters', () => {
+			assert.ok(validatePluginName('a'.repeat(65)));
+		});
+
+		test('accepts name with exactly 64 characters', () => {
+			assert.strictEqual(validatePluginName('a'.repeat(64)), undefined);
+		});
+	});
+
+	suite('getResourceLabel', () => {
+
+		test('returns name if set', () => {
+			const path = makePromptPath({
+				uri: URI.file('/foo/bar.instructions.md'),
+				storage: PromptsStorage.local,
+				type: PromptsType.instructions,
+				name: 'my-instructions',
+			});
+			assert.strictEqual(getResourceLabel(path), 'my-instructions');
+		});
+
+		test('returns basename for non-skill resources without name', () => {
+			const path = makePromptPath({
+				uri: URI.file('/foo/bar.instructions.md'),
+				storage: PromptsStorage.local,
+				type: PromptsType.instructions,
+			});
+			assert.strictEqual(getResourceLabel(path), 'bar.instructions.md');
+		});
+
+		test('returns parent directory name for skills pointing to SKILL.md', () => {
+			const path = makePromptPath({
+				uri: URI.file('/workspace/.github/skills/my-skill/SKILL.md'),
+				storage: PromptsStorage.local,
+				type: PromptsType.skill,
+			});
+			assert.strictEqual(getResourceLabel(path), 'my-skill');
+		});
+
+		test('returns basename for skill not named SKILL.md', () => {
+			const path = makePromptPath({
+				uri: URI.file('/workspace/.github/skills/custom.md'),
+				storage: PromptsStorage.local,
+				type: PromptsType.skill,
+			});
+			assert.strictEqual(getResourceLabel(path), 'custom.md');
+		});
+	});
+
+	suite('getResourceFileName', () => {
+
+		test('strips namespace prefix', () => {
+			const path = makePromptPath({
+				uri: URI.file('/foo/SKILL.md'),
+				storage: PromptsStorage.plugin,
+				type: PromptsType.skill,
+				name: 'hookify:writing-rules',
+			});
+			assert.strictEqual(getResourceFileName(path), 'writing-rules');
+		});
+
+		test('returns full name when no prefix', () => {
+			const path = makePromptPath({
+				uri: URI.file('/foo/my-skill/SKILL.md'),
+				storage: PromptsStorage.local,
+				type: PromptsType.skill,
+			});
+			assert.strictEqual(getResourceFileName(path), 'my-skill');
+		});
+
+		test('handles names with multiple colons', () => {
+			const path = makePromptPath({
+				uri: URI.file('/foo/bar.md'),
+				storage: PromptsStorage.plugin,
+				type: PromptsType.agent,
+				name: 'ns:sub:name',
+			});
+			assert.strictEqual(getResourceFileName(path), 'sub:name');
+		});
+	});
+
+	suite('serializeHookCommand', () => {
+
+		test('serializes basic command', () => {
+			assert.deepStrictEqual(serializeHookCommand({ type: 'command', command: 'echo hello' }), {
+				type: 'command',
+				command: 'echo hello',
+			});
+		});
+
+		test('serializes platform-specific commands', () => {
+			assert.deepStrictEqual(
+				serializeHookCommand({
+					type: 'command',
+					command: 'echo hello',
+					windows: 'echo.exe hello',
+					linux: '/bin/echo hello',
+					osx: '/bin/echo hello',
+				}),
+				{
+					type: 'command',
+					command: 'echo hello',
+					windows: 'echo.exe hello',
+					linux: '/bin/echo hello',
+					osx: '/bin/echo hello',
+				}
+			);
+		});
+
+		test('includes env and timeout when present', () => {
+			assert.deepStrictEqual(
+				serializeHookCommand({
+					type: 'command',
+					command: 'test',
+					env: { FOO: 'bar' },
+					timeout: 5000,
+				}),
+				{
+					type: 'command',
+					command: 'test',
+					env: { FOO: 'bar' },
+					timeout: 5000,
+				}
+			);
+		});
+
+		test('omits empty env', () => {
+			const result = serializeHookCommand({ type: 'command', command: 'test', env: {} });
+			assert.strictEqual(result['env'], undefined);
+		});
+
+		test('converts URI-like cwd to string', () => {
+			const cwd = URI.file('/workspace');
+			const result = serializeHookCommand({ type: 'command', command: 'test', cwd });
+			assert.strictEqual(typeof result['cwd'], 'string');
+		});
+
+		test('preserves timeout of 0', () => {
+			const result = serializeHookCommand({ type: 'command', command: 'test', timeout: 0 });
+			assert.strictEqual(result['timeout'], 0);
+		});
+	});
+
+	suite('serializeMcpLaunch', () => {
+
+		test('serializes stdio launch', () => {
+			assert.deepStrictEqual(
+				serializeMcpLaunch({
+					type: McpServerTransportType.Stdio,
+					command: 'node',
+					args: ['server.js'],
+					cwd: '/workspace',
+					env: { NODE_ENV: 'production' },
+					envFile: undefined,
+					sandbox: undefined,
+				}),
+				{
+					type: 'stdio',
+					command: 'node',
+					args: ['server.js'],
+					cwd: '/workspace',
+					env: { NODE_ENV: 'production' },
+				}
+			);
+		});
+
+		test('omits empty args and env for stdio', () => {
+			assert.deepStrictEqual(
+				serializeMcpLaunch({
+					type: McpServerTransportType.Stdio,
+					command: 'server',
+					args: [],
+					cwd: undefined,
+					env: {},
+					envFile: undefined,
+					sandbox: undefined,
+				}),
+				{
+					type: 'stdio',
+					command: 'server',
+				}
+			);
+		});
+
+		test('serializes http launch', () => {
+			assert.deepStrictEqual(
+				serializeMcpLaunch({
+					type: McpServerTransportType.HTTP,
+					uri: URI.parse('http://localhost:3000'),
+					headers: [['Authorization', 'Bearer token']],
+				}),
+				{
+					type: 'http',
+					url: 'http://localhost:3000/',
+					headers: { Authorization: 'Bearer token' },
+				}
+			);
+		});
+
+		test('omits empty headers for http', () => {
+			assert.deepStrictEqual(
+				serializeMcpLaunch({
+					type: McpServerTransportType.HTTP,
+					uri: URI.parse('http://localhost:3000'),
+					headers: [],
+				}),
+				{
+					type: 'http',
+					url: 'http://localhost:3000/',
+				}
+			);
+		});
+	});
+});
+
+suite('writePluginToDisk', () => {
+
+	const disposables = new DisposableStore();
+	let fileService: IFileService;
+	const root = URI.from({ scheme: Schemas.inMemory, path: '/test' });
+
+	setup(() => {
+		const service = disposables.add(new FileService(new NullLogService()));
+		const provider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(service.registerProvider(Schemas.inMemory, provider));
+		fileService = service;
+	});
+
+	teardown(() => {
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	async function readJson(uri: URI): Promise<Record<string, unknown>> {
+		const content = await fileService.readFile(uri);
+		return JSON.parse(content.value.toString());
+	}
+
+	test('creates manifest with correct structure', async () => {
+		const pluginRoot = URI.joinPath(root, 'my-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'my-plugin', []);
+
+		assert.deepStrictEqual(await readJson(URI.joinPath(pluginRoot, '.plugin', 'plugin.json')), {
+			name: 'my-plugin',
+			version: '1.0.0',
+			description: '',
+		});
+	});
+
+	test('copies instructions to rules/', async () => {
+		const sourceUri = URI.joinPath(root, 'source', 'coding.instructions.md');
+		await fileService.writeFile(sourceUri, VSBuffer.fromString('# My coding rules'));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'coding',
+				resourceType: 'instruction',
+				promptPath: makePromptPath({
+					uri: sourceUri,
+					storage: PromptsStorage.local,
+					type: PromptsType.instructions,
+					name: 'coding',
+				}),
+			}),
+		]);
+
+		const content = await fileService.readFile(URI.joinPath(pluginRoot, 'rules', 'coding.instructions.md'));
+		assert.strictEqual(content.value.toString(), '# My coding rules');
+	});
+
+	test('preserves .mdc suffix for rule files', async () => {
+		const sourceUri = URI.joinPath(root, 'source', 'prefer-const.mdc');
+		await fileService.writeFile(sourceUri, VSBuffer.fromString('prefer const'));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'prefer-const.mdc',
+				resourceType: 'instruction',
+				promptPath: makePromptPath({
+					uri: sourceUri,
+					storage: PromptsStorage.local,
+					type: PromptsType.instructions,
+					name: 'prefer-const.mdc',
+				}),
+			}),
+		]);
+
+		const content = await fileService.readFile(URI.joinPath(pluginRoot, 'rules', 'prefer-const.mdc'));
+		assert.strictEqual(content.value.toString(), 'prefer const');
+	});
+
+	test('copies prompts to commands/', async () => {
+		const sourceUri = URI.joinPath(root, 'source', 'review.prompt.md');
+		await fileService.writeFile(sourceUri, VSBuffer.fromString('Review this code'));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'review',
+				resourceType: 'prompt',
+				promptPath: makePromptPath({
+					uri: sourceUri,
+					storage: PromptsStorage.local,
+					type: PromptsType.prompt,
+					name: 'review',
+				}),
+			}),
+		]);
+
+		const content = await fileService.readFile(URI.joinPath(pluginRoot, 'commands', 'review.md'));
+		assert.strictEqual(content.value.toString(), 'Review this code');
+	});
+
+	test('copies agents to agents/', async () => {
+		const sourceUri = URI.joinPath(root, 'source', 'reviewer.agent.md');
+		await fileService.writeFile(sourceUri, VSBuffer.fromString('---\nname: reviewer\n---\nYou review code.'));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'reviewer',
+				resourceType: 'agent',
+				promptPath: makePromptPath({
+					uri: sourceUri,
+					storage: PromptsStorage.local,
+					type: PromptsType.agent,
+					name: 'reviewer',
+				}),
+			}),
+		]);
+
+		const content = await fileService.readFile(URI.joinPath(pluginRoot, 'agents', 'reviewer.md'));
+		assert.strictEqual(content.value.toString(), '---\nname: reviewer\n---\nYou review code.');
+	});
+
+	test('copies skill directories recursively', async () => {
+		const skillDir = URI.joinPath(root, 'source', 'skills', 'my-skill');
+		await fileService.writeFile(URI.joinPath(skillDir, 'SKILL.md'), VSBuffer.fromString('# My Skill'));
+		await fileService.writeFile(URI.joinPath(skillDir, 'helper.md'), VSBuffer.fromString('helper content'));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'my-skill',
+				resourceType: 'skill',
+				promptPath: makePromptPath({
+					uri: URI.joinPath(skillDir, 'SKILL.md'),
+					storage: PromptsStorage.local,
+					type: PromptsType.skill,
+				}),
+			}),
+		]);
+
+		const skillMd = await fileService.readFile(URI.joinPath(pluginRoot, 'skills', 'my-skill', 'SKILL.md'));
+		assert.strictEqual(skillMd.value.toString(), '# My Skill');
+		const helperMd = await fileService.readFile(URI.joinPath(pluginRoot, 'skills', 'my-skill', 'helper.md'));
+		assert.strictEqual(helperMd.value.toString(), 'helper content');
+	});
+
+	test('merges hooks into hooks/hooks.json', async () => {
+		const hooksUri = URI.joinPath(root, 'source', 'hooks.json');
+		await fileService.writeFile(hooksUri, VSBuffer.fromString(JSON.stringify({
+			hooks: {
+				SessionStart: [{ type: 'command', command: 'echo start' }],
+				PreToolUse: [{ type: 'command', command: 'echo pre' }],
+			}
+		})));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'hooks',
+				resourceType: 'hook',
+				promptPath: makePromptPath({
+					uri: hooksUri,
+					storage: PromptsStorage.local,
+					type: PromptsType.hook,
+				}),
+			}),
+		]);
+
+		assert.deepStrictEqual(await readJson(URI.joinPath(pluginRoot, 'hooks', 'hooks.json')), {
+			hooks: {
+				SessionStart: [{ type: 'command', command: 'echo start' }],
+				PreToolUse: [{ type: 'command', command: 'echo pre' }],
+			}
+		});
+	});
+
+	test('exports MCP servers to .mcp.json', async () => {
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'my-server',
+				resourceType: 'mcp',
+				mcpServer: {
+					collection: {
+						id: 'col1',
+						label: 'Test Collection',
+						presentation: { order: McpCollectionSortOrder.User },
+					} as IResourceTreeItem['mcpServer'] extends undefined ? never : NonNullable<IResourceTreeItem['mcpServer']>['collection'],
+					definition: {
+						id: 'def1',
+						label: 'my-server',
+						launch: {
+							type: McpServerTransportType.Stdio,
+							command: 'npx',
+							args: ['-y', 'my-mcp-server'],
+							cwd: undefined,
+							env: {},
+							envFile: undefined,
+							sandbox: undefined,
+						},
+						cacheNonce: '1',
+					} as IResourceTreeItem['mcpServer'] extends undefined ? never : NonNullable<IResourceTreeItem['mcpServer']>['definition'],
+				},
+			}),
+		]);
+
+		assert.deepStrictEqual(await readJson(URI.joinPath(pluginRoot, '.mcp.json')), {
+			mcpServers: {
+				'my-server': {
+					type: 'stdio',
+					command: 'npx',
+					args: ['-y', 'my-mcp-server'],
+				}
+			}
+		});
+	});
+
+	test('strips namespace prefix from plugin resource names', async () => {
+		const sourceUri = URI.joinPath(root, 'source', 'rules.instructions.md');
+		await fileService.writeFile(sourceUri, VSBuffer.fromString('content'));
+
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', [
+			makeResourceItem({
+				label: 'hookify:writing-rules',
+				resourceType: 'instruction',
+				promptPath: makePromptPath({
+					uri: sourceUri,
+					storage: PromptsStorage.plugin,
+					type: PromptsType.instructions,
+					name: 'hookify:writing-rules',
+				}),
+			}),
+		]);
+
+		const content = await fileService.readFile(URI.joinPath(pluginRoot, 'rules', 'writing-rules.instructions.md'));
+		assert.strictEqual(content.value.toString(), 'content');
+	});
+
+	test('does not create directories for empty resource types', async () => {
+		const pluginRoot = URI.joinPath(root, 'test-plugin');
+		await writePluginToDisk(fileService, pluginRoot, 'test-plugin', []);
+
+		assert.ok(await fileService.exists(URI.joinPath(pluginRoot, '.plugin', 'plugin.json')));
+		assert.ok(!(await fileService.exists(URI.joinPath(pluginRoot, 'rules'))));
+		assert.ok(!(await fileService.exists(URI.joinPath(pluginRoot, 'commands'))));
+		assert.ok(!(await fileService.exists(URI.joinPath(pluginRoot, 'agents'))));
+		assert.ok(!(await fileService.exists(URI.joinPath(pluginRoot, 'skills'))));
+		assert.ok(!(await fileService.exists(URI.joinPath(pluginRoot, 'hooks'))));
+		assert.ok(!(await fileService.exists(URI.joinPath(pluginRoot, '.mcp.json'))));
+	});
+});
+
+suite('updateMarketplaceIfNeeded', () => {
+
+	const disposables = new DisposableStore();
+	let fileService: IFileService;
+	const root = URI.from({ scheme: Schemas.inMemory, path: '/marketplace-test' });
+
+	setup(() => {
+		const service = disposables.add(new FileService(new NullLogService()));
+		const provider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(service.registerProvider(Schemas.inMemory, provider));
+		fileService = service;
+	});
+
+	teardown(() => {
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('adds plugin to existing marketplace.json', async () => {
+		const marketplace = { name: 'my-marketplace', plugins: [{ name: 'existing', source: './existing/' }] };
+		await fileService.writeFile(URI.joinPath(root, 'marketplace.json'), VSBuffer.fromString(JSON.stringify(marketplace)));
+
+		await updateMarketplaceIfNeeded(fileService, root, 'new-plugin');
+
+		const content = await fileService.readFile(URI.joinPath(root, 'marketplace.json'));
+		const result = JSON.parse(content.value.toString());
+		assert.deepStrictEqual(result.plugins, [
+			{ name: 'existing', source: './existing/' },
+			{ name: 'new-plugin', source: './new-plugin/' },
+		]);
+	});
+
+	test('creates plugins array if missing', async () => {
+		await fileService.writeFile(URI.joinPath(root, 'marketplace.json'), VSBuffer.fromString(JSON.stringify({ name: 'test' })));
+
+		await updateMarketplaceIfNeeded(fileService, root, 'my-plugin');
+
+		const content = await fileService.readFile(URI.joinPath(root, 'marketplace.json'));
+		const result = JSON.parse(content.value.toString());
+		assert.deepStrictEqual(result.plugins, [
+			{ name: 'my-plugin', source: './my-plugin/' },
+		]);
+	});
+
+	test('detects .plugin/marketplace.json', async () => {
+		const marketplace = { name: 'test', plugins: [] };
+		await fileService.writeFile(URI.joinPath(root, '.plugin', 'marketplace.json'), VSBuffer.fromString(JSON.stringify(marketplace)));
+
+		await updateMarketplaceIfNeeded(fileService, root, 'my-plugin');
+
+		const content = await fileService.readFile(URI.joinPath(root, '.plugin', 'marketplace.json'));
+		const result = JSON.parse(content.value.toString());
+		assert.deepStrictEqual(result.plugins, [
+			{ name: 'my-plugin', source: './my-plugin/' },
+		]);
+	});
+
+	test('does nothing when no marketplace.json exists', async () => {
+		await updateMarketplaceIfNeeded(fileService, root, 'my-plugin');
+		assert.ok(!(await fileService.exists(URI.joinPath(root, 'marketplace.json'))));
+	});
+
+	test('does not duplicate existing plugin entry', async () => {
+		const marketplace = { name: 'test', plugins: [{ name: 'my-plugin', source: './my-plugin/' }] };
+		await fileService.writeFile(URI.joinPath(root, 'marketplace.json'), VSBuffer.fromString(JSON.stringify(marketplace)));
+
+		await updateMarketplaceIfNeeded(fileService, root, 'my-plugin');
+
+		const content = await fileService.readFile(URI.joinPath(root, 'marketplace.json'));
+		const result = JSON.parse(content.value.toString());
+		assert.deepStrictEqual(result.plugins, [
+			{ name: 'my-plugin', source: './my-plugin/' },
+		]);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostAuth.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostAuth.test.ts
new file mode 100644
index 00000000000..464eb0d8095
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostAuth.test.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IAuthenticationService } from '../../../../../services/authentication/common/authentication.js';
+import { resolveTokenForResource } from '../../../browser/agentSessions/agentHost/agentHostAuth.js';
+
+function createMockAuthService(overrides: {
+	getOrActivateProviderIdForServer?: (serverUri: URI, resourceUri: URI) => Promise<string | undefined>;
+	getSessions?: (providerId: string, scopes: string[] | undefined, options: any, activate: boolean) => Promise<readonly { scopes: string[]; accessToken: string }[]>;
+}): IAuthenticationService {
+	return {
+		getOrActivateProviderIdForServer: overrides.getOrActivateProviderIdForServer ?? (() => Promise.resolve(undefined)),
+		getSessions: overrides.getSessions ?? (() => Promise.resolve([])),
+	} as unknown as IAuthenticationService;
+}
+
+suite('resolveTokenForResource', () => {
+
+	const log = new NullLogService();
+	const resource = URI.parse('https://api.example.com');
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('returns undefined when no authorization servers provided', async () => {
+		const authService = createMockAuthService({});
+		const token = await resolveTokenForResource(resource, [], ['read'], authService, log, 'test');
+		assert.strictEqual(token, undefined);
+	});
+
+	test('returns undefined when no provider matches the server', async () => {
+		const authService = createMockAuthService({
+			getOrActivateProviderIdForServer: () => Promise.resolve(undefined),
+		});
+		const token = await resolveTokenForResource(resource, ['https://auth.example.com'], ['read'], authService, log, 'test');
+		assert.strictEqual(token, undefined);
+	});
+
+	test('returns token from exact scope match', async () => {
+		const authService = createMockAuthService({
+			getOrActivateProviderIdForServer: () => Promise.resolve('provider-1'),
+			getSessions: (_providerId, scopes) => {
+				if (scopes && scopes.length === 1 && scopes[0] === 'read') {
+					return Promise.resolve([{ scopes: ['read'], accessToken: 'exact-token' }]);
+				}
+				return Promise.resolve([]);
+			},
+		});
+		const token = await resolveTokenForResource(resource, ['https://auth.example.com'], ['read'], authService, log, 'test');
+		assert.strictEqual(token, 'exact-token');
+	});
+
+	test('falls back to narrowest superset session when exact match fails', async () => {
+		const authService = createMockAuthService({
+			getOrActivateProviderIdForServer: () => Promise.resolve('provider-1'),
+			getSessions: (_providerId, scopes) => {
+				if (scopes !== undefined) {
+					// Exact match returns empty
+					return Promise.resolve([]);
+				}
+				// All sessions — return two superset options
+				return Promise.resolve([
+					{ scopes: ['read', 'write', 'admin'], accessToken: 'wide-token' },
+					{ scopes: ['read', 'write'], accessToken: 'narrow-token' },
+				]);
+			},
+		});
+		const token = await resolveTokenForResource(resource, ['https://auth.example.com'], ['read'], authService, log, 'test');
+		assert.strictEqual(token, 'narrow-token');
+	});
+
+	test('returns undefined when no session has matching scopes', async () => {
+		const authService = createMockAuthService({
+			getOrActivateProviderIdForServer: () => Promise.resolve('provider-1'),
+			getSessions: (_providerId, scopes) => {
+				if (scopes !== undefined) {
+					return Promise.resolve([]);
+				}
+				// No session contains the 'read' scope
+				return Promise.resolve([
+					{ scopes: ['write'], accessToken: 'wrong-token' },
+				]);
+			},
+		});
+		const token = await resolveTokenForResource(resource, ['https://auth.example.com'], ['read'], authService, log, 'test');
+		assert.strictEqual(token, undefined);
+	});
+
+	test('tries multiple authorization servers in order', async () => {
+		const calls: string[] = [];
+		const authService = createMockAuthService({
+			getOrActivateProviderIdForServer: (serverUri) => {
+				calls.push(serverUri.toString());
+				if (serverUri.toString() === 'https://auth2.example.com/') {
+					return Promise.resolve('provider-2');
+				}
+				return Promise.resolve(undefined);
+			},
+			getSessions: () => Promise.resolve([{ scopes: ['read'], accessToken: 'server2-token' }]),
+		});
+		const token = await resolveTokenForResource(
+			resource,
+			['https://auth1.example.com', 'https://auth2.example.com'],
+			['read'], authService, log, 'test',
+		);
+		assert.strictEqual(token, 'server2-token');
+		assert.strictEqual(calls.length, 2);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostChatContribution.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostChatContribution.test.ts
new file mode 100644
index 00000000000..ed53e2ac21a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostChatContribution.test.ts
@@ -0,0 +1,1651 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { mock, upcastPartial } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { timeout } from '../../../../../../base/common/async.js';
+import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IAgentCreateSessionConfig, IAgentHostService, IAgentSessionMetadata, AgentSession } from '../../../../../../platform/agentHost/common/agentService.js';
+import type { IActionEnvelope, INotification, ISessionAction, IToolCallConfirmedAction, ITurnStartedAction } from '../../../../../../platform/agentHost/common/state/sessionActions.js';
+import type { IStateSnapshot } from '../../../../../../platform/agentHost/common/state/sessionProtocol.js';
+import { SessionLifecycle, SessionStatus, TurnState, createSessionState, ROOT_STATE_URI, PolicyState, ResponsePartKind, type ISessionState, type ISessionSummary } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { IDefaultAccountService } from '../../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IAuthenticationService } from '../../../../../services/authentication/common/authentication.js';
+import { IChatAgentData, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+import { IChatMarkdownContent, IChatProgress, IChatTerminalToolInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService/chatService.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { ILanguageModelsService } from '../../../common/languageModels.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IOutputService } from '../../../../../services/output/common/output.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
+import { AgentHostContribution, AgentHostSessionListController, AgentHostSessionHandler } from '../../../browser/agentSessions/agentHost/agentHostChatContribution.js';
+import { AgentHostLanguageModelProvider } from '../../../browser/agentSessions/agentHost/agentHostLanguageModelProvider.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { TestFileService } from '../../../../../test/common/workbenchTestServices.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { MockLabelService } from '../../../../../services/label/test/common/mockLabelService.js';
+
+// ---- Mock agent host service ------------------------------------------------
+
+class MockAgentHostService extends mock<IAgentHostService>() {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidAction = new Emitter<IActionEnvelope>();
+	override readonly onDidAction = this._onDidAction.event;
+	private readonly _onDidNotification = new Emitter<INotification>();
+	override readonly onDidNotification = this._onDidNotification.event;
+	override readonly onAgentHostExit = Event.None;
+	override readonly onAgentHostStart = Event.None;
+
+	private _nextId = 1;
+	private readonly _sessions = new Map<string, IAgentSessionMetadata>();
+	public createSessionCalls: IAgentCreateSessionConfig[] = [];
+	public agents = [{ provider: 'copilot' as const, displayName: 'Agent Host - Copilot', description: 'test', requiresAuth: true }];
+
+	override async listSessions(): Promise<IAgentSessionMetadata[]> {
+		return [...this._sessions.values()];
+	}
+
+	override async listAgents() {
+		return this.agents;
+	}
+
+	override async refreshModels(): Promise<void> { }
+
+	override async createSession(config?: IAgentCreateSessionConfig): Promise<URI> {
+		if (config) {
+			this.createSessionCalls.push(config);
+		}
+		const id = `sdk-session-${this._nextId++}`;
+		const session = AgentSession.uri('copilot', id);
+		this._sessions.set(id, { session, startTime: Date.now(), modifiedTime: Date.now() });
+		return session;
+	}
+
+	override async disposeSession(_session: URI): Promise<void> { }
+	override async shutdown(): Promise<void> { }
+	override async restartAgentHost(): Promise<void> { }
+
+	// Protocol methods
+	public override readonly clientId = 'test-window-1';
+	public dispatchedActions: { action: ISessionAction; clientId: string; clientSeq: number }[] = [];
+	public sessionStates = new Map<string, ISessionState>();
+	override async subscribe(resource: URI): Promise<IStateSnapshot> {
+		const resourceStr = resource.toString();
+		const existingState = this.sessionStates.get(resourceStr);
+		if (existingState) {
+			return { resource: resourceStr, state: existingState, fromSeq: 0 };
+		}
+		// Root state subscription
+		if (resourceStr === ROOT_STATE_URI) {
+			return {
+				resource: resourceStr,
+				state: {
+					agents: this.agents.map(a => ({ provider: a.provider, displayName: a.displayName, description: a.description, models: [] })),
+					activeSessions: 0
+				},
+				fromSeq: 0,
+			};
+		}
+		const summary: ISessionSummary = {
+			resource: resourceStr,
+			provider: 'copilot',
+			title: 'Test',
+			status: SessionStatus.Idle,
+			createdAt: Date.now(),
+			modifiedAt: Date.now(),
+		};
+		return {
+			resource: resourceStr,
+			state: { ...createSessionState(summary), lifecycle: SessionLifecycle.Ready },
+			fromSeq: 0,
+		};
+	}
+	override unsubscribe(_resource: URI): void { }
+	override dispatchAction(action: ISessionAction, clientId: string, clientSeq: number): void {
+		this.dispatchedActions.push({ action, clientId, clientSeq });
+	}
+
+	// Test helpers
+	fireAction(envelope: IActionEnvelope): void {
+		this._onDidAction.fire(envelope);
+	}
+
+	addSession(meta: IAgentSessionMetadata): void {
+		this._sessions.set(AgentSession.id(meta.session), meta);
+	}
+
+	dispose(): void {
+		this._onDidAction.dispose();
+		this._onDidNotification.dispose();
+	}
+}
+
+// ---- Minimal service mocks --------------------------------------------------
+
+class MockChatAgentService extends mock<IChatAgentService>() {
+	declare readonly _serviceBrand: undefined;
+
+	registeredAgents = new Map<string, { data: IChatAgentData; impl: IChatAgentImplementation }>();
+
+	override registerDynamicAgent(data: IChatAgentData, agentImpl: IChatAgentImplementation) {
+		this.registeredAgents.set(data.id, { data, impl: agentImpl });
+		return toDisposable(() => this.registeredAgents.delete(data.id));
+	}
+}
+
+// ---- Helpers ----------------------------------------------------------------
+
+function createTestServices(disposables: DisposableStore) {
+	const instantiationService = disposables.add(new TestInstantiationService());
+
+	const agentHostService = new MockAgentHostService();
+	disposables.add(toDisposable(() => agentHostService.dispose()));
+
+	const chatAgentService = new MockChatAgentService();
+
+	instantiationService.stub(IAgentHostService, agentHostService);
+	instantiationService.stub(ILogService, new NullLogService());
+	instantiationService.stub(IProductService, { quality: 'insider' });
+	instantiationService.stub(IChatAgentService, chatAgentService);
+	instantiationService.stub(IFileService, TestFileService);
+	instantiationService.stub(ILabelService, MockLabelService);
+	instantiationService.stub(IChatSessionsService, {
+		registerChatSessionItemController: () => toDisposable(() => { }),
+		registerChatSessionContentProvider: () => toDisposable(() => { }),
+		registerChatSessionContribution: () => toDisposable(() => { }),
+	});
+	instantiationService.stub(IDefaultAccountService, { onDidChangeDefaultAccount: Event.None, getDefaultAccount: async () => null });
+	instantiationService.stub(IAuthenticationService, { onDidChangeSessions: Event.None });
+	instantiationService.stub(ILanguageModelsService, {
+		deltaLanguageModelChatProviderDescriptors: () => { },
+		registerLanguageModelProvider: () => toDisposable(() => { }),
+	});
+	instantiationService.stub(IConfigurationService, { getValue: () => true });
+	instantiationService.stub(IOutputService, { getChannel: () => undefined });
+	instantiationService.stub(IWorkspaceContextService, { getWorkspace: () => ({ id: '', folders: [] }), getWorkspaceFolder: () => null });
+
+	return { instantiationService, agentHostService, chatAgentService };
+}
+
+function createContribution(disposables: DisposableStore) {
+	const { instantiationService, agentHostService, chatAgentService } = createTestServices(disposables);
+
+	const listController = disposables.add(instantiationService.createInstance(AgentHostSessionListController, 'agent-host-copilot', 'copilot', agentHostService, undefined));
+	const sessionHandler = disposables.add(instantiationService.createInstance(AgentHostSessionHandler, {
+		provider: 'copilot' as const,
+		agentId: 'agent-host-copilot',
+		sessionType: 'agent-host-copilot',
+		fullName: 'Agent Host - Copilot',
+		description: 'Copilot SDK agent running in a dedicated process',
+		connection: agentHostService,
+		connectionAuthority: 'local',
+	}));
+	const contribution = disposables.add(instantiationService.createInstance(AgentHostContribution));
+
+	return { contribution, listController, sessionHandler, agentHostService, chatAgentService };
+}
+
+function makeRequest(overrides: Partial<{ message: string; sessionResource: URI; variables: IChatAgentRequest['variables']; userSelectedModelId: string }> = {}): IChatAgentRequest {
+	return upcastPartial<IChatAgentRequest>({
+		sessionResource: overrides.sessionResource ?? URI.from({ scheme: 'untitled', path: '/chat-1' }),
+		requestId: 'req-1',
+		agentId: 'agent-host-copilot',
+		message: overrides.message ?? 'Hello',
+		variables: overrides.variables ?? { variables: [] },
+		location: ChatAgentLocation.Chat,
+		userSelectedModelId: overrides.userSelectedModelId,
+	});
+}
+
+/** Extract the text value from a string or IMarkdownString. */
+function textOf(value: string | IMarkdownString | undefined): string | undefined {
+	if (value === undefined) {
+		return undefined;
+	}
+	return typeof value === 'string' ? value : value.value;
+}
+
+/**
+ * Start a turn through the state-driven flow. Creates a chat session,
+ * starts the requestHandler (non-blocking), and waits for the first action
+ * to be dispatched. Returns helpers to fire server action envelopes.
+ */
+async function startTurn(
+	sessionHandler: AgentHostSessionHandler,
+	agentHostService: MockAgentHostService,
+	ds: DisposableStore,
+	overrides?: Partial<{
+		message: string;
+		sessionResource: URI;
+		variables: IChatAgentRequest['variables'];
+		userSelectedModelId: string;
+		cancellationToken: CancellationToken;
+	}>,
+) {
+	const sessionResource = overrides?.sessionResource ?? URI.from({ scheme: 'agent-host-copilot', path: '/untitled-turntest' });
+	const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+	ds.add(toDisposable(() => chatSession.dispose()));
+
+	const collected: IChatProgress[][] = [];
+	const seq = { v: 1 };
+
+	const turnPromise = chatSession.requestHandler!(
+		makeRequest({
+			message: overrides?.message ?? 'Hello',
+			sessionResource,
+			variables: overrides?.variables,
+			userSelectedModelId: overrides?.userSelectedModelId,
+		}),
+		(parts) => collected.push(parts),
+		[],
+		overrides?.cancellationToken ?? CancellationToken.None,
+	);
+
+	await timeout(10);
+
+	const lastDispatch = agentHostService.dispatchedActions[agentHostService.dispatchedActions.length - 1];
+	const session = (lastDispatch?.action as ITurnStartedAction)?.session;
+	const turnId = (lastDispatch?.action as ITurnStartedAction)?.turnId;
+
+	const fire = (action: ISessionAction) => {
+		agentHostService.fireAction({ action, serverSeq: seq.v++, origin: undefined });
+	};
+
+	// Echo the turnStarted action to clear the pending write-ahead entry.
+	// Without this, the optimistic state replay would re-add activeTurn after
+	// the server's turnComplete clears it, preventing the turn from finishing.
+	if (lastDispatch) {
+		agentHostService.fireAction({
+			action: lastDispatch.action,
+			serverSeq: seq.v++,
+			origin: { clientId: agentHostService.clientId, clientSeq: lastDispatch.clientSeq },
+		});
+	}
+
+	return { turnPromise, collected, chatSession, session, turnId, fire };
+}
+
+suite('AgentHostChatContribution', () => {
+
+	const disposables = new DisposableStore();
+
+	teardown(() => disposables.clear());
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	// ---- Registration ---------------------------------------------------
+
+	suite('registration', () => {
+
+		test('registers agent', () => {
+			const { chatAgentService } = createContribution(disposables);
+
+			assert.ok(chatAgentService.registeredAgents.has('agent-host-copilot'));
+		});
+	});
+
+	// ---- Session list (IChatSessionItemController) ----------------------
+
+	suite('session list', () => {
+
+		test('refresh populates items from agent host', async () => {
+			const { listController, agentHostService } = createContribution(disposables);
+
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'aaa'), startTime: 1000, modifiedTime: 2000, summary: 'My session' });
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'bbb'), startTime: 3000, modifiedTime: 4000 });
+
+			await listController.refresh(CancellationToken.None);
+
+			assert.strictEqual(listController.items.length, 2);
+			assert.strictEqual(listController.items[0].label, 'My session');
+			assert.strictEqual(listController.items[1].label, 'Session bbb');
+			assert.strictEqual(listController.items[0].resource.scheme, 'agent-host-copilot');
+			assert.strictEqual(listController.items[0].resource.path, '/aaa');
+		});
+
+		test('refresh fires onDidChangeChatSessionItems', async () => {
+			const { listController, agentHostService } = createContribution(disposables);
+
+			let fired = false;
+			disposables.add(listController.onDidChangeChatSessionItems(() => { fired = true; }));
+
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'x'), startTime: 1000, modifiedTime: 2000 });
+			await listController.refresh(CancellationToken.None);
+
+			assert.ok(fired);
+		});
+
+		test('refresh handles error gracefully', async () => {
+			const { listController, agentHostService } = createContribution(disposables);
+
+			agentHostService.listSessions = async () => { throw new Error('fail'); };
+
+			await listController.refresh(CancellationToken.None);
+
+			assert.strictEqual(listController.items.length, 0);
+		});
+	});
+
+	// ---- Session ID resolution in _invokeAgent --------------------------
+
+	suite('session ID resolution', () => {
+
+		test('creates new SDK session for untitled resource', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, { message: 'Hello' });
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			assert.strictEqual(agentHostService.dispatchedActions[0].action.type, 'session/turnStarted');
+			assert.strictEqual((agentHostService.dispatchedActions[0].action as ITurnStartedAction).userMessage.text, 'Hello');
+			assert.ok(AgentSession.id(URI.parse(session)).startsWith('sdk-session-'));
+		});
+
+		test('reuses SDK session for same resource on second message', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const resource = URI.from({ scheme: 'agent-host-copilot', path: '/untitled-reuse' });
+			const chatSession = await sessionHandler.provideChatSessionContent(resource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			// First turn
+			const turn1Promise = chatSession.requestHandler!(
+				makeRequest({ message: 'First', sessionResource: resource }),
+				() => { }, [], CancellationToken.None,
+			);
+			await timeout(10);
+			const dispatch1 = agentHostService.dispatchedActions[0];
+			const action1 = dispatch1.action as ITurnStartedAction;
+			// Echo the turnStarted to clear pending write-ahead
+			agentHostService.fireAction({ action: dispatch1.action, serverSeq: 1, origin: { clientId: agentHostService.clientId, clientSeq: dispatch1.clientSeq } });
+			agentHostService.fireAction({ action: { type: 'session/turnComplete', session: action1.session, turnId: action1.turnId } as ISessionAction, serverSeq: 2, origin: undefined });
+			await turn1Promise;
+
+			// Second turn
+			const turn2Promise = chatSession.requestHandler!(
+				makeRequest({ message: 'Second', sessionResource: resource }),
+				() => { }, [], CancellationToken.None,
+			);
+			await timeout(10);
+			const dispatch2 = agentHostService.dispatchedActions[1];
+			const action2 = dispatch2.action as ITurnStartedAction;
+			agentHostService.fireAction({ action: dispatch2.action, serverSeq: 3, origin: { clientId: agentHostService.clientId, clientSeq: dispatch2.clientSeq } });
+			agentHostService.fireAction({ action: { type: 'session/turnComplete', session: action2.session, turnId: action2.turnId } as ISessionAction, serverSeq: 4, origin: undefined });
+			await turn2Promise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 2);
+			assert.strictEqual(
+				(agentHostService.dispatchedActions[0].action as ITurnStartedAction).session.toString(),
+				(agentHostService.dispatchedActions[1].action as ITurnStartedAction).session.toString(),
+			);
+		});
+
+		test('uses sessionId from agent-host scheme resource', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'Hi',
+				sessionResource: URI.from({ scheme: 'agent-host-copilot', path: '/existing-session-42' }),
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(AgentSession.id(URI.parse(session)), 'existing-session-42');
+		});
+
+		test('agent-host scheme with untitled path creates new session via mapping', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'Hi',
+				sessionResource: URI.from({ scheme: 'agent-host-copilot', path: '/untitled-abc123' }),
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			// Should create a new SDK session, not use "untitled-abc123" literally
+			assert.ok(AgentSession.id(URI.parse(session)).startsWith('sdk-session-'));
+		});
+		test('passes raw model id extracted from language model identifier', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'Hi',
+				userSelectedModelId: 'agent-host-copilot:claude-sonnet-4-20250514',
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.createSessionCalls.length, 1);
+			assert.strictEqual(agentHostService.createSessionCalls[0].model, 'claude-sonnet-4-20250514');
+		});
+
+		test('passes model id as-is when no vendor prefix', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'Hi',
+				userSelectedModelId: 'gpt-4o',
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.createSessionCalls.length, 1);
+			assert.strictEqual(agentHostService.createSessionCalls[0].model, 'gpt-4o');
+		});
+
+		test('does not create backend session eagerly for untitled sessions', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/untitled-deferred' });
+			const session = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => session.dispose()));
+
+			// No backend session should have been created yet
+			assert.strictEqual(agentHostService.createSessionCalls.length, 0);
+		});
+	});
+
+	// ---- Progress event → chat progress conversion ----------------------
+
+	suite('progress routing', () => {
+
+		test('delta events become markdownContent progress', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/responsePart', session, turnId, part: { kind: 'markdown', id: 'md-1', content: 'hello ' } } as ISessionAction);
+			fire({ type: 'session/delta', session, turnId, partId: 'md-1', content: 'world' } as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			// Events may be coalesced by the throttler, so check total content
+			const markdownParts = collected.flat().filter((p): p is IChatMarkdownContent => p.kind === 'markdownContent');
+			const totalContent = markdownParts.map(p => p.content.value).join('');
+			assert.strictEqual(totalContent, 'hello world');
+		});
+
+		test('tool_start events become toolInvocation progress', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-1', toolName: 'read_file', displayName: 'Read File' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-1', invocationMessage: 'Reading file', confirmed: 'not-needed' } as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			assert.strictEqual(collected.length, 1);
+			assert.strictEqual(collected[0][0].kind, 'toolInvocation');
+		});
+
+		test('tool_complete event transitions toolInvocation to completed', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-2', toolName: 'bash', displayName: 'Bash' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-2', invocationMessage: 'Running Bash command', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-2',
+				result: { success: true, pastTenseMessage: 'Ran Bash command' },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			assert.strictEqual(collected.length, 1);
+			const invocation = collected[0][0] as IChatToolInvocation;
+			assert.strictEqual(invocation.kind, 'toolInvocation');
+			assert.strictEqual(invocation.toolCallId, 'tc-2');
+			assert.strictEqual(IChatToolInvocation.isComplete(invocation), true);
+		});
+
+		test('tool_complete with failure sets error state', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-3', toolName: 'bash', displayName: 'Bash' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-3', invocationMessage: 'Running Bash command', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-3',
+				result: { success: false, pastTenseMessage: '"Bash" failed', content: [{ type: 'text', text: 'command not found' }], error: { message: 'command not found' } },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			assert.strictEqual(collected.length, 1);
+			const invocation = collected[0][0] as IChatToolInvocation;
+			assert.strictEqual(invocation.kind, 'toolInvocation');
+			assert.strictEqual(IChatToolInvocation.isComplete(invocation), true);
+		});
+
+		test('malformed toolArguments does not throw', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-bad', toolName: 'bash', displayName: 'Bash' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-bad', invocationMessage: 'Running Bash command', confirmed: 'not-needed' } as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			assert.strictEqual(collected.length, 1);
+			assert.strictEqual(collected[0][0].kind, 'toolInvocation');
+		});
+
+		test('outstanding tool invocations are completed on idle', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			// tool_start without tool_complete
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-orphan', toolName: 'bash', displayName: 'Bash' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-orphan', invocationMessage: 'Running Bash command', confirmed: 'not-needed' } as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			assert.strictEqual(collected.length, 1);
+			const invocation = collected[0][0] as IChatToolInvocation;
+			assert.strictEqual(invocation.kind, 'toolInvocation');
+			assert.strictEqual(IChatToolInvocation.isComplete(invocation), true);
+		});
+
+		test('events from other sessions are ignored', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			// Delta from a different session — will be ignored (session not subscribed)
+			agentHostService.fireAction({
+				action: { type: 'session/delta', session: AgentSession.uri('copilot', 'other-session').toString(), turnId, partId: 'md-other', content: 'wrong' } as ISessionAction,
+				serverSeq: 100,
+				origin: undefined,
+			});
+			fire({ type: 'session/responsePart', session, turnId, part: { kind: 'markdown', id: 'md-1', content: 'right' } } as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			assert.strictEqual(collected.length, 1);
+			assert.strictEqual((collected[0][0] as IChatMarkdownContent).content.value, 'right');
+		});
+	});
+
+	// ---- Cancellation -----------------------------------------------------
+
+	suite('cancellation', () => {
+
+		test('cancellation resolves the agent invoke', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const cts = new CancellationTokenSource();
+			disposables.add(cts);
+
+			const { turnPromise } = await startTurn(sessionHandler, agentHostService, disposables, {
+				cancellationToken: cts.token,
+			});
+
+			cts.cancel();
+			await turnPromise;
+
+			assert.ok(agentHostService.dispatchedActions.some(a => a.action.type === 'session/turnCancelled'));
+		});
+
+		test('cancellation force-completes outstanding tool invocations', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const cts = new CancellationTokenSource();
+			disposables.add(cts);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				cancellationToken: cts.token,
+			});
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-cancel', toolName: 'bash', displayName: 'Bash' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-cancel', invocationMessage: 'Running Bash command', confirmed: 'not-needed' } as ISessionAction);
+
+			cts.cancel();
+			await turnPromise;
+
+			// The tool invocation may or may not have been emitted before cancellation
+			// (the throttler can coalesce events). If it was emitted, it should be complete.
+			const toolInvocations = collected.flat().filter(p => p.kind === 'toolInvocation');
+			for (const inv of toolInvocations) {
+				assert.strictEqual(IChatToolInvocation.isComplete(inv as IChatToolInvocation), true);
+			}
+		});
+
+		test('cancellation calls abortSession on the agent host service', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const cts = new CancellationTokenSource();
+			disposables.add(cts);
+
+			const { turnPromise } = await startTurn(sessionHandler, agentHostService, disposables, {
+				cancellationToken: cts.token,
+			});
+
+			cts.cancel();
+			await turnPromise;
+
+			// Cancellation now dispatches session/turnCancelled action
+			assert.ok(agentHostService.dispatchedActions.some(a => a.action.type === 'session/turnCancelled'));
+		});
+	});
+
+	// ---- Error events -------------------------------------------------------
+
+	suite('error events', () => {
+
+		test('error event renders error message and finishes the request', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			agentHostService.fireAction({
+				action: {
+					type: 'session/error',
+					session,
+					turnId,
+					error: { errorType: 'test_error', message: 'Something went wrong' },
+				} as ISessionAction,
+				serverSeq: 99,
+				origin: undefined,
+			});
+
+			await turnPromise;
+
+			// Should have received the error message and the request should have finished
+			assert.ok(collected.length >= 1);
+			const errorPart = collected.flat().find(p => p.kind === 'markdownContent' && (p as IChatMarkdownContent).content.value.includes('Something went wrong'));
+			assert.ok(errorPart, 'Should have found a markdownContent part containing the error message');
+		});
+	});
+
+	// ---- Permission requests -----------------------------------------------
+
+	suite('permission requests', () => {
+
+		test('permission_request event shows confirmation and responds when confirmed', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			// Simulate a tool call requiring confirmation via toolCallStart + toolCallReady
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-perm-1', toolName: 'shell', displayName: 'Shell' } as ISessionAction);
+			fire({
+				type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-perm-1',
+				invocationMessage: 'echo hello', toolInput: 'echo hello',
+			} as ISessionAction);
+
+			await timeout(10);
+
+			// The tool call should have produced a ChatToolInvocation in WaitingForConfirmation state
+			// After toolCallStart (Streaming) and toolCallReady without confirmed (PendingConfirmation),
+			// the handler emits two progress events — we want the last one (with confirmation).
+			const toolInvocations = collected.flat().filter(p => p.kind === 'toolInvocation');
+			assert.ok(toolInvocations.length >= 1, 'Should have received tool confirmation progress');
+			const permInvocation = toolInvocations[toolInvocations.length - 1] as IChatToolInvocation;
+			assert.strictEqual(permInvocation.kind, 'toolInvocation');
+
+			// Confirm the tool
+			IChatToolInvocation.confirmWith(permInvocation, { type: ToolConfirmKind.UserAction });
+
+			await timeout(10);
+
+			// The handler should have dispatched session/toolCallConfirmed
+			assert.ok(agentHostService.dispatchedActions.some(
+				a => {
+					if (a.action.type !== 'session/toolCallConfirmed') {
+						return false;
+					}
+					const action = a.action as IToolCallConfirmedAction;
+					return action.toolCallId === 'tc-perm-1' && action.approved === true;
+				}
+			));
+
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+		});
+
+		test('permission_request denied when user skips', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-perm-2', toolName: 'write', displayName: 'Write File' } as ISessionAction);
+			fire({
+				type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-perm-2',
+				invocationMessage: 'Write to /tmp/test.txt',
+			} as ISessionAction);
+
+			await timeout(10);
+
+			const toolInvocations = collected.flat().filter(p => p.kind === 'toolInvocation');
+			const permInvocation = toolInvocations[toolInvocations.length - 1] as IChatToolInvocation;
+			// Deny the permission
+			IChatToolInvocation.confirmWith(permInvocation, { type: ToolConfirmKind.Denied });
+
+			await timeout(10);
+
+			assert.ok(agentHostService.dispatchedActions.some(
+				a => {
+					if (a.action.type !== 'session/toolCallConfirmed') {
+						return false;
+					}
+					const action = a.action as IToolCallConfirmedAction;
+					return action.toolCallId === 'tc-perm-2' && action.approved === false;
+				}
+			));
+
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+		});
+
+		test('shell permission shows terminal-style confirmation data', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-perm-shell', toolName: 'shell', displayName: 'Shell', _meta: { toolKind: 'terminal' } } as ISessionAction);
+			fire({
+				type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-perm-shell',
+				invocationMessage: 'echo hello', toolInput: 'echo hello',
+			} as ISessionAction);
+
+			await timeout(10);
+			const toolInvocations = collected.flat().filter(p => p.kind === 'toolInvocation');
+			const permInvocation = toolInvocations[toolInvocations.length - 1] as IChatToolInvocation;
+			assert.strictEqual(permInvocation.toolSpecificData?.kind, 'terminal');
+			const termData = permInvocation.toolSpecificData as IChatTerminalToolInvocationData;
+			assert.strictEqual(termData.commandLine.original, 'echo hello');
+
+			IChatToolInvocation.confirmWith(permInvocation, { type: ToolConfirmKind.UserAction });
+			await timeout(10);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+		});
+
+		test('read permission shows input-style confirmation data', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-perm-read', toolName: 'read_file', displayName: 'Read File' } as ISessionAction);
+			fire({
+				type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-perm-read',
+				invocationMessage: 'Read file contents', toolInput: '/workspace/file.ts',
+			} as ISessionAction);
+
+			await timeout(10);
+			const permInvocation = collected[0][0] as IChatToolInvocation;
+
+			IChatToolInvocation.confirmWith(permInvocation, { type: ToolConfirmKind.UserAction });
+			await timeout(10);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+		});
+	});
+
+	// ---- History loading ---------------------------------------------------
+
+	suite('history loading', () => {
+
+		test('loads user and assistant messages into history', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const sessionUri = AgentSession.uri('copilot', 'sess-1');
+			agentHostService.sessionStates.set(sessionUri.toString(), {
+				...createSessionState({ resource: sessionUri.toString(), provider: 'copilot', title: 'Test', status: SessionStatus.Idle, createdAt: Date.now(), modifiedAt: Date.now() }),
+				lifecycle: SessionLifecycle.Ready,
+				turns: [{
+					id: 'turn-1',
+					userMessage: { text: 'What is 2+2?' },
+					responseParts: [{ kind: ResponsePartKind.Markdown, id: 'md-1', content: '4' }],
+					usage: undefined,
+					state: TurnState.Complete,
+				}],
+			});
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/sess-1' });
+			const session = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => session.dispose()));
+
+			assert.strictEqual(session.history.length, 2);
+
+			const request = session.history[0];
+			assert.strictEqual(request.type, 'request');
+			if (request.type === 'request') {
+				assert.strictEqual(request.prompt, 'What is 2+2?');
+			}
+
+			const response = session.history[1];
+			assert.strictEqual(response.type, 'response');
+			if (response.type === 'response') {
+				assert.strictEqual(response.parts.length, 1);
+				assert.strictEqual((response.parts[0] as IChatMarkdownContent).content.value, '4');
+			}
+		});
+
+		test('untitled sessions have empty history', async () => {
+			const { sessionHandler } = createContribution(disposables);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/untitled-xyz' });
+			const session = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => session.dispose()));
+
+			assert.strictEqual(session.history.length, 0);
+		});
+	});
+
+	// ---- Tool invocation rendering -----------------------------------------
+
+	suite('tool invocation rendering', () => {
+
+		test('bash tool renders as terminal command block with output', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-shell', toolName: 'bash', displayName: 'Bash', _meta: { toolKind: 'terminal', language: 'shellscript' } } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-shell', invocationMessage: 'Running `echo hello`', toolInput: 'echo hello', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-shell',
+				result: { success: true, pastTenseMessage: 'Ran `echo hello`', content: [{ type: 'text', text: 'hello\n' }] },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			const invocation = collected[0][0] as IChatToolInvocation;
+			const termData = invocation.toolSpecificData as IChatTerminalToolInvocationData;
+			assert.deepStrictEqual({
+				kind: invocation.kind,
+				invocationMessage: textOf(invocation.invocationMessage),
+				pastTenseMessage: textOf(invocation.pastTenseMessage),
+				dataKind: termData.kind,
+				commandLine: termData.commandLine.original,
+				language: termData.language,
+				outputText: termData.terminalCommandOutput?.text,
+				exitCode: termData.terminalCommandState?.exitCode,
+			}, {
+				kind: 'toolInvocation',
+				invocationMessage: 'Running `echo hello`',
+				pastTenseMessage: undefined,
+				dataKind: 'terminal',
+				commandLine: 'echo hello',
+				language: 'shellscript',
+				outputText: 'hello\n',
+				exitCode: 0,
+			});
+		});
+
+		test('bash tool failure sets exit code 1 and error output', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-fail', toolName: 'bash', displayName: 'Bash', _meta: { toolKind: 'terminal', language: 'shellscript' } } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-fail', invocationMessage: 'Running `bad_cmd`', toolInput: 'bad_cmd', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-fail',
+				result: { success: false, pastTenseMessage: '"Bash" failed', content: [{ type: 'text', text: 'command not found: bad_cmd' }], error: { message: 'command not found: bad_cmd' } },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			const invocation = collected[0][0] as IChatToolInvocation;
+			const termData = invocation.toolSpecificData as IChatTerminalToolInvocationData;
+			assert.deepStrictEqual({
+				pastTenseMessage: invocation.pastTenseMessage,
+				outputText: termData.terminalCommandOutput?.text,
+				exitCode: termData.terminalCommandState?.exitCode,
+			}, {
+				pastTenseMessage: undefined,
+				outputText: 'command not found: bad_cmd',
+				exitCode: 1,
+			});
+		});
+
+		test('generic tool has invocation message and no toolSpecificData', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-gen', toolName: 'custom_tool', displayName: 'custom_tool' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-gen', invocationMessage: 'Using "custom_tool"', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-gen',
+				result: { success: true, pastTenseMessage: 'Used "custom_tool"' },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			const invocation = collected[0][0] as IChatToolInvocation;
+			assert.deepStrictEqual({
+				invocationMessage: textOf(invocation.invocationMessage),
+				pastTenseMessage: textOf(invocation.pastTenseMessage),
+				toolSpecificData: invocation.toolSpecificData,
+			}, {
+				invocationMessage: 'Using "custom_tool"',
+				pastTenseMessage: 'Used "custom_tool"',
+				toolSpecificData: undefined,
+			});
+		});
+
+		test('bash tool without arguments has no terminal data', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-noargs', toolName: 'bash', displayName: 'Bash', toolKind: 'terminal' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-noargs', invocationMessage: 'Running Bash command', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-noargs',
+				result: { success: true, pastTenseMessage: 'Ran Bash command' },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			const invocation = collected[0][0] as IChatToolInvocation;
+			assert.deepStrictEqual({
+				invocationMessage: textOf(invocation.invocationMessage),
+				pastTenseMessage: textOf(invocation.pastTenseMessage),
+				toolSpecificData: invocation.toolSpecificData,
+			}, {
+				invocationMessage: 'Running Bash command',
+				pastTenseMessage: 'Ran Bash command',
+				toolSpecificData: undefined,
+			});
+		});
+
+		test('view tool shows file path in messages', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, collected, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			fire({ type: 'session/toolCallStart', session, turnId, toolCallId: 'tc-view', toolName: 'view', displayName: 'View File' } as ISessionAction);
+			fire({ type: 'session/toolCallReady', session, turnId, toolCallId: 'tc-view', invocationMessage: 'Reading /tmp/test.txt', confirmed: 'not-needed' } as ISessionAction);
+			fire({
+				type: 'session/toolCallComplete', session, turnId, toolCallId: 'tc-view',
+				result: { success: true, pastTenseMessage: 'Read /tmp/test.txt' },
+			} as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+
+			await turnPromise;
+
+			const invocation = collected[0][0] as IChatToolInvocation;
+			assert.deepStrictEqual({
+				invocationMessage: textOf(invocation.invocationMessage),
+				pastTenseMessage: textOf(invocation.pastTenseMessage),
+			}, {
+				invocationMessage: 'Reading /tmp/test.txt',
+				pastTenseMessage: 'Read /tmp/test.txt',
+			});
+		});
+	});
+
+	// ---- History with tool events ----------------------------------------
+
+	suite('history with tool events', () => {
+
+		test('tool_start and tool_complete appear as toolInvocationSerialized in history', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+			const sessionUri = AgentSession.uri('copilot', 'tool-hist');
+
+			agentHostService.sessionStates.set(sessionUri.toString(), {
+				...createSessionState({ resource: sessionUri.toString(), provider: 'copilot', title: 'Test', status: SessionStatus.Idle, createdAt: Date.now(), modifiedAt: Date.now() }),
+				lifecycle: SessionLifecycle.Ready,
+				turns: [{
+					id: 'turn-1',
+					userMessage: { text: 'run ls' },
+					state: TurnState.Complete,
+					responseParts: [{
+						kind: 'toolCall' as const, toolCall: {
+							status: 'completed' as const, toolCallId: 'tc-1', toolName: 'bash', displayName: 'Bash',
+							invocationMessage: 'Running `ls`', toolInput: 'ls', _meta: { toolKind: 'terminal', language: 'shellscript' },
+							confirmed: 'not-needed' as const, success: true, pastTenseMessage: 'Ran `ls`', content: [{ type: 'text' as const, text: 'file1\nfile2' }],
+						}
+					}],
+					usage: undefined,
+				}],
+			} as ISessionState);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/tool-hist' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			// request, response
+			assert.strictEqual(chatSession.history.length, 2);
+
+			const response = chatSession.history[1];
+			assert.strictEqual(response.type, 'response');
+			if (response.type === 'response') {
+				assert.strictEqual(response.parts.length, 1);
+				const toolPart = response.parts[0] as IChatToolInvocationSerialized;
+				assert.strictEqual(toolPart.kind, 'toolInvocationSerialized');
+				assert.strictEqual(toolPart.toolCallId, 'tc-1');
+				assert.strictEqual(toolPart.isComplete, true);
+				// Terminal tool has output and exit code
+				assert.strictEqual(toolPart.toolSpecificData?.kind, 'terminal');
+				const termData = toolPart.toolSpecificData as IChatTerminalToolInvocationData;
+				assert.strictEqual(termData.terminalCommandOutput?.text, 'file1\nfile2');
+				assert.strictEqual(termData.terminalCommandState?.exitCode, 0);
+			}
+		});
+
+		test('orphaned tool_start is marked complete in history', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+			const sessionUri = AgentSession.uri('copilot', 'orphan-tool');
+
+			agentHostService.sessionStates.set(sessionUri.toString(), {
+				...createSessionState({ resource: sessionUri.toString(), provider: 'copilot', title: 'Test', status: SessionStatus.Idle, createdAt: Date.now(), modifiedAt: Date.now() }),
+				lifecycle: SessionLifecycle.Ready,
+				turns: [{
+					id: 'turn-1',
+					userMessage: { text: 'do something' },
+					state: TurnState.Complete,
+					responseParts: [{
+						kind: 'toolCall' as const, toolCall: { status: 'completed' as const, toolCallId: 'tc-orphan', toolName: 'read_file', displayName: 'Read File', invocationMessage: 'Reading file', confirmed: 'not-needed' as const, success: false, pastTenseMessage: 'Reading file' },
+					}],
+					usage: undefined,
+				}],
+			} as ISessionState);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/orphan-tool' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			assert.strictEqual(chatSession.history.length, 2);
+			const response = chatSession.history[1];
+			if (response.type === 'response') {
+				const toolPart = response.parts[0] as IChatToolInvocationSerialized;
+				assert.strictEqual(toolPart.kind, 'toolInvocationSerialized');
+				assert.strictEqual(toolPart.isComplete, true);
+			}
+		});
+
+		test('non-terminal tool_complete sets pastTenseMessage in history', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+			const sessionUri = AgentSession.uri('copilot', 'generic-tool');
+
+			agentHostService.sessionStates.set(sessionUri.toString(), {
+				...createSessionState({ resource: sessionUri.toString(), provider: 'copilot', title: 'Test', status: SessionStatus.Idle, createdAt: Date.now(), modifiedAt: Date.now() }),
+				lifecycle: SessionLifecycle.Ready,
+				turns: [{
+					id: 'turn-1',
+					userMessage: { text: 'search' },
+					state: TurnState.Complete,
+					responseParts: [{
+						kind: 'toolCall' as const, toolCall: { status: 'completed' as const, toolCallId: 'tc-g', toolName: 'grep', displayName: 'Grep', invocationMessage: 'Searching...', confirmed: 'not-needed' as const, success: true, pastTenseMessage: 'Searched for pattern' },
+					}],
+					usage: undefined,
+				}],
+			} as ISessionState);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/generic-tool' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			const response = chatSession.history[1];
+			if (response.type === 'response') {
+				const toolPart = response.parts[0] as IChatToolInvocationSerialized;
+				assert.strictEqual(textOf(toolPart.pastTenseMessage), 'Searched for pattern');
+				assert.strictEqual(toolPart.toolSpecificData, undefined);
+			}
+		});
+
+		test('empty session produces empty history', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const sessionUri = AgentSession.uri('copilot', 'empty-sess');
+			agentHostService.sessionStates.set(sessionUri.toString(), {
+				...createSessionState({ resource: sessionUri.toString(), provider: 'copilot', title: 'Test', status: SessionStatus.Idle, createdAt: Date.now(), modifiedAt: Date.now() }),
+				lifecycle: SessionLifecycle.Ready,
+				turns: [],
+			} as ISessionState);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/empty-sess' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			assert.strictEqual(chatSession.history.length, 0);
+		});
+	});
+
+	// ---- Server error handling ----------------------------------------------
+
+	suite('server error handling', () => {
+
+		test('server-side error resolves the agent invoke without throwing', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId } = await startTurn(sessionHandler, agentHostService, disposables);
+
+			// Simulate a server-side error (e.g. sendMessage failure on the server)
+			agentHostService.fireAction({
+				action: {
+					type: 'session/error',
+					session,
+					turnId,
+					error: { errorType: 'connection_error', message: 'connection lost' },
+				} as ISessionAction,
+				serverSeq: 99,
+				origin: undefined,
+			});
+
+			await turnPromise;
+		});
+	});
+
+	// ---- Session list provider filtering --------------------------------
+
+	suite('session list provider filtering', () => {
+
+		test('filters sessions to only the matching provider', async () => {
+			const { listController, agentHostService } = createContribution(disposables);
+
+			// Add sessions from both providers (use a non-copilot scheme to test filtering)
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'cp-1'), startTime: 1000, modifiedTime: 2000 });
+			agentHostService.addSession({ session: URI.from({ scheme: 'other-provider', path: '/cl-1' }), startTime: 1000, modifiedTime: 2000 });
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'cp-2'), startTime: 3000, modifiedTime: 4000 });
+
+			await listController.refresh(CancellationToken.None);
+
+			// The list controller is configured for 'copilot', so only copilot sessions
+			assert.strictEqual(listController.items.length, 2);
+			assert.ok(listController.items.every(item => item.resource.scheme === 'agent-host-copilot'));
+		});
+	});
+
+	// ---- Language model provider ----------------------------------------
+
+	suite('language model provider', () => {
+
+		test('maps models with correct metadata', async () => {
+			const provider = disposables.add(new AgentHostLanguageModelProvider('agent-host-copilot', 'agent-host-copilot'));
+			provider.updateModels([
+				{ provider: 'copilot', id: 'gpt-4o', name: 'GPT-4o', maxContextWindow: 128000, supportsVision: true },
+			]);
+
+			const models = await provider.provideLanguageModelChatInfo({}, CancellationToken.None);
+
+			assert.strictEqual(models.length, 1);
+			assert.strictEqual(models[0].identifier, 'agent-host-copilot:gpt-4o');
+			assert.strictEqual(models[0].metadata.name, 'GPT-4o');
+			assert.strictEqual(models[0].metadata.maxInputTokens, 128000);
+			assert.strictEqual(models[0].metadata.capabilities?.vision, true);
+			assert.strictEqual(models[0].metadata.targetChatSessionType, 'agent-host-copilot');
+		});
+
+		test('filters out disabled models', async () => {
+			const provider = disposables.add(new AgentHostLanguageModelProvider('agent-host-copilot', 'agent-host-copilot'));
+			provider.updateModels([
+				{ provider: 'copilot', id: 'gpt-4o', name: 'GPT-4o', maxContextWindow: 128000, supportsVision: false, policyState: PolicyState.Enabled },
+				{ provider: 'copilot', id: 'gpt-3.5', name: 'GPT-3.5', maxContextWindow: 16000, supportsVision: false, policyState: PolicyState.Disabled },
+			]);
+
+			const models = await provider.provideLanguageModelChatInfo({}, CancellationToken.None);
+
+			assert.strictEqual(models.length, 1);
+			assert.strictEqual(models[0].metadata.name, 'GPT-4o');
+		});
+
+		test('returns empty when no models set', async () => {
+			const provider = disposables.add(new AgentHostLanguageModelProvider('agent-host-copilot', 'agent-host-copilot'));
+
+			const models = await provider.provideLanguageModelChatInfo({}, CancellationToken.None);
+
+			assert.strictEqual(models.length, 0);
+		});
+
+		test('sendChatRequest throws', async () => {
+			const provider = disposables.add(new AgentHostLanguageModelProvider('agent-host-copilot', 'agent-host-copilot'));
+
+			await assert.rejects(() => provider.sendChatRequest(), /do not support direct chat requests/);
+		});
+	});
+
+	// ---- Attachment context conversion --------------------------------------
+
+	suite('attachment context', () => {
+
+		test('file variable with file:// URI becomes file attachment', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'check this file',
+				variables: {
+					variables: [
+						upcastPartial({ kind: 'file', id: 'v-file', name: 'test.ts', value: URI.file('/workspace/test.ts') }),
+					],
+				},
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			assert.deepStrictEqual(turnAction.userMessage.attachments, [
+				{ type: 'file', path: URI.file('/workspace/test.ts').fsPath, displayName: 'test.ts' },
+			]);
+		});
+
+		test('directory variable with file:// URI becomes directory attachment', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'check this dir',
+				variables: {
+					variables: [
+						upcastPartial({ kind: 'directory', id: 'v-dir', name: 'src', value: URI.file('/workspace/src') }),
+					],
+				},
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			assert.deepStrictEqual(turnAction.userMessage.attachments, [
+				{ type: 'directory', path: URI.file('/workspace/src').fsPath, displayName: 'src' },
+			]);
+		});
+
+		test('implicit selection variable becomes selection attachment', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'explain this',
+				variables: {
+					variables: [
+						upcastPartial({ kind: 'implicit', id: 'v-implicit', name: 'selection', isFile: true as const, isSelection: true, uri: URI.file('/workspace/foo.ts'), enabled: true, value: undefined }),
+					],
+				},
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			assert.deepStrictEqual(turnAction.userMessage.attachments, [
+				{ type: 'selection', path: URI.file('/workspace/foo.ts').fsPath, displayName: 'selection' },
+			]);
+		});
+
+		test('non-file URIs are skipped', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'check this',
+				variables: {
+					variables: [
+						upcastPartial({ kind: 'file', id: 'v-file', name: 'untitled', value: URI.from({ scheme: 'untitled', path: '/foo' }) }),
+					],
+				},
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			// No attachments because it's not a file:// URI
+			assert.strictEqual(turnAction.userMessage.attachments, undefined);
+		});
+
+		test('tool variables are skipped', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'use tools',
+				variables: {
+					variables: [
+						upcastPartial({ kind: 'tool', id: 'v-tool', name: 'myTool', value: { id: 'tool-1' } }),
+					],
+				},
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			assert.strictEqual(turnAction.userMessage.attachments, undefined);
+		});
+
+		test('mixed variables extracts only supported types', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'mixed',
+				variables: {
+					variables: [
+						upcastPartial({ kind: 'file', id: 'v-file', name: 'a.ts', value: URI.file('/workspace/a.ts') }),
+						upcastPartial({ kind: 'tool', id: 'v-tool', name: 'myTool', value: { id: 'tool-1' } }),
+						upcastPartial({ kind: 'directory', id: 'v-dir', name: 'lib', value: URI.file('/workspace/lib') }),
+						upcastPartial({ kind: 'file', id: 'v-file', name: 'remote.ts', value: URI.from({ scheme: 'vscode-remote', path: '/remote/file.ts' }) }),
+					],
+				},
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			assert.deepStrictEqual(turnAction.userMessage.attachments, [
+				{ type: 'file', path: URI.file('/workspace/a.ts').fsPath, displayName: 'a.ts' },
+				{ type: 'directory', path: URI.file('/workspace/lib').fsPath, displayName: 'lib' },
+			]);
+		});
+
+		test('no variables results in no attachments argument', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const { turnPromise, session, turnId, fire } = await startTurn(sessionHandler, agentHostService, disposables, {
+				message: 'Hello',
+			});
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			const turnAction = agentHostService.dispatchedActions[0].action as ITurnStartedAction;
+			assert.strictEqual(turnAction.userMessage.attachments, undefined);
+		});
+	});
+
+	// ---- AgentHostContribution discovery ---------------------------------
+
+	suite('dynamic discovery', () => {
+
+		test('setting gate prevents registration', async () => {
+			const { instantiationService } = createTestServices(disposables);
+			instantiationService.stub(IConfigurationService, { getValue: () => false });
+
+			const contribution = disposables.add(instantiationService.createInstance(AgentHostContribution));
+			// Contribution should exist but not have registered any agents
+			assert.ok(contribution);
+			// Let async work settle
+			await timeout(10);
+		});
+	});
+
+	// ---- IAgentConnection unification -------------------------------------
+
+	suite('IAgentConnection config', () => {
+
+		test('handler uses custom extensionId from config', async () => {
+			const { instantiationService, agentHostService, chatAgentService } = createTestServices(disposables);
+
+			disposables.add(instantiationService.createInstance(AgentHostSessionHandler, {
+				provider: 'copilot' as const,
+				agentId: 'remote-test-copilot',
+				sessionType: 'remote-test-copilot',
+				fullName: 'Remote Copilot',
+				description: 'Remote agent',
+				connection: agentHostService,
+				connectionAuthority: 'local',
+				extensionId: 'vscode.remote-agent-host',
+				extensionDisplayName: 'Remote Agent Host',
+			}));
+
+			const registered = chatAgentService.registeredAgents.get('remote-test-copilot');
+			assert.ok(registered);
+			assert.strictEqual(registered.data.extensionId.value, 'vscode.remote-agent-host');
+			assert.strictEqual(registered.data.extensionDisplayName, 'Remote Agent Host');
+		});
+
+		test('handler defaults extensionId when not provided', async () => {
+			const { instantiationService, agentHostService, chatAgentService } = createTestServices(disposables);
+
+			disposables.add(instantiationService.createInstance(AgentHostSessionHandler, {
+				provider: 'copilot' as const,
+				agentId: 'default-ext-test',
+				sessionType: 'default-ext-test',
+				fullName: 'Test',
+				description: 'test',
+				connection: agentHostService,
+				connectionAuthority: 'local',
+			}));
+
+			const registered = chatAgentService.registeredAgents.get('default-ext-test');
+			assert.ok(registered);
+			assert.strictEqual(registered.data.extensionId.value, 'vscode.agent-host');
+			assert.strictEqual(registered.data.extensionDisplayName, 'Agent Host');
+		});
+
+		test('handler uses resolveWorkingDirectory callback', async () => {
+			const { instantiationService, agentHostService } = createTestServices(disposables);
+
+			const handler = disposables.add(instantiationService.createInstance(AgentHostSessionHandler, {
+				provider: 'copilot' as const,
+				agentId: 'workdir-test',
+				sessionType: 'workdir-test',
+				fullName: 'Test',
+				description: 'test',
+				connection: agentHostService,
+				connectionAuthority: 'local',
+				resolveWorkingDirectory: () => '/custom/working/dir',
+			}));
+
+			const { turnPromise, session, turnId, fire } = await startTurn(handler, agentHostService, disposables);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			assert.strictEqual(agentHostService.createSessionCalls.length, 1);
+			assert.strictEqual(agentHostService.createSessionCalls[0].workingDirectory, '/custom/working/dir');
+		});
+
+		test('list controller includes description in items', async () => {
+			const { instantiationService, agentHostService } = createTestServices(disposables);
+
+			const controller = disposables.add(instantiationService.createInstance(
+				AgentHostSessionListController, 'remote-test', 'copilot', agentHostService, 'My Remote Host'));
+
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'sess-1'), startTime: 1000, modifiedTime: 2000, summary: 'Test session' });
+			await controller.refresh(CancellationToken.None);
+
+			assert.strictEqual(controller.items.length, 1);
+			assert.strictEqual(controller.items[0].description, 'My Remote Host');
+		});
+
+		test('list controller omits description when undefined', async () => {
+			const { instantiationService, agentHostService } = createTestServices(disposables);
+
+			const controller = disposables.add(instantiationService.createInstance(
+				AgentHostSessionListController, 'agent-host-copilot', 'copilot', agentHostService, undefined));
+
+			agentHostService.addSession({ session: AgentSession.uri('copilot', 'sess-2'), startTime: 1000, modifiedTime: 2000, summary: 'Test' });
+			await controller.refresh(CancellationToken.None);
+
+			assert.strictEqual(controller.items.length, 1);
+			assert.strictEqual(controller.items[0].description, undefined);
+		});
+
+		test('handler works with any IAgentConnection, not just IAgentHostService', async () => {
+			const { instantiationService, agentHostService, chatAgentService } = createTestServices(disposables);
+
+			// Create handler with agentHostService as IAgentConnection (not IAgentHostService)
+			const handler = disposables.add(instantiationService.createInstance(AgentHostSessionHandler, {
+				provider: 'copilot' as const,
+				agentId: 'connection-test',
+				sessionType: 'connection-test',
+				fullName: 'Connection Test',
+				description: 'test',
+				connection: agentHostService,
+				connectionAuthority: 'local',
+			}));
+
+			// Verify it registered an agent
+			assert.ok(chatAgentService.registeredAgents.has('connection-test'));
+
+			// Verify it can run a turn through the IAgentConnection path
+			const { turnPromise, session, turnId, fire } = await startTurn(handler, agentHostService, disposables, {
+				message: 'Test message',
+			});
+
+			fire({ type: 'session/delta', session, turnId, content: 'Response' } as ISessionAction);
+			fire({ type: 'session/turnComplete', session, turnId } as ISessionAction);
+			await turnPromise;
+
+			// Turn dispatched via connection.dispatchAction
+			assert.strictEqual(agentHostService.dispatchedActions.length, 1);
+			assert.strictEqual((agentHostService.dispatchedActions[0].action as ITurnStartedAction).userMessage.text, 'Test message');
+		});
+	});
+
+	// ---- Server-initiated turns -------------------------------------------
+
+	suite('server-initiated turns', () => {
+
+		test('detects server-initiated turn and fires onDidStartServerRequest', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			// Create and subscribe a session
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/untitled-server-turn' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			// First, do a normal turn so the backend session is created
+			const turn1Promise = chatSession.requestHandler!(
+				makeRequest({ message: 'Hello', sessionResource }),
+				() => { }, [], CancellationToken.None,
+			);
+			await timeout(10);
+			const dispatch1 = agentHostService.dispatchedActions[0];
+			const action1 = dispatch1.action as ITurnStartedAction;
+			const session = action1.session;
+			// Echo + complete the first turn
+			agentHostService.fireAction({ action: dispatch1.action, serverSeq: 1, origin: { clientId: agentHostService.clientId, clientSeq: dispatch1.clientSeq } });
+			agentHostService.fireAction({ action: { type: 'session/turnComplete', session, turnId: action1.turnId } as ISessionAction, serverSeq: 2, origin: undefined });
+			await turn1Promise;
+
+			// Now simulate a server-initiated turn (e.g. from a consumed queued message)
+			const serverTurnId = 'server-turn-1';
+			const serverRequestEvents: { prompt: string }[] = [];
+			disposables.add(chatSession.onDidStartServerRequest!(e => serverRequestEvents.push(e)));
+
+			agentHostService.fireAction({
+				action: {
+					type: 'session/turnStarted',
+					session,
+					turnId: serverTurnId,
+					userMessage: { text: 'queued message text' },
+				} as ISessionAction,
+				serverSeq: 3,
+				origin: undefined, // Server-originated — no client origin
+			});
+
+			await timeout(10);
+
+			// onDidStartServerRequest should have fired
+			assert.strictEqual(serverRequestEvents.length, 1);
+			assert.strictEqual(serverRequestEvents[0].prompt, 'queued message text');
+
+			// isCompleteObs should be false (turn in progress)
+			assert.strictEqual(chatSession.isCompleteObs!.get(), false);
+		});
+
+		test('server-initiated turn streams progress through progressObs', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/untitled-server-progress' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			// Normal turn to create backend session
+			const turn1Promise = chatSession.requestHandler!(
+				makeRequest({ message: 'Init', sessionResource }),
+				() => { }, [], CancellationToken.None,
+			);
+			await timeout(10);
+			const dispatch1 = agentHostService.dispatchedActions[0];
+			const action1 = dispatch1.action as ITurnStartedAction;
+			const session = action1.session;
+			agentHostService.fireAction({ action: dispatch1.action, serverSeq: 1, origin: { clientId: agentHostService.clientId, clientSeq: dispatch1.clientSeq } });
+			agentHostService.fireAction({ action: { type: 'session/turnComplete', session, turnId: action1.turnId } as ISessionAction, serverSeq: 2, origin: undefined });
+			await turn1Promise;
+
+			// Server-initiated turn
+			const serverTurnId = 'server-turn-progress';
+			agentHostService.fireAction({
+				action: { type: 'session/turnStarted', session, turnId: serverTurnId, userMessage: { text: 'auto queued' } } as ISessionAction,
+				serverSeq: 3, origin: undefined,
+			});
+			await timeout(10);
+
+			// Stream a response part + delta
+			agentHostService.fireAction({
+				action: { type: 'session/responsePart', session, turnId: serverTurnId, part: { kind: 'markdown', id: 'md-srv', content: 'Hello ' } } as ISessionAction,
+				serverSeq: 4, origin: undefined,
+			});
+			agentHostService.fireAction({
+				action: { type: 'session/delta', session, turnId: serverTurnId, partId: 'md-srv', content: 'world' } as ISessionAction,
+				serverSeq: 5, origin: undefined,
+			});
+			await timeout(50);
+
+			// Progress should be in progressObs
+			const progress = chatSession.progressObs!.get();
+			const markdownParts = progress.filter((p): p is IChatMarkdownContent => p.kind === 'markdownContent');
+			const totalContent = markdownParts.map(p => p.content.value).join('');
+			assert.strictEqual(totalContent, 'Hello world');
+
+			// Complete the turn
+			agentHostService.fireAction({
+				action: { type: 'session/turnComplete', session, turnId: serverTurnId } as ISessionAction,
+				serverSeq: 6, origin: undefined,
+			});
+			await timeout(10);
+
+			assert.strictEqual(chatSession.isCompleteObs!.get(), true);
+		});
+
+		test('client-dispatched turns are not treated as server-initiated', async () => {
+			const { sessionHandler, agentHostService } = createContribution(disposables);
+
+			const sessionResource = URI.from({ scheme: 'agent-host-copilot', path: '/untitled-no-dupe' });
+			const chatSession = await sessionHandler.provideChatSessionContent(sessionResource, CancellationToken.None);
+			disposables.add(toDisposable(() => chatSession.dispose()));
+
+			const serverRequestEvents: { prompt: string }[] = [];
+			disposables.add(chatSession.onDidStartServerRequest!(e => serverRequestEvents.push(e)));
+
+			// Normal client turn — should NOT fire onDidStartServerRequest
+			const turnPromise = chatSession.requestHandler!(
+				makeRequest({ message: 'Client turn', sessionResource }),
+				() => { }, [], CancellationToken.None,
+			);
+			await timeout(10);
+			const dispatch = agentHostService.dispatchedActions[0];
+			const action = dispatch.action as ITurnStartedAction;
+			agentHostService.fireAction({ action: dispatch.action, serverSeq: 1, origin: { clientId: agentHostService.clientId, clientSeq: dispatch.clientSeq } });
+			agentHostService.fireAction({ action: { type: 'session/turnComplete', session: action.session, turnId: action.turnId } as ISessionAction, serverSeq: 2, origin: undefined });
+			await turnPromise;
+
+			assert.strictEqual(serverRequestEvents.length, 0, 'Client-dispatched turns should not trigger onDidStartServerRequest');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionApprovalModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionApprovalModel.test.ts
index 321bac437d2..de54c6b1471 100644
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionApprovalModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionApprovalModel.test.ts
@@ -32,6 +32,7 @@ function makeToolInvocationPart(options: {
 		toolCallId: 'call-1',
 		state: observableValue('toolState', options.state),
 		toolSpecificData: options.toolSpecificData,
+		isAttachedToThinking: false,
 		toJSON: () => undefined!,
 	};
 }
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts
index 445feba0a2f..47a202aaa7a 100644
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts
@@ -24,6 +24,20 @@ import { TestInstantiationService } from '../../../../../../platform/instantiati
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { AgentSessionProviders, getAgentCanContinueIn, getAgentSessionProviderIcon, getAgentSessionProviderName } from '../../../browser/agentSessions/agentSessions.js';
 
+class StaticChatSessionItemController implements IChatSessionItemController {
+	readonly onDidChangeChatSessionItems = Event.None;
+
+	constructor(
+		private readonly sessionItems: readonly IChatSessionItem[],
+	) { }
+
+	get items(): readonly IChatSessionItem[] {
+		return this.sessionItems;
+	}
+
+	async refresh(): Promise<void> { }
+}
+
 
 suite('AgentSessions', () => {
 
@@ -41,6 +55,10 @@ suite('AgentSessions', () => {
 			));
 		}
 
+		function registerContribution(type: string): void {
+			disposables.add(mockChatSessionsService.registerChatSessionContribution({ type, name: type, displayName: type, description: type }));
+		}
+
 		setup(() => {
 			mockChatSessionsService = new MockChatSessionsService();
 			mockLifecycleService = disposables.add(new TestLifecycleService());
@@ -63,21 +81,15 @@ suite('AgentSessions', () => {
 
 		test('should resolve sessions from controllers', async () => {
 			return runWithFakedTimers({}, async () => {
-				const chatSessionType = 'test-type';
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [
-							makeSimpleSessionItem('session-1', {
-								label: 'Test Session 1'
-							}),
-							makeSimpleSessionItem('session-2', {
-								label: 'Test Session 2'
-							})
-						];
-					}
-				};
+				const chatSessionType = chatSessionTestType;
+				const controller = new StaticChatSessionItemController([
+					makeSimpleSessionItem('session-1', {
+						label: 'Test Session 1'
+					}),
+					makeSimpleSessionItem('session-2', {
+						label: 'Test Session 2'
+					})
+				]);
 
 				mockChatSessionsService.registerChatSessionItemController(chatSessionType, controller);
 				viewModel = createViewModel();
@@ -85,31 +97,21 @@ suite('AgentSessions', () => {
 				await viewModel.resolve(undefined);
 
 				assert.strictEqual(viewModel.sessions.length, 2);
-				assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://session-1');
+				assert.strictEqual(viewModel.sessions[0].resource.toString(), `${chatSessionTestType}://session-1`);
 				assert.strictEqual(viewModel.sessions[0].label, 'Test Session 1');
-				assert.strictEqual(viewModel.sessions[1].resource.toString(), 'test://session-2');
+				assert.strictEqual(viewModel.sessions[1].resource.toString(), `${chatSessionTestType}://session-2`);
 				assert.strictEqual(viewModel.sessions[1].label, 'Test Session 2');
 			});
 		});
 
 		test('should resolve sessions from multiple controllers', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller1: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller1 = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				const controller2: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-2')];
-					}
-				};
+				const controller2 = new StaticChatSessionItemController([makeSimpleSessionItem('session-2')]);
 
+				registerContribution('type-1');
+				registerContribution('type-2');
 				mockChatSessionsService.registerChatSessionItemController('type-1', controller1);
 				mockChatSessionsService.registerChatSessionItemController('type-2', controller2);
 
@@ -118,32 +120,33 @@ suite('AgentSessions', () => {
 				await viewModel.resolve(undefined);
 
 				assert.strictEqual(viewModel.sessions.length, 2);
-				assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://session-1');
-				assert.strictEqual(viewModel.sessions[1].resource.toString(), 'test://session-2');
+				const uris = viewModel.sessions.map(s => s.resource.toString()).sort();
+				assert.deepStrictEqual(uris, [
+					`${chatSessionTestType}://session-1`,
+					`${chatSessionTestType}://session-2`,
+				]);
 			});
 		});
 
 		test('should fire onWillResolve and onDidResolve events', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() { return []; }
-				};
+				const controller = new StaticChatSessionItemController([]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				let willResolveFired = false;
 				let didResolveFired = false;
 
-				disposables.add(viewModel.onWillResolve(() => {
+				disposables.add(viewModel.onWillResolve(provider => {
 					willResolveFired = true;
+					assert.strictEqual(typeof provider, 'string', 'onWillResolve should carry the provider');
 					assert.strictEqual(didResolveFired, false, 'onDidResolve should not fire before onWillResolve completes');
 				}));
 
-				disposables.add(viewModel.onDidResolve(() => {
+				disposables.add(viewModel.onDidResolve(provider => {
 					didResolveFired = true;
+					assert.strictEqual(typeof provider, 'string', 'onDidResolve should carry the provider');
 					assert.strictEqual(willResolveFired, true, 'onWillResolve should fire before onDidResolve');
 				}));
 
@@ -156,15 +159,9 @@ suite('AgentSessions', () => {
 
 		test('should fire onDidChangeSessions event after resolving', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				let sessionsChangedFired = false;
@@ -183,24 +180,18 @@ suite('AgentSessions', () => {
 				const created = Date.now();
 				const lastRequestEnded = created + 1000;
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-1'),
-							label: 'Test Session',
-							description: new MarkdownString('**Bold** description'),
-							status: ChatSessionStatus.Completed,
-							tooltip: 'Session tooltip',
-							iconPath: ThemeIcon.fromId('check'),
-							timing: { created, lastRequestStarted: created, lastRequestEnded },
-							changes: { files: 1, insertions: 10, deletions: 5 }
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-1'),
+					label: 'Test Session',
+					description: new MarkdownString('**Bold** description'),
+					status: ChatSessionStatus.Completed,
+					tooltip: 'Session tooltip',
+					iconPath: ThemeIcon.fromId('check'),
+					timing: { created, lastRequestStarted: created, lastRequestEnded },
+					changes: { files: 1, insertions: 10, deletions: 5 }
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				await viewModel.resolve(undefined);
@@ -222,22 +213,12 @@ suite('AgentSessions', () => {
 
 		test('should handle resolve with specific provider', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller1: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller1 = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				const controller2: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-2')];
-					}
-				};
+				const controller2 = new StaticChatSessionItemController([makeSimpleSessionItem('session-2')]);
 
+				registerContribution('type-1');
+				registerContribution('type-2');
 				disposables.add(mockChatSessionsService.registerChatSessionItemController('type-1', controller1));
 				disposables.add(mockChatSessionsService.registerChatSessionItemController('type-2', controller2));
 
@@ -249,29 +230,19 @@ suite('AgentSessions', () => {
 
 				// Now resolve only type-1
 				await viewModel.resolve('type-1');
-				// Only type-1 sessions remain since non-resolved providers are cleared
-				assert.strictEqual(viewModel.sessions.length, 1);
+				// Per-provider resolution preserves sessions from other providers
+				assert.strictEqual(viewModel.sessions.length, 2);
 			});
 		});
 
 		test('should handle resolve with multiple specific controllers', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller1: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller1 = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				const controller2: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-2')];
-					}
-				};
+				const controller2 = new StaticChatSessionItemController([makeSimpleSessionItem('session-2')]);
 
+				registerContribution('type-1');
+				registerContribution('type-2');
 				mockChatSessionsService.registerChatSessionItemController('type-1', controller1);
 				mockChatSessionsService.registerChatSessionItemController('type-2', controller2);
 
@@ -285,14 +256,8 @@ suite('AgentSessions', () => {
 
 		test('should respond to onDidChangeItemsProviders event', async () => {
 			return runWithFakedTimers({}, async () => {
-				const chatSessionType = 'test-type';
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const chatSessionType = chatSessionTestType;
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
 				mockChatSessionsService.registerChatSessionItemController(chatSessionType, controller);
 				viewModel = createViewModel();
@@ -311,15 +276,9 @@ suite('AgentSessions', () => {
 
 		test('should respond to onDidChangeAvailability event', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
@@ -336,21 +295,16 @@ suite('AgentSessions', () => {
 
 		test('should respond to onDidChangeSessionItems event', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const testSession = makeSimpleSessionItem('session-1');
+				const controller = new StaticChatSessionItemController([testSession]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
 
 				// Trigger event - this should automatically call resolve
-				mockChatSessionsService.fireDidChangeSessionItems('test-type');
+				mockChatSessionsService.fireDidChangeSessionItems({ addedOrUpdated: [testSession] });
 
 				// Wait for the sessions to be resolved
 				await sessionsChangedPromise;
@@ -361,33 +315,23 @@ suite('AgentSessions', () => {
 
 		test('should maintain provider reference in session view model', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				await viewModel.resolve(undefined);
 
 				assert.strictEqual(viewModel.sessions.length, 1);
-				assert.strictEqual(viewModel.sessions[0].providerType, 'test-type');
+				assert.strictEqual(viewModel.sessions[0].providerType, chatSessionTestType);
 			});
 		});
 
 		test('should handle empty provider results', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() { return []; }
-				};
+				const controller = new StaticChatSessionItemController([]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				await viewModel.resolve(undefined);
@@ -398,37 +342,28 @@ suite('AgentSessions', () => {
 
 		test('should handle sessions with different statuses', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [
-							{
-								id: 'session-failed',
-								resource: URI.parse('test://session-failed'),
-								label: 'Failed Session',
-								status: ChatSessionStatus.Failed,
-								timing: makeNewSessionTiming()
-							},
-							{
-								id: 'session-completed',
-								resource: URI.parse('test://session-completed'),
-								label: 'Completed Session',
-								status: ChatSessionStatus.Completed,
-								timing: makeNewSessionTiming()
-							},
-							{
-								id: 'session-inprogress',
-								resource: URI.parse('test://session-inprogress'),
-								label: 'In Progress Session',
-								status: ChatSessionStatus.InProgress,
-								timing: makeNewSessionTiming()
-							}
-						];
+				const controller = new StaticChatSessionItemController([
+					{
+						resource: URI.parse('test://session-failed'),
+						label: 'Failed Session',
+						status: ChatSessionStatus.Failed,
+						timing: makeNewSessionTiming()
+					},
+					{
+						resource: URI.parse('test://session-completed'),
+						label: 'Completed Session',
+						status: ChatSessionStatus.Completed,
+						timing: makeNewSessionTiming()
+					},
+					{
+						resource: URI.parse('test://session-inprogress'),
+						label: 'In Progress Session',
+						status: ChatSessionStatus.InProgress,
+						timing: makeNewSessionTiming()
 					}
-				};
+				]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				await viewModel.resolve(undefined);
@@ -456,7 +391,7 @@ suite('AgentSessions', () => {
 					get items() { return _items; }
 				};
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				await viewModel.resolve(undefined);
@@ -470,18 +405,11 @@ suite('AgentSessions', () => {
 
 		test('should handle local agent session type specially', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							id: 'local-session',
-							resource: LocalChatSessionUri.forSession('local-session'),
-							label: 'Local Session',
-							timing: makeNewSessionTiming()
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: LocalChatSessionUri.forSession('local-session'),
+					label: 'Local Session',
+					timing: makeNewSessionTiming()
+				}]);
 
 				mockChatSessionsService.registerChatSessionItemController(localChatSessionType, controller);
 				viewModel = createViewModel();
@@ -497,19 +425,13 @@ suite('AgentSessions', () => {
 			return runWithFakedTimers({}, async () => {
 				const resource = URI.parse('custom://my-session/path');
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: resource,
-							label: 'Test Session',
-							timing: makeNewSessionTiming()
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: resource,
+					label: 'Test Session',
+					timing: makeNewSessionTiming()
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = createViewModel();
 
 				await viewModel.resolve(undefined);
@@ -531,7 +453,7 @@ suite('AgentSessions', () => {
 					}
 				};
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				// Registering calls a refresh initially
 				assert.strictEqual(controllerCallCount, 1);
 
@@ -552,7 +474,7 @@ suite('AgentSessions', () => {
 			});
 		});
 
-		test('should not preserve sessions from non-resolved controllers', async () => {
+		test('should preserve sessions from non-resolved controllers', async () => {
 			return runWithFakedTimers({}, async () => {
 				let controller1CallCount = 0;
 				let controller2CallCount = 0;
@@ -585,6 +507,8 @@ suite('AgentSessions', () => {
 					get items() { return _items2; }
 				};
 
+				registerContribution('type-1');
+				registerContribution('type-2');
 				mockChatSessionsService.registerChatSessionItemController('type-1', controller1);
 				mockChatSessionsService.registerChatSessionItemController('type-2', controller2);
 
@@ -599,8 +523,8 @@ suite('AgentSessions', () => {
 				// Now resolve only type-2
 				await viewModel.resolve('type-2');
 
-				// Should still have only one session
-				assert.strictEqual(viewModel.sessions.length, 1);
+				// Per-provider resolution: type-1 sessions are preserved
+				assert.strictEqual(viewModel.sessions.length, 2);
 				// Controller 1 should not be called again
 				assert.strictEqual(controller1CallCount, 2);
 				// Controller 2 should be called again
@@ -608,6 +532,58 @@ suite('AgentSessions', () => {
 			});
 		});
 
+		test('should resolve providers independently (per-provider delayers)', async () => {
+			return runWithFakedTimers({}, async () => {
+				let controller1RefreshCount = 0;
+				let controller2RefreshCount = 0;
+				let _items1: IChatSessionItem[] = [];
+				let _items2: IChatSessionItem[] = [];
+
+				const controller1: IChatSessionItemController = {
+					onDidChangeChatSessionItems: Event.None,
+					refresh: async () => {
+						controller1RefreshCount++;
+						_items1 = [makeSimpleSessionItem('session-1', { label: `Session 1 v${controller1RefreshCount}` })];
+					},
+					get items() { return _items1; }
+				};
+
+				const controller2: IChatSessionItemController = {
+					onDidChangeChatSessionItems: Event.None,
+					refresh: async () => {
+						controller2RefreshCount++;
+						_items2 = [makeSimpleSessionItem('session-2', { label: `Session 2 v${controller2RefreshCount}` })];
+					},
+					get items() { return _items2; }
+				};
+
+				registerContribution('type-1');
+				registerContribution('type-2');
+				mockChatSessionsService.registerChatSessionItemController('type-1', controller1);
+				mockChatSessionsService.registerChatSessionItemController('type-2', controller2);
+
+				viewModel = createViewModel();
+
+				// Resolve all to populate both providers
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 2);
+
+				// Resolve only type-1: should refresh only type-1, preserve type-2
+				const type1RefreshBefore = controller1RefreshCount;
+				const type2RefreshBefore = controller2RefreshCount;
+				await viewModel.resolve('type-1');
+
+				assert.strictEqual(controller1RefreshCount, type1RefreshBefore + 1);
+				assert.strictEqual(controller2RefreshCount, type2RefreshBefore); // not refreshed
+				assert.strictEqual(viewModel.sessions.length, 2); // type-2 session preserved
+
+				// Resolve only type-2: should refresh only type-2, preserve type-1
+				await viewModel.resolve('type-2');
+				assert.strictEqual(controller2RefreshCount, type2RefreshBefore + 1);
+				assert.strictEqual(viewModel.sessions.length, 2); // type-1 session preserved
+			});
+		});
+
 		test('should accumulate providers when resolve is called with different provider types', async () => {
 			return runWithFakedTimers({}, async () => {
 				let resolveCount = 0;
@@ -639,6 +615,8 @@ suite('AgentSessions', () => {
 					get items() { return _items2; }
 				};
 
+				registerContribution('type-1');
+				registerContribution('type-2');
 				mockChatSessionsService.registerChatSessionItemController('type-1', controller1);
 				mockChatSessionsService.registerChatSessionItemController('type-2', controller2);
 
@@ -677,7 +655,10 @@ suite('AgentSessions', () => {
 				status: ChatSessionStatus.Completed,
 				isArchived: () => false,
 				setArchived: archived => { },
+				isPinned: () => false,
+				setPinned: pinned => { },
 				isRead: () => false,
+				isMarkedUnread: () => false,
 				setRead: read => { }
 			};
 
@@ -692,7 +673,10 @@ suite('AgentSessions', () => {
 				status: ChatSessionStatus.Completed,
 				isArchived: () => false,
 				setArchived: archived => { },
+				isPinned: () => false,
+				setPinned: pinned => { },
 				isRead: () => false,
+				isMarkedUnread: () => false,
 				setRead: read => { }
 			};
 
@@ -712,7 +696,10 @@ suite('AgentSessions', () => {
 				status: ChatSessionStatus.Completed,
 				isArchived: () => false,
 				setArchived: archived => { },
+				isPinned: () => false,
+				setPinned: pinned => { },
 				isRead: () => false,
+				isMarkedUnread: () => false,
 				setRead: read => { }
 			};
 
@@ -736,7 +723,10 @@ suite('AgentSessions', () => {
 				status: ChatSessionStatus.Completed,
 				isArchived: () => false,
 				setArchived: archived => { },
+				isPinned: () => false,
+				setPinned: pinned => { },
 				isRead: () => false,
+				isMarkedUnread: () => false,
 				setRead: read => { }
 			};
 
@@ -763,7 +753,7 @@ suite('AgentSessions', () => {
 
 		function createSession(overrides: Partial<IAgentSession> = {}): IAgentSession {
 			return {
-				providerType: 'test-type',
+				providerType: chatSessionTestType,
 				providerLabel: 'Test Provider',
 				icon: Codicon.chatSparkle,
 				resource: URI.parse('test://session'),
@@ -772,7 +762,10 @@ suite('AgentSessions', () => {
 				status: ChatSessionStatus.Completed,
 				isArchived: () => false,
 				setArchived: () => { },
+				isPinned: () => false,
+				setPinned: () => { },
 				isRead: () => false,
+				isMarkedUnread: () => false,
 				setRead: read => { },
 				...overrides
 			};
@@ -1046,11 +1039,7 @@ suite('AgentSessions', () => {
 		});
 
 		test('should register provider filter actions', () => {
-			const controller: IChatSessionItemController = {
-				onDidChangeChatSessionItems: Event.None,
-				refresh: async () => { },
-				get items() { return []; }
-			};
+			const controller = new StaticChatSessionItemController([]);
 
 			mockChatSessionsService.registerChatSessionItemController('custom-type-1', controller);
 
@@ -1071,11 +1060,7 @@ suite('AgentSessions', () => {
 			));
 
 			const chatSessionType = 'new-type';
-			const controller: IChatSessionItemController = {
-				onDidChangeChatSessionItems: Event.None,
-				refresh: async () => { },
-				get items() { return []; }
-			};
+			const controller = new StaticChatSessionItemController([]);
 
 			// Register provider after filter creation
 			mockChatSessionsService.registerChatSessionItemController(chatSessionType, controller);
@@ -1314,15 +1299,9 @@ suite('AgentSessions', () => {
 
 		test('should archive and unarchive sessions', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1342,15 +1321,9 @@ suite('AgentSessions', () => {
 
 		test('should fire onDidChangeSessions when archiving', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1368,15 +1341,9 @@ suite('AgentSessions', () => {
 
 		test('should not fire onDidChangeSessions when archiving with same value', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1397,20 +1364,14 @@ suite('AgentSessions', () => {
 
 		test('should preserve archived state from provider', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-1'),
-							label: 'Test Session',
-							archived: true,
-							timing: makeNewSessionTiming()
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-1'),
+					label: 'Test Session',
+					archived: true,
+					timing: makeNewSessionTiming()
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1422,20 +1383,14 @@ suite('AgentSessions', () => {
 
 		test('should override provider archived state with user preference', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-1'),
-							label: 'Test Session',
-							archived: true,
-							timing: makeNewSessionTiming()
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-1'),
+					label: 'Test Session',
+					archived: true,
+					timing: makeNewSessionTiming()
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1484,19 +1439,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-1'),
-							label: 'Session 1',
-							timing: futureSessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-1'),
+					label: 'Session 1',
+					timing: futureSessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1510,20 +1459,49 @@ suite('AgentSessions', () => {
 				// Mark as unread
 				session.setRead(false);
 				assert.strictEqual(session.isRead(), false);
+				assert.strictEqual(session.isMarkedUnread(), true);
+			});
+		});
+
+		test('should report isMarkedUnread only when explicitly marked unread', async () => {
+			return runWithFakedTimers({}, async () => {
+				const futureSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestStarted: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
+				};
+
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-1'),
+					label: 'Session 1',
+					timing: futureSessionTiming,
+				}]);
+
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+
+				// Naturally unread session is NOT marked unread (no explicit user action)
+				assert.strictEqual(session.isRead(), false);
+				assert.strictEqual(session.isMarkedUnread(), false);
+
+				// Mark as read, then explicitly mark as unread
+				session.setRead(true);
+				assert.strictEqual(session.isMarkedUnread(), false);
+
+				session.setRead(false);
+				assert.strictEqual(session.isMarkedUnread(), true);
 			});
 		});
 
 		test('should fire onDidChangeSessions when marking as read', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1543,15 +1521,9 @@ suite('AgentSessions', () => {
 
 		test('should not fire onDidChangeSessions when marking as read with same value', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1572,15 +1544,9 @@ suite('AgentSessions', () => {
 
 		test('should preserve read state after re-resolve', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1605,19 +1571,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2025, 10 /* November */, 2),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://old-session'),
-							label: 'Old Session',
-							timing: oldSessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://old-session'),
+					label: 'Old Session',
+					timing: oldSessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1636,19 +1596,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://new-session'),
-							label: 'New Session',
-							timing: newSessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://new-session'),
+					label: 'New Session',
+					timing: newSessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1668,19 +1622,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2026, 1 /* February */, 1),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-with-endtime'),
-							label: 'Session With EndTime',
-							timing: sessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-with-endtime'),
+					label: 'Session With EndTime',
+					timing: sessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1700,19 +1648,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: undefined,
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-no-endtime'),
-							label: 'Session Without EndTime',
-							timing: sessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-no-endtime'),
+					label: 'Session Without EndTime',
+					timing: sessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1731,19 +1673,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://new-session'),
-							label: 'New Session',
-							timing: newSessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://new-session'),
+					label: 'New Session',
+					timing: newSessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1770,19 +1706,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://new-session'),
-							label: 'New Session',
-							timing: newSessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://new-session'),
+					label: 'New Session',
+					timing: newSessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1815,19 +1745,13 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
 				};
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://new-session'),
-							label: 'New Session',
-							timing: newSessionTiming,
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://new-session'),
+					label: 'New Session',
+					timing: newSessionTiming,
+				}]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1857,18 +1781,12 @@ suite('AgentSessions', () => {
 					lastRequestEnded: Date.UTC(2025, 10 /* November */, 2),
 				};
 
-				const chatSessionType = 'test-type';
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://old-session'),
-							label: 'Old Session',
-							timing: oldSessionTiming,
-						}];
-					}
-				};
+				const chatSessionType = chatSessionTestType;
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://old-session'),
+					label: 'Old Session',
+					timing: oldSessionTiming,
+				}]);
 
 				mockChatSessionsService.registerChatSessionItemController(chatSessionType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
@@ -1931,7 +1849,7 @@ suite('AgentSessions', () => {
 					get items() { return _items; }
 				};
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -1961,7 +1879,7 @@ suite('AgentSessions', () => {
 					get items() { return _items; }
 				};
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				await viewModel.resolve(undefined);
@@ -2031,13 +1949,7 @@ suite('AgentSessions', () => {
 				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
 				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
 				mockChatSessionsService.registerChatSessionItemController(AgentSessionProviders.Local, controller);
 				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
@@ -2058,13 +1970,7 @@ suite('AgentSessions', () => {
 				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
 				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
 				mockChatSessionsService.registerChatSessionItemController(AgentSessionProviders.Background, controller);
 				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
@@ -2085,13 +1991,7 @@ suite('AgentSessions', () => {
 				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
 				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
 				mockChatSessionsService.registerChatSessionItemController(AgentSessionProviders.Cloud, controller);
 				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
@@ -2113,18 +2013,12 @@ suite('AgentSessions', () => {
 				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
 
 				const customIcon = ThemeIcon.fromId('beaker');
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [{
-							resource: URI.parse('test://session-1'),
-							label: 'Test Session',
-							iconPath: customIcon,
-							timing: makeNewSessionTiming()
-						}];
-					}
-				};
+				const controller = new StaticChatSessionItemController([{
+					resource: URI.parse('test://session-1'),
+					label: 'Test Session',
+					iconPath: customIcon,
+					timing: makeNewSessionTiming()
+				}]);
 
 				mockChatSessionsService.registerChatSessionItemController('custom-type', controller);
 				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
@@ -2143,13 +2037,7 @@ suite('AgentSessions', () => {
 				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
 				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
 
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
 				mockChatSessionsService.registerChatSessionItemController('custom-type', controller);
 				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
@@ -2199,15 +2087,9 @@ suite('AgentSessions', () => {
 
 		test('should not resolve if lifecycle will shutdown', async () => {
 			return runWithFakedTimers({}, async () => {
-				const controller: IChatSessionItemController = {
-					onDidChangeChatSessionItems: Event.None,
-					refresh: async () => { },
-					get items() {
-						return [makeSimpleSessionItem('session-1')];
-					}
-				};
+				const controller = new StaticChatSessionItemController([makeSimpleSessionItem('session-1')]);
 
-				mockChatSessionsService.registerChatSessionItemController('test-type', controller);
+				mockChatSessionsService.registerChatSessionItemController(chatSessionTestType, controller);
 				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
 
 				// Set willShutdown to true
@@ -2258,9 +2140,11 @@ suite('AgentSessions', () => {
 
 }); // End of Agent Sessions suite
 
+const chatSessionTestType = 'test-type';
+
 function makeSimpleSessionItem(id: string, overrides?: Partial<IChatSessionItem>): IChatSessionItem {
 	return {
-		resource: URI.parse(`test://${id}`),
+		resource: URI.parse(`${chatSessionTestType}://${id}`),
 		label: `Session ${id}`,
 		timing: makeNewSessionTiming(),
 		...overrides
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.ts
index 336955f5bb0..cbf18d99540 100644
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.ts
@@ -39,7 +39,10 @@ suite('AgentSessionsAccessibilityProvider', () => {
 			changes: undefined,
 			isArchived: () => false,
 			setArchived: () => { },
+			isPinned: () => false,
+			setPinned: () => { },
 			isRead: () => true,
+			isMarkedUnread: () => false,
 			setRead: () => { },
 		};
 	}
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts
index aeee47e33c3..b4169caa93c 100644
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts
@@ -6,47 +6,13 @@
 import assert from 'assert';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { AgentSessionsDataSource, AgentSessionListItem, IAgentSessionsFilter, sessionDateFromNow } from '../../../browser/agentSessions/agentSessionsViewer.js';
-import { AgentSessionSection, IAgentSession, IAgentSessionSection, IAgentSessionsModel, isAgentSessionSection } from '../../../browser/agentSessions/agentSessionsModel.js';
+import { AgentSessionsDataSource, AgentSessionListItem, IAgentSessionsFilter, sessionDateFromNow, getRepositoryName, AgentSessionsSorter, groupAgentSessionsByDate } from '../../../browser/agentSessions/agentSessionsViewer.js';
+import { AgentSessionSection, IAgentSession, IAgentSessionSection, IAgentSessionsModel, isAgentSession, isAgentSessionSection, isAgentSessionShowLess, isAgentSessionShowMore } from '../../../browser/agentSessions/agentSessionsModel.js';
 import { ChatSessionStatus } from '../../../common/chatSessionsService.js';
 import { ITreeSorter } from '../../../../../../base/browser/ui/tree/tree.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Event } from '../../../../../../base/common/event.js';
-import { AgentSessionsGrouping } from '../../../browser/agentSessions/agentSessionsFilter.js';
-import { getAgentSessionTime } from '../../../browser/agentSessions/agentSessions.js';
-import { IChatSessionTiming } from '../../../common/chatService/chatService.js';
-
-suite('getAgentSessionTime', () => {
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('returns lastRequestStarted when available', () => {
-		const timing: IChatSessionTiming = {
-			created: 1000,
-			lastRequestStarted: 2000,
-			lastRequestEnded: 3000,
-		};
-		assert.strictEqual(getAgentSessionTime(timing), 2000);
-	});
-
-	test('returns lastRequestStarted even when lastRequestEnded is undefined', () => {
-		const timing: IChatSessionTiming = {
-			created: 1000,
-			lastRequestStarted: 2000,
-			lastRequestEnded: undefined,
-		};
-		assert.strictEqual(getAgentSessionTime(timing), 2000);
-	});
-
-	test('returns created when lastRequestStarted is undefined', () => {
-		const timing: IChatSessionTiming = {
-			created: 1000,
-			lastRequestStarted: undefined,
-			lastRequestEnded: undefined,
-		};
-		assert.strictEqual(getAgentSessionTime(timing), 1000);
-	});
-});
+import { AgentSessionsGrouping, AgentSessionsSorting } from '../../../browser/agentSessions/agentSessionsFilter.js';
 
 suite('sessionDateFromNow', () => {
 
@@ -91,6 +57,22 @@ suite('sessionDateFromNow', () => {
 		assert.ok(result.includes('day'), `Expected days ago, got: ${result}`);
 		assert.ok(!result.includes('1 day') && !result.includes('2 days'), `Should not be 1 or 2 days ago, got: ${result}`);
 	});
+
+	test('appends "ago" when appendAgoLabel is true', () => {
+		const now = Date.now();
+		const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+
+		const yesterday = startOfToday - ONE_DAY / 2;
+		assert.strictEqual(sessionDateFromNow(yesterday, true), '1 day ago');
+
+		const startOfYesterday = startOfToday - ONE_DAY;
+		const twoDaysAgo = startOfYesterday - ONE_DAY / 2;
+		assert.strictEqual(sessionDateFromNow(twoDaysAgo, true), '2 days ago');
+
+		const fiveDaysAgo = startOfToday - 5 * ONE_DAY;
+		const result = sessionDateFromNow(fiveDaysAgo, true);
+		assert.ok(result.includes('ago'), `Expected "ago" in result, got: ${result}`);
+	});
 });
 
 suite('AgentSessionsDataSource', () => {
@@ -104,6 +86,7 @@ suite('AgentSessionsDataSource', () => {
 		id: string;
 		status: ChatSessionStatus;
 		isArchived: boolean;
+		isPinned: boolean;
 		isRead: boolean;
 		hasChanges: boolean;
 		startTime: number;
@@ -129,7 +112,10 @@ suite('AgentSessionsDataSource', () => {
 			badge: overrides.badge,
 			isArchived: () => overrides.isArchived ?? false,
 			setArchived: () => { },
+			isPinned: () => overrides.isPinned ?? false,
+			setPinned: () => { },
 			isRead: () => overrides.isRead ?? true,
+			isMarkedUnread: () => false,
 			setRead: () => { },
 		};
 	}
@@ -139,8 +125,8 @@ suite('AgentSessionsDataSource', () => {
 			sessions,
 			resolved: true,
 			getSession: () => undefined,
-			onWillResolve: Event.None,
-			onDidResolve: Event.None,
+			onWillResolve: Event.None as Event<string>,
+			onDidResolve: Event.None as Event<string>,
 			onDidChangeSessions: Event.None,
 			onDidChangeSessionArchivedState: Event.None,
 			resolve: async () => { },
@@ -151,12 +137,13 @@ suite('AgentSessionsDataSource', () => {
 		groupBy?: AgentSessionsGrouping;
 		exclude?: (session: IAgentSession) => boolean;
 		excludeRead?: boolean;
+		repositoryGroupCapped?: boolean;
 	}): IAgentSessionsFilter {
 		return {
 			onDidChange: Event.None,
 			groupResults: () => options.groupBy,
 			exclude: options.exclude ?? (() => false),
-			getExcludes: () => ({ providers: [], states: [], archived: false, read: options.excludeRead ?? false }),
+			getExcludes: () => ({ providers: [], states: [], archived: false, read: options.excludeRead ?? false, repositoryGroupCapped: options.repositoryGroupCapped ?? true }),
 			isDefault: () => true,
 			reset: () => { },
 		};
@@ -165,9 +152,9 @@ suite('AgentSessionsDataSource', () => {
 	function createMockSorter(): ITreeSorter<IAgentSession> {
 		return {
 			compare: (a, b) => {
-				// Sort by end time, most recent first
-				const aTime = getAgentSessionTime(a.timing);
-				const bTime = getAgentSessionTime(b.timing);
+				// Sort by creation time, most recent first
+				const aTime = a.timing.created;
+				const bTime = b.timing.created;
 				return bTime - aTime;
 			}
 		};
@@ -499,6 +486,173 @@ suite('AgentSessionsDataSource', () => {
 			assert.strictEqual(sections[0].section, AgentSessionSection.More);
 			assert.strictEqual(sections[0].sessions.length, 2);
 		});
+
+		test('pinned sessions appear in Pinned section at the top with date grouping', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'pinned1', isPinned: true, startTime: now - WEEK_THRESHOLD - ONE_DAY }),
+				createMockSession({ id: 'today', startTime: now }),
+				createMockSession({ id: 'pinned2', isPinned: true, startTime: now }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, sorter));
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			assert.strictEqual(sections[0].section, AgentSessionSection.Pinned);
+			assert.strictEqual(sections[0].sessions.length, 2);
+			assert.strictEqual(sections[1].section, AgentSessionSection.Today);
+			assert.strictEqual(sections[1].sessions.length, 1);
+		});
+
+		test('archived pinned sessions go to Archived, not Pinned', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'archived-pinned', isPinned: true, isArchived: true, startTime: now }),
+				createMockSession({ id: 'pinned', isPinned: true, startTime: now }),
+				createMockSession({ id: 'today', startTime: now }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, sorter));
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			const pinnedSection = sections.find(s => s.section === AgentSessionSection.Pinned);
+			const archivedSection = sections.find(s => s.section === AgentSessionSection.Archived);
+
+			assert.ok(pinnedSection);
+			assert.strictEqual(pinnedSection.sessions.length, 1);
+			assert.strictEqual(pinnedSection.sessions[0].label, 'Session pinned');
+
+			assert.ok(archivedSection);
+			assert.strictEqual(archivedSection.sessions.length, 1);
+			assert.strictEqual(archivedSection.sessions[0].label, 'Session archived-pinned');
+		});
+
+		test('pinned sessions are always shown above the cap with capped grouping', () => {
+			const now = Date.now();
+			const sessions = [
+				// Recent unpinned sessions fill the top 3 by time
+				createMockSession({ id: 's1', startTime: now }),
+				createMockSession({ id: 's2', startTime: now - ONE_DAY }),
+				createMockSession({ id: 's3', startTime: now - 2 * ONE_DAY }),
+				// Unpinned overflow
+				createMockSession({ id: 's4', startTime: now - 3 * ONE_DAY }),
+				// Two pinned sessions with old timestamps — would fall outside top 3 by time alone
+				createMockSession({ id: 'pinned1', isPinned: true, startTime: now - 4 * ONE_DAY }),
+				createMockSession({ id: 'pinned2', isPinned: true, startTime: now - 5 * ONE_DAY }),
+			];
+
+			const filter = createMockFilter({
+				groupBy: AgentSessionsGrouping.Capped,
+				excludeRead: false
+			});
+			const sorter = createMockSorter();
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, sorter));
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+			const topSessions = result.filter((r): r is IAgentSession => !isAgentSessionSection(r));
+
+			// Pinned sessions first, then up to 3 non-pinned sessions
+			assert.deepStrictEqual(topSessions.map(s => s.label), [
+				'Session pinned1',
+				'Session pinned2',
+				'Session s1',
+				'Session s2',
+				'Session s3',
+			]);
+
+			// Only unpinned overflow goes to More
+			const moreSection = sections.find(s => s.section === AgentSessionSection.More);
+			assert.ok(moreSection);
+			assert.deepStrictEqual(moreSection.sessions.map(s => s.label), [
+				'Session s4',
+			]);
+		});
+
+		test('more pinned sessions than cap limit are all shown', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'pinned1', isPinned: true, startTime: now }),
+				createMockSession({ id: 'pinned2', isPinned: true, startTime: now - ONE_DAY }),
+				createMockSession({ id: 'pinned3', isPinned: true, startTime: now - 2 * ONE_DAY }),
+				createMockSession({ id: 'pinned4', isPinned: true, startTime: now - 3 * ONE_DAY }),
+				// Unpinned session — still fits within the cap of 3 non-pinned
+				createMockSession({ id: 'unpinned1', startTime: now - 4 * ONE_DAY }),
+			];
+
+			const filter = createMockFilter({
+				groupBy: AgentSessionsGrouping.Capped,
+				excludeRead: false
+			});
+			const sorter = createMockSorter();
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, sorter));
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+			const topSessions = result.filter((r): r is IAgentSession => !isAgentSessionSection(r));
+
+			// All 4 pinned + 1 unpinned (fits within cap of 3 non-pinned)
+			assert.deepStrictEqual(topSessions.map(s => s.label), [
+				'Session pinned1',
+				'Session pinned2',
+				'Session pinned3',
+				'Session pinned4',
+				'Session unpinned1',
+			]);
+
+			// No More section needed since unpinned count (1) is within cap (3)
+			const moreSection = sections.find(s => s.section === AgentSessionSection.More);
+			assert.strictEqual(moreSection, undefined);
+		});
+
+		test('unpinned NeedsInput session appears in the non-pinned section below pinned', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'needs-input', status: ChatSessionStatus.NeedsInput, startTime: now }),
+				createMockSession({ id: 'pinned1', isPinned: true, startTime: now }),
+				createMockSession({ id: 'pinned2', isPinned: true, startTime: now - ONE_DAY }),
+				createMockSession({ id: 'pinned3', isPinned: true, startTime: now - 2 * ONE_DAY }),
+				createMockSession({ id: 's1', startTime: now }),
+			];
+
+			const filter = createMockFilter({
+				groupBy: AgentSessionsGrouping.Capped,
+				excludeRead: false
+			});
+			// Use real sorter to exercise NeedsInput prioritization in capped mode
+			const sorter = new AgentSessionsSorter();
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, sorter));
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+			const topSessions = result.filter((r): r is IAgentSession => !isAgentSessionSection(r));
+
+			// Pinned sessions come first, then up to 3 non-pinned (NeedsInput + s1 both fit in cap)
+			assert.deepStrictEqual(topSessions.map(s => s.label), [
+				'Session pinned1',
+				'Session pinned2',
+				'Session pinned3',
+				'Session needs-input',
+				'Session s1',
+			]);
+
+			// All non-pinned fit within cap of 3, so no More section
+			const moreSection = sections.find(s => s.section === AgentSessionSection.More);
+			assert.strictEqual(moreSection, undefined);
+		});
 	});
 
 	suite('groupSessionsByRepository', () => {
@@ -798,5 +952,483 @@ suite('AgentSessionsDataSource', () => {
 
 			assert.deepStrictEqual(result.map(s => s.label), ['vscode']);
 		});
+
+		test('Other group appears after named repos and before Archived', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'no-repo', startTime: now }),
+				createMockSession({ id: 'repo-a', startTime: now - 1, metadata: { repositoryPath: '/path/alpha' } }),
+				createMockSession({ id: 'archived', startTime: now - 2, isArchived: true }),
+				createMockSession({ id: 'repo-b', startTime: now - 3, metadata: { repositoryPath: '/path/beta' } }),
+				createMockSession({ id: 'no-repo-2', startTime: now - 4 }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter()));
+			const result = getSectionsFromResult(dataSource.getChildren(createMockModel(sessions)));
+
+			const labels = result.map(s => s.label);
+			const otherIndex = labels.indexOf('Other');
+			const archivedIndex = labels.indexOf('Archived');
+
+			// Other must exist and contain the 2 sessions without repo info
+			assert.ok(otherIndex !== -1, 'Other section should be present');
+			assert.strictEqual(result[otherIndex].sessions.length, 2);
+
+			// Other must come after all named repo groups
+			for (let i = 0; i < otherIndex; i++) {
+				assert.strictEqual(result[i].section, AgentSessionSection.Repository, `section at index ${i} should be a named repository group`);
+			}
+
+			// Archived must come after Other
+			assert.ok(archivedIndex > otherIndex, 'Archived section should come after Other');
+		});
+
+		test('pinned sessions are top-level items before alphabetized repository sections', () => {
+			const now = Date.now();
+			const pinnedSession = createMockSession({ id: 'pinned', isPinned: true, startTime: now + 10, metadata: { repositoryPath: '/path/zebra' } });
+			const sessions = [
+				createMockSession({ id: 'other', startTime: now + 9 }),
+				createMockSession({ id: 'zebra', startTime: now + 8, metadata: { repositoryPath: '/path/zebra' } }),
+				createMockSession({ id: 'alpha', startTime: now + 7, metadata: { repositoryPath: '/path/Alpha' } }),
+				createMockSession({ id: 'archived', isArchived: true, startTime: now + 6, metadata: { repositoryPath: '/path/middle' } }),
+				pinnedSession,
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter()));
+			const result = Array.from(dataSource.getChildren(createMockModel(sessions)));
+
+			assert.ok(isAgentSession(result[0]), 'first item should be the pinned session');
+			assert.strictEqual(result[0].resource.toString(), pinnedSession.resource.toString());
+
+			const sections = result.filter((item): item is IAgentSessionSection => isAgentSessionSection(item));
+			assert.deepStrictEqual(sections.map(section => ({ label: section.label, section: section.section, count: section.sessions.length })), [
+				{ label: 'Alpha', section: AgentSessionSection.Repository, count: 1 },
+				{ label: 'zebra', section: AgentSessionSection.Repository, count: 1 },
+				{ label: 'Other', section: AgentSessionSection.Repository, count: 1 },
+				{ label: 'Archived', section: AgentSessionSection.Archived, count: 1 },
+			]);
+		});
+	});
+
+	suite('repositoryGroupLimit', () => {
+
+		test('caps repo group children at limit and appends show-more item', () => {
+			const now = Date.now();
+			const sessions = Array.from({ length: 8 }, (_, i) =>
+				createMockSession({ id: `s${i}`, metadata: { repositoryNwo: 'owner/vscode' }, startTime: now - i * 1000 })
+			);
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter(), 5));
+			const model = createMockModel(sessions);
+			const topLevel = Array.from(dataSource.getChildren(model));
+			const section = topLevel.find(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Repository) as IAgentSessionSection;
+			assert.ok(section);
+
+			const children = Array.from(dataSource.getChildren(section));
+			assert.strictEqual(children.length, 6); // 5 sessions + 1 show-more
+			const showMore = children[5];
+			assert.ok(isAgentSessionShowMore(showMore));
+			assert.strictEqual(showMore.remainingCount, 3);
+			assert.strictEqual(showMore.sectionLabel, 'vscode');
+		});
+
+		test('does not cap when group has fewer items than limit', () => {
+			const now = Date.now();
+			const sessions = Array.from({ length: 3 }, (_, i) =>
+				createMockSession({ id: `s${i}`, metadata: { repositoryNwo: 'owner/vscode' }, startTime: now - i * 1000 })
+			);
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter(), 5));
+			const model = createMockModel(sessions);
+			const topLevel = Array.from(dataSource.getChildren(model));
+			const section = topLevel.find(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Repository) as IAgentSessionSection;
+
+			const children = Array.from(dataSource.getChildren(section));
+			assert.strictEqual(children.length, 3);
+			assert.ok(!children.some(isAgentSessionShowMore));
+		});
+
+		test('expanding a group removes the cap and appends show-less item', () => {
+			const now = Date.now();
+			const sessions = Array.from({ length: 8 }, (_, i) =>
+				createMockSession({ id: `s${i}`, metadata: { repositoryNwo: 'owner/vscode' }, startTime: now - i * 1000 })
+			);
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter(), 5));
+			const model = createMockModel(sessions);
+			const topLevel = Array.from(dataSource.getChildren(model));
+			const section = topLevel.find(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Repository) as IAgentSessionSection;
+
+			dataSource.expandRepositoryGroup('vscode');
+			const children = Array.from(dataSource.getChildren(section));
+			assert.strictEqual(children.length, 9); // 8 sessions + 1 show-less
+			assert.ok(!children.some(isAgentSessionShowMore));
+			const showLess = children[8];
+			assert.ok(isAgentSessionShowLess(showLess));
+			assert.strictEqual(showLess.sectionLabel, 'vscode');
+		});
+
+		test('does not cap non-repository sections', () => {
+			const now = Date.now();
+			const sessions = Array.from({ length: 8 }, (_, i) =>
+				createMockSession({ id: `s${i}`, startTime: now - i * 1000 })
+			);
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter(), 5));
+			const model = createMockModel(sessions);
+			const topLevel = Array.from(dataSource.getChildren(model));
+			const todaySection = topLevel.find(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Today) as IAgentSessionSection;
+
+			const children = Array.from(dataSource.getChildren(todaySection));
+			assert.strictEqual(children.length, 8);
+			assert.ok(!children.some(isAgentSessionShowMore));
+		});
+
+		test('does not cap when repositoryGroupLimit is not set', () => {
+			const now = Date.now();
+			const sessions = Array.from({ length: 8 }, (_, i) =>
+				createMockSession({ id: `s${i}`, metadata: { repositoryNwo: 'owner/vscode' }, startTime: now - i * 1000 })
+			);
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter()));
+			const model = createMockModel(sessions);
+			const topLevel = Array.from(dataSource.getChildren(model));
+			const section = topLevel.find(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Repository) as IAgentSessionSection;
+
+			const children = Array.from(dataSource.getChildren(section));
+			assert.strictEqual(children.length, 8);
+			assert.ok(!children.some(isAgentSessionShowMore));
+		});
+
+		test('does not cap when repositoryGroupCapped filter is disabled', () => {
+			const now = Date.now();
+			const sessions = Array.from({ length: 8 }, (_, i) =>
+				createMockSession({ id: `s${i}`, metadata: { repositoryNwo: 'owner/vscode' }, startTime: now - i * 1000 })
+			);
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Repository, repositoryGroupCapped: false });
+			const dataSource = disposables.add(new AgentSessionsDataSource(filter, createMockSorter(), 5));
+			const model = createMockModel(sessions);
+			const topLevel = Array.from(dataSource.getChildren(model));
+			const section = topLevel.find(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Repository) as IAgentSessionSection;
+
+			const children = Array.from(dataSource.getChildren(section));
+			assert.strictEqual(children.length, 8);
+			assert.ok(!children.some(isAgentSessionShowMore));
+		});
+	});
+
+	suite('getRepositoryName', () => {
+
+		test('returns metadata.name when owner and name are present', () => {
+			const session = createMockSession({ id: '1', metadata: { owner: 'microsoft', name: 'vscode' } });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns repo from repositoryNwo', () => {
+			const session = createMockSession({ id: '1', metadata: { repositoryNwo: 'microsoft/vscode' } });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns repo from repository URL', () => {
+			const session = createMockSession({ id: '1', metadata: { repository: 'https://github.com/microsoft/vscode' } });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns repo from repositoryPath basename', () => {
+			const session = createMockSession({ id: '1', metadata: { repositoryPath: '/Users/user/Projects/vscode' } });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns parent repo name from worktree path', () => {
+			const session = createMockSession({ id: '1', metadata: { worktreePath: '/Users/user/Projects/vscode.worktrees/my-branch' } });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns name from badge with $(repo) prefix', () => {
+			const session = createMockSession({ id: '1', badge: '$(repo) vscode' });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns name from badge with $(folder) prefix', () => {
+			const session = createMockSession({ id: '1', badge: '$(folder) my-project' });
+			assert.strictEqual(getRepositoryName(session), 'my-project');
+		});
+
+		test('metadata repo name takes priority over badge name', () => {
+			const session = createMockSession({ id: '1', metadata: { owner: 'microsoft', name: 'vscode' }, badge: '$(folder) copilot-worktree-branch' });
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+
+		test('returns undefined when no repo info is available', () => {
+			const session = createMockSession({ id: '1' });
+			assert.strictEqual(getRepositoryName(session), undefined);
+		});
+
+		test('badge name can differ from metadata repo name (worktree scenario)', () => {
+			// This is the key scenario: a session in a worktree where the badge shows
+			// the worktree folder name but the repo name (from metadata) is different.
+			// The renderer uses this to decide whether to hide the badge when grouped by repo.
+			const session = createMockSession({
+				id: '1',
+				metadata: { repositoryPath: '/Users/user/Projects/vscode' },
+				badge: '$(folder) copilot-worktree-2026-03-13T00-27-32',
+			});
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+			// Badge text shows a different name than the repo — renderer should NOT hide it
+		});
+
+		test('archived session still returns repo name from metadata', () => {
+			// Archived sessions are grouped under "Archived", not under a repo section,
+			// so the renderer must keep their badge visible even when the badge name
+			// matches the repo name. getRepositoryName still resolves normally.
+			const session = createMockSession({
+				id: '1',
+				isArchived: true,
+				metadata: { repositoryPath: '/Users/user/Projects/vscode' },
+				badge: '$(repo) vscode',
+			});
+			assert.strictEqual(getRepositoryName(session), 'vscode');
+		});
+	});
+});
+
+suite('AgentSessionsSorter', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createSession(overrides: Partial<{
+		id: string;
+		status: ChatSessionStatus;
+		isArchived: boolean;
+		isPinned: boolean;
+		created: number;
+		lastRequestStarted: number;
+		lastRequestEnded: number;
+	}>): IAgentSession {
+		const now = Date.now();
+		return {
+			providerType: 'test',
+			providerLabel: 'Test',
+			resource: URI.parse(`test://session/${overrides.id ?? 'default'}`),
+			status: overrides.status ?? ChatSessionStatus.Completed,
+			label: `Session ${overrides.id ?? 'default'}`,
+			icon: Codicon.terminal,
+			timing: {
+				created: overrides.created ?? now,
+				lastRequestEnded: overrides.lastRequestEnded,
+				lastRequestStarted: overrides.lastRequestStarted,
+			},
+			changes: undefined,
+			metadata: undefined,
+			isArchived: () => overrides.isArchived ?? false,
+			setArchived: () => { },
+			isPinned: () => overrides.isPinned ?? false,
+			setPinned: () => { },
+			isRead: () => true,
+			isMarkedUnread: () => false,
+			setRead: () => { },
+		};
+	}
+
+	test('default: sorts by creation time (most recent first)', () => {
+		const sorter = new AgentSessionsSorter();
+		const old = createSession({ id: 'old', created: 1000 });
+		const recent = createSession({ id: 'recent', created: 2000 });
+
+		const sorted = [old, recent].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session recent', 'Session old']);
+	});
+
+	test('default: archived sessions come last', () => {
+		const sorter = new AgentSessionsSorter();
+		const archived = createSession({ id: 'archived', isArchived: true, created: 3000 });
+		const active = createSession({ id: 'active', created: 1000 });
+
+		const sorted = [archived, active].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session active', 'Session archived']);
+	});
+
+	test('default: does NOT prioritize needs-input sessions', () => {
+		const sorter = new AgentSessionsSorter();
+		const needsInput = createSession({ id: 'needs', status: ChatSessionStatus.NeedsInput, created: 1000 });
+		const completed = createSession({ id: 'done', status: ChatSessionStatus.Completed, created: 2000 });
+
+		const sorted = [needsInput, completed].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session done', 'Session needs']);
+	});
+
+	test('prioritizeActive: needs-input sessions come first', () => {
+		const sorter = new AgentSessionsSorter();
+		const needsInput = createSession({ id: 'needs', status: ChatSessionStatus.NeedsInput, created: 1000 });
+		const completed = createSession({ id: 'done', status: ChatSessionStatus.Completed, created: 2000 });
+
+		const sorted = [completed, needsInput].sort((a, b) => sorter.compare(a, b, true));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session needs', 'Session done']);
+	});
+
+	test('prioritizeActive: archived still come last when not active', () => {
+		const sorter = new AgentSessionsSorter();
+		const archived = createSession({ id: 'archived', isArchived: true, created: 3000 });
+		const active = createSession({ id: 'active', created: 1000 });
+
+		const sorted = [archived, active].sort((a, b) => sorter.compare(a, b, true));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session active', 'Session archived']);
+	});
+
+	test('prioritizeActive: uses lastRequestStarted for time sorting', () => {
+		const sorter = new AgentSessionsSorter();
+		const recentlyActive = createSession({ id: 'recent-active', created: 1000, lastRequestStarted: 5000 });
+		const recentlyCreated = createSession({ id: 'recent-created', created: 3000 });
+
+		const sorted = [recentlyCreated, recentlyActive].sort((a, b) => sorter.compare(a, b, true));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session recent-active', 'Session recent-created']);
+	});
+
+	test('pinned sessions come before non-pinned sessions', () => {
+		const sorter = new AgentSessionsSorter();
+		const pinned = createSession({ id: 'pinned', isPinned: true, created: 1000 });
+		const regular = createSession({ id: 'regular', created: 2000 });
+
+		const sorted = [regular, pinned].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session pinned', 'Session regular']);
+	});
+
+	test('archived pinned sessions do not sort before non-archived', () => {
+		const sorter = new AgentSessionsSorter();
+		const archivedPinned = createSession({ id: 'archived-pinned', isPinned: true, isArchived: true, created: 3000 });
+		const regular = createSession({ id: 'regular', created: 1000 });
+
+		const sorted = [archivedPinned, regular].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session regular', 'Session archived-pinned']);
+	});
+
+	test('sortBy Created: sorts by creation time regardless of lastRequestEnded', () => {
+		const sorter = new AgentSessionsSorter(() => AgentSessionsSorting.Created);
+		const olderCreated = createSession({ id: 'older', created: 1000, lastRequestEnded: 5000 });
+		const newerCreated = createSession({ id: 'newer', created: 3000, lastRequestEnded: 2000 });
+
+		const sorted = [olderCreated, newerCreated].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session newer', 'Session older']);
+	});
+
+	test('sortBy Updated: sorts by lastRequestEnded', () => {
+		const sorter = new AgentSessionsSorter(() => AgentSessionsSorting.Updated);
+		const recentlyUpdated = createSession({ id: 'updated', created: 1000, lastRequestEnded: 5000 });
+		const recentlyCreated = createSession({ id: 'created', created: 3000, lastRequestEnded: 2000 });
+
+		const sorted = [recentlyCreated, recentlyUpdated].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session updated', 'Session created']);
+	});
+
+	test('sortBy Updated: falls back to created when lastRequestEnded is undefined', () => {
+		const sorter = new AgentSessionsSorter(() => AgentSessionsSorting.Updated);
+		const withRequest = createSession({ id: 'with-request', created: 1000, lastRequestEnded: 3000 });
+		const withoutRequest = createSession({ id: 'no-request', created: 4000 });
+
+		const sorted = [withRequest, withoutRequest].sort((a, b) => sorter.compare(a, b));
+		assert.deepStrictEqual(sorted.map(s => s.label), ['Session no-request', 'Session with-request']);
+	});
+});
+
+suite('groupAgentSessionsByDate with sortBy', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createSession(overrides: Partial<{
+		id: string;
+		isArchived: boolean;
+		isPinned: boolean;
+		created: number;
+		lastRequestEnded: number;
+	}>): IAgentSession {
+		return {
+			providerType: 'test',
+			providerLabel: 'Test',
+			resource: URI.parse(`test://session/${overrides.id ?? 'default'}`),
+			status: ChatSessionStatus.Completed,
+			label: `Session ${overrides.id ?? 'default'}`,
+			icon: Codicon.terminal,
+			timing: {
+				created: overrides.created ?? Date.now(),
+				lastRequestEnded: overrides.lastRequestEnded,
+				lastRequestStarted: undefined,
+			},
+			changes: undefined,
+			metadata: undefined,
+			isArchived: () => overrides.isArchived ?? false,
+			setArchived: () => { },
+			isPinned: () => overrides.isPinned ?? false,
+			setPinned: () => { },
+			isRead: () => true,
+			isMarkedUnread: () => false,
+			setRead: () => { },
+		};
+	}
+
+	test('default (Created): buckets by created time', () => {
+		const now = Date.now();
+		const tenDaysAgo = now - 10 * 24 * 60 * 60 * 1000;
+
+		const oldSession = createSession({ id: 'old', created: tenDaysAgo, lastRequestEnded: now });
+
+		const grouped = groupAgentSessionsByDate([oldSession]);
+		const todaySessions = grouped.get(AgentSessionSection.Today)!.sessions;
+		const olderSessions = grouped.get(AgentSessionSection.Older)!.sessions;
+
+		assert.deepStrictEqual(todaySessions.length, 0);
+		assert.deepStrictEqual(olderSessions.length, 1);
+	});
+
+	test('Updated: session created long ago but recently updated goes into Today', () => {
+		const now = Date.now();
+		const tenDaysAgo = now - 10 * 24 * 60 * 60 * 1000;
+
+		const oldButUpdated = createSession({ id: 'old-updated', created: tenDaysAgo, lastRequestEnded: now });
+
+		const grouped = groupAgentSessionsByDate([oldButUpdated], AgentSessionsSorting.Updated);
+		const todaySessions = grouped.get(AgentSessionSection.Today)!.sessions;
+		const olderSessions = grouped.get(AgentSessionSection.Older)!.sessions;
+
+		assert.deepStrictEqual(todaySessions.length, 1);
+		assert.deepStrictEqual(olderSessions.length, 0);
+	});
+
+	test('Updated: falls back to created when lastRequestEnded is undefined', () => {
+		const now = Date.now();
+		const tenDaysAgo = now - 10 * 24 * 60 * 60 * 1000;
+
+		const oldNoUpdate = createSession({ id: 'old-no-update', created: tenDaysAgo });
+
+		const grouped = groupAgentSessionsByDate([oldNoUpdate], AgentSessionsSorting.Updated);
+		const todaySessions = grouped.get(AgentSessionSection.Today)!.sessions;
+		const olderSessions = grouped.get(AgentSessionSection.Older)!.sessions;
+
+		assert.deepStrictEqual(todaySessions.length, 0);
+		assert.deepStrictEqual(olderSessions.length, 1);
+	});
+
+	test('Updated: pinned and archived sessions are not affected by sortBy', () => {
+		const now = Date.now();
+		const tenDaysAgo = now - 10 * 24 * 60 * 60 * 1000;
+
+		const pinnedOld = createSession({ id: 'pinned', created: tenDaysAgo, lastRequestEnded: now, isPinned: true });
+		const archivedOld = createSession({ id: 'archived', created: tenDaysAgo, lastRequestEnded: now, isArchived: true });
+
+		const grouped = groupAgentSessionsByDate([pinnedOld, archivedOld], AgentSessionsSorting.Updated);
+		const pinnedSessions = grouped.get(AgentSessionSection.Pinned)!.sessions;
+		const archivedSessions = grouped.get(AgentSessionSection.Archived)!.sessions;
+		const todaySessions = grouped.get(AgentSessionSection.Today)!.sessions;
+
+		assert.deepStrictEqual(pinnedSessions.length, 1);
+		assert.deepStrictEqual(archivedSessions.length, 1);
+		assert.deepStrictEqual(todaySessions.length, 0);
 	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsController.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsController.test.ts
index 5f64164b246..e8fc5382908 100644
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsController.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsController.test.ts
@@ -6,7 +6,7 @@
 import assert from 'assert';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../../base/common/event.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../../base/common/observable.js';
 import { URI } from '../../../../../../base/common/uri.js';
@@ -585,14 +585,25 @@ suite('LocalAgentsSessionsController', () => {
 
 				// Add the session first
 				mockChatService.addSession(mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Test Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					timing: createTestTiming(),
+					lastResponseState: ResponseModelState.Complete
+				}]);
 
 				let changeEventCount = 0;
 				disposables.add(controller.onDidChangeChatSessionItems(() => {
 					changeEventCount++;
 				}));
 
+				const onDidChangeChatSessionItems = Event.toPromise(controller.onDidChangeChatSessionItems);
+
 				// Simulate progress change by triggering the progress listener
-				mockChatService.triggerProgressEvent();
+				mockChatService.triggerProgressEvent(sessionResource);
+				await onDidChangeChatSessionItems;
 
 				assert.strictEqual(changeEventCount, 1);
 			});
@@ -611,15 +622,26 @@ suite('LocalAgentsSessionsController', () => {
 
 				// Add the session first
 				mockChatService.addSession(mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Test Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					timing: createTestTiming(),
+					lastResponseState: ResponseModelState.Complete
+				}]);
 
 				let changeEventCount = 0;
 				disposables.add(controller.onDidChangeChatSessionItems(() => {
 					changeEventCount++;
 				}));
 
-				// Simulate progress change by triggering the progress listener
-				mockChatService.triggerProgressEvent();
+				const onDidChangeChatSessionItems = Event.toPromise(controller.onDidChangeChatSessionItems);
 
+				// Simulate progress change by triggering the progress listener
+				mockChatService.triggerProgressEvent(sessionResource);
+
+				await onDidChangeChatSessionItems;
 				assert.strictEqual(changeEventCount, 1);
 			});
 		});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/stateToProgressAdapter.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/stateToProgressAdapter.test.ts
new file mode 100644
index 00000000000..800c3389593
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/stateToProgressAdapter.test.ts
@@ -0,0 +1,375 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ToolCallStatus, ToolCallConfirmationReason, ToolResultContentType, TurnState, ResponsePartKind, type ICompletedToolCall, type IToolCallRunningState, type ITurn, type IToolCallResponsePart, ToolCallCancellationReason } from '../../../../../../platform/agentHost/common/state/sessionState.js';
+import { IChatToolInvocationSerialized, type IChatMarkdownContent } from '../../../common/chatService/chatService.js';
+import { ToolDataSource } from '../../../common/tools/languageModelToolsService.js';
+import { turnsToHistory, toolCallStateToInvocation, finalizeToolInvocation } from '../../../browser/agentSessions/agentHost/stateToProgressAdapter.js';
+
+// ---- Helper factories -------------------------------------------------------
+
+function createToolCallState(overrides?: Partial<IToolCallRunningState>): IToolCallRunningState {
+	return {
+		toolCallId: 'tc-1',
+		toolName: 'test_tool',
+		displayName: 'Test Tool',
+		invocationMessage: 'Running test tool...',
+		status: ToolCallStatus.Running,
+		confirmed: ToolCallConfirmationReason.NotNeeded,
+		...overrides,
+	};
+}
+
+function createCompletedToolCall(overrides?: Partial<ICompletedToolCall>): ICompletedToolCall {
+	return {
+		status: ToolCallStatus.Completed,
+		toolCallId: 'tc-1',
+		toolName: 'test_tool',
+		displayName: 'Test Tool',
+		invocationMessage: 'Running test tool...',
+		success: true,
+		confirmed: ToolCallConfirmationReason.NotNeeded,
+		pastTenseMessage: 'Ran test tool',
+		...overrides,
+	} as ICompletedToolCall;
+}
+
+function createTurn(overrides?: Partial<ITurn>): ITurn {
+	return {
+		id: 'turn-1',
+		userMessage: { text: 'Hello' },
+		responseParts: [],
+		usage: undefined,
+		state: TurnState.Complete,
+		...overrides,
+	};
+}
+
+// ---- Tests ------------------------------------------------------------------
+
+suite('stateToProgressAdapter', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('turnsToHistory', () => {
+
+		test('empty turns produces empty history', () => {
+			const result = turnsToHistory([], 'p');
+			assert.deepStrictEqual(result, []);
+		});
+
+		test('single turn produces request + response pair', () => {
+			const turn = createTurn({
+				userMessage: { text: 'Do something' },
+				responseParts: [{ kind: ResponsePartKind.ToolCall, toolCall: createCompletedToolCall() } as IToolCallResponsePart],
+			});
+
+			const history = turnsToHistory([turn], 'participant-1');
+			assert.strictEqual(history.length, 2);
+
+			// Request
+			assert.strictEqual(history[0].type, 'request');
+			assert.strictEqual(history[0].prompt, 'Do something');
+			assert.strictEqual(history[0].participant, 'participant-1');
+
+			// Response
+			assert.strictEqual(history[1].type, 'response');
+			assert.strictEqual(history[1].participant, 'participant-1');
+			assert.strictEqual(history[1].parts.length, 1);
+
+			const serialized = history[1].parts[0] as IChatToolInvocationSerialized;
+			assert.strictEqual(serialized.kind, 'toolInvocationSerialized');
+			assert.strictEqual(serialized.toolCallId, 'tc-1');
+			assert.strictEqual(serialized.toolId, 'test_tool');
+			assert.strictEqual(serialized.isComplete, true);
+		});
+
+		test('terminal tool call in history has correct terminal data', () => {
+			const turn = createTurn({
+				responseParts: [{
+					kind: ResponsePartKind.ToolCall, toolCall: createCompletedToolCall({
+						_meta: { toolKind: 'terminal', language: 'shellscript' },
+						toolInput: 'echo hello',
+						content: [{ type: ToolResultContentType.Text, text: 'hello' }],
+						success: true,
+					})
+				} as IToolCallResponsePart],
+			});
+
+			const history = turnsToHistory([turn], 'p');
+			const response = history[1];
+			assert.strictEqual(response.type, 'response');
+			if (response.type !== 'response') { return; }
+			const serialized = response.parts[0] as IChatToolInvocationSerialized;
+
+			assert.ok(serialized.toolSpecificData);
+			assert.strictEqual(serialized.toolSpecificData.kind, 'terminal');
+			const termData = serialized.toolSpecificData as { kind: 'terminal'; commandLine: { original: string }; terminalCommandOutput: { text: string }; terminalCommandState: { exitCode: number } };
+			assert.strictEqual(termData.commandLine.original, 'echo hello');
+			assert.strictEqual(termData.terminalCommandOutput.text, 'hello');
+			assert.strictEqual(termData.terminalCommandState.exitCode, 0);
+		});
+
+		test('turn with responseText produces markdown content in history', () => {
+			const turn = createTurn({
+				responseParts: [{ kind: ResponsePartKind.Markdown, id: 'md-1', content: 'Hello world' }],
+			});
+
+			const history = turnsToHistory([turn], 'p');
+			assert.strictEqual(history.length, 2);
+
+			const response = history[1];
+			assert.strictEqual(response.type, 'response');
+			if (response.type !== 'response') { return; }
+			assert.strictEqual(response.parts.length, 1);
+			assert.strictEqual(response.parts[0].kind, 'markdownContent');
+			assert.strictEqual((response.parts[0] as IChatMarkdownContent).content.value, 'Hello world');
+		});
+
+		test('error turn produces error message in history', () => {
+			const turn = createTurn({
+				state: TurnState.Error,
+				error: { errorType: 'test', message: 'boom' },
+			});
+
+			const history = turnsToHistory([turn], 'p');
+			const response = history[1];
+			assert.strictEqual(response.type, 'response');
+			if (response.type !== 'response') { return; }
+			const errorPart = response.parts.find(p => p.kind === 'markdownContent' && (p as IChatMarkdownContent).content.value.includes('boom'));
+			assert.ok(errorPart, 'Should have a markdownContent part containing the error message');
+		});
+
+		test('failed tool in history has exitCode 1', () => {
+			const turn = createTurn({
+				responseParts: [{
+					kind: ResponsePartKind.ToolCall, toolCall: createCompletedToolCall({
+						_meta: { toolKind: 'terminal' },
+						toolInput: 'bad-command',
+						content: [{ type: ToolResultContentType.Text, text: 'error' }],
+						success: false,
+					})
+				} as IToolCallResponsePart],
+			});
+
+			const history = turnsToHistory([turn], 'p');
+			const response = history[1];
+			assert.strictEqual(response.type, 'response');
+			if (response.type !== 'response') { return; }
+			const serialized = response.parts[0] as IChatToolInvocationSerialized;
+
+			assert.ok(serialized.toolSpecificData);
+			assert.strictEqual(serialized.toolSpecificData.kind, 'terminal');
+			const termData = serialized.toolSpecificData as { kind: 'terminal'; terminalCommandState: { exitCode: number } };
+			assert.strictEqual(termData.terminalCommandState.exitCode, 1);
+		});
+	});
+
+	suite('toolCallStateToInvocation', () => {
+
+		test('creates ChatToolInvocation for running tool', () => {
+			const tc = createToolCallState({
+				toolCallId: 'tc-42',
+				toolName: 'my_tool',
+				displayName: 'My Tool',
+				invocationMessage: 'Doing stuff',
+				status: ToolCallStatus.Running,
+			});
+
+			const invocation = toolCallStateToInvocation(tc);
+			assert.strictEqual(invocation.toolCallId, 'tc-42');
+			assert.strictEqual(invocation.toolId, 'my_tool');
+			assert.strictEqual(invocation.source, ToolDataSource.Internal);
+		});
+
+		test('sets terminal toolSpecificData', () => {
+			const tc = createToolCallState({
+				_meta: { toolKind: 'terminal' },
+				toolInput: 'ls -la',
+			});
+
+			const invocation = toolCallStateToInvocation(tc);
+			assert.ok(invocation.toolSpecificData);
+			assert.strictEqual(invocation.toolSpecificData.kind, 'terminal');
+			const termData = invocation.toolSpecificData as { kind: 'terminal'; commandLine: { original: string } };
+			assert.strictEqual(termData.commandLine.original, 'ls -la');
+		});
+
+		test('creates invocation without toolArguments', () => {
+			const tc = createToolCallState({});
+
+			const invocation = toolCallStateToInvocation(tc);
+			assert.strictEqual(invocation.toolCallId, 'tc-1');
+		});
+	});
+
+	suite('finalizeToolInvocation', () => {
+
+		test('finalizes terminal tool with output and exit code', () => {
+			const tc = createToolCallState({
+				_meta: { toolKind: 'terminal' },
+				toolInput: 'echo hi',
+				status: ToolCallStatus.Running,
+			});
+			const invocation = toolCallStateToInvocation(tc);
+
+			finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Completed,
+				toolCallId: 'tc-1',
+				toolName: 'test_tool',
+				displayName: 'Test Tool',
+				invocationMessage: 'Running test tool...',
+				_meta: { toolKind: 'terminal' },
+				toolInput: 'echo hi',
+				confirmed: ToolCallConfirmationReason.NotNeeded,
+				success: true,
+				pastTenseMessage: 'Ran echo hi',
+				content: [{ type: ToolResultContentType.Text, text: 'output text' }],
+			});
+
+			assert.ok(invocation.toolSpecificData);
+			assert.strictEqual(invocation.toolSpecificData.kind, 'terminal');
+			const termData = invocation.toolSpecificData as { kind: 'terminal'; terminalCommandOutput: { text: string }; terminalCommandState: { exitCode: number } };
+			assert.strictEqual(termData.terminalCommandOutput.text, 'output text');
+			assert.strictEqual(termData.terminalCommandState.exitCode, 0);
+		});
+
+		test('finalizes failed tool with error message', () => {
+			const tc = createToolCallState({
+				status: ToolCallStatus.Running,
+			});
+			const invocation = toolCallStateToInvocation(tc);
+
+			finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Completed,
+				toolCallId: 'tc-1',
+				toolName: 'test_tool',
+				displayName: 'Test Tool',
+				invocationMessage: 'Running test tool...',
+				confirmed: ToolCallConfirmationReason.NotNeeded,
+				success: false,
+				pastTenseMessage: 'Failed',
+				error: { message: 'timeout' },
+			});
+
+			// Should not throw
+		});
+
+		test('returns file edits from completed tool call with FileEdit content', () => {
+			const tc = createToolCallState({ status: ToolCallStatus.Running });
+			const invocation = toolCallStateToInvocation(tc);
+
+			const fileEdits = finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Completed,
+				toolCallId: 'tc-1',
+				toolName: 'edit_file',
+				displayName: 'Edit File',
+				invocationMessage: 'Editing file...',
+				confirmed: ToolCallConfirmationReason.NotNeeded,
+				success: true,
+				pastTenseMessage: 'Edited file',
+				toolInput: JSON.stringify({ path: '/home/user/file.ts' }),
+				content: [{
+					type: ToolResultContentType.FileEdit,
+					beforeURI: 'agenthost-content:///session/snap/before',
+					afterURI: 'agenthost-content:///session/snap/after',
+				}],
+			});
+
+			assert.strictEqual(fileEdits.length, 1);
+			assert.strictEqual(fileEdits[0].resource.fsPath.replace(/\\/g, '/'), '/home/user/file.ts');
+			assert.strictEqual(fileEdits[0].beforeContentUri.toString(), URI.parse('agenthost-content:///session/snap/before').toString());
+			assert.strictEqual(fileEdits[0].afterContentUri.toString(), URI.parse('agenthost-content:///session/snap/after').toString());
+			assert.ok(fileEdits[0].undoStopId);
+		});
+
+		test('returns empty file edits for cancelled tool call', () => {
+			const tc = createToolCallState({ status: ToolCallStatus.Running });
+			const invocation = toolCallStateToInvocation(tc);
+
+			const fileEdits = finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Cancelled,
+				toolCallId: 'tc-1',
+				toolName: 'edit_file',
+				displayName: 'Edit File',
+				invocationMessage: 'Editing file...',
+				reason: ToolCallCancellationReason.Denied,
+				reasonMessage: 'User cancelled',
+			});
+
+			assert.strictEqual(fileEdits.length, 0);
+		});
+
+		test('returns empty file edits when tool has no FileEdit content', () => {
+			const tc = createToolCallState({ status: ToolCallStatus.Running });
+			const invocation = toolCallStateToInvocation(tc);
+
+			const fileEdits = finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Completed,
+				toolCallId: 'tc-1',
+				toolName: 'test_tool',
+				displayName: 'Test Tool',
+				invocationMessage: 'Running test tool...',
+				confirmed: ToolCallConfirmationReason.NotNeeded,
+				success: true,
+				pastTenseMessage: 'Ran test tool',
+				content: [{ type: ToolResultContentType.Text, text: 'output' }],
+			});
+
+			assert.strictEqual(fileEdits.length, 0);
+		});
+
+		test('returns empty file edits when toolInput has no path', () => {
+			const tc = createToolCallState({ status: ToolCallStatus.Running });
+			const invocation = toolCallStateToInvocation(tc);
+
+			const fileEdits = finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Completed,
+				toolCallId: 'tc-1',
+				toolName: 'edit_file',
+				displayName: 'Edit File',
+				invocationMessage: 'Editing file...',
+				confirmed: ToolCallConfirmationReason.NotNeeded,
+				success: true,
+				pastTenseMessage: 'Edited',
+				toolInput: JSON.stringify({ content: 'no path field' }),
+				content: [{
+					type: ToolResultContentType.FileEdit,
+					beforeURI: 'agenthost-content:///before',
+					afterURI: 'agenthost-content:///after',
+				}],
+			});
+
+			assert.strictEqual(fileEdits.length, 0);
+		});
+
+		test('returns empty file edits when toolInput is invalid JSON', () => {
+			const tc = createToolCallState({ status: ToolCallStatus.Running });
+			const invocation = toolCallStateToInvocation(tc);
+
+			const fileEdits = finalizeToolInvocation(invocation, {
+				status: ToolCallStatus.Completed,
+				toolCallId: 'tc-1',
+				toolName: 'edit_file',
+				displayName: 'Edit File',
+				invocationMessage: 'Editing file...',
+				confirmed: ToolCallConfirmationReason.NotNeeded,
+				success: true,
+				pastTenseMessage: 'Edited',
+				toolInput: 'not json',
+				content: [{
+					type: ToolResultContentType.FileEdit,
+					beforeURI: 'agenthost-content:///before',
+					afterURI: 'agenthost-content:///after',
+				}],
+			});
+
+			assert.strictEqual(fileEdits.length, 0);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/aiCustomization/aiCustomizationListWidget.test.ts b/src/vs/workbench/contrib/chat/test/browser/aiCustomization/aiCustomizationListWidget.test.ts
index 5723ae0a159..806712bb354 100644
--- a/src/vs/workbench/contrib/chat/test/browser/aiCustomization/aiCustomizationListWidget.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/aiCustomization/aiCustomizationListWidget.test.ts
@@ -5,25 +5,31 @@
 
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { getCustomizationSecondaryText, truncateToFirstSentence } from '../../../browser/aiCustomization/aiCustomizationListWidgetUtils.js';
+import { getCustomizationSecondaryText, truncateToFirstLine } from '../../../browser/aiCustomization/aiCustomizationListWidgetUtils.js';
 import { PromptsType } from '../../../common/promptSyntax/promptTypes.js';
 
 suite('aiCustomizationListWidget', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	suite('truncateToFirstSentence', () => {
-		test('keeps first sentence when within max chars', () => {
+	suite('truncateToFirstLine', () => {
+		test('keeps first line when text has multiple lines', () => {
 			assert.strictEqual(
-				truncateToFirstSentence('First sentence. Second sentence.'),
-				'First sentence.'
+				truncateToFirstLine('First line\nSecond line'),
+				'First line'
 			);
 		});
 
-		test('falls back to max chars when no sentence boundary is found', () => {
-			const longText = 'a'.repeat(140);
+		test('returns full text when no newline is present', () => {
 			assert.strictEqual(
-				truncateToFirstSentence(longText),
-				`${'a'.repeat(120)}\u2026`
+				truncateToFirstLine('No newline here. Even with sentences.'),
+				'No newline here. Even with sentences.'
+			);
+		});
+
+		test('handles carriage return line endings', () => {
+			assert.strictEqual(
+				truncateToFirstLine('First line\r\nSecond line'),
+				'First line'
 			);
 		});
 	});
@@ -36,10 +42,10 @@ suite('aiCustomizationListWidget', () => {
 			);
 		});
 
-		test('truncates non-hook descriptions to the first sentence', () => {
+		test('truncates non-hook descriptions to the first line', () => {
 			assert.strictEqual(
-				getCustomizationSecondaryText('Show the first sentence. Hide the rest.', 'prompt.md', PromptsType.prompt),
-				'Show the first sentence.'
+				getCustomizationSecondaryText('Show the first line.\nHide the rest.', 'prompt.md', PromptsType.prompt),
+				'Show the first line.'
 			);
 		});
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/aiCustomization/applyStorageSourceFilter.test.ts b/src/vs/workbench/contrib/chat/test/browser/aiCustomization/applyStorageSourceFilter.test.ts
index 95988b49868..55f7cb956f7 100644
--- a/src/vs/workbench/contrib/chat/test/browser/aiCustomization/applyStorageSourceFilter.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/aiCustomization/applyStorageSourceFilter.test.ts
@@ -7,9 +7,9 @@ import assert from 'assert';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
-import { applyStorageSourceFilter, IStorageSourceFilter } from '../../../common/aiCustomizationWorkspaceService.js';
+import { applyStorageSourceFilter, BUILTIN_STORAGE, IStorageSourceFilter } from '../../../common/aiCustomizationWorkspaceService.js';
 
-function item(path: string, storage: PromptsStorage): { uri: URI; storage: PromptsStorage } {
+function item(path: string, storage: PromptsStorage | string): { uri: URI; storage: string } {
 	return { uri: URI.file(path), storage };
 }
 
@@ -218,6 +218,36 @@ suite('applyStorageSourceFilter', () => {
 			};
 			assert.strictEqual(applyStorageSourceFilter(items, filter).length, 4);
 		});
+
+		test('core-like filter with builtin: extension items pass when both extension and builtin are in sources', () => {
+			// Items from the chat extension have storage=extension but groupKey=builtin.
+			// The filter operates on storage, so extension items pass through regardless of groupKey.
+			const items = [
+				item('/w/a.md', PromptsStorage.local),
+				item('/e/builtin-agent.md', PromptsStorage.extension),
+				item('/e/third-party.md', PromptsStorage.extension),
+				item('/b/sessions-builtin.md', BUILTIN_STORAGE),
+			];
+			const filter: IStorageSourceFilter = {
+				sources: [PromptsStorage.local, PromptsStorage.extension, BUILTIN_STORAGE],
+			};
+			const result = applyStorageSourceFilter(items, filter);
+			assert.strictEqual(result.length, 4);
+		});
+
+		test('builtin source is respected independently', () => {
+			const items = [
+				item('/e/from-extension.md', PromptsStorage.extension),
+				item('/b/from-sessions.md', BUILTIN_STORAGE),
+			];
+			// Only builtin in sources — extension items excluded
+			const filter: IStorageSourceFilter = {
+				sources: [BUILTIN_STORAGE],
+			};
+			const result = applyStorageSourceFilter(items, filter);
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].storage, BUILTIN_STORAGE);
+		});
 	});
 
 	suite('type safety', () => {
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatDebugEventDetailRenderer.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatDebugEventDetailRenderer.test.ts
index 3a0f01975d1..8d9a7d19bfd 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatDebugEventDetailRenderer.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatDebugEventDetailRenderer.test.ts
@@ -60,17 +60,17 @@ suite('formatEventDetail', () => {
 			sessionResource: URI.parse('test://s1'),
 			created: new Date(),
 			model: 'gpt-4o',
-			inputTokens: 1000,
-			outputTokens: 500,
-			totalTokens: 1500,
-			durationInMillis: 3200,
+			inputTokens: 100,
+			outputTokens: 50,
+			totalTokens: 150,
+			durationInMillis: 320,
 		};
 		const result = formatEventDetail(event);
 		assert.ok(result.includes('gpt-4o'));
-		assert.ok(result.includes('1000'));
-		assert.ok(result.includes('500'));
-		assert.ok(result.includes('1500'));
-		assert.ok(result.includes('3200'));
+		assert.ok(result.includes('100'));
+		assert.ok(result.includes('50'));
+		assert.ok(result.includes('150'));
+		assert.ok(result.includes('320'));
 	});
 
 	test('generic event', () => {
@@ -118,7 +118,7 @@ suite('formatEventDetail', () => {
 			agentName: 'Data',
 			description: 'Querying KQL',
 			status: 'completed',
-			durationInMillis: 5000,
+			durationInMillis: 500,
 			toolCallCount: 3,
 			modelTurnCount: 2,
 		};
@@ -126,7 +126,7 @@ suite('formatEventDetail', () => {
 		assert.ok(result.includes('Data'));
 		assert.ok(result.includes('Querying KQL'));
 		assert.ok(result.includes('completed'));
-		assert.ok(result.includes('5000'));
+		assert.ok(result.includes('500'));
 		assert.ok(result.includes('3'));
 		assert.ok(result.includes('2'));
 	});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatDebugFilters.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatDebugFilters.test.ts
index 9bb37a5f829..db4550e7369 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatDebugFilters.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatDebugFilters.test.ts
@@ -6,6 +6,7 @@
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ChatDebugFilterState } from '../../browser/chatDebug/chatDebugFilters.js';
+import { parseTimeToken } from '../../common/chatDebugEvents.js';
 
 suite('ChatDebugFilterState', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -15,38 +16,38 @@ suite('ChatDebugFilterState', () => {
 		suite('before: prefix', () => {
 
 			test('year only — rounds to end of year', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2026', 'before');
+				const result = parseTimeToken('before:2026', 'before');
 				assert.strictEqual(result, new Date(2026, 11, 31, 23, 59, 59, 999).getTime());
 			});
 
 			test('year-month — rounds to end of month', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2026-03', 'before');
+				const result = parseTimeToken('before:2026-03', 'before');
 				// new Date(2026, 3, 0) gives last day of March
 				assert.strictEqual(result, new Date(2026, 3, 0, 23, 59, 59, 999).getTime());
 			});
 
 			test('year-month (February, non-leap) — rounds to end of Feb', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2025-02', 'before');
+				const result = parseTimeToken('before:2025-02', 'before');
 				assert.strictEqual(result, new Date(2025, 2, 0, 23, 59, 59, 999).getTime());
 			});
 
 			test('year-month-day — rounds to end of day', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2026-03-03', 'before');
+				const result = parseTimeToken('before:2026-03-03', 'before');
 				assert.strictEqual(result, new Date(2026, 2, 3, 23, 59, 59, 999).getTime());
 			});
 
 			test('date with hour only — rounds to end of hour', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2026-03-03t14', 'before');
+				const result = parseTimeToken('before:2026-03-03t14', 'before');
 				assert.strictEqual(result, new Date(2026, 2, 3, 14, 59, 59, 999).getTime());
 			});
 
 			test('date with hour:minute — rounds to end of minute', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2026-03-03t14:30', 'before');
+				const result = parseTimeToken('before:2026-03-03t14:30', 'before');
 				assert.strictEqual(result, new Date(2026, 2, 3, 14, 30, 59, 999).getTime());
 			});
 
 			test('full date-time with seconds', () => {
-				const result = ChatDebugFilterState.parseTimeToken('before:2026-03-03t14:30:45', 'before');
+				const result = parseTimeToken('before:2026-03-03t14:30:45', 'before');
 				assert.strictEqual(result, new Date(2026, 2, 3, 14, 30, 45, 999).getTime());
 			});
 		});
@@ -54,32 +55,32 @@ suite('ChatDebugFilterState', () => {
 		suite('after: prefix', () => {
 
 			test('year only — start of year', () => {
-				const result = ChatDebugFilterState.parseTimeToken('after:2026', 'after');
+				const result = parseTimeToken('after:2026', 'after');
 				assert.strictEqual(result, new Date(2026, 0, 1, 0, 0, 0, 0).getTime());
 			});
 
 			test('year-month — start of month', () => {
-				const result = ChatDebugFilterState.parseTimeToken('after:2026-03', 'after');
+				const result = parseTimeToken('after:2026-03', 'after');
 				assert.strictEqual(result, new Date(2026, 2, 1, 0, 0, 0, 0).getTime());
 			});
 
 			test('year-month-day — start of day', () => {
-				const result = ChatDebugFilterState.parseTimeToken('after:2026-03-03', 'after');
+				const result = parseTimeToken('after:2026-03-03', 'after');
 				assert.strictEqual(result, new Date(2026, 2, 3, 0, 0, 0, 0).getTime());
 			});
 
 			test('date with hour only — start of hour', () => {
-				const result = ChatDebugFilterState.parseTimeToken('after:2026-03-03t14', 'after');
+				const result = parseTimeToken('after:2026-03-03t14', 'after');
 				assert.strictEqual(result, new Date(2026, 2, 3, 14, 0, 0, 0).getTime());
 			});
 
 			test('date with hour:minute — start of minute', () => {
-				const result = ChatDebugFilterState.parseTimeToken('after:2026-03-03t14:30', 'after');
+				const result = parseTimeToken('after:2026-03-03t14:30', 'after');
 				assert.strictEqual(result, new Date(2026, 2, 3, 14, 30, 0, 0).getTime());
 			});
 
 			test('full date-time with seconds', () => {
-				const result = ChatDebugFilterState.parseTimeToken('after:2026-03-03t14:30:45', 'after');
+				const result = parseTimeToken('after:2026-03-03t14:30:45', 'after');
 				assert.strictEqual(result, new Date(2026, 2, 3, 14, 30, 45, 0).getTime());
 			});
 		});
@@ -87,33 +88,33 @@ suite('ChatDebugFilterState', () => {
 		suite('no match', () => {
 
 			test('returns undefined for empty string', () => {
-				assert.strictEqual(ChatDebugFilterState.parseTimeToken('', 'before'), undefined);
+				assert.strictEqual(parseTimeToken('', 'before'), undefined);
 			});
 
 			test('returns undefined for unrelated text', () => {
-				assert.strictEqual(ChatDebugFilterState.parseTimeToken('hello world', 'before'), undefined);
+				assert.strictEqual(parseTimeToken('hello world', 'before'), undefined);
 			});
 
 			test('returns undefined for wrong prefix', () => {
-				assert.strictEqual(ChatDebugFilterState.parseTimeToken('after:2026', 'before'), undefined);
+				assert.strictEqual(parseTimeToken('after:2026', 'before'), undefined);
 			});
 
 			test('returns undefined for bare time without date', () => {
-				assert.strictEqual(ChatDebugFilterState.parseTimeToken('before:14:30', 'before'), undefined);
+				assert.strictEqual(parseTimeToken('before:14:30', 'before'), undefined);
 			});
 		});
 
 		suite('embedded in text', () => {
 
 			test('extracts token from surrounding text', () => {
-				const result = ChatDebugFilterState.parseTimeToken('some text before:2026-03-03 more text', 'before');
+				const result = parseTimeToken('some text before:2026-03-03 more text', 'before');
 				assert.strictEqual(result, new Date(2026, 2, 3, 23, 59, 59, 999).getTime());
 			});
 
 			test('handles both before and after in same string', () => {
 				const text = 'after:2026-01 before:2026-03';
-				const after = ChatDebugFilterState.parseTimeToken(text, 'after');
-				const before = ChatDebugFilterState.parseTimeToken(text, 'before');
+				const after = parseTimeToken(text, 'after');
+				const before = parseTimeToken(text, 'before');
 				assert.strictEqual(after, new Date(2026, 0, 1, 0, 0, 0, 0).getTime());
 				assert.strictEqual(before, new Date(2026, 3, 0, 23, 59, 59, 999).getTime());
 			});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatImageCarouselService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatImageCarouselService.test.ts
new file mode 100644
index 00000000000..4f11f611c29
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatImageCarouselService.test.ts
@@ -0,0 +1,364 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { buildCollectionArgs, buildSingleImageArgs, collectCarouselSections, findClickedImageIndex, ICarouselSection } from '../../browser/chatImageCarouselService.js';
+import { IChatToolInvocationSerialized } from '../../common/chatService/chatService.js';
+import { ChatResponseResource } from '../../common/model/chatModel.js';
+import { IImageVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IChatRequestViewModel, IChatResponseViewModel } from '../../common/model/chatViewModel.js';
+import { ToolDataSource } from '../../common/tools/languageModelToolsService.js';
+
+suite('ChatImageCarouselService helpers', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function makeRequest(id: string, variables: IChatRequestViewModel['variables'], messageText: string = 'Request'): IChatRequestViewModel {
+		return {
+			id,
+			sessionResource: URI.parse('chat-session://test/session'),
+			dataId: `data-${id}`,
+			username: 'test-user',
+			message: { text: messageText, parts: [] },
+			messageText,
+			attempt: 0,
+			variables,
+			currentRenderedHeight: undefined,
+			shouldBeRemovedOnSend: undefined,
+			isComplete: true,
+			isCompleteAddedRequest: true,
+			slashCommand: undefined,
+			agentOrSlashCommandDetected: false,
+			shouldBeBlocked: undefined!,
+			timestamp: 0,
+		} as unknown as IChatRequestViewModel;
+	}
+
+	function makeResponse(requestId: string, id: string = 'resp-1', responseValue: IChatResponseViewModel['response']['value'] = []): IChatResponseViewModel {
+		return {
+			id,
+			requestId,
+			sessionResource: URI.parse('chat-session://test/session'),
+			response: { value: responseValue },
+			session: { getItems: () => [] },
+			setVote: () => { },
+		} as unknown as IChatResponseViewModel;
+	}
+
+	function makeImageVariableEntry(overrides: Partial<IImageVariableEntry> & Pick<IImageVariableEntry, 'value'>): IImageVariableEntry {
+		const { value, ...rest } = overrides;
+		return {
+			id: 'img-1',
+			kind: 'image',
+			name: 'cat.png',
+			value,
+			mimeType: 'image/png',
+			...rest,
+		};
+	}
+
+	function makeImage(id: string, name: string = 'img.png', mimeType: string = 'image/png'): { id: string; name: string; mimeType: string; data: Uint8Array } {
+		return { id, name, mimeType, data: new Uint8Array([1, 2, 3]) };
+	}
+
+	function makeSections(...imageCounts: number[]): ICarouselSection[] {
+		return imageCounts.map((count, sectionIdx) => ({
+			title: `Section ${sectionIdx}`,
+			images: Array.from({ length: count }, (_, imgIdx) =>
+				makeImage(URI.file(`/image_s${sectionIdx}_i${imgIdx}.png`).toString(), `image_s${sectionIdx}_i${imgIdx}.png`)
+			),
+		}));
+	}
+
+	suite('findClickedImageIndex', () => {
+
+		test('finds image by URI string match in first section', () => {
+			const sections = makeSections(3);
+			const targetUri = URI.parse(sections[0].images[1].id);
+			assert.strictEqual(findClickedImageIndex(sections, targetUri), 1);
+		});
+
+		test('finds image by URI string match in second section', () => {
+			const sections = makeSections(2, 3);
+			const targetUri = URI.parse(sections[1].images[2].id);
+			// globalOffset = 2 (first section) + 2 (third in second section) = 4
+			assert.strictEqual(findClickedImageIndex(sections, targetUri), 4);
+		});
+
+		test('returns -1 when no match found', () => {
+			const sections = makeSections(2, 2);
+			const unknownUri = URI.file('/nonexistent.png');
+			assert.strictEqual(findClickedImageIndex(sections, unknownUri), -1);
+		});
+
+		test('falls back to data buffer match', () => {
+			const sections: ICarouselSection[] = [{
+				title: 'Section',
+				images: [
+					{ id: 'custom-id-1', name: 'a.png', mimeType: 'image/png', data: new Uint8Array([10, 20]) },
+					{ id: 'custom-id-2', name: 'b.png', mimeType: 'image/png', data: new Uint8Array([30, 40]) },
+				],
+			}];
+			const unknownUri = URI.from({ scheme: 'data', path: 'b.png' });
+			assert.strictEqual(findClickedImageIndex(sections, unknownUri, new Uint8Array([30, 40])), 1);
+		});
+
+		test('prefers a later exact URI match over an earlier image with identical data', () => {
+			const firstUri = URI.parse('vscode-chat-response-resource://session/tool-call-1/0/file.png');
+			const secondUri = URI.parse('vscode-chat-response-resource://session/tool-call-2/0/file.png');
+			const identicalData = new Uint8Array([10, 20, 30]);
+			const sections: ICarouselSection[] = [
+				{
+					title: 'Earlier',
+					images: [
+						{ id: firstUri.toString(), name: 'first.png', mimeType: 'image/png', data: identicalData },
+					],
+				},
+				{
+					title: 'Later',
+					images: [
+						{ id: secondUri.toString(), name: 'second.png', mimeType: 'image/png', data: identicalData },
+					],
+				},
+			];
+
+			assert.strictEqual(findClickedImageIndex(sections, secondUri, identicalData), 1);
+		});
+
+		test('returns -1 for empty sections', () => {
+			assert.strictEqual(findClickedImageIndex([], URI.file('/x.png')), -1);
+		});
+	});
+
+	suite('buildCollectionArgs', () => {
+
+		test('uses section title when single section', () => {
+			const sections = makeSections(2);
+			const result = buildCollectionArgs(sections, 0, URI.file('/session'));
+			assert.deepStrictEqual(result, {
+				collection: {
+					id: URI.file('/session').toString() + '_carousel',
+					title: 'Section 0',
+					sections,
+				},
+				startIndex: 0,
+			});
+		});
+
+		test('uses generic title for multiple sections', () => {
+			const sections = makeSections(1, 1);
+			const result = buildCollectionArgs(sections, 1, URI.file('/session'));
+			assert.strictEqual(result.collection.title, 'Conversation Images');
+			assert.strictEqual(result.startIndex, 1);
+		});
+
+		test('falls back to default title when single section has empty title', () => {
+			const sections: ICarouselSection[] = [{
+				title: '',
+				images: [makeImage(URI.file('/img.png').toString())],
+			}];
+			const result = buildCollectionArgs(sections, 0, URI.file('/session'));
+			assert.strictEqual(result.collection.title, 'Conversation Images');
+		});
+	});
+
+	suite('buildSingleImageArgs', () => {
+
+		test('extracts name and mime from URI path', () => {
+			const uri = URI.file('/path/to/photo.jpg');
+			const data = new Uint8Array([1, 2, 3]);
+			assert.deepStrictEqual(buildSingleImageArgs(uri, data), {
+				name: 'photo.jpg',
+				mimeType: 'image/jpg',
+				data,
+				title: 'photo.jpg',
+			});
+		});
+
+		test('defaults mime to image/png for unknown extension', () => {
+			const uri = URI.file('/path/to/file.xyz');
+			const data = new Uint8Array([1]);
+			assert.strictEqual(buildSingleImageArgs(uri, data).mimeType, 'image/png');
+		});
+	});
+
+	suite('collectCarouselSections', () => {
+
+		test('collects request attachment images for pending requests', async () => {
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({ value: new Uint8Array([1, 2, 3]) }),
+			], 'Pending request');
+
+			const result = await collectCarouselSections([request], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].title, 'Pending request');
+			assert.strictEqual(result[0].images.length, 1);
+			assert.deepStrictEqual({
+				id: result[0].images[0].id,
+				name: result[0].images[0].name,
+				mimeType: result[0].images[0].mimeType,
+				data: [...result[0].images[0].data],
+			}, {
+				id: URI.from({ scheme: 'data', path: 'cat.png' }).toString(),
+				name: 'cat.png',
+				mimeType: 'image/png',
+				data: [1, 2, 3],
+			});
+		});
+
+		test('collects request attachment images restored as plain objects', async () => {
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({ value: { 0: 4, 1: 5, 2: 6 } }),
+			], 'Pending request');
+
+			const result = await collectCarouselSections([request], async () => new Uint8Array());
+
+			assert.deepStrictEqual([...result[0].images[0].data], [4, 5, 6]);
+		});
+
+		test('merges request images into matching response section', async () => {
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({ value: new Uint8Array([1, 2, 3]) }),
+			], 'Show me images');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async uri => VSBuffer.fromString(`data-for-${uri.path}`).buffer);
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].title, 'Show me images');
+			assert.strictEqual(result[0].images.length, 1);
+			assert.strictEqual(result[0].images[0].name, 'cat.png');
+		});
+
+		test('prefers paired request message text over extracted response title', async () => {
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({ value: new Uint8Array([1, 2, 3]) }),
+			], 'Request title wins');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].title, 'Request title wins');
+		});
+
+		test('does not duplicate request images when response exists', async () => {
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({ value: new Uint8Array([1, 2, 3]) }),
+			], 'Show me images');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].images.length, 1);
+		});
+
+		test('deduplicates consecutive images with the same URI', async () => {
+			const uri = URI.file('/screenshot.png');
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+				makeImageVariableEntry({
+					id: 'img-2',
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+			], 'Two same images');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].images.length, 1);
+		});
+
+		test('keeps non-consecutive images with the same URI', async () => {
+			const uri = URI.file('/screenshot.png');
+			const otherUri = URI.file('/other.png');
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+				makeImageVariableEntry({
+					id: 'img-2',
+					name: 'other.png',
+					value: new Uint8Array([4, 5, 6]),
+					references: [{ reference: otherUri, kind: 'reference' }],
+				}),
+				makeImageVariableEntry({
+					id: 'img-3',
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+			], 'Non-consecutive duplicates');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].images.length, 3);
+		});
+
+		test('uses tool image URIs as carousel image ids', async () => {
+			const request = makeRequest('req-1', [], 'Request with tool output image');
+			const toolCallId = 'tool-call-1';
+			const sessionResource = URI.parse('chat-session://test/session');
+			const expectedUri = ChatResponseResource.createUri(sessionResource, toolCallId, 0, 'file.png').toString();
+			const response = makeResponse('req-1', 'resp-1', [
+				{
+					kind: 'toolInvocationSerialized',
+					toolId: 'test_tool',
+					toolCallId,
+					invocationMessage: 'Took screenshot',
+					originMessage: undefined,
+					pastTenseMessage: undefined,
+					presentation: undefined,
+					resultDetails: {
+						output: {
+							type: 'data',
+							mimeType: 'image/png',
+							base64Data: 'AQID'
+						}
+					},
+					isConfirmed: { type: 0 },
+					isComplete: true,
+					source: ToolDataSource.Internal,
+					generatedTitle: undefined,
+					isAttachedToThinking: false,
+				} as unknown as IChatToolInvocationSerialized,
+			]);
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].images.length, 1);
+			assert.strictEqual(result[0].images[0].id, expectedUri);
+		});
+
+		test('image data is a plain Uint8Array usable by Blob constructor', async () => {
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({ value: new Uint8Array([1, 2, 3]) }),
+			], 'Screenshot request');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			const data = result[0].images[0].data;
+			// data must be a Uint8Array (not VSBuffer or ArrayBuffer) so that
+			// new Blob([data]) in the carousel editor works correctly.
+			assert.ok(data instanceof Uint8Array, 'image data should be Uint8Array');
+			assert.deepStrictEqual([...data], [1, 2, 3]);
+		});
+	});
+
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts
index 46e8316eef2..307e6955d7a 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
+import { IAction } from '../../../../../../base/common/actions.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../../base/common/observable.js';
@@ -123,9 +124,23 @@ class MockLanguageModelsService implements ILanguageModelsService {
 		throw new Error('Method not implemented.');
 	}
 
+	getModelConfiguration(_modelId: string): IStringDictionary<unknown> | undefined {
+		return undefined;
+	}
+
+	async setModelConfiguration(_modelId: string, _values: IStringDictionary<unknown>): Promise<void> {
+	}
+
+	getModelConfigurationActions(_modelId: string): IAction[] {
+		return [];
+	}
+
 	async configureLanguageModelsProviderGroup(vendorId: string, name?: string): Promise<void> {
 	}
 
+	async configureModel(_modelId: string): Promise<void> {
+	}
+
 	async addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void> {
 	}
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatSetup/chatSetupGrowthSession.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatSetup/chatSetupGrowthSession.test.ts
index d9da6ade3e0..cb4e36936f8 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatSetup/chatSetupGrowthSession.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatSetup/chatSetupGrowthSession.test.ts
@@ -129,7 +129,10 @@ suite('GrowthSessionOpenerParticipant', () => {
 			timing: { created: Date.now(), lastRequestStarted: undefined, lastRequestEnded: undefined },
 			isArchived: () => false,
 			setArchived: () => { },
+			isPinned: () => false,
+			setPinned: () => { },
 			isRead: () => true,
+			isMarkedUnread: () => false,
 			setRead: () => { },
 		};
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/plugins/agentPluginRepositoryService.test.ts b/src/vs/workbench/contrib/chat/test/browser/plugins/agentPluginRepositoryService.test.ts
index 6fe9944953e..3e94219d5ae 100644
--- a/src/vs/workbench/contrib/chat/test/browser/plugins/agentPluginRepositoryService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/plugins/agentPluginRepositoryService.test.ts
@@ -110,6 +110,53 @@ suite('AgentPluginRepositoryService', () => {
 		assert.strictEqual(uri.path, '/cache/agentPlugins/github.com/microsoft/vscode');
 	});
 
+	test('concurrent ensureRepository calls for the same marketplace clone only once', async () => {
+		let cloneCount = 0;
+		const instantiationService = store.add(new TestInstantiationService());
+
+		// Track whether the repo exists (set to true after the first clone completes)
+		let repoExists = false;
+		const fileService = {
+			exists: async (_resource: URI) => repoExists,
+			createFolder: async () => undefined,
+		} as unknown as IFileService;
+
+		const progressService = {
+			withProgress: async (_options: unknown, callback: (...args: unknown[]) => Promise<unknown>) => callback(),
+		} as unknown as IProgressService;
+
+		instantiationService.stub(ICommandService, {
+			executeCommand: async (id: string) => {
+				if (id === '_git.cloneRepository') {
+					cloneCount++;
+					// Simulate async clone by yielding, then mark repo as existing
+					await new Promise<void>(r => setTimeout(r, 0));
+					repoExists = true;
+				}
+				return undefined;
+			},
+		} as unknown as ICommandService);
+		instantiationService.stub(IEnvironmentService, { cacheHome: URI.file('/cache') } as unknown as IEnvironmentService);
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(INotificationService, { notify: () => undefined } as unknown as INotificationService);
+		instantiationService.stub(IProgressService, progressService);
+		instantiationService.stub(IStorageService, store.add(new InMemoryStorageService()));
+
+		const service = instantiationService.createInstance(AgentPluginRepositoryService);
+		const plugin = createPlugin('microsoft/vscode', 'plugins/myPlugin');
+
+		// Fire two concurrent ensureRepository calls for the same marketplace
+		const [uri1, uri2] = await Promise.all([
+			service.ensureRepository(plugin.marketplaceReference, { marketplaceType: plugin.marketplaceType }),
+			service.ensureRepository(plugin.marketplaceReference, { marketplaceType: plugin.marketplaceType }),
+		]);
+
+		assert.strictEqual(cloneCount, 1);
+		assert.strictEqual(uri1.path, '/cache/agentPlugins/github.com/microsoft/vscode');
+		assert.strictEqual(uri2.path, '/cache/agentPlugins/github.com/microsoft/vscode');
+	});
+
 	test('builds install URI from source inside repository root', () => {
 		const service = createService();
 		const plugin = createPlugin('microsoft/vscode', 'plugins/myPlugin');
@@ -398,5 +445,72 @@ suite('AgentPluginRepositoryService', () => {
 			assert.strictEqual(deleted.length, 1);
 			assert.ok(deleted[0].includes('github.com/owner/repo'));
 		});
+
+		test('skips deletion when another installed plugin shares the same cleanup target', async () => {
+			const deleted: string[] = [];
+			const service = createServiceWithDel(r => deleted.push(r.path));
+
+			await service.cleanupPluginSource(
+				{
+					name: 'plugin-a',
+					description: '',
+					version: '',
+					source: '',
+					sourceDescriptor: { kind: PluginSourceKind.GitHub, repo: 'owner/repo', path: 'plugins/a' },
+					marketplace: 'owner/marketplace',
+					marketplaceReference: parseMarketplaceReference('owner/marketplace')!,
+					marketplaceType: MarketplaceType.Copilot,
+				},
+				// Another plugin from the same repo still installed
+				[{ kind: PluginSourceKind.GitHub, repo: 'owner/repo', path: 'plugins/b' }],
+			);
+
+			assert.strictEqual(deleted.length, 0);
+		});
+
+		test('proceeds with deletion when no other plugin shares the cleanup target', async () => {
+			const deleted: string[] = [];
+			const service = createServiceWithDel(r => deleted.push(r.path));
+
+			await service.cleanupPluginSource(
+				{
+					name: 'plugin-a',
+					description: '',
+					version: '',
+					source: '',
+					sourceDescriptor: { kind: PluginSourceKind.GitHub, repo: 'owner/repo', path: 'plugins/a' },
+					marketplace: 'owner/marketplace',
+					marketplaceReference: parseMarketplaceReference('owner/marketplace')!,
+					marketplaceType: MarketplaceType.Copilot,
+				},
+				// Only unrelated plugins remain
+				[{ kind: PluginSourceKind.GitHub, repo: 'other-owner/other-repo' }],
+			);
+
+			assert.ok(deleted.length >= 1);
+			assert.ok(deleted[0].includes('github.com/owner/repo'));
+		});
+
+		test('proceeds with deletion when otherInstalledDescriptors is empty', async () => {
+			const deleted: string[] = [];
+			const service = createServiceWithDel(r => deleted.push(r.path));
+
+			await service.cleanupPluginSource(
+				{
+					name: 'plugin-a',
+					description: '',
+					version: '',
+					source: '',
+					sourceDescriptor: { kind: PluginSourceKind.GitHub, repo: 'owner/repo' },
+					marketplace: 'owner/marketplace',
+					marketplaceReference: parseMarketplaceReference('owner/marketplace')!,
+					marketplaceType: MarketplaceType.Copilot,
+				},
+				[],
+			);
+
+			assert.ok(deleted.length >= 1);
+			assert.ok(deleted[0].includes('github.com/owner/repo'));
+		});
 	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/browser/plugins/pluginInstallService.test.ts b/src/vs/workbench/contrib/chat/test/browser/plugins/pluginInstallService.test.ts
index 2804da7b73a..db448e31734 100644
--- a/src/vs/workbench/contrib/chat/test/browser/plugins/pluginInstallService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/plugins/pluginInstallService.test.ts
@@ -6,15 +6,18 @@
 import assert from 'assert';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
 import { INotificationService } from '../../../../../../platform/notification/common/notification.js';
 import { IProgressService } from '../../../../../../platform/progress/common/progress.js';
+import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.js';
 import { ITerminalService } from '../../../../terminal/browser/terminal.js';
 import { PluginInstallService } from '../../../browser/pluginInstallService.js';
 import { IAgentPluginRepositoryService, IEnsureRepositoryOptions, IPullRepositoryOptions } from '../../../common/plugins/agentPluginRepositoryService.js';
+import { ChatConfiguration } from '../../../common/constants.js';
 import { IMarketplacePlugin, IMarketplaceReference, IPluginMarketplaceService, IPluginSourceDescriptor, MarketplaceType, parseMarketplaceReference, PluginSourceKind } from '../../../common/plugins/pluginMarketplaceService.js';
 import { IPluginSource } from '../../../common/plugins/pluginSource.js';
 
@@ -66,6 +69,16 @@ suite('PluginInstallService', () => {
 		marketplaceTrusted: boolean;
 		/** Canonical IDs that were trusted via trustMarketplace() */
 		trustedMarketplaces: string[];
+		/** Plugins returned by readPluginsFromDirectory */
+		readPluginsResult: IMarketplacePlugin[];
+		/** Result of the quick pick dialog */
+		quickPickResult: { label: string } | undefined;
+		/** Result of the quick input dialog */
+		quickInputResult: string | undefined;
+		/** Current configured marketplace values */
+		configuredMarketplaces: string[];
+		/** Updated marketplace config values */
+		updatedMarketplaces: string[] | undefined;
 	}
 
 	function createDefaults(): MockState {
@@ -84,6 +97,11 @@ suite('PluginInstallService', () => {
 			updatePluginSourceCalls: [],
 			marketplaceTrusted: true,
 			trustedMarketplaces: [],
+			readPluginsResult: [],
+			quickPickResult: undefined,
+			quickInputResult: undefined,
+			configuredMarketplaces: [],
+			updatedMarketplaces: undefined,
 		};
 	}
 
@@ -247,8 +265,35 @@ suite('PluginInstallService', () => {
 			trustMarketplace: (ref: IMarketplaceReference) => {
 				state.trustedMarketplaces.push(ref.canonicalId);
 			},
+			readPluginsFromDirectory: async () => state.readPluginsResult,
 		} as unknown as IPluginMarketplaceService);
 
+		// IConfigurationService
+		instantiationService.stub(IConfigurationService, {
+			getValue: (key: string) => {
+				if (key === ChatConfiguration.PluginMarketplaces) {
+					return state.configuredMarketplaces;
+				}
+				return undefined;
+			},
+			updateValue: async (key: string, value: unknown) => {
+				if (key === ChatConfiguration.PluginMarketplaces) {
+					state.updatedMarketplaces = value as string[];
+				}
+			},
+		} as unknown as IConfigurationService);
+
+		// IQuickInputService
+		instantiationService.stub(IQuickInputService, {
+			input: async () => state.quickInputResult,
+			pick: async (picks: { label: string }[]) => {
+				if (!state.quickPickResult) {
+					return undefined;
+				}
+				return picks.find(p => p.label === state.quickPickResult!.label);
+			},
+		} as unknown as IQuickInputService);
+
 		const service = instantiationService.createInstance(PluginInstallService);
 		return { service, state };
 	}
@@ -781,4 +826,216 @@ suite('PluginInstallService', () => {
 			assert.strictEqual(state.addedPlugins.length, 0, 'no plugins should be installed when trust is declined');
 		});
 	});
+
+	// =========================================================================
+	// installPluginFromSource
+	// =========================================================================
+
+	suite('installPluginFromSource', () => {
+
+		test('rejects invalid source strings', async () => {
+			const { service, state } = createService();
+			await service.installPluginFromSource('not a valid source');
+			assert.strictEqual(state.addedPlugins.length, 0);
+			assert.strictEqual(state.notifications.length, 1);
+		});
+
+		test('rejects local file URIs', async () => {
+			const { service, state } = createService();
+			await service.installPluginFromSource('file:///some/local/path');
+			assert.strictEqual(state.addedPlugins.length, 0);
+			assert.strictEqual(state.notifications.length, 1);
+		});
+
+		test('installs single plugin from GitHub shorthand with marketplace.json', async () => {
+			const ref = makeMarketplaceRef('owner/my-plugin');
+			const discoveredPlugin = createPlugin({
+				name: 'my-discovered-plugin',
+				description: 'A discovered plugin',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: '' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+				marketplaceType: MarketplaceType.OpenPlugin,
+			});
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/my-plugin'),
+				readPluginsResult: [discoveredPlugin],
+			});
+
+			await service.installPluginFromSource('owner/my-plugin');
+
+			assert.strictEqual(state.addedPlugins.length, 1);
+			assert.strictEqual(state.addedPlugins[0].plugin.name, 'my-discovered-plugin');
+		});
+
+		test('shows error when no marketplace.json found', async () => {
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/cool-tool'),
+				readPluginsResult: [],
+			});
+
+			await service.installPluginFromSource('owner/cool-tool');
+
+			assert.strictEqual(state.addedPlugins.length, 0);
+			assert.strictEqual(state.notifications.length, 1);
+			assert.ok(state.notifications[0].message.includes('No plugins found'));
+		});
+
+		test('shows quick pick for multi-plugin repos', async () => {
+			const ref = makeMarketplaceRef('owner/multi-repo');
+			const pluginA = createPlugin({
+				name: 'plugin-a',
+				source: 'plugins/a',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: 'plugins/a' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+			});
+			const pluginB = createPlugin({
+				name: 'plugin-b',
+				source: 'plugins/b',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: 'plugins/b' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+			});
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/multi-repo'),
+				readPluginsResult: [pluginA, pluginB],
+				quickPickResult: { label: 'plugin-b' },
+			});
+
+			await service.installPluginFromSource('owner/multi-repo');
+
+			assert.strictEqual(state.addedPlugins.length, 1);
+			assert.strictEqual(state.addedPlugins[0].plugin.name, 'plugin-b');
+			assert.ok(state.addedPlugins[0].uri.includes('plugins/b'));
+		});
+
+		test('does not install when quick pick is cancelled', async () => {
+			const ref = makeMarketplaceRef('owner/multi-repo');
+			const pluginA = createPlugin({
+				name: 'plugin-a',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: 'plugins/a' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+			});
+			const pluginB = createPlugin({
+				name: 'plugin-b',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: 'plugins/b' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+			});
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/multi-repo'),
+				readPluginsResult: [pluginA, pluginB],
+				quickPickResult: undefined,
+			});
+
+			await service.installPluginFromSource('owner/multi-repo');
+
+			assert.strictEqual(state.addedPlugins.length, 0);
+		});
+
+		test('does not install when trust is declined', async () => {
+			const { service, state } = createService({
+				marketplaceTrusted: false,
+				dialogConfirmResult: false,
+				readPluginsResult: [],
+			});
+
+			await service.installPluginFromSource('owner/repo');
+
+			assert.strictEqual(state.addedPlugins.length, 0);
+		});
+
+		test('shows error when no plugins found in git URL', async () => {
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/my-tool'),
+				readPluginsResult: [],
+			});
+
+			await service.installPluginFromSource('https://github.com/owner/my-tool.git');
+
+			assert.strictEqual(state.addedPlugins.length, 0);
+			assert.strictEqual(state.notifications.length, 1);
+			assert.ok(state.notifications[0].message.includes('No plugins found'));
+		});
+
+		test('shows error when clone directory does not exist', async () => {
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/missing'),
+				fileExistsResult: false,
+			});
+
+			await service.installPluginFromSource('owner/missing');
+
+			assert.strictEqual(state.addedPlugins.length, 0);
+			assert.strictEqual(state.notifications.length, 1);
+		});
+
+		test('adds marketplace to config after installing single plugin', async () => {
+			const ref = makeMarketplaceRef('owner/my-plugin');
+			const discoveredPlugin = createPlugin({
+				name: 'my-discovered-plugin',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: '' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+				marketplaceType: MarketplaceType.OpenPlugin,
+			});
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/my-plugin'),
+				readPluginsResult: [discoveredPlugin],
+			});
+
+			await service.installPluginFromSource('owner/my-plugin');
+
+			assert.deepStrictEqual(state.updatedMarketplaces, ['owner/my-plugin']);
+		});
+
+		test('adds marketplace to config after picking from multi-plugin repo', async () => {
+			const ref = makeMarketplaceRef('owner/multi-repo');
+			const pluginA = createPlugin({
+				name: 'plugin-a',
+				source: 'plugins/a',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: 'plugins/a' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+			});
+			const pluginB = createPlugin({
+				name: 'plugin-b',
+				source: 'plugins/b',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: 'plugins/b' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+			});
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/multi-repo'),
+				readPluginsResult: [pluginA, pluginB],
+				quickPickResult: { label: 'plugin-a' },
+			});
+
+			await service.installPluginFromSource('owner/multi-repo');
+
+			assert.deepStrictEqual(state.updatedMarketplaces, ['owner/multi-repo']);
+		});
+
+		test('does not duplicate marketplace in config', async () => {
+			const ref = makeMarketplaceRef('owner/my-plugin');
+			const discoveredPlugin = createPlugin({
+				name: 'my-discovered-plugin',
+				sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: '' },
+				marketplace: ref.displayLabel,
+				marketplaceReference: ref,
+				marketplaceType: MarketplaceType.OpenPlugin,
+			});
+			const { service, state } = createService({
+				ensurePluginSourceResult: URI.file('/cache/agentPlugins/github.com/owner/my-plugin'),
+				readPluginsResult: [discoveredPlugin],
+				configuredMarketplaces: ['owner/my-plugin'],
+			});
+
+			await service.installPluginFromSource('owner/my-plugin');
+
+			assert.strictEqual(state.updatedMarketplaces, undefined);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/browser/plugins/pluginUrlHandler.test.ts b/src/vs/workbench/contrib/chat/test/browser/plugins/pluginUrlHandler.test.ts
new file mode 100644
index 00000000000..2b0f32639f8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/plugins/pluginUrlHandler.test.ts
@@ -0,0 +1,306 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { encodeBase64, VSBuffer } from '../../../../../../base/common/buffer.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IURLService } from '../../../../../../platform/url/common/url.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../../../services/host/browser/host.js';
+import { IExtensionsWorkbenchService } from '../../../../extensions/common/extensions.js';
+import { AgentPluginEditorInput } from '../../../browser/agentPluginEditor/agentPluginEditorInput.js';
+import { PluginUrlHandler } from '../../../browser/pluginUrlHandler.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+import { IInstallPluginFromSourceOptions, IInstallPluginFromSourceResult, IPluginInstallService } from '../../../common/plugins/pluginInstallService.js';
+import { IMarketplacePlugin, MarketplaceReferenceKind, MarketplaceType, PluginSourceKind } from '../../../common/plugins/pluginMarketplaceService.js';
+
+function toBase64(value: string): string {
+	return encodeBase64(VSBuffer.fromString(value));
+}
+
+suite('PluginUrlHandler', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	interface MockState {
+		dialogConfirmResult: boolean;
+		installedSources: string[];
+		configUpdates: { key: string; value: unknown; target: ConfigurationTarget }[];
+		openedEditorInputs: AgentPluginEditorInput[];
+		openSearchQueries: string[];
+		installFromValidatedSourceResult: IInstallPluginFromSourceResult;
+	}
+
+	function createHandler(stateOverrides?: Partial<MockState>): { handler: PluginUrlHandler; state: MockState } {
+		const state: MockState = {
+			dialogConfirmResult: true,
+			installedSources: [],
+			configUpdates: [],
+			openedEditorInputs: [],
+			openSearchQueries: [],
+			installFromValidatedSourceResult: { success: false },
+			...stateOverrides,
+		};
+
+		const instantiationService = store.add(new TestInstantiationService());
+
+		instantiationService.stub(IURLService, {
+			registerHandler: () => ({ dispose() { } }),
+		} as unknown as IURLService);
+
+		instantiationService.stub(IPluginInstallService, {
+			installPluginFromSource: async (source: string) => { state.installedSources.push(source); },
+			installPluginFromValidatedSource: async (_source: string, _options?: IInstallPluginFromSourceOptions) => state.installFromValidatedSourceResult,
+		} as unknown as IPluginInstallService);
+
+		instantiationService.stub(IDialogService, {
+			confirm: async () => ({ confirmed: state.dialogConfirmResult }),
+		} as unknown as IDialogService);
+
+		const configService = new TestConfigurationService({
+			[ChatConfiguration.PluginMarketplaces]: ['existing/marketplace'],
+		});
+		// Track updateValue calls
+		const origUpdate = configService.updateValue.bind(configService);
+		configService.updateValue = async (key: string, value: unknown, target?: ConfigurationTarget) => {
+			state.configUpdates.push({ key, value, target: target ?? ConfigurationTarget.USER });
+			return origUpdate(key, value);
+		};
+		instantiationService.stub(IConfigurationService, configService);
+
+		instantiationService.stub(IHostService, {
+			focus: async () => { },
+		} as unknown as IHostService);
+
+		instantiationService.stub(IExtensionsWorkbenchService, {
+			openSearch: (query: string) => { state.openSearchQueries.push(query); },
+		} as unknown as IExtensionsWorkbenchService);
+
+		instantiationService.stub(IEditorService, {
+			openEditor: async (input: AgentPluginEditorInput) => {
+				state.openedEditorInputs.push(input);
+				store.add(input);
+				return undefined;
+			},
+		} as unknown as IEditorService);
+
+		// IInstantiationService: delegate createInstance to the TestInstantiationService itself
+		instantiationService.stub(IInstantiationService, instantiationService);
+
+		instantiationService.stub(ILogService, new NullLogService());
+
+		const handler = store.add(instantiationService.createInstance(PluginUrlHandler));
+		return { handler, state };
+	}
+
+	function uri(path: string, query: string): URI {
+		return URI.from({ scheme: 'vscode', authority: 'chat-plugin', path, query });
+	}
+
+	// --- routing ---
+
+	test('ignores unrelated authority', async () => {
+		const { handler } = createHandler();
+		assert.strictEqual(await handler.handleURL(URI.parse('vscode://other/install?source=foo/bar')), false);
+	});
+
+	test('ignores unknown path', async () => {
+		const { handler } = createHandler();
+		assert.strictEqual(await handler.handleURL(uri('/unknown', 'source=foo/bar')), false);
+	});
+
+	// --- install: plain text ---
+
+	test('install with plain-text owner/repo source', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/install', 'source=anthropics/claude-code'));
+		assert.strictEqual(result, true);
+		assert.deepStrictEqual(state.installedSources, ['anthropics/claude-code']);
+	});
+
+	// --- install: base64 ---
+
+	test('install with base64-encoded source', async () => {
+		const { handler, state } = createHandler();
+		const encoded = toBase64('anthropics/claude-code');
+		const result = await handler.handleURL(uri('/install', `source=${encoded}`));
+		assert.strictEqual(result, true);
+		assert.deepStrictEqual(state.installedSources, ['anthropics/claude-code']);
+	});
+
+	// --- install: dialog declined ---
+
+	test('install does nothing when dialog is declined', async () => {
+		const { handler, state } = createHandler({ dialogConfirmResult: false });
+		const result = await handler.handleURL(uri('/install', 'source=anthropics/claude-code'));
+		assert.strictEqual(result, true);
+		assert.deepStrictEqual(state.installedSources, []);
+	});
+
+	// --- install: missing/invalid source ---
+
+	test('install handles missing source param', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/install', ''));
+		assert.strictEqual(result, true);
+		assert.deepStrictEqual(state.installedSources, []);
+	});
+
+	test('install handles invalid source', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/install', 'source=not-a-valid-ref'));
+		assert.strictEqual(result, true);
+		assert.deepStrictEqual(state.installedSources, []);
+	});
+
+	test('install rejects local file URI sources', async () => {
+		const { handler, state } = createHandler();
+		const encoded = toBase64('file:///home/user/my-plugin');
+		const result = await handler.handleURL(uri('/install', `source=${encodeURIComponent(encoded)}`));
+		assert.strictEqual(result, true);
+		assert.deepStrictEqual(state.installedSources, []);
+	});
+
+	// --- add-marketplace: plain text ---
+
+	test('add-marketplace with plain-text ref', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/add-marketplace', 'ref=anthropics/claude-code'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 1);
+		assert.deepStrictEqual(state.configUpdates[0].value, ['existing/marketplace', 'anthropics/claude-code']);
+	});
+
+	// --- add-marketplace: base64 ---
+
+	test('add-marketplace with base64-encoded ref', async () => {
+		const { handler, state } = createHandler();
+		const encoded = toBase64('anthropics/claude-code');
+		const result = await handler.handleURL(uri('/add-marketplace', `ref=${encoded}`));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 1);
+		assert.deepStrictEqual(state.configUpdates[0].value, ['existing/marketplace', 'anthropics/claude-code']);
+	});
+
+	// --- add-marketplace: dedup ---
+
+	test('add-marketplace does not duplicate existing entry', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/add-marketplace', 'ref=existing/marketplace'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 0);
+	});
+
+	test('add-marketplace deduplicates by canonical ID', async () => {
+		const { handler, state } = createHandler();
+		// The URL form of the same GitHub shorthand should match canonically
+		const result = await handler.handleURL(uri('/add-marketplace', 'ref=existing%2Fmarketplace'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 0);
+	});
+
+	// --- add-marketplace: dialog declined ---
+
+	test('add-marketplace does nothing when dialog is declined', async () => {
+		const { handler, state } = createHandler({ dialogConfirmResult: false });
+		const result = await handler.handleURL(uri('/add-marketplace', 'ref=anthropics/claude-code'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 0);
+	});
+
+	// --- add-marketplace: missing/invalid ref ---
+
+	test('add-marketplace handles missing ref param', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/add-marketplace', ''));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 0);
+	});
+
+	test('add-marketplace handles invalid ref', async () => {
+		const { handler, state } = createHandler();
+		const result = await handler.handleURL(uri('/add-marketplace', 'ref=not-valid'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.configUpdates.length, 0);
+	});
+
+	// --- install with plugin targeting ---
+
+	function makeMarketplacePlugin(name: string, marketplace: string): IMarketplacePlugin {
+		const [owner, repo] = marketplace.split('/');
+		const ref = {
+			kind: MarketplaceReferenceKind.GitHubShorthand as const,
+			rawValue: marketplace,
+			displayLabel: marketplace,
+			canonicalId: `github:${owner.toLowerCase()}/${repo.toLowerCase()}`,
+			cloneUrl: `https://github.com/${marketplace}.git`,
+			githubRepo: marketplace,
+			cacheSegments: ['github.com', owner, repo],
+		};
+		return {
+			name,
+			description: `${name} description`,
+			version: '1.0.0',
+			source: name,
+			sourceDescriptor: { kind: PluginSourceKind.RelativePath, path: name },
+			marketplace,
+			marketplaceReference: ref,
+			marketplaceType: MarketplaceType.OpenPlugin,
+		};
+	}
+
+	test('install with plugin param delegates to installPluginFromValidatedSource and opens editor', async () => {
+		const plugin = makeMarketplacePlugin('my-plugin', 'acme/plugins');
+		const { handler, state } = createHandler({
+			installFromValidatedSourceResult: { success: true, matchedPlugin: plugin },
+		});
+		const result = await handler.handleURL(uri('/install', 'source=acme/plugins&plugin=my-plugin'));
+		assert.strictEqual(result, true);
+		// Should not show the install confirmation dialog (trust handled by install service)
+		assert.deepStrictEqual(state.installedSources, []);
+		// Plugin editor was opened
+		assert.strictEqual(state.openedEditorInputs.length, 1);
+		assert.strictEqual(state.openedEditorInputs[0].item.name, 'my-plugin');
+	});
+
+	test('install with base64-encoded plugin param opens editor', async () => {
+		const plugin = makeMarketplacePlugin('my-plugin', 'acme/plugins');
+		const { handler, state } = createHandler({
+			installFromValidatedSourceResult: { success: true, matchedPlugin: plugin },
+		});
+		const encodedPlugin = toBase64('my-plugin');
+		const result = await handler.handleURL(uri('/install', `source=acme/plugins&plugin=${encodedPlugin}`));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.openedEditorInputs.length, 1);
+		assert.strictEqual(state.openedEditorInputs[0].item.name, 'my-plugin');
+	});
+
+	test('install with plugin param falls back to search on failure', async () => {
+		const { handler, state } = createHandler({
+			installFromValidatedSourceResult: { success: false, message: 'Plugin not found' },
+		});
+		const result = await handler.handleURL(uri('/install', 'source=acme/plugins&plugin=nonexistent'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.openedEditorInputs.length, 0);
+		assert.strictEqual(state.openSearchQueries.length, 1);
+		assert.ok(state.openSearchQueries[0].includes('acme/plugins'));
+	});
+
+	test('install with plugin param falls back to search when no matchedPlugin', async () => {
+		const { handler, state } = createHandler({
+			installFromValidatedSourceResult: { success: true },
+		});
+		const result = await handler.handleURL(uri('/install', 'source=acme/plugins&plugin=my-plugin'));
+		assert.strictEqual(result, true);
+		assert.strictEqual(state.openedEditorInputs.length, 0);
+		assert.strictEqual(state.openSearchQueries.length, 1);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts
index be2df9c0456..56d51978cfe 100644
--- a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts
@@ -28,20 +28,23 @@ import { PromptFileParser } from '../../../../common/promptSyntax/promptFilePars
 import { ICustomAgent, IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
 import { MockChatModeService } from '../../../common/mockChatModeService.js';
 import { MockPromptsService } from '../../../common/promptSyntax/service/mockPromptsService.js';
+import { PromptsConfig } from '../../../../common/promptSyntax/config/config.js';
 
 suite('PromptValidator', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instaService: TestInstantiationService;
+	let testConfigService: TestConfigurationService;
 
 	const existingRef1 = URI.parse('myFs://test/reference1.md');
 	const existingRef2 = URI.parse('myFs://test/reference2.md');
 
 	setup(async () => {
 
-		const testConfigService = new TestConfigurationService();
+		testConfigService = new TestConfigurationService();
 		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
-		testConfigService.setUserConfiguration('chat.useCustomAgentHooks', true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOM_AGENT_HOOKS, true);
+		testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 		instaService = workbenchInstantiationService({
 			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
 			configurationService: () => testConfigService
@@ -631,6 +634,60 @@ suite('PromptValidator', () => {
 			assert.deepStrictEqual(markers, [], 'Expected no validation issues for handoffs attribute');
 		});
 
+		test('duplicate handoff labels are reported', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`handoffs:`,
+				'  - label: Start Implementation',
+				'    agent: agent',
+				'    prompt: Go implement',
+				'  - label: Start Implementation',
+				'    agent: agent',
+				'    prompt: Go implement again',
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [
+				'Duplicate handoff label \'Start Implementation\'. Each handoff must have a unique label.',
+			]);
+		});
+
+		test('duplicate handoff labels are case-insensitive', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`handoffs:`,
+				'  - label: Start Implementation',
+				'    agent: agent',
+				'    prompt: Go implement',
+				'  - label: start implementation',
+				'    agent: edit',
+				'    prompt: Different prompt',
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [
+				'Duplicate handoff label \'start implementation\'. Each handoff must have a unique label.',
+			]);
+		});
+
+		test('handoff label must contain alphanumeric character', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`handoffs:`,
+				'  - label: "!!!"',
+				'    agent: agent',
+				'    prompt: Go',
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [
+				'The \'label\' property in a handoff must contain at least one alphanumeric character.',
+			]);
+		});
+
 		test('github-copilot agent with supported attributes', async () => {
 			const content = [
 				'---',
@@ -1044,6 +1101,7 @@ suite('PromptValidator', () => {
 
 			// Valid infer: true (maps to 'all') - shows deprecation warning
 			{
+				testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 				const content = [
 					'---',
 					'name: "TestAgent"',
@@ -1074,70 +1132,6 @@ suite('PromptValidator', () => {
 				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
 			}
 
-			// Valid infer: 'all' - shows deprecation warning
-			{
-				const content = [
-					'---',
-					'name: "TestAgent"',
-					'description: "Test agent"',
-					'infer: all',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1, 'infer: all should produce deprecation warning');
-				assert.strictEqual(markers[0].message, deprecationMessage);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-			}
-
-			// Valid infer: 'user' - shows deprecation warning
-			{
-				const content = [
-					'---',
-					'name: "TestAgent"',
-					'description: "Test agent"',
-					'infer: user',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1, 'infer: user should produce deprecation warning');
-				assert.strictEqual(markers[0].message, deprecationMessage);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-			}
-
-			// Valid infer: 'agent' - shows deprecation warning
-			{
-				const content = [
-					'---',
-					'name: "TestAgent"',
-					'description: "Test agent"',
-					'infer: agent',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1, 'infer: agent should produce deprecation warning');
-				assert.strictEqual(markers[0].message, deprecationMessage);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-			}
-
-			// Valid infer: 'hidden' - shows deprecation warning
-			{
-				const content = [
-					'---',
-					'name: "TestAgent"',
-					'description: "Test agent"',
-					'infer: hidden',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1, 'infer: hidden should produce deprecation warning');
-				assert.strictEqual(markers[0].message, deprecationMessage);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-			}
-
 			// Invalid infer: unknown string value - shows deprecation warning (validation removed for deprecated attribute)
 			{
 				const content = [
@@ -1154,22 +1148,6 @@ suite('PromptValidator', () => {
 				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
 			}
 
-			// Invalid infer: number value - shows deprecation warning (validation removed for deprecated attribute)
-			{
-				const content = [
-					'---',
-					'name: "TestAgent"',
-					'description: "Test agent"',
-					'infer: 1',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1, 'infer: 1 should produce deprecation warning');
-				assert.strictEqual(markers[0].message, deprecationMessage);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-			}
-
 			// Missing infer attribute (should be optional)
 			{
 				const content = [
@@ -1184,7 +1162,28 @@ suite('PromptValidator', () => {
 			}
 		});
 
+		test('disable-model-invocation: false warns when customAgentInSubagent.enabled is disabled', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, false);
+
+			// disable-model-invocation: false should warn when config is disabled
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'disable-model-invocation: false',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+				assert.strictEqual(markers[0].message, `For agents to be used as subagent you also need to enable the 'chat.customAgentInSubagent.enabled' setting.`);
+			}
+		});
+
 		test('agents attribute must be an array', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -1196,6 +1195,7 @@ suite('PromptValidator', () => {
 		});
 
 		test('each agent name in agents attribute must be a string', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -1222,6 +1222,7 @@ suite('PromptValidator', () => {
 		});
 
 		test('agents attribute with non-empty value requires agent tool 1', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -1233,6 +1234,7 @@ suite('PromptValidator', () => {
 		});
 
 		test('agents attribute with non-empty value requires agent tool 2', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -1245,6 +1247,7 @@ suite('PromptValidator', () => {
 		});
 
 		test('agents attribute with non-empty value requires agent tool 3', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -1257,6 +1260,7 @@ suite('PromptValidator', () => {
 		});
 
 		test('agents attribute with non-empty value requires agent tool 4', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -1269,6 +1273,7 @@ suite('PromptValidator', () => {
 		});
 
 		test('agents attribute with empty array does not require agent tool', async () => {
+			testConfigService.setUserConfiguration(ChatConfiguration.SubagentToolCustomAgents, true);
 			const content = [
 				'---',
 				'description: "Test"',
@@ -2111,7 +2116,7 @@ suite('PromptValidator', () => {
 			assert.strictEqual(markers[0].message, `The skill name 'different-name' should match the folder name 'my-skill'.`);
 		});
 
-		test('skill without name attribute does not error', async () => {
+		test('skill without name attribute should error', async () => {
 			const content = [
 				'---',
 				'description: Test Skill',
@@ -2119,10 +2124,12 @@ suite('PromptValidator', () => {
 				'This is a skill without a name.'
 			].join('\n');
 			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
-			assert.deepStrictEqual(markers, [], 'Expected no validation issues when name is missing');
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `Skill must provide a name.`);
 		});
 
-		test('skill with empty name does not validate folder match', async () => {
+		test('skill with empty name should error', async () => {
 			const content = [
 				'---',
 				'name: ""',
@@ -2131,9 +2138,49 @@ suite('PromptValidator', () => {
 				'This is a skill.'
 			].join('\n');
 			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
-			// Should get error for empty name, but no folder mismatch warning since name is empty
-			assert.ok(markers.some(m => m.message.includes('must not be empty')), 'Expected error for empty name');
-			assert.ok(!markers.some(m => m.message.includes('should match the folder name')), 'Should not warn about folder mismatch for empty name');
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
+		});
+
+		test('skill without description attribute should error', async () => {
+			const content = [
+				'---',
+				'name: my-skill',
+				'---',
+				'This is a skill without a description.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `Skill must provide a description.`);
+		});
+
+		test('skill with empty description should error', async () => {
+			const content = [
+				'---',
+				'name: my-skill',
+				'description: ""',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `The 'description' attribute should not be empty.`);
+		});
+
+
+		test('skill name with invalid characters should error', async () => {
+			const content = [
+				'---',
+				'name: My Skill',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.ok(markers.some(m => m.severity === MarkerSeverity.Error && m.message === 'Skill name may only contain lowercase letters, numbers, and hyphens.'));
 		});
 
 		test('skill name with whitespace trimmed matches folder name', async () => {
@@ -2186,7 +2233,7 @@ suite('PromptValidator', () => {
 				'This is a skill.'
 			].join('\n');
 			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my_special-skill.v2/SKILL.md'));
-			assert.deepStrictEqual(markers, [], 'Expected no issues when name with special chars matches folder');
+			assert.ok(markers.some(m => m.severity === MarkerSeverity.Error && m.message === 'Skill name may only contain lowercase letters, numbers, and hyphens.'), 'Expected error for invalid characters in skill name');
 		});
 
 		test('skill with non-string name type does not validate folder match', async () => {
diff --git a/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts
index 653cc47feb7..94e98ecbadc 100644
--- a/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts
@@ -6,10 +6,10 @@
 import * as assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { IStorageService, InMemoryStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { IStorageService, InMemoryStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { LanguageModelToolsConfirmationService } from '../../../browser/tools/languageModelToolsConfirmationService.js';
 import { ToolConfirmKind } from '../../../common/chatService/chatService.js';
-import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from '../../../common/tools/languageModelToolsConfirmationService.js';
+import { computeCombinationKey, ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from '../../../common/tools/languageModelToolsConfirmationService.js';
 import { ToolDataSource } from '../../../common/tools/languageModelToolsService.js';
 
 suite('LanguageModelToolsConfirmationService', () => {
@@ -44,6 +44,16 @@ suite('LanguageModelToolsConfirmationService', () => {
 		};
 	}
 
+	async function createCombinationRef(toolId: string, parameters: unknown, combinationLabel: string): Promise<ILanguageModelToolConfirmationRef> {
+		return {
+			...createToolRef(toolId, ToolDataSource.Internal, parameters),
+			combination: {
+				label: combinationLabel,
+				key: await computeCombinationKey(toolId, parameters),
+			},
+		};
+	}
+
 	test('getPreConfirmAction returns undefined by default', () => {
 		const ref = createToolRef('testTool');
 		const result = service.getPreConfirmAction(ref);
@@ -525,4 +535,134 @@ suite('LanguageModelToolsConfirmationService', () => {
 		const newResult = newService.getPreConfirmAction(ref);
 		assert.strictEqual(newResult, undefined);
 	});
+
+	test('combination actions are only offered when combinationLabel is set', async () => {
+		const refWithout = createToolRef('testTool', ToolDataSource.Internal, { file: 'foo.txt' });
+		const actionsWithout = service.getPreConfirmActions(refWithout);
+		assert.ok(!actionsWithout.some(a => a.label.includes('foo.txt')));
+
+		const refWith = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+		const actionsWith = service.getPreConfirmActions(refWith);
+		assert.ok(actionsWith.some(a => a.label.includes('Allow reading "foo.txt"')));
+	});
+
+	test('combination actions include session, workspace, and profile scopes', async () => {
+		const ref = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+		const actions = service.getPreConfirmActions(ref);
+		const combinationActions = actions.filter(a => a.label.includes('Allow reading "foo.txt"'));
+		assert.strictEqual(combinationActions.length, 3);
+		assert.ok(combinationActions.some(a => a.scope === 'session'));
+		assert.ok(combinationActions.some(a => a.scope === 'workspace'));
+		assert.ok(combinationActions.some(a => a.scope === 'profile'));
+	});
+
+	test('selecting a combination session action auto-confirms the same parameters', async () => {
+		const ref = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+
+		assert.strictEqual(service.getPreConfirmAction(ref), undefined);
+
+		const actions = service.getPreConfirmActions(ref);
+		const combinationAction = actions.find(a => a.label.includes('Allow reading "foo.txt"') && a.scope === 'session');
+		assert.ok(combinationAction);
+		await combinationAction.select();
+
+		const result = service.getPreConfirmAction(ref);
+		assert.deepStrictEqual(result, { type: ToolConfirmKind.LmServicePerTool, scope: 'session' });
+	});
+
+	test('selecting a combination workspace action stores at workspace scope', async () => {
+		const ref = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+
+		const actions = service.getPreConfirmActions(ref);
+		const combinationAction = actions.find(a => a.label.includes('Allow reading "foo.txt"') && a.scope === 'workspace');
+		assert.ok(combinationAction);
+		await combinationAction.select();
+
+		assert.deepStrictEqual(service.getPreConfirmAction(ref), { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' });
+	});
+
+	test('combination approval does not apply to different parameters', async () => {
+		const refFoo = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+		const refBar = await createCombinationRef('testTool', { file: 'bar.txt' }, 'Allow reading "bar.txt"');
+
+		const actions = service.getPreConfirmActions(refFoo);
+		const combinationAction = actions.find(a => a.label.includes('Allow reading "foo.txt"') && a.scope === 'session');
+		assert.ok(combinationAction);
+		await combinationAction.select();
+
+		assert.ok(service.getPreConfirmAction(refFoo));
+		assert.strictEqual(service.getPreConfirmAction(refBar), undefined);
+	});
+
+	test('tool-level approval takes precedence over combination approval', async () => {
+		const ref = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+
+		const actions = service.getPreConfirmActions(ref);
+		const toolSessionAction = actions.find(a => a.label.includes('Session')
+			&& !a.label.includes('foo.txt') && !a.label.includes('Server'));
+		assert.ok(toolSessionAction);
+		await toolSessionAction.select();
+
+		const result = service.getPreConfirmAction(ref);
+		assert.deepStrictEqual(result, { type: ToolConfirmKind.LmServicePerTool, scope: 'session' });
+	});
+
+	test('combination approvals are cleared on reset', async () => {
+		const ref = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+
+		const actions = service.getPreConfirmActions(ref);
+		const combinationAction = actions.find(a => a.label.includes('Allow reading "foo.txt"') && a.scope === 'session');
+		assert.ok(combinationAction);
+		await combinationAction.select();
+		assert.ok(service.getPreConfirmAction(ref));
+
+		service.resetToolAutoConfirmation();
+		assert.strictEqual(service.getPreConfirmAction(ref), undefined);
+	});
+
+	test('combination session approvals do not persist across service instances', async () => {
+		const ref = await createCombinationRef('testTool', { file: 'foo.txt' }, 'Allow reading "foo.txt"');
+
+		const actions = service.getPreConfirmActions(ref);
+		const combinationAction = actions.find(a => a.label.includes('Allow reading "foo.txt"') && a.scope === 'session');
+		assert.ok(combinationAction);
+		await combinationAction.select();
+		assert.ok(service.getPreConfirmAction(ref));
+
+		const newService = store.add(instantiationService.createInstance(LanguageModelToolsConfirmationService));
+		assert.strictEqual(newService.getPreConfirmAction(ref), undefined);
+	});
+
+	test('legacy string[] storage format is read correctly', () => {
+		// Pre-seed storage with the legacy string[] format
+		const storageService = instantiationService.get(IStorageService);
+		storageService.store('chat/autoconfirm', JSON.stringify(['tool1', 'tool2']), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+
+		// Create a new service instance that reads the legacy data
+		const newService = store.add(instantiationService.createInstance(LanguageModelToolsConfirmationService));
+
+		const ref1 = createToolRef('tool1');
+		const ref2 = createToolRef('tool2');
+		const ref3 = createToolRef('tool3');
+
+		assert.deepStrictEqual(newService.getPreConfirmAction(ref1), { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' });
+		assert.deepStrictEqual(newService.getPreConfirmAction(ref2), { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' });
+		assert.strictEqual(newService.getPreConfirmAction(ref3), undefined);
+	});
+
+	test('new Record storage format preserves labels', () => {
+		// Pre-seed storage with the new Record<string, string | boolean> format
+		const storageService = instantiationService.get(IStorageService);
+		const data: Record<string, string | boolean> = {
+			'tool1:combination:12345': 'Allow reading foo.txt',
+			'tool2': true,
+		};
+		storageService.store('chat/autoconfirm', JSON.stringify(data), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+
+		const newService = store.add(instantiationService.createInstance(LanguageModelToolsConfirmationService));
+
+		// tool2 should be auto-confirmed (boolean true, no label)
+		const ref2 = createToolRef('tool2');
+		assert.deepStrictEqual(newService.getPreConfirmAction(ref2), { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' });
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts
index 4689f30c00a..cab5d1b1b52 100644
--- a/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts
@@ -1633,6 +1633,97 @@ suite('LanguageModelToolsService', () => {
 		assert.strictEqual(result.content[0].value, 'bypass executed');
 	});
 
+	test('bypass approvals does not auto-approve tools in toolIdsThatCannotBeAutoApproved for CLI sessions', async () => {
+		const { service: testService, chatService: testChatService } = createTestToolsService(store, {
+			configureServices: config => {
+				config.setUserConfiguration('chat.tools.global.autoApprove', false);
+			}
+		});
+
+		// Register a tool with the ID that should never be auto-approved
+		registerToolForTest(testService, store, 'vscode_get_modified_files_confirmation', {
+			prepareToolInvocation: async () => ({
+				confirmationMessages: {
+					title: 'Uncommitted Changes',
+					message: 'Should these changes be included?',
+				},
+			}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'confirmed' }] })
+		});
+
+		// Create a CLI session URI (authority = 'copilotcli' instead of 'local')
+		const sessionId = 'test-bypass-no-auto-confirm';
+		const cliSessionResource = URI.from({
+			scheme: LocalChatSessionUri.scheme,
+			authority: 'copilotcli',
+			path: '/' + sessionId
+		});
+
+		const capture: { invocation?: any } = {};
+		const fakeModel = {
+			sessionId,
+			sessionResource: cliSessionResource,
+			getRequests: () => [{ id: 'req1', modelId: 'test-model', modeInfo: { permissionLevel: ChatPermissionLevel.AutoApprove } }],
+		} as ChatModel;
+		testChatService.addSession(fakeModel);
+		testChatService.appendProgress = (_request, progress) => {
+			capture.invocation = progress;
+		};
+
+		const resultPromise = testService.invokeTool(
+			{
+				callId: '1',
+				toolId: 'vscode_get_modified_files_confirmation',
+				tokenBudget: 100,
+				parameters: { test: true },
+				context: { sessionResource: cliSessionResource },
+			},
+			async () => 0,
+			CancellationToken.None
+		);
+
+		// The tool should NOT be auto-approved for CLI sessions — it must show confirmation UI
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'tool in toolIdsThatCannotBeAutoApproved should require confirmation for CLI sessions even with Bypass Approvals');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await resultPromise;
+		assert.strictEqual(result.content[0].value, 'confirmed');
+	});
+
+	test('bypass approvals auto-approves tools in toolIdsThatCannotBeAutoApproved for local sessions', async () => {
+		const { service: testService, chatService: testChatService } = createTestToolsService(store, {
+			configureServices: config => {
+				config.setUserConfiguration('chat.tools.global.autoApprove', false);
+			}
+		});
+
+		// Register a tool with the ID that cannot be auto-approved for CLI
+		const tool = registerToolForTest(testService, store, 'vscode_get_modified_files_confirmation', {
+			prepareToolInvocation: async () => ({
+				confirmationMessages: {
+					title: 'Uncommitted Changes',
+					message: 'Should these changes be included?',
+				},
+			}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'auto approved for local' }] })
+		});
+
+		const sessionId = 'test-bypass-local-auto-confirm';
+		stubGetSession(testChatService, sessionId, {
+			requestId: 'req1',
+			modeInfo: { permissionLevel: ChatPermissionLevel.AutoApprove },
+		});
+
+		// For local sessions, Bypass Approvals should auto-approve even these tools
+		const result = await testService.invokeTool(
+			tool.makeDto({ test: true }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result.content[0].value, 'auto approved for local');
+	});
+
 	test('shouldAutoConfirm with basic configuration', async () => {
 		// Test basic shouldAutoConfirm behavior with simple configuration
 		const { service: testService, chatService: testChatService } = createTestToolsService(store, {
diff --git a/src/vs/workbench/contrib/chat/test/browser/tools/renameTool.test.ts b/src/vs/workbench/contrib/chat/test/browser/tools/renameTool.test.ts
index 42226127e20..fabf66ac855 100644
--- a/src/vs/workbench/contrib/chat/test/browser/tools/renameTool.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/tools/renameTool.test.ts
@@ -12,10 +12,11 @@ import { RenameProvider, WorkspaceEdit, Rejection } from '../../../../../../edit
 import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { LanguageFeaturesService } from '../../../../../../editor/common/services/languageFeaturesService.js';
 import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { createTextModel } from '../../../../../../editor/test/common/testTextModel.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../../platform/workspace/common/workspace.js';
 import { IBulkEditService, IBulkEditResult } from '../../../../../../editor/browser/services/bulkEditService.js';
-import { RenameTool, RenameToolId } from '../../../browser/tools/renameTool.js';
+import { RenameTool } from '../../../browser/tools/renameTool.js';
 import { IChatService } from '../../../common/chatService/chatService.js';
 import { IToolInvocation, IToolResult, IToolResultTextPart, ToolProgress } from '../../../common/tools/languageModelToolsService.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
@@ -100,9 +101,14 @@ suite('RenameTool', () => {
 	const noopCountTokens = async () => 0;
 	const noopProgress: ToolProgress = { report() { } };
 
+	function createMockLanguageService(): ILanguageService {
+		return { getLanguageName: (id: string) => id } as unknown as ILanguageService;
+	}
+
 	function createTool(textModelService: ITextModelService, options?: { bulkEditService?: IBulkEditService }): RenameTool {
 		return new RenameTool(
 			langFeatures,
+			createMockLanguageService(),
 			textModelService,
 			createMockWorkspaceService(),
 			createMockChatService(),
@@ -124,9 +130,7 @@ suite('RenameTool', () => {
 
 		test('reports no providers when none registered', () => {
 			const tool = disposables.add(createTool(createMockTextModelService(null!)));
-			const data = tool.getToolData();
-			assert.strictEqual(data.id, RenameToolId);
-			assert.ok(data.modelDescription.includes('No languages currently have rename providers'));
+			assert.strictEqual(tool.getToolData(), undefined);
 		});
 
 		test('lists registered language ids', () => {
@@ -136,7 +140,7 @@ suite('RenameTool', () => {
 				provideRenameEdits: () => ({ edits: [] }),
 			}));
 			const data = tool.getToolData();
-			assert.ok(data.modelDescription.includes('typescript'));
+			assert.ok(data?.modelDescription.includes('typescript'));
 		});
 
 		test('reports all languages for wildcard', () => {
@@ -145,7 +149,7 @@ suite('RenameTool', () => {
 				provideRenameEdits: () => ({ edits: [] }),
 			}));
 			const data = tool.getToolData();
-			assert.ok(data.modelDescription.includes('all languages'));
+			assert.ok(data?.modelDescription.includes('all languages'));
 		});
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/tools/usagesTool.test.ts b/src/vs/workbench/contrib/chat/test/browser/tools/usagesTool.test.ts
index e0e20ec03f6..28c14f3b1ad 100644
--- a/src/vs/workbench/contrib/chat/test/browser/tools/usagesTool.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/tools/usagesTool.test.ts
@@ -13,10 +13,11 @@ import { ITextModel } from '../../../../../../editor/common/model.js';
 import { LanguageFeaturesService } from '../../../../../../editor/common/services/languageFeaturesService.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { createTextModel } from '../../../../../../editor/test/common/testTextModel.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../../platform/workspace/common/workspace.js';
 import { FileMatch, ISearchComplete, ISearchService, ITextQuery, OneLineRange, TextSearchMatch } from '../../../../../services/search/common/search.js';
-import { UsagesTool, UsagesToolId } from '../../../browser/tools/usagesTool.js';
+import { UsagesTool } from '../../../browser/tools/usagesTool.js';
 import { IToolInvocation, IToolResult, IToolResultTextPart, ToolProgress } from '../../../common/tools/languageModelToolsService.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 
@@ -91,8 +92,12 @@ suite('UsagesTool', () => {
 	const noopCountTokens = async () => 0;
 	const noopProgress: ToolProgress = { report() { } };
 
+	function createMockLanguageService(): ILanguageService {
+		return { getLanguageName: (id: string) => id } as unknown as ILanguageService;
+	}
+
 	function createTool(textModelService: ITextModelService, workspaceService: IWorkspaceContextService, options?: { modelService?: IModelService; searchService?: ISearchService }): UsagesTool {
-		return new UsagesTool(langFeatures, options?.modelService ?? createMockModelService(), options?.searchService ?? createMockSearchService(), textModelService, workspaceService);
+		return new UsagesTool(langFeatures, createMockLanguageService(), options?.modelService ?? createMockModelService(), options?.searchService ?? createMockSearchService(), textModelService, workspaceService);
 	}
 
 	setup(() => {
@@ -109,9 +114,7 @@ suite('UsagesTool', () => {
 
 		test('reports no providers when none registered', () => {
 			const tool = disposables.add(createTool(createMockTextModelService(null!), createMockWorkspaceService()));
-			const data = tool.getToolData();
-			assert.strictEqual(data.id, UsagesToolId);
-			assert.ok(data.modelDescription.includes('No languages currently have reference providers'));
+			assert.strictEqual(tool.getToolData(), undefined);
 		});
 
 		test('lists registered language ids', () => {
@@ -119,14 +122,14 @@ suite('UsagesTool', () => {
 			const tool = disposables.add(createTool(createMockTextModelService(model), createMockWorkspaceService()));
 			disposables.add(langFeatures.referenceProvider.register('typescript', { provideReferences: () => [] }));
 			const data = tool.getToolData();
-			assert.ok(data.modelDescription.includes('typescript'));
+			assert.ok(data?.modelDescription.includes('typescript'));
 		});
 
 		test('reports all languages for wildcard', () => {
 			const tool = disposables.add(createTool(createMockTextModelService(null!), createMockWorkspaceService()));
 			disposables.add(langFeatures.referenceProvider.register('*', { provideReferences: () => [] }));
 			const data = tool.getToolData();
-			assert.ok(data.modelDescription.includes('all languages'));
+			assert.ok(data?.modelDescription.includes('all languages'));
 		});
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts
index 7bc6a6c0412..6362d8764f2 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts
@@ -149,6 +149,82 @@ suite('ChatQuestionCarouselPart', () => {
 			const directChildCloseContainer = widget.domNode.querySelector(':scope > .chat-question-close-container');
 			assert.strictEqual(directChildCloseContainer, null, 'close button container should not be positioned as a direct child of the carousel container');
 		});
+
+		test('renders collapse button in title row even when skip is disabled', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], false);
+			createWidget(carousel);
+
+			const titleRow = widget.domNode.querySelector('.chat-question-title-row');
+			assert.ok(titleRow, 'title row should exist');
+
+			const collapseButton = titleRow?.querySelector('.chat-question-collapse-toggle');
+			assert.ok(collapseButton, 'collapse button should be rendered even when skip is disabled');
+		});
+
+		test('renders collapse button to the right of close button', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' },
+				{ id: 'q2', type: 'text', title: 'Question 2' }
+			], true);
+			createWidget(carousel);
+
+			const actionsContainer = widget.domNode.querySelector('.chat-question-header-actions');
+			assert.ok(actionsContainer, 'actions container should exist');
+			if (!actionsContainer) {
+				return;
+			}
+
+			const actionButtons = Array.from(actionsContainer.querySelectorAll('.monaco-button'));
+			const closeIndex = actionButtons.findIndex(button => button.classList.contains('chat-question-close'));
+			const collapseIndex = actionButtons.findIndex(button => button.classList.contains('chat-question-collapse-toggle'));
+
+			assert.ok(closeIndex >= 0, 'close button should exist');
+			assert.ok(collapseIndex >= 0, 'collapse button should exist');
+			assert.ok(collapseIndex > closeIndex, 'collapse button should be positioned to the right of close button');
+		});
+
+		test('toggles collapsed state and updates aria-expanded', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' },
+				{ id: 'q2', type: 'text', title: 'Question 2' }
+			], true);
+			createWidget(carousel);
+
+			const collapseButton = widget.domNode.querySelector('.chat-question-collapse-toggle') as HTMLElement;
+			assert.ok(collapseButton, 'collapse button should exist');
+			assert.strictEqual(collapseButton.getAttribute('aria-expanded'), 'true');
+
+			collapseButton.click();
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-collapsed'), 'widget should enter collapsed state');
+			assert.strictEqual(collapseButton.getAttribute('aria-expanded'), 'false');
+			const collapsedSummary = widget.domNode.querySelector('.chat-question-collapsed-summary');
+			assert.strictEqual(collapsedSummary, null, 'collapsed mode should not render an additional summary section');
+
+			const titleRow = widget.domNode.querySelector('.chat-question-title-row');
+			assert.ok(titleRow, 'header should remain visible when collapsed');
+
+			const inputScrollable = widget.domNode.querySelector('.chat-question-input-scrollable');
+			assert.ok(inputScrollable, 'input section exists in DOM but is hidden while collapsed');
+
+			collapseButton.click();
+			assert.ok(!widget.domNode.classList.contains('chat-question-carousel-collapsed'), 'widget should exit collapsed state');
+			assert.strictEqual(collapseButton.getAttribute('aria-expanded'), 'true');
+		});
+
+		test('restores draft collapsed state from carousel data', () => {
+			const carousel = new ChatQuestionCarouselData([
+				{ id: 'q1', type: 'text', title: 'Question 1' },
+				{ id: 'q2', type: 'text', title: 'Question 2' }
+			], true);
+			carousel.draftCollapsed = true;
+			createWidget(carousel);
+
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-collapsed'), 'widget should restore collapsed draft state');
+			const collapseButton = widget.domNode.querySelector('.chat-question-collapse-toggle');
+			assert.strictEqual(collapseButton?.getAttribute('aria-expanded'), 'false');
+		});
 	});
 
 	suite('Question Types', () => {
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts
index 5dc3df666c6..93339e79244 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts
@@ -144,13 +144,14 @@ suite('ChatSubagentContentPart', () => {
 				prompt: 'Test prompt'
 			},
 			originMessage: undefined,
-			invocationMessage: options.invocationMessage ?? 'Running subagent...',
+			invocationMessage: options.invocationMessage ?? 'Running subagent',
 			pastTenseMessage: undefined,
 			source: ToolDataSource.Internal,
 			toolId: options.toolId ?? RunSubagentTool.Id,
 			toolCallId: toolCallId,
 			subAgentInvocationId: options.subAgentInvocationId,
 			state: observableValue('state', stateValue),
+			isAttachedToThinking: false,
 			kind: 'toolInvocation',
 			toJSON: () => createMockSerializedToolInvocation({
 				toolId: options.toolId ?? RunSubagentTool.Id,
@@ -179,7 +180,7 @@ suite('ChatSubagentContentPart', () => {
 				result: 'Test result text'
 			},
 			originMessage: undefined,
-			invocationMessage: 'Running subagent...',
+			invocationMessage: 'Running subagent',
 			pastTenseMessage: undefined,
 			resultDetails: undefined,
 			isConfirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts
index f11478cebc5..8717a5dee30 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts
@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { $ } from '../../../../../../../base/browser/dom.js';
-import { Event } from '../../../../../../../base/common/event.js';
+import { Emitter, Event } from '../../../../../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../../../base/common/observable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
@@ -14,9 +14,10 @@ import { workbenchInstantiationService } from '../../../../../../test/browser/wo
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { ChatThinkingContentPart } from '../../../../browser/widget/chatContentParts/chatThinkingContentPart.js';
-import { IChatMarkdownContent, IChatThinkingPart } from '../../../../common/chatService/chatService.js';
+import { IChatMarkdownContent, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../../common/chatService/chatService.js';
 import { IChatContentPartRenderContext, InlineTextModelCollection } from '../../../../browser/widget/chatContentParts/chatContentParts.js';
 import { IChatRendererContent, IChatResponseViewModel } from '../../../../common/model/chatViewModel.js';
+import { IEditSessionDiffStats } from '../../../../common/editing/chatEditingService.js';
 import { IChatMarkdownAnchorService } from '../../../../browser/widget/chatContentParts/chatMarkdownAnchorService.js';
 import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
 import { IRenderedMarkdown, MarkdownRenderOptions } from '../../../../../../../base/browser/markdownRenderer.js';
@@ -26,6 +27,7 @@ import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockMod
 import { EditorPool, DiffEditorPool } from '../../../../browser/widget/chatContentParts/chatContentCodePools.js';
 import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
 import { ILanguageModelsService } from '../../../../common/languageModels.js';
+import { ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
 import { URI } from '../../../../../../../base/common/uri.js';
 
 suite('ChatThinkingContentPart', () => {
@@ -1193,5 +1195,415 @@ suite('ChatThinkingContentPart', () => {
 			const circleIcon = part.domNode.querySelector('.codicon-circle-filled');
 			assert.ok(circleIcon, 'Should have circle-filled icon while streaming');
 		});
+
+		function createMockStreamingToolInvocation(toolId: string, invocationMessage: string, toolCallId: string): IChatToolInvocation {
+			return {
+				kind: 'toolInvocation',
+				toolId,
+				toolCallId,
+				invocationMessage,
+				originMessage: undefined,
+				pastTenseMessage: undefined,
+				presentation: undefined,
+				source: ToolDataSource.Internal,
+				isAttachedToThinking: false,
+				generatedTitle: undefined,
+				state: observableValue('state', {
+					type: IChatToolInvocation.StateKind.Streaming,
+					partialInput: observableValue('partialInput', undefined),
+					streamingMessage: observableValue('streamingMessage', undefined),
+				}),
+				toJSON: () => ({} as IChatToolInvocationSerialized),
+			} as IChatToolInvocation;
+		}
+
+		function createMockExecutingToolInvocation(toolId: string, invocationMessage: string, toolCallId: string): IChatToolInvocation {
+			return {
+				kind: 'toolInvocation',
+				toolId,
+				toolCallId,
+				invocationMessage,
+				originMessage: undefined,
+				pastTenseMessage: undefined,
+				presentation: undefined,
+				source: ToolDataSource.Internal,
+				isAttachedToThinking: false,
+				generatedTitle: undefined,
+				state: observableValue('state', {
+					type: IChatToolInvocation.StateKind.Executing,
+					confirmed: { type: 0 },
+					progress: observableValue('progress', { progress: 0 }),
+					parameters: {},
+					confirmationMessages: undefined,
+				}),
+				toJSON: () => ({} as IChatToolInvocationSerialized),
+			} as IChatToolInvocation;
+		}
+
+		function createMockSerializedImageToolInvocation(toolId: string, invocationMessage: string, toolCallId: string): IChatToolInvocationSerialized {
+			return {
+				kind: 'toolInvocationSerialized',
+				toolId,
+				toolCallId,
+				invocationMessage,
+				originMessage: undefined,
+				pastTenseMessage: undefined,
+				presentation: undefined,
+				resultDetails: {
+					output: {
+						type: 'data',
+						mimeType: 'image/png',
+						base64Data: 'AQID'
+					}
+				},
+				isConfirmed: { type: 0 },
+				isComplete: true,
+				source: ToolDataSource.Internal,
+				generatedTitle: undefined,
+				isAttachedToThinking: false,
+			};
+		}
+
+		test('should show "Editing files" for streaming edit tools instead of generic display name', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const streamingReplaceTool = createMockStreamingToolInvocation(
+				'copilot_replaceString', 'Replace String in File', 'call-1'
+			);
+
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.textContent = 'Replace tool';
+				return { domNode: div };
+			}, streamingReplaceTool.toolId, streamingReplaceTool);
+
+			// The title should show "Editing files" instead of "Replace String in File"
+			const button = part.domNode.querySelector('.chat-used-context-label .monaco-button');
+			assert.ok(button, 'Should have collapse button');
+			const labelText = button.querySelector('.icon-label')?.textContent ?? button.textContent ?? '';
+			assert.ok(labelText.includes('Editing files'), `Title should contain "Editing files" but got "${labelText}"`);
+		});
+
+		test('should show original message for non-edit streaming tools', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const streamingReadTool = createMockStreamingToolInvocation(
+				'copilot_readFile', 'Reading file.ts', 'call-2'
+			);
+
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.textContent = 'Read tool';
+				return { domNode: div };
+			}, streamingReadTool.toolId, streamingReadTool);
+
+			const button = part.domNode.querySelector('.chat-used-context-label .monaco-button');
+			assert.ok(button, 'Should have collapse button');
+			const labelText = button.querySelector('.icon-label')?.textContent ?? button.textContent ?? '';
+			assert.ok(labelText.includes('Reading file.ts'), `Title should contain "Reading file.ts" but got "${labelText}"`);
+		});
+
+		test('should show original message for non-streaming edit tools', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Non-streaming (executing) edit tool should show its invocation message
+			const executingReplaceTool = createMockExecutingToolInvocation(
+				'copilot_replaceString', 'Replacing 5 lines in file.ts', 'call-3'
+			);
+
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.textContent = 'Replace tool';
+				return { domNode: div };
+			}, executingReplaceTool.toolId, executingReplaceTool);
+
+			const button = part.domNode.querySelector('.chat-used-context-label .monaco-button');
+			assert.ok(button, 'Should have collapse button');
+			const labelText = button.querySelector('.icon-label')?.textContent ?? button.textContent ?? '';
+			assert.ok(labelText.includes('Replacing 5 lines in file.ts'), `Title should contain "Replacing 5 lines in file.ts" but got "${labelText}"`);
+		});
+
+		test('should keep original message for create_file tool even when streaming', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const streamingCreateTool = createMockStreamingToolInvocation(
+				'copilot_createFile', 'Creating newFile.ts', 'call-4'
+			);
+
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.textContent = 'Create tool';
+				return { domNode: div };
+			}, streamingCreateTool.toolId, streamingCreateTool);
+
+			const button = part.domNode.querySelector('.chat-used-context-label .monaco-button');
+			assert.ok(button, 'Should have collapse button');
+			const labelText = button.querySelector('.icon-label')?.textContent ?? button.textContent ?? '';
+			assert.ok(labelText.includes('Creating newFile.ts'), `Title should contain "Creating newFile.ts" but got "${labelText}"`);
+		});
+
+		test('should show external resources for serialized image tools when initially collapsed and hide them when expanded', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const serializedImageTool = createMockSerializedImageToolInvocation(
+				'chat_screenshot', 'Captured screenshot', 'image-call-1'
+			);
+
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.textContent = 'Image tool';
+				return { domNode: div };
+			}, serializedImageTool.toolId, serializedImageTool);
+
+			const externalResources = part.domNode.querySelector('.chat-thinking-external-resources') as HTMLElement;
+			assert.ok(externalResources, 'Should render external resources container');
+			assert.notStrictEqual(externalResources.style.display, 'none', 'Should show external resources while initially collapsed');
+
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			assert.ok(button, 'Should have expand button');
+			button.click();
+
+			assert.strictEqual(externalResources.style.display, 'none', 'Should hide external resources when expanded');
+
+			button.click();
+			assert.notStrictEqual(externalResources.style.display, 'none', 'Should show external resources again after collapsing');
+		});
+	});
+
+	suite('Diff aggregation in thinking header', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('should show diff stats in finalized title when onDidChangeDiff fires', () => {
+			const content = createThinkingPart('**Editing files**');
+			const context = createMockRenderContext(true);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const diffEmitter = store.add(new Emitter<IEditSessionDiffStats>());
+
+			part.appendItem(
+				() => ({ domNode: $('div.test-edit-pill') }),
+				'edit-part-1',
+				undefined,
+				undefined,
+				diffEmitter.event
+			);
+
+			part.finalizeTitleIfDefault();
+
+			// Fire diff event
+			diffEmitter.fire({ added: 10, removed: 3 });
+
+			const addedEl = part.domNode.querySelector('.label-added');
+			const removedEl = part.domNode.querySelector('.label-removed');
+			assert.ok(addedEl, 'Should render +N element');
+			assert.ok(removedEl, 'Should render -N element');
+			assert.strictEqual(addedEl?.textContent, '+10');
+			assert.strictEqual(removedEl?.textContent, '-3');
+		});
+
+		test('should aggregate diffs from multiple edit parts', () => {
+			const content = createThinkingPart('**Editing files**');
+			const context = createMockRenderContext(true);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const diffEmitter1 = store.add(new Emitter<IEditSessionDiffStats>());
+			const diffEmitter2 = store.add(new Emitter<IEditSessionDiffStats>());
+
+			part.appendItem(
+				() => ({ domNode: $('div.test-edit-pill-1') }),
+				'edit-part-1',
+				undefined,
+				undefined,
+				diffEmitter1.event
+			);
+
+			part.appendItem(
+				() => ({ domNode: $('div.test-edit-pill-2') }),
+				'edit-part-2',
+				undefined,
+				undefined,
+				diffEmitter2.event
+			);
+
+			part.finalizeTitleIfDefault();
+
+			diffEmitter1.fire({ added: 5, removed: 2 });
+			diffEmitter2.fire({ added: 8, removed: 1 });
+
+			const addedEl = part.domNode.querySelector('.label-added');
+			const removedEl = part.domNode.querySelector('.label-removed');
+			assert.strictEqual(addedEl?.textContent, '+13');
+			assert.strictEqual(removedEl?.textContent, '-3');
+		});
+
+		test('should show +0 -0 when diff parts exist but have no changes', () => {
+			const content = createThinkingPart('**Editing files**');
+			const context = createMockRenderContext(true);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const diffEmitter = store.add(new Emitter<IEditSessionDiffStats>());
+
+			part.appendItem(
+				() => ({ domNode: $('div.test-edit-pill') }),
+				'edit-part-1',
+				undefined,
+				undefined,
+				diffEmitter.event
+			);
+
+			part.finalizeTitleIfDefault();
+			diffEmitter.fire({ added: 0, removed: 0 });
+
+			const addedEl = part.domNode.querySelector('.label-added');
+			const removedEl = part.domNode.querySelector('.label-removed');
+			assert.strictEqual(addedEl?.textContent, '+0');
+			assert.strictEqual(removedEl?.textContent, '-0');
+		});
+
+		test('should include diff stats in aria-label', () => {
+			const content = createThinkingPart('**Editing files**');
+			const context = createMockRenderContext(true);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const diffEmitter = store.add(new Emitter<IEditSessionDiffStats>());
+
+			part.appendItem(
+				() => ({ domNode: $('div.test-edit-pill') }),
+				'edit-part-1',
+				undefined,
+				undefined,
+				diffEmitter.event
+			);
+
+			part.finalizeTitleIfDefault();
+			diffEmitter.fire({ added: 7, removed: 2 });
+
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			assert.ok(button?.ariaLabel?.includes('7'), 'aria-label should include added count');
+			assert.ok(button?.ariaLabel?.includes('2'), 'aria-label should include removed count');
+		});
+
+		test('should not show diff stats when no diff events fired', () => {
+			const content = createThinkingPart('**Analyzing code**');
+			const context = createMockRenderContext(true);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			part.finalizeTitleIfDefault();
+
+			const diffContainer = part.domNode.querySelector('.chat-thinking-title-diff');
+			assert.strictEqual(diffContainer, null, 'Should not render diff container when no diffs exist');
+		});
 	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatToolProgressPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatToolProgressPart.test.ts
new file mode 100644
index 00000000000..535b44dcd18
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatToolProgressPart.test.ts
@@ -0,0 +1,248 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { Event } from '../../../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../../../base/common/observable.js';
+import { IRenderedMarkdown, MarkdownRenderOptions } from '../../../../../../../base/browser/markdownRenderer.js';
+import { IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { mainWindow } from '../../../../../../../base/browser/window.js';
+import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { IChatMarkdownAnchorService } from '../../../../browser/widget/chatContentParts/chatMarkdownAnchorService.js';
+import { IChatContentPartRenderContext, InlineTextModelCollection } from '../../../../browser/widget/chatContentParts/chatContentParts.js';
+import { ChatToolProgressSubPart } from '../../../../browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.js';
+import { isMcpToolInvocation } from '../../../../browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.js';
+import { DiffEditorPool, EditorPool } from '../../../../browser/widget/chatContentParts/chatContentCodePools.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { IChatResponseViewModel } from '../../../../common/model/chatViewModel.js';
+import { ToolDataSource, type ToolDataSource as ToolDataSourceType } from '../../../../common/tools/languageModelToolsService.js';
+import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+
+suite('ChatToolProgressSubPart', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let disposables: DisposableStore;
+	let instantiationService: ReturnType<typeof workbenchInstantiationService>;
+	let mockMarkdownRenderer: IMarkdownRenderer;
+	let mockAnchorService: IChatMarkdownAnchorService;
+	let mockHoverService: IHoverService;
+	let mockConfigurationService: TestConfigurationService;
+	let mockEditorPool: EditorPool;
+	let mockCodeBlockModelCollection: CodeBlockModelCollection;
+
+	function createRenderContext(isComplete: boolean = false): IChatContentPartRenderContext {
+		const mockElement: Partial<IChatResponseViewModel> = {
+			isComplete,
+			id: 'test-response-id',
+			sessionResource: URI.parse('chat-session://test/session1'),
+			setVote: () => { },
+			get model() { return {} as IChatResponseViewModel['model']; }
+		};
+
+		return {
+			element: mockElement as IChatResponseViewModel,
+			inlineTextModels: {} as InlineTextModelCollection,
+			elementIndex: 0,
+			container: mainWindow.document.createElement('div'),
+			content: [],
+			contentIndex: 0,
+			editorPool: mockEditorPool,
+			codeBlockStartIndex: 0,
+			treeStartIndex: 0,
+			diffEditorPool: {} as DiffEditorPool,
+			codeBlockModelCollection: mockCodeBlockModelCollection,
+			currentWidth: observableValue('currentWidth', 500),
+			onDidChangeVisibility: Event.None
+		};
+	}
+
+	function createSerializedToolInvocation(options: {
+		source?: ToolDataSourceType;
+		toolId?: string;
+		isComplete?: boolean;
+		invocationMessage?: string;
+	} = {}): IChatToolInvocationSerialized {
+		return {
+			presentation: undefined,
+			toolSpecificData: undefined,
+			originMessage: undefined,
+			invocationMessage: options.invocationMessage ?? 'Running tool...',
+			pastTenseMessage: undefined,
+			resultDetails: undefined,
+			isConfirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
+			isComplete: options.isComplete ?? false,
+			toolCallId: 'tool-call-id',
+			toolId: options.toolId ?? 'test_tool',
+			source: options.source,
+			kind: 'toolInvocationSerialized'
+		};
+	}
+
+	function createToolInvocation(options: {
+		source?: ToolDataSourceType;
+		toolId?: string;
+		invocationMessage?: string;
+	} = {}): IChatToolInvocation {
+		const source = options.source ?? ToolDataSource.Internal;
+		const toolId = options.toolId ?? 'test_tool';
+		return {
+			presentation: undefined,
+			toolSpecificData: undefined,
+			originMessage: undefined,
+			invocationMessage: options.invocationMessage ?? 'Running tool...',
+			pastTenseMessage: undefined,
+			source,
+			toolId,
+			toolCallId: 'live-tool-call-id',
+			state: observableValue('state', {
+				type: IChatToolInvocation.StateKind.Executing,
+				parameters: undefined,
+				confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
+				progress: observableValue('progress', { message: undefined, progress: undefined })
+			}),
+			isAttachedToThinking: false,
+			kind: 'toolInvocation',
+			toJSON: () => createSerializedToolInvocation({ source, toolId, invocationMessage: options.invocationMessage })
+		};
+	}
+
+	setup(() => {
+		disposables = store.add(new DisposableStore());
+		instantiationService = workbenchInstantiationService(undefined, store);
+
+		mockConfigurationService = new TestConfigurationService();
+		instantiationService.stub(IConfigurationService, mockConfigurationService);
+
+		mockMarkdownRenderer = {
+			render: (markdown: IMarkdownString, _options?: MarkdownRenderOptions, outElement?: HTMLElement): IRenderedMarkdown => {
+				const element = outElement ?? mainWindow.document.createElement('div');
+				const content = typeof markdown === 'string' ? markdown : (markdown.value ?? '');
+				element.textContent = content;
+				return {
+					element,
+					dispose: () => { }
+				};
+			}
+		};
+
+		mockAnchorService = {
+			_serviceBrand: undefined,
+			register: () => ({ dispose: () => { } }),
+			lastFocusedAnchor: undefined
+		};
+		instantiationService.stub(IChatMarkdownAnchorService, mockAnchorService);
+
+		mockHoverService = {
+			_serviceBrand: undefined,
+			showHover: () => undefined,
+			showDelayedHover: () => undefined,
+			showAndFocusLastHover: () => { },
+			hideHover: () => { },
+			setupDelayedHover: () => ({ dispose: () => { } }),
+			setupManagedHover: () => ({ dispose: () => { }, show: () => { }, hide: () => { }, update: () => { } }),
+			showManagedHover: () => undefined,
+			isHovered: () => false,
+		} as unknown as IHoverService;
+		instantiationService.stub(IHoverService, mockHoverService);
+
+		mockEditorPool = {} as EditorPool;
+		mockCodeBlockModelCollection = {} as CodeBlockModelCollection;
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	test('detects MCP tool invocations for live and serialized rows', () => {
+		const mcpSource: ToolDataSourceType = {
+			type: 'mcp',
+			label: 'Weather MCP',
+			serverLabel: 'Weather',
+			instructions: undefined,
+			collectionId: 'collection',
+			definitionId: 'definition'
+		};
+
+		const cases = [
+			isMcpToolInvocation(createToolInvocation({ source: mcpSource })),
+			isMcpToolInvocation(createSerializedToolInvocation({ source: undefined, toolId: 'mcp__weather' })),
+			isMcpToolInvocation(createSerializedToolInvocation({ source: ToolDataSource.Internal, toolId: 'fetch_webpage' }))
+		];
+
+		assert.deepStrictEqual(cases, [true, true, false]);
+	});
+
+	test('adds shimmer styling for active MCP tool progress', () => {
+		const mcpTool = createToolInvocation({
+			source: {
+				type: 'mcp',
+				label: 'Weather MCP',
+				serverLabel: 'Weather',
+				instructions: undefined,
+				collectionId: 'collection',
+				definitionId: 'definition'
+			},
+			toolId: 'weather_lookup'
+		});
+
+		const part = disposables.add(instantiationService.createInstance(
+			ChatToolProgressSubPart,
+			mcpTool,
+			createRenderContext(false),
+			mockMarkdownRenderer,
+			new Set<string>()
+		));
+
+		assert.ok(part.domNode.querySelector('.shimmer-progress'));
+	});
+
+	test('does not add shimmer styling for non-MCP tool progress', () => {
+		const tool = createSerializedToolInvocation({
+			source: ToolDataSource.Internal,
+			toolId: 'fetch_webpage'
+		});
+
+		const part = disposables.add(instantiationService.createInstance(
+			ChatToolProgressSubPart,
+			tool,
+			createRenderContext(false),
+			mockMarkdownRenderer,
+			new Set<string>()
+		));
+
+		assert.strictEqual(part.domNode.querySelector('.shimmer-progress'), null);
+	});
+
+	test('does not add shimmer styling for completed MCP tool progress', () => {
+		const mcpTool = createSerializedToolInvocation({
+			source: {
+				type: 'mcp',
+				label: 'Weather MCP',
+				serverLabel: 'Weather',
+				instructions: undefined,
+				collectionId: 'collection',
+				definitionId: 'definition'
+			},
+			toolId: 'weather_lookup'
+		});
+
+		const part = disposables.add(instantiationService.createInstance(
+			ChatToolProgressSubPart,
+			mcpTool,
+			createRenderContext(false),
+			mockMarkdownRenderer,
+			new Set<string>()
+		));
+
+		assert.strictEqual(part.domNode.querySelector('.shimmer-progress'), null);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/input/chatModelPicker.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatModelPicker.test.ts
index 11be03e3f31..d98c5e41fe5 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/input/chatModelPicker.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatModelPicker.test.ts
@@ -12,7 +12,7 @@ import { ActionListItemKind, IActionListItem } from '../../../../../../../platfo
 import { IActionWidgetDropdownAction } from '../../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
 import { StateType } from '../../../../../../../platform/update/common/update.js';
 import { buildModelPickerItems, getModelPickerAccessibilityProvider } from '../../../../browser/widget/input/chatModelPicker.js';
-import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, IModelControlEntry } from '../../../../common/languageModels.js';
+import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService, IModelControlEntry } from '../../../../common/languageModels.js';
 import { ChatEntitlement, IChatEntitlementService } from '../../../../../../services/chat/common/chatEntitlementService.js';
 
 function createStubEntitlementService(opts?: { entitlement?: ChatEntitlement; isInternal?: boolean; anonymous?: boolean }): IChatEntitlementService {
@@ -69,6 +69,8 @@ const stubManageModelsAction: IActionWidgetDropdownAction = {
 	run: () => { }
 };
 
+const stubLanguageModelsService = { getModelConfigurationActions: () => [], getModelConfiguration: () => undefined } as unknown as ILanguageModelsService;
+
 function callBuild(
 	models: ILanguageModelChatMetadataAndIdentifier[],
 	opts: {
@@ -80,6 +82,8 @@ function callBuild(
 		updateStateType?: StateType;
 		manageSettingsUrl?: string;
 		anonymous?: boolean;
+		showUnavailableFeatured?: boolean;
+		showFeatured?: boolean;
 	} = {},
 ): IActionListItem<IActionWidgetDropdownAction>[] {
 	const onSelect = () => { };
@@ -99,6 +103,10 @@ function callBuild(
 		true,
 		stubManageModelsAction,
 		entitlementService,
+		opts.showUnavailableFeatured ?? true,
+		opts.showFeatured ?? true,
+		undefined,
+		stubLanguageModelsService,
 	);
 }
 
@@ -474,6 +482,10 @@ suite('buildModelPickerItems', () => {
 			true,
 			undefined,
 			stubChatEntitlementService,
+			true,
+			true,
+			undefined,
+			stubLanguageModelsService,
 		);
 		const gptItem = getActionItems(items).find(a => a.label === 'GPT-4o');
 		assert.ok(gptItem?.item);
@@ -544,6 +556,7 @@ suite('buildModelPickerItems', () => {
 
 	test('admin unavailable model shows manage settings link in description', () => {
 		const auto = createAutoModel();
+		const businessEntitlementService = createStubEntitlementService({ entitlement: ChatEntitlement.Business });
 		const items = buildModelPickerItems(
 			[auto],
 			undefined,
@@ -555,7 +568,11 @@ suite('buildModelPickerItems', () => {
 			'https://aka.ms/github-copilot-settings',
 			true,
 			undefined,
-			stubChatEntitlementService,
+			businessEntitlementService,
+			true,
+			true,
+			undefined,
+			stubLanguageModelsService,
 		);
 
 		const adminItem = getActionItems(items).find(a => a.label === 'Missing Model');
@@ -639,10 +656,80 @@ suite('buildModelPickerItems', () => {
 			true,
 			undefined,
 			anonymousEntitlementService,
+			true,
+			true,
+			undefined,
+			stubLanguageModelsService,
 		);
 		const gptItem = getActionItems(items).find(a => a.label === 'GPT-4o');
 		assert.ok(gptItem?.item);
 		gptItem.item.run();
 		assert.strictEqual(selectedModel?.identifier, modelA.identifier);
 	});
+
+	test('showFeatured=false omits featured models from promoted section', () => {
+		const auto = createAutoModel();
+		const modelA = createModel('gpt-4o', 'GPT-4o');
+		const modelB = createModel('claude', 'Claude');
+		const items = callBuild([auto, modelA, modelB], {
+			controlModels: {
+				'gpt-4o': { label: 'GPT-4o', featured: true, exists: true },
+			},
+			showFeatured: false,
+		});
+		const actions = getActionItems(items);
+		// Auto first, then Other Models toggle, then models in other section
+		assert.strictEqual(actions[0].label, 'Auto');
+		// GPT-4o should NOT be promoted — it should be in Other Models
+		const promotedLabels = actions.filter(a => !a.isSectionToggle && a.section !== 'other' && a.item?.id !== 'manageModels').map(a => a.label);
+		assert.ok(!promotedLabels.includes('GPT-4o'), 'GPT-4o should not be in promoted section when showFeatured=false');
+	});
+
+	test('showUnavailableFeatured=false omits unavailable featured models from promoted section', () => {
+		const auto = createAutoModel();
+		const items = callBuild([auto], {
+			controlModels: {
+				'premium-model': { label: 'Premium Model', featured: true, exists: false },
+			},
+			entitlement: ChatEntitlement.Free,
+			showUnavailableFeatured: false,
+		});
+		const actions = getActionItems(items);
+		// Premium Model should not appear at all
+		const premiumItem = actions.find(a => a.label === 'Premium Model');
+		assert.strictEqual(premiumItem, undefined, 'Unavailable featured model should not appear when showUnavailableFeatured=false');
+	});
+
+	test('showUnavailableFeatured=false still shows available featured models', () => {
+		const auto = createAutoModel();
+		const modelA = createModel('gpt-4o', 'GPT-4o');
+		const items = callBuild([auto, modelA], {
+			controlModels: {
+				'gpt-4o': { label: 'GPT-4o', featured: true, exists: true },
+			},
+			showUnavailableFeatured: false,
+		});
+		const actions = getActionItems(items);
+		// GPT-4o is available and featured, so it should still appear in promoted
+		const gptItem = actions.find(a => a.label === 'GPT-4o');
+		assert.ok(gptItem, 'Available featured model should appear even when showUnavailableFeatured=false');
+	});
+
+	test('showUnavailableFeatured=false with version-gated model allows it in Other Models', () => {
+		const auto = createAutoModel();
+		const modelA = createModel('gpt-4o', 'GPT-4o');
+		const items = callBuild([auto, modelA], {
+			controlModels: {
+				'gpt-4o': { label: 'GPT-4o', featured: true, minVSCodeVersion: '2.0.0', exists: true },
+			},
+			showUnavailableFeatured: false,
+		});
+		const actions = getActionItems(items);
+		// Version-gated model should not be in promoted section as unavailable
+		const promotedGpt = actions.find(a => a.label === 'GPT-4o' && a.section !== 'other');
+		assert.strictEqual(promotedGpt?.disabled, undefined, 'Version-gated featured model should not appear as unavailable in promoted when showUnavailableFeatured=false');
+		// It should still appear in Other Models since it was not placed
+		const otherGpt = actions.find(a => a.label === 'GPT-4o' && a.section === 'other');
+		assert.ok(otherGpt, 'Version-gated featured model should appear in Other Models when showUnavailableFeatured=false');
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/chatDebugEvents.test.ts b/src/vs/workbench/contrib/chat/test/common/chatDebugEvents.test.ts
new file mode 100644
index 00000000000..ae69da089de
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/chatDebugEvents.test.ts
@@ -0,0 +1,327 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../base/common/uri.js';
+import { ChatDebugLogLevel, IChatDebugEvent, IChatDebugGenericEvent, IChatDebugModelTurnEvent, IChatDebugSubagentInvocationEvent, IChatDebugToolCallEvent, IChatDebugUserMessageEvent, IChatDebugAgentResponseEvent } from '../../common/chatDebugService.js';
+import { debugEventMatchesText, filterDebugEvents, filterDebugEventsByText, parseTimeToken, stripTimestampTokens } from '../../common/chatDebugEvents.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+
+const sessionResource = URI.parse('vscode-chat-session://local/test');
+
+function makeGenericEvent(overrides: Partial<IChatDebugGenericEvent> = {}): IChatDebugGenericEvent {
+	return {
+		kind: 'generic',
+		sessionResource,
+		created: new Date('2026-03-10T12:00:00Z'),
+		name: 'test-event',
+		level: ChatDebugLogLevel.Info,
+		...overrides,
+	};
+}
+
+function makeToolCallEvent(overrides: Partial<IChatDebugToolCallEvent> = {}): IChatDebugToolCallEvent {
+	return {
+		kind: 'toolCall',
+		sessionResource,
+		created: new Date('2026-03-10T12:01:00Z'),
+		toolName: 'readFile',
+		...overrides,
+	};
+}
+
+function makeModelTurnEvent(overrides: Partial<IChatDebugModelTurnEvent> = {}): IChatDebugModelTurnEvent {
+	return {
+		kind: 'modelTurn',
+		sessionResource,
+		created: new Date('2026-03-10T12:02:00Z'),
+		model: 'gpt-4o',
+		requestName: 'chat-request',
+		...overrides,
+	};
+}
+
+function makeSubagentEvent(overrides: Partial<IChatDebugSubagentInvocationEvent> = {}): IChatDebugSubagentInvocationEvent {
+	return {
+		kind: 'subagentInvocation',
+		sessionResource,
+		created: new Date('2026-03-10T12:03:00Z'),
+		agentName: 'explorer',
+		...overrides,
+	};
+}
+
+function makeUserMessageEvent(overrides: Partial<IChatDebugUserMessageEvent> = {}): IChatDebugUserMessageEvent {
+	return {
+		kind: 'userMessage',
+		sessionResource,
+		created: new Date('2026-03-10T12:04:00Z'),
+		message: 'hello world',
+		sections: [],
+		...overrides,
+	};
+}
+
+function makeAgentResponseEvent(overrides: Partial<IChatDebugAgentResponseEvent> = {}): IChatDebugAgentResponseEvent {
+	return {
+		kind: 'agentResponse',
+		sessionResource,
+		created: new Date('2026-03-10T12:05:00Z'),
+		message: 'Here is the answer',
+		sections: [],
+		...overrides,
+	};
+}
+
+suite('chatDebugEvents', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('debugEventMatchesText', () => {
+		test('matches event kind', () => {
+			assert.strictEqual(debugEventMatchesText(makeToolCallEvent(), 'toolcall'), true);
+			assert.strictEqual(debugEventMatchesText(makeToolCallEvent(), 'generic'), false);
+		});
+
+		test('matches toolCall tool name', () => {
+			assert.strictEqual(debugEventMatchesText(makeToolCallEvent({ toolName: 'readFile' }), 'readfile'), true);
+			assert.strictEqual(debugEventMatchesText(makeToolCallEvent({ toolName: 'readFile' }), 'writefile'), false);
+		});
+
+		test('matches toolCall input and output', () => {
+			const event = makeToolCallEvent({ input: 'path/to/file.ts', output: 'file contents' });
+			assert.strictEqual(debugEventMatchesText(event, 'path/to'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'contents'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'missing'), false);
+		});
+
+		test('matches modelTurn model and requestName', () => {
+			assert.strictEqual(debugEventMatchesText(makeModelTurnEvent({ model: 'gpt-4o' }), 'gpt-4o'), true);
+			assert.strictEqual(debugEventMatchesText(makeModelTurnEvent({ requestName: 'chat-request' }), 'chat-request'), true);
+		});
+
+		test('matches generic event name, details, and category', () => {
+			const event = makeGenericEvent({ name: 'discovery', details: 'loaded 5 files', category: 'instructions' });
+			assert.strictEqual(debugEventMatchesText(event, 'discovery'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'loaded'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'instructions'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'missing'), false);
+		});
+
+		test('matches subagentInvocation agent name and description', () => {
+			const event = makeSubagentEvent({ agentName: 'explorer', description: 'search codebase' });
+			assert.strictEqual(debugEventMatchesText(event, 'explorer'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'codebase'), true);
+		});
+
+		test('matches userMessage message and sections', () => {
+			const event = makeUserMessageEvent({
+				message: 'fix the bug',
+				sections: [{ name: 'system', content: 'you are a helpful assistant' }],
+			});
+			assert.strictEqual(debugEventMatchesText(event, 'fix'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'system'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'helpful'), true);
+		});
+
+		test('matches agentResponse message and sections', () => {
+			const event = makeAgentResponseEvent({
+				message: 'done',
+				sections: [{ name: 'result', content: 'applied 3 edits' }],
+			});
+			assert.strictEqual(debugEventMatchesText(event, 'done'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'result'), true);
+			assert.strictEqual(debugEventMatchesText(event, 'edits'), true);
+		});
+	});
+
+	suite('parseTimeToken', () => {
+		test('parses year-only before token', () => {
+			const result = parseTimeToken('before:2026', 'before');
+			assert.strictEqual(result, new Date(2026, 11, 31, 23, 59, 59, 999).getTime());
+		});
+
+		test('parses year-month before token', () => {
+			const result = parseTimeToken('before:2026-03', 'before');
+			// End of March 2026
+			assert.strictEqual(result, new Date(2026, 3, 0, 23, 59, 59, 999).getTime());
+		});
+
+		test('parses full date before token', () => {
+			const result = parseTimeToken('before:2026-03-10', 'before');
+			assert.strictEqual(result, new Date(2026, 2, 10, 23, 59, 59, 999).getTime());
+		});
+
+		test('parses year-only after token', () => {
+			const result = parseTimeToken('after:2026', 'after');
+			assert.strictEqual(result, new Date(2026, 0, 1, 0, 0, 0, 0).getTime());
+		});
+
+		test('parses full date after token', () => {
+			const result = parseTimeToken('after:2026-03-10', 'after');
+			assert.strictEqual(result, new Date(2026, 2, 10, 0, 0, 0, 0).getTime());
+		});
+
+		test('returns undefined when token is absent', () => {
+			assert.strictEqual(parseTimeToken('some text', 'before'), undefined);
+			assert.strictEqual(parseTimeToken('some text', 'after'), undefined);
+		});
+	});
+
+	suite('stripTimestampTokens', () => {
+		test('strips before token', () => {
+			assert.strictEqual(stripTimestampTokens('before:2026-03 hello'), 'hello');
+		});
+
+		test('strips after token', () => {
+			assert.strictEqual(stripTimestampTokens('after:2026-03-10 hello'), 'hello');
+		});
+
+		test('strips both tokens', () => {
+			assert.strictEqual(stripTimestampTokens('after:2026-03 before:2026-04 hello'), 'hello');
+		});
+
+		test('returns text unchanged when no tokens', () => {
+			assert.strictEqual(stripTimestampTokens('hello world'), 'hello world');
+		});
+	});
+
+	suite('filterDebugEventsByText', () => {
+		// parseTimeToken uses local-time Date constructors, so event timestamps
+		// must also be in local time to produce predictable comparisons.
+		const events: readonly IChatDebugEvent[] = [
+			makeGenericEvent({ name: 'discovery', category: 'instructions', created: new Date(2026, 2, 10, 10, 0, 0) }),
+			makeToolCallEvent({ toolName: 'readFile', created: new Date(2026, 2, 10, 11, 0, 0) }),
+			makeToolCallEvent({ toolName: 'writeFile', created: new Date(2026, 2, 10, 12, 0, 0) }),
+			makeModelTurnEvent({ model: 'gpt-4o', created: new Date(2026, 2, 10, 13, 0, 0) }),
+		];
+
+		test('filters by inclusion term', () => {
+			const result = filterDebugEventsByText(events, 'readfile');
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'readFile');
+		});
+
+		test('filters by exclusion term', () => {
+			const result = filterDebugEventsByText(events, '!readfile');
+			assert.strictEqual(result.length, 3);
+		});
+
+		test('handles comma-separated terms as OR', () => {
+			const result = filterDebugEventsByText(events, 'readfile, writefile');
+			assert.strictEqual(result.length, 2);
+		});
+
+		test('combines inclusion and exclusion', () => {
+			const result = filterDebugEventsByText(events, 'toolcall, !readfile');
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'writeFile');
+		});
+
+		test('filters by before timestamp', () => {
+			const result = filterDebugEventsByText(events, 'before:2026-03-10t11');
+			assert.strictEqual(result.length, 2); // 10:00 and 11:00 (before rounds up to 11:59:59)
+		});
+
+		test('filters by after timestamp', () => {
+			const result = filterDebugEventsByText(events, 'after:2026-03-10t12');
+			assert.strictEqual(result.length, 2); // 12:00 and 13:00
+		});
+
+		test('combines timestamp and text filters', () => {
+			const result = filterDebugEventsByText(events, 'after:2026-03-10t11 toolcall');
+			assert.strictEqual(result.length, 2); // writeFile at 12:00 and readFile at 11:00
+		});
+
+		test('returns all events with empty filter', () => {
+			const result = filterDebugEventsByText(events, '');
+			assert.strictEqual(result.length, 4);
+		});
+	});
+
+	suite('filterDebugEvents', () => {
+		const events: readonly IChatDebugEvent[] = [
+			makeGenericEvent({ name: 'event-1', created: new Date('2026-03-10T10:00:00Z') }),
+			makeToolCallEvent({ toolName: 'readFile', created: new Date('2026-03-10T11:00:00Z') }),
+			makeToolCallEvent({ toolName: 'writeFile', created: new Date('2026-03-10T12:00:00Z') }),
+			makeModelTurnEvent({ model: 'gpt-4o', created: new Date('2026-03-10T13:00:00Z') }),
+			makeSubagentEvent({ agentName: 'explorer', created: new Date('2026-03-10T14:00:00Z') }),
+		];
+
+		test('returns all events with empty options', () => {
+			assert.deepStrictEqual(filterDebugEvents(events, {}), events);
+		});
+
+		test('filters by kind', () => {
+			const result = filterDebugEvents(events, { kind: 'toolCall' });
+			assert.strictEqual(result.length, 2);
+			assert.ok(result.every(e => e.kind === 'toolCall'));
+		});
+
+		test('filters by kind with no matches', () => {
+			const result = filterDebugEvents(events, { kind: 'userMessage' });
+			assert.strictEqual(result.length, 0);
+		});
+
+		test('filters by text', () => {
+			const result = filterDebugEvents(events, { filter: 'readfile' });
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'readFile');
+		});
+
+		test('limits to N most recent', () => {
+			const result = filterDebugEvents(events, { limit: 2 });
+			assert.strictEqual(result.length, 2);
+			assert.strictEqual(result[0].kind, 'modelTurn');
+			assert.strictEqual(result[1].kind, 'subagentInvocation');
+		});
+
+		test('limit larger than event count returns all', () => {
+			const result = filterDebugEvents(events, { limit: 100 });
+			assert.strictEqual(result.length, 5);
+		});
+
+		test('limit of 0 returns all', () => {
+			const result = filterDebugEvents(events, { limit: 0 });
+			assert.strictEqual(result.length, 5);
+		});
+
+		test('limit of negative returns all', () => {
+			const result = filterDebugEvents(events, { limit: -1 });
+			assert.strictEqual(result.length, 5);
+		});
+
+		test('combines kind and text filters', () => {
+			const result = filterDebugEvents(events, { kind: 'toolCall', filter: 'readfile' });
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'readFile');
+		});
+
+		test('combines kind and limit', () => {
+			const result = filterDebugEvents(events, { kind: 'toolCall', limit: 1 });
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'writeFile');
+		});
+
+		test('combines text filter and limit', () => {
+			const result = filterDebugEvents(events, { filter: 'toolcall', limit: 1 });
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'writeFile');
+		});
+
+		test('combines all three filters', () => {
+			const allToolCalls: readonly IChatDebugEvent[] = [
+				makeToolCallEvent({ toolName: 'readFile', created: new Date('2026-03-10T10:00:00Z') }),
+				makeToolCallEvent({ toolName: 'writeFile', created: new Date('2026-03-10T11:00:00Z') }),
+				makeToolCallEvent({ toolName: 'listDir', created: new Date('2026-03-10T12:00:00Z') }),
+				makeGenericEvent({ name: 'unrelated', created: new Date('2026-03-10T13:00:00Z') }),
+			];
+			// kind=toolCall, exclude readFile, limit=1 → should get the most recent non-readFile toolCall (listDir)
+			const result = filterDebugEvents(allToolCalls, { kind: 'toolCall', filter: '!readfile', limit: 1 });
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual((result[0] as IChatDebugToolCallEvent).toolName, 'listDir');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatDebugServiceImpl.test.ts b/src/vs/workbench/contrib/chat/test/common/chatDebugServiceImpl.test.ts
index 9b9b0aac42a..62e41c7fcb8 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatDebugServiceImpl.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatDebugServiceImpl.test.ts
@@ -21,7 +21,9 @@ suite('ChatDebugServiceImpl', () => {
 	const sessionA = LocalChatSessionUri.forSession('a');
 	const sessionB = LocalChatSessionUri.forSession('b');
 	const sessionGeneric = URI.parse('vscode-chat-session://local/session');
-	const nonLocalSession = URI.parse('vscode-chat-session://remote-provider/session-1');
+	const nonLocalSession = URI.parse('some-other-scheme://authority/session-1');
+	const copilotCliSession = URI.parse('copilotcli:/test-session-id');
+	const claudeCodeSession = URI.parse('claude-code:/test-session-id');
 
 	setup(() => {
 		service = disposables.add(new ChatDebugServiceImpl());
@@ -148,7 +150,7 @@ suite('ChatDebugServiceImpl', () => {
 			assert.strictEqual(event.parentEventId, 'parent-1');
 		});
 
-		test('should not log events for non-local sessions', () => {
+		test('should not log events for ineligible session schemes', () => {
 			const firedEvents: IChatDebugEvent[] = [];
 			disposables.add(service.onDidAddEvent(e => firedEvents.push(e)));
 
@@ -157,6 +159,26 @@ suite('ChatDebugServiceImpl', () => {
 			assert.strictEqual(firedEvents.length, 0);
 			assert.strictEqual(service.getEvents(nonLocalSession).length, 0);
 		});
+
+		test('should log events for copilotcli sessions', () => {
+			const firedEvents: IChatDebugEvent[] = [];
+			disposables.add(service.onDidAddEvent(e => firedEvents.push(e)));
+
+			service.log(copilotCliSession, 'cli-event', 'details');
+
+			assert.strictEqual(firedEvents.length, 1);
+			assert.strictEqual(service.getEvents(copilotCliSession).length, 1);
+		});
+
+		test('should log events for claude-code sessions', () => {
+			const firedEvents: IChatDebugEvent[] = [];
+			disposables.add(service.onDidAddEvent(e => firedEvents.push(e)));
+
+			service.log(claudeCodeSession, 'claude-event', 'details');
+
+			assert.strictEqual(firedEvents.length, 1);
+			assert.strictEqual(service.getEvents(claudeCodeSession).length, 1);
+		});
 	});
 
 	suite('getSessionResources', () => {
@@ -185,21 +207,61 @@ suite('ChatDebugServiceImpl', () => {
 		});
 	});
 
-	suite('MAX_EVENTS cap', () => {
-		test('should evict oldest events when exceeding cap', () => {
-			// The max is 10_000. Add more than that and verify trimming.
-			// We'll test with a smaller count by adding events and checking boundary behavior.
+	suite('MAX_EVENTS_PER_SESSION cap', () => {
+		test('should evict oldest events when exceeding per-session cap', () => {
+			// The max per session is 10_000. Add more than that to a single session.
 			for (let i = 0; i < 10_001; i++) {
 				service.addEvent({ kind: 'generic', sessionResource: sessionGeneric, created: new Date(), name: `event-${i}`, level: ChatDebugLogLevel.Info });
 			}
 
 			const events = service.getEvents();
-			assert.ok(events.length <= 10_000, 'Should not exceed MAX_EVENTS');
+			assert.ok(events.length <= 10_000, 'Should not exceed MAX_EVENTS_PER_SESSION');
 			// The first event should have been evicted
 			assert.ok(!(events as IChatDebugGenericEvent[]).find(e => e.name === 'event-0'), 'Event-0 should have been evicted');
 			// The last event should be present
 			assert.ok((events as IChatDebugGenericEvent[]).find(e => e.name === 'event-10000'), 'Last event should be present');
 		});
+
+		test('should evict oldest session when exceeding MAX_SESSIONS', () => {
+			// MAX_SESSIONS is 5 — add events to 6 different sessions
+			const sessions: URI[] = [];
+			for (let i = 0; i < 6; i++) {
+				const uri = URI.parse(`vscode-chat-session://local/session-lru-${i}`);
+				sessions.push(uri);
+				service.addEvent({ kind: 'generic', sessionResource: uri, created: new Date(), name: `event-${i}`, level: ChatDebugLogLevel.Info });
+			}
+
+			const resources = service.getSessionResources();
+			assert.strictEqual(resources.length, 5, 'Should not exceed MAX_SESSIONS');
+			// The first session should have been evicted
+			assert.ok(!resources.some(r => r.toString() === sessions[0].toString()), 'Session-0 should have been evicted');
+			assert.strictEqual(service.getEvents(sessions[0]).length, 0, 'Events from evicted session should be gone');
+			// The last session should be present
+			assert.ok(resources.some(r => r.toString() === sessions[5].toString()), 'Session-5 should be present');
+		});
+
+		test('should use LRU eviction — recently-used sessions are kept', () => {
+			// Fill to MAX_SESSIONS (5)
+			const sessions: URI[] = [];
+			for (let i = 0; i < 5; i++) {
+				const uri = URI.parse(`vscode-chat-session://local/session-lru2-${i}`);
+				sessions.push(uri);
+				service.addEvent({ kind: 'generic', sessionResource: uri, created: new Date(), name: `init-${i}`, level: ChatDebugLogLevel.Info });
+			}
+
+			// Touch session-0 so it moves to the back of the LRU order
+			service.addEvent({ kind: 'generic', sessionResource: sessions[0], created: new Date(), name: 'touch', level: ChatDebugLogLevel.Info });
+
+			// Add a 6th session — session-1 (the true LRU) should be evicted, not session-0
+			const session6 = URI.parse('vscode-chat-session://local/session-lru2-5');
+			service.addEvent({ kind: 'generic', sessionResource: session6, created: new Date(), name: 'new', level: ChatDebugLogLevel.Info });
+
+			const resources = service.getSessionResources();
+			assert.strictEqual(resources.length, 5);
+			assert.ok(resources.some(r => r.toString() === sessions[0].toString()), 'Session-0 should be kept (recently used)');
+			assert.ok(!resources.some(r => r.toString() === sessions[1].toString()), 'Session-1 should be evicted (LRU)');
+			assert.ok(resources.some(r => r.toString() === session6.toString()), 'Session-5 should be present');
+		});
 	});
 
 	suite('activeSessionResource', () => {
@@ -395,7 +457,7 @@ suite('ChatDebugServiceImpl', () => {
 			assert.strictEqual(tokenA.isCancellationRequested, false, 'session-a token should not be cancelled');
 		});
 
-		test('should not invoke providers for non-local sessions', async () => {
+		test('should not invoke providers for ineligible session schemes', async () => {
 			let providerCalled = false;
 
 			const provider: IChatDebugLogProvider = {
@@ -418,6 +480,52 @@ suite('ChatDebugServiceImpl', () => {
 			assert.strictEqual(service.getEvents(nonLocalSession).length, 0);
 		});
 
+		test('should invoke providers for copilotcli sessions', async () => {
+			let providerCalled = false;
+
+			const provider: IChatDebugLogProvider = {
+				provideChatDebugLog: async () => {
+					providerCalled = true;
+					return [{
+						kind: 'generic',
+						sessionResource: copilotCliSession,
+						created: new Date(),
+						name: 'cli-provider-event',
+						level: ChatDebugLogLevel.Info,
+					}];
+				},
+			};
+
+			disposables.add(service.registerProvider(provider));
+			await service.invokeProviders(copilotCliSession);
+
+			assert.strictEqual(providerCalled, true);
+			assert.ok(service.getEvents(copilotCliSession).length > 0);
+		});
+
+		test('should invoke providers for claude-code sessions', async () => {
+			let providerCalled = false;
+
+			const provider: IChatDebugLogProvider = {
+				provideChatDebugLog: async () => {
+					providerCalled = true;
+					return [{
+						kind: 'generic',
+						sessionResource: claudeCodeSession,
+						created: new Date(),
+						name: 'claude-provider-event',
+						level: ChatDebugLogLevel.Info,
+					}];
+				},
+			};
+
+			disposables.add(service.registerProvider(provider));
+			await service.invokeProviders(claudeCodeSession);
+
+			assert.strictEqual(providerCalled, true);
+			assert.ok(service.getEvents(claudeCodeSession).length > 0);
+		});
+
 		test('newly registered provider should be invoked for active sessions', async () => {
 			// Start an invocation before the provider is registered
 			const firstProvider: IChatDebugLogProvider = {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatHandoffs.test.ts b/src/vs/workbench/contrib/chat/test/common/chatHandoffs.test.ts
new file mode 100644
index 00000000000..39825409eca
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/chatHandoffs.test.ts
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { constObservable, observableValue } from '../../../../../base/common/observable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { buildCustomAgentHandoffsInfo, getHandoffId, IChatMode } from '../../common/chatModes.js';
+import { ChatModeKind } from '../../common/constants.js';
+import { IHandOff } from '../../common/promptSyntax/promptFileParser.js';
+import { Target } from '../../common/promptSyntax/promptTypes.js';
+
+function createMockMode(overrides: Partial<IChatMode> & { id: string; kind: ChatModeKind }): IChatMode {
+	return {
+		name: constObservable(overrides.id),
+		label: constObservable(overrides.id),
+		icon: constObservable(undefined),
+		description: constObservable(undefined),
+		isBuiltin: overrides.isBuiltin ?? false,
+		target: constObservable(Target.Undefined),
+		...overrides,
+	} as IChatMode;
+}
+
+suite('getHandoffId', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('should generate a stable id from agent and label', () => {
+		const handoff: IHandOff = { agent: 'agent', label: 'Start Implementation', prompt: 'go' };
+		assert.strictEqual(getHandoffId(handoff), 'agent:start-implementation');
+	});
+
+	test('should handle special characters in label', () => {
+		const handoff: IHandOff = { agent: 'edit', label: 'Open in Editor!', prompt: '' };
+		assert.strictEqual(getHandoffId(handoff), 'edit:open-in-editor');
+	});
+
+	test('should handle single-word label', () => {
+		const handoff: IHandOff = { agent: 'agent', label: 'Continue', prompt: '' };
+		assert.strictEqual(getHandoffId(handoff), 'agent:continue');
+	});
+});
+
+suite('buildCustomAgentHandoffsInfo', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('should return empty handoffs for modes without handOffs', () => {
+		const mode = createMockMode({
+			id: 'ask',
+			kind: ChatModeKind.Ask,
+			isBuiltin: true,
+		});
+
+		const result = buildCustomAgentHandoffsInfo([mode]);
+		assert.deepStrictEqual(result, [{
+			id: 'ask',
+			name: 'ask',
+			isBuiltin: true,
+			visibility: { userInvocable: true, agentInvocable: true },
+			handoffs: [],
+		}]);
+	});
+
+	test('should map handoffs with all fields', () => {
+		const handoffs: IHandOff[] = [
+			{ agent: 'agent', label: 'Start Implementation', prompt: 'Start implementation', send: true, model: 'gpt-4o' },
+			{ agent: 'agent', label: 'Open in Editor', prompt: 'Open the plan', showContinueOn: false },
+		];
+		const mode = createMockMode({
+			id: 'plan-mode',
+			kind: ChatModeKind.Agent,
+			handOffs: observableValue('handOffs', handoffs),
+			visibility: observableValue('visibility', { userInvocable: true, agentInvocable: false }),
+		});
+
+		const result = buildCustomAgentHandoffsInfo([mode]);
+		assert.deepStrictEqual(result, [{
+			id: 'plan-mode',
+			name: 'plan-mode',
+			isBuiltin: false,
+			visibility: { userInvocable: true, agentInvocable: false },
+			handoffs: [
+				{ id: 'agent:start-implementation', label: 'Start Implementation', agent: 'agent', prompt: 'Start implementation', send: true, model: 'gpt-4o' },
+				{ id: 'agent:open-in-editor', label: 'Open in Editor', agent: 'agent', prompt: 'Open the plan', showContinueOn: false },
+			],
+		}]);
+	});
+
+	test('should handle multiple modes', () => {
+		const askMode = createMockMode({ id: 'ask', kind: ChatModeKind.Ask, isBuiltin: true });
+		const agentMode = createMockMode({ id: 'agent', kind: ChatModeKind.Agent, isBuiltin: true });
+
+		const result = buildCustomAgentHandoffsInfo([askMode, agentMode]);
+		assert.deepStrictEqual(result, [
+			{
+				id: 'ask',
+				name: 'ask',
+				isBuiltin: true,
+				visibility: { userInvocable: true, agentInvocable: true },
+				handoffs: [],
+			},
+			{
+				id: 'agent',
+				name: 'agent',
+				isBuiltin: true,
+				visibility: { userInvocable: true, agentInvocable: true },
+				handoffs: [],
+			},
+		]);
+	});
+
+	test('should omit optional handoff fields when undefined', () => {
+		const handoffs: IHandOff[] = [
+			{ agent: 'agent', label: 'Go', prompt: 'do it' },
+		];
+		const mode = createMockMode({
+			id: 'test',
+			kind: ChatModeKind.Agent,
+			handOffs: observableValue('handOffs', handoffs),
+		});
+
+		const result = buildCustomAgentHandoffsInfo([mode]);
+		const info = result[0].handoffs[0];
+		assert.strictEqual(info.id, 'agent:go');
+		assert.strictEqual(info.send, undefined);
+		assert.strictEqual(info.showContinueOn, undefined);
+		assert.strictEqual(info.model, undefined);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatImageExtraction.test.ts b/src/vs/workbench/contrib/chat/test/common/chatImageExtraction.test.ts
new file mode 100644
index 00000000000..e3e4014a762
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/chatImageExtraction.test.ts
@@ -0,0 +1,490 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IImageVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IChatProgressResponseContent } from '../../common/model/chatModel.js';
+import { IChatRequestViewModel, IChatResponseViewModel } from '../../common/model/chatViewModel.js';
+import { IChatContentInlineReference, IChatToolInvocationSerialized, IToolResultOutputDetailsSerialized } from '../../common/chatService/chatService.js';
+import { IToolResultInputOutputDetails } from '../../common/tools/languageModelToolsService.js';
+import { extractImagesFromChatRequest, extractImagesFromChatResponse, extractImagesFromToolInvocationMessages } from '../../common/chatImageExtraction.js';
+
+function makeToolInvocation(overrides: Partial<IChatToolInvocationSerialized> = {}): IChatToolInvocationSerialized {
+	return {
+		kind: 'toolInvocationSerialized',
+		toolCallId: 'call_1',
+		toolId: 'test-tool',
+		invocationMessage: 'Running tool',
+		originMessage: undefined,
+		pastTenseMessage: 'Ran tool',
+		isConfirmed: true,
+		isComplete: true,
+		source: undefined,
+		presentation: undefined,
+		resultDetails: undefined,
+		...overrides,
+	};
+}
+
+function makeInlineReference(uri: URI, name?: string): IChatContentInlineReference {
+	return {
+		kind: 'inlineReference',
+		inlineReference: uri,
+		name,
+	};
+}
+
+function makeResponse(items: ReadonlyArray<IChatProgressResponseContent>, opts: {
+	sessionResource?: URI;
+	requestId?: string;
+	id?: string;
+	requestMessageText?: string;
+	noMatchingRequest?: boolean;
+} = {}): IChatResponseViewModel {
+	const sessionResource = opts.sessionResource ?? URI.parse('chat-session://test/session');
+	const requestId = opts.requestId ?? 'req-1';
+	const responseId = opts.id ?? 'resp-1';
+	const requestMessageText = opts.requestMessageText ?? 'Show me images';
+
+	return {
+		id: responseId,
+		requestId,
+		sessionResource,
+		response: { value: items },
+		session: {
+			getItems: () => opts.noMatchingRequest ? [] : [{
+				id: requestId,
+				messageText: requestMessageText,
+				message: { parts: [], text: requestMessageText },
+			}],
+		},
+	} as unknown as IChatResponseViewModel;
+}
+
+const fakeReadFile = (uri: URI) => Promise.resolve(VSBuffer.fromString(`data-for-${uri.path}`));
+
+function makeRequest(variables: IChatRequestViewModel['variables'], opts: { id?: string; messageText?: string } = {}): IChatRequestViewModel {
+	return {
+		id: opts.id ?? 'req-1',
+		sessionResource: URI.parse('chat-session://test/session'),
+		dataId: 'data-1',
+		username: 'test-user',
+		message: { text: opts.messageText ?? 'Show me images', parts: [] },
+		messageText: opts.messageText ?? 'Show me images',
+		attempt: 0,
+		variables,
+		currentRenderedHeight: undefined,
+		shouldBeRemovedOnSend: undefined,
+		isComplete: true,
+		isCompleteAddedRequest: true,
+		slashCommand: undefined,
+		agentOrSlashCommandDetected: false,
+		shouldBeBlocked: undefined!,
+		timestamp: 0,
+	} as unknown as IChatRequestViewModel;
+}
+
+function makeImageVariableEntry(overrides: Partial<IImageVariableEntry> & Pick<IImageVariableEntry, 'value'>): IImageVariableEntry {
+	const { value, ...rest } = overrides;
+	return {
+		id: 'img-1',
+		kind: 'image',
+		name: 'cat.png',
+		value,
+		mimeType: 'image/png',
+		...rest,
+	};
+}
+
+suite('extractImagesFromChatResponse', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('returns empty images when response has no items', async () => {
+		const response = makeResponse([]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+		assert.deepStrictEqual(result, {
+			id: response.sessionResource.toString() + '_' + response.id,
+			title: 'Show me images',
+			images: [],
+		});
+	});
+
+	test('uses default title when no matching request is found', async () => {
+		const response = makeResponse([], { noMatchingRequest: true });
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+		assert.strictEqual(result.title, 'Images');
+	});
+
+	test('extracts image from tool invocation with IToolResultOutputDetails', async () => {
+		const resultDetails: IToolResultOutputDetailsSerialized = {
+			output: { type: 'data', mimeType: 'image/png', base64Data: 'AQID' },
+		};
+		const toolInvocation = makeToolInvocation({
+			toolCallId: 'call_img',
+			toolId: 'screenshot-tool',
+			pastTenseMessage: 'Took a screenshot',
+			resultDetails,
+		});
+
+		const response = makeResponse([toolInvocation]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 1);
+		assert.strictEqual(result.images[0].id, 'call_img_0');
+		assert.strictEqual(result.images[0].mimeType, 'image/png');
+		assert.ok(result.images[0].source.includes('screenshot-tool'));
+		assert.strictEqual(result.images[0].caption, 'Took a screenshot');
+	});
+
+	test('extracts multiple images from tool invocation with IToolResultInputOutputDetails', async () => {
+		const resultDetails: IToolResultInputOutputDetails = {
+			input: '',
+			output: [
+				{ type: 'embed', mimeType: 'image/png', value: 'AQID', isText: false },
+				{ type: 'embed', mimeType: 'text/plain', value: 'text', isText: true },
+				{ type: 'embed', mimeType: 'image/jpeg', value: 'BAUG', isText: false },
+			],
+		};
+		const toolInvocation = makeToolInvocation({
+			toolCallId: 'call_multi',
+			toolId: 'multi-tool',
+			pastTenseMessage: 'Generated images',
+			resultDetails,
+		});
+
+		const response = makeResponse([toolInvocation]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 2);
+		assert.strictEqual(result.images[0].id, 'call_multi_0');
+		assert.strictEqual(result.images[0].mimeType, 'image/png');
+		assert.strictEqual(result.images[1].id, 'call_multi_2');
+		assert.strictEqual(result.images[1].mimeType, 'image/jpeg');
+	});
+
+	test('skips tool invocations without image results', async () => {
+		const resultDetails: IToolResultOutputDetailsSerialized = {
+			output: { type: 'data', mimeType: 'text/plain', base64Data: 'aGVsbG8=' },
+		};
+		const toolInvocation = makeToolInvocation({ resultDetails });
+
+		const response = makeResponse([toolInvocation]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+		assert.strictEqual(result.images.length, 0);
+	});
+
+	test('extracts image from inline reference URI when readFile is provided', async () => {
+		const imageUri = URI.file('/photos/cat.png');
+		const inlineRef = makeInlineReference(imageUri, 'cat.png');
+
+		const response = makeResponse([inlineRef]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 1);
+		assert.strictEqual(result.images[0].uri.toString(), imageUri.toString());
+		assert.strictEqual(result.images[0].name, 'cat.png');
+		assert.strictEqual(result.images[0].mimeType, 'image/png');
+		assert.strictEqual(result.images[0].source, 'File');
+	});
+
+	test('extracts image from inline reference Location', async () => {
+		const imageUri = URI.file('/photos/dog.jpg');
+		const inlineRef: IChatContentInlineReference = {
+			kind: 'inlineReference',
+			inlineReference: { uri: imageUri, range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 } },
+		};
+
+		const response = makeResponse([inlineRef]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 1);
+		assert.strictEqual(result.images[0].uri.toString(), imageUri.toString());
+	});
+
+	test('skips non-image inline references', async () => {
+		const codeUri = URI.file('/src/main.ts');
+		const inlineRef = makeInlineReference(codeUri);
+
+		const response = makeResponse([inlineRef]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+		assert.strictEqual(result.images.length, 0);
+	});
+
+	test('uses filename from URI path when name is not provided', async () => {
+		const imageUri = URI.file('/assets/banner.gif');
+		const inlineRef = makeInlineReference(imageUri);
+
+		const response = makeResponse([inlineRef]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 1);
+		assert.strictEqual(result.images[0].name, 'banner.gif');
+	});
+
+	test('preserves interleaved order of tool and inline reference images', async () => {
+		const toolInvocation = makeToolInvocation({
+			toolCallId: 'call_first',
+			toolId: 'tool-1',
+			resultDetails: {
+				output: { type: 'data', mimeType: 'image/png', base64Data: 'AQID' },
+			} satisfies IToolResultOutputDetailsSerialized,
+		});
+
+		const inlineRef = makeInlineReference(URI.file('/middle.png'), 'middle.png');
+
+		const toolInvocation2 = makeToolInvocation({
+			toolCallId: 'call_last',
+			toolId: 'tool-2',
+			resultDetails: {
+				output: { type: 'data', mimeType: 'image/jpeg', base64Data: 'BAUG' },
+			} satisfies IToolResultOutputDetailsSerialized,
+		});
+
+		const response = makeResponse([toolInvocation, inlineRef, toolInvocation2]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 3);
+		assert.strictEqual(result.images[0].id, 'call_first_0');
+		assert.strictEqual(result.images[1].name, 'middle.png');
+		assert.strictEqual(result.images[2].id, 'call_last_0');
+	});
+
+	test('collection id combines sessionResource and response id', async () => {
+		const sessionResource = URI.parse('chat-session://test/my-session');
+		const response = makeResponse([], { sessionResource, id: 'response-42' });
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+		assert.strictEqual(result.id, sessionResource.toString() + '_response-42');
+	});
+
+	test('skips inline reference when readFile fails', async () => {
+		const imageUri = URI.file('/photos/missing.png');
+		const inlineRef = makeInlineReference(imageUri, 'missing.png');
+		const failingReadFile = (_uri: URI) => Promise.reject(new Error('File not found'));
+
+		const response = makeResponse([inlineRef]);
+		const result = await extractImagesFromChatResponse(response, failingReadFile);
+		assert.strictEqual(result.images.length, 0);
+	});
+
+	test('extracts images from tool invocation message URIs', async () => {
+		const imageUri = URI.file('/screenshots/result.png');
+		const toolInvocation = makeToolInvocation({
+			toolCallId: 'call_msg',
+			toolId: 'screenshot-tool',
+			pastTenseMessage: { value: 'Took a screenshot', isTrusted: false, uris: { '0': imageUri.toJSON() } },
+		});
+
+		const response = makeResponse([toolInvocation]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 1);
+		assert.strictEqual(result.images[0].uri.toString(), imageUri.toString());
+		assert.strictEqual(result.images[0].name, 'result.png');
+		assert.strictEqual(result.images[0].mimeType, 'image/png');
+		assert.strictEqual(result.images[0].caption, 'Took a screenshot');
+	});
+
+	test('combines output details images and message URI images', async () => {
+		const imageUri = URI.file('/screenshots/msg-image.jpg');
+		const resultDetails: IToolResultOutputDetailsSerialized = {
+			output: { type: 'data', mimeType: 'image/png', base64Data: 'AQID' },
+		};
+		const toolInvocation = makeToolInvocation({
+			toolCallId: 'call_both',
+			toolId: 'combo-tool',
+			pastTenseMessage: { value: 'Ran combo tool', isTrusted: false, uris: { '0': imageUri.toJSON() } },
+			resultDetails,
+		});
+
+		const response = makeResponse([toolInvocation]);
+		const result = await extractImagesFromChatResponse(response, fakeReadFile);
+
+		assert.strictEqual(result.images.length, 2);
+		assert.strictEqual(result.images[0].id, 'call_both_0');
+		assert.strictEqual(result.images[1].uri.toString(), imageUri.toString());
+	});
+});
+
+suite('extractImagesFromToolInvocationMessages', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('returns empty when message is undefined', async () => {
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: undefined,
+			invocationMessage: undefined,
+		});
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+		assert.deepStrictEqual(result, []);
+	});
+
+	test('returns empty when message is a string', async () => {
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: 'some string message',
+		});
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+		assert.deepStrictEqual(result, []);
+	});
+
+	test('returns empty when message has no uris', async () => {
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: { value: 'No URIs here', isTrusted: false },
+		});
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+		assert.deepStrictEqual(result, []);
+	});
+
+	test('returns empty when message uris are empty', async () => {
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: { value: 'Empty URIs', isTrusted: false, uris: {} },
+		});
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+		assert.deepStrictEqual(result, []);
+	});
+
+	test('skips non-image URIs', async () => {
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: { value: 'Code file', isTrusted: false, uris: { '0': URI.file('/src/main.ts').toJSON() } },
+		});
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+		assert.deepStrictEqual(result, []);
+	});
+
+	test('extracts image from message URI', async () => {
+		const imageUri = URI.file('/screenshots/capture.png');
+		const toolInvocation = makeToolInvocation({
+			toolCallId: 'call_uri',
+			toolId: 'screenshot-tool',
+			pastTenseMessage: { value: 'Captured screenshot', isTrusted: false, uris: { '0': imageUri.toJSON() } },
+		});
+
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].uri.toString(), imageUri.toString());
+		assert.strictEqual(result[0].name, 'capture.png');
+		assert.strictEqual(result[0].mimeType, 'image/png');
+		assert.strictEqual(result[0].caption, 'Captured screenshot');
+		assert.ok(result[0].source.includes('screenshot-tool'));
+	});
+
+	test('extracts multiple images from message URIs', async () => {
+		const uri1 = URI.file('/img/a.png');
+		const uri2 = URI.file('/img/b.jpg');
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: {
+				value: 'Generated images',
+				isTrusted: false,
+				uris: { '0': uri1.toJSON(), '1': uri2.toJSON() },
+			},
+		});
+
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+
+		assert.strictEqual(result.length, 2);
+		assert.strictEqual(result[0].mimeType, 'image/png');
+		assert.strictEqual(result[1].mimeType, 'image/jpg');
+	});
+
+	test('continues when readFile fails for one URI', async () => {
+		const goodUri = URI.file('/img/good.png');
+		const badUri = URI.file('/img/bad.png');
+		const failingReadFile = (uri: URI) => {
+			if (uri.path.includes('bad')) {
+				return Promise.reject(new Error('File not found'));
+			}
+			return Promise.resolve(VSBuffer.fromString('image-data'));
+		};
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: {
+				value: 'Mixed results',
+				isTrusted: false,
+				uris: { '0': badUri.toJSON(), '1': goodUri.toJSON() },
+			},
+		});
+
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, failingReadFile);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].uri.toString(), goodUri.toString());
+	});
+
+	test('falls back to invocationMessage when pastTenseMessage is undefined', async () => {
+		const imageUri = URI.file('/img/fallback.png');
+		const toolInvocation = makeToolInvocation({
+			pastTenseMessage: undefined,
+			invocationMessage: { value: 'Running tool', isTrusted: false, uris: { '0': imageUri.toJSON() } },
+		});
+
+		const result = await extractImagesFromToolInvocationMessages(toolInvocation, fakeReadFile);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].caption, 'Running tool');
+	});
+});
+
+suite('extractImagesFromChatRequest', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('extracts image attachment from Uint8Array', () => {
+		const request = makeRequest([
+			makeImageVariableEntry({ value: new Uint8Array([1, 2, 3]) }),
+		]);
+
+		const result = extractImagesFromChatRequest(request);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].name, 'cat.png');
+		assert.strictEqual(result[0].mimeType, 'image/png');
+		assert.deepStrictEqual([...result[0].data.buffer], [1, 2, 3]);
+	});
+
+	test('extracts image attachment from ArrayBuffer', () => {
+		const request = makeRequest([
+			makeImageVariableEntry({ value: new Uint8Array([4, 5, 6]).buffer }),
+		]);
+
+		const result = extractImagesFromChatRequest(request);
+
+		assert.strictEqual(result.length, 1);
+		assert.deepStrictEqual([...result[0].data.buffer], [4, 5, 6]);
+	});
+
+	test('extracts restored image attachment from plain object bytes', () => {
+		const request = makeRequest([
+			makeImageVariableEntry({ value: { 0: 7, 1: 8, 2: 9 } }),
+		]);
+
+		const result = extractImagesFromChatRequest(request);
+
+		assert.strictEqual(result.length, 1);
+		assert.deepStrictEqual([...result[0].data.buffer], [7, 8, 9]);
+	});
+
+	test('extracts restored image attachment from reordered plain object bytes', () => {
+		const request = makeRequest([
+			makeImageVariableEntry({ value: { 2: 9, 0: 7, 1: 8 } }),
+		]);
+
+		const result = extractImagesFromChatRequest(request);
+
+		assert.strictEqual(result.length, 1);
+		assert.deepStrictEqual([...result[0].data.buffer], [7, 8, 9]);
+	});
+
+	test('uses attachment resource URI when available', () => {
+		const uri = URI.file('/tmp/cat.png');
+		const request = makeRequest([
+			makeImageVariableEntry({ value: new Uint8Array([1]), references: [{ kind: 'reference', reference: uri }] }),
+		]);
+
+		const result = extractImagesFromChatRequest(request);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].uri.toString(), uri.toString());
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts
index 3ca952c05d5..c4dacb71de5 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts
@@ -5,6 +5,7 @@
 
 import assert from 'assert';
 import { DeferredPromise } from '../../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
@@ -23,38 +24,39 @@ import { ServiceCollection } from '../../../../../../platform/instantiation/comm
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { MockContextKeyService } from '../../../../../../platform/keybinding/test/common/mockKeybindingService.js';
 import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
-import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { IStorageService, StorageScope } from '../../../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
 import { NullTelemetryService } from '../../../../../../platform/telemetry/common/telemetryUtils.js';
 import { IUserDataProfilesService, toUserDataProfile } from '../../../../../../platform/userDataProfile/common/userDataProfile.js';
 import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchAssignmentService } from '../../../../../services/assignment/common/assignmentService.js';
 import { NullWorkbenchAssignmentService } from '../../../../../services/assignment/test/common/nullAssignmentService.js';
+import { IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
 import { IExtensionService, nullExtensionDescription } from '../../../../../services/extensions/common/extensions.js';
 import { ILifecycleService } from '../../../../../services/lifecycle/common/lifecycle.js';
 import { IViewsService } from '../../../../../services/views/common/viewsService.js';
 import { IWorkspaceEditingService } from '../../../../../services/workspaces/common/workspaceEditing.js';
-import { IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
 import { InMemoryTestFileService, mock, TestChatEntitlementService, TestContextService, TestExtensionService, TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
 import { IMcpService } from '../../../../mcp/common/mcpTypes.js';
 import { TestMcpService } from '../../../../mcp/test/common/testMcpService.js';
-import { ChatAgentService, IChatAgent, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../../common/participants/chatAgents.js';
-import { IChatEditingService, IChatEditingSession } from '../../../common/editing/chatEditingService.js';
-import { ChatModel, IChatModel, ISerializableChatData } from '../../../common/model/chatModel.js';
-import { ChatRequestQueueKind, ChatSendResult, IChatFollowup, IChatModelReference, IChatService, ResponseModelState } from '../../../common/chatService/chatService.js';
-import { ChatService } from '../../../common/chatService/chatServiceImpl.js';
-import { ChatSlashCommandService, IChatSlashCommandService } from '../../../common/participants/chatSlashCommands.js';
 import { IChatVariablesService } from '../../../common/attachments/chatVariables.js';
-import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
-import { MockChatService } from './mockChatService.js';
-import { MockChatVariablesService } from '../mockChatVariables.js';
-import { IPromptsService } from '../../../common/promptSyntax/service/promptsService.js';
-import { MockPromptsService } from '../promptSyntax/service/mockPromptsService.js';
 import { IChatDebugService } from '../../../common/chatDebugService.js';
 import { ChatDebugServiceImpl } from '../../../common/chatDebugServiceImpl.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { ChatRequestQueueKind, ChatSendResult, IChatFollowup, IChatModelReference, IChatService, ResponseModelState } from '../../../common/chatService/chatService.js';
+import { ChatService } from '../../../common/chatService/chatServiceImpl.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { IChatEditingService, IChatEditingSession } from '../../../common/editing/chatEditingService.js';
+import { ChatModel, IChatModel, ISerializableChatData } from '../../../common/model/chatModel.js';
+import { ChatAgentService, IChatAgent, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ChatSlashCommandService, IChatSlashCommandService } from '../../../common/participants/chatSlashCommands.js';
+import { IConfiguredHooksInfo, IPromptsService } from '../../../common/promptSyntax/service/promptsService.js';
 import { ILanguageModelToolsService } from '../../../common/tools/languageModelToolsService.js';
+import { MockChatVariablesService } from '../mockChatVariables.js';
+import { MockPromptsService } from '../promptSyntax/service/mockPromptsService.js';
 import { MockLanguageModelToolsService } from '../tools/mockLanguageModelToolsService.js';
+import { MockChatService } from './mockChatService.js';
+import { ChatSessionOptionsMap, IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { MockChatSessionsService } from '../mockChatSessionsService.js';
 
 const chatAgentWithUsedContextId = 'ChatProviderWithUsedContext';
 const chatAgentWithUsedContext: IChatAgent = {
@@ -536,6 +538,97 @@ suite('ChatService', () => {
 		assert.ok(invokedRequests[1].includes('steering3'), 'Combined message should include steering3');
 		assert.ok(invokedRequests[1].includes('\n\n'), 'Combined message should use \\n\\n as separator');
 	});
+
+	test('disabled Claude hooks hint is shown once per workspace (fix for #295079)', async () => {
+		// Set up a prompts service that reports disabled Claude hooks
+		const mockPromptsService = new class extends MockPromptsService {
+			override getHooks(_token: CancellationToken, _sessionResource?: URI): Promise<IConfiguredHooksInfo> {
+				return Promise.resolve({ hooks: {}, hasDisabledClaudeHooks: true });
+			}
+		}();
+		instantiationService.stub(IPromptsService, mockPromptsService);
+
+		const storageService = instantiationService.get(IStorageService);
+		const disabledHintsKey = 'chat.disabledClaudeHooks.notification';
+
+		// Before any request, the storage key should not be set
+		assert.strictEqual(storageService.getBoolean(disabledHintsKey, StorageScope.WORKSPACE), undefined);
+
+		const testService = createChatService();
+		const modelRef = testDisposables.add(startSessionModel(testService));
+		const model = modelRef.object;
+
+		// Disabled hooks are reported for every request, but the hint should only be shown once per workspace.
+		const response = await testService.sendRequest(model.sessionResource, 'test request');
+		ChatSendResult.assertSent(response);
+		await response.data.responseCompletePromise;
+
+		// The hint should have been shown, and the key set to true
+		assert.strictEqual(storageService.getBoolean(disabledHintsKey, StorageScope.WORKSPACE), true, 'Flag should be set after showing the hint');
+
+		// Verify the response contains the disabledClaudeHooks part
+		const requests = model.getRequests();
+		assert.strictEqual(requests.length, 1);
+		const responseParts = requests[0].response?.response.value ?? [];
+		const hasHookHint = responseParts.some(part => part.kind === 'disabledClaudeHooks');
+		assert.ok(hasHookHint, 'Response should contain the disabledClaudeHooks hint');
+
+		// Sending another request should NOT show the hint again (shown only once per workspace)
+		const response2 = await testService.sendRequest(model.sessionResource, 'second request');
+		ChatSendResult.assertSent(response2);
+		await response2.data.responseCompletePromise;
+
+		const requests2 = model.getRequests();
+		assert.strictEqual(requests2.length, 2);
+		const responseParts2 = requests2[1].response?.response.value ?? [];
+		const hasHookHint2 = responseParts2.some(part => part.kind === 'disabledClaudeHooks');
+		assert.ok(!hasHookHint2, 'Response should NOT contain the disabledClaudeHooks hint on second request');
+	});
+
+	test('disabled Claude hooks hint is not consumed when no disabled hooks (fix for #295079)', async () => {
+		// Set up a prompts service that simulates the setup agent first pass (no disabled hooks)
+		// followed by the real resent request (with disabled hooks).
+		const mockPromptsService = new class extends MockPromptsService {
+			private _callCount = 0;
+			override getHooks(_token: CancellationToken, _sessionResource?: URI): Promise<IConfiguredHooksInfo> {
+				this._callCount++;
+				// First call (setup agent): no disabled hooks
+				// Second call (real request after resend): disabled hooks present
+				return Promise.resolve({ hooks: {}, hasDisabledClaudeHooks: this._callCount > 1 });
+			}
+		}();
+		instantiationService.stub(IPromptsService, mockPromptsService);
+
+		const storageService = instantiationService.get(IStorageService);
+		const disabledHintsKey = 'chat.disabledClaudeHooks.notification';
+
+		// First request: no disabled hooks (simulates setup agent pass)
+		const testService = createChatService();
+		const modelRef = testDisposables.add(startSessionModel(testService));
+		const model = modelRef.object;
+
+		const response = await testService.sendRequest(model.sessionResource, 'first request');
+		ChatSendResult.assertSent(response);
+		await response.data.responseCompletePromise;
+
+		// Flag should NOT be set because no hint was shown
+		assert.strictEqual(storageService.getBoolean(disabledHintsKey, StorageScope.WORKSPACE), undefined, 'Flag should not be set when no disabled hooks');
+
+		const firstRequest = model.getRequests()[0];
+		assert.ok(firstRequest, 'Expected the initial request to exist before resend');
+
+		// Resend the original request: now disabled hooks are present (simulates resend after setup)
+		await testService.resendRequest(firstRequest);
+
+		// Now the flag should be set and the hint shown
+		assert.strictEqual(storageService.getBoolean(disabledHintsKey, StorageScope.WORKSPACE), true, 'Flag should be set after showing the hint');
+
+		const requests = model.getRequests();
+		assert.strictEqual(requests.length, 1, 'Resend should replace the original request');
+		const responseParts2 = requests[0].response?.response.value ?? [];
+		const hasHookHint2 = responseParts2.some(part => part.kind === 'disabledClaudeHooks');
+		assert.ok(hasHookHint2, 'Response should contain the disabledClaudeHooks hint on second request');
+	});
 	test('cancelCurrentRequestForSession waits for response completion', async () => {
 		const requestStarted = new DeferredPromise<void>();
 		const completeRequest = new DeferredPromise<void>();
@@ -609,6 +702,248 @@ suite('ChatService', () => {
 		completeRequest.complete();
 		await response.data.responseCompletePromise;
 	});
+
+	test('pending requests can be removed from one session and re-sent on another', async () => {
+		const requestStarted = new DeferredPromise<void>();
+		const completeRequest = new DeferredPromise<void>();
+		const invokedMessages: string[] = [];
+
+		const slowAgent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				invokedMessages.push(request.message);
+				if (invokedMessages.length === 1) {
+					requestStarted.complete();
+					await completeRequest.p;
+				}
+				return {};
+			},
+		};
+
+		testDisposables.add(chatAgentService.registerAgent('slowAgent', { ...getAgentData('slowAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgentImplementation('slowAgent', slowAgent));
+
+		const testService = createChatService();
+		const sourceRef = testDisposables.add(startSessionModel(testService));
+		const source = sourceRef.object;
+
+		// Start a blocking request on source
+		const response = await testService.sendRequest(source.sessionResource, 'first request', { agentId: 'slowAgent' });
+		ChatSendResult.assertSent(response);
+		await requestStarted.p;
+
+		// Queue a request while the first is in progress
+		const queued = await testService.sendRequest(source.sessionResource, 'queued request', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued });
+		assert.ok(ChatSendResult.isQueued(queued));
+
+		// Remove the queued request from source
+		const pendingId = source.getPendingRequests()[0].request.id;
+		testService.removePendingRequest(source.sessionResource, pendingId);
+		assert.strictEqual(source.getPendingRequests().length, 0);
+
+		// Re-send it on a new target session through the normal queue path
+		const targetRef = testDisposables.add(startSessionModel(testService));
+		const target = targetRef.object;
+		const resent = await testService.sendRequest(target.sessionResource, 'queued request', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued, pauseQueue: true });
+		assert.ok(ChatSendResult.isQueued(resent));
+		assert.strictEqual(target.getPendingRequests().length, 1);
+
+		// Complete the first request so the source loop finishes
+		completeRequest.complete();
+		await response.data.responseCompletePromise;
+
+		// Process the target queue — the re-sent request should be invoked
+		testService.processPendingRequests(target.sessionResource);
+		const result = await resent.deferred;
+		assert.ok(ChatSendResult.isSent(result));
+
+		// The agent should have been invoked twice: first request + re-sent queued request
+		assert.strictEqual(invokedMessages.length, 2);
+		assert.ok(invokedMessages[1].includes('queued request'));
+	});
+
+	test('race condition: processNextPendingRequest dequeues before commit handler runs', async () => {
+		// This reproduces the race where:
+		// 1. Request 1 completes → .finally() calls processNextPendingRequest immediately
+		// 2. processNextPendingRequest dequeues queued-request-1 and starts it on the OLD session
+		// 3. Commit event arrives later → only sees remaining queued requests (one was already dequeued)
+		// The fix: detect the in-flight request on the old session, cancel it, and re-send on the new session.
+
+		const invocationOrder: string[] = [];
+		const firstRequestStarted = new DeferredPromise<void>();
+		const firstRequestGate = new DeferredPromise<void>();
+
+		const slowAgent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				invocationOrder.push(request.message);
+
+				if (invocationOrder.length === 1) {
+					// First request — block until we say go
+					firstRequestStarted.complete();
+					await firstRequestGate.p;
+				}
+				// All subsequent requests complete immediately
+				return {};
+			},
+		};
+
+		testDisposables.add(chatAgentService.registerAgent('slowAgent', { ...getAgentData('slowAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgentImplementation('slowAgent', slowAgent));
+
+		const testService = createChatService();
+		const sourceRef = testDisposables.add(startSessionModel(testService));
+		const source = sourceRef.object;
+
+		// Step 1: Send request 1 (blocks on firstRequestGate)
+		const response1 = await testService.sendRequest(source.sessionResource, 'request-1', { agentId: 'slowAgent' });
+		ChatSendResult.assertSent(response1);
+		await firstRequestStarted.p;
+
+		// Step 2: Queue 3 more requests while request 1 is in progress
+		const q1 = await testService.sendRequest(source.sessionResource, 'queued-1', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued });
+		const q2 = await testService.sendRequest(source.sessionResource, 'queued-2', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued });
+		const q3 = await testService.sendRequest(source.sessionResource, 'queued-3', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued });
+		assert.ok(ChatSendResult.isQueued(q1));
+		assert.ok(ChatSendResult.isQueued(q2));
+		assert.ok(ChatSendResult.isQueued(q3));
+		assert.strictEqual(source.getPendingRequests().length, 3);
+		assert.strictEqual(source.getRequests().length, 1, 'Only request-1 should be a real request');
+
+		// Step 3: Complete request 1 → .finally() runs processNextPendingRequest
+		// This dequeues "queued-1" and starts it on the source (old) session
+		firstRequestGate.complete();
+		await response1.data.responseCompletePromise;
+
+		// processNextPendingRequest dequeued one from the queue synchronously
+		assert.strictEqual(source.getPendingRequests().length, 2, 'Should have 2 remaining after auto-dequeue');
+
+		// Yield to let the dequeued request's async chain progress (extension activation, addRequest, etc.)
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		// Step 4: Simulate what _resendPendingRequests does (the commit handler)
+		// This is the recovery: cancel the in-flight, remove remaining, re-send all on target
+		const targetRef = testDisposables.add(startSessionModel(testService));
+		const target = targetRef.object;
+
+		// Cancel whatever is in-flight on the old session
+		await testService.cancelCurrentRequestForSession(source.sessionResource);
+
+		// Remove remaining pending requests from old session
+		const remaining = [...source.getPendingRequests()];
+		for (const p of remaining) {
+			testService.removePendingRequest(source.sessionResource, p.request.id);
+		}
+		assert.strictEqual(source.getPendingRequests().length, 0);
+
+		// Re-send ALL 3 on the target through the normal queue path
+		const resent1 = await testService.sendRequest(target.sessionResource, 'queued-1', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued, pauseQueue: true });
+		const resent2 = await testService.sendRequest(target.sessionResource, 'queued-2', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued, pauseQueue: true });
+		const resent3 = await testService.sendRequest(target.sessionResource, 'queued-3', { agentId: 'slowAgent', queue: ChatRequestQueueKind.Queued, pauseQueue: true });
+		assert.ok(ChatSendResult.isQueued(resent1));
+		assert.ok(ChatSendResult.isQueued(resent2));
+		assert.ok(ChatSendResult.isQueued(resent3));
+		assert.strictEqual(target.getPendingRequests().length, 3, 'Target should have all 3 queued requests');
+
+		// Step 5: Process the target queue and verify all 3 get sent
+		testService.processPendingRequests(target.sessionResource);
+		const result1 = await resent1.deferred;
+		assert.ok(ChatSendResult.isSent(result1));
+		await result1.data.responseCompletePromise;
+
+		const result2 = await resent2.deferred;
+		assert.ok(ChatSendResult.isSent(result2));
+		await result2.data.responseCompletePromise;
+
+		const result3 = await resent3.deferred;
+		assert.ok(ChatSendResult.isSent(result3));
+
+		// Verify the agent received all 3 queued messages on the target session
+		const queuedInvocations = invocationOrder.filter(m => m.includes('queued-'));
+		assert.ok(queuedInvocations.length >= 3, `Expected at least 3 queued invocations, got ${queuedInvocations.length}`);
+		const lastThree = queuedInvocations.slice(-3);
+		assert.ok(lastThree[0].includes('queued-1'));
+		assert.ok(lastThree[1].includes('queued-2'));
+		assert.ok(lastThree[2].includes('queued-3'));
+	});
+
+	test('acquireOrLoadSession returns undefined when remote provider is not registered (fix for #301203)', async () => {
+		const unregisteredScheme = 'unregistered-provider';
+		const sessionResource = URI.from({ scheme: unregisteredScheme, path: '/orphaned-session' });
+
+		// Use a mock sessions service with NO content provider registered for the scheme
+		const mockSessionsService = new MockChatSessionsService();
+		instantiationService.stub(IChatSessionsService, mockSessionsService);
+
+		const testService = createChatService();
+		const ref = await testService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, CancellationToken.None);
+		assert.strictEqual(ref, undefined, 'Should return undefined when no provider is registered');
+	});
+
+	test('sendRequest on untitled remote session propagates initialSessionOptions to new model', async () => {
+		const remoteScheme = 'remoteProvider';
+		const untitledResource = URI.from({ scheme: remoteScheme, path: '/untitled-test-session' });
+		const realResource = URI.from({ scheme: remoteScheme, path: '/real-session-123' });
+
+		// Set up the mock chat sessions service
+		const mockSessionsService = new MockChatSessionsService();
+
+		// Register a content provider so loadRemoteSession can resolve sessions
+		testDisposables.add(mockSessionsService.registerChatSessionContentProvider(remoteScheme, {
+			provideChatSessionContent: (_resource: URI, _token: CancellationToken) => {
+				return Promise.resolve({
+					sessionResource: _resource,
+					history: [],
+					onWillDispose: Event.None,
+					dispose: () => { },
+				});
+			},
+		}));
+
+		// Set session options for the untitled resource
+		mockSessionsService.setSessionOption(untitledResource, 'model', 'claude-3.5-sonnet');
+		mockSessionsService.setSessionOption(untitledResource, 'repo', 'my-repo');
+
+		// Override createNewChatSessionItem to return a real resource
+		mockSessionsService.createNewChatSessionItem = async () => ({
+			resource: realResource,
+			label: 'Test Session',
+			timing: { created: Date.now(), lastRequestStarted: undefined, lastRequestEnded: undefined },
+		});
+
+		instantiationService.stub(IChatSessionsService, mockSessionsService);
+
+		// Register the remote agent
+		const remoteAgent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				return {};
+			},
+		};
+		testDisposables.add(chatAgentService.registerAgent(remoteScheme, { ...getAgentData(remoteScheme), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgentImplementation(remoteScheme, remoteAgent));
+
+		const testService = createChatService();
+
+		// Load the untitled session to create the initial model
+		const untitledRef = await testService.acquireOrLoadSession(untitledResource, ChatAgentLocation.Chat, CancellationToken.None);
+		assert.ok(untitledRef, 'Should load untitled session');
+		testDisposables.add(untitledRef);
+
+		// Send a request - this triggers the untitled → real session conversion
+		const response = await testService.sendRequest(untitledResource, 'hello', { agentId: remoteScheme });
+		ChatSendResult.assertSent(response);
+		await response.data.responseCompletePromise;
+
+		// The new model (with real resource) should have initialSessionOptions set
+		const newModel = testService.getSession(realResource) as ChatModel;
+		assert.ok(newModel, 'New model should exist at the real resource');
+		assert.ok(newModel.contributedChatSession, 'New model should have contributedChatSession');
+		assert.deepStrictEqual(
+			ChatSessionOptionsMap.toStrValueArray(newModel.contributedChatSession?.initialSessionOptions),
+			[
+				{ optionId: 'model', value: 'claude-3.5-sonnet' },
+				{ optionId: 'repo', value: 'my-repo' },
+			]
+		);
+	});
 });
 
 
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts
index e268a3a137e..52c097fac48 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts
@@ -6,6 +6,7 @@
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
 import { ISettableObservable, observableValue } from '../../../../../../base/common/observable.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ChatRequestQueueKind, ChatSendResult, IChatDetail, IChatModelReference, IChatProgress, IChatSendRequestOptions, IChatService, IChatSessionContext, IChatSessionStartOptions, IChatUserActionEvent } from '../../../common/chatService/chatService.js';
@@ -22,7 +23,7 @@ export class MockChatService implements IChatService {
 	readonly onDidSubmitRequest = Event.None;
 	readonly onDidCreateModel = Event.None;
 
-	private sessions = new Map<string, IChatModel>();
+	private readonly sessions = new ResourceMap<IChatModel>();
 	private liveSessionItems: IChatDetail[] = [];
 	private historySessionItems: IChatDetail[] = [];
 
@@ -50,13 +51,13 @@ export class MockChatService implements IChatService {
 	}
 
 	addSession(session: IChatModel): void {
-		this.sessions.set(session.sessionResource.toString(), session);
+		this.sessions.set(session.sessionResource, session);
 		// Update the chatModels observable
 		this._chatModels.set([...this.sessions.values()], undefined);
 	}
 
 	removeSession(sessionResource: URI): void {
-		this.sessions.delete(sessionResource.toString());
+		this.sessions.delete(sessionResource);
 		// Update the chatModels observable
 		this._chatModels.set([...this.sessions.values()], undefined);
 	}
@@ -78,7 +79,7 @@ export class MockChatService implements IChatService {
 	}
 
 	getSession(sessionResource: URI): IChatModel | undefined {
-		return this.sessions.get(sessionResource.toString());
+		return this.sessions.get(sessionResource);
 	}
 
 	getLatestRequest(): IChatRequestModel | undefined {
@@ -127,6 +128,8 @@ export class MockChatService implements IChatService {
 
 	async cancelCurrentRequestForSession(_sessionResource: URI, _source?: string): Promise<void> { }
 
+	migrateRequests(_originalResource: URI, _targetResource: URI): void { }
+
 	setYieldRequested(_sessionResource: URI): void { }
 
 	removePendingRequest(_sessionResource: URI, _requestId: string): void { }
@@ -190,9 +193,9 @@ export class MockChatService implements IChatService {
 	}
 
 
-	private onChange?: () => void;
+	private onChange?: (sessionResource: URI) => void;
 
-	registerChatModelChangeListeners(chatSessionType: string, onChange: () => void): IDisposable {
+	registerChatModelChangeListeners(chatSessionType: string, onChange: (sessionResource: URI) => void): IDisposable {
 		// Store the emitter so tests can trigger it
 		this.onChange = onChange;
 		return {
@@ -203,9 +206,7 @@ export class MockChatService implements IChatService {
 	}
 
 	// Helper method for tests to trigger progress events
-	triggerProgressEvent(): void {
-		if (this.onChange) {
-			this.onChange();
-		}
+	triggerProgressEvent(sessionResource: URI): void {
+		this.onChange?.(sessionResource);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
index 5790fab95dd..6908d48f9d4 100644
--- a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
@@ -993,3 +993,153 @@ suite('LanguageModels - Vendor Change Events', function () {
 		assert.strictEqual(eventFired, false, 'Should not fire event when vendor list is unchanged');
 	});
 });
+
+suite('LanguageModels - Per-Model Configuration', function () {
+
+	let languageModelsService: LanguageModelsService;
+	const disposables = new DisposableStore();
+	let receivedOptions: { [name: string]: unknown } | undefined;
+
+	setup(async function () {
+		receivedOptions = undefined;
+
+		languageModelsService = new LanguageModelsService(
+			new class extends mock<IExtensionService>() {
+				override activateByEvent() {
+					return Promise.resolve();
+				}
+			},
+			new NullLogService(),
+			new TestStorageService(),
+			new MockContextKeyService(),
+			new class extends mock<ILanguageModelsConfigurationService>() {
+				override onDidChangeLanguageModelGroups = Event.None;
+				override getLanguageModelsProviderGroups() {
+					return [{
+						vendor: 'config-vendor',
+						name: 'default',
+						settings: {
+							'model-a': { temperature: 0.7, reasoningEffort: 'high' },
+							'model-b': { temperature: 0.2 }
+						}
+					}];
+				}
+			},
+			new class extends mock<IQuickInputService>() { },
+			new TestSecretStorageService(),
+			new class extends mock<IProductService>() { override readonly version = '1.100.0'; },
+			new class extends mock<IRequestService>() { },
+		);
+
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'config-vendor', displayName: 'Config Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		disposables.add(languageModelsService.registerLanguageModelProvider('config-vendor', {
+			onDidChange: Event.None,
+			provideLanguageModelChatInfo: async (options) => {
+				if (options.group) {
+					return [{
+						metadata: {
+							extension: nullExtensionDescription.identifier,
+							name: 'Model A',
+							vendor: 'config-vendor',
+							family: 'family-a',
+							version: '1.0',
+							id: 'model-a',
+							maxInputTokens: 100,
+							maxOutputTokens: 100,
+							modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
+							isDefaultForLocation: {},
+							configurationSchema: {
+								type: 'object',
+								properties: {
+									temperature: { type: 'number', default: 0.5 },
+									reasoningEffort: { type: 'string', default: 'medium' },
+									maxTokens: { type: 'number', default: 4096 }
+								}
+							}
+						} satisfies ILanguageModelChatMetadata,
+						identifier: 'config-vendor/default/model-a'
+					}, {
+						metadata: {
+							extension: nullExtensionDescription.identifier,
+							name: 'Model B',
+							vendor: 'config-vendor',
+							family: 'family-b',
+							version: '1.0',
+							id: 'model-b',
+							maxInputTokens: 100,
+							maxOutputTokens: 100,
+							modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
+							isDefaultForLocation: {}
+						} satisfies ILanguageModelChatMetadata,
+						identifier: 'config-vendor/default/model-b'
+					}];
+				}
+				return [];
+			},
+			sendChatRequest: async (_modelId, _messages, _from, options) => {
+				receivedOptions = options;
+				const defer = new DeferredPromise();
+				const stream = new AsyncIterableSource<IChatResponsePart>();
+				stream.resolve();
+				defer.complete(undefined);
+				return { stream: stream.asyncIterable, result: defer.p };
+			},
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		await languageModelsService.selectLanguageModels({});
+	});
+
+	teardown(function () {
+		languageModelsService.dispose();
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('getModelConfiguration returns per-model config from group', function () {
+		const configA = languageModelsService.getModelConfiguration('config-vendor/default/model-a');
+		assert.deepStrictEqual(configA, { temperature: 0.7, reasoningEffort: 'high', maxTokens: 4096 });
+
+		const configB = languageModelsService.getModelConfiguration('config-vendor/default/model-b');
+		assert.deepStrictEqual(configB, { temperature: 0.2 });
+	});
+
+	test('getModelConfiguration returns undefined for unknown model', function () {
+		const config = languageModelsService.getModelConfiguration('config-vendor/default/model-c');
+		assert.strictEqual(config, undefined);
+	});
+
+	test('sendChatRequest merges schema defaults with user config', async function () {
+		const cts = disposables.add(new CancellationTokenSource());
+		const request = await languageModelsService.sendChatRequest(
+			'config-vendor/default/model-a',
+			nullExtensionDescription.identifier,
+			[{ role: ChatMessageRole.User, content: [{ type: 'text', value: 'hello' }] }],
+			{},
+			cts.token
+		);
+		await request.result;
+
+		// User config overrides defaults: temperature=0.7 (not 0.5), reasoningEffort='high' (not 'medium')
+		// Schema default maxTokens=4096 is included since user didn't override it
+		assert.deepStrictEqual(receivedOptions, { configuration: { temperature: 0.7, reasoningEffort: 'high', maxTokens: 4096 } });
+	});
+
+	test('sendChatRequest passes user config when model has no schema', async function () {
+		const cts = disposables.add(new CancellationTokenSource());
+		const request = await languageModelsService.sendChatRequest(
+			'config-vendor/default/model-b',
+			nullExtensionDescription.identifier,
+			[{ role: ChatMessageRole.User, content: [{ type: 'text', value: 'hello' }] }],
+			{},
+			cts.token
+		);
+		await request.result;
+
+		assert.deepStrictEqual(receivedOptions, { configuration: { temperature: 0.2 } });
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/languageModels.ts b/src/vs/workbench/contrib/chat/test/common/languageModels.ts
index 8ead7eab0a9..51ac576ae1a 100644
--- a/src/vs/workbench/contrib/chat/test/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/test/common/languageModels.ts
@@ -8,8 +8,9 @@ import { IStringDictionary } from '../../../../../base/common/collections.js';
 import { Event } from '../../../../../base/common/event.js';
 import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observable.js';
+import { IAction } from '../../../../../base/common/actions.js';
 import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { IChatMessage, IModelsControlManifest, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatProvider, ILanguageModelChatResponse, ILanguageModelChatSelector, ILanguageModelProviderDescriptor, ILanguageModelsGroup, ILanguageModelsService, IUserFriendlyLanguageModel } from '../../common/languageModels.js';
+import { IChatMessage, IModelsControlManifest, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatProvider, ILanguageModelChatRequestOptions, ILanguageModelChatResponse, ILanguageModelChatSelector, ILanguageModelProviderDescriptor, ILanguageModelsGroup, ILanguageModelsService, IUserFriendlyLanguageModel } from '../../common/languageModels.js';
 import { ILanguageModelsProviderGroup } from '../../common/languageModelsConfiguration.js';
 
 export class NullLanguageModelsService implements ILanguageModelsService {
@@ -66,8 +67,7 @@ export class NullLanguageModelsService implements ILanguageModelsService {
 		return [];
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	sendChatRequest(identifier: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse> {
+	sendChatRequest(identifier: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<ILanguageModelChatResponse> {
 		throw new Error('Method not implemented.');
 	}
 
@@ -75,10 +75,24 @@ export class NullLanguageModelsService implements ILanguageModelsService {
 		throw new Error('Method not implemented.');
 	}
 
+	getModelConfiguration(_modelId: string): IStringDictionary<unknown> | undefined {
+		return undefined;
+	}
+
+	async setModelConfiguration(_modelId: string, _values: IStringDictionary<unknown>): Promise<void> {
+	}
+
+	getModelConfigurationActions(_modelId: string): IAction[] {
+		return [];
+	}
+
 	async configureLanguageModelsProviderGroup(vendorId: string, name?: string): Promise<void> {
 
 	}
 
+	async configureModel(_modelId: string): Promise<void> {
+	}
+
 	async addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void> {
 
 	}
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts
index 883337c04ee..3f9b1f77c2a 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts
@@ -4,25 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { AsyncEmitter, Emitter } from '../../../../../base/common/event.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { IChatAgentAttachmentCapabilities } from '../../common/participants/chatAgents.js';
+import { ReadonlyChatSessionOptionsMap, IChatNewSessionRequest, IChatSession, IChatSessionContentProvider, IChatSessionCustomizationItemGroup, IChatSessionCustomizationsProvider, IChatSessionItem, IChatSessionItemController, IChatSessionItemsDelta, IChatSessionOptionsChangeEvent, IChatSessionProviderOptionGroup, IChatSessionRequestHistoryItem, IChatSessionsExtensionPoint, IChatSessionsService, ResolvedChatSessionsExtensionPoint, ChatSessionOptionsMap } from '../../common/chatSessionsService.js';
 import { IChatModel } from '../../common/model/chatModel.js';
-import { IChatNewSessionRequest, IChatSession, IChatSessionContentProvider, IChatSessionItemController, IChatSessionItem, IChatSessionOptionsWillNotifyExtensionEvent, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsExtensionPoint, IChatSessionsService, ResolvedChatSessionsExtensionPoint } from '../../common/chatSessionsService.js';
+import { IChatAgentAttachmentCapabilities } from '../../common/participants/chatAgents.js';
 import { Target } from '../../common/promptSyntax/promptTypes.js';
 
 export class MockChatSessionsService implements IChatSessionsService {
 	_serviceBrand: undefined;
 
-	private readonly _onDidChangeSessionOptions = new Emitter<URI>();
+	private readonly _onDidChangeSessionOptions = new Emitter<IChatSessionOptionsChangeEvent>();
 	readonly onDidChangeSessionOptions = this._onDidChangeSessionOptions.event;
+
 	private readonly _onDidChangeItemsProviders = new Emitter<{ readonly chatSessionType: string }>();
 	readonly onDidChangeItemsProviders = this._onDidChangeItemsProviders.event;
 
-	private readonly _onDidChangeSessionItems = new Emitter<{ readonly chatSessionType: string }>();
+	private readonly _onDidChangeSessionItems = new Emitter<IChatSessionItemsDelta>();
 	readonly onDidChangeSessionItems = this._onDidChangeSessionItems.event;
 
 	private readonly _onDidChangeAvailability = new Emitter<void>();
@@ -37,23 +38,21 @@ export class MockChatSessionsService implements IChatSessionsService {
 	private readonly _onDidChangeOptionGroups = new Emitter<string>();
 	readonly onDidChangeOptionGroups = this._onDidChangeOptionGroups.event;
 
-	private readonly _onRequestNotifyExtension = new AsyncEmitter<IChatSessionOptionsWillNotifyExtensionEvent>();
-	readonly onRequestNotifyExtension = this._onRequestNotifyExtension.event;
 
 	private sessionItemControllers = new Map<string, { readonly controller: IChatSessionItemController; readonly initialRefresh: Promise<void> }>();
 	private contentProviders = new Map<string, IChatSessionContentProvider>();
 	private contributions: IChatSessionsExtensionPoint[] = [];
 	private optionGroups = new Map<string, IChatSessionProviderOptionGroup[]>();
-	private sessionOptions = new ResourceMap<Map<string, string>>();
-	private inProgress = new Map<string, number>();
+	private sessionOptions = new ResourceMap<ChatSessionOptionsMap>();
+	private inProgress = new Map</* chatSessionType*/ string, number>();
 
 	// For testing: allow triggering events
 	fireDidChangeItemsProviders(event: { chatSessionType: string }): void {
 		this._onDidChangeItemsProviders.fire(event);
 	}
 
-	fireDidChangeSessionItems(chatSessionType: string): void {
-		this._onDidChangeSessionItems.fire({ chatSessionType });
+	fireDidChangeSessionItems(event: IChatSessionItemsDelta): void {
+		this._onDidChangeSessionItems.fire(event);
 	}
 
 	fireDidChangeAvailability(): void {
@@ -73,6 +72,10 @@ export class MockChatSessionsService implements IChatSessionsService {
 		};
 	}
 
+	getRegisteredChatSessionItemProviders(): readonly string[] {
+		return Array.from(this.sessionItemControllers.keys());
+	}
+
 	getAllChatSessionContributions(): ResolvedChatSessionsExtensionPoint[] {
 		return this.contributions.map(contribution => this.resolveContribution(contribution));
 	}
@@ -122,13 +125,8 @@ export class MockChatSessionsService implements IChatSessionsService {
 				}));
 	}
 
-	reportInProgress(chatSessionType: string, count: number): void {
-		this.inProgress.set(chatSessionType, count);
-		this._onDidChangeInProgress.fire();
-	}
-
-	getInProgress(): { displayName: string; count: number }[] {
-		return Array.from(this.inProgress.entries()).map(([displayName, count]) => ({ displayName, count }));
+	getInProgress(): { chatSessionType: string; count: number }[] {
+		return Array.from(this.inProgress.entries()).map(([chatSessionType, count]) => ({ chatSessionType, count }));
 	}
 
 	registerChatSessionContentProvider(chatSessionType: string, provider: IChatSessionContentProvider): IDisposable {
@@ -169,32 +167,39 @@ export class MockChatSessionsService implements IChatSessionsService {
 		}
 	}
 
-	getNewSessionOptionsForSessionType(_chatSessionType: string): Record<string, string | IChatSessionProviderOptionItem> | undefined {
+	getNewSessionOptionsForSessionType(_chatSessionType: string): ReadonlyChatSessionOptionsMap | undefined {
 		return undefined;
 	}
 
-	setNewSessionOptionsForSessionType(_chatSessionType: string, _options: Record<string, string | IChatSessionProviderOptionItem>): void {
+	setNewSessionOptionsForSessionType(_chatSessionType: string, _options: ReadonlyChatSessionOptionsMap): void {
 		// noop
 	}
 
-	async notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>): Promise<void> {
-		await this._onRequestNotifyExtension.fireAsync({ sessionResource, updates }, CancellationToken.None);
+	getSessionOptions(sessionResource: URI): ReadonlyChatSessionOptionsMap | undefined {
+		const options = this.sessionOptions.get(sessionResource);
+		return options && options.size > 0 ? options : undefined;
 	}
 
 	getSessionOption(sessionResource: URI, optionId: string): string | undefined {
-		return this.sessionOptions.get(sessionResource)?.get(optionId);
+		const value = this.sessionOptions.get(sessionResource)?.get(optionId);
+		return typeof value === 'string' ? value : value?.id;
 	}
 
 	setSessionOption(sessionResource: URI, optionId: string, value: string): boolean {
+		return this.updateSessionOptions(sessionResource, new Map([[optionId, value]]));
+	}
+
+	updateSessionOptions(sessionResource: URI, updates: ReadonlyChatSessionOptionsMap): boolean {
 		if (!this.sessionOptions.has(sessionResource)) {
 			this.sessionOptions.set(sessionResource, new Map());
 		}
-		this.sessionOptions.get(sessionResource)!.set(optionId, value);
-		return true;
-	}
+		for (const [optionId, value] of updates) {
+			this.sessionOptions.get(sessionResource)!.set(optionId, value);
+		}
 
-	hasAnySessionOptions(resource: URI): boolean {
-		return this.sessionOptions.has(resource) && this.sessionOptions.get(resource)!.size > 0;
+		this._onDidChangeSessionOptions.fire({ sessionResource, updates });
+
+		return true;
 	}
 
 	getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined {
@@ -209,6 +214,18 @@ export class MockChatSessionsService implements IChatSessionsService {
 		return this.contributions.find(c => c.type === chatSessionType)?.requiresCustomModels ?? false;
 	}
 
+	supportsDelegationForSessionType(chatSessionType: string): boolean {
+		return this.contributions.find(c => c.type === chatSessionType)?.supportsDelegation !== false;
+	}
+
+	sessionSupportsFork(_sessionResource: URI): boolean {
+		return false;
+	}
+
+	async forkChatSession(_sessionResource: URI, _request: IChatSessionRequestHistoryItem | undefined, _token: CancellationToken): Promise<IChatSessionItem> {
+		throw new Error('Not implemented');
+	}
+
 	getContentProviderSchemes(): string[] {
 		return Array.from(this.contentProviders.keys());
 	}
@@ -224,4 +241,32 @@ export class MockChatSessionsService implements IChatSessionsService {
 	registerSessionResourceAlias(_untitledResource: URI, _realResource: URI): void {
 		// noop
 	}
+
+	registerChatSessionContribution(contribution: IChatSessionsExtensionPoint): IDisposable {
+		this.contributions.push(contribution);
+		return {
+			dispose: () => {
+				const idx = this.contributions.indexOf(contribution);
+				if (idx >= 0) {
+					this.contributions.splice(idx, 1);
+				}
+			}
+		};
+	}
+
+	private readonly _onDidChangeCustomizations = new Emitter<{ readonly chatSessionType: string }>();
+	readonly onDidChangeCustomizations = this._onDidChangeCustomizations.event;
+
+	registerCustomizationsProvider(_chatSessionType: string, _provider: IChatSessionCustomizationsProvider): IDisposable {
+		return { dispose: () => { } };
+	}
+
+	hasCustomizationsProvider(_chatSessionType: string): boolean {
+		return false;
+	}
+
+	async getCustomizations(_chatSessionType: string, _token: CancellationToken): Promise<IChatSessionCustomizationItemGroup[] | undefined> {
+		return undefined;
+	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts
index e89b504b224..8a3a7439207 100644
--- a/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts
@@ -25,9 +25,9 @@ import { TestExtensionService, TestStorageService } from '../../../../../test/co
 import { CellUri } from '../../../../notebook/common/notebookCommon.js';
 import { IChatRequestImplicitVariableEntry, IChatRequestStringVariableEntry, IChatRequestFileEntry, StringChatContextValue } from '../../../common/attachments/chatVariableEntries.js';
 import { ChatAgentService, IChatAgentService } from '../../../common/participants/chatAgents.js';
-import { ChatModel, ChatRequestModel, IChatRequestModeInfo, IExportableChatData, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, Response } from '../../../common/model/chatModel.js';
+import { ChatModel, ChatRequestModel, ChatResponseResource, IChatRequestModeInfo, IExportableChatData, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, Response } from '../../../common/model/chatModel.js';
 import { ChatRequestTextPart } from '../../../common/requestParser/chatParserTypes.js';
-import { ChatRequestQueueKind, IChatService, IChatToolInvocation } from '../../../common/chatService/chatService.js';
+import { ChatRequestQueueKind, IChatService, IChatTerminalToolInvocationData, IChatToolInvocation } from '../../../common/chatService/chatService.js';
 import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
 import { MockChatService } from '../chatService/mockChatService.js';
 
@@ -553,6 +553,65 @@ suite('Response', () => {
 		assert.strictEqual(textEditGroups.length, 0, 'Should not have textEditGroup for cell edits');
 		assert.strictEqual(notebookEditGroups.length, 1, 'Should have notebookEditGroup for cell edits');
 	});
+
+	test('external terminal tool updates preserve toolSpecificData when completing an existing invocation', () => {
+		const response = store.add(new Response([]));
+		const toolSpecificData: IChatTerminalToolInvocationData = {
+			kind: 'terminal',
+			language: 'bash',
+			commandLine: { original: 'npm test' },
+			terminalCommandOutput: { text: 'all green' },
+			terminalCommandState: { exitCode: 0 },
+		};
+
+		response.updateContent({
+			kind: 'externalToolInvocationUpdate',
+			toolCallId: 'tool-call-1',
+			toolName: 'run_in_terminal',
+			isComplete: false,
+			invocationMessage: 'Running npm test',
+		});
+
+		response.updateContent({
+			kind: 'externalToolInvocationUpdate',
+			toolCallId: 'tool-call-1',
+			toolName: 'run_in_terminal',
+			isComplete: true,
+			pastTenseMessage: 'Ran npm test',
+			toolSpecificData,
+		});
+
+		assert.strictEqual(response.value.length, 1);
+		assert.strictEqual(response.value[0].kind, 'toolInvocation');
+		assert.deepStrictEqual(response.value[0].toolSpecificData, toolSpecificData);
+		assert.strictEqual(IChatToolInvocation.isComplete(response.value[0]), true);
+	});
+
+	test('external terminal tool updates preserve toolSpecificData when first pushed as complete', () => {
+		const response = store.add(new Response([]));
+		const toolSpecificData: IChatTerminalToolInvocationData = {
+			kind: 'terminal',
+			language: 'bash',
+			commandLine: { original: 'npm test' },
+			terminalCommandOutput: { text: 'all green' },
+			terminalCommandState: { exitCode: 0 },
+		};
+
+		response.updateContent({
+			kind: 'externalToolInvocationUpdate',
+			toolCallId: 'tool-call-2',
+			toolName: 'run_in_terminal',
+			isComplete: true,
+			invocationMessage: 'Running npm test',
+			pastTenseMessage: 'Ran npm test',
+			toolSpecificData,
+		});
+
+		assert.strictEqual(response.value.length, 1);
+		assert.strictEqual(response.value[0].kind, 'toolInvocation');
+		assert.deepStrictEqual(response.value[0].toolSpecificData, toolSpecificData);
+		assert.strictEqual(IChatToolInvocation.isComplete(response.value[0]), true);
+	});
 });
 
 suite('normalizeSerializableChatData', () => {
@@ -1048,3 +1107,52 @@ suite('ChatModel - Pending Requests', () => {
 		assert.strictEqual(pending.sendOptions.attempt, 3);
 	});
 });
+
+suite('ChatResponseResource', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('createUri roundtrips through parseUri without basename', () => {
+		const sessionResource = URI.parse('vscode-chat-session://local/session1');
+		const uri = ChatResponseResource.createUri(sessionResource, 'call-123', 2);
+		const parsed = ChatResponseResource.parseUri(uri);
+
+		assert.ok(parsed);
+		assert.strictEqual(parsed.sessionResource.toString(), sessionResource.toString());
+		assert.strictEqual(parsed.toolCallId, 'call-123');
+		assert.strictEqual(parsed.index, 2);
+	});
+
+	test('createUri roundtrips through parseUri with basename', () => {
+		const sessionResource = URI.parse('vscode-chat-session://local/session1');
+		const uri = ChatResponseResource.createUri(sessionResource, 'call-456', 0, 'file.txt');
+		const parsed = ChatResponseResource.parseUri(uri);
+
+		assert.ok(parsed);
+		assert.strictEqual(parsed.sessionResource.toString(), sessionResource.toString());
+		assert.strictEqual(parsed.toolCallId, 'call-456');
+		assert.strictEqual(parsed.index, 0);
+	});
+
+	test('parseUri rejects paths with fewer than 4 segments', () => {
+		// path "/tool/callId/0" splits into ['', 'tool', 'callId', '0'] = 4 parts => valid
+		// path "/tool/callId" splits into ['', 'tool', 'callId'] = 3 parts => invalid
+		const base = URI.from({ scheme: ChatResponseResource.scheme, authority: 'abc', path: '/tool/callId' });
+		assert.strictEqual(ChatResponseResource.parseUri(base), undefined);
+
+		const tooShort = URI.from({ scheme: ChatResponseResource.scheme, authority: 'abc', path: '/tool' });
+		assert.strictEqual(ChatResponseResource.parseUri(tooShort), undefined);
+
+		const empty = URI.from({ scheme: ChatResponseResource.scheme, authority: 'abc', path: '/' });
+		assert.strictEqual(ChatResponseResource.parseUri(empty), undefined);
+	});
+
+	test('parseUri rejects wrong scheme', () => {
+		const uri = URI.from({ scheme: 'file', path: '/tool/callId/0' });
+		assert.strictEqual(ChatResponseResource.parseUri(uri), undefined);
+	});
+
+	test('parseUri rejects wrong kind', () => {
+		const uri = URI.from({ scheme: ChatResponseResource.scheme, authority: 'abc', path: '/notTool/callId/0' });
+		assert.strictEqual(ChatResponseResource.parseUri(uri), undefined);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/plugins/agentPluginFormatDetection.test.ts b/src/vs/workbench/contrib/chat/test/common/plugins/agentPluginFormatDetection.test.ts
new file mode 100644
index 00000000000..9818dbb04b5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/plugins/agentPluginFormatDetection.test.ts
@@ -0,0 +1,935 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { waitForState } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { FileService } from '../../../../../../platform/files/common/fileService.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { InMemoryFileSystemProvider } from '../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
+import { testWorkspace } from '../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { TestContextService } from '../../../../../test/common/workbenchTestServices.js';
+import { IPathService } from '../../../../../services/path/common/pathService.js';
+import { AbstractAgentPluginDiscovery } from '../../../common/plugins/agentPluginServiceImpl.js';
+import { ContributionEnablementState, IEnablementModel } from '../../../common/enablement.js';
+
+/**
+ * Concrete discovery subclass that returns a fixed list of plugin URIs,
+ * allowing format detection and content reading to be tested in isolation.
+ */
+class TestPluginDiscovery extends AbstractAgentPluginDiscovery {
+	private _sources: URI[] = [];
+
+	constructor(
+		fileService: IFileService,
+		pathService: IPathService,
+		logService: ILogService,
+		instantiationService: IInstantiationService,
+	) {
+		super(fileService, pathService, logService, instantiationService);
+	}
+
+	start(enablementModel: IEnablementModel): void {
+		this._enablementModel = enablementModel;
+	}
+
+	/** Set plugin sources and trigger a refresh. */
+	async setSourcesAndRefresh(uris: URI[]): Promise<void> {
+		this._sources = uris;
+		await this._refreshPlugins();
+	}
+
+	protected override async _discoverPluginSources() {
+		return this._sources.map(uri => ({
+			uri,
+			fromMarketplace: undefined,
+			remove: () => { },
+		}));
+	}
+}
+
+suite('AgentPlugin format detection', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	const logService = new NullLogService();
+
+	let fileService: FileService;
+	let instantiationService: TestInstantiationService;
+	const workspaceRoot = URI.from({ scheme: Schemas.inMemory, path: '/workspace' });
+
+	setup(() => {
+		const contextService = new TestContextService(testWorkspace(workspaceRoot));
+
+		fileService = store.add(new FileService(logService));
+		store.add(fileService.registerProvider(Schemas.inMemory, store.add(new InMemoryFileSystemProvider())));
+
+		instantiationService = store.add(new TestInstantiationService());
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(ILogService, logService);
+		instantiationService.stub(IWorkspaceContextService, contextService);
+		instantiationService.stub(IPathService, {
+			userHome: async () => URI.file('/home/testuser'),
+		} as Partial<IPathService> as IPathService);
+		instantiationService.stub(IInstantiationService, instantiationService);
+	});
+
+	const mockEnablementModel: IEnablementModel = {
+		readEnabled: () => ContributionEnablementState.EnabledProfile,
+		setEnabled: () => { },
+		remove: () => { },
+	};
+
+	function createDiscovery(): TestPluginDiscovery {
+		return store.add(new TestPluginDiscovery(
+			fileService,
+			instantiationService.get(IPathService),
+			logService,
+			instantiationService,
+		));
+	}
+
+	async function writeFile(path: string, content: string): Promise<void> {
+		const uri = URI.from({ scheme: Schemas.inMemory, path });
+		await fileService.writeFile(uri, VSBuffer.fromString(content));
+	}
+
+	function pluginUri(path: string): URI {
+		return URI.from({ scheme: Schemas.inMemory, path });
+	}
+
+	test('detects Open Plugin format when .plugin/plugin.json exists', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/my-open-plugin');
+		await writeFile('/plugins/my-open-plugin/.plugin/plugin.json', JSON.stringify({ name: 'my-open-plugin' }));
+		await writeFile('/plugins/my-open-plugin/commands/hello.md', '# Hello');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		// Verify the plugin read commands from the standard commands/ directory
+		await waitForState(plugins[0].commands, cmds => cmds.length > 0);
+		assert.strictEqual(plugins[0].commands.get()[0].name, 'hello');
+	}));
+
+	test('detects Claude format when .claude-plugin/plugin.json exists', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/my-claude-plugin');
+		await writeFile('/plugins/my-claude-plugin/.claude-plugin/plugin.json', JSON.stringify({ name: 'my-claude-plugin' }));
+		await writeFile('/plugins/my-claude-plugin/commands/greet.md', '# Greet');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].commands, cmds => cmds.length > 0);
+		assert.strictEqual(plugins[0].commands.get()[0].name, 'greet');
+	}));
+
+	test('falls back to Copilot format when no vendor manifest exists', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/my-copilot-plugin');
+		await writeFile('/plugins/my-copilot-plugin/plugin.json', JSON.stringify({ name: 'my-copilot-plugin' }));
+		await writeFile('/plugins/my-copilot-plugin/commands/run.md', '# Run');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].commands, cmds => cmds.length > 0);
+		assert.strictEqual(plugins[0].commands.get()[0].name, 'run');
+	}));
+
+	test('Open Plugin format takes priority over Claude format', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		// Plugin has both .plugin/plugin.json and .claude-plugin/plugin.json —
+		// the open plugin manifest should be detected first.
+		const uri = pluginUri('/plugins/dual-plugin');
+		await writeFile('/plugins/dual-plugin/.plugin/plugin.json', JSON.stringify({ name: 'dual-plugin' }));
+		await writeFile('/plugins/dual-plugin/.claude-plugin/plugin.json', JSON.stringify({ name: 'dual-plugin' }));
+
+		// Write inline MCP into the open-plugin manifest to verify it's used.
+		await writeFile('/plugins/dual-plugin/.plugin/plugin.json', JSON.stringify({
+			name: 'dual-plugin',
+			mcpServers: { 'open-server': { command: 'echo', args: ['open'] } },
+		}));
+		// Claude manifest defines a different server to prove it's NOT read.
+		await writeFile('/plugins/dual-plugin/.claude-plugin/plugin.json', JSON.stringify({
+			name: 'dual-plugin',
+			mcpServers: { 'claude-server': { command: 'echo', args: ['claude'] } },
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].mcpServerDefinitions, defs => defs.length > 0);
+		const mcpDefs = plugins[0].mcpServerDefinitions.get();
+		assert.strictEqual(mcpDefs.length, 1);
+		assert.strictEqual(mcpDefs[0].name, 'open-server');
+	}));
+
+	test('Open Plugin reads MCP definitions from .plugin/plugin.json inline', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/mcp-plugin');
+		await writeFile('/plugins/mcp-plugin/.plugin/plugin.json', JSON.stringify({
+			name: 'mcp-plugin',
+			mcpServers: {
+				'my-server': { command: 'node', args: ['server.js'] },
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].mcpServerDefinitions, defs => defs.length > 0);
+		const mcpDefs = plugins[0].mcpServerDefinitions.get();
+		assert.deepStrictEqual(mcpDefs.map(d => d.name), ['my-server']);
+	}));
+
+	test('Open Plugin reads MCP definitions from standalone .mcp.json', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/mcp-standalone');
+		await writeFile('/plugins/mcp-standalone/.plugin/plugin.json', JSON.stringify({ name: 'mcp-standalone' }));
+		await writeFile('/plugins/mcp-standalone/.mcp.json', JSON.stringify({
+			mcpServers: {
+				'standalone-server': { command: 'python', args: ['serve.py'] },
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].mcpServerDefinitions, defs => defs.length > 0);
+		assert.strictEqual(plugins[0].mcpServerDefinitions.get()[0].name, 'standalone-server');
+	}));
+
+	test('reads skills from skills/ subdirectories', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/skills-plugin');
+		await writeFile('/plugins/skills-plugin/.plugin/plugin.json', JSON.stringify({ name: 'skills-plugin' }));
+		await writeFile('/plugins/skills-plugin/skills/deploy/SKILL.md', '# Deploy skill');
+		await writeFile('/plugins/skills-plugin/skills/lint/SKILL.md', '# Lint skill');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].skills, s => s.length > 0);
+		const skillNames = plugins[0].skills.get().map(s => s.name).sort();
+		assert.deepStrictEqual(skillNames, ['deploy', 'lint']);
+	}));
+
+	test('reads root-level SKILL.md as a fallback skill', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/root-skill');
+		await writeFile('/plugins/root-skill/.plugin/plugin.json', JSON.stringify({ name: 'root-skill' }));
+		await writeFile('/plugins/root-skill/SKILL.md', '# Visual Explainer');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].skills, s => s.length > 0);
+		assert.deepStrictEqual(
+			plugins[0].skills.get().map(s => s.name),
+			['root-skill'],
+		);
+	}));
+
+	test('root-level SKILL.md is ignored when skills/ has content', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/root-skill-ignored');
+		await writeFile('/plugins/root-skill-ignored/.plugin/plugin.json', JSON.stringify({ name: 'root-skill-ignored' }));
+		await writeFile('/plugins/root-skill-ignored/SKILL.md', '# Root skill');
+		await writeFile('/plugins/root-skill-ignored/skills/real/SKILL.md', '# Real skill');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].skills, s => s.length > 0);
+		assert.deepStrictEqual(
+			plugins[0].skills.get().map(s => s.name),
+			['real'],
+		);
+	}));
+
+	test('reads agents from agents/ directory', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/agents-plugin');
+		await writeFile('/plugins/agents-plugin/.plugin/plugin.json', JSON.stringify({ name: 'agents-plugin' }));
+		await writeFile('/plugins/agents-plugin/agents/reviewer.md', '---\nname: reviewer\n---\nYou review code.');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].agents, a => a.length > 0);
+		assert.strictEqual(plugins[0].agents.get()[0].name, 'reviewer');
+	}));
+
+	test('manifest skills field adds supplemental skill directories', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/custom-skills');
+		await writeFile('/plugins/custom-skills/.plugin/plugin.json', JSON.stringify({
+			name: 'custom-skills',
+			skills: './extra-skills/',
+		}));
+		await writeFile('/plugins/custom-skills/skills/default-skill/SKILL.md', '# Default skill');
+		await writeFile('/plugins/custom-skills/extra-skills/bonus-skill/SKILL.md', '# Bonus skill');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].skills, s => s.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].skills.get().map(s => s.name).sort(),
+			['bonus-skill', 'default-skill'],
+		);
+	}));
+
+	test('manifest skills field with exclusive mode skips default directory', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/exclusive-skills');
+		await writeFile('/plugins/exclusive-skills/.plugin/plugin.json', JSON.stringify({
+			name: 'exclusive-skills',
+			skills: { paths: ['./only-here/'], exclusive: true },
+		}));
+		await writeFile('/plugins/exclusive-skills/skills/ignored/SKILL.md', '# Should be ignored');
+		await writeFile('/plugins/exclusive-skills/only-here/visible/SKILL.md', '# Should be visible');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].skills, s => s.length > 0);
+		assert.deepStrictEqual(
+			plugins[0].skills.get().map(s => s.name),
+			['visible'],
+		);
+	}));
+
+	test('manifest commands field with string array scans multiple directories', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/multi-commands');
+		await writeFile('/plugins/multi-commands/.plugin/plugin.json', JSON.stringify({
+			name: 'multi-commands',
+			commands: ['./cmd1/', './cmd2/'],
+		}));
+		await writeFile('/plugins/multi-commands/commands/default.md', '# Default');
+		await writeFile('/plugins/multi-commands/cmd1/alpha.md', '# Alpha');
+		await writeFile('/plugins/multi-commands/cmd2/beta.md', '# Beta');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].commands, c => c.length >= 3);
+		assert.deepStrictEqual(
+			plugins[0].commands.get().map(c => c.name).sort(),
+			['alpha', 'beta', 'default'],
+		);
+	}));
+
+	test('manifest agents field adds supplemental agent directories', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/custom-agents');
+		await writeFile('/plugins/custom-agents/.plugin/plugin.json', JSON.stringify({
+			name: 'custom-agents',
+			agents: './extra-agents/',
+		}));
+		await writeFile('/plugins/custom-agents/agents/default-agent.md', '# Default');
+		await writeFile('/plugins/custom-agents/extra-agents/bonus-agent.md', '# Bonus');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].agents, a => a.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].agents.get().map(a => a.name).sort(),
+			['bonus-agent', 'default-agent'],
+		);
+	}));
+
+	test('path traversal in manifest is rejected', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/traversal');
+		await writeFile('/plugins/traversal/.plugin/plugin.json', JSON.stringify({
+			name: 'traversal',
+			skills: '../outside/',
+		}));
+		await writeFile('/plugins/outside/evil/SKILL.md', '# Evil skill');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		// Only default skills/ directory should be scanned; the traversal path is rejected.
+		// Since there are no skills in skills/, result should be empty.
+		await waitForState(plugins[0].skills, () => true);
+		assert.deepStrictEqual(plugins[0].skills.get(), []);
+	}));
+
+	test('duplicate names across directories deduplicate (first wins)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/dedup');
+		await writeFile('/plugins/dedup/.plugin/plugin.json', JSON.stringify({
+			name: 'dedup',
+			commands: './extra-commands/',
+		}));
+		await writeFile('/plugins/dedup/commands/shared.md', '# Default version');
+		await writeFile('/plugins/dedup/extra-commands/shared.md', '# Custom version');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].commands, c => c.length > 0);
+		const cmds = plugins[0].commands.get();
+		assert.strictEqual(cmds.length, 1);
+		assert.strictEqual(cmds[0].name, 'shared');
+		// The default directory is scanned first, so the URI should come from commands/
+		assert.ok(cmds[0].uri.path.includes('/commands/shared.md'));
+	}));
+
+	test('discovers components without a manifest', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/no-manifest');
+		await writeFile('/plugins/no-manifest/commands/hello.md', '# Hello');
+		await writeFile('/plugins/no-manifest/skills/my-skill/SKILL.md', '# My skill');
+		await writeFile('/plugins/no-manifest/agents/helper.md', '# Helper');
+		await writeFile('/plugins/no-manifest/rules/prefer-const.mdc', '---\ndescription: Prefer const\n---\nUse const.');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		assert.strictEqual(plugins[0].label, 'no-manifest');
+
+		await waitForState(plugins[0].commands, c => c.length > 0);
+		assert.strictEqual(plugins[0].commands.get()[0].name, 'hello');
+
+		await waitForState(plugins[0].skills, s => s.length > 0);
+		assert.strictEqual(plugins[0].skills.get()[0].name, 'my-skill');
+
+		await waitForState(plugins[0].agents, a => a.length > 0);
+		assert.strictEqual(plugins[0].agents.get()[0].name, 'helper');
+
+		await waitForState(plugins[0].instructions, i => i.length > 0);
+		assert.strictEqual(plugins[0].instructions.get()[0].name, 'prefer-const');
+	}));
+
+	test('reads hooks from default hooks/hooks.json', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/hooks-default');
+		await writeFile('/plugins/hooks-default/.plugin/plugin.json', JSON.stringify({ name: 'hooks-default' }));
+		await writeFile('/plugins/hooks-default/hooks/hooks.json', JSON.stringify({
+			hooks: {
+				PostToolUse: [{ matcher: 'Write', hooks: [{ type: 'command', command: 'echo done' }] }],
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].hooks, h => h.length > 0);
+		assert.strictEqual(plugins[0].hooks.get().length, 1);
+	}));
+
+	test('reads inline hooks from manifest', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/hooks-inline');
+		await writeFile('/plugins/hooks-inline/.plugin/plugin.json', JSON.stringify({
+			name: 'hooks-inline',
+			hooks: {
+				hooks: {
+					SessionStart: [{ hooks: [{ type: 'command', command: 'echo start' }] }],
+				},
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].hooks, h => h.length > 0);
+		assert.strictEqual(plugins[0].hooks.get().length, 1);
+	}));
+
+	test('reads hooks from custom path in manifest', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/hooks-custom');
+		await writeFile('/plugins/hooks-custom/.plugin/plugin.json', JSON.stringify({
+			name: 'hooks-custom',
+			hooks: './config/my-hooks.json',
+		}));
+		await writeFile('/plugins/hooks-custom/config/my-hooks.json', JSON.stringify({
+			hooks: {
+				PostToolUse: [{ matcher: 'Edit', hooks: [{ type: 'command', command: 'echo edited' }] }],
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].hooks, h => h.length > 0);
+		assert.strictEqual(plugins[0].hooks.get().length, 1);
+	}));
+
+	test('reads MCP from custom path in manifest', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/mcp-custom');
+		await writeFile('/plugins/mcp-custom/.plugin/plugin.json', JSON.stringify({
+			name: 'mcp-custom',
+			mcpServers: './config/servers.json',
+		}));
+		await writeFile('/plugins/mcp-custom/config/servers.json', JSON.stringify({
+			mcpServers: {
+				'custom-server': { command: 'node', args: ['custom.js'] },
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].mcpServerDefinitions, d => d.length > 0);
+		assert.strictEqual(plugins[0].mcpServerDefinitions.get()[0].name, 'custom-server');
+	}));
+
+	test('inline MCP in manifest takes priority over standalone .mcp.json', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/mcp-merged');
+		await writeFile('/plugins/mcp-merged/.plugin/plugin.json', JSON.stringify({
+			name: 'mcp-merged',
+			mcpServers: {
+				'inline-server': { command: 'echo', args: ['inline'] },
+			},
+		}));
+		await writeFile('/plugins/mcp-merged/.mcp.json', JSON.stringify({
+			mcpServers: {
+				'file-server': { command: 'echo', args: ['file'] },
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		// When inline mcpServers is an object in the manifest, it is treated as
+		// embedded configuration and the default .mcp.json file is not read.
+		// Wait for the inline server to appear (manifest loads asynchronously).
+		await waitForState(plugins[0].mcpServerDefinitions, d =>
+			[...d].some(s => s.name === 'inline-server'));
+		assert.deepStrictEqual(
+			plugins[0].mcpServerDefinitions.get().map(d => d.name),
+			['inline-server'],
+		);
+	}));
+
+	test('PLUGIN_ROOT expansion in hook commands', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/root-expansion');
+		await writeFile('/plugins/root-expansion/.plugin/plugin.json', JSON.stringify({
+			name: 'root-expansion',
+			hooks: {
+				hooks: {
+					PostToolUse: [{
+						hooks: [{
+							type: 'command',
+							command: '${PLUGIN_ROOT}/scripts/format.sh',
+						}],
+					}],
+				},
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].hooks, h => h.length > 0);
+
+		const hookCommands = plugins[0].hooks.get()[0].hooks;
+		assert.ok(hookCommands.length > 0);
+		// ${PLUGIN_ROOT} should be expanded to the plugin's fsPath
+		const command = hookCommands[0].command;
+		assert.ok(command && !command.includes('${PLUGIN_ROOT}'), `Expected PLUGIN_ROOT to be expanded, got: ${command}`);
+	}));
+
+	test('manifest commands field pointing to a specific file', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/cmd-file');
+		await writeFile('/plugins/cmd-file/.plugin/plugin.json', JSON.stringify({
+			name: 'cmd-file',
+			commands: './special/deploy.md',
+		}));
+		await writeFile('/plugins/cmd-file/commands/default.md', '# Default');
+		await writeFile('/plugins/cmd-file/special/deploy.md', '# Deploy');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].commands, c => c.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].commands.get().map(c => c.name).sort(),
+			['default', 'deploy'],
+		);
+	}));
+
+	test('manifest commands field with array of specific files', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/cmd-files');
+		await writeFile('/plugins/cmd-files/.plugin/plugin.json', JSON.stringify({
+			name: 'cmd-files',
+			commands: ['./extras/alpha.md', './extras/beta.md'],
+		}));
+		await writeFile('/plugins/cmd-files/extras/alpha.md', '# Alpha');
+		await writeFile('/plugins/cmd-files/extras/beta.md', '# Beta');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].commands, c => c.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].commands.get().map(c => c.name).sort(),
+			['alpha', 'beta'],
+		);
+	}));
+
+	test('manifest agents field pointing to a specific file', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/agent-file');
+		await writeFile('/plugins/agent-file/.plugin/plugin.json', JSON.stringify({
+			name: 'agent-file',
+			agents: './custom/specialist.md',
+		}));
+		await writeFile('/plugins/agent-file/agents/default.md', '# Default');
+		await writeFile('/plugins/agent-file/custom/specialist.md', '# Specialist');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].agents, a => a.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].agents.get().map(a => a.name).sort(),
+			['default', 'specialist'],
+		);
+	}));
+
+	test('manifest skills field pointing to a specific skill directory', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/skill-dir');
+		await writeFile('/plugins/skill-dir/.plugin/plugin.json', JSON.stringify({
+			name: 'skill-dir',
+			skills: './custom/my-skill',
+		}));
+		await writeFile('/plugins/skill-dir/custom/my-skill/SKILL.md', '# My Skill');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].skills, s => s.length > 0);
+		assert.deepStrictEqual(
+			plugins[0].skills.get().map(s => s.name),
+			['my-skill'],
+		);
+	}));
+
+	test('manifest hooks field pointing to a specific file', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/hook-file');
+		await writeFile('/plugins/hook-file/.plugin/plugin.json', JSON.stringify({
+			name: 'hook-file',
+			hooks: './config/custom-hooks.json',
+		}));
+		await writeFile('/plugins/hook-file/config/custom-hooks.json', JSON.stringify({
+			hooks: {
+				SessionStart: [{ hooks: [{ type: 'command', command: 'echo hi' }] }],
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].hooks, h => h.length > 0);
+		assert.strictEqual(plugins[0].hooks.get().length, 1);
+	}));
+
+	test('manifest mcpServers field pointing to a specific file', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/mcp-file');
+		await writeFile('/plugins/mcp-file/.plugin/plugin.json', JSON.stringify({
+			name: 'mcp-file',
+			mcpServers: './config/servers.json',
+		}));
+		await writeFile('/plugins/mcp-file/config/servers.json', JSON.stringify({
+			mcpServers: {
+				'custom-server': { command: 'node', args: ['serve.js'] },
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+		await waitForState(plugins[0].mcpServerDefinitions, d => d.length > 0);
+		assert.strictEqual(plugins[0].mcpServerDefinitions.get()[0].name, 'custom-server');
+	}));
+
+	test('reads rules from rules/ directory with .mdc extension', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/rules-plugin');
+		await writeFile('/plugins/rules-plugin/.plugin/plugin.json', JSON.stringify({ name: 'rules-plugin' }));
+		await writeFile('/plugins/rules-plugin/rules/prefer-const.mdc', '---\ndescription: Prefer const\n---\nUse const.');
+		await writeFile('/plugins/rules-plugin/rules/error-handling.mdc', '---\ndescription: Error handling\n---\nAlways handle errors.');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].instructions, i => i.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].instructions.get().map(i => i.name).sort(),
+			['error-handling', 'prefer-const'],
+		);
+	}));
+
+	test('reads rules with .md and .instructions.md extensions', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/rules-mixed');
+		await writeFile('/plugins/rules-mixed/.plugin/plugin.json', JSON.stringify({ name: 'rules-mixed' }));
+		await writeFile('/plugins/rules-mixed/rules/rule-a.mdc', 'Rule A');
+		await writeFile('/plugins/rules-mixed/rules/rule-b.md', 'Rule B');
+		await writeFile('/plugins/rules-mixed/rules/rule-c.instructions.md', 'Rule C');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].instructions, i => i.length >= 3);
+		assert.deepStrictEqual(
+			plugins[0].instructions.get().map(i => i.name).sort(),
+			['rule-a', 'rule-b', 'rule-c'],
+		);
+	}));
+
+	test('manifest rules field adds supplemental rule directories', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/custom-rules');
+		await writeFile('/plugins/custom-rules/.plugin/plugin.json', JSON.stringify({
+			name: 'custom-rules',
+			rules: './extra-rules/',
+		}));
+		await writeFile('/plugins/custom-rules/rules/default-rule.mdc', 'Default rule');
+		await writeFile('/plugins/custom-rules/extra-rules/bonus-rule.mdc', 'Bonus rule');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].instructions, i => i.length >= 2);
+		assert.deepStrictEqual(
+			plugins[0].instructions.get().map(i => i.name).sort(),
+			['bonus-rule', 'default-rule'],
+		);
+	}));
+
+	test('manifest rules field with exclusive mode skips default directory', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/exclusive-rules');
+		await writeFile('/plugins/exclusive-rules/.plugin/plugin.json', JSON.stringify({
+			name: 'exclusive-rules',
+			rules: { paths: ['./only-here/'], exclusive: true },
+		}));
+		await writeFile('/plugins/exclusive-rules/rules/ignored.mdc', 'Should be ignored');
+		await writeFile('/plugins/exclusive-rules/only-here/visible.mdc', 'Should be visible');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].instructions, i => i.length === 1 && i[0].name === 'visible');
+		assert.deepStrictEqual(
+			plugins[0].instructions.get().map(i => i.name),
+			['visible'],
+		);
+	}));
+
+	test('rule name strips longest matching suffix first', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/suffix-rules');
+		await writeFile('/plugins/suffix-rules/.plugin/plugin.json', JSON.stringify({ name: 'suffix-rules' }));
+		await writeFile('/plugins/suffix-rules/rules/coding-standards.instructions.md', 'Standards');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].instructions, i => i.length > 0);
+		// Should strip '.instructions.md' (longest match), not just '.md'
+		assert.strictEqual(plugins[0].instructions.get()[0].name, 'coding-standards');
+	}));
+
+	test('deduplicates rules with the same base name', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/dup-rules');
+		await writeFile('/plugins/dup-rules/.plugin/plugin.json', JSON.stringify({
+			name: 'dup-rules',
+			rules: './extra/',
+		}));
+		// Default directory has 'my-rule.mdc', supplemental has 'my-rule.md' — first wins
+		await writeFile('/plugins/dup-rules/rules/my-rule.mdc', 'From default');
+		await writeFile('/plugins/dup-rules/extra/my-rule.md', 'From extra');
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].instructions, i => i.length > 0);
+		assert.strictEqual(plugins[0].instructions.get().length, 1);
+		const instruction = plugins[0].instructions.get()[0];
+		assert.strictEqual(instruction.name, 'my-rule');
+		assert.ok(instruction.uri.path.endsWith('/rules/my-rule.mdc'));
+	}));
+
+	test('PLUGIN_ROOT expansion in inline MCP server definitions', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/mcp-root');
+		await writeFile('/plugins/mcp-root/.plugin/plugin.json', JSON.stringify({
+			name: 'mcp-root',
+			mcpServers: {
+				'my-server': {
+					command: '${PLUGIN_ROOT}/bin/server',
+					args: ['--config', '${PLUGIN_ROOT}/config.json'],
+					cwd: '${PLUGIN_ROOT}',
+					env: { 'CONFIG_DIR': '${PLUGIN_ROOT}/etc' },
+				},
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].mcpServerDefinitions, d => d.length > 0);
+		const server = plugins[0].mcpServerDefinitions.get()[0];
+		assert.strictEqual(server.name, 'my-server');
+		const config: any = server.configuration;
+		assert.ok(!config.command.includes('${PLUGIN_ROOT}'), `Expected PLUGIN_ROOT to be expanded in command, got: ${config.command}`);
+		assert.ok(!config.args[1].includes('${PLUGIN_ROOT}'), `Expected PLUGIN_ROOT to be expanded in args, got: ${config.args[1]}`);
+		assert.ok(!config.cwd.includes('${PLUGIN_ROOT}'), `Expected PLUGIN_ROOT to be expanded in cwd, got: ${config.cwd}`);
+		assert.ok(!config.env['CONFIG_DIR'].includes('${PLUGIN_ROOT}'), `Expected PLUGIN_ROOT to be expanded in env, got: ${config.env['CONFIG_DIR']}`);
+		assert.strictEqual(config.env['PLUGIN_ROOT'], uri.fsPath, 'Expected PLUGIN_ROOT env var to be set');
+	}));
+
+	test('CLAUDE_PLUGIN_ROOT expansion in MCP server definitions from .mcp.json', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = pluginUri('/plugins/claude-mcp-root');
+		await writeFile('/plugins/claude-mcp-root/.claude-plugin/plugin.json', JSON.stringify({ name: 'claude-mcp-root' }));
+		await writeFile('/plugins/claude-mcp-root/.mcp.json', JSON.stringify({
+			mcpServers: {
+				'claude-server': {
+					command: '${CLAUDE_PLUGIN_ROOT}/run.sh',
+					args: ['--dir', '${CLAUDE_PLUGIN_ROOT}/data'],
+				},
+			},
+		}));
+
+		const discovery = createDiscovery();
+		discovery.start(mockEnablementModel);
+		await discovery.setSourcesAndRefresh([uri]);
+
+		const plugins = discovery.plugins.get();
+		assert.strictEqual(plugins.length, 1);
+
+		await waitForState(plugins[0].mcpServerDefinitions, d => d.length > 0);
+		const server = plugins[0].mcpServerDefinitions.get()[0];
+		const config: any = server.configuration;
+		assert.ok(!config.command.includes('${CLAUDE_PLUGIN_ROOT}'), `Expected CLAUDE_PLUGIN_ROOT to be expanded in command, got: ${config.command}`);
+		assert.ok(!config.args[1].includes('${CLAUDE_PLUGIN_ROOT}'), `Expected CLAUDE_PLUGIN_ROOT to be expanded in args, got: ${config.args[1]}`);
+		assert.strictEqual(config.env['CLAUDE_PLUGIN_ROOT'], uri.fsPath, 'Expected CLAUDE_PLUGIN_ROOT env var to be set');
+	}));
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/plugins/convertBareEnvVarsToVsCodeSyntax.test.ts b/src/vs/workbench/contrib/chat/test/common/plugins/convertBareEnvVarsToVsCodeSyntax.test.ts
new file mode 100644
index 00000000000..896e7b70b93
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/plugins/convertBareEnvVarsToVsCodeSyntax.test.ts
@@ -0,0 +1,264 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IMcpRemoteServerConfiguration, IMcpStdioServerConfiguration, McpServerType } from '../../../../../../platform/mcp/common/mcpPlatformTypes.js';
+import { convertBareEnvVarsToVsCodeSyntax } from '../../../common/plugins/agentPluginServiceImpl.js';
+
+suite('convertBareEnvVarsToVsCodeSyntax', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	/** Helper to narrow the result configuration to a stdio server. */
+	function asStdio(result: ReturnType<typeof convertBareEnvVarsToVsCodeSyntax>): IMcpStdioServerConfiguration {
+		assert.strictEqual(result.configuration.type, McpServerType.LOCAL);
+		return result.configuration as IMcpStdioServerConfiguration;
+	}
+
+	/** Helper to narrow the result configuration to a remote server. */
+	function asRemote(result: ReturnType<typeof convertBareEnvVarsToVsCodeSyntax>): IMcpRemoteServerConfiguration {
+		assert.strictEqual(result.configuration.type, McpServerType.REMOTE);
+		return result.configuration as IMcpRemoteServerConfiguration;
+	}
+
+	suite('stdio (LOCAL) servers', () => {
+
+		test('converts bare ${VAR} in command to ${env:VAR}', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${MY_TOOL_PATH}/bin/server',
+				},
+			}));
+			assert.strictEqual(cfg.command, '${env:MY_TOOL_PATH}/bin/server');
+		});
+
+		test('converts bare ${VAR} in args', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: 'node',
+					args: ['--token', '${ENTERPRISE_GITHUB_TOKEN}'],
+				},
+			}));
+			assert.deepStrictEqual(cfg.args, ['--token', '${env:ENTERPRISE_GITHUB_TOKEN}']);
+		});
+
+		test('converts bare ${VAR} in env values', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: 'server',
+					env: {
+						TOKEN: '${ENTERPRISE_GITHUB_TOKEN}',
+						STATIC: 'literal-value',
+					},
+				},
+			}));
+			assert.strictEqual(cfg.env!.TOKEN, '${env:ENTERPRISE_GITHUB_TOKEN}');
+			assert.strictEqual(cfg.env!.STATIC, 'literal-value');
+		});
+
+		test('converts bare ${VAR} in cwd', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: 'server',
+					cwd: '${PROJECT_DIR}/subdir',
+				},
+			}));
+			assert.strictEqual(cfg.cwd, '${env:PROJECT_DIR}/subdir');
+		});
+
+		test('converts bare ${VAR} in envFile', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: 'server',
+					envFile: '${HOME}/.env',
+				},
+			}));
+			assert.strictEqual(cfg.envFile, '${env:HOME}/.env');
+		});
+
+		test('does not convert already-namespaced ${env:VAR} references', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${env:ALREADY_RESOLVED}/bin/server',
+				},
+			}));
+			assert.strictEqual(cfg.command, '${env:ALREADY_RESOLVED}/bin/server');
+		});
+
+		test('does not convert ${config:...} references', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${config:editor.fontSize}',
+				},
+			}));
+			assert.strictEqual(cfg.command, '${config:editor.fontSize}');
+		});
+
+		test('does not convert lowercase/camelCase VS Code variable tokens', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${workspaceFolder}/server',
+					cwd: '${fileDirname}',
+				},
+			}));
+			assert.strictEqual(cfg.command, '${workspaceFolder}/server');
+			assert.strictEqual(cfg.cwd, '${fileDirname}');
+		});
+
+		test('converts multiple bare ${VAR} references in a single string', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${BIN_DIR}/run --config ${CONFIG_DIR}/cfg.json',
+				},
+			}));
+			assert.strictEqual(cfg.command, '${env:BIN_DIR}/run --config ${env:CONFIG_DIR}/cfg.json');
+		});
+
+		test('leaves strings without any ${VAR} unchanged', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '/usr/bin/server',
+					args: ['--port', '8080'],
+					env: { KEY: 'plain-value' },
+				},
+			}));
+			assert.strictEqual(cfg.command, '/usr/bin/server');
+			assert.deepStrictEqual(cfg.args, ['--port', '8080']);
+			assert.strictEqual(cfg.env!.KEY, 'plain-value');
+		});
+
+		test('preserves non-string env values (numbers and null)', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: 'server',
+					env: {
+						PORT: 3000,
+						UNSET: null,
+						TOKEN: '${MY_TOKEN}',
+					},
+				},
+			}));
+			assert.strictEqual(cfg.env!.PORT, 3000);
+			assert.strictEqual(cfg.env!.UNSET, null);
+			assert.strictEqual(cfg.env!.TOKEN, '${env:MY_TOKEN}');
+		});
+
+		test('converts underscore-prefixed variable names', () => {
+			const cfg = asStdio(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${_PRIVATE_BIN}/server',
+				},
+			}));
+			assert.strictEqual(cfg.command, '${env:_PRIVATE_BIN}/server');
+		});
+
+		test('preserves the definition name unchanged', () => {
+			const result = convertBareEnvVarsToVsCodeSyntax({
+				name: 'my-mcp-server',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${MY_PATH}/server',
+				},
+			});
+			assert.strictEqual(result.name, 'my-mcp-server');
+		});
+
+		test('preserves uri as a URI instance', () => {
+			const input = URI.parse('file:///plugins/my-plugin');
+			const result = convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: input,
+				configuration: {
+					type: McpServerType.LOCAL,
+					command: '${MY_PATH}/server',
+				},
+			});
+			assert.ok(URI.isUri(result.uri), 'uri must remain a URI instance');
+			assert.strictEqual(result.uri.toString(), input.toString());
+		});
+	});
+
+	suite('remote (HTTP) servers', () => {
+
+		test('converts bare ${VAR} in url', () => {
+			const cfg = asRemote(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.REMOTE,
+					url: 'https://${API_HOST}/mcp',
+				},
+			}));
+			assert.strictEqual(cfg.url, 'https://${env:API_HOST}/mcp');
+		});
+
+		test('converts bare ${VAR} in header values', () => {
+			const cfg = asRemote(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.REMOTE,
+					url: 'https://example.com/mcp',
+					headers: {
+						Authorization: 'Bearer ${API_TOKEN}',
+						'X-Custom': 'static-value',
+					},
+				},
+			}));
+			assert.strictEqual(cfg.headers!.Authorization, 'Bearer ${env:API_TOKEN}');
+			assert.strictEqual(cfg.headers!['X-Custom'], 'static-value');
+		});
+
+		test('does not convert already-namespaced ${env:VAR} in url', () => {
+			const cfg = asRemote(convertBareEnvVarsToVsCodeSyntax({
+				name: 'test',
+				uri: URI.parse('file:///test'),
+				configuration: {
+					type: McpServerType.REMOTE,
+					url: 'https://${env:API_HOST}/mcp',
+				},
+			}));
+			assert.strictEqual(cfg.url, 'https://${env:API_HOST}/mcp');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/plugins/pluginMarketplaceService.test.ts b/src/vs/workbench/contrib/chat/test/common/plugins/pluginMarketplaceService.test.ts
index 879e3a33850..d66d3e7d785 100644
--- a/src/vs/workbench/contrib/chat/test/common/plugins/pluginMarketplaceService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/plugins/pluginMarketplaceService.test.ts
@@ -4,7 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
+import { Event } from '../../../../../../base/common/event.js';
+import { observableValue } from '../../../../../../base/common/observable.js';
 import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
@@ -12,10 +15,11 @@ import { TestInstantiationService } from '../../../../../../platform/instantiati
 import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
 import { IRequestService } from '../../../../../../platform/request/common/request.js';
 import { IStorageService, InMemoryStorageService } from '../../../../../../platform/storage/common/storage.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { IAgentPluginRepositoryService } from '../../../common/plugins/agentPluginRepositoryService.js';
+import { IWorkspaceTrustManagementService } from '../../../../../../platform/workspace/common/workspaceTrust.js';
 import { ChatConfiguration } from '../../../common/constants.js';
+import { IAgentPluginRepositoryService } from '../../../common/plugins/agentPluginRepositoryService.js';
 import { MarketplaceReferenceKind, MarketplaceType, PluginMarketplaceService, PluginSourceKind, getPluginSourceLabel, parseMarketplaceReference, parseMarketplaceReferences, parsePluginSource } from '../../../common/plugins/pluginMarketplaceService.js';
+import { IWorkspacePluginSettingsService } from '../../../common/plugins/workspacePluginSettingsService.js';
 
 suite('PluginMarketplaceService', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -31,6 +35,7 @@ suite('PluginMarketplaceService', () => {
 		assert.strictEqual(parsed.canonicalId, 'github:microsoft/vscode');
 		assert.strictEqual(parsed.displayLabel, 'microsoft/vscode');
 		assert.deepStrictEqual(parsed.cacheSegments, ['github.com', 'microsoft', 'vscode']);
+		assert.strictEqual(parsed.githubRepo, 'microsoft/vscode');
 	});
 
 	test('parses direct HTTPS and SSH marketplaces ending in .git', () => {
@@ -62,6 +67,33 @@ suite('PluginMarketplaceService', () => {
 		assert.strictEqual(parsed.cloneUrl, 'git@example.com:org/repo.git');
 		assert.strictEqual(parsed.canonicalId, 'git:example.com/org/repo.git');
 		assert.deepStrictEqual(parsed.cacheSegments, ['example.com', 'org', 'repo']);
+		assert.strictEqual(parsed.githubRepo, undefined);
+	});
+
+	test('populates githubRepo for GitHub HTTPS URLs', () => {
+		const withGit = parseMarketplaceReference('https://github.com/owner/repo.git');
+		assert.ok(withGit);
+		assert.strictEqual(withGit?.githubRepo, 'owner/repo');
+
+		const withoutGit = parseMarketplaceReference('https://github.com/owner/repo');
+		assert.ok(withoutGit);
+		assert.strictEqual(withoutGit?.githubRepo, 'owner/repo');
+	});
+
+	test('populates githubRepo for GitHub SCP-style URLs', () => {
+		const parsed = parseMarketplaceReference('git@github.com:owner/repo.git');
+		assert.ok(parsed);
+		assert.strictEqual(parsed?.githubRepo, 'owner/repo');
+	});
+
+	test('does not populate githubRepo for non-GitHub URLs', () => {
+		const https = parseMarketplaceReference('https://example.com/org/repo.git');
+		assert.ok(https);
+		assert.strictEqual(https?.githubRepo, undefined);
+
+		const scp = parseMarketplaceReference('git@gitlab.com:org/repo.git');
+		assert.ok(scp);
+		assert.strictEqual(scp?.githubRepo, undefined);
 	});
 
 	test('parses local file marketplace references', () => {
@@ -159,6 +191,14 @@ suite('PluginMarketplaceService - getMarketplacePluginMetadata', () => {
 		instantiationService.stub(ILogService, new NullLogService());
 		instantiationService.stub(IRequestService, {} as unknown as IRequestService);
 		instantiationService.stub(IStorageService, store.add(new InMemoryStorageService()));
+		instantiationService.stub(IWorkspacePluginSettingsService, {
+			extraMarketplaces: observableValue('test.extraMarketplaces', []),
+			enabledPlugins: observableValue('test.enabledPlugins', new Map()),
+		} as Partial<IWorkspacePluginSettingsService> as IWorkspacePluginSettingsService);
+		instantiationService.stub(IWorkspaceTrustManagementService, {
+			isWorkspaceTrusted: () => true,
+			onDidChangeTrust: Event.None,
+		} as Partial<IWorkspaceTrustManagementService> as IWorkspaceTrustManagementService);
 
 		return store.add(instantiationService.createInstance(PluginMarketplaceService));
 	}
@@ -231,12 +271,17 @@ suite('parsePluginSource', () => {
 
 	test('parses github object source', () => {
 		const result = parsePluginSource({ source: 'github', repo: 'owner/repo' }, undefined, logContext);
-		assert.deepStrictEqual(result, { kind: PluginSourceKind.GitHub, repo: 'owner/repo', ref: undefined, sha: undefined });
+		assert.deepStrictEqual(result, { kind: PluginSourceKind.GitHub, repo: 'owner/repo', ref: undefined, sha: undefined, path: undefined });
 	});
 
 	test('parses github object source with ref and sha', () => {
 		const result = parsePluginSource({ source: 'github', repo: 'owner/repo', ref: 'v2.0.0', sha: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0' }, undefined, logContext);
-		assert.deepStrictEqual(result, { kind: PluginSourceKind.GitHub, repo: 'owner/repo', ref: 'v2.0.0', sha: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0' });
+		assert.deepStrictEqual(result, { kind: PluginSourceKind.GitHub, repo: 'owner/repo', ref: 'v2.0.0', sha: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0', path: undefined });
+	});
+
+	test('parses github object source with path', () => {
+		const result = parsePluginSource({ source: 'github', repo: 'owner/repo', path: 'plugins/my-plugin' }, undefined, logContext);
+		assert.deepStrictEqual(result, { kind: PluginSourceKind.GitHub, repo: 'owner/repo', ref: undefined, sha: undefined, path: 'plugins/my-plugin' });
 	});
 
 	test('returns undefined for github source missing repo', () => {
@@ -251,6 +296,10 @@ suite('parsePluginSource', () => {
 		assert.strictEqual(parsePluginSource({ source: 'github', repo: 'owner/repo', sha: 'abc123' }, undefined, logContext), undefined);
 	});
 
+	test('returns undefined for github source with non-string path', () => {
+		assert.strictEqual(parsePluginSource({ source: 'github', repo: 'owner/repo', path: 42 } as never, undefined, logContext), undefined);
+	});
+
 	test('parses url object source', () => {
 		const result = parsePluginSource({ source: 'url', url: 'https://gitlab.com/team/plugin.git' }, undefined, logContext);
 		assert.deepStrictEqual(result, { kind: PluginSourceKind.GitUrl, url: 'https://gitlab.com/team/plugin.git', ref: undefined, sha: undefined });
@@ -324,6 +373,10 @@ suite('getPluginSourceLabel', () => {
 		assert.strictEqual(getPluginSourceLabel({ kind: PluginSourceKind.GitHub, repo: 'owner/repo' }), 'owner/repo');
 	});
 
+	test('formats github source with path', () => {
+		assert.strictEqual(getPluginSourceLabel({ kind: PluginSourceKind.GitHub, repo: 'owner/repo', path: 'plugins/foo' }), 'owner/repo/plugins/foo');
+	});
+
 	test('formats url source', () => {
 		assert.strictEqual(getPluginSourceLabel({ kind: PluginSourceKind.GitUrl, url: 'https://example.com/repo.git' }), 'https://example.com/repo.git');
 	});
diff --git a/src/vs/workbench/contrib/chat/test/common/plugins/resolveMcpServersMap.test.ts b/src/vs/workbench/contrib/chat/test/common/plugins/resolveMcpServersMap.test.ts
new file mode 100644
index 00000000000..d6174d1a5fc
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/plugins/resolveMcpServersMap.test.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { resolveMcpServersMap } from '../../../common/plugins/agentPluginServiceImpl.js';
+
+suite('resolveMcpServersMap', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('returns undefined for null', () => {
+		assert.strictEqual(resolveMcpServersMap(null), undefined);
+	});
+
+	test('returns undefined for undefined', () => {
+		assert.strictEqual(resolveMcpServersMap(undefined), undefined);
+	});
+
+	test('returns undefined for non-object primitives', () => {
+		assert.strictEqual(resolveMcpServersMap('string'), undefined);
+		assert.strictEqual(resolveMcpServersMap(42), undefined);
+		assert.strictEqual(resolveMcpServersMap(true), undefined);
+	});
+
+	test('unwraps mcpServers property when present', () => {
+		const servers = { myServer: { command: 'node' } };
+		const result = resolveMcpServersMap({ mcpServers: servers });
+		assert.deepStrictEqual(result, servers);
+	});
+
+	test('returns the object directly when mcpServers is absent', () => {
+		const servers = { myServer: { command: 'node' }, otherServer: { url: 'http://localhost' } };
+		const result = resolveMcpServersMap(servers);
+		assert.deepStrictEqual(result, servers);
+	});
+
+	test('returns empty object for empty wrapped format', () => {
+		assert.deepStrictEqual(resolveMcpServersMap({ mcpServers: {} }), {});
+	});
+
+	test('returns empty object for empty flat format', () => {
+		assert.deepStrictEqual(resolveMcpServersMap({}), {});
+	});
+
+	test('prefers mcpServers property over other top-level keys', () => {
+		const inner = { realServer: { command: 'python' } };
+		const result = resolveMcpServersMap({ mcpServers: inner, someOtherKey: 'ignored' });
+		assert.deepStrictEqual(result, inner);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/plugins/shellQuotePluginRootInCommand.test.ts b/src/vs/workbench/contrib/chat/test/common/plugins/shellQuotePluginRootInCommand.test.ts
index 973c7f28de2..de66a7f4b5c 100644
--- a/src/vs/workbench/contrib/chat/test/common/plugins/shellQuotePluginRootInCommand.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/plugins/shellQuotePluginRootInCommand.test.ts
@@ -98,14 +98,14 @@ suite('shellQuotePluginRootInCommand', () => {
 
 	test('uses default CLAUDE_PLUGIN_ROOT token when not specified', () => {
 		assert.strictEqual(
-			shellQuotePluginRootInCommand('${CLAUDE_PLUGIN_ROOT}/run.sh', '/safe/path'),
+			shellQuotePluginRootInCommand('${CLAUDE_PLUGIN_ROOT}/run.sh', '/safe/path', '${CLAUDE_PLUGIN_ROOT}'),
 			'/safe/path/run.sh',
 		);
 	});
 
 	test('uses default CLAUDE_PLUGIN_ROOT token with quoting', () => {
 		assert.strictEqual(
-			shellQuotePluginRootInCommand('${CLAUDE_PLUGIN_ROOT}/run.sh', '/my dir'),
+			shellQuotePluginRootInCommand('${CLAUDE_PLUGIN_ROOT}/run.sh', '/my dir', '${CLAUDE_PLUGIN_ROOT}'),
 			'"/my dir/run.sh"',
 		);
 	});
diff --git a/src/vs/workbench/contrib/chat/test/common/plugins/workspacePluginSettingsService.test.ts b/src/vs/workbench/contrib/chat/test/common/plugins/workspacePluginSettingsService.test.ts
new file mode 100644
index 00000000000..0a1434d439d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/plugins/workspacePluginSettingsService.test.ts
@@ -0,0 +1,246 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { waitForState } from '../../../../../../base/common/observable.js';
+import { FileService } from '../../../../../../platform/files/common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { TestContextService } from '../../../../../test/common/workbenchTestServices.js';
+import { testWorkspace } from '../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { WorkspacePluginSettingsService } from '../../../common/plugins/workspacePluginSettingsService.js';
+
+suite('WorkspacePluginSettingsService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	const logService = new NullLogService();
+
+	let fileService: FileService;
+	let workspaceContextService: TestContextService;
+	const workspaceRoot = URI.from({ scheme: Schemas.inMemory, path: '/workspace' });
+
+	setup(() => {
+		workspaceContextService = new TestContextService(testWorkspace(workspaceRoot));
+		fileService = store.add(new FileService(logService));
+		store.add(fileService.registerProvider(Schemas.inMemory, store.add(new InMemoryFileSystemProvider())));
+	});
+
+	function createService(): WorkspacePluginSettingsService {
+		return store.add(new WorkspacePluginSettingsService(
+			fileService,
+			workspaceContextService,
+			logService,
+		));
+	}
+
+	async function writeClaudeSettings(content: string): Promise<void> {
+		const uri = URI.from({ scheme: Schemas.inMemory, path: '/workspace/.claude/settings.json' });
+		await fileService.writeFile(uri, VSBuffer.fromString(content));
+	}
+
+	async function writeClaudeLocalSettings(content: string): Promise<void> {
+		const uri = URI.from({ scheme: Schemas.inMemory, path: '/workspace/.claude/settings.local.json' });
+		await fileService.writeFile(uri, VSBuffer.fromString(content));
+	}
+
+	async function writeCopilotSettings(content: string): Promise<void> {
+		const uri = URI.from({ scheme: Schemas.inMemory, path: '/workspace/.github/copilot/settings.json' });
+		await fileService.writeFile(uri, VSBuffer.fromString(content));
+	}
+
+	// --- enabledPlugins parsing ---
+
+	test('parses enabledPlugins from Claude settings', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			enabledPlugins: {
+				'my-plugin@my-marketplace': true,
+				'disabled-plugin@my-marketplace': false,
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.enabledPlugins, v => v.size > 0);
+
+		const enabled = service.enabledPlugins.get();
+		assert.strictEqual(enabled.get('my-plugin@my-marketplace'), true);
+		assert.strictEqual(enabled.get('disabled-plugin@my-marketplace'), false);
+		assert.strictEqual(enabled.size, 2);
+	}));
+
+	test('settings.local.json overrides settings.json for enabledPlugins', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			enabledPlugins: {
+				'my-plugin@mp': true,
+				'other-plugin@mp': true,
+			}
+		}));
+		await writeClaudeLocalSettings(JSON.stringify({
+			enabledPlugins: {
+				'my-plugin@mp': false,
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.enabledPlugins, v => v.size > 0);
+
+		const enabled = service.enabledPlugins.get();
+		assert.strictEqual(enabled.get('my-plugin@mp'), false, 'local should override shared');
+		assert.strictEqual(enabled.get('other-plugin@mp'), true, 'non-overridden key preserved');
+	}));
+
+	test('merges enabledPlugins from Claude and Copilot settings', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			enabledPlugins: { 'from-claude@mp': true }
+		}));
+		await writeCopilotSettings(JSON.stringify({
+			enabledPlugins: { 'from-copilot@mp': true }
+		}));
+
+		const service = createService();
+		await waitForState(service.enabledPlugins, v => v.size >= 2);
+
+		const enabled = service.enabledPlugins.get();
+		assert.strictEqual(enabled.get('from-claude@mp'), true);
+		assert.strictEqual(enabled.get('from-copilot@mp'), true);
+	}));
+
+	test('Claude enabledPlugins take precedence over Copilot for same key', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			enabledPlugins: { 'shared-plugin@mp': false }
+		}));
+		await writeCopilotSettings(JSON.stringify({
+			enabledPlugins: { 'shared-plugin@mp': true }
+		}));
+
+		const service = createService();
+		await waitForState(service.enabledPlugins, v => v.size > 0);
+
+		const enabled = service.enabledPlugins.get();
+		assert.strictEqual(enabled.get('shared-plugin@mp'), false, 'Claude should win');
+	}));
+
+	// --- extraKnownMarketplaces parsing ---
+
+	test('parses GitHub shorthand from extraKnownMarketplaces', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			extraKnownMarketplaces: {
+				'my-marketplace': {
+					source: 'github',
+					repo: 'owner/repo',
+				}
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.extraMarketplaces, v => v.length > 0);
+
+		const marketplaces = service.extraMarketplaces.get();
+		assert.strictEqual(marketplaces.length, 1);
+		assert.strictEqual(marketplaces[0].name, 'my-marketplace');
+		assert.strictEqual(marketplaces[0].reference.displayLabel, 'my-marketplace');
+		assert.strictEqual(marketplaces[0].reference.githubRepo, 'owner/repo');
+	}));
+
+	test('parses nested source object from extraKnownMarketplaces', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			extraKnownMarketplaces: {
+				'nested-mp': {
+					source: {
+						source: 'github',
+						repo: 'nested-owner/nested-repo',
+					}
+				}
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.extraMarketplaces, v => v.length > 0);
+
+		const marketplaces = service.extraMarketplaces.get();
+		assert.strictEqual(marketplaces.length, 1);
+		assert.strictEqual(marketplaces[0].reference.githubRepo, 'nested-owner/nested-repo');
+		assert.strictEqual(marketplaces[0].reference.displayLabel, 'nested-mp');
+	}));
+
+	test('deduplicates marketplaces across Claude and Copilot by canonical ID', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			extraKnownMarketplaces: {
+				'claude-name': { source: 'github', repo: 'owner/repo' }
+			}
+		}));
+		await writeCopilotSettings(JSON.stringify({
+			extraKnownMarketplaces: {
+				'copilot-name': { source: 'github', repo: 'owner/repo' }
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.extraMarketplaces, v => v.length > 0);
+
+		const marketplaces = service.extraMarketplaces.get();
+		assert.strictEqual(marketplaces.length, 1, 'should deduplicate by canonical ID');
+		assert.strictEqual(marketplaces[0].name, 'claude-name', 'Claude entry should win');
+	}));
+
+	// --- Invalid input handling ---
+
+	test('ignores invalid enabledPlugins shapes', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			enabledPlugins: 'not-an-object'
+		}));
+
+		const service = createService();
+		// Give the async read a chance to complete with faked timers.
+		await new Promise<void>(r => queueMicrotask(r));
+
+		assert.strictEqual(service.enabledPlugins.get().size, 0);
+	}));
+
+	test('ignores non-boolean values in enabledPlugins', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			enabledPlugins: {
+				'valid@mp': true,
+				'number@mp': 42,
+				'string@mp': 'yes',
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.enabledPlugins, v => v.size > 0);
+
+		const enabled = service.enabledPlugins.get();
+		assert.strictEqual(enabled.size, 1);
+		assert.strictEqual(enabled.get('valid@mp'), true);
+	}));
+
+	test('ignores non-object marketplace entries', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		await writeClaudeSettings(JSON.stringify({
+			extraKnownMarketplaces: {
+				'valid': { source: 'github', repo: 'owner/repo' },
+				'invalid-string': 'not-valid',
+				'invalid-number': 42,
+			}
+		}));
+
+		const service = createService();
+		await waitForState(service.extraMarketplaces, v => v.length > 0);
+
+		const marketplaces = service.extraMarketplaces.get();
+		assert.strictEqual(marketplaces.length, 1);
+		assert.strictEqual(marketplaces[0].name, 'valid');
+	}));
+
+	test('returns empty observables when no settings files exist', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const service = createService();
+		await new Promise<void>(r => queueMicrotask(r));
+
+		assert.strictEqual(service.enabledPlugins.get().size, 0);
+		assert.strictEqual(service.extraMarketplaces.get().length, 0);
+	}));
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts
index 899d04339a4..9cf3150e5ae 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts
@@ -60,6 +60,7 @@ suite('ComputeAutomaticInstructions', () => {
 	let fileService: IFileService;
 	let toolsService: ILanguageModelToolsService;
 	let fileSystemProvider: TestInMemoryFileSystemProviderWithRealPath;
+	let workspaceTrustService: TestWorkspaceTrustManagementService;
 
 	setup(async () => {
 		instaService = disposables.add(new TestInstantiationService());
@@ -76,6 +77,7 @@ suite('ComputeAutomaticInstructions', () => {
 		testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
 		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
 		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, false);
 		testConfigService.setUserConfiguration(PromptsConfig.INSTRUCTIONS_LOCATION_KEY, { [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true, [CLAUDE_RULES_SOURCE_FOLDER]: true });
 		testConfigService.setUserConfiguration(PromptsConfig.PROMPT_LOCATIONS_KEY, { [PROMPT_DEFAULT_SOURCE_FOLDER]: true });
 		testConfigService.setUserConfiguration(PromptsConfig.MODE_LOCATION_KEY, { [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true });
@@ -91,6 +93,9 @@ suite('ComputeAutomaticInstructions', () => {
 			activateByEvent: () => Promise.resolve()
 		});
 
+		workspaceTrustService = disposables.add(new TestWorkspaceTrustManagementService());
+		instaService.stub(IWorkspaceTrustManagementService, workspaceTrustService);
+
 		fileService = disposables.add(instaService.createInstance(FileService));
 		instaService.stub(IFileService, fileService);
 
@@ -182,11 +187,9 @@ suite('ComputeAutomaticInstructions', () => {
 
 		instaService.stub(IContextKeyService, new MockContextKeyService());
 
-		instaService.stub(IWorkspaceTrustManagementService, disposables.add(new TestWorkspaceTrustManagementService()));
-
 		instaService.stub(IAgentPluginService, {
 			plugins: observableValue('testPlugins', []),
-			enablementModel: { readEnabled: () => 2 /* EnabledProfile */, setEnabled: () => { } },
+			enablementModel: { readEnabled: () => 2 /* EnabledProfile */, setEnabled: () => { }, remove: () => { } },
 		});
 
 		service = disposables.add(instaService.createInstance(PromptsService));
@@ -1453,6 +1456,86 @@ suite('ComputeAutomaticInstructions', () => {
 			assert.equal(xmlContents(skills[1], 'file')[0], getFilePath(`/home/user/.claude/skills/claude-personal/SKILL.md`));
 			assert.equal(xmlContents(skills[1], 'name')[0], 'claude-personal');
 		});
+
+		test('should include skills with missing name, missing description, or mismatched folder name', async () => {
+			const rootFolderName = 'skills-missing-metadata-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Enable the config for agent skills
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+
+			await mockFiles(fileService, [
+				{
+					// Skill with no name attribute - should use folder name as fallback
+					path: `${rootFolder}/.claude/skills/no-name-skill/SKILL.md`,
+					contents: [
+						'---',
+						'description: \'A skill without a name\'',
+						'---',
+						'Skill content without name',
+					]
+				},
+				{
+					// Skill with no description attribute - should still be included
+					path: `${rootFolder}/.claude/skills/no-desc-skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: \'no-desc-skill\'',
+						'---',
+						'Skill content without description',
+					]
+				},
+				{
+					// Skill where name does not match folder name - should still be included
+					path: `${rootFolder}/.claude/skills/actual-folder/SKILL.md`,
+					contents: [
+						'---',
+						'name: \'mismatched-name\'',
+						'description: \'A skill with mismatched name\'',
+						'---',
+						'Skill content with mismatched name',
+					]
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatModeKind.Agent,
+				{ 'vscode_readFile': true }, // Enable readFile tool
+				undefined,
+				undefined
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			assert.equal(textVariables.length, 1, 'There should be one text variable for skills list');
+
+			const skillsList = xmlContents(textVariables[0].value, 'skills');
+			assert.equal(skillsList.length, 1, 'There should be one skills list');
+
+			const skills = xmlContents(skillsList[0], 'skill');
+			assert.equal(skills.length, 3, 'All three skills should be included despite missing/mismatched metadata');
+
+			// Skill with missing name should use folder name as fallback
+			assert.equal(xmlContents(skills[0], 'name')[0], 'no-name-skill');
+			assert.equal(xmlContents(skills[0], 'description')[0], 'A skill without a name');
+			assert.equal(xmlContents(skills[0], 'file')[0], getFilePath(`${rootFolder}/.claude/skills/no-name-skill/SKILL.md`));
+
+			// Skill with missing description should still be listed
+			assert.equal(xmlContents(skills[1], 'name')[0], 'no-desc-skill');
+			assert.equal(xmlContents(skills[1], 'description').length, 0, 'Should have no description element');
+			assert.equal(xmlContents(skills[1], 'file')[0], getFilePath(`${rootFolder}/.claude/skills/no-desc-skill/SKILL.md`));
+
+			// Skill with mismatched name should use folder name
+			assert.equal(xmlContents(skills[2], 'name')[0], 'actual-folder');
+			assert.equal(xmlContents(skills[2], 'description')[0], 'A skill with mismatched name');
+			assert.equal(xmlContents(skills[2], 'file')[0], getFilePath(`${rootFolder}/.claude/skills/actual-folder/SKILL.md`));
+		});
 	});
 
 	suite('edge cases', () => {
@@ -1628,6 +1711,126 @@ suite('ComputeAutomaticInstructions', () => {
 		assert.ok(!paths.includes(`${rootFolder}/.claude/CLAUDE.md`), 'Should not include .claude/CLAUDE.md when disabled');
 	});
 
+	test('should collect parent folder CLAUDE configurations when includeWorkspaceFolderParents is enabled', async () => {
+		const parentFolderName = 'collect-claude-parent-test';
+		const parentFolder = `/${parentFolderName}`;
+		const rootFolder = `${parentFolder}/repo`;
+		const rootFolderUri = URI.file(rootFolder);
+
+		workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+		await mockFiles(fileService, [
+			{
+				path: `${parentFolder}/.git/HEAD`,
+				contents: ['ref: refs/heads/main'],
+			},
+			{
+				path: `${parentFolder}/CLAUDE.md`,
+				contents: ['Parent Claude guidelines'],
+			},
+			{
+				path: `${parentFolder}/.claude/CLAUDE.md`,
+				contents: ['Parent .claude Claude guidelines'],
+			},
+			{
+				path: `${rootFolder}/src/file.ts`,
+				contents: ['console.log("test");'],
+			},
+		]);
+
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CLAUDE_MD, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, false);
+
+		await workspaceTrustService.setTrustedUris([URI.file(parentFolder)]);
+
+		const disabledParentContextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatModeKind.Agent, undefined, undefined, undefined);
+		const disabledParentVariables = new ChatRequestVariableSet();
+		disabledParentVariables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+		await disabledParentContextComputer.collect(disabledParentVariables, CancellationToken.None);
+
+		let paths = disabledParentVariables.asArray()
+			.filter(v => isPromptFileVariableEntry(v))
+			.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+		assert.ok(!paths.includes(`${parentFolder}/CLAUDE.md`), 'Should not include parent CLAUDE.md when parent search is disabled');
+		assert.ok(!paths.includes(`${parentFolder}/.claude/CLAUDE.md`), 'Should not include parent .claude/CLAUDE.md when parent search is disabled');
+
+		// Parent folder settings should allow finding both root and .claude CLAUDE files above the workspace folder.
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, true);
+
+		const enabledParentContextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatModeKind.Agent, undefined, undefined, undefined);
+		const enabledParentVariables = new ChatRequestVariableSet();
+		enabledParentVariables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+		await enabledParentContextComputer.collect(enabledParentVariables, CancellationToken.None);
+
+		paths = enabledParentVariables.asArray()
+			.filter(v => isPromptFileVariableEntry(v))
+			.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+		assert.ok(paths.includes(`${parentFolder}/CLAUDE.md`), 'Should include parent CLAUDE.md when parent search is enabled');
+		assert.ok(paths.includes(`${parentFolder}/.claude/CLAUDE.md`), 'Should include parent .claude/CLAUDE.md when parent search is enabled');
+	});
+
+	test('should collect parent folder copilot-instructions.md and AGENTS.md when includeWorkspaceFolderParents is enabled', async () => {
+		const parentFolderName = 'collect-agent-parent-test';
+		const parentFolder = `/${parentFolderName}`;
+		const rootFolder = `${parentFolder}/repo`;
+		const rootFolderUri = URI.file(rootFolder);
+
+		workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+		await mockFiles(fileService, [
+			{
+				path: `${parentFolder}/.git/HEAD`,
+				contents: ['ref: refs/heads/main'],
+			},
+			{
+				path: `${parentFolder}/.github/copilot-instructions.md`,
+				contents: ['Parent copilot instructions'],
+			},
+			{
+				path: `${parentFolder}/AGENTS.md`,
+				contents: ['Parent agent guidelines'],
+			},
+			{
+				path: `${rootFolder}/src/file.ts`,
+				contents: ['console.log("test");'],
+			},
+		]);
+
+		testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, false);
+
+		await workspaceTrustService.setTrustedUris([URI.file(parentFolder)]);
+
+		const disabledParentContextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatModeKind.Agent, undefined, undefined, undefined);
+		const disabledParentVariables = new ChatRequestVariableSet();
+		disabledParentVariables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+		await disabledParentContextComputer.collect(disabledParentVariables, CancellationToken.None);
+
+		let paths = disabledParentVariables.asArray()
+			.filter(v => isPromptFileVariableEntry(v))
+			.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+		assert.ok(!paths.includes(`${parentFolder}/.github/copilot-instructions.md`), 'Should not include parent copilot-instructions.md when parent search is disabled');
+		assert.ok(!paths.includes(`${parentFolder}/AGENTS.md`), 'Should not include parent AGENTS.md when parent search is disabled');
+
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, true);
+
+		const enabledParentContextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatModeKind.Agent, undefined, undefined, undefined);
+		const enabledParentVariables = new ChatRequestVariableSet();
+		enabledParentVariables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+		await enabledParentContextComputer.collect(enabledParentVariables, CancellationToken.None);
+
+		paths = enabledParentVariables.asArray()
+			.filter(v => isPromptFileVariableEntry(v))
+			.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+		assert.ok(paths.includes(`${parentFolder}/.github/copilot-instructions.md`), 'Should include parent copilot-instructions.md when parent search is enabled');
+		assert.ok(paths.includes(`${parentFolder}/AGENTS.md`), 'Should include parent AGENTS.md when parent search is enabled');
+	});
+
 	test('should collect ~/.claude/CLAUDE.md when enabled', async () => {
 		const rootFolderName = 'collect-claude-home-test';
 		const rootFolder = `/${rootFolderName}`;
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptFileParser.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptFileParser.test.ts
index d50fa8b4fe2..4f426ae9316 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptFileParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptFileParser.test.ts
@@ -165,6 +165,27 @@ suite('PromptFileParser', () => {
 		assert.deepEqual(result.header.handOffs[0].showContinueOn, undefined);
 	});
 
+	test('handoff with whitespace-only label is skipped', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			/* 01 */'---',
+			/* 02 */`description: "Agent test"`,
+			/* 03 */'handoffs:',
+			/* 04 */'  - label: "   "',
+			/* 05 */'    agent: Default',
+			/* 06 */'    prompt: "Do something"',
+			/* 07 */'  - label: "Valid"',
+			/* 08 */'    agent: Default',
+			/* 09 */'    prompt: "Also do something"',
+			/* 10 */'---',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.ok(result.header);
+		assert.deepStrictEqual(result.header.handOffs, [
+			{ agent: 'Default', label: 'Valid', prompt: 'Also do something' }
+		]);
+	});
+
 	test('instructions', async () => {
 		const uri = URI.parse('file:///test/prompt1.md');
 		const content = [
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts
index 24374b4316e..cd90c0c7e7f 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts
@@ -53,7 +53,7 @@ import { ChatModeKind } from '../../../../common/constants.js';
 import { HookType } from '../../../../common/promptSyntax/hookTypes.js';
 import { IContextKeyService, IContextKeyChangeEvent } from '../../../../../../../platform/contextkey/common/contextkey.js';
 import { MockContextKeyService } from '../../../../../../../platform/keybinding/test/common/mockKeybindingService.js';
-import { IAgentPlugin, IAgentPluginAgent, IAgentPluginCommand, IAgentPluginHook, IAgentPluginMcpServerDefinition, IAgentPluginService, IAgentPluginSkill } from '../../../../common/plugins/agentPluginService.js';
+import { IAgentPlugin, IAgentPluginAgent, IAgentPluginCommand, IAgentPluginHook, IAgentPluginInstruction, IAgentPluginMcpServerDefinition, IAgentPluginService, IAgentPluginSkill } from '../../../../common/plugins/agentPluginService.js';
 import { IWorkspaceTrustManagementService } from '../../../../../../../platform/workspace/common/workspaceTrust.js';
 
 suite('PromptsService', () => {
@@ -80,6 +80,7 @@ suite('PromptsService', () => {
 		testConfigService.setUserConfiguration(PromptsConfig.USE_NESTED_AGENT_MD, false);
 		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS, true);
 		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, false);
 		testConfigService.setUserConfiguration(PromptsConfig.INSTRUCTIONS_LOCATION_KEY, { [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true });
 		testConfigService.setUserConfiguration(PromptsConfig.PROMPT_LOCATIONS_KEY, { [PROMPT_DEFAULT_SOURCE_FOLDER]: true });
 		testConfigService.setUserConfiguration(PromptsConfig.MODE_LOCATION_KEY, { [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true });
@@ -168,13 +169,14 @@ suite('PromptsService', () => {
 		instaService.stub(IContextKeyService, new MockContextKeyService());
 
 		workspaceTrustService = disposables.add(new TestWorkspaceTrustManagementService());
+		workspaceTrustService.getUriTrustInfo = (uri: URI) => Promise.resolve({ trusted: true, uri });
 		instaService.stub(IWorkspaceTrustManagementService, workspaceTrustService);
 
 		testPluginsObservable = observableValue<readonly IAgentPlugin[]>('testPlugins', []);
 
 		instaService.stub(IAgentPluginService, {
 			plugins: testPluginsObservable,
-			enablementModel: { readEnabled: () => 2 /* EnabledProfile */, setEnabled: () => { } },
+			enablementModel: { readEnabled: () => 2 /* EnabledProfile */, setEnabled: () => { }, remove: () => { } },
 		});
 
 		service = disposables.add(instaService.createInstance(PromptsService));
@@ -1431,7 +1433,8 @@ suite('PromptsService', () => {
 			};
 			instaService.stub(IUserDataProfileService, customUserDataProfileService);
 
-			// Recreate the service with the new stub
+			// Recreate the service with the new stub (dispose existing to avoid duplicate filesystem registration)
+			service.dispose();
 			const testService = disposables.add(instaService.createInstance(PromptsService));
 
 			// Create agent files in both workspace and user data folder
@@ -1513,7 +1516,8 @@ suite('PromptsService', () => {
 			};
 			instaService.stub(IUserDataProfileService, customUserDataProfileService);
 
-			// Recreate the service with the new stub
+			// Recreate the service with the new stub (dispose existing to avoid duplicate filesystem registration)
+			service.dispose();
 			const testService = disposables.add(instaService.createInstance(PromptsService));
 
 			// Create prompt files in both workspace and user data folder
@@ -1578,7 +1582,8 @@ suite('PromptsService', () => {
 			};
 			instaService.stub(IUserDataProfileService, customUserDataProfileService);
 
-			// Recreate the service with the new stub
+			// Recreate the service with the new stub (dispose existing to avoid duplicate filesystem registration)
+			service.dispose();
 			const testService = disposables.add(instaService.createInstance(PromptsService));
 
 			// Create instructions files in both workspace and user data folder
@@ -1660,7 +1665,7 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+			const result = (await service.listPromptFiles(PromptsType.skill, CancellationToken.None)).filter(s => s.storage !== PromptsStorage.internal);
 
 			assert.strictEqual(result.length, 2, 'Should find 2 skills');
 
@@ -1751,7 +1756,7 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+			const result = (await service.listPromptFiles(PromptsType.skill, CancellationToken.None)).filter(s => s.storage !== PromptsStorage.internal);
 
 			assert.strictEqual(result.length, 0, 'Should not find any skills in non-skill locations');
 		});
@@ -1837,7 +1842,7 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+			const result = (await service.listPromptFiles(PromptsType.skill, CancellationToken.None)).filter(s => s.storage !== PromptsStorage.internal);
 
 			assert.strictEqual(result.length, 1, 'Should find only 1 skill (from enabled folder)');
 			assert.ok(result[0].uri.path.includes('.claude/skills'), 'Should only find skill from .claude/skills');
@@ -1873,7 +1878,7 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+			const result = (await service.listPromptFiles(PromptsType.skill, CancellationToken.None)).filter(s => s.storage !== PromptsStorage.internal);
 
 			assert.strictEqual(result.length, 1, 'Should find 1 skill from tilde-expanded path');
 			assert.ok(result[0].uri.path.includes('/home/user/my-custom-skills'), 'Path should be expanded from tilde');
@@ -2015,6 +2020,7 @@ suite('PromptsService', () => {
 				}
 			}();
 			instaService.stub(IContextKeyService, testContextKeyService);
+			service.dispose();
 			const testService = disposables.add(instaService.createInstance(PromptsService));
 
 			const registered = testService.registerContributedFile(
@@ -2044,6 +2050,156 @@ suite('PromptsService', () => {
 		});
 	});
 
+	suite('listPromptFiles - parent repo folder', () => {
+		test('should find prompts, instructions, and agents in a parent repo folder', async () => {
+			const parentFolder = '/repos/collect-prompt-parent-test';
+			const rootFolder = `${parentFolder}/repo`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				// .git in parent marks it as a repo root
+				{
+					path: `${parentFolder}/.git/HEAD`,
+					contents: ['ref: refs/heads/main'],
+				},
+				// Applying instruction in parent
+				{
+					path: `${parentFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Parent TypeScript instructions\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'Parent TypeScript coding standards',
+					]
+				},
+				// Prompt file in parent
+				{
+					path: `${parentFolder}/.github/prompts/help.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Parent help prompt\'',
+						'---',
+						'Help the user with their question',
+					]
+				},
+				// Agent file in parent
+				{
+					path: `${parentFolder}/.github/agents/reviewer.agent.md`,
+					contents: [
+						'---',
+						'description: \'Parent code reviewer agent\'',
+						'---',
+						'You are a code reviewer',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['console.log("test");'],
+				},
+			]);
+
+			testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, false);
+
+			// With parent search disabled, should not find parent files
+			let promptFiles = await service.listPromptFiles(PromptsType.prompt, CancellationToken.None);
+			let agentFiles = await service.listPromptFiles(PromptsType.agent, CancellationToken.None);
+			let instructionFiles = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+
+			assert.ok(!promptFiles.some(f => f.uri.path.includes(parentFolder)), 'Should not find parent prompt files when parent search is disabled');
+			assert.ok(!agentFiles.some(f => f.uri.path.includes(parentFolder)), 'Should not find parent agent files when parent search is disabled');
+			assert.ok(!instructionFiles.some(f => f.uri.path.includes(parentFolder)), 'Should not find parent instruction files when parent search is disabled');
+
+			// With parent search enabled, should find parent files
+			testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, true);
+
+			promptFiles = await service.listPromptFiles(PromptsType.prompt, CancellationToken.None);
+			agentFiles = await service.listPromptFiles(PromptsType.agent, CancellationToken.None);
+			instructionFiles = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+
+			const promptPaths = promptFiles.map(f => f.uri.path);
+			const agentPaths = agentFiles.map(f => f.uri.path);
+			const instructionPaths = instructionFiles.map(f => f.uri.path);
+
+			assert.ok(promptPaths.includes(`${parentFolder}/.github/prompts/help.prompt.md`), 'Should find parent prompt file when parent search is enabled');
+			assert.ok(agentPaths.includes(`${parentFolder}/.github/agents/reviewer.agent.md`), 'Should find parent agent file when parent search is enabled');
+			assert.ok(instructionPaths.includes(`${parentFolder}/.github/instructions/typescript.instructions.md`), 'Should find parent instruction file when parent search is enabled');
+		});
+
+		test('should not find files in an untrusted parent repo folder', async () => {
+			const parentFolder = '/repos/untrusted-parent-test';
+			const rootFolder = `${parentFolder}/repo`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				// .git in parent marks it as a repo root
+				{
+					path: `${parentFolder}/.git/HEAD`,
+					contents: ['ref: refs/heads/main'],
+				},
+				// Applying instruction in parent
+				{
+					path: `${parentFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Parent TypeScript instructions\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'Parent TypeScript coding standards',
+					]
+				},
+				// Prompt file in parent
+				{
+					path: `${parentFolder}/.github/prompts/help.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Parent help prompt\'',
+						'---',
+						'Help the user with their question',
+					]
+				},
+				// Agent file in parent
+				{
+					path: `${parentFolder}/.github/agents/reviewer.agent.md`,
+					contents: [
+						'---',
+						'description: \'Parent code reviewer agent\'',
+						'---',
+						'You are a code reviewer',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['console.log("test");'],
+				},
+			]);
+
+			testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS, true);
+
+			// Mark the parent repo root as untrusted
+			workspaceTrustService.getUriTrustInfo = (uri: URI) => {
+				if (uri.path === parentFolder) {
+					return Promise.resolve({ trusted: false, uri });
+				}
+				return Promise.resolve({ trusted: true, uri });
+			};
+
+			const promptFiles = await service.listPromptFiles(PromptsType.prompt, CancellationToken.None);
+			const agentFiles = await service.listPromptFiles(PromptsType.agent, CancellationToken.None);
+			const instructionFiles = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+
+			assert.ok(!promptFiles.some(f => f.uri.path.includes(parentFolder)), 'Should not find parent prompt files when parent repo is untrusted');
+			assert.ok(!agentFiles.some(f => f.uri.path.includes(parentFolder)), 'Should not find parent agent files when parent repo is untrusted');
+			assert.ok(!instructionFiles.some(f => f.uri.path.includes(parentFolder)), 'Should not find parent instruction files when parent repo is untrusted');
+		});
+	});
+
 	test('Instructions provider', async () => {
 		const instructionUri = URI.parse('file://extensions/my-extension/myInstruction.instructions.md');
 		const extension = {
@@ -2267,14 +2423,15 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results when agent skills are enabled');
-			assert.strictEqual(result.length, 4, 'Should find 4 skills total');
+			assert.ok(allResult, 'Should return results when agent skills are enabled');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
+			assert.strictEqual(result.length, 5, 'Should find 5 skills total');
 
 			// Check project skills (both from .github/skills and .claude/skills)
 			const projectSkills = result.filter(skill => skill.storage === PromptsStorage.local);
-			assert.strictEqual(projectSkills.length, 2, 'Should find 2 project skills');
+			assert.strictEqual(projectSkills.length, 3, 'Should find 3 project skills');
 
 			const githubSkill1 = projectSkills.find(skill => skill.name === 'GitHub Skill 1');
 			assert.ok(githubSkill1, 'Should find GitHub skill 1');
@@ -2286,6 +2443,12 @@ suite('PromptsService', () => {
 			assert.strictEqual(claudeSkill1.description, 'A Claude skill for testing');
 			assert.strictEqual(claudeSkill1.uri.path, `${rootFolder}/.claude/skills/Claude Skill 1/SKILL.md`);
 
+			// The invalid-skill (no name attribute) should now use folder name as fallback
+			const invalidSkill = projectSkills.find(skill => skill.name === 'invalid-skill');
+			assert.ok(invalidSkill, 'Should find invalid-skill using folder name as fallback');
+			assert.strictEqual(invalidSkill.description, 'Invalid skill, no name');
+			assert.strictEqual(invalidSkill.uri.path, `${rootFolder}/.claude/skills/invalid-skill/SKILL.md`);
+
 			// Check personal skills
 			const personalSkills = result.filter(skill => skill.storage === PromptsStorage.user);
 			assert.strictEqual(personalSkills.length, 2, 'Should find 2 personal skills');
@@ -2335,13 +2498,20 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			// Should still return the valid skill, even if one has parsing errors
-			assert.ok(result, 'Should return results even with parsing errors');
-			assert.strictEqual(result.length, 1, 'Should find 1 valid skill');
-			assert.strictEqual(result[0].name, 'Valid Skill');
-			assert.strictEqual(result[0].storage, PromptsStorage.local);
+			// Should return both skills - the malformed one uses folder name as fallback
+			assert.ok(allResult, 'Should return results even with parsing errors');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
+			assert.strictEqual(result.length, 2, 'Should find 2 skills');
+
+			const validSkill = result.find(s => s.name === 'Valid Skill');
+			assert.ok(validSkill, 'Should find the valid skill');
+			assert.strictEqual(validSkill.storage, PromptsStorage.local);
+
+			const invalidSkill = result.find(s => s.name === 'invalid-skill');
+			assert.ok(invalidSkill, 'Should find skill with folder name as fallback despite malformed YAML');
+			assert.strictEqual(invalidSkill.storage, PromptsStorage.local);
 		});
 
 		test('should return empty array when no skills found', async () => {
@@ -2356,9 +2526,10 @@ suite('PromptsService', () => {
 			// Create empty mock filesystem
 			await mockFiles(fileService, []);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results array');
+			assert.ok(allResult, 'Should return results array');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 0, 'Should find no skills');
 		});
 
@@ -2390,9 +2561,10 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 1, 'Should find 1 skill');
 			assert.strictEqual(result[0].name.length, 64, 'Name should be truncated to 64 characters');
 			assert.strictEqual(result[0].description?.length, 1024, 'Description should be truncated to 1024 characters');
@@ -2422,9 +2594,10 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 1, 'Should find 1 skill');
 			assert.strictEqual(result[0].name, 'Skill with XML tags', 'XML tags should be removed from name');
 			assert.strictEqual(result[0].description, 'Description with HTML and other tags', 'XML tags should be removed from description');
@@ -2458,9 +2631,10 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 1, 'Should find 1 skill');
 			// XML tags are removed first, then truncation happens
 			assert.ok(!result[0].name.includes('<'), 'Name should not contain XML tags');
@@ -2516,9 +2690,10 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 2, 'Should find 2 skills (duplicate skipped)');
 
 			const duplicateSkill = result.find(s => s.name === 'Duplicate Skill');
@@ -2564,15 +2739,16 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 1, 'Should find 1 skill (duplicates resolved by priority)');
 			assert.strictEqual(result[0].description, 'Workspace version - highest priority', 'Workspace should win over user');
 			assert.strictEqual(result[0].storage, PromptsStorage.local);
 		});
 
-		test('should skip skills where name does not match folder name', async () => {
+		test('should include skills where name does not match folder name using folder name as fallback', async () => {
 			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
 			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
 
@@ -2589,7 +2765,7 @@ suite('PromptsService', () => {
 					contents: [
 						'---',
 						'name: "Correct Skill Name"',
-						'description: "This skill should be skipped due to name mismatch"',
+						'description: "This skill should use folder name as fallback"',
 						'---',
 						'Skill content',
 					],
@@ -2607,14 +2783,21 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
-			assert.strictEqual(result.length, 1, 'Should find only 1 skill (mismatched one skipped)');
-			assert.strictEqual(result[0].name, 'Valid Skill', 'Should only find the valid skill');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
+			assert.strictEqual(result.length, 2, 'Should find both skills');
+
+			const mismatchedSkill = result.find(s => s.name === 'wrong-folder-name');
+			assert.ok(mismatchedSkill, 'Should find skill with folder name as fallback');
+			assert.strictEqual(mismatchedSkill.description, 'This skill should use folder name as fallback');
+
+			const validSkill = result.find(s => s.name === 'Valid Skill');
+			assert.ok(validSkill, 'Should find the valid skill');
 		});
 
-		test('should skip skills with missing name attribute', async () => {
+		test('should include skills with missing name attribute using folder name as fallback', async () => {
 			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
 			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
 
@@ -2646,11 +2829,18 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
-			assert.strictEqual(result.length, 1, 'Should find only 1 skill (one without name skipped)');
-			assert.strictEqual(result[0].name, 'Valid Named Skill', 'Should only find skill with name attribute');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
+			assert.strictEqual(result.length, 2, 'Should find both skills');
+
+			const noNameSkill = result.find(s => s.name === 'no-name-skill');
+			assert.ok(noNameSkill, 'Should find skill with folder name as fallback');
+			assert.strictEqual(noNameSkill.description, 'This skill has no name attribute');
+
+			const validSkill = result.find(s => s.name === 'Valid Named Skill');
+			assert.ok(validSkill, 'Should find skill with name attribute');
 		});
 
 		test('should include extension-provided skills in findAgentSkills', async () => {
@@ -2701,9 +2891,10 @@ suite('PromptsService', () => {
 
 			const registered = service.registerPromptFileProvider(extension, PromptsType.skill, provider);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 2, 'Should find 2 skills (workspace + extension)');
 
 			const workspaceSkill = result.find(s => s.name === 'Workspace Skill');
@@ -2763,9 +2954,10 @@ suite('PromptsService', () => {
 				'A contributed skill from extension'
 			);
 
-			const result = await service.findAgentSkills(CancellationToken.None);
+			const allResult = await service.findAgentSkills(CancellationToken.None);
 
-			assert.ok(result, 'Should return results');
+			assert.ok(allResult, 'Should return results');
+			const result = allResult.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(result.length, 2, 'Should find 2 skills (local + contributed)');
 
 			const localSkill = result.find(s => s.name === 'Local Skill');
@@ -2779,7 +2971,7 @@ suite('PromptsService', () => {
 			registered.dispose();
 
 			// After disposal, only local skill should remain
-			const resultAfterDispose = await service.findAgentSkills(CancellationToken.None);
+			const resultAfterDispose = (await service.findAgentSkills(CancellationToken.None))?.filter(s => s.storage !== PromptsStorage.internal);
 			assert.strictEqual(resultAfterDispose?.length, 1, 'Should find 1 skill after disposal');
 			assert.strictEqual(resultAfterDispose?.[0].name, 'Local Skill');
 		});
@@ -3453,7 +3645,7 @@ suite('PromptsService', () => {
 				},
 			]);
 
-			const slashCommands = await service.getPromptSlashCommands(CancellationToken.None);
+			const slashCommands = (await service.getPromptSlashCommands(CancellationToken.None)).filter(c => c.promptPath.storage !== PromptsStorage.internal);
 
 			// All commands should be present in the raw list
 			assert.strictEqual(slashCommands.length, 4, 'Should find all 4 commands');
@@ -3516,6 +3708,7 @@ suite('PromptsService', () => {
 			const commands = observableValue<readonly IAgentPluginCommand[]>('testPluginCommands', []);
 			const skills = observableValue<readonly IAgentPluginSkill[]>('testPluginSkills', []);
 			const agents = observableValue<readonly IAgentPluginAgent[]>('testPluginAgents', []);
+			const instructions = observableValue<readonly IAgentPluginInstruction[]>('testPluginInstructions', []);
 			const mcpServerDefinitions = observableValue<readonly IAgentPluginMcpServerDefinition[]>('testPluginMcpServerDefinitions', []);
 
 			return {
@@ -3528,6 +3721,7 @@ suite('PromptsService', () => {
 					commands,
 					skills,
 					agents,
+					instructions,
 					mcpServerDefinitions,
 				},
 				hooks,
@@ -3593,6 +3787,7 @@ suite('PromptsService', () => {
 				type: HookType.PreToolUse,
 				originalId: 'plugin-pre-tool-use',
 				hooks: [{ type: 'command', command: 'echo from-plugin' }],
+				uri: URI.file('/plugins/test-plugin/hooks.json'),
 			}]);
 
 			testPluginsObservable.set([plugin], undefined);
@@ -3614,6 +3809,7 @@ suite('PromptsService', () => {
 				type: HookType.PreToolUse,
 				originalId: 'plugin-pre-tool-use',
 				hooks: [{ type: 'command', command: 'echo before' }],
+				uri: URI.file('/plugins/test-plugin/hooks.json'),
 			}]);
 
 			testPluginsObservable.set([plugin], undefined);
@@ -3626,6 +3822,7 @@ suite('PromptsService', () => {
 				type: HookType.PreToolUse,
 				originalId: 'plugin-pre-tool-use',
 				hooks: [{ type: 'command', command: 'echo after' }],
+				uri: URI.file('/plugins/test-plugin/hooks.json'),
 			}], undefined);
 
 			const after = await service.getHooks(CancellationToken.None);
@@ -3678,6 +3875,7 @@ suite('PromptsService', () => {
 				type: HookType.PreToolUse,
 				originalId: 'plugin-pre-tool-use',
 				hooks: [{ type: 'command', command: 'echo from-plugin' }],
+				uri: URI.file('/plugins/test-plugin/hooks.json'),
 			}]);
 
 			testPluginsObservable.set([plugin], undefined);
@@ -3687,4 +3885,110 @@ suite('PromptsService', () => {
 			assert.strictEqual(result, undefined, 'Expected undefined hooks when workspace is untrusted, even with plugin hooks');
 		});
 	});
+
+	suite('plugin instructions', () => {
+		function createPluginWithInstructions(
+			path: string,
+			initialInstructions: readonly IAgentPluginInstruction[],
+		): { plugin: IAgentPlugin; instructions: ISettableObservable<readonly IAgentPluginInstruction[]> } {
+			const enablement = observableValue('testPluginEnablement', 2 /* ContributionEnablementState.EnabledProfile */);
+			const hooks = observableValue<readonly IAgentPluginHook[]>('testPluginHooks', []);
+			const commands = observableValue<readonly IAgentPluginCommand[]>('testPluginCommands', []);
+			const skills = observableValue<readonly IAgentPluginSkill[]>('testPluginSkills', []);
+			const agents = observableValue<readonly IAgentPluginAgent[]>('testPluginAgents', []);
+			const instructions = observableValue<readonly IAgentPluginInstruction[]>('testPluginInstructions', initialInstructions);
+			const mcpServerDefinitions = observableValue<readonly IAgentPluginMcpServerDefinition[]>('testPluginMcpServerDefinitions', []);
+
+			return {
+				plugin: {
+					uri: URI.file(path),
+					label: basename(URI.file(path)),
+					enablement,
+					remove: () => { },
+					hooks,
+					commands,
+					skills,
+					agents,
+					instructions,
+					mcpServerDefinitions,
+				},
+				instructions,
+			};
+		}
+
+		test('lists plugin instructions via listPromptFiles', async function () {
+			const ruleUri = URI.file('/plugins/test-plugin/rules/prefer-const.mdc');
+			const { plugin } = createPluginWithInstructions('/plugins/test-plugin', [
+				{ uri: ruleUri, name: 'prefer-const' },
+			]);
+
+			testPluginsObservable.set([plugin], undefined);
+
+			const result = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			const pluginInstruction = result.find(p => p.uri.toString() === ruleUri.toString());
+			assert.ok(pluginInstruction, 'Plugin instruction should appear in listPromptFiles');
+			assert.strictEqual(pluginInstruction!.storage, PromptsStorage.plugin);
+		});
+
+		test('updates listed instructions when plugin instructions change', async function () {
+			const ruleUri1 = URI.file('/plugins/test-plugin/rules/rule-a.mdc');
+			const ruleUri2 = URI.file('/plugins/test-plugin/rules/rule-b.mdc');
+			const { plugin, instructions } = createPluginWithInstructions('/plugins/test-plugin', [
+				{ uri: ruleUri1, name: 'rule-a' },
+			]);
+
+			testPluginsObservable.set([plugin], undefined);
+
+			const before = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			const beforePlugin = before.filter(p => p.storage === PromptsStorage.plugin);
+			assert.strictEqual(beforePlugin.length, 1);
+
+			const eventFired = new Promise<void>(resolve => {
+				const disposable = service.onDidChangeInstructions(() => {
+					disposable.dispose();
+					resolve();
+				});
+			});
+
+			instructions.set([
+				{ uri: ruleUri1, name: 'rule-a' },
+				{ uri: ruleUri2, name: 'rule-b' },
+			], undefined);
+
+			await eventFired;
+
+			const after = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			const afterPlugin = after.filter(p => p.storage === PromptsStorage.plugin);
+			assert.strictEqual(afterPlugin.length, 2);
+		});
+
+		test('removes instructions when plugin is removed', async function () {
+			const ruleUri = URI.file('/plugins/test-plugin/rules/rule-a.mdc');
+			const { plugin } = createPluginWithInstructions('/plugins/test-plugin', [
+				{ uri: ruleUri, name: 'rule-a' },
+			]);
+
+			testPluginsObservable.set([plugin], undefined);
+			const withPlugin = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			assert.ok(withPlugin.some(p => p.storage === PromptsStorage.plugin));
+
+			testPluginsObservable.set([], undefined);
+			const withoutPlugin = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			assert.ok(!withoutPlugin.some(p => p.storage === PromptsStorage.plugin));
+		});
+
+		test('namespaces plugin instruction names with plugin folder', async function () {
+			const ruleUri = URI.file('/plugins/deploy-tools/rules/lint-check.mdc');
+			const { plugin } = createPluginWithInstructions('/plugins/deploy-tools', [
+				{ uri: ruleUri, name: 'lint-check' },
+			]);
+
+			testPluginsObservable.set([plugin], undefined);
+
+			const result = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			const pluginInstruction = result.find(p => p.uri.toString() === ruleUri.toString());
+			assert.ok(pluginInstruction, 'Plugin instruction should be listed');
+			assert.strictEqual(pluginInstruction!.name, 'deploy-tools:lint-check');
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts
index 2dde1dfb0a2..757eeca3a0d 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts
@@ -25,11 +25,12 @@ import { IPathService } from '../../../../../../services/path/common/pathService
 import { PromptsConfig } from '../../../../common/promptSyntax/config/config.js';
 import { PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
 import { hasGlobPattern, isValidGlob, isValidPromptFolderPath, PromptFilesLocator } from '../../../../common/promptSyntax/utils/promptFilesLocator.js';
-import { IMockFileEntry, IMockFolder, MockFilesystem } from '../testUtils/mockFilesystem.js';
+import { mockFiles } from '../testUtils/mockFilesystem.js';
 import { mockService } from './mock.js';
-import { TestUserDataProfileService } from '../../../../../../test/common/workbenchTestServices.js';
+import { TestUserDataProfileService, TestWorkspaceTrustManagementService } from '../../../../../../test/common/workbenchTestServices.js';
 import { PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
 import { runWithFakedTimers } from '../../../../../../../base/test/common/timeTravelScheduler.js';
+import { IWorkspaceTrustManagementService } from '../../../../../../../platform/workspace/common/workspaceTrust.js';
 
 /**
  * Mocked instance of {@link IConfigurationService}.
@@ -77,39 +78,22 @@ suite('PromptFilesLocator', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;
-	setup(async () => {
-		instantiationService = disposables.add(new TestInstantiationService());
-		instantiationService.stub(ILogService, new NullLogService());
+	let fileService: IFileService;
+	const configValues: Record<string, unknown> = {};
+	let workspaceTrustService: TestWorkspaceTrustManagementService;
 
-		const fileService = disposables.add(instantiationService.createInstance(FileService));
-		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
-		disposables.add(fileService.registerProvider(Schemas.file, fileSystemProvider));
+	// Sets all prompt file location config keys to the same value
+	const setLocations = (value: unknown) => {
+		configValues[PromptsConfig.PROMPT_LOCATIONS_KEY] = value;
+		configValues[PromptsConfig.INSTRUCTIONS_LOCATION_KEY] = value;
+		configValues[PromptsConfig.MODE_LOCATION_KEY] = value;
+		configValues[PromptsConfig.SKILLS_LOCATION_KEY] = value;
+	};
 
-		instantiationService.stub(IFileService, fileService);
-	});
-
-	/**
-	 * Create a new instance of {@link PromptFilesLocator} with provided mocked
-	 * values for configuration and workspace services.
-	 */
-	const createPromptsLocator = async (configValue: unknown, workspaceFolderPaths: string[], filesystem: IMockFolder[]) => {
-
-		const mockFs = instantiationService.createInstance(MockFilesystem, filesystem);
-		await mockFs.mock();
-
-		instantiationService.stub(IConfigurationService, mockConfigService({
-			'explorer.excludeGitIgnore': false,
-			'files.exclude': {},
-			'search.exclude': {},
-			[PromptsConfig.PROMPT_LOCATIONS_KEY]: configValue,
-			[PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: configValue,
-			[PromptsConfig.MODE_LOCATION_KEY]: configValue,
-			[PromptsConfig.SKILLS_LOCATION_KEY]: configValue,
-		}));
-
-		const workspaceFolders = workspaceFolderPaths.map((path, index) => {
+	// Stubs workspace context service with the given folder paths
+	const setWorkspaceFolders = (paths: string[]) => {
+		const workspaceFolders = paths.map((path, index) => {
 			const uri = URI.file(path);
-
 			return new class extends mock<IWorkspaceFolder>() {
 				override uri = uri;
 				override name = basename(uri);
@@ -117,6 +101,34 @@ suite('PromptFilesLocator', () => {
 			};
 		});
 		instantiationService.stub(IWorkspaceContextService, mockWorkspaceService(workspaceFolders));
+	};
+
+	setup(async () => {
+		instantiationService = disposables.add(new TestInstantiationService());
+		instantiationService.stub(ILogService, new NullLogService());
+
+		fileService = disposables.add(instantiationService.createInstance(FileService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(Schemas.file, fileSystemProvider));
+		instantiationService.stub(IFileService, fileService);
+
+		workspaceTrustService = disposables.add(new TestWorkspaceTrustManagementService());
+		instantiationService.stub(IWorkspaceTrustManagementService, workspaceTrustService);
+
+		// Reset config values to defaults
+		for (const key of Object.keys(configValues)) {
+			delete configValues[key];
+		}
+		Object.assign(configValues, {
+			'explorer.excludeGitIgnore': false,
+			'files.exclude': {},
+			'search.exclude': {},
+			[PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS]: false,
+		});
+		instantiationService.stub(IConfigurationService, mockConfigService(configValues));
+
+		setWorkspaceFolders([]);
+
 		instantiationService.stub(IWorkbenchEnvironmentService, {} as IWorkbenchEnvironmentService);
 		instantiationService.stub(IUserDataProfileService, new TestUserDataProfileService());
 		instantiationService.stub(ISearchService, {
@@ -124,11 +136,9 @@ suite('PromptFilesLocator', () => {
 				return true;
 			},
 			async fileSearch(query: IFileQuery) {
-				// mock the search service
-				const fs = instantiationService.get(IFileService);
 				const findFilesInLocation = async (location: URI, results: URI[] = []) => {
 					try {
-						const resolve = await fs.resolve(location);
+						const resolve = await fileService.resolve(location);
 						if (resolve.isFile) {
 							results.push(resolve.resource);
 						} else if (resolve.isDirectory && resolve.children) {
@@ -149,7 +159,6 @@ suite('PromptFilesLocator', () => {
 							results.push({ resource });
 						}
 					}
-
 				}
 				return { results, messages: [] };
 			}
@@ -163,134 +172,112 @@ suite('PromptFilesLocator', () => {
 				return Promise.resolve(uri);
 			}
 		} as IPathService);
-
-		const locator = instantiationService.createInstance(PromptFilesLocator);
-
-		return {
-			async listFiles(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly URI[]> {
-				return locator.listFiles(type, storage, token);
-			},
-			async getConfigBasedSourceFolders(type: PromptsType): Promise<readonly URI[]> {
-				return await locator.getConfigBasedSourceFolders(type);
-			},
-			async findAgentSkills(token: CancellationToken) {
-				return await locator.findAgentSkills(token);
-			},
-			async disposeAsync(): Promise<void> {
-				await mockFs.delete();
-			}
-		};
-	};
+	});
 
 	suite('empty workspace', () => {
 		const EMPTY_WORKSPACE: string[] = [];
 
 		suite('empty filesystem', () => {
 			testT('no config value', async () => {
-				const locator = await createPromptsLocator(undefined, EMPTY_WORKSPACE, []);
+				setLocations(undefined);
+				setWorkspaceFolders(EMPTY_WORKSPACE);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
 					[],
 					'No prompts must be found.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('object config value', async () => {
-				const locator = await createPromptsLocator({
+				setLocations({
 					'/Users/legomushroom/repos/prompts/': true,
 					'/tmp/prompts/': false,
-				}, EMPTY_WORKSPACE, []);
+				});
+				setWorkspaceFolders(EMPTY_WORKSPACE);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
 					[],
 					'No prompts must be found.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('array config value', async () => {
-				const locator = await createPromptsLocator([
+				setLocations([
 					'relative/path/to/prompts/',
 					'/abs/path',
-				], EMPTY_WORKSPACE, []);
+				]);
+				setWorkspaceFolders(EMPTY_WORKSPACE);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
 					[],
 					'No prompts must be found.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('null config value', async () => {
-				const locator = await createPromptsLocator(null, EMPTY_WORKSPACE, []);
+				setLocations(null);
+				setWorkspaceFolders(EMPTY_WORKSPACE);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
 					[],
 					'No prompts must be found.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('string config value', async () => {
-				const locator = await createPromptsLocator('/etc/hosts/prompts', EMPTY_WORKSPACE, []);
+				setLocations('/etc/hosts/prompts');
+				setWorkspaceFolders(EMPTY_WORKSPACE);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
 					[],
 					'No prompts must be found.',
 				);
-				await locator.disposeAsync();
 			});
 		});
 
 		suite('non-empty filesystem', () => {
 			testT('core logic', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'/Users/legomushroom/repos/prompts': true,
+					'/tmp/prompts/': true,
+					'/absolute/path/prompts': false,
+					'.copilot/prompts': true,
+				});
+				setWorkspaceFolders(EMPTY_WORKSPACE);
+				await mockFiles(fileService, [
 					{
-						'/Users/legomushroom/repos/prompts': true,
-						'/tmp/prompts/': true,
-						'/absolute/path/prompts': false,
-						'.copilot/prompts': true,
+						path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+						contents: ['Hello, World!'],
 					},
-					EMPTY_WORKSPACE,
-					[
-						{
-							name: '/Users/legomushroom/repos/prompts',
-							children: [
-								{
-									name: 'test.prompt.md',
-									contents: 'Hello, World!',
-								},
-								{
-									name: 'refactor-tests.prompt.md',
-									contents: 'some file content goes here',
-								},
-							],
-						},
-						{
-							name: '/tmp/prompts',
-							children: [
-								{
-									name: 'translate.to-rust.prompt.md',
-									contents: 'some more random file contents',
-								},
-							],
-						},
-						{
-							name: '/absolute/path/prompts',
-							children: [
-								{
-									name: 'some-prompt-file.prompt.md',
-									contents: 'hey hey hey',
-								},
-							],
-						},
-					]);
+					{
+						path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+						contents: ['some file content goes here'],
+					},
+					{
+						path: '/tmp/prompts/translate.to-rust.prompt.md',
+						contents: ['some more random file contents'],
+					},
+					{
+						path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+						contents: ['hey hey hey'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -301,7 +288,6 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find correct prompts.',
 				);
-				await locator.disposeAsync();
 			});
 
 			suite('absolute', () => {
@@ -326,47 +312,31 @@ suite('PromptFilesLocator', () => {
 					];
 
 					for (const setting of settings) {
-						const locator = await createPromptsLocator(
-							{ [setting]: true },
-							EMPTY_WORKSPACE,
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'deps/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-							],
-						);
+						setLocations({ [setting]: true });
+						setWorkspaceFolders(EMPTY_WORKSPACE);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -378,7 +348,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 					}
 				});
 
@@ -480,51 +449,35 @@ suite('PromptFilesLocator', () => {
 							vscodeSettings[setting] = true;
 						}
 
-						const locator = await createPromptsLocator(
-							vscodeSettings,
-							EMPTY_WORKSPACE,
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'deps/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'default.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rawbot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-							],
-						);
+						setLocations(vscodeSettings);
+						setWorkspaceFolders(EMPTY_WORKSPACE);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/default.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rawbot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -535,7 +488,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 					}
 				});
 			});
@@ -566,47 +518,31 @@ suite('PromptFilesLocator', () => {
 					];
 
 					for (const setting of testSettings) {
-						const locator = await createPromptsLocator(
-							{ [setting]: true },
-							['/Users/legomushroom/repos/vscode'],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'deps/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-							],
-						);
+						setLocations({ [setting]: true });
+						setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -618,7 +554,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -721,51 +656,35 @@ suite('PromptFilesLocator', () => {
 							vscodeSettings[setting] = true;
 						}
 
-						const locator = await createPromptsLocator(
-							vscodeSettings,
-							['/Users/legomushroom/repos/vscode'],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'deps/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'default.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rawbot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-							],
-						);
+						setLocations(vscodeSettings);
+						setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/default.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rawbot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -776,7 +695,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 					}
 				});
 			});
@@ -804,47 +722,31 @@ suite('PromptFilesLocator', () => {
 
 					for (const setting of settings) {
 
-						const locator = await createPromptsLocator(
-							{ [setting]: true },
-							['/Users/legomushroom/repos/vscode'],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'deps/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-							],
-						);
+						setLocations({ [setting]: true });
+						setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -856,7 +758,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -959,51 +860,35 @@ suite('PromptFilesLocator', () => {
 							vscodeSettings[setting] = true;
 						}
 
-						const locator = await createPromptsLocator(
-							vscodeSettings,
-							['/Users/legomushroom/repos/vscode'],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'deps/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'default.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rawbot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-							],
-						);
+						setLocations(vscodeSettings);
+						setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/default.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rawbot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/deps/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1014,7 +899,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -1023,72 +907,42 @@ suite('PromptFilesLocator', () => {
 	});
 
 	testT('core logic', async () => {
-		const locator = await createPromptsLocator(
+		setLocations({
+			'/Users/legomushroom/repos/prompts': true,
+			'/tmp/prompts/': true,
+			'/absolute/path/prompts': false,
+			'.copilot/prompts': true,
+		});
+		setWorkspaceFolders([
+			'/Users/legomushroom/repos/vscode',
+		]);
+		await mockFiles(fileService, [
 			{
-				'/Users/legomushroom/repos/prompts': true,
-				'/tmp/prompts/': true,
-				'/absolute/path/prompts': false,
-				'.copilot/prompts': true,
+				path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+				contents: ['Hello, World!'],
 			},
-			[
-				'/Users/legomushroom/repos/vscode',
-			],
-			[
-				{
-					name: '/Users/legomushroom/repos/prompts',
-					children: [
-						{
-							name: 'test.prompt.md',
-							contents: 'Hello, World!',
-						},
-						{
-							name: 'refactor-tests.prompt.md',
-							contents: 'some file content goes here',
-						},
-					],
-				},
-				{
-					name: '/tmp/prompts',
-					children: [
-						{
-							name: 'translate.to-rust.prompt.md',
-							contents: 'some more random file contents',
-						},
-					],
-				},
-				{
-					name: '/absolute/path/prompts',
-					children: [
-						{
-							name: 'some-prompt-file.prompt.md',
-							contents: 'hey hey hey',
-						},
-					],
-				},
-				{
-					name: '/Users/legomushroom/repos/vscode',
-					children: [
-						{
-							name: '.copilot/prompts',
-							children: [
-								{
-									name: 'default.prompt.md',
-									contents: 'oh hi, robot!',
-								},
-							],
-						},
-						{
-							name: '.github/prompts',
-							children: [
-								{
-									name: 'my.prompt.md',
-									contents: 'oh hi, bot!',
-								},
-							],
-						},
-					],
-				},
-			]);
+			{
+				path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+				contents: ['some file content goes here'],
+			},
+			{
+				path: '/tmp/prompts/translate.to-rust.prompt.md',
+				contents: ['some more random file contents'],
+			},
+			{
+				path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+				contents: ['hey hey hey'],
+			},
+			{
+				path: '/Users/legomushroom/repos/vscode/.copilot/prompts/default.prompt.md',
+				contents: ['oh hi, robot!'],
+			},
+			{
+				path: '/Users/legomushroom/repos/vscode/.github/prompts/my.prompt.md',
+				contents: ['oh hi, bot!'],
+			},
+		]);
+		const locator = instantiationService.createInstance(PromptFilesLocator);
 
 		assertOutcome(
 			await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1101,81 +955,50 @@ suite('PromptFilesLocator', () => {
 			],
 			'Must find correct prompts.',
 		);
-		await locator.disposeAsync();
 	});
 
 	testT('with disabled `.github/prompts` location', async () => {
-		const locator = await createPromptsLocator(
+		setLocations({
+			'/Users/legomushroom/repos/prompts': true,
+			'/tmp/prompts/': true,
+			'/absolute/path/prompts': false,
+			'.copilot/prompts': true,
+			'.github/prompts': false,
+		});
+		setWorkspaceFolders([
+			'/Users/legomushroom/repos/vscode',
+		]);
+		await mockFiles(fileService, [
 			{
-				'/Users/legomushroom/repos/prompts': true,
-				'/tmp/prompts/': true,
-				'/absolute/path/prompts': false,
-				'.copilot/prompts': true,
-				'.github/prompts': false,
+				path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+				contents: ['Hello, World!'],
 			},
-			[
-				'/Users/legomushroom/repos/vscode',
-			],
-			[
-				{
-					name: '/Users/legomushroom/repos/prompts',
-					children: [
-						{
-							name: 'test.prompt.md',
-							contents: 'Hello, World!',
-						},
-						{
-							name: 'refactor-tests.prompt.md',
-							contents: 'some file content goes here',
-						},
-					],
-				},
-				{
-					name: '/tmp/prompts',
-					children: [
-						{
-							name: 'translate.to-rust.prompt.md',
-							contents: 'some more random file contents',
-						},
-					],
-				},
-				{
-					name: '/absolute/path/prompts',
-					children: [
-						{
-							name: 'some-prompt-file.prompt.md',
-							contents: 'hey hey hey',
-						},
-					],
-				},
-				{
-					name: '/Users/legomushroom/repos/vscode',
-					children: [
-						{
-							name: '.copilot/prompts',
-							children: [
-								{
-									name: 'default.prompt.md',
-									contents: 'oh hi, robot!',
-								},
-							],
-						},
-						{
-							name: '.github/prompts',
-							children: [
-								{
-									name: 'my.prompt.md',
-									contents: 'oh hi, bot!',
-								},
-								{
-									name: 'your.prompt.md',
-									contents: 'oh hi, bot!',
-								},
-							],
-						},
-					],
-				},
-			]);
+			{
+				path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+				contents: ['some file content goes here'],
+			},
+			{
+				path: '/tmp/prompts/translate.to-rust.prompt.md',
+				contents: ['some more random file contents'],
+			},
+			{
+				path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+				contents: ['hey hey hey'],
+			},
+			{
+				path: '/Users/legomushroom/repos/vscode/.copilot/prompts/default.prompt.md',
+				contents: ['oh hi, robot!'],
+			},
+			{
+				path: '/Users/legomushroom/repos/vscode/.github/prompts/my.prompt.md',
+				contents: ['oh hi, bot!'],
+			},
+			{
+				path: '/Users/legomushroom/repos/vscode/.github/prompts/your.prompt.md',
+				contents: ['oh hi, bot!'],
+			},
+		]);
+		const locator = instantiationService.createInstance(PromptFilesLocator);
 
 		assertOutcome(
 			await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1187,116 +1010,64 @@ suite('PromptFilesLocator', () => {
 			],
 			'Must find correct prompts.',
 		);
-		await locator.disposeAsync();
 	});
 
 	suite('multi-root workspace', () => {
 		suite('core logic', () => {
 			testT('without top-level `.github` folder', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'/Users/legomushroom/repos/prompts': true,
+					'/tmp/prompts/': true,
+					'/absolute/path/prompts': false,
+					'.copilot/prompts': false,
+				});
+				setWorkspaceFolders([
+					'/Users/legomushroom/repos/vscode',
+					'/Users/legomushroom/repos/node',
+				]);
+				await mockFiles(fileService, [
 					{
-						'/Users/legomushroom/repos/prompts': true,
-						'/tmp/prompts/': true,
-						'/absolute/path/prompts': false,
-						'.copilot/prompts': false,
+						path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+						contents: ['Hello, World!'],
 					},
-					[
-						'/Users/legomushroom/repos/vscode',
-						'/Users/legomushroom/repos/node',
-					],
-					[
-						{
-							name: '/Users/legomushroom/repos/prompts',
-							children: [
-								{
-									name: 'test.prompt.md',
-									contents: 'Hello, World!',
-								},
-								{
-									name: 'refactor-tests.prompt.md',
-									contents: 'some file content goes here',
-								},
-							],
-						},
-						{
-							name: '/tmp/prompts',
-							children: [
-								{
-									name: 'translate.to-rust.prompt.md',
-									contents: 'some more random file contents',
-								},
-							],
-						},
-						{
-							name: '/absolute/path/prompts',
-							children: [
-								{
-									name: 'some-prompt-file.prompt.md',
-									contents: 'hey hey hey',
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/vscode',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt1.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'default.prompt.md',
-											contents: 'oh hi, bot!',
-										},
-									],
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/node',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt5.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'refactor-static-classes.prompt.md',
-											contents: 'file contents',
-										},
-									],
-								},
-							],
-						},
-						// note! this folder is not part of the workspace, so prompt files are `ignored`
-						{
-							name: '/Users/legomushroom/repos/.github/prompts',
-							children: [
-								{
-									name: 'prompt-name.prompt.md',
-									contents: 'oh hi, robot!',
-								},
-								{
-									name: 'name-of-the-prompt.prompt.md',
-									contents: 'oh hi, raw bot!',
-								},
-							],
-						},
-					]);
+					{
+						path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+						contents: ['some file content goes here'],
+					},
+					{
+						path: '/tmp/prompts/translate.to-rust.prompt.md',
+						contents: ['some more random file contents'],
+					},
+					{
+						path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+						contents: ['hey hey hey'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.copilot/prompts/prompt1.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.github/prompts/default.prompt.md',
+						contents: ['oh hi, bot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.copilot/prompts/prompt5.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.github/prompts/refactor-static-classes.prompt.md',
+						contents: ['file contents'],
+					},
+					{
+						path: '/Users/legomushroom/repos/.github/prompts/prompt-name.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/.github/prompts/name-of-the-prompt.prompt.md',
+						contents: ['oh hi, raw bot!'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1309,115 +1080,63 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find correct prompts.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('with top-level `.github` folder', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'/Users/legomushroom/repos/prompts': true,
+					'/tmp/prompts/': true,
+					'/absolute/path/prompts': false,
+					'.copilot/prompts': false,
+				});
+				setWorkspaceFolders([
+					'/Users/legomushroom/repos/vscode',
+					'/Users/legomushroom/repos/node',
+					'/var/shared/prompts',
+				]);
+				await mockFiles(fileService, [
 					{
-						'/Users/legomushroom/repos/prompts': true,
-						'/tmp/prompts/': true,
-						'/absolute/path/prompts': false,
-						'.copilot/prompts': false,
+						path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+						contents: ['Hello, World!'],
 					},
-					[
-						'/Users/legomushroom/repos/vscode',
-						'/Users/legomushroom/repos/node',
-						'/var/shared/prompts',
-					],
-					[
-						{
-							name: '/Users/legomushroom/repos/prompts',
-							children: [
-								{
-									name: 'test.prompt.md',
-									contents: 'Hello, World!',
-								},
-								{
-									name: 'refactor-tests.prompt.md',
-									contents: 'some file content goes here',
-								},
-							],
-						},
-						{
-							name: '/tmp/prompts',
-							children: [
-								{
-									name: 'translate.to-rust.prompt.md',
-									contents: 'some more random file contents',
-								},
-							],
-						},
-						{
-							name: '/absolute/path/prompts',
-							children: [
-								{
-									name: 'some-prompt-file.prompt.md',
-									contents: 'hey hey hey',
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/vscode',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt1.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'default.prompt.md',
-											contents: 'oh hi, bot!',
-										},
-									],
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/node',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt5.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'refactor-static-classes.prompt.md',
-											contents: 'file contents',
-										},
-									],
-								},
-							],
-						},
-						// note! this folder is part of the workspace, so prompt files are `included`
-						{
-							name: '/var/shared/prompts/.github/prompts',
-							children: [
-								{
-									name: 'prompt-name.prompt.md',
-									contents: 'oh hi, robot!',
-								},
-								{
-									name: 'name-of-the-prompt.prompt.md',
-									contents: 'oh hi, raw bot!',
-								},
-							],
-						},
-					]);
+					{
+						path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+						contents: ['some file content goes here'],
+					},
+					{
+						path: '/tmp/prompts/translate.to-rust.prompt.md',
+						contents: ['some more random file contents'],
+					},
+					{
+						path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+						contents: ['hey hey hey'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.copilot/prompts/prompt1.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.github/prompts/default.prompt.md',
+						contents: ['oh hi, bot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.copilot/prompts/prompt5.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.github/prompts/refactor-static-classes.prompt.md',
+						contents: ['file contents'],
+					},
+					{
+						path: '/var/shared/prompts/.github/prompts/prompt-name.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/var/shared/prompts/.github/prompts/name-of-the-prompt.prompt.md',
+						contents: ['oh hi, raw bot!'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1432,116 +1151,64 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find correct prompts.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('with disabled `.github/prompts` location', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'/Users/legomushroom/repos/prompts': true,
+					'/tmp/prompts/': true,
+					'/absolute/path/prompts': false,
+					'.copilot/prompts': false,
+					'.github/prompts': false,
+				});
+				setWorkspaceFolders([
+					'/Users/legomushroom/repos/vscode',
+					'/Users/legomushroom/repos/node',
+					'/var/shared/prompts',
+				]);
+				await mockFiles(fileService, [
 					{
-						'/Users/legomushroom/repos/prompts': true,
-						'/tmp/prompts/': true,
-						'/absolute/path/prompts': false,
-						'.copilot/prompts': false,
-						'.github/prompts': false,
+						path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+						contents: ['Hello, World!'],
 					},
-					[
-						'/Users/legomushroom/repos/vscode',
-						'/Users/legomushroom/repos/node',
-						'/var/shared/prompts',
-					],
-					[
-						{
-							name: '/Users/legomushroom/repos/prompts',
-							children: [
-								{
-									name: 'test.prompt.md',
-									contents: 'Hello, World!',
-								},
-								{
-									name: 'refactor-tests.prompt.md',
-									contents: 'some file content goes here',
-								},
-							],
-						},
-						{
-							name: '/tmp/prompts',
-							children: [
-								{
-									name: 'translate.to-rust.prompt.md',
-									contents: 'some more random file contents',
-								},
-							],
-						},
-						{
-							name: '/absolute/path/prompts',
-							children: [
-								{
-									name: 'some-prompt-file.prompt.md',
-									contents: 'hey hey hey',
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/vscode',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt1.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'default.prompt.md',
-											contents: 'oh hi, bot!',
-										},
-									],
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/node',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt5.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'refactor-static-classes.prompt.md',
-											contents: 'file contents',
-										},
-									],
-								},
-							],
-						},
-						// note! this folder is part of the workspace, so prompt files are `included`
-						{
-							name: '/var/shared/prompts/.github/prompts',
-							children: [
-								{
-									name: 'prompt-name.prompt.md',
-									contents: 'oh hi, robot!',
-								},
-								{
-									name: 'name-of-the-prompt.prompt.md',
-									contents: 'oh hi, raw bot!',
-								},
-							],
-						},
-					]);
+					{
+						path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+						contents: ['some file content goes here'],
+					},
+					{
+						path: '/tmp/prompts/translate.to-rust.prompt.md',
+						contents: ['some more random file contents'],
+					},
+					{
+						path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+						contents: ['hey hey hey'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.copilot/prompts/prompt1.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.github/prompts/default.prompt.md',
+						contents: ['oh hi, bot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.copilot/prompts/prompt5.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.github/prompts/refactor-static-classes.prompt.md',
+						contents: ['file contents'],
+					},
+					{
+						path: '/var/shared/prompts/.github/prompts/prompt-name.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/var/shared/prompts/.github/prompts/name-of-the-prompt.prompt.md',
+						contents: ['oh hi, raw bot!'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1552,119 +1219,67 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find correct prompts.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('mixed', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'/Users/legomushroom/repos/**/*test*': true,
+					'.copilot/prompts': false,
+					'.github/prompts': true,
+					'/absolute/path/prompts/some-prompt-file.prompt.md': true,
+				});
+				setWorkspaceFolders([
+					'/Users/legomushroom/repos/vscode',
+					'/Users/legomushroom/repos/node',
+					'/var/shared/prompts',
+				]);
+				await mockFiles(fileService, [
 					{
-						'/Users/legomushroom/repos/**/*test*': true,
-						'.copilot/prompts': false,
-						'.github/prompts': true,
-						'/absolute/path/prompts/some-prompt-file.prompt.md': true,
+						path: '/Users/legomushroom/repos/prompts/test.prompt.md',
+						contents: ['Hello, World!'],
 					},
-					[
-						'/Users/legomushroom/repos/vscode',
-						'/Users/legomushroom/repos/node',
-						'/var/shared/prompts',
-					],
-					[
-						{
-							name: '/Users/legomushroom/repos/prompts',
-							children: [
-								{
-									name: 'test.prompt.md',
-									contents: 'Hello, World!',
-								},
-								{
-									name: 'refactor-tests.prompt.md',
-									contents: 'some file content goes here',
-								},
-								{
-									name: 'elf.prompt.md',
-									contents: 'haalo!',
-								},
-							],
-						},
-						{
-							name: '/tmp/prompts',
-							children: [
-								{
-									name: 'translate.to-rust.prompt.md',
-									contents: 'some more random file contents',
-								},
-							],
-						},
-						{
-							name: '/absolute/path/prompts',
-							children: [
-								{
-									name: 'some-prompt-file.prompt.md',
-									contents: 'hey hey hey',
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/vscode',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt1.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'default.prompt.md',
-											contents: 'oh hi, bot!',
-										},
-									],
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/node',
-							children: [
-								{
-									name: '.copilot/prompts',
-									children: [
-										{
-											name: 'prompt5.prompt.md',
-											contents: 'oh hi, robot!',
-										},
-									],
-								},
-								{
-									name: '.github/prompts',
-									children: [
-										{
-											name: 'refactor-static-classes.prompt.md',
-											contents: 'file contents',
-										},
-									],
-								},
-							],
-						},
-						// note! this folder is part of the workspace, so prompt files are `included`
-						{
-							name: '/var/shared/prompts/.github/prompts',
-							children: [
-								{
-									name: 'prompt-name.prompt.md',
-									contents: 'oh hi, robot!',
-								},
-								{
-									name: 'name-of-the-prompt.prompt.md',
-									contents: 'oh hi, raw bot!',
-								},
-							],
-						},
-					]);
+					{
+						path: '/Users/legomushroom/repos/prompts/refactor-tests.prompt.md',
+						contents: ['some file content goes here'],
+					},
+					{
+						path: '/Users/legomushroom/repos/prompts/elf.prompt.md',
+						contents: ['haalo!'],
+					},
+					{
+						path: '/tmp/prompts/translate.to-rust.prompt.md',
+						contents: ['some more random file contents'],
+					},
+					{
+						path: '/absolute/path/prompts/some-prompt-file.prompt.md',
+						contents: ['hey hey hey'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.copilot/prompts/prompt1.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.github/prompts/default.prompt.md',
+						contents: ['oh hi, bot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.copilot/prompts/prompt5.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/Users/legomushroom/repos/node/.github/prompts/refactor-static-classes.prompt.md',
+						contents: ['file contents'],
+					},
+					{
+						path: '/var/shared/prompts/.github/prompts/prompt-name.prompt.md',
+						contents: ['oh hi, robot!'],
+					},
+					{
+						path: '/var/shared/prompts/.github/prompts/name-of-the-prompt.prompt.md',
+						contents: ['oh hi, raw bot!'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				assertOutcome(
 					await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1682,7 +1297,6 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find correct prompts.',
 				);
-				await locator.disposeAsync();
 			});
 		});
 
@@ -1714,72 +1328,46 @@ suite('PromptFilesLocator', () => {
 
 					for (const setting of testSettings) {
 
-						const locator = await createPromptsLocator(
-							{ [setting]: true },
-							[
-								'/Users/legomushroom/repos/vscode',
-								'/Users/legomushroom/repos/prompts',
-							],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'gen/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-								{
-									name: '/Users/legomushroom/repos/prompts',
-									children: [
-										{
-											name: 'general',
-											children: [
-												{
-													name: 'common.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'uncommon-10.prompt.md',
-													contents: 'oh hi, robot!',
-												},
-												{
-													name: 'license.md',
-													contents: 'non prompt file',
-												},
-											],
-										}
-									],
-								},
-							],
-						);
+						setLocations({ [setting]: true });
+						setWorkspaceFolders([
+							'/Users/legomushroom/repos/vscode',
+							'/Users/legomushroom/repos/prompts',
+						]);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/common.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/uncommon-10.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/license.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1794,7 +1382,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -1919,72 +1506,46 @@ suite('PromptFilesLocator', () => {
 							vscodeSettings[setting] = true;
 						}
 
-						const locator = await createPromptsLocator(
-							vscodeSettings,
-							[
-								'/Users/legomushroom/repos/vscode',
-								'/Users/legomushroom/repos/prompts',
-							],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'gen/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-								{
-									name: '/Users/legomushroom/repos/prompts',
-									children: [
-										{
-											name: 'general',
-											children: [
-												{
-													name: 'common.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'uncommon-10.prompt.md',
-													contents: 'oh hi, robot!',
-												},
-												{
-													name: 'license.md',
-													contents: 'non prompt file',
-												},
-											],
-										}
-									],
-								},
-							],
-						);
+						setLocations(vscodeSettings);
+						setWorkspaceFolders([
+							'/Users/legomushroom/repos/vscode',
+							'/Users/legomushroom/repos/prompts',
+						]);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/common.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/uncommon-10.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/license.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -1999,7 +1560,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -2043,72 +1603,46 @@ suite('PromptFilesLocator', () => {
 					];
 
 					for (const setting of testSettings) {
-						const locator = await createPromptsLocator(
-							{ [setting]: true },
-							[
-								'/Users/legomushroom/repos/vscode',
-								'/Users/legomushroom/repos/prompts',
-							],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'gen/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-								{
-									name: '/Users/legomushroom/repos/prompts',
-									children: [
-										{
-											name: 'general',
-											children: [
-												{
-													name: 'common.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'uncommon-10.prompt.md',
-													contents: 'oh hi, robot!',
-												},
-												{
-													name: 'license.md',
-													contents: 'non prompt file',
-												},
-											],
-										}
-									],
-								},
-							],
-						);
+						setLocations({ [setting]: true });
+						setWorkspaceFolders([
+							'/Users/legomushroom/repos/vscode',
+							'/Users/legomushroom/repos/prompts',
+						]);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/common.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/uncommon-10.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/license.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -2123,7 +1657,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -2278,72 +1811,46 @@ suite('PromptFilesLocator', () => {
 							vscodeSettings[setting] = true;
 						}
 
-						const locator = await createPromptsLocator(
-							vscodeSettings,
-							[
-								'/Users/legomushroom/repos/vscode',
-								'/Users/legomushroom/repos/prompts',
-							],
-							[
-								{
-									name: '/Users/legomushroom/repos/vscode',
-									children: [
-										{
-											name: 'gen/text',
-											children: [
-												{
-													name: 'my.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'nested',
-													children: [
-														{
-															name: 'specific.prompt.md',
-															contents: 'oh hi, bot!',
-														},
-														{
-															name: 'unspecific1.prompt.md',
-															contents: 'oh hi, robot!',
-														},
-														{
-															name: 'unspecific2.prompt.md',
-															contents: 'oh hi, rabot!',
-														},
-														{
-															name: 'readme.md',
-															contents: 'non prompt file',
-														},
-													],
-												}
-											],
-										},
-									],
-								},
-								{
-									name: '/Users/legomushroom/repos/prompts',
-									children: [
-										{
-											name: 'general',
-											children: [
-												{
-													name: 'common.prompt.md',
-													contents: 'oh hi, bot!',
-												},
-												{
-													name: 'uncommon-10.prompt.md',
-													contents: 'oh hi, robot!',
-												},
-												{
-													name: 'license.md',
-													contents: 'non prompt file',
-												},
-											],
-										}
-									],
-								},
-							],
-						);
+						setLocations(vscodeSettings);
+						setWorkspaceFolders([
+							'/Users/legomushroom/repos/vscode',
+							'/Users/legomushroom/repos/prompts',
+						]);
+						await mockFiles(fileService, [
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/my.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/specific.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific1.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/unspecific2.prompt.md',
+								contents: ['oh hi, rabot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/vscode/gen/text/nested/readme.md',
+								contents: ['non prompt file'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/common.prompt.md',
+								contents: ['oh hi, bot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/uncommon-10.prompt.md',
+								contents: ['oh hi, robot!'],
+							},
+							{
+								path: '/Users/legomushroom/repos/prompts/general/license.md',
+								contents: ['non prompt file'],
+							},
+						]);
+						const locator = instantiationService.createInstance(PromptFilesLocator);
 
 						assertOutcome(
 							await locator.listFiles(PromptsType.prompt, PromptsStorage.local, CancellationToken.None),
@@ -2358,7 +1865,6 @@ suite('PromptFilesLocator', () => {
 							],
 							'Must find correct prompts.',
 						);
-						await locator.disposeAsync();
 
 					}
 				});
@@ -2368,52 +1874,31 @@ suite('PromptFilesLocator', () => {
 
 	suite('instructions', () => {
 		testT('finds instructions files in subdirectories of .github/instructions', async () => {
-			const locator = await createPromptsLocator(
+			setLocations({
+				'.github/instructions': true,
+				'.claude/rules': false,
+				'~/.copilot/instructions': false,
+			});
+			setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+			await mockFiles(fileService, [
 				{
-					'.github/instructions': true,
-					'.claude/rules': false,
-					'~/.copilot/instructions': false,
+					path: '/Users/legomushroom/repos/vscode/.github/instructions/root.instructions.md',
+					contents: ['root instructions'],
 				},
-				['/Users/legomushroom/repos/vscode'],
-				[
-					{
-						name: '/Users/legomushroom/repos/vscode',
-						children: [
-							{
-								name: '.github/instructions',
-								children: [
-									{
-										name: 'root.instructions.md',
-										contents: 'root instructions',
-									},
-									{
-										name: 'frontend',
-										children: [
-											{
-												name: 'react.instructions.md',
-												contents: 'react instructions',
-											},
-											{
-												name: 'css.instructions.md',
-												contents: 'css instructions',
-											},
-										],
-									},
-									{
-										name: 'backend',
-										children: [
-											{
-												name: 'api.instructions.md',
-												contents: 'api instructions',
-											},
-										],
-									},
-								],
-							},
-						],
-					},
-				],
-			);
+				{
+					path: '/Users/legomushroom/repos/vscode/.github/instructions/frontend/react.instructions.md',
+					contents: ['react instructions'],
+				},
+				{
+					path: '/Users/legomushroom/repos/vscode/.github/instructions/frontend/css.instructions.md',
+					contents: ['css instructions'],
+				},
+				{
+					path: '/Users/legomushroom/repos/vscode/.github/instructions/backend/api.instructions.md',
+					contents: ['api instructions'],
+				},
+			]);
+			const locator = instantiationService.createInstance(PromptFilesLocator);
 
 			assertOutcome(
 				await locator.listFiles(PromptsType.instructions, PromptsStorage.local, CancellationToken.None),
@@ -2425,48 +1910,31 @@ suite('PromptFilesLocator', () => {
 				],
 				'Must find instructions files recursively in subdirectories of .github/instructions.',
 			);
-			await locator.disposeAsync();
 		});
 	});
 
 	suite('skills', () => {
 		suite('findAgentSkills', () => {
 			testT('finds skill files in configured locations', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'.claude/skills': true,
+					// disable other defaults
+					'.github/skills': false,
+					'~/.copilot/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, [
 					{
-						'.claude/skills': true,
-						// disable other defaults
-						'.github/skills': false,
-						'~/.copilot/skills': false,
-						'~/.claude/skills': false,
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/pptx/SKILL.md',
+						contents: ['# PPTX Skill'],
 					},
-					['/Users/legomushroom/repos/vscode'],
-					[
-						{
-							name: '/Users/legomushroom/repos/vscode/.claude/skills',
-							children: [
-								{
-									name: 'pptx',
-									children: [
-										{
-											name: 'SKILL.md',
-											contents: '# PPTX Skill',
-										},
-									],
-								},
-								{
-									name: 'excel',
-									children: [
-										{
-											name: 'SKILL.md',
-											contents: '# Excel Skill',
-										},
-									],
-								},
-							],
-						},
-					],
-				);
+					{
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/excel/SKILL.md',
+						contents: ['# Excel Skill'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const skills = await locator.findAgentSkills(CancellationToken.None);
 				assertOutcome(
@@ -2477,54 +1945,32 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find skill files.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('ignores folders without SKILL.md', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'.claude/skills': true,
+					// disable other defaults
+					'.github/skills': false,
+					'~/.copilot/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, [
 					{
-						'.claude/skills': true,
-						// disable other defaults
-						'.github/skills': false,
-						'~/.copilot/skills': false,
-						'~/.claude/skills': false,
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/valid-skill/SKILL.md',
+						contents: ['# Valid Skill'],
 					},
-					['/Users/legomushroom/repos/vscode'],
-					[
-						{
-							name: '/Users/legomushroom/repos/vscode/.claude/skills',
-							children: [
-								{
-									name: 'valid-skill',
-									children: [
-										{
-											name: 'SKILL.md',
-											contents: '# Valid Skill',
-										},
-									],
-								},
-								{
-									name: 'invalid-skill',
-									children: [
-										{
-											name: 'readme.md',
-											contents: 'Not a skill file',
-										},
-									],
-								},
-								{
-									name: 'another-invalid',
-									children: [
-										{
-											name: 'index.js',
-											contents: 'console.log("not a skill")',
-										},
-									],
-								},
-							],
-						},
-					],
-				);
+					{
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/invalid-skill/readme.md',
+						contents: ['Not a skill file'],
+					},
+					{
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/another-invalid/index.js',
+						contents: ['console.log("not a skill")'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const skills = await locator.findAgentSkills(CancellationToken.None);
 				assertOutcome(
@@ -2534,26 +1980,19 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must only find folders with SKILL.md.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('returns empty array when no skills exist', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'.claude/skills': true,
-						// disable other defaults
-						'.github/skills': false,
-						'~/.copilot/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[
-						{
-							name: '/Users/legomushroom/repos/vscode/.claude/skills',
-							children: [],
-						},
-					],
-				);
+				setLocations({
+					'.claude/skills': true,
+					// disable other defaults
+					'.github/skills': false,
+					'~/.copilot/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const skills = await locator.findAgentSkills(CancellationToken.None);
 				assertOutcome(
@@ -2561,21 +2000,19 @@ suite('PromptFilesLocator', () => {
 					[],
 					'Must return empty array when no skills exist.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('returns empty array when skill folder does not exist', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'.claude/skills': true,
-						// disable other defaults
-						'.github/skills': false,
-						'~/.copilot/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[], // empty filesystem
-				);
+				setLocations({
+					'.claude/skills': true,
+					// disable other defaults
+					'.github/skills': false,
+					'~/.copilot/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const skills = await locator.findAgentSkills(CancellationToken.None);
 				assertOutcome(
@@ -2583,53 +2020,31 @@ suite('PromptFilesLocator', () => {
 					[],
 					'Must return empty array when folder does not exist.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('finds skills across multiple workspace folders', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'.claude/skills': true,
+					// disable other defaults
+					'.github/skills': false,
+					'~/.copilot/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders([
+					'/Users/legomushroom/repos/vscode',
+					'/Users/legomushroom/repos/node',
+				]);
+				await mockFiles(fileService, [
 					{
-						'.claude/skills': true,
-						// disable other defaults
-						'.github/skills': false,
-						'~/.copilot/skills': false,
-						'~/.claude/skills': false,
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/skill-a/SKILL.md',
+						contents: ['# Skill A'],
 					},
-					[
-						'/Users/legomushroom/repos/vscode',
-						'/Users/legomushroom/repos/node',
-					],
-					[
-						{
-							name: '/Users/legomushroom/repos/vscode/.claude/skills',
-							children: [
-								{
-									name: 'skill-a',
-									children: [
-										{
-											name: 'SKILL.md',
-											contents: '# Skill A',
-										},
-									],
-								},
-							],
-						},
-						{
-							name: '/Users/legomushroom/repos/node/.claude/skills',
-							children: [
-								{
-									name: 'skill-b',
-									children: [
-										{
-											name: 'SKILL.md',
-											contents: '# Skill B',
-										},
-									],
-								},
-							],
-						},
-					],
-				);
+					{
+						path: '/Users/legomushroom/repos/node/.claude/skills/skill-b/SKILL.md',
+						contents: ['# Skill B'],
+					},
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const skills = await locator.findAgentSkills(CancellationToken.None);
 				assertOutcome(
@@ -2640,38 +2055,26 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must find skills across all workspace folders.',
 				);
-				await locator.disposeAsync();
 			});
 		});
 
 		suite('listFiles with PromptsType.skill', () => {
 			testT('does not list skills when location is disabled', async () => {
-				const locator = await createPromptsLocator(
+				setLocations({
+					'.claude/skills': false,
+					// disable other defaults
+					'.github/skills': false,
+					'~/.copilot/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, [
 					{
-						'.claude/skills': false,
-						// disable other defaults
-						'.github/skills': false,
-						'~/.copilot/skills': false,
-						'~/.claude/skills': false,
+						path: '/Users/legomushroom/repos/vscode/.claude/skills/pptx/SKILL.md',
+						contents: ['# PPTX Skill'],
 					},
-					['/Users/legomushroom/repos/vscode'],
-					[
-						{
-							name: '/Users/legomushroom/repos/vscode/.claude/skills',
-							children: [
-								{
-									name: 'pptx',
-									children: [
-										{
-											name: 'SKILL.md',
-											contents: '# PPTX Skill',
-										},
-									],
-								},
-							],
-						},
-					],
-				);
+				]);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const files = await locator.listFiles(PromptsType.skill, PromptsStorage.local, CancellationToken.None);
 				assertOutcome(
@@ -2679,28 +2082,26 @@ suite('PromptFilesLocator', () => {
 					[],
 					'Must not list skills when location is disabled.',
 				);
-				await locator.disposeAsync();
 			});
 		});
 
 		suite('toAbsoluteLocationsForSkills path validation', () => {
 			testT('rejects glob patterns in skill paths via getConfigBasedSourceFolders', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'skills/**': true,
-						'skills/*': true,
-						'**/skills': true,
-						// disable defaults
-						'.github/skills': false,
-						'.agents/skills': false,
-						'.claude/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'skills/**': true,
+					'skills/*': true,
+					'**/skills': true,
+					// disable defaults
+					'.github/skills': false,
+					'.agents/skills': false,
+					'.claude/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2708,24 +2109,22 @@ suite('PromptFilesLocator', () => {
 					[],
 					'Must reject glob patterns in skill paths.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('rejects absolute paths in skill paths via getConfigBasedSourceFolders', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'/absolute/path/skills': true,
-						// disable defaults
-						'.github/skills': false,
-						'.agents/skills': false,
-						'.claude/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'/absolute/path/skills': true,
+					// disable defaults
+					'.github/skills': false,
+					'.agents/skills': false,
+					'.claude/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2733,25 +2132,23 @@ suite('PromptFilesLocator', () => {
 					[],
 					'Must reject absolute paths in skill paths.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('accepts relative paths in skill paths via getConfigBasedSourceFolders', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'./my-skills': true,
-						'custom/skills': true,
-						// disable defaults
-						'.github/skills': false,
-						'.agents/skills': false,
-						'.claude/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'./my-skills': true,
+					'custom/skills': true,
+					// disable defaults
+					'.github/skills': false,
+					'.agents/skills': false,
+					'.claude/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2762,24 +2159,22 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must accept relative paths in skill paths.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('accepts parent relative paths for monorepos via getConfigBasedSourceFolders', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'../shared-skills': true,
-						// disable defaults
-						'.github/skills': false,
-						'.agents/skills': false,
-						'.claude/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'../shared-skills': true,
+					// disable defaults
+					'.github/skills': false,
+					'.agents/skills': false,
+					'.claude/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2789,24 +2184,22 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must accept parent relative paths for monorepos.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('accepts tilde paths for user home skills', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'~/my-skills': true,
-						// disable defaults
-						'.github/skills': false,
-						'.agents/skills': false,
-						'.claude/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'~/my-skills': true,
+					// disable defaults
+					'.github/skills': false,
+					'.agents/skills': false,
+					'.claude/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2816,29 +2209,27 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must accept tilde paths for user home skills.',
 				);
-				await locator.disposeAsync();
 			});
 		});
 
 		suite('getConfigBasedSourceFolders for skills', () => {
 			testT('returns source folders without glob processing', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'.claude/skills': true,
-						'custom-skills': true,
-						// explicitly disable other defaults we don't want for this test
-						'.github/skills': false,
-						'.agents/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					[
-						'/Users/legomushroom/repos/vscode',
-						'/Users/legomushroom/repos/node',
-					],
-					[],
-				);
+				setLocations({
+					'.claude/skills': true,
+					'custom-skills': true,
+					// explicitly disable other defaults we don't want for this test
+					'.github/skills': false,
+					'.agents/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders([
+					'/Users/legomushroom/repos/vscode',
+					'/Users/legomushroom/repos/node',
+				]);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2851,25 +2242,23 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must return skill source folders without glob processing.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('filters out invalid skill paths from source folders', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'.claude/skills': true,
-						'skills/**': true, // glob - should be filtered out
-						'/absolute/skills': true, // absolute - should be filtered out
-						// explicitly disable other defaults we don't want for this test
-						'.github/skills': false,
-						'.agents/skills': false,
-						'~/.copilot/skills': false,
-						'~/.agents/skills': false,
-						'~/.claude/skills': false,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'.claude/skills': true,
+					'skills/**': true, // glob - should be filtered out
+					'/absolute/skills': true, // absolute - should be filtered out
+					// explicitly disable other defaults we don't want for this test
+					'.github/skills': false,
+					'.agents/skills': false,
+					'~/.copilot/skills': false,
+					'~/.agents/skills': false,
+					'~/.claude/skills': false,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2879,17 +2268,15 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must filter out invalid skill paths.',
 				);
-				await locator.disposeAsync();
 			});
 
 			testT('includes default skill source folders from defaults', async () => {
-				const locator = await createPromptsLocator(
-					{
-						'custom-skills': true,
-					},
-					['/Users/legomushroom/repos/vscode'],
-					[],
-				);
+				setLocations({
+					'custom-skills': true,
+				});
+				setWorkspaceFolders(['/Users/legomushroom/repos/vscode']);
+				await mockFiles(fileService, []);
+				const locator = instantiationService.createInstance(PromptFilesLocator);
 
 				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
 				assertOutcome(
@@ -2907,7 +2294,6 @@ suite('PromptFilesLocator', () => {
 					],
 					'Must include default skill source folders.',
 				);
-				await locator.disposeAsync();
 			});
 		});
 	});
@@ -3212,23 +2598,22 @@ suite('PromptFilesLocator', () => {
 
 	suite('getConfigBasedSourceFolders', () => {
 		testT('gets unambiguous list of folders', async () => {
-			const locator = await createPromptsLocator(
-				{
-					'.github/prompts': true,
-					'/Users/**/repos/**': true,
-					'gen/text/**': true,
-					'gen/text/nested/*.prompt.md': true,
-					'general/*': true,
-					'/Users/legomushroom/repos/vscode/my-prompts': true,
-					'/Users/legomushroom/repos/vscode/your-prompts/*.md': true,
-					'/Users/legomushroom/repos/prompts/shared-prompts/*': true,
-				},
-				[
-					'/Users/legomushroom/repos/vscode',
-					'/Users/legomushroom/repos/prompts',
-				],
-				[],
-			);
+			setLocations({
+				'.github/prompts': true,
+				'/Users/**/repos/**': true,
+				'gen/text/**': true,
+				'gen/text/nested/*.prompt.md': true,
+				'general/*': true,
+				'/Users/legomushroom/repos/vscode/my-prompts': true,
+				'/Users/legomushroom/repos/vscode/your-prompts/*.md': true,
+				'/Users/legomushroom/repos/prompts/shared-prompts/*': true,
+			});
+			setWorkspaceFolders([
+				'/Users/legomushroom/repos/vscode',
+				'/Users/legomushroom/repos/prompts',
+			]);
+			await mockFiles(fileService, []);
+			const locator = instantiationService.createInstance(PromptFilesLocator);
 
 			assertOutcome(
 				await locator.getConfigBasedSourceFolders(PromptsType.prompt),
@@ -3245,29 +2630,25 @@ suite('PromptFilesLocator', () => {
 				],
 				'Must find correct prompts.',
 			);
-			await locator.disposeAsync();
 		});
 	});
 
 	suite('findAgentMDsInWorkspace', () => {
 		testT('finds AGENTS.md files using FileSearchProvider', async () => {
-			const locator = await createPromptsLocatorForAgentMD(
-				{},
-				['/Users/legomushroom/repos/workspace'],
-				[
-					{
-						path: '/Users/legomushroom/repos/workspace/AGENTS.md',
-						contents: ['# Root agents']
-					},
-					{
-						path: '/Users/legomushroom/repos/workspace/src/AGENTS.md',
-						contents: ['# Src agents']
-					}
-				],
-				true // has FileSearchProvider
-			);
+			setWorkspaceFolders(['/Users/legomushroom/repos/workspace']);
+			await mockFiles(fileService, [
+				{
+					path: '/Users/legomushroom/repos/workspace/AGENTS.md',
+					contents: ['# Root agents']
+				},
+				{
+					path: '/Users/legomushroom/repos/workspace/src/AGENTS.md',
+					contents: ['# Src agents']
+				}
+			]);
+			const locator = instantiationService.createInstance(PromptFilesLocator);
 
-			const result = await locator.findAgentMDsInWorkspace(CancellationToken.None);
+			const result = (await locator.findAgentMDsInWorkspace(CancellationToken.None)).map(f => f.uri);
 			assertOutcome(
 				result,
 				[
@@ -3276,31 +2657,31 @@ suite('PromptFilesLocator', () => {
 				],
 				'Must find all AGENTS.md files using search service.'
 			);
-			await locator.disposeAsync();
 		});
 
 		testT('finds AGENTS.md files using file service fallback', async () => {
-			const locator = await createPromptsLocatorForAgentMD(
-				{},
-				['/Users/legomushroom/repos/workspace'],
-				[
-					{
-						path: '/Users/legomushroom/repos/workspace/AGENTS.md',
-						contents: ['# Root agents']
-					},
-					{
-						path: '/Users/legomushroom/repos/workspace/src/AGENTS.md',
-						contents: ['# Src agents']
-					},
-					{
-						path: '/Users/legomushroom/repos/workspace/src/nested/AGENTS.md',
-						contents: ['# Nested agents']
-					}
-				],
-				false // no FileSearchProvider - should use file service fallback
-			);
+			setWorkspaceFolders(['/Users/legomushroom/repos/workspace']);
+			await mockFiles(fileService, [
+				{
+					path: '/Users/legomushroom/repos/workspace/AGENTS.md',
+					contents: ['# Root agents']
+				},
+				{
+					path: '/Users/legomushroom/repos/workspace/src/AGENTS.md',
+					contents: ['# Src agents']
+				},
+				{
+					path: '/Users/legomushroom/repos/workspace/src/nested/AGENTS.md',
+					contents: ['# Nested agents']
+				}
+			]);
+			instantiationService.stub(ISearchService, {
+				schemeHasFileSearchProvider: () => false,
+				async fileSearch() { throw new Error('FileSearchProvider not available'); }
+			});
+			const locator = instantiationService.createInstance(PromptFilesLocator);
 
-			const result = await locator.findAgentMDsInWorkspace(CancellationToken.None);
+			const result = (await locator.findAgentMDsInWorkspace(CancellationToken.None)).map(f => f.uri);
 			assertOutcome(
 				result,
 				[
@@ -3310,120 +2691,110 @@ suite('PromptFilesLocator', () => {
 				],
 				'Must find all AGENTS.md files using file service fallback.'
 			);
-			await locator.disposeAsync();
 		});
 
 		testT('handles cancellation token in file service fallback', async () => {
-			const locator = await createPromptsLocatorForAgentMD(
-				{},
-				['/Users/legomushroom/repos/workspace'],
-				[
-					{
-						path: '/Users/legomushroom/repos/workspace/AGENTS.md',
-						contents: ['# Root agents']
-					}
-				],
-				false // no FileSearchProvider
-			);
+			setWorkspaceFolders(['/Users/legomushroom/repos/workspace']);
+			await mockFiles(fileService, [
+				{
+					path: '/Users/legomushroom/repos/workspace/AGENTS.md',
+					contents: ['# Root agents']
+				}
+			]);
+			instantiationService.stub(ISearchService, {
+				schemeHasFileSearchProvider: () => false,
+				async fileSearch() { throw new Error('FileSearchProvider not available'); }
+			});
+			const locator = instantiationService.createInstance(PromptFilesLocator);
 
 			const source = new CancellationTokenSource();
 			// Cancel immediately
 			source.cancel();
-			const result = await locator.findAgentMDsInWorkspace(source.token);
+			const result = (await locator.findAgentMDsInWorkspace(source.token)).map(f => f.uri);
 			assertOutcome(
 				result,
 				[],
 				'Must return empty array when cancelled.'
 			);
-			await locator.disposeAsync();
 		});
 
-		const createPromptsLocatorForAgentMD = async (
-			configValue: unknown,
-			workspaceFolderPaths: string[],
-			filesystem: IMockFileEntry[],
-			hasFileSearchProvider: boolean
-		) => {
-			const mockFs = instantiationService.createInstance(MockFilesystem, filesystem);
-			await mockFs.mock();
+	});
 
-			instantiationService.stub(IConfigurationService, mockConfigService({
-				'explorer.excludeGitIgnore': false,
-				'files.exclude': {},
-				'search.exclude': {}
-			}));
+	suite('getWorkspaceFolderRoots', () => {
+		let locator: PromptFilesLocator;
 
-			const workspaceFolders = workspaceFolderPaths.map((path, index) => {
-				const uri = URI.file(path);
-
-				return new class extends mock<IWorkspaceFolder>() {
-					override uri = uri;
-					override name = basename(uri);
-					override index = index;
-				};
-			});
-			instantiationService.stub(IWorkspaceContextService, mockWorkspaceService(workspaceFolders));
-			instantiationService.stub(IWorkbenchEnvironmentService, {} as IWorkbenchEnvironmentService);
-			instantiationService.stub(IUserDataProfileService, new TestUserDataProfileService());
-			instantiationService.stub(ISearchService, {
-				schemeHasFileSearchProvider(scheme: string): boolean {
-					return hasFileSearchProvider;
-				},
-				async fileSearch(query: IFileQuery) {
-					if (!hasFileSearchProvider) {
-						throw new Error('FileSearchProvider not available');
-					}
-					// mock the search service
-					const fs = instantiationService.get(IFileService);
-					const findFilesInLocation = async (location: URI, results: URI[] = []) => {
-						try {
-							const resolve = await fs.resolve(location);
-							if (resolve.isFile) {
-								results.push(resolve.resource);
-							} else if (resolve.isDirectory && resolve.children) {
-								for (const child of resolve.children) {
-									await findFilesInLocation(child.resource, results);
-								}
-							}
-						} catch (error) {
-						}
-						return results;
-					};
-					const results: IFileMatch[] = [];
-					for (const folderQuery of query.folderQueries) {
-						const allFiles = await findFilesInLocation(folderQuery.folder);
-						for (const resource of allFiles) {
-							const pathInFolder = relativePath(folderQuery.folder, resource) ?? '';
-							if (query.filePattern === undefined || match(query.filePattern, pathInFolder)) {
-								results.push({ resource });
-							}
-						}
-
-					}
-					return { results, messages: [] };
-				}
-			});
-			instantiationService.stub(IPathService, {
-				userHome(options?: { preferLocal: boolean }): URI | Promise<URI> {
-					const uri = URI.file('/Users/legomushroom');
-					if (options?.preferLocal) {
-						return uri;
-					}
-					return Promise.resolve(uri);
-				}
-			} as IPathService);
-
-			const locator = instantiationService.createInstance(PromptFilesLocator);
-
-			return {
-				async findAgentMDsInWorkspace(token: CancellationToken): Promise<URI[]> {
-					return (await locator.findAgentMDsInWorkspace(token)).map(f => f.uri);
-				},
-				async disposeAsync(): Promise<void> {
-					await mockFs.delete();
-				}
-			};
+		// Override setWorkspaceFolders to also create the locator
+		const setWorkspaceFoldersForRoots = (paths: string[]) => {
+			setWorkspaceFolders(paths);
+			locator = instantiationService.createInstance(PromptFilesLocator);
 		};
+
+		testT('returns only workspace folder when it has .git', async () => {
+			setWorkspaceFoldersForRoots(['/repos/my-project']);
+			await mockFiles(fileService, [
+				{ path: '/repos/my-project/.git/HEAD', contents: ['ref: refs/heads/main'] },
+				{ path: '/repos/my-project/src/index.ts', contents: ['export {};'] },
+			]);
+
+			const roots = await locator.getWorkspaceFolderRoots(true);
+			assert.deepStrictEqual(
+				roots.map(r => r.path),
+				['/repos/my-project'],
+				'Should only return the workspace folder itself when it has .git',
+			);
+		});
+
+		testT('walks up to parent with .git when workspace folder has no .git', async () => {
+			setWorkspaceFoldersForRoots(['/repos/monorepo/packages/my-app']);
+			await mockFiles(fileService, [
+				{ path: '/repos/monorepo/.git/HEAD', contents: ['ref: refs/heads/main'] },
+				{ path: '/repos/monorepo/packages/my-app/src/index.ts', contents: ['export {};'] },
+			]);
+
+			workspaceTrustService.setTrustedUris([URI.file('/repos/monorepo')]);
+
+			const roots = await locator.getWorkspaceFolderRoots(true);
+			assert.deepStrictEqual(
+				roots.map(r => r.path).sort(),
+				[
+					'/repos/monorepo',
+					'/repos/monorepo/packages',
+					'/repos/monorepo/packages/my-app',
+				].sort(),
+				'Should include workspace folder and all parents up to the one with .git',
+			);
+		});
+
+		testT('does not walk up when includeParents is false', async () => {
+			setWorkspaceFoldersForRoots(['/repos/monorepo/packages/my-app']);
+			await mockFiles(fileService, [
+				{ path: '/repos/monorepo/.git/HEAD', contents: ['ref: refs/heads/main'] },
+				{ path: '/repos/monorepo/packages/my-app/src/index.ts', contents: ['export {};'] },
+			]);
+
+			workspaceTrustService.setTrustedUris([URI.file('/repos/monorepo')]);
+
+			const roots = await locator.getWorkspaceFolderRoots(false);
+			assert.deepStrictEqual(
+				roots.map(r => r.path),
+				['/repos/monorepo/packages/my-app'],
+				'Should only return workspace folders when includeParents is false',
+			);
+		});
+
+		testT('returns only workspace folder when no .git is found', async () => {
+			setWorkspaceFoldersForRoots(['/Users/legomushroom/my-project']);
+			await mockFiles(fileService, [
+				{ path: '/Users/legomushroom/my-project/src/index.ts', contents: ['export {};'] },
+			]);
+
+			const roots = await locator.getWorkspaceFolderRoots(true);
+			assert.deepStrictEqual(
+				roots.map(r => r.path),
+				['/Users/legomushroom/my-project'],
+				'Should only return the workspace folder when no .git is found in any parent',
+			);
+		});
 	});
 });
 
diff --git a/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_non-silent_slash_command_with_agent_and_no_supportsPromptAttachments.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_non-silent_slash_command_with_agent_and_no_supportsPromptAttachments.0.snap
new file mode 100644
index 00000000000..64219fdc9a8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_non-silent_slash_command_with_agent_and_no_supportsPromptAttachments.0.snap
@@ -0,0 +1,54 @@
+{
+  parts: [
+    {
+      range: {
+        start: 0,
+        endExclusive: 6
+      },
+      editorRange: {
+        startLineNumber: 1,
+        startColumn: 1,
+        endLineNumber: 1,
+        endColumn: 7
+      },
+      agent: {
+        id: "agent",
+        name: "agent",
+        extensionId: {
+          value: "nullExtensionDescription",
+          _lower: "nullextensiondescription"
+        },
+        extensionVersion: undefined,
+        publisherDisplayName: "",
+        extensionDisplayName: "",
+        extensionPublisherId: "",
+        locations: [ "panel" ],
+        modes: [ "ask" ],
+        metadata: {  },
+        slashCommands: [
+          {
+            name: "subCommand",
+            description: ""
+          }
+        ],
+        disambiguation: [  ]
+      },
+      kind: "agent"
+    },
+    {
+      range: {
+        start: 6,
+        endExclusive: 16
+      },
+      editorRange: {
+        startLineNumber: 1,
+        startColumn: 7,
+        endLineNumber: 1,
+        endColumn: 17
+      },
+      text: " /fix this",
+      kind: "text"
+    }
+  ],
+  text: "@agent /fix this"
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_silent_slash_command_with_agent_and_no_supportsPromptAttachments.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_silent_slash_command_with_agent_and_no_supportsPromptAttachments.0.snap
new file mode 100644
index 00000000000..235e281426e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_silent_slash_command_with_agent_and_no_supportsPromptAttachments.0.snap
@@ -0,0 +1,71 @@
+{
+  parts: [
+    {
+      range: {
+        start: 0,
+        endExclusive: 6
+      },
+      editorRange: {
+        startLineNumber: 1,
+        startColumn: 1,
+        endLineNumber: 1,
+        endColumn: 7
+      },
+      agent: {
+        id: "agent",
+        name: "agent",
+        extensionId: {
+          value: "nullExtensionDescription",
+          _lower: "nullextensiondescription"
+        },
+        extensionVersion: undefined,
+        publisherDisplayName: "",
+        extensionDisplayName: "",
+        extensionPublisherId: "",
+        locations: [ "panel" ],
+        modes: [ "ask" ],
+        metadata: {  },
+        slashCommands: [
+          {
+            name: "subCommand",
+            description: ""
+          }
+        ],
+        disambiguation: [  ]
+      },
+      kind: "agent"
+    },
+    {
+      range: {
+        start: 6,
+        endExclusive: 7
+      },
+      editorRange: {
+        startLineNumber: 1,
+        startColumn: 7,
+        endLineNumber: 1,
+        endColumn: 8
+      },
+      text: " ",
+      kind: "text"
+    },
+    {
+      range: {
+        start: 7,
+        endExclusive: 13
+      },
+      editorRange: {
+        startLineNumber: 1,
+        startColumn: 8,
+        endLineNumber: 1,
+        endColumn: 14
+      },
+      slashCommand: {
+        command: "clear",
+        silent: true
+      },
+      kind: "slash"
+    }
+  ],
+  text: "@agent /clear"
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts b/src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts
index fa6cc7ac065..fb7b45dab7c 100644
--- a/src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts
@@ -408,4 +408,36 @@ suite('ChatRequestParser', () => {
 		});
 		await assertSnapshot(result);
 	});
+
+	test('silent slash command with agent and no supportsPromptAttachments', async () => {
+		const agentsService = mockObject<IChatAgentService>()({ _serviceBrand: undefined, hasToolsAgent: false, onDidChangeAgents: Event.None });
+		agentsService.getAgentsByName.returns([getAgentWithSlashCommands([{ name: 'subCommand', description: '' }])]);
+		instantiationService.stub(IChatAgentService, agentsService);
+
+		const slashCommandService = mockObject<IChatSlashCommandService>()({ _serviceBrand: undefined });
+		slashCommandService.getCommands.returns([{ command: 'clear', silent: true }]);
+		instantiationService.stub(IChatSlashCommandService, slashCommandService);
+
+		parser = instantiationService.createInstance(ChatRequestParser);
+		const result = parser.parseChatRequest(testSessionUri, '@agent /clear', undefined, {
+			attachmentCapabilities: { supportsPromptAttachments: false }
+		});
+		await assertSnapshot(result);
+	});
+
+	test('non-silent slash command with agent and no supportsPromptAttachments', async () => {
+		const agentsService = mockObject<IChatAgentService>()({ _serviceBrand: undefined, hasToolsAgent: false, onDidChangeAgents: Event.None });
+		agentsService.getAgentsByName.returns([getAgentWithSlashCommands([{ name: 'subCommand', description: '' }])]);
+		instantiationService.stub(IChatAgentService, agentsService);
+
+		const slashCommandService = mockObject<IChatSlashCommandService>()({ _serviceBrand: undefined });
+		slashCommandService.getCommands.returns([{ command: 'fix' }]);
+		instantiationService.stub(IChatSlashCommandService, slashCommandService);
+
+		parser = instantiationService.createInstance(ChatRequestParser);
+		const result = parser.parseChatRequest(testSessionUri, '@agent /fix this', undefined, {
+			attachmentCapabilities: { supportsPromptAttachments: false }
+		});
+		await assertSnapshot(result);
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/askQuestionsTool.test.ts b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/askQuestionsTool.test.ts
index 8085c61d223..015fde819ab 100644
--- a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/askQuestionsTool.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/askQuestionsTool.test.ts
@@ -7,6 +7,7 @@ import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
 import { NullLogService } from '../../../../../../../platform/log/common/log.js';
 import { NullTelemetryService } from '../../../../../../../platform/telemetry/common/telemetryUtils.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { IChatQuestionAnswers, IChatService } from '../../../../common/chatService/chatService.js';
 import { AskQuestionsTool, IAnswerResult, IQuestion, IQuestionAnswer } from '../../../../common/tools/builtinTools/askQuestionsTool.js';
 
@@ -30,7 +31,8 @@ suite('AskQuestionsTool - convertCarouselAnswers', () => {
 		tool = store.add(new TestableAskQuestionsTool(
 			null! as IChatService,
 			NullTelemetryService,
-			new NullLogService()
+			new NullLogService(),
+			new TestConfigurationService()
 		));
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts
index 79d99695eb5..fdc83461475 100644
--- a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts
@@ -9,10 +9,10 @@ import { URI } from '../../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
 import { NullLogService } from '../../../../../../../platform/log/common/log.js';
 import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { RunSubagentTool } from '../../../../common/tools/builtinTools/runSubagentTool.js';
+import { RUN_SUBAGENT_MAX_NESTING_DEPTH, RunSubagentTool } from '../../../../common/tools/builtinTools/runSubagentTool.js';
 import { MockLanguageModelToolsService } from '../mockLanguageModelToolsService.js';
-import { IChatAgentService } from '../../../../common/participants/chatAgents.js';
-import { IChatService } from '../../../../common/chatService/chatService.js';
+import { IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService, UserSelectedTools } from '../../../../common/participants/chatAgents.js';
+import { IChatProgress, IChatService } from '../../../../common/chatService/chatService.js';
 import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../../../common/languageModels.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { IProductService } from '../../../../../../../platform/product/common/productService.js';
@@ -20,6 +20,9 @@ import { ICustomAgent, PromptsStorage } from '../../../../common/promptSyntax/se
 import { Target } from '../../../../common/promptSyntax/promptTypes.js';
 import { MockPromptsService } from '../../promptSyntax/service/mockPromptsService.js';
 import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
+import { IToolInvocation, ToolProgress } from '../../../../common/tools/languageModelToolsService.js';
+import { IChatModel } from '../../../../common/model/chatModel.js';
+import { ChatConfiguration } from '../../../../common/constants.js';
 
 suite('RunSubagentTool', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -491,4 +494,144 @@ suite('RunSubagentTool', () => {
 			});
 		});
 	});
+
+	suite('nested subagent depth tracking', () => {
+		/**
+		 * Creates a RunSubagentTool with mocked services suitable for invoke() testing.
+		 * The returned `capturedRequests` array collects every IChatAgentRequest passed to invokeAgent.
+		 */
+		let callIdCounter = 0;
+		function createInvokableTool(opts: {
+			allowInvocationsFromSubagents: boolean;
+			capturedRequests: IChatAgentRequest[];
+		}) {
+			const mockToolsService = testDisposables.add(new MockLanguageModelToolsService());
+			const configService = new TestConfigurationService({
+				[ChatConfiguration.SubagentsAllowInvocationsFromSubagents]: opts.allowInvocationsFromSubagents,
+			});
+			const promptsService = new MockPromptsService();
+
+			const mockChatAgentService: Pick<IChatAgentService, 'getDefaultAgent' | 'invokeAgent'> = {
+				getDefaultAgent() {
+					return { id: 'default-agent' } as IChatAgentService extends { getDefaultAgent(...args: infer _A): infer R } ? NonNullable<R> : never;
+				},
+				async invokeAgent(_id: string, request: IChatAgentRequest, _progress: (parts: IChatProgress[]) => void, _history: IChatAgentHistoryEntry[], _token: CancellationToken): Promise<IChatAgentResult> {
+					opts.capturedRequests.push(request);
+					return {};
+				},
+			};
+
+			const mockChatService: Pick<IChatService, 'getSession'> = {
+				getSession() {
+					return {
+						getRequests: () => [{ id: 'req-1' }],
+						acceptResponseProgress: () => { },
+					} as unknown as IChatModel;
+				},
+			};
+
+			const mockInstantiationService: Pick<IInstantiationService, 'createInstance'> = {
+				createInstance(..._args: never[]): { collect: () => Promise<void> } {
+					return { collect: async () => { } };
+				},
+			};
+
+			const tool = testDisposables.add(new RunSubagentTool(
+				mockChatAgentService as IChatAgentService,
+				mockChatService as IChatService,
+				mockToolsService,
+				{} as ILanguageModelsService,
+				new NullLogService(),
+				mockToolsService,
+				configService,
+				promptsService,
+				mockInstantiationService as IInstantiationService,
+				{} as IProductService,
+			));
+
+			return { tool, mockChatAgentService };
+		}
+
+		function createInvocation(sessionUri: URI, userSelectedTools?: UserSelectedTools): IToolInvocation {
+			return {
+				callId: `call-${++callIdCounter}`,
+				toolId: 'runSubagent',
+				parameters: { prompt: 'do something', description: 'test' },
+				context: { sessionResource: sessionUri },
+				userSelectedTools: userSelectedTools ?? { runSubagent: true },
+			} as IToolInvocation;
+		}
+
+		const countTokens = async () => 0;
+		const noProgress: ToolProgress = { report() { } };
+
+		test('disables runSubagent tool when nesting is disabled', async () => {
+			const capturedRequests: IChatAgentRequest[] = [];
+			const { tool } = createInvokableTool({ allowInvocationsFromSubagents: false, capturedRequests });
+			const sessionUri = URI.parse('test://session/depth0');
+
+			await tool.invoke(createInvocation(sessionUri), countTokens, noProgress, CancellationToken.None);
+
+			assert.strictEqual(capturedRequests.length, 1);
+			assert.strictEqual(capturedRequests[0].userSelectedTools?.['runSubagent'], false);
+		});
+
+		test('enables runSubagent tool at depth 0 when nesting is enabled', async () => {
+			const capturedRequests: IChatAgentRequest[] = [];
+			const { tool } = createInvokableTool({ allowInvocationsFromSubagents: true, capturedRequests });
+			const sessionUri = URI.parse('test://session/depth-enabled');
+
+			await tool.invoke(createInvocation(sessionUri), countTokens, noProgress, CancellationToken.None);
+
+			assert.strictEqual(capturedRequests.length, 1);
+			assert.strictEqual(capturedRequests[0].userSelectedTools?.['runSubagent'], true);
+		});
+
+		test('disables runSubagent tool when depth reaches hard limit', async () => {
+			const capturedRequests: IChatAgentRequest[] = [];
+			const sessionUri = URI.parse('test://session/depth-limit');
+
+			// When nesting is enabled, the tool enforces a hardcoded maximum depth of 5.
+			// Simulate nested invocation until we exceed the limit and ensure it disables nesting.
+			const { tool, mockChatAgentService } = createInvokableTool({ allowInvocationsFromSubagents: true, capturedRequests });
+
+			// Simulate nested invocation: the first invoke's invokeAgent callback
+			// triggers a second invoke on the same tool (same session).
+			capturedRequests.length = 0;
+			let nestedInvocations = 0;
+			mockChatAgentService.invokeAgent = async (_id: string, request: IChatAgentRequest) => {
+				capturedRequests.push(request);
+				// Keep nesting until we go beyond the hardcoded maxDepth
+				if (nestedInvocations++ < RUN_SUBAGENT_MAX_NESTING_DEPTH + 1) {
+					await tool.invoke(createInvocation(sessionUri), countTokens, noProgress, CancellationToken.None);
+				}
+				return {};
+			};
+
+			await tool.invoke(createInvocation(sessionUri), countTokens, noProgress, CancellationToken.None);
+
+			assert.ok(capturedRequests.length >= 2);
+			// At depth 0..(maxDepth-1), nesting is allowed. Once depth reaches maxDepth, the next call should disable nesting.
+			const enabledFlags = capturedRequests.map(r => r.userSelectedTools?.['runSubagent']);
+			assert.strictEqual(enabledFlags[0], true);
+			assert.strictEqual(enabledFlags[1], true);
+			assert.strictEqual(enabledFlags[RUN_SUBAGENT_MAX_NESTING_DEPTH], false);
+		});
+
+		test('depth is decremented after invoke completes', async () => {
+			const capturedRequests: IChatAgentRequest[] = [];
+			const { tool } = createInvokableTool({ allowInvocationsFromSubagents: true, capturedRequests });
+			const sessionUri = URI.parse('test://session/depth-decrement');
+
+			// First invoke
+			await tool.invoke(createInvocation(sessionUri), countTokens, noProgress, CancellationToken.None);
+			// Second invoke on same session should start at depth 0 again
+			await tool.invoke(createInvocation(sessionUri), countTokens, noProgress, CancellationToken.None);
+
+			assert.strictEqual(capturedRequests.length, 2);
+			// Both should have runSubagent enabled since depth resets after each invoke
+			assert.strictEqual(capturedRequests[0].userSelectedTools?.['runSubagent'], true);
+			assert.strictEqual(capturedRequests[1].userSelectedTools?.['runSubagent'], true);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts b/src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts
index 12819789846..a47b17723ce 100644
--- a/src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts
+++ b/src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts
@@ -11,8 +11,9 @@ import { ResourceMap } from '../../../../../../../base/common/map.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
 import { IFileContent, IReadFileOptions } from '../../../../../../../platform/files/common/files.js';
 import { IWebContentExtractorService, WebContentExtractResult } from '../../../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { testWorkspace } from '../../../../../../../platform/workspace/test/common/testWorkspace.js';
 import { FetchWebPageTool } from '../../../../electron-browser/builtInTools/fetchPageTool.js';
-import { TestFileService } from '../../../../../../test/common/workbenchTestServices.js';
+import { TestContextService, TestFileService } from '../../../../../../test/common/workbenchTestServices.js';
 import { MockTrustedDomainService } from '../../../../../url/test/browser/mockTrustedDomainService.js';
 import { InternalFetchWebPageToolId } from '../../../../common/tools/builtinTools/tools.js';
 import { MockChatService } from '../../../common/chatService/mockChatService.js';
@@ -91,6 +92,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const testUrls = [
@@ -140,6 +142,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 			new MockTrustedDomainService([]),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		// Test empty array
@@ -189,6 +192,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const preparation = await tool.prepareToolInvocation(
@@ -203,6 +207,100 @@ suite('FetchWebPageTool', () => {
 		assert.ok(messageText.includes('invalid://invalid'), 'Should mention invalid URL');
 	});
 
+	test('should not show confirmation dialog for file URIs inside the workspace', async () => {
+		// Use a workspace rooted at /workspaceRoot
+		const workspaceRoot = URI.file('/workspaceRoot');
+		const workspaceContextService = new TestContextService(testWorkspace(workspaceRoot));
+
+		const fileContentMap = new ResourceMap<string | VSBuffer>([
+			[URI.file('/workspaceRoot/plan.md'), 'Plan content'],
+			[URI.file('/workspaceRoot/subdir/notes.txt'), 'Notes content'],
+		]);
+
+		const tool = new FetchWebPageTool(
+			new TestWebContentExtractorService(new ResourceMap<string>()),
+			new ExtendedTestFileService(fileContentMap),
+			new MockTrustedDomainService([]),
+			new MockChatService(),
+			workspaceContextService,
+		);
+
+		// File inside workspace - should NOT trigger confirmation
+		const preparation = await tool.prepareToolInvocation(
+			{ parameters: { urls: [URI.file('/workspaceRoot/plan.md').toString()] }, toolCallId: 'test-file-in-ws', chatSessionResource: undefined },
+			CancellationToken.None
+		);
+		assert.ok(preparation, 'Should return prepared invocation');
+		assert.strictEqual(preparation.confirmationMessages?.title, undefined, 'File inside workspace should not show confirmation dialog');
+		assert.strictEqual(preparation.confirmationMessages?.confirmResults, false, 'File inside workspace should not require post-confirmation');
+	});
+
+	test('should show confirmation dialog for file URIs outside the workspace', async () => {
+		// Use a workspace rooted at /workspaceRoot
+		const workspaceRoot = URI.file('/workspaceRoot');
+		const workspaceContextService = new TestContextService(testWorkspace(workspaceRoot));
+
+		const fileContentMap = new ResourceMap<string | VSBuffer>([
+			[URI.file('/tmp/external-plan.md'), 'External plan content'],
+		]);
+
+		const tool = new FetchWebPageTool(
+			new TestWebContentExtractorService(new ResourceMap<string>()),
+			new ExtendedTestFileService(fileContentMap),
+			new MockTrustedDomainService([]),
+			new MockChatService(),
+			workspaceContextService,
+		);
+
+		// File outside workspace - should still trigger confirmation
+		const preparation = await tool.prepareToolInvocation(
+			{ parameters: { urls: [URI.file('/tmp/external-plan.md').toString()] }, toolCallId: 'test-file-outside-ws', chatSessionResource: undefined },
+			CancellationToken.None
+		);
+		assert.ok(preparation, 'Should return prepared invocation');
+		assert.ok(preparation.confirmationMessages?.title, 'File outside workspace should show confirmation dialog');
+		assert.strictEqual(preparation.confirmationMessages?.confirmResults, true, 'File outside workspace should require post-confirmation');
+	});
+
+	test('workspace file mixed with untrusted web URI: only web URI triggers confirmation', async () => {
+		const workspaceRoot = URI.file('/workspaceRoot');
+		const workspaceContextService = new TestContextService(testWorkspace(workspaceRoot));
+
+		const webContentMap = new ResourceMap<string>([
+			[URI.parse('https://example.com'), 'Web content']
+		]);
+		const fileContentMap = new ResourceMap<string | VSBuffer>([
+			[URI.file('/workspaceRoot/plan.md'), 'Plan content']
+		]);
+
+		const tool = new FetchWebPageTool(
+			new TestWebContentExtractorService(webContentMap),
+			new ExtendedTestFileService(fileContentMap),
+			new MockTrustedDomainService([]), // No trusted domains
+			new MockChatService(),
+			workspaceContextService,
+		);
+
+		// Mix: one untrusted web URI + one workspace file URI
+		const preparation = await tool.prepareToolInvocation(
+			{
+				parameters: { urls: ['https://example.com', URI.file('/workspaceRoot/plan.md').toString()] },
+				toolCallId: 'test-mixed',
+				chatSessionResource: undefined
+			},
+			CancellationToken.None
+		);
+		assert.ok(preparation, 'Should return prepared invocation');
+		// Confirmation should only be for the web URI
+		assert.ok(preparation.confirmationMessages?.title, 'Should show confirmation for untrusted web URI');
+		// The confirmation message should mention only the web URI, not the workspace file
+		const msgValue = typeof preparation.confirmationMessages?.message === 'string'
+			? preparation.confirmationMessages.message
+			: preparation.confirmationMessages?.message?.value ?? '';
+		assert.ok(!msgValue.includes('/workspaceRoot/'), 'Confirmation message should not mention workspace file');
+		assert.ok(msgValue.includes('example.com'), 'Confirmation message should mention web URI');
+	});
+
 	test('should approve when all URLs were mentioned in chat', async () => {
 		const webContentMap = new ResourceMap<string>([
 			[URI.parse('https://valid.com'), 'Valid content']
@@ -227,6 +325,7 @@ suite('FetchWebPageTool', () => {
 					};
 				},
 			}),
+			new TestContextService(),
 		);
 
 		const preparation1 = await tool.prepareToolInvocation(
@@ -261,6 +360,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const result = await tool.invoke(
@@ -309,6 +409,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const result = await tool.invoke(
@@ -350,6 +451,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const result = await tool.invoke(
@@ -397,6 +499,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const result = await tool.invoke(
@@ -463,6 +566,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const result = await tool.invoke(
@@ -503,6 +607,7 @@ suite('FetchWebPageTool', () => {
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
 			new MockChatService(),
+			new TestContextService(),
 		);
 
 		const result = await tool.invoke(
@@ -547,6 +652,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const testUrls = [
@@ -606,6 +712,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService([]),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const testUrls = [
@@ -642,6 +749,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const testUrls = [
@@ -684,6 +792,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const testUrls = [
@@ -732,6 +841,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()), // Empty - all file ,
 				new MockTrustedDomainService([]),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const testUrls = [
@@ -766,6 +876,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService([]),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const result = await tool.invoke(
@@ -792,6 +903,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const result = await tool.invoke(
@@ -829,6 +941,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const result = await tool.invoke(
@@ -856,6 +969,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const result = await tool.invoke(
@@ -888,6 +1002,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const result = await tool.invoke(
@@ -914,6 +1029,7 @@ suite('FetchWebPageTool', () => {
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
 				new MockChatService(),
+				new TestContextService(),
 			);
 
 			const result = await tool.invoke(
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
index d7ba992c32d..b2c7dbedd4a 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
@@ -19,8 +19,8 @@ import { timeout } from '../../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
-import { prepareQuery } from '../../../../../base/common/fuzzyScorer.js';
-import { SymbolKind } from '../../../../../editor/common/languages.js';
+import { prepareQuery, IPreparedQuery } from '../../../../../base/common/fuzzyScorer.js';
+import { DocumentSymbol, SymbolKind } from '../../../../../editor/common/languages.js';
 import { fuzzyScore } from '../../../../../base/common/filters.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -34,6 +34,8 @@ import { ILanguageFeaturesService } from '../../../../../editor/common/services/
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { accessibilityHelpIsShown, accessibleViewIsShown } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { matchesFuzzyIconAware, parseLabelWithIcons } from '../../../../../base/common/iconLabels.js';
+import { IChatWidgetService } from '../../../chat/browser/chat.js';
+import { ISymbolVariableEntry } from '../../../chat/common/attachments/chatVariableEntries.js';
 
 export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
 
@@ -45,6 +47,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 		@IOutlineService private readonly outlineService: IOutlineService,
 		@IOutlineModelService outlineModelService: IOutlineModelService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 	) {
 		super(languageFeaturesService, outlineModelService, {
 			openSideBySideDirection: () => this.configuration.openSideBySideDirection
@@ -121,6 +124,31 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 		return this.doGetSymbolPicks(this.getDocumentSymbols(model, token), prepareQuery(filter), options, token, model);
 	}
 
+	protected override async doGetSymbolPicks(symbolsPromise: Promise<DocumentSymbol[]>, query: IPreparedQuery, options: { extraContainerLabel?: string } | undefined, token: CancellationToken, model: ITextModel): Promise<Array<IGotoSymbolQuickPickItem | IQuickPickSeparator>> {
+		const picks = await super.doGetSymbolPicks(symbolsPromise, query, options, token, model);
+		const modelUri = model.uri;
+		for (const pick of picks) {
+			const symbolPick = pick as IGotoSymbolQuickPickItem;
+			if (symbolPick.range && !symbolPick.attach) {
+				symbolPick.attach = () => {
+					const widget = this.chatWidgetService.lastFocusedWidget;
+					if (!widget) {
+						return;
+					}
+					const entry: ISymbolVariableEntry = {
+						kind: 'symbol',
+						id: JSON.stringify({ uri: modelUri.toString(), range: symbolPick.range!.decoration }),
+						name: symbolPick.symbolName ?? symbolPick.label,
+						value: { uri: modelUri, range: symbolPick.range!.decoration },
+						symbolKind: symbolPick.kind,
+					};
+					widget.attachmentModel.addContext(entry);
+				};
+			}
+		}
+		return picks;
+	}
+
 	//#endregion
 
 	protected override provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index bf2f59505c9..feca14ac94b 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -25,16 +25,18 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { OS } from '../../../../base/common/platform.js';
 import { IEditorPane } from '../../../common/editor.js';
 import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
 import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IHistoryService } from '../../../services/history/common/history.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind, IAdapterManager, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, IGlobalConfig, IGuessedDebugger, ILaunch } from '../common/debug.js';
+import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind, IAdapterManager, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, IGlobalConfig, IGuessedDebugger, ILaunch, isDebugConfig } from '../common/debug.js';
 import { launchSchema } from '../common/debugSchemas.js';
-import { getVisibleAndSorted } from '../common/debugUtils.js';
+import { getEffectiveConfigForPlatform, getVisibleAndSorted } from '../common/debugUtils.js';
 import { debugConfigure } from './debugIcons.js';
 
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
@@ -62,6 +64,7 @@ export class ConfigurationManager implements IConfigurationManager {
 	private debugConfigurationTypeContext: IContextKey<string>;
 	private readonly _onDidChangeConfigurationProviders = new Emitter<void>();
 	public readonly onDidChangeConfigurationProviders = this._onDidChangeConfigurationProviders.event;
+	private targetOperatingSystem = OS;
 
 	constructor(
 		private readonly adapterManager: IAdapterManager,
@@ -73,6 +76,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IHistoryService private readonly historyService: IHistoryService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ILogService private readonly logService: ILogService,
 	) {
@@ -92,6 +96,23 @@ export class ConfigurationManager implements IConfigurationManager {
 		} else if (this.launches.length > 0) {
 			this.selectConfiguration(undefined, previousSelectedName, undefined, dynamicConfig);
 		}
+		this.resolveTargetOperatingSystem();
+	}
+
+	private resolveTargetOperatingSystem(): void {
+		this.remoteAgentService.getEnvironment().then(environment => {
+			const targetOperatingSystem = environment?.os ?? OS;
+			if (this.targetOperatingSystem !== targetOperatingSystem) {
+				this.targetOperatingSystem = targetOperatingSystem;
+				this._onDidSelectConfigurationName.fire();
+			}
+		}, () => {
+			// Ignore remote environment failures and fall back to the local OS.
+		});
+	}
+
+	getTargetOperatingSystem() {
+		return this.targetOperatingSystem;
 	}
 
 	registerDebugConfigurationProvider(debugConfigurationProvider: IDebugConfigurationProvider): IDisposable {
@@ -533,7 +554,8 @@ abstract class AbstractLaunch implements ILaunch {
 			if (config.compounds) {
 				configurations.push(...config.compounds.filter(compound => typeof compound.name === 'string' && compound.configurations && compound.configurations.length));
 			}
-			return getVisibleAndSorted(configurations).map(c => c.name);
+			const resolved = configurations.map(c => isDebugConfig(c) ? getEffectiveConfigForPlatform(c, this.configurationManager.getTargetOperatingSystem()) : c);
+			return getVisibleAndSorted(resolved).map(c => c.name);
 		}
 	}
 
@@ -548,12 +570,14 @@ abstract class AbstractLaunch implements ILaunch {
 			return;
 		}
 
+		const effectiveConfiguration = getEffectiveConfigForPlatform(configuration, this.configurationManager.getTargetOperatingSystem());
+
 		if (this instanceof UserLaunch) {
-			return { ...configuration, __configurationTarget: ConfigurationTarget.USER };
+			return { ...effectiveConfiguration, __configurationTarget: ConfigurationTarget.USER };
 		} else if (this instanceof WorkspaceLaunch) {
-			return { ...configuration, __configurationTarget: ConfigurationTarget.WORKSPACE };
+			return { ...effectiveConfiguration, __configurationTarget: ConfigurationTarget.WORKSPACE };
 		} else {
-			return { ...configuration, __configurationTarget: ConfigurationTarget.WORKSPACE_FOLDER };
+			return { ...effectiveConfiguration, __configurationTarget: ConfigurationTarget.WORKSPACE_FOLDER };
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 2aaeed08888..a29b51b09ad 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -834,6 +834,12 @@ export interface IGlobalConfig {
 	configurations: IConfig[];
 }
 
+export interface IConfigPresentation {
+	hidden?: boolean;
+	group?: string;
+	order?: number;
+}
+
 interface IEnvConfig {
 	internalConsoleOptions?: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
 	preRestartTask?: string | ITaskIdentifier;
@@ -843,12 +849,7 @@ interface IEnvConfig {
 	debugServer?: number;
 	noDebug?: boolean;
 	suppressMultipleSessionWarning?: boolean;
-}
-
-export interface IConfigPresentation {
-	hidden?: boolean;
-	group?: string;
-	order?: number;
+	presentation?: IConfigPresentation;
 }
 
 export interface IConfig extends IEnvConfig {
@@ -879,6 +880,10 @@ export interface ICompound {
 	presentation?: IConfigPresentation;
 }
 
+export function isDebugConfig(thing: IConfig | ICompound): thing is IConfig {
+	return 'type' in thing && 'request' in thing;
+}
+
 export interface IDebugAdapter extends IDisposable {
 	readonly onError: Event<Error>;
 	readonly onExit: Event<number | null>;
diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts
index cf8490229f9..4e673774783 100644
--- a/src/vs/workbench/contrib/debug/common/debugUtils.ts
+++ b/src/vs/workbench/contrib/debug/common/debugUtils.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
-import { IDebuggerContribution, IDebugSession, IConfigPresentation, State } from './debug.js';
+import { IDebuggerContribution, IDebugSession, IConfig, IConfigPresentation, State } from './debug.js';
 import { URI as uri } from '../../../../base/common/uri.js';
 import { isAbsolute } from '../../../../base/common/path.js';
 import { deepClone } from '../../../../base/common/objects.js';
@@ -17,6 +17,7 @@ import { IRange, Range } from '../../../../editor/common/core/range.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { OperatingSystem, OS } from '../../../../base/common/platform.js';
 
 const _formatPIIRegexp = /{([^}]+)}/g;
 
@@ -330,7 +331,6 @@ function convertPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePath: (toDA:
 		}
 	}
 }
-
 export function getVisibleAndSorted<T extends { presentation?: IConfigPresentation }>(array: T[]): T[] {
 	return array.filter(config => !config.presentation?.hidden).sort((first, second) => {
 		if (!first.presentation) {
@@ -413,3 +413,33 @@ export function resolveChildSession(session: IDebugSession, allSessions: readonl
 	// Return the original session if it has no children
 	return session;
 }
+
+type IPlatformSpecificConfig = NonNullable<IConfig['windows']>;
+
+function getPlatformSpecificConfig(config: IConfig, os: OperatingSystem): IPlatformSpecificConfig | undefined {
+	switch (os) {
+		case OperatingSystem.Windows:
+			return config.windows;
+		case OperatingSystem.Macintosh:
+			return config.osx;
+		case OperatingSystem.Linux:
+			return config.linux;
+	}
+}
+
+export function getEffectiveConfigForPlatform(config: IConfig, os: OperatingSystem = OS): IConfig {
+	const platformConfig = getPlatformSpecificConfig(config, os);
+	if (!platformConfig) {
+		return config;
+	}
+
+	return {
+		...config,
+		...platformConfig,
+		presentation: platformConfig.presentation ? { ...config.presentation, ...platformConfig.presentation } : config.presentation,
+	};
+}
+
+export function getEffectivePresentationForConfig(config: IConfig, os: OperatingSystem = OS): IConfigPresentation | undefined {
+	return getEffectiveConfigForPlatform(config, os).presentation;
+}
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
index c9e63e55900..ecbb3b1ba44 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
@@ -7,26 +7,26 @@ import assert from 'assert';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Event } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { OperatingSystem, OS } from '../../../../../base/common/platform.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
-import { FileService } from '../../../../../platform/files/common/fileService.js';
-import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
-import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { NullLogService } from '../../../../../platform/log/common/log.js';
-import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IRemoteAgentEnvironment } from '../../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { ConfigurationManager } from '../../browser/debugConfigurationManager.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterManager, IConfig, IDebugAdapterExecutable, IDebugSession } from '../../common/debug.js';
 import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
-import { TestQuickInputService } from '../../../../test/browser/workbenchTestServices.js';
-import { TestHistoryService, TestContextService, TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { ITestInstantiationService, TestRemoteAgentService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
 
 suite('debugConfigurationManager', () => {
 	const configurationProviderType = 'custom-type';
 	let _debugConfigurationManager: ConfigurationManager;
 	let disposables: DisposableStore;
+	let instantiationService: ITestInstantiationService;
+	let contextService: TestContextService;
 
 	const adapterManager = <IAdapterManager>{
 		getDebugAdapterDescriptor(session: IDebugSession, config: IConfig): Promise<IDebugAdapterExecutable | undefined> {
@@ -47,22 +47,22 @@ suite('debugConfigurationManager', () => {
 	};
 
 	const configurationService = new TestConfigurationService();
+	let remoteAgentService: IRemoteAgentService;
+
+	function createConfigurationManager(): ConfigurationManager {
+		instantiationService.stub(IWorkspaceContextService, contextService);
+		instantiationService.stub(IConfigurationService, configurationService);
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		instantiationService.stub(IPreferencesService, preferencesService);
+		return disposables.add(instantiationService.createInstance(ConfigurationManager, adapterManager));
+	}
+
 	setup(() => {
 		disposables = new DisposableStore();
-		const fileService = disposables.add(new FileService(new NullLogService()));
-		const instantiationService = disposables.add(new TestInstantiationService(new ServiceCollection([IPreferencesService, preferencesService], [IConfigurationService, configurationService])));
-		_debugConfigurationManager = new ConfigurationManager(
-			adapterManager,
-			new TestContextService(),
-			configurationService,
-			new TestQuickInputService(),
-			instantiationService,
-			new TestStorageService(),
-			new TestExtensionService(),
-			new TestHistoryService(),
-			new UriIdentityService(fileService),
-			disposables.add(new ContextKeyService(configurationService)),
-			new NullLogService());
+		instantiationService = workbenchInstantiationService(undefined, disposables);
+		contextService = new TestContextService();
+		remoteAgentService = new TestRemoteAgentService();
+		_debugConfigurationManager = createConfigurationManager();
 	});
 
 	teardown(() => disposables.dispose());
@@ -130,5 +130,54 @@ suite('debugConfigurationManager', () => {
 		assert.strictEqual((resultConfig as any).configurationResolved, true, 'Configuration should be updated by test provider');
 	});
 
+	test('uses remote target OS when computing visible configurations', async () => {
+		class LinuxRemoteAgentService extends TestRemoteAgentService {
+			override async getEnvironment(): Promise<IRemoteAgentEnvironment> {
+				return {
+					pid: 1,
+					connectionToken: 'token',
+					appRoot: URI.file('/remote/app'),
+					execPath: '/remote/app/node',
+					tmpDir: URI.file('/remote/tmp'),
+					settingsPath: URI.file('/remote/settings.json'),
+					mcpResource: URI.file('/remote/mcp.json'),
+					logsPath: URI.file('/remote/logs'),
+					extensionHostLogsPath: URI.file('/remote/ext-logs'),
+					globalStorageHome: URI.file('/remote/global-storage'),
+					workspaceStorageHome: URI.file('/remote/workspace-storage'),
+					localHistoryHome: URI.file('/remote/local-history'),
+					userHome: URI.file('/remote/home'),
+					os: OperatingSystem.Linux,
+					arch: 'x64',
+					marks: [],
+					useHostProxy: false,
+					profiles: {
+						all: [],
+						home: URI.file('/remote/profiles')
+					},
+					isUnsupportedGlibc: false
+				};
+			}
+		}
+
+		remoteAgentService = new LinuxRemoteAgentService();
+		contextService = new TestContextService();
+		configurationService.setUserConfiguration('launch', {
+			version: '0.2.0',
+			configurations: [
+				{ type: 'node', request: 'launch', name: 'visible', presentation: { hidden: false } },
+				{ type: 'node', request: 'launch', name: 'linux-hidden', linux: { presentation: { hidden: true } } }
+			]
+		});
+		disposables.delete(_debugConfigurationManager);
+		_debugConfigurationManager = createConfigurationManager();
+
+		if (OS !== OperatingSystem.Linux) {
+			await Event.toPromise(_debugConfigurationManager.onDidSelectConfiguration);
+		}
+
+		assert.deepStrictEqual(_debugConfigurationManager.getAllConfigurations().map(({ name }) => name), ['visible']);
+	});
+
 	teardown(() => disposables.clear());
 });
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts
index 4743a73d2c2..9a9db4dd0cd 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugUtils.test.ts
@@ -4,9 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { IConfig } from '../../common/debug.js';
-import { formatPII, getExactExpressionStartAndEnd, getVisibleAndSorted } from '../../common/debugUtils.js';
+import { formatPII, getEffectiveConfigForPlatform, getEffectivePresentationForConfig, getExactExpressionStartAndEnd, getVisibleAndSorted } from '../../common/debugUtils.js';
+
+function platformSection(os: OperatingSystem, value: NonNullable<IConfig['windows']>): Pick<IConfig, 'windows' | 'osx' | 'linux'> {
+	switch (os) {
+		case OperatingSystem.Windows:
+			return { windows: value };
+		case OperatingSystem.Macintosh:
+			return { osx: value };
+		case OperatingSystem.Linux:
+			return { linux: value };
+	}
+}
 
 suite('Debug - Utils', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -51,6 +63,56 @@ suite('Debug - Utils', () => {
 		assert.deepStrictEqual(getExactExpressionStartAndEnd('...variable', 5, 5), { start: 4, end: 11 });
 	});
 
+	test('getEffectivePresentationForConfig - platform override', () => {
+		// No platform override: returns base presentation
+		const config1: IConfig = { type: 'node', request: 'launch', name: 'a', presentation: { hidden: false } };
+		assert.deepStrictEqual(getEffectivePresentationForConfig(config1, OperatingSystem.Macintosh), { hidden: false });
+
+		// Platform-specific presentation overrides base hidden value
+		const config2: IConfig = {
+			type: 'node', request: 'launch', name: 'b',
+			presentation: { hidden: false },
+			...platformSection(OperatingSystem.Windows, { presentation: { hidden: true } })
+		};
+		assert.deepStrictEqual(getEffectivePresentationForConfig(config2, OperatingSystem.Windows), { hidden: true });
+
+		// Non-matching platform override does not affect result
+		const config3: IConfig = {
+			type: 'node', request: 'launch', name: 'c',
+			presentation: { hidden: false },
+			...platformSection(OperatingSystem.Windows, { presentation: { hidden: true } })
+		};
+		assert.deepStrictEqual(getEffectivePresentationForConfig(config3, OperatingSystem.Linux), { hidden: false });
+
+		// No base presentation, platform-specific sets hidden
+		const config4: IConfig = {
+			type: 'node', request: 'launch', name: 'd',
+			...platformSection(OperatingSystem.Macintosh, { presentation: { hidden: true } })
+		};
+		assert.deepStrictEqual(getEffectivePresentationForConfig(config4, OperatingSystem.Macintosh), { hidden: true });
+
+		// Platform-specific merges with base (group and order preserved)
+		const config5: IConfig = {
+			type: 'node', request: 'launch', name: 'e',
+			presentation: { group: 'myGroup', order: 2 },
+			...platformSection(OperatingSystem.Linux, { presentation: { hidden: true } })
+		};
+		assert.deepStrictEqual(getEffectivePresentationForConfig(config5, OperatingSystem.Linux), { group: 'myGroup', order: 2, hidden: true });
+
+		// Platform-specific config overrides other launch attributes while preserving nested sections
+		const config6: IConfig = {
+			type: 'node', request: 'launch', name: 'f',
+			preLaunchTask: 'base-task',
+			presentation: { group: 'base' },
+			...platformSection(OperatingSystem.Windows, { preLaunchTask: 'windows-task', presentation: { hidden: true } })
+		};
+		assert.deepStrictEqual(getEffectiveConfigForPlatform(config6, OperatingSystem.Windows), {
+			...config6,
+			preLaunchTask: 'windows-task',
+			presentation: { group: 'base', hidden: true }
+		});
+	});
+
 	test('config presentation', () => {
 		const configs: IConfig[] = [];
 		configs.push({
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts
index 2a2ae1cc5d6..55fb2fdf16f 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts
@@ -212,6 +212,8 @@ class TrackedDocumentInfo extends Disposable {
 				trigger: EditTelemetryTrigger;
 				languageId: string;
 				statsUuid: string;
+				conversationId: string | undefined;
+				requestId: string | undefined;
 				modifiedCount: number;
 				deltaModifiedCount: number;
 				totalModifiedCount: number;
@@ -229,6 +231,8 @@ class TrackedDocumentInfo extends Disposable {
 
 				languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language id of the document.' };
 				statsUuid: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The unique identifier of the session for which stats are reported. The sourceKey is unique in this session.' };
+				conversationId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The chat conversation identifier when the edit source comes from chat. Sourced from the chat edit session id.' };
+				requestId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The chat request identifier when the edit source comes from chat.' };
 
 				trigger: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Indicates why the session ended.' };
 
@@ -248,6 +252,8 @@ class TrackedDocumentInfo extends Disposable {
 				trigger,
 				languageId: this._doc.document.languageId.get(),
 				statsUuid: statsUuid,
+				conversationId: repr.props.$$sessionId,
+				requestId: repr.props.$$requestId,
 				modifiedCount: value,
 				deltaModifiedCount: deltaModifiedCount,
 				totalModifiedCount: data.totalModifiedCharactersInFinalState,
diff --git a/src/vs/workbench/contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.ts b/src/vs/workbench/contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.ts
index f8e3072a474..85eeeee5438 100644
--- a/src/vs/workbench/contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.ts
+++ b/src/vs/workbench/contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.ts
@@ -69,7 +69,7 @@ export class EmergencyAlert extends Disposable implements IWorkbenchContribution
 	}
 
 	private async doFetchAlerts(url: string): Promise<void> {
-		const requestResult = await this.requestService.request({ type: 'GET', url, disableCache: true, timeout: 20000 }, CancellationToken.None);
+		const requestResult = await this.requestService.request({ type: 'GET', url, disableCache: true, timeout: 20000, callSite: 'emergencyAlert.doFetchAlerts' }, CancellationToken.None);
 
 		if (requestResult.res.statusCode !== 200) {
 			throw new Error(`Failed to fetch emergency alerts: HTTP ${requestResult.res.statusCode}`);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 2842ef3b7d2..9ca8f603041 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -985,7 +985,7 @@ export class ExtensionEditor extends EditorPane {
 		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
 
 		this.contentDisposables.add(dependenciesTree);
-		scrollableContent.scanDomNode();
+		depLayout();
 
 		return Promise.resolve({ focus() { dependenciesTree.domFocus(); } });
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index ff48f40cbed..cf21e94d059 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -1197,11 +1197,11 @@ export class ExtensionsListView extends AbstractExtensionsListView<IExtension> {
 	}
 
 	static isInstalledExtensionsQuery(query: string): boolean {
-		return /@installed$/i.test(query);
+		return /@installed$/i.test(query) && !/@mcp/i.test(query) && !/@agentPlugins/i.test(query);
 	}
 
 	static isSearchInstalledExtensionsQuery(query: string): boolean {
-		return /@installed\s./i.test(query) || this.isFeatureExtensionsQuery(query);
+		return (/@installed\s./i.test(query) && !/@mcp/i.test(query) && !/@agentPlugins/i.test(query)) || this.isFeatureExtensionsQuery(query);
 	}
 
 	static isOutdatedExtensionsQuery(query: string): boolean {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index 8daf6dc9427..7b5cb760b3a 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -417,7 +417,8 @@
 	background: url('loading.svg') center center no-repeat;
 }
 
-.extension-editor > .body > .content > .monaco-scrollable-element {
+.extension-editor > .body > .content > .monaco-scrollable-element,
+.extension-editor > .body > .content > .details > .content-container > .monaco-scrollable-element {
 	height: 100%;
 }
 
@@ -592,7 +593,8 @@
 	box-sizing: border-box;
 }
 
-.extension-editor > .body > .content > .monaco-scrollable-element > .subcontent {
+.extension-editor > .body > .content > .monaco-scrollable-element > .subcontent,
+.extension-editor > .body > .content > .details > .content-container > .monaco-scrollable-element > .subcontent {
 	height: 100%;
 	padding: 20px;
 	overflow-y: scroll;
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
index 46120a9e645..77c1661c677 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
@@ -100,7 +100,7 @@ export async function createSlowExtensionAction(
 	const url = `https://api.github.com/search/issues?q=is:issue+state:open+in:title+repo:${info.owner}/${info.repo}+%22Extension+causes+high+cpu+load%22`;
 	let res: IRequestContext;
 	try {
-		res = await requestService.request({ url }, CancellationToken.None);
+		res = await requestService.request({ url, callSite: 'extensionsSlowActions.getSlowExtensionAction' }, CancellationToken.None);
 	} catch {
 		return undefined;
 	}
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
index d635e1c0c48..4b1d2cafd74 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
@@ -247,6 +247,10 @@ suite('ExtensionsViews Tests', () => {
 		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@disabled searchText'), true);
 		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@outdated searchText'), true);
 		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@updates searchText'), true);
+		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@agentPlugins @installed'), false);
+		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@agentPlugins @installed searchText'), false);
+		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@mcp @installed'), false);
+		assert.strictEqual(ExtensionsListView.isLocalExtensionsQuery('@mcp @installed searchText'), false);
 	});
 
 	test('Test empty query equates to sort by install count', async () => {
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index 53918c80b78..8f36c834a3a 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -459,7 +459,7 @@ configurationRegistry.registerConfiguration({
 								type: 'string', // expression ({ "**/*.js": { "when": "$(basename).js" } })
 								pattern: '\\w*\\$\\(basename\\)\\w*',
 								default: '$(basename).ext',
-								description: nls.localize('explorer.autoRevealExclude.when', 'Additional check on the siblings of a matching file. Use $(basename) as variable for the matching file name.')
+								description: nls.localize('explorer.autoRevealExclude.when', 'Additional check on the siblings of a matching file. Use {0} as variable for the matching file name.', '$(basename)')
 							}
 						}
 					}
diff --git a/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts
index 5581931a9e7..f7f07298866 100644
--- a/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts
@@ -52,7 +52,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor: ServicesAccessor) => {
 		const editorService = accessor.get(IEditorService);
 		const activeInput = editorService.activeEditor;
-		const resource = EditorResourceAccessor.getOriginalUri(activeInput, { filterByScheme: Schemas.file, supportSideBySide: SideBySideEditor.PRIMARY });
+		const resource = EditorResourceAccessor.getOriginalUri(activeInput, { filterByScheme: [Schemas.file], supportSideBySide: SideBySideEditor.PRIMARY });
 		const resources = resource ? [resource] : [];
 		revealResourcesInOS(resources, accessor.get(INativeHostService), accessor.get(IWorkspaceContextService));
 	}
diff --git a/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts b/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts
index ec009a1c697..c158f460de2 100644
--- a/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts
@@ -8,20 +8,46 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { sequence } from '../../../../base/common/async.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { getRemoteName, getRemoteServerRootPath } from '../../../../platform/remote/common/remoteHosts.js';
 
 // Commands
 
 export function revealResourcesInOS(resources: URI[], nativeHostService: INativeHostService, workspaceContextService: IWorkspaceContextService): void {
 	if (resources.length) {
 		sequence(resources.map(r => async () => {
-			if (r.scheme === Schemas.file || r.scheme === Schemas.vscodeUserData) {
-				nativeHostService.showItemInFolder(r.with({ scheme: Schemas.file }).fsPath);
+			const localUri = toLocalFileUri(r);
+			if (localUri) {
+				nativeHostService.showItemInFolder(localUri.fsPath);
 			}
 		}));
 	} else if (workspaceContextService.getWorkspace().folders.length) {
-		const uri = workspaceContextService.getWorkspace().folders[0].uri;
-		if (uri.scheme === Schemas.file) {
-			nativeHostService.showItemInFolder(uri.fsPath);
+		const localUri = toLocalFileUri(workspaceContextService.getWorkspace().folders[0].uri);
+		if (localUri) {
+			nativeHostService.showItemInFolder(localUri.fsPath);
 		}
 	}
 }
+
+/**
+ * Converts a resource URI to a local file URI.
+ * For WSL remote resources, constructs a UNC path (e.g. \\wsl$\Ubuntu\...).
+ */
+function toLocalFileUri(resource: URI): URI | undefined {
+	switch (resource.scheme) {
+		case Schemas.file:
+		case Schemas.vscodeUserData:
+			return resource.with({ scheme: Schemas.file });
+		case Schemas.vscodeRemote: {
+			const remoteName = getRemoteName(resource.authority);
+			if (remoteName === 'wsl') {
+				const distro = getRemoteServerRootPath(resource.authority);
+				if (distro) {
+					return URI.from({ scheme: Schemas.file, authority: 'wsl$', path: `/${distro}${resource.path}` });
+				}
+			}
+			return undefined;
+		}
+		default:
+			return undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/git/browser/gitService.ts b/src/vs/workbench/contrib/git/browser/gitService.ts
index ca34f506015..f9403bd33f1 100644
--- a/src/vs/workbench/contrib/git/browser/gitService.ts
+++ b/src/vs/workbench/contrib/git/browser/gitService.ts
@@ -85,4 +85,8 @@ export class GitRepository extends Disposable implements IGitRepository {
 	async diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<GitDiffChange[]> {
 		return this.delegate.diffBetweenWithStats(this.rootUri, ref1, ref2, path);
 	}
+
+	async diffBetweenWithStats2(ref: string, path?: string): Promise<GitDiffChange[]> {
+		return this.delegate.diffBetweenWithStats2(this.rootUri, ref, path);
+	}
 }
diff --git a/src/vs/workbench/contrib/git/common/gitService.ts b/src/vs/workbench/contrib/git/common/gitService.ts
index ce605402b6f..cbaa386370d 100644
--- a/src/vs/workbench/contrib/git/common/gitService.ts
+++ b/src/vs/workbench/contrib/git/common/gitService.ts
@@ -74,6 +74,7 @@ export interface IGitRepository {
 
 	getRefs(query: GitRefQuery, token?: CancellationToken): Promise<GitRef[]>;
 	diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<GitDiffChange[]>;
+	diffBetweenWithStats2(ref: string, path?: string): Promise<GitDiffChange[]>;
 }
 
 export interface IGitExtensionDelegate {
@@ -82,6 +83,7 @@ export interface IGitExtensionDelegate {
 
 	getRefs(root: URI, query?: GitRefQuery, token?: CancellationToken): Promise<GitRef[]>;
 	diffBetweenWithStats(root: URI, ref1: string, ref2: string, path?: string): Promise<GitDiffChange[]>;
+	diffBetweenWithStats2(root: URI, ref: string, path?: string): Promise<GitDiffChange[]>;
 }
 
 export const IGitService = createDecorator<IGitService>('gitService');
diff --git a/src/vs/workbench/contrib/imageCarousel/AGENTS.md b/src/vs/workbench/contrib/imageCarousel/AGENTS.md
new file mode 100644
index 00000000000..4cf1b28f215
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/AGENTS.md
@@ -0,0 +1,69 @@
+# Image Carousel
+
+A generic workbench editor for viewing collections of images in a carousel/slideshow UI. Opens as a modal editor pane with navigation arrows, a caption, and a thumbnail strip.
+
+## Architecture
+
+The image carousel is a self-contained workbench contribution that follows the **custom editor** pattern:
+
+- **URI scheme**: `vscode-image-carousel` (registered in `Schemas` in `src/vs/base/common/network.ts`) — used for `EditorInput.resource` identity.
+- **Direct editor input**: Callers create `ImageCarouselEditorInput` with a collection and open it directly via `IEditorService.openEditor()`.
+- **Image extraction**: Chat integration builds a **sections-based** collection from chat request/response items. A section can include user-attached request images alongside response-derived images (tool invocations and inline references). For paired request/response items, the section title prefers the user's chat request message; pending requests with image attachments form their own section.
+
+## How to open the carousel
+
+### From code (generic)
+
+```ts
+const collection: IImageCarouselCollection = { id, title, sections: [{ title: '', images: [...] }] };
+const input = new ImageCarouselEditorInput(collection, startIndex);
+await editorService.openEditor(input, { pinned: true }, MODAL_GROUP);
+```
+
+### From chat (via click handler)
+
+Clicking an image attachment pill in chat (when `chat.imageCarousel.enabled` is true) executes the `workbench.action.chat.openImageInCarousel` command, which collects request attachment images together with response-derived images for the current chat session and opens them in the carousel. MIME types are resolved via `getMediaMime()` from `src/vs/base/common/mime.ts`.
+
+## Key design decisions
+
+### Editor & lifecycle
+
+- **Modal editor**: Opens in `MODAL_GROUP` (-4) as an overlay.
+- **Not restorable**: `canSerialize()` returns `false` — image data is in-memory only.
+- **Collection ID = chat session identity**: `sessionResource + '_carousel'` for stable dedup via `EditorInput.matches()`.
+- **Preview-gated**: `chat.imageCarousel.enabled` (default `false`, tagged `preview`). When off, clicks fall through to `openResource()`.
+- **Exact image matching**: Finds the clicked image within the constructed collection by URI first, then falls back to byte equality when needed.
+
+### DOM & rendering
+
+- **DOM construction**: Uses the `h()` helper from `vs/base/browser/dom` with `@name` references for declarative DOM — no imperative `document.createElement` calls.
+- **Bottom bar**: Caption and thumbnail sections are wrapped in a `div.bottom-bar` flex column below the image area.
+- **Stable DOM skeleton**: Builds DOM once per `setInput()`, updates only changing parts to avoid flash on navigation.
+- **Blob URL lifecycle**: Main image URLs tracked in `_imageDisposables` (revoked on nav), thumbnails in `_contentDisposables` (revoked on `clearInput()`).
+- **Focus border suppressed**: The slideshow container uses `outline: none !important` on `:focus` / `:focus-visible` to override the workbench's global `[tabindex="0"]` focus styles.
+
+### Keyboard & focus
+
+- **Keyboard parity**: Uses `registerOpenEditorListeners` (click, double-click, Enter, Space) matching other attachment widgets.
+- **Arrow key navigation**: Handled via DOM `keydown` listener with `stopPropagation()` — not Action2 keybindings, because the modal editor's `KEY_DOWN` handler blocks `workbench.*` commands not in its allowlist. The editor overrides `focus()` to forward focus to the slideshow container so arrow keys work immediately without clicking.
+
+### Zoom
+
+Zoom state is `ZoomScale = number | 'fit'` held in `_zoomScale`.
+
+| Gesture | Effect |
+|---------|--------|
+| Click | Zoom in one level |
+| Alt+click (Mac) / Ctrl+click (Win/Linux) | Zoom out one level |
+| Ctrl+scroll (Win/Linux) or Alt+scroll (Mac) | Continuous zoom (~7.5% per tick) |
+| Trackpad pinch | Zoom (reported as `wheel` + `e.ctrlKey`) |
+
+Predefined zoom levels: 10%, 20%, 30%, …, 100%, 150%, 200%, 300%, 500%, 700%, 1000%, 1500%, 2000%. Click cycles through these levels.
+
+`_applyZoom(scale)` is the central method:
+- `'fit'` → adds `scale-to-fit` class, clears `img.style.zoom`, removes `.zoomed` from container
+- numeric → sets `img.style.zoom`, adds `.zoomed` on the container (enabling `overflow: auto` for panning with themed scrollbars), preserves scroll center using `dx/dy` ratio math, adds `pixelated` class at ≥ 3× zoom
+
+Zoom always resets to `'fit'` when navigating to a different image.
+
+Cursor changes to `zoom-out` when the zoom-out modifier key is held (via `.zoom-out` class on the container).
diff --git a/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.ts b/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.ts
new file mode 100644
index 00000000000..967dd0feffd
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.ts
@@ -0,0 +1,311 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/imageCarousel.css';
+import { localize, localize2 } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../../../common/editor.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { ImageCarouselEditor } from './imageCarouselEditor.js';
+import { ImageCarouselEditorInput } from './imageCarouselEditorInput.js';
+import { ICarouselImage, IImageCarouselCollection } from './imageCarouselTypes.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExplorerFolderContext } from '../../files/common/files.js';
+import { IExplorerService } from '../../files/browser/files.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { getMediaMime } from '../../../../base/common/mime.js';
+import { URI } from '../../../../base/common/uri.js';
+import { basename, dirname, extname } from '../../../../base/common/resources.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+
+// --- Configuration ---
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	id: 'imageCarousel',
+	title: localize('imageCarouselConfigurationTitle', "Images Preview"),
+	type: 'object',
+	properties: {
+		'imageCarousel.explorerContextMenu.enabled': {
+			type: 'boolean',
+			default: true,
+			markdownDescription: localize('imageCarousel.explorerContextMenu.enabled', "Controls whether the **Open in Images Preview** option appears in the Explorer context menu."),
+			tags: ['experimental'],
+		},
+		'imageCarousel.chat.enabled': {
+			type: 'boolean',
+			default: true,
+			description: localize('imageCarousel.chat.enabled', "Controls whether clicking an image attachment in chat opens the Images Preview viewer."),
+			tags: ['experimental'],
+		},
+	}
+});
+
+// --- Editor Pane Registration ---
+
+Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
+	EditorPaneDescriptor.create(
+		ImageCarouselEditor,
+		ImageCarouselEditor.ID,
+		localize('imageCarouselEditor', "Images Preview")
+	),
+	[
+		new SyncDescriptor(ImageCarouselEditorInput)
+	]
+);
+
+// --- Serializer ---
+
+class ImageCarouselEditorInputSerializer implements IEditorSerializer {
+	canSerialize(): boolean {
+		return false;
+	}
+
+	serialize(): string | undefined {
+		return undefined;
+	}
+
+	deserialize(): ImageCarouselEditorInput | undefined {
+		return undefined;
+	}
+}
+
+Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory)
+	.registerEditorSerializer(ImageCarouselEditorInput.ID, ImageCarouselEditorInputSerializer);
+
+// --- Args Types ---
+
+interface IOpenCarouselCollectionArgs {
+	readonly collection: IImageCarouselCollection;
+	readonly startIndex: number;
+}
+
+interface IOpenCarouselSingleImageArgs {
+	readonly name: string;
+	readonly mimeType: string;
+	readonly data: Uint8Array;
+	readonly title?: string;
+}
+
+function isCollectionArgs(args: unknown): args is IOpenCarouselCollectionArgs {
+	return typeof args === 'object' && args !== null
+		&& typeof (args as IOpenCarouselCollectionArgs).collection === 'object'
+		&& typeof (args as IOpenCarouselCollectionArgs).startIndex === 'number';
+}
+
+function isSingleImageArgs(args: unknown): args is IOpenCarouselSingleImageArgs {
+	return typeof args === 'object' && args !== null
+		&& typeof (args as IOpenCarouselSingleImageArgs).name === 'string'
+		&& typeof (args as IOpenCarouselSingleImageArgs).mimeType === 'string'
+		&& (args as IOpenCarouselSingleImageArgs).data instanceof Uint8Array;
+}
+
+// --- Actions ---
+
+class OpenImageInCarouselAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.chat.openImageInCarousel',
+			title: localize2('openImageInCarousel', "Open in Images Preview"),
+			f1: false
+		});
+	}
+
+	async run(accessor: ServicesAccessor, args?: unknown): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+
+		let collection: IImageCarouselCollection;
+		let startIndex: number;
+
+		if (isCollectionArgs(args)) {
+			collection = args.collection;
+			startIndex = args.startIndex;
+		} else if (isSingleImageArgs(args)) {
+			collection = {
+				id: generateUuid(),
+				title: args.title ?? localize('imageCarousel.title', "Images Preview"),
+				sections: [{
+					title: '',
+					images: [{
+						id: generateUuid(),
+						name: args.name,
+						mimeType: args.mimeType,
+						data: VSBuffer.wrap(args.data),
+					}],
+				}],
+			};
+			startIndex = 0;
+		} else {
+			return;
+		}
+
+		const input = new ImageCarouselEditorInput(collection, startIndex);
+		await editorService.openEditor(input, { pinned: true });
+	}
+}
+
+registerAction2(OpenImageInCarouselAction);
+
+// --- Explorer Context Menu Integration ---
+
+/** Supported media (image + video) extensions for the carousel explorer context menu. */
+const MEDIA_EXTENSION_REGEX = /^\.(png|jpg|jpeg|jpe|gif|webp|svg|bmp|ico|mp4|webm)$/i;
+
+function isMediaResource(uri: URI): boolean {
+	return MEDIA_EXTENSION_REGEX.test(extname(uri));
+}
+
+async function collectImageFilesFromFolder(fileService: IFileService, folderUri: URI): Promise<URI[]> {
+	const stat = await fileService.resolve(folderUri);
+	const imageUris: URI[] = [];
+	if (stat.children) {
+		for (const child of stat.children) {
+			if (child.isFile && isMediaResource(child.resource)) {
+				imageUris.push(child.resource);
+			}
+		}
+	}
+	imageUris.sort((a, b) => basename(a).localeCompare(basename(b)));
+	return imageUris;
+}
+
+function createImageEntries(uris: URI[]): ICarouselImage[] {
+	return uris.map(uri => ({
+		id: generateUuid(),
+		name: basename(uri),
+		mimeType: getMediaMime(uri.path) ?? 'image/png',
+		uri,
+	}));
+}
+
+class OpenImagesInCarouselFromExplorerAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.openImagesInCarousel',
+			title: localize2('openImagesInCarousel', "Open in Images Preview"),
+			f1: false,
+			menu: [{
+				id: MenuId.ExplorerContext,
+				group: 'navigation',
+				order: 25,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.has('config.imageCarousel.explorerContextMenu.enabled'),
+					ContextKeyExpr.or(
+						ExplorerFolderContext,
+						ContextKeyExpr.regex(ResourceContextKey.Extension.key, MEDIA_EXTENSION_REGEX),
+					),
+				),
+			}],
+		});
+	}
+
+	async run(accessor: ServicesAccessor, resource?: URI): Promise<void> {
+		const explorerService = accessor.get(IExplorerService);
+		const fileService = accessor.get(IFileService);
+		const editorService = accessor.get(IEditorService);
+		const notificationService = accessor.get(INotificationService);
+		const contextService = accessor.get(IWorkspaceContextService);
+
+		const context = explorerService.getContext(true);
+
+		let imageUris: URI[] = [];
+		let startUri: URI | undefined;
+
+		try {
+			if (context.length === 0) {
+				// Empty-space right-click: the explorer passes the workspace root
+				// as the resource argument. Fall back to the first workspace folder
+				// when no resource is available.
+				let folderUri: URI | undefined;
+				if (URI.isUri(resource)) {
+					folderUri = resource;
+				} else {
+					const folders = contextService.getWorkspace().folders;
+					if (folders.length > 0) {
+						folderUri = folders[0].uri;
+					}
+				}
+
+				if (folderUri) {
+					imageUris = await collectImageFilesFromFolder(fileService, folderUri);
+				}
+			} else {
+				const hasSingleImageFile = context.length === 1 && !context[0].isDirectory && isMediaResource(context[0].resource);
+
+				if (hasSingleImageFile) {
+					// Single image: show all sibling images in the same folder with
+					// the selected image focused
+					startUri = context[0].resource;
+					const parentUri = dirname(context[0].resource);
+					imageUris = await collectImageFilesFromFolder(fileService, parentUri);
+				} else {
+					// Multiple items or a folder: collect images from selection,
+					// deduplicating in case a folder and its children are both selected
+					const seen = new ResourceSet();
+					for (const item of context) {
+						if (item.isDirectory) {
+							const folderImages = await collectImageFilesFromFolder(fileService, item.resource);
+							for (const uri of folderImages) {
+								if (!seen.has(uri)) {
+									seen.add(uri);
+									imageUris.push(uri);
+								}
+							}
+						} else if (isMediaResource(item.resource)) {
+							if (!seen.has(item.resource)) {
+								seen.add(item.resource);
+								imageUris.push(item.resource);
+								if (!startUri) {
+									startUri = item.resource;
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch {
+			notificationService.error(localize('folderReadError', "Could not read folder contents."));
+			return;
+		}
+
+		if (imageUris.length === 0) {
+			notificationService.info(localize('noImagesFound', "No images found in this folder."));
+			return;
+		}
+
+		const images = createImageEntries(imageUris);
+
+		let startIndex = 0;
+		if (startUri) {
+			const idx = images.findIndex(img => img.uri?.toString() === startUri!.toString());
+			if (idx >= 0) {
+				startIndex = idx;
+			}
+		}
+
+		const collection: IImageCarouselCollection = {
+			id: generateUuid(),
+			title: localize('imageCarousel.explorerTitle', "Images Preview"),
+			sections: [{
+				title: '',
+				images,
+			}],
+		};
+
+		const input = new ImageCarouselEditorInput(collection, startIndex);
+		await editorService.openEditor(input, { pinned: true });
+	}
+}
+
+registerAction2(OpenImagesInCarouselFromExplorerAction);
diff --git a/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.ts b/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.ts
new file mode 100644
index 00000000000..611656daca9
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.ts
@@ -0,0 +1,659 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { addDisposableListener, clearNode, Dimension, EventType, h } from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { localize } from '../../../../nls.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
+import { ImageCarouselEditorInput } from './imageCarouselEditorInput.js';
+import { ICarouselImage, ICarouselSection, isVideoMimeType } from './imageCarouselTypes.js';
+
+/**
+ * A flat entry referencing a specific image within a section, used
+ * for global index-based navigation across all sections.
+ */
+interface IFlatImageEntry {
+	readonly sectionIndex: number;
+	readonly imageIndexInSection: number;
+	readonly image: ICarouselImage;
+}
+
+type ZoomScale = number | 'fit';
+
+const SCALE_PINCH_FACTOR = 0.075;
+const MAX_SCALE = 20;
+const MIN_SCALE = 0.1;
+const PIXELATION_THRESHOLD = 3;
+const ZOOM_LEVELS = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.5, 2, 3, 5, 7, 10, 15, 20];
+
+export class ImageCarouselEditor extends EditorPane {
+	static readonly ID = 'workbench.editor.imageCarousel';
+
+	private _container: HTMLElement | undefined;
+	private _currentIndex: number = 0;
+	private _zoomScale: ZoomScale = 'fit';
+	private _sections: ReadonlyArray<ICarouselSection> = [];
+	private _flatImages: IFlatImageEntry[] = [];
+	private readonly _contentDisposables = this._register(new DisposableStore());
+	private readonly _imageDisposables = this._register(new DisposableStore());
+	private readonly _blobUrlCache = new Map<string, string>();
+
+	private _videoWebview: IWebviewElement | undefined;
+	private _elements: {
+		root: HTMLElement;
+		imageArea: HTMLElement;
+		mainImageContainer: HTMLElement;
+		mainImage: HTMLImageElement;
+		videoContainer: HTMLElement;
+		captionText: HTMLElement;
+		captionSeparator: HTMLElement;
+		counter: HTMLElement;
+		prevBtn: HTMLButtonElement;
+		nextBtn: HTMLButtonElement;
+		sectionsContainer: HTMLElement;
+	} | undefined;
+	private _thumbnailElements: HTMLElement[] = [];
+
+	constructor(
+		group: IEditorGroup,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService themeService: IThemeService,
+		@IStorageService storageService: IStorageService,
+		@IFileService private readonly _fileService: IFileService,
+		@IWebviewService private readonly _webviewService: IWebviewService
+	) {
+		super(ImageCarouselEditor.ID, group, telemetryService, themeService, storageService);
+	}
+
+	protected override createEditor(parent: HTMLElement): void {
+		this._container = h('div.image-carousel-editor').root;
+		parent.appendChild(this._container);
+	}
+
+	override async setInput(input: ImageCarouselEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		await super.setInput(input, options, context, token);
+
+		this._sections = input.collection.sections;
+		this._flatImages = [];
+		for (let s = 0; s < this._sections.length; s++) {
+			for (let i = 0; i < this._sections[s].images.length; i++) {
+				this._flatImages.push({ sectionIndex: s, imageIndexInSection: i, image: this._sections[s].images[i] });
+			}
+		}
+		this._currentIndex = Math.min(input.startIndex, Math.max(0, this._flatImages.length - 1));
+		this.buildSlideshow();
+	}
+
+	override clearInput(): void {
+		this._videoWebview?.dispose();
+		this._videoWebview = undefined;
+		this._contentDisposables.clear();
+		this._imageDisposables.clear();
+		this._revokeCachedBlobUrls();
+		this._zoomScale = 'fit';
+		if (this._container) {
+			clearNode(this._container);
+		}
+		this._elements = undefined;
+		this._thumbnailElements = [];
+		super.clearInput();
+	}
+
+	private _isCurrentVideo(): boolean {
+		const entry = this._flatImages[this._currentIndex];
+		return !!entry && isVideoMimeType(entry.image.mimeType);
+	}
+
+	/**
+	 * Build the full DOM skeleton. Called once per setInput.
+	 */
+	private buildSlideshow(): void {
+		if (!this._container) {
+			return;
+		}
+
+		this._contentDisposables.clear();
+		this._imageDisposables.clear();
+		this._revokeCachedBlobUrls();
+		clearNode(this._container);
+
+		if (this._flatImages.length === 0) {
+			const empty = h('div.empty-message');
+			empty.root.textContent = localize('imageCarousel.noImages', "No images to display");
+			this._container.appendChild(empty.root);
+			return;
+		}
+
+		const elements = h('div.slideshow-container', [
+			h('div.image-area@imageArea', [
+				h('div.main-image-container@mainImageContainer', [
+					h('img.main-image@mainImage'),
+					h('div.video-container@videoContainer'),
+				]),
+				h('button.nav-arrow.prev-arrow@prevBtn', { ariaLabel: localize('imageCarousel.previousImage', "Previous image") }, [
+					h('span.codicon.codicon-chevron-left'),
+				]),
+				h('button.nav-arrow.next-arrow@nextBtn', { ariaLabel: localize('imageCarousel.nextImage', "Next image") }, [
+					h('span.codicon.codicon-chevron-right'),
+				]),
+			]),
+			h('div.bottom-bar@bottomBar', [
+				h('div.image-info-bar', [
+					h('span.caption-text@captionText'),
+					h('span.caption-separator@captionSeparator'),
+					h('span.image-counter@counter'),
+				]),
+				h('div.sections-container@sectionsContainer'),
+			]),
+		]);
+
+		this._elements = {
+			root: elements.root,
+			imageArea: elements.imageArea,
+			mainImageContainer: elements.mainImageContainer,
+			mainImage: elements.mainImage as HTMLImageElement,
+			videoContainer: elements.videoContainer,
+			captionText: elements.captionText,
+			captionSeparator: elements.captionSeparator,
+			counter: elements.counter,
+			prevBtn: elements.prevBtn as HTMLButtonElement,
+			nextBtn: elements.nextBtn as HTMLButtonElement,
+			sectionsContainer: elements.sectionsContainer,
+		};
+
+		// Initialize image in fit mode
+		this._elements.mainImage.classList.add('scale-to-fit');
+
+		// Hide video container initially
+		this._elements.videoContainer.style.display = 'none';
+
+		// Navigation listeners
+		this._contentDisposables.add(addDisposableListener(this._elements.prevBtn, 'click', () => {
+			if (this._currentIndex > 0) {
+				this._currentIndex--;
+				this.updateCurrentImage();
+			}
+		}));
+		this._contentDisposables.add(addDisposableListener(this._elements.nextBtn, 'click', () => {
+			if (this._currentIndex < this._flatImages.length - 1) {
+				this._currentIndex++;
+				this.updateCurrentImage();
+			}
+		}));
+
+		// Keyboard navigation
+		this._contentDisposables.add(addDisposableListener(elements.root, EventType.KEY_DOWN, e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.keyCode === KeyCode.LeftArrow) {
+				this.previous();
+				event.stopPropagation();
+				event.preventDefault();
+			} else if (event.keyCode === KeyCode.RightArrow) {
+				this.next();
+				event.stopPropagation();
+				event.preventDefault();
+			}
+		}));
+		elements.root.tabIndex = 0;
+
+		// Zoom: scroll wheel + modifier key (Ctrl on Win/Linux, Alt on Mac) or pinch
+		this._contentDisposables.add(addDisposableListener(this._elements.imageArea, EventType.MOUSE_WHEEL, (e: WheelEvent) => {
+			if (this._isCurrentVideo()) {
+				return;
+			}
+			const isZoomModifier = isMacintosh ? e.altKey : e.ctrlKey;
+			if (!isZoomModifier && !e.ctrlKey) {
+				return;
+			}
+			e.preventDefault();
+
+			if (e.deltaY === 0) {
+				return;
+			}
+
+			if (this._zoomScale === 'fit') {
+				this._initZoomFromFit();
+			}
+
+			const delta = e.deltaY > 0 ? 1 : -1;
+			this._applyZoom((this._zoomScale as number) * (1 - delta * SCALE_PINCH_FACTOR));
+		}, { passive: false }));
+
+		// Zoom: single click to zoom in/out (like image preview)
+		// Track modifier keys at mousedown time
+		let clickCtrlPressed = false;
+		let clickAltPressed = false;
+		this._contentDisposables.add(addDisposableListener(this._elements.mainImageContainer, EventType.MOUSE_DOWN, (e: MouseEvent) => {
+			if (e.button !== 0) {
+				return;
+			}
+			clickCtrlPressed = e.ctrlKey;
+			clickAltPressed = e.altKey;
+		}));
+		this._contentDisposables.add(addDisposableListener(this._elements.mainImageContainer, EventType.CLICK, (e: MouseEvent) => {
+			if (e.button !== 0 || this._isCurrentVideo()) {
+				return;
+			}
+			const isZoomOut = isMacintosh ? clickAltPressed : clickCtrlPressed;
+			if (isZoomOut) {
+				this._zoomOut();
+			} else {
+				this._zoomIn();
+			}
+		}));
+
+		// Update zoom-out cursor class when modifier key is held
+		const updateZoomCursor = (e: KeyboardEvent) => {
+			const isZoomOut = isMacintosh ? e.altKey : e.ctrlKey;
+			this._elements!.mainImageContainer.classList.toggle('zoom-out', isZoomOut);
+		};
+		this._contentDisposables.add(addDisposableListener(elements.root, EventType.KEY_DOWN, updateZoomCursor));
+		this._contentDisposables.add(addDisposableListener(elements.root, EventType.KEY_UP, updateZoomCursor));
+
+		// Build section thumbnails
+		this._thumbnailElements = [];
+		let flatIndex = 0;
+		for (let s = 0; s < this._sections.length; s++) {
+			const section = this._sections[s];
+
+			// Add separator between sections (not before the first)
+			if (s > 0 && this._sections.length > 1) {
+				this._elements.sectionsContainer.appendChild(h('div.thumbnail-separator').root);
+			}
+
+			for (let i = 0; i < section.images.length; i++) {
+				const image = section.images[i];
+				const currentFlatIndex = flatIndex;
+				const isItemVideo = isVideoMimeType(image.mimeType);
+
+				const btn = document.createElement('button');
+				btn.className = isItemVideo ? 'thumbnail video-thumbnail' : 'thumbnail';
+				btn.ariaLabel = isItemVideo
+					? localize('imageCarousel.thumbnailLabelVideo', "Video {0} of {1}", currentFlatIndex + 1, this._flatImages.length)
+					: localize('imageCarousel.thumbnailLabelImage', "Image {0} of {1}", currentFlatIndex + 1, this._flatImages.length);
+
+				if (isItemVideo) {
+					const icon = h('span.codicon.codicon-play.thumbnail-play-icon');
+					icon.root.setAttribute('aria-hidden', 'true');
+					btn.appendChild(icon.root);
+				} else {
+					const img = document.createElement('img');
+					img.className = 'thumbnail-image';
+					this._loadBlobUrl(image).then(url => {
+						img.src = url;
+					}, () => {
+						btn.classList.add('broken');
+					});
+					img.alt = image.name;
+					this._contentDisposables.add(addDisposableListener(img, 'error', () => {
+						btn.classList.add('broken');
+					}));
+					btn.appendChild(img);
+				}
+
+				this._contentDisposables.add(addDisposableListener(btn, 'click', () => {
+					this._currentIndex = currentFlatIndex;
+					this.updateCurrentImage();
+				}));
+
+				this._elements.sectionsContainer.appendChild(btn);
+				this._thumbnailElements.push(btn);
+				flatIndex++;
+			}
+		}
+
+		this._container.appendChild(elements.root);
+
+		// Set initial image
+		this.updateCurrentImage();
+	}
+
+	/**
+	 * Update only the changing parts: main image src, caption, button states, thumbnail selection.
+	 * No DOM teardown/rebuild — eliminates the blank flash.
+	 */
+	private async updateCurrentImage(): Promise<void> {
+		if (!this._elements) {
+			return;
+		}
+
+		// Capture the navigation index before starting async work so that
+		// we can discard stale results if the user navigates while loading/decoding.
+		const navigationIndex = this._currentIndex;
+
+		// Swap main image using cached/lazy-loaded blob URL.
+		// Pre-decode via decode() before assigning to <img> so the browser
+		// decodes on a worker thread, avoiding main-thread stalls during commit.
+		const entry = this._flatImages[navigationIndex];
+		const currentImage = entry.image;
+		const isVideo = isVideoMimeType(currentImage.mimeType);
+
+		if (isVideo) {
+			// Show video container, hide image
+			this._elements.mainImage.style.display = 'none';
+			this._elements.videoContainer.style.display = '';
+			this._elements.mainImageContainer.classList.remove('zoomed');
+			this._elements.mainImageContainer.style.cursor = 'default';
+
+			// Load raw data to send via postMessage
+			const rawData = await this._loadRawData(currentImage);
+			if (this._currentIndex !== navigationIndex) {
+				return;
+			}
+
+			const nonce = generateUuid();
+			const videoHtml = `<!DOCTYPE html>
+<html><head>
+<meta charset="utf-8">
+<meta http-equiv="Content-Security-Policy" content="default-src 'none'; media-src blob: data:; script-src 'nonce-${nonce}'; style-src 'nonce-${nonce}';">
+<style nonce="${nonce}">html,body{margin:0;padding:0;width:100%;height:100%;overflow:hidden;background:transparent}
+video{width:100%;height:100%;object-fit:contain;outline:none}</style>
+</head><body>
+<video id="v" controls></video>
+<script nonce="${nonce}">
+window.addEventListener("message",function(e){var m=e.data;if(m.type==="loadVideo"){var b=new Blob([m.data],{type:m.mimeType});document.getElementById("v").src=URL.createObjectURL(b);}});
+</script>
+</body></html>`;
+
+			// Reuse existing webview or create one on first video navigation
+			let webview: IWebviewElement;
+			if (!this._videoWebview) {
+				webview = this._contentDisposables.add(this._webviewService.createWebviewElement({
+					title: currentImage.name,
+					options: { disableServiceWorker: true },
+					contentOptions: { allowScripts: true },
+					extension: undefined,
+				}));
+				webview.mountTo(this._elements.videoContainer, this.window);
+				this._videoWebview = webview;
+			} else {
+				webview = this._videoWebview;
+			}
+
+			webview.setHtml(videoHtml);
+
+			// Send the video data to the webview via postMessage
+			const buffer = (rawData as Uint8Array<ArrayBuffer>).buffer;
+			webview.postMessage({ type: 'loadVideo', data: buffer, mimeType: currentImage.mimeType }, [buffer]);
+		} else {
+			// Show image, hide video container
+			this._elements.videoContainer.style.display = 'none';
+			this._elements.mainImage.style.display = '';
+			this._elements.mainImageContainer.style.cursor = '';
+
+			const url = await this._loadBlobUrl(currentImage);
+
+			// If the user navigated while loading the blob URL, discard this result.
+			if (this._currentIndex !== navigationIndex) {
+				return;
+			}
+
+			const tmp = new Image();
+			tmp.src = url;
+			tmp.decode().then(() => {
+				// Only apply if user hasn't navigated away during decode
+				if (this._currentIndex === navigationIndex && this._elements) {
+					this._elements.mainImage.src = url;
+					this._elements.mainImage.alt = currentImage.name;
+				}
+			}, () => {
+				// Decode failed (invalid image) — still show src for browser fallback
+				if (this._currentIndex === navigationIndex && this._elements) {
+					this._elements.mainImage.src = url;
+					this._elements.mainImage.alt = currentImage.name;
+				}
+			});
+		}
+
+		// Reset zoom when switching images
+		this._applyZoom('fit');
+
+		// Update info bar: caption + separator + counter
+		if (currentImage.caption) {
+			this._elements.captionText.textContent = currentImage.caption;
+			this._elements.captionText.style.display = '';
+			this._elements.captionSeparator.style.display = '';
+		} else {
+			this._elements.captionText.textContent = '';
+			this._elements.captionText.style.display = 'none';
+			this._elements.captionSeparator.style.display = 'none';
+		}
+		this._elements.counter.textContent = localize('imageCarousel.counter', "{0} / {1}", this._currentIndex + 1, this._flatImages.length);
+
+		// Update button states
+		this._elements.prevBtn.disabled = this._currentIndex === 0;
+		this._elements.nextBtn.disabled = this._currentIndex === this._flatImages.length - 1;
+
+		// Update thumbnail selection — only toggle active class and
+		// call getBoundingClientRect on the active thumbnail to avoid
+		// layout thrashing across all thumbnails on every navigation.
+		for (let i = 0; i < this._thumbnailElements.length; i++) {
+			const isActive = i === this._currentIndex;
+			const thumbnail = this._thumbnailElements[i];
+			thumbnail.classList.toggle('active', isActive);
+			if (isActive) {
+				thumbnail.setAttribute('aria-current', 'page');
+			} else {
+				thumbnail.removeAttribute('aria-current');
+			}
+		}
+
+		// Scroll the active thumbnail into view without blocking the main thread.
+		// Using scrollIntoView with 'nearest' avoids forced layout from
+		// getBoundingClientRect + scrollLeft and is handled efficiently by
+		// the browser's scroll machinery.
+		const activeThumbnail = this._thumbnailElements[this._currentIndex];
+		if (activeThumbnail) {
+			activeThumbnail.scrollIntoView({ block: 'nearest', inline: 'nearest' });
+		}
+
+		// Update editor title to reflect current section
+		if (this.input instanceof ImageCarouselEditorInput) {
+			const currentSection = this._sections[entry.sectionIndex];
+			this.input.setName(currentSection.title || this.input.collection.title);
+		}
+
+		// Preload adjacent images for smoother navigation
+		this._preloadAdjacentImages();
+	}
+
+	private async _loadBlobUrl(image: ICarouselImage): Promise<string> {
+		const cached = this._blobUrlCache.get(image.id);
+		if (cached) {
+			return cached;
+		}
+
+		let buffer: Uint8Array;
+		if (image.data) {
+			// Handle both VSBuffer (has .buffer property) and raw Uint8Array from chat attachments
+			buffer = image.data instanceof Uint8Array ? image.data : image.data.buffer;
+		} else if (image.uri) {
+			const content = await this._fileService.readFile(image.uri);
+			buffer = content.value.buffer;
+		} else {
+			return '';
+		}
+
+		const blob = new Blob([buffer as Uint8Array<ArrayBuffer>], { type: image.mimeType });
+		const url = URL.createObjectURL(blob);
+		this._blobUrlCache.set(image.id, url);
+		return url;
+	}
+
+	private _revokeCachedBlobUrls(): void {
+		for (const url of this._blobUrlCache.values()) {
+			URL.revokeObjectURL(url);
+		}
+		this._blobUrlCache.clear();
+	}
+
+	private async _loadRawData(image: ICarouselImage): Promise<Uint8Array> {
+		if (image.data) {
+			return image.data instanceof Uint8Array ? image.data : image.data.buffer;
+		} else if (image.uri) {
+			const content = await this._fileService.readFile(image.uri);
+			return content.value.buffer;
+		}
+		return new Uint8Array(0);
+	}
+
+	private _preloadAdjacentImages(): void {
+		for (const idx of [this._currentIndex - 1, this._currentIndex + 1]) {
+			if (idx >= 0 && idx < this._flatImages.length) {
+				const adjacentImage = this._flatImages[idx].image;
+				if (isVideoMimeType(adjacentImage.mimeType)) {
+					// For video, preload raw data into the file service cache
+					this._loadRawData(adjacentImage).catch(() => { /* ignore */ });
+				} else {
+					this._loadBlobUrl(adjacentImage).then(url => {
+						// Pre-decode via decode() so the compositor doesn't block
+						// the main thread decoding this image during commit.
+						const img = new Image();
+						img.src = url;
+						img.decode().catch(() => { /* invalid image */ });
+					});
+				}
+			}
+		}
+	}
+
+	previous(): void {
+		if (this._currentIndex > 0) {
+			this._currentIndex--;
+			this.updateCurrentImage();
+		}
+	}
+
+	next(): void {
+		if (this._currentIndex < this._flatImages.length - 1) {
+			this._currentIndex++;
+			this.updateCurrentImage();
+		}
+	}
+
+	/**
+	 * Compute the current display scale when transitioning from 'fit' to numeric zoom.
+	 */
+	private _initZoomFromFit(): void {
+		if (!this._elements) {
+			return;
+		}
+		const img = this._elements.mainImage;
+		if (img.naturalWidth > 0) {
+			this._zoomScale = img.clientWidth / img.naturalWidth;
+		} else {
+			this._zoomScale = 1;
+		}
+	}
+
+	/**
+	 * Zoom in to the next predefined zoom level.
+	 */
+	private _zoomIn(): void {
+		if (this._zoomScale === 'fit') {
+			this._initZoomFromFit();
+		}
+		const scale = this._zoomScale as number;
+		let i = 0;
+		for (; i < ZOOM_LEVELS.length; ++i) {
+			if (ZOOM_LEVELS[i] > scale) {
+				break;
+			}
+		}
+		this._applyZoom(ZOOM_LEVELS[i] ?? MAX_SCALE);
+	}
+
+	/**
+	 * Zoom out to the previous predefined zoom level.
+	 */
+	private _zoomOut(): void {
+		if (this._zoomScale === 'fit') {
+			this._initZoomFromFit();
+		}
+		const scale = this._zoomScale as number;
+		let i = ZOOM_LEVELS.length - 1;
+		for (; i >= 0; --i) {
+			if (ZOOM_LEVELS[i] < scale) {
+				break;
+			}
+		}
+		this._applyZoom(ZOOM_LEVELS[i] ?? MIN_SCALE);
+	}
+
+	/**
+	 * Apply fit-to-container or numeric zoom with scroll-center preservation.
+	 */
+	private _applyZoom(newScale: ZoomScale): void {
+		if (!this._elements) {
+			return;
+		}
+
+		const container = this._elements.mainImageContainer;
+		const img = this._elements.mainImage;
+
+		if (newScale === 'fit') {
+			this._zoomScale = 'fit';
+			img.classList.add('scale-to-fit');
+			img.classList.remove('pixelated');
+			img.style.zoom = '';
+			// Remove zoomed/overflow before scrollTo to avoid an expensive
+			// synchronous ScrollLayer that blocks the main thread.
+			const wasZoomed = container.classList.contains('zoomed');
+			container.classList.remove('zoomed');
+			container.classList.remove('zoom-out');
+			if (wasZoomed) {
+				container.scrollTo(0, 0);
+			}
+		} else {
+			const scale = clamp(newScale, MIN_SCALE, MAX_SCALE);
+			this._zoomScale = scale;
+
+			// Capture scroll center ratio before changing zoom.
+			const dx = container.scrollWidth > 0
+				? (container.scrollLeft + container.clientWidth / 2) / container.scrollWidth
+				: 0.5;
+			const dy = container.scrollHeight > 0
+				? (container.scrollTop + container.clientHeight / 2) / container.scrollHeight
+				: 0.5;
+
+			img.classList.remove('scale-to-fit');
+			img.classList.toggle('pixelated', scale >= PIXELATION_THRESHOLD);
+			img.style.zoom = String(scale);
+			container.classList.add('zoomed');
+
+			// Restore scroll center — works because setting img.style.zoom triggers
+			// synchronous layout, so scrollWidth/scrollHeight reflect the new size.
+			const newScrollX = container.scrollWidth * dx - container.clientWidth / 2;
+			const newScrollY = container.scrollHeight * dy - container.clientHeight / 2;
+			container.scrollTo(newScrollX, newScrollY);
+		}
+	}
+
+	override focus(): void {
+		super.focus();
+		this._elements?.root.focus();
+	}
+
+	override layout(dimension: Dimension): void {
+		if (this._container) {
+			this._container.style.width = `${dimension.width}px`;
+			this._container.style.height = `${dimension.height}px`;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditorInput.ts b/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditorInput.ts
new file mode 100644
index 00000000000..50f76b0bff0
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditorInput.ts
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { EditorInputCapabilities, IUntypedEditorInput } from '../../../common/editor.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IImageCarouselCollection } from './imageCarouselTypes.js';
+
+export class ImageCarouselEditorInput extends EditorInput {
+	static readonly ID = 'workbench.input.imageCarousel';
+
+	private _resource: URI;
+	private _name: string;
+
+	override get capabilities(): EditorInputCapabilities {
+		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.RequiresModal;
+	}
+
+	constructor(
+		public readonly collection: IImageCarouselCollection,
+		public readonly startIndex: number = 0
+	) {
+		super();
+		this._resource = URI.from({
+			scheme: Schemas.vscodeImageCarousel,
+			path: `/${encodeURIComponent(collection.id)}`,
+		});
+		this._name = collection.title;
+	}
+
+	get typeId(): string {
+		return ImageCarouselEditorInput.ID;
+	}
+
+	get resource(): URI {
+		return this._resource;
+	}
+
+	override getName(): string {
+		return this._name;
+	}
+
+	setName(name: string): void {
+		if (this._name !== name) {
+			this._name = name;
+			this._onDidChangeLabel.fire();
+		}
+	}
+
+	override matches(other: EditorInput | IUntypedEditorInput): boolean {
+		if (other instanceof ImageCarouselEditorInput) {
+			return other.collection.id === this.collection.id;
+		}
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselTypes.ts b/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselTypes.ts
new file mode 100644
index 00000000000..0c713e948ad
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselTypes.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../base/common/uri.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+
+export interface ICarouselImage {
+	readonly id: string;
+	readonly name: string;
+	readonly mimeType: string;
+	/** In-memory image data. Omit when the image can be loaded lazily from `uri`. */
+	readonly data?: VSBuffer;
+	readonly uri?: URI;
+	readonly source?: string;
+	readonly caption?: string;
+}
+
+export interface ICarouselSection {
+	readonly title: string;
+	readonly images: ReadonlyArray<ICarouselImage>;
+}
+
+export interface IImageCarouselCollection {
+	readonly id: string;
+	readonly title: string;
+	readonly sections: ReadonlyArray<ICarouselSection>;
+}
+
+export function isVideoMimeType(mimeType: string): boolean {
+	return mimeType.startsWith('video/');
+}
diff --git a/src/vs/workbench/contrib/imageCarousel/browser/media/imageCarousel.css b/src/vs/workbench/contrib/imageCarousel/browser/media/imageCarousel.css
new file mode 100644
index 00000000000..4ef892836f8
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/browser/media/imageCarousel.css
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.image-carousel-editor {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
+
+.image-carousel-editor .empty-message {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+	color: var(--vscode-descriptionForeground);
+	font-size: 14px;
+}
+
+.image-carousel-editor .slideshow-container {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	gap: 8px;
+	overflow: hidden;
+}
+
+.image-carousel-editor .slideshow-container:focus,
+.image-carousel-editor .slideshow-container:focus-visible {
+	outline: none !important;
+}
+
+/* Image viewing area */
+.image-carousel-editor .image-area {
+	flex: 1;
+	min-height: 0;
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+}
+
+.image-carousel-editor .main-image-container {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	overflow: hidden;
+	cursor: zoom-in;
+}
+
+.image-carousel-editor .main-image-container.zoom-out {
+	cursor: zoom-out;
+}
+
+.image-carousel-editor .main-image-container.zoomed {
+	overflow: auto;
+	padding: 0;
+	scrollbar-color: var(--vscode-scrollbarSlider-background) transparent;
+}
+
+.image-carousel-editor .main-image-container.zoomed::-webkit-scrollbar {
+	width: 10px;
+	height: 10px;
+}
+
+.image-carousel-editor .main-image-container.zoomed::-webkit-scrollbar-thumb {
+	background-color: var(--vscode-scrollbarSlider-background);
+}
+
+.image-carousel-editor .main-image-container.zoomed::-webkit-scrollbar-thumb:hover {
+	background-color: var(--vscode-scrollbarSlider-hoverBackground);
+}
+
+.image-carousel-editor .main-image-container.zoomed::-webkit-scrollbar-thumb:active {
+	background-color: var(--vscode-scrollbarSlider-activeBackground);
+}
+
+.image-carousel-editor .main-image {
+	border-radius: 4px;
+	margin: auto;
+}
+
+.image-carousel-editor .video-container {
+	width: 100%;
+	height: 100%;
+	border-radius: 4px;
+	overflow: hidden;
+}
+
+.image-carousel-editor .main-image.scale-to-fit {
+	max-width: 100%;
+	max-height: 100%;
+	object-fit: contain;
+}
+
+.image-carousel-editor .main-image.pixelated {
+	image-rendering: pixelated;
+}
+
+/* Overlay navigation arrows */
+.image-carousel-editor .nav-arrow {
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+	width: 32px;
+	height: 32px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: var(--vscode-toolbar-hoverBackground);
+	color: var(--vscode-foreground);
+	border: none;
+	border-radius: 50%;
+	cursor: pointer;
+	opacity: 0;
+	transition: opacity 0.15s ease;
+	z-index: 1;
+}
+
+.monaco-workbench.monaco-reduce-motion .image-carousel-editor .nav-arrow {
+	transition: none;
+}
+.image-carousel-editor .slideshow-container:hover .nav-arrow:not(:disabled) {
+	opacity: 0.8;
+}
+
+.image-carousel-editor .slideshow-container:hover .nav-arrow:disabled {
+	opacity: 0.3;
+}
+
+.image-carousel-editor .nav-arrow:hover:not(:disabled) {
+	opacity: 1 !important;
+	background: var(--vscode-toolbar-activeBackground);
+	color: var(--vscode-foreground);
+}
+
+.image-carousel-editor .nav-arrow:focus-visible:not(:disabled) {
+	opacity: 1 !important;
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.image-carousel-editor .nav-arrow:disabled {
+	cursor: default;
+}
+
+.image-carousel-editor .nav-arrow.prev-arrow {
+	left: 8px;
+}
+
+.image-carousel-editor .nav-arrow.next-arrow {
+	right: 8px;
+}
+
+/* Bottom bar: caption + counter + thumbnails */
+.image-carousel-editor .bottom-bar {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 2px;
+	padding: 4px 0 8px;
+	flex-shrink: 0;
+	min-width: 0;
+	max-width: 100%;
+}
+
+/* Extra gap before thumbnails */
+.image-carousel-editor .bottom-bar .sections-container {
+	margin-top: 4px;
+}
+
+/* Info bar: caption · counter */
+.image-carousel-editor .image-info-bar {
+	text-align: center;
+	color: var(--vscode-descriptionForeground);
+	font-size: 12px;
+	padding: 0 24px;
+	min-height: 16px;
+}
+
+.image-carousel-editor .caption-separator::before {
+	content: '\00b7';
+	margin: 0 6px;
+	opacity: 0.6;
+}
+
+.image-carousel-editor .image-counter {
+	opacity: 0.7;
+}
+
+/* Sections container — flat horizontal thumbnail strip */
+.image-carousel-editor .sections-container {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 6px;
+	overflow-x: auto;
+	justify-content: center;
+	justify-content: safe center;
+	padding: 0;
+	flex-shrink: 0;
+	min-width: 0;
+	max-width: 100%;
+	scrollbar-width: none;
+}
+
+.image-carousel-editor .sections-container::-webkit-scrollbar {
+	display: none;
+}
+
+/* Subtle separator between sections */
+.image-carousel-editor .thumbnail-separator {
+	width: 1px;
+	height: 24px;
+	background: var(--vscode-editorWidget-border, var(--vscode-widget-border));
+	opacity: 0.4;
+	flex-shrink: 0;
+	margin: 0 6px;
+}
+
+.image-carousel-editor .thumbnail {
+	width: 48px;
+	height: 48px;
+	border: 2px solid transparent;
+	border-radius: 4px;
+	overflow: hidden;
+	cursor: pointer;
+	transition: border-color 0.15s ease, opacity 0.15s ease;
+	flex-shrink: 0;
+	opacity: 0.6;
+	padding: 0;
+	background: none;
+}
+
+.image-carousel-editor .thumbnail:hover {
+	opacity: 1;
+	border-color: var(--vscode-focusBorder);
+}
+
+.image-carousel-editor .thumbnail.active {
+	opacity: 1;
+	border-color: var(--vscode-focusBorder);
+}
+
+.image-carousel-editor .thumbnail.broken .thumbnail-image {
+	display: none;
+}
+
+.image-carousel-editor .thumbnail.broken {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: var(--vscode-editor-background);
+}
+
+.image-carousel-editor .thumbnail.broken::after {
+	font-family: codicon;
+	content: '\eaea'; /* file-media */
+	font-size: 20px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.image-carousel-editor .thumbnail-image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	pointer-events: none;
+}
+
+/* Video thumbnail: play icon centered in a dark background */
+.image-carousel-editor .thumbnail.video-thumbnail {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: var(--vscode-editor-background);
+}
+
+.image-carousel-editor .thumbnail-play-icon {
+	font-size: 20px;
+	color: var(--vscode-descriptionForeground);
+}
diff --git a/src/vs/workbench/contrib/imageCarousel/test/browser/imageCarousel.contribution.test.ts b/src/vs/workbench/contrib/imageCarousel/test/browser/imageCarousel.contribution.test.ts
new file mode 100644
index 00000000000..37b32ac3077
--- /dev/null
+++ b/src/vs/workbench/contrib/imageCarousel/test/browser/imageCarousel.contribution.test.ts
@@ -0,0 +1,464 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../base/common/uri.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { NullFilesConfigurationService, createFileStat } from '../../../../test/common/workbenchTestServices.js';
+import { IExplorerService } from '../../../files/browser/files.js';
+import { ExplorerItem } from '../../../files/common/explorerModel.js';
+import { IFileService, IFileStat, IFileContent } from '../../../../../platform/files/common/files.js';
+import { IEditorService, MODAL_GROUP } from '../../../../services/editor/common/editorService.js';
+import { ImageCarouselEditorInput } from '../../browser/imageCarouselEditorInput.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+
+// Importing the contribution registers the actions
+import '../../browser/imageCarousel.contribution.js';
+
+function createExplorerItem(
+	path: string,
+	isFolder: boolean,
+	fileService: IFileService,
+	configService: TestConfigurationService,
+	parent?: ExplorerItem,
+): ExplorerItem {
+	return new ExplorerItem(
+		URI.file(path),
+		fileService,
+		configService,
+		NullFilesConfigurationService,
+		parent,
+		isFolder,
+	);
+}
+
+suite('OpenImagesInCarouselFromExplorerAction', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let configService: TestConfigurationService;
+	let openedInputs: { input: ImageCarouselEditorInput; group: typeof MODAL_GROUP }[];
+	let infoMessages: string[];
+	let errorMessages: string[];
+
+	setup(() => {
+		openedInputs = [];
+		infoMessages = [];
+		errorMessages = [];
+		configService = new TestConfigurationService();
+		instantiationService = workbenchInstantiationService(undefined, disposables);
+	});
+
+	function stubFileService(resolveMap: Map<string, IFileStat>, fileContents: Map<string, VSBuffer>): void {
+		instantiationService.stub(IFileService, 'resolve', async (resource: URI) => {
+			const stat = resolveMap.get(resource.path);
+			if (!stat) {
+				throw new Error(`File not found: ${resource.path}`);
+			}
+			return stat;
+		});
+
+		instantiationService.stub(IFileService, 'readFile', async (resource: URI) => {
+			const content = fileContents.get(resource.path);
+			if (!content) {
+				throw new Error(`Cannot read: ${resource.path}`);
+			}
+			return { resource, value: content } as IFileContent;
+		});
+	}
+
+	function stubExplorerService(items: ExplorerItem[]): void {
+		instantiationService.stub(IExplorerService, {
+			getContext: () => items,
+		});
+	}
+
+	function stubEditorService(): void {
+		instantiationService.stub(IEditorService, 'openEditor', async (input: unknown, _options: unknown, group: unknown) => {
+			if (input instanceof ImageCarouselEditorInput) {
+				openedInputs.push({ input, group: group as typeof MODAL_GROUP });
+				disposables.add(input);
+			}
+			return undefined;
+		});
+	}
+
+	function stubNotificationService(): void {
+		instantiationService.stub(INotificationService, 'info', (message: string) => {
+			infoMessages.push(message);
+		});
+		instantiationService.stub(INotificationService, 'error', (message: string) => {
+			errorMessages.push(message);
+		});
+	}
+
+	test('single image file opens carousel with sibling images', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const parent = createExplorerItem('/workspace/images', true, fileService, configService);
+		const imageItem = createExplorerItem('/workspace/images/photo.png', false, fileService, configService, parent);
+
+		const pngData = VSBuffer.fromString('fake-png');
+		const jpgData = VSBuffer.fromString('fake-jpg');
+		const txtData = VSBuffer.fromString('text file');
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/images', createFileStat(
+			URI.file('/workspace/images'), false, false, true, false, [
+			{ resource: URI.file('/workspace/images/photo.png'), isFile: true },
+			{ resource: URI.file('/workspace/images/other.jpg'), isFile: true },
+			{ resource: URI.file('/workspace/images/readme.txt'), isFile: true },
+			{ resource: URI.file('/workspace/images/subfolder'), isDirectory: true, isFile: false },
+		]
+		));
+
+		const fileContents = new Map<string, VSBuffer>();
+		fileContents.set('/workspace/images/photo.png', pngData);
+		fileContents.set('/workspace/images/other.jpg', jpgData);
+		fileContents.set('/workspace/images/readme.txt', txtData);
+
+		stubFileService(resolveMap, fileContents);
+		stubExplorerService([imageItem]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command, 'Command should be registered');
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 1, 'Should open one editor');
+		const input = openedInputs[0].input;
+		assert.strictEqual(input.collection.sections.length, 1);
+
+		const images = input.collection.sections[0].images;
+		assert.strictEqual(images.length, 2, 'Should include 2 image siblings (png + jpg), not txt');
+		// Images are sorted by basename: other.jpg before photo.png
+		assert.strictEqual(images[0].name, 'other.jpg');
+		assert.strictEqual(images[1].name, 'photo.png');
+
+		// Start index should be the selected image (photo.png = index 1 after sorting)
+		assert.strictEqual(input.startIndex, 1);
+	});
+
+	test('folder opens carousel with all contained images', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const folderItem = createExplorerItem('/workspace/images', true, fileService, configService);
+
+		const gifData = VSBuffer.fromString('fake-gif');
+		const webpData = VSBuffer.fromString('fake-webp');
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/images', createFileStat(
+			URI.file('/workspace/images'), false, false, true, false, [
+			{ resource: URI.file('/workspace/images/anim.gif'), isFile: true },
+			{ resource: URI.file('/workspace/images/photo.webp'), isFile: true },
+			{ resource: URI.file('/workspace/images/script.js'), isFile: true },
+		]
+		));
+
+		const fileContents = new Map<string, VSBuffer>();
+		fileContents.set('/workspace/images/anim.gif', gifData);
+		fileContents.set('/workspace/images/photo.webp', webpData);
+
+		stubFileService(resolveMap, fileContents);
+		stubExplorerService([folderItem]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 1);
+		const images = openedInputs[0].input.collection.sections[0].images;
+		assert.strictEqual(images.length, 2, 'Should include 2 images (gif + webp), not js');
+		assert.strictEqual(images[0].name, 'anim.gif');
+		assert.strictEqual(images[1].name, 'photo.webp');
+	});
+
+	test('multiple selected images open in carousel', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const img1 = createExplorerItem('/workspace/a.png', false, fileService, configService);
+		const img2 = createExplorerItem('/workspace/b.svg', false, fileService, configService);
+		const txtFile = createExplorerItem('/workspace/notes.txt', false, fileService, configService);
+
+		const pngData = VSBuffer.fromString('fake-png');
+		const svgData = VSBuffer.fromString('<svg></svg>');
+
+		const resolveMap = new Map<string, IFileStat>();
+
+		const fileContents = new Map<string, VSBuffer>();
+		fileContents.set('/workspace/a.png', pngData);
+		fileContents.set('/workspace/b.svg', svgData);
+
+		stubFileService(resolveMap, fileContents);
+		stubExplorerService([img1, img2, txtFile]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 1);
+		const images = openedInputs[0].input.collection.sections[0].images;
+		assert.strictEqual(images.length, 2, 'Should include only image files');
+		assert.strictEqual(images[0].name, 'a.png');
+		assert.strictEqual(images[1].name, 'b.svg');
+	});
+
+	test('empty selection with resource argument opens carousel from that folder', async () => {
+		const pngData = VSBuffer.fromString('fake-png');
+		const jpgData = VSBuffer.fromString('fake-jpg');
+
+		const folderUri = URI.file('/workspace/photos');
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/photos', createFileStat(
+			folderUri, false, false, true, false, [
+			{ resource: URI.file('/workspace/photos/sunset.png'), isFile: true },
+			{ resource: URI.file('/workspace/photos/mountain.jpg'), isFile: true },
+			{ resource: URI.file('/workspace/photos/notes.txt'), isFile: true },
+		]
+		));
+
+		const fileContents = new Map<string, VSBuffer>();
+		fileContents.set('/workspace/photos/sunset.png', pngData);
+		fileContents.set('/workspace/photos/mountain.jpg', jpgData);
+
+		stubFileService(resolveMap, fileContents);
+		stubExplorerService([]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		// Pass the folder URI as the resource argument (as explorer does for empty-space click)
+		await instantiationService.invokeFunction(command.handler, folderUri);
+
+		assert.strictEqual(openedInputs.length, 1, 'Should open carousel using resource argument fallback');
+		const images = openedInputs[0].input.collection.sections[0].images;
+		assert.strictEqual(images.length, 2, 'Should include 2 images from the folder');
+	});
+
+	test('empty selection without resource falls back to first workspace folder', async () => {
+		const pngData = VSBuffer.fromString('fake-png');
+
+		// Derive the workspace root from IWorkspaceContextService so the test
+		// works on all platforms (the path differs on Windows vs Unix).
+		const contextService = instantiationService.get(IWorkspaceContextService);
+		const wsRoot = contextService.getWorkspace().folders[0].uri;
+		const logoUri = URI.joinPath(wsRoot, 'logo.png');
+		const readmeUri = URI.joinPath(wsRoot, 'readme.md');
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set(wsRoot.path, createFileStat(
+			wsRoot, false, false, true, false, [
+			{ resource: logoUri, isFile: true },
+			{ resource: readmeUri, isFile: true },
+		]
+		));
+
+		const fileContents = new Map<string, VSBuffer>();
+		fileContents.set(logoUri.path, pngData);
+
+		stubFileService(resolveMap, fileContents);
+		stubExplorerService([]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		// No resource argument — should fall back to workspace root
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 1, 'Should open carousel using workspace root fallback');
+		const images = openedInputs[0].input.collection.sections[0].images;
+		assert.strictEqual(images.length, 1, 'Should include image from workspace root');
+		assert.strictEqual(images[0].name, 'logo.png');
+	});
+
+	test('empty selection with no images shows notification', async () => {
+		const folderUri = URI.file('/workspace/docs');
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/docs', createFileStat(
+			folderUri, false, false, true, false, [
+			{ resource: URI.file('/workspace/docs/readme.md'), isFile: true },
+		]
+		));
+
+		stubFileService(resolveMap, new Map());
+		stubExplorerService([]);
+		stubEditorService();
+		stubNotificationService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler, folderUri);
+
+		assert.strictEqual(openedInputs.length, 0, 'Should not open carousel when folder has no images');
+		assert.strictEqual(infoMessages.length, 1, 'Should show notification');
+	});
+
+	test('folder with no images shows notification', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const folderItem = createExplorerItem('/workspace/docs', true, fileService, configService);
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/docs', createFileStat(
+			URI.file('/workspace/docs'), false, false, true, false, [
+			{ resource: URI.file('/workspace/docs/readme.md'), isFile: true },
+			{ resource: URI.file('/workspace/docs/notes.txt'), isFile: true },
+		]
+		));
+
+		stubFileService(resolveMap, new Map());
+		stubExplorerService([folderItem]);
+		stubEditorService();
+		stubNotificationService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 0, 'Should not open carousel when folder has no images');
+		assert.strictEqual(infoMessages.length, 1, 'Should show notification about no images');
+	});
+
+	test('folder read error shows error notification', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const folderItem = createExplorerItem('/workspace/restricted', true, fileService, configService);
+
+		// resolve throws to simulate a permission error
+		const resolveMap = new Map<string, IFileStat>();
+		stubFileService(resolveMap, new Map());
+		stubExplorerService([folderItem]);
+		stubEditorService();
+		stubNotificationService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 0, 'Should not open carousel on folder read error');
+		assert.strictEqual(errorMessages.length, 1, 'Should show error notification');
+		assert.strictEqual(infoMessages.length, 0, 'Should not show info notification');
+	});
+
+	test('images with URIs are passed lazily without reading file contents', async () => {
+		const folderUri = URI.file('/workspace/broken');
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/broken', createFileStat(
+			folderUri, false, false, true, false, [
+			{ resource: URI.file('/workspace/broken/corrupt.png'), isFile: true },
+			{ resource: URI.file('/workspace/broken/missing.jpg'), isFile: true },
+		]
+		));
+
+		// No file contents — with lazy loading, no readFile should be called at action time
+		let readFileCallCount = 0;
+		stubFileService(resolveMap, new Map());
+		instantiationService.stub(IFileService, 'readFile', async () => {
+			readFileCallCount++;
+			throw new Error('readFile should not be called');
+		});
+		stubExplorerService([]);
+		stubEditorService();
+		stubNotificationService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler, folderUri);
+
+		assert.strictEqual(readFileCallCount, 0, 'readFile should not be called during action');
+		assert.strictEqual(openedInputs.length, 1, 'Should open carousel with lazy image entries');
+		const images = openedInputs[0].input.collection.sections[0].images;
+		assert.strictEqual(images.length, 2, 'Should include 2 lazy image entries');
+		assert.strictEqual(images[0].data, undefined, 'Image data should not be loaded eagerly');
+		assert.ok(images[0].uri, 'Image should have a URI for lazy loading');
+	});
+
+	test('folder includes video files alongside images', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const folderItem = createExplorerItem('/workspace/media', true, fileService, configService);
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/media', createFileStat(
+			URI.file('/workspace/media'), false, false, true, false, [
+			{ resource: URI.file('/workspace/media/clip.mp4'), isFile: true },
+			{ resource: URI.file('/workspace/media/photo.png'), isFile: true },
+			{ resource: URI.file('/workspace/media/demo.webm'), isFile: true },
+			{ resource: URI.file('/workspace/media/readme.txt'), isFile: true },
+		]
+		));
+
+		stubFileService(resolveMap, new Map());
+		stubExplorerService([folderItem]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 1);
+		const images = openedInputs[0].input.collection.sections[0].images;
+		assert.strictEqual(images.length, 3, 'Should include mp4 + png + webm, not txt');
+		assert.strictEqual(images[0].name, 'clip.mp4');
+		assert.strictEqual(images[1].name, 'demo.webm');
+		assert.strictEqual(images[2].name, 'photo.png');
+	});
+
+	test('single video file opens carousel with sibling media', async () => {
+		const fileService = instantiationService.get(IFileService);
+		const parent = createExplorerItem('/workspace/media', true, fileService, configService);
+		const videoItem = createExplorerItem('/workspace/media/clip.mp4', false, fileService, configService, parent);
+
+		const resolveMap = new Map<string, IFileStat>();
+		resolveMap.set('/workspace/media', createFileStat(
+			URI.file('/workspace/media'), false, false, true, false, [
+			{ resource: URI.file('/workspace/media/clip.mp4'), isFile: true },
+			{ resource: URI.file('/workspace/media/photo.png'), isFile: true },
+			{ resource: URI.file('/workspace/media/notes.txt'), isFile: true },
+		]
+		));
+
+		stubFileService(resolveMap, new Map());
+		stubExplorerService([videoItem]);
+		stubEditorService();
+
+		const { CommandsRegistry } = await import('../../../../../platform/commands/common/commands.js');
+		const command = CommandsRegistry.getCommand('workbench.action.openImagesInCarousel');
+		assert.ok(command);
+
+		await instantiationService.invokeFunction(command.handler);
+
+		assert.strictEqual(openedInputs.length, 1);
+		const input = openedInputs[0].input;
+		const images = input.collection.sections[0].images;
+		assert.strictEqual(images.length, 2, 'Should include mp4 + png siblings');
+		assert.strictEqual(images[0].name, 'clip.mp4');
+		assert.strictEqual(images[1].name, 'photo.png');
+		assert.strictEqual(input.startIndex, 0, 'Start index should point to the selected video');
+	});
+});
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
index 85237c14100..acb788bced6 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
@@ -17,6 +17,7 @@ import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.js';
 import { InlineChatEnabler, InlineChatEscapeToolContribution, InlineChatSessionServiceImpl } from './inlineChatSessionServiceImpl.js';
+import { IInlineChatHistoryService, InlineChatHistoryService } from './inlineChatHistoryService.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { CancelAction, ChatSubmitAction } from '../../chat/browser/actions/chatExecuteActions.js';
 import { localize } from '../../../../nls.js';
@@ -30,10 +31,13 @@ registerAction2(InlineChatActions.KeepSessionAction2);
 registerAction2(InlineChatActions.UndoSessionAction2);
 registerAction2(InlineChatActions.UndoAndCloseSessionAction2);
 registerAction2(InlineChatActions.CancelSessionAction);
+registerAction2(InlineChatActions.ContinueInlineChatInChatViewAction);
+registerAction2(InlineChatActions.RephraseInlineChatSessionAction);
 
 // --- browser
 
 registerSingleton(IInlineChatSessionService, InlineChatSessionServiceImpl, InstantiationType.Delayed);
+registerSingleton(IInlineChatHistoryService, InlineChatHistoryService, InstantiationType.Delayed);
 
 // --- MENU special ---
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index aef9aeefc52..d4bfb599f0c 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -11,7 +11,7 @@ import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diff
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
-import { ACTION_ACCEPT_CHANGES, ACTION_ASK_IN_CHAT, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_V1_ENABLED, CTX_HOVER_MODE, CTX_INLINE_CHAT_INPUT_HAS_TEXT, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_PENDING_CONFIRMATION, InlineChatConfigKeys, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE } from '../common/inlineChat.js';
+import { ACTION_ACCEPT_CHANGES, ACTION_ASK_IN_CHAT, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_V1_ENABLED, CTX_HOVER_MODE, CTX_INLINE_CHAT_INPUT_HAS_TEXT, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_TERMINATED, InlineChatConfigKeys, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, CTX_ASK_IN_CHAT_ENABLED } from '../common/inlineChat.js';
 import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../chat/browser/chatEditing/chatEditingEditorContextKeys.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Action2, IAction2Options, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
@@ -29,7 +29,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IChatEditingService } from '../../chat/common/editing/chatEditingService.js';
 import { IChatWidgetService } from '../../chat/browser/chat.js';
 import { ChatRequestQueueKind } from '../../chat/common/chatService/chatService.js';
-
+import { ChatEntitlementContextKeys } from '../../../services/chat/common/chatEntitlementService.js';
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
@@ -53,9 +53,13 @@ export class StartSessionAction extends Action2 {
 			shortTitle: localize2('runShort', 'Inline Chat'),
 			category: AbstractInlineChatAction.category,
 			f1: true,
-			precondition: ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+			precondition: ContextKeyExpr.and(inlineChatContextKey, ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate())),
 			keybinding: {
-				when: EditorContextKeys.focus,
+				when: ContextKeyExpr.and(
+					EditorContextKeys.focus,
+					inlineChatContextKey,
+					ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate())
+				),
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyI
 			},
@@ -64,7 +68,7 @@ export class StartSessionAction extends Action2 {
 				id: MenuId.EditorContext,
 				group: '1_chat',
 				order: 3,
-				when: inlineChatContextKey
+				when: ContextKeyExpr.and(inlineChatContextKey, ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate()))
 			}, {
 				id: MenuId.ChatTitleBarMenu,
 				group: 'a_open',
@@ -130,7 +134,7 @@ export class StartSessionAction extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
 	group: '0_chat',
 	order: 1,
-	when: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+	when: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasNonEmptySelection, ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate()), ChatEntitlementContextKeys.Setup.hidden.negate()),
 	command: {
 		id: ACTION_START,
 		title: localize('editCode', "Ask for Edits"),
@@ -250,6 +254,12 @@ export class FixDiagnosticsAction extends AbstractInlineChatAction {
 				group: '2_chat',
 				order: 1,
 				when: ContextKeyExpr.and(CTX_FIX_DIAGNOSTICS_ENABLED, EditorContextKeys.selectionHasDiagnostics, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+			}, {
+				id: MenuId.MarkerHoverStatusBar,
+				group: '1_fix',
+				order: 1,
+				when: ContextKeyExpr.and(CTX_FIX_DIAGNOSTICS_ENABLED, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+				precondition: null,
 			}]
 		});
 	}
@@ -399,6 +409,49 @@ export class CancelSessionAction extends KeepOrUndoSessionAction {
 	}
 }
 
+export class ContinueInlineChatInChatViewAction extends AbstractInlineChatAction {
+
+	constructor() {
+		super({
+			id: 'inlineChat2.continueInChat',
+			title: localize2('continueInChat', "Ask in Chat"),
+			icon: Codicon.chatSparkle,
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED),
+			menu: [{
+				id: MenuId.ChatEditorInlineExecute,
+				group: 'navigation',
+				order: 2,
+				when: ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED)
+			}]
+		});
+	}
+
+	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor): Promise<void> {
+		await ctrl.continueSessionInChat();
+	}
+}
+
+export class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
+
+	constructor() {
+		super({
+			id: 'inlineChat2.rephrase',
+			title: localize2('rephrase', "Rephrase"),
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED),
+			menu: [{
+				id: MenuId.ChatEditorInlineExecute,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED)
+			}]
+		});
+	}
+
+	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor): Promise<void> {
+		await ctrl.rephraseSession();
+	}
+}
+
 export class SubmitInlineChatInputAction extends AbstractInlineChatAction {
 
 	constructor() {
@@ -406,9 +459,9 @@ export class SubmitInlineChatInputAction extends AbstractInlineChatAction {
 			id: 'inlineChat.submitInput',
 			title: localize2('submitInput', "Send"),
 			icon: Codicon.send,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_INPUT_HAS_TEXT, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_INPUT_HAS_TEXT, ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate())),
 			keybinding: {
-				when: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()),
+				when: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate())),
 				weight: KeybindingWeight.EditorCore + 10,
 				primary: KeyCode.Enter
 			},
@@ -416,7 +469,7 @@ export class SubmitInlineChatInputAction extends AbstractInlineChatAction {
 				id: MenuId.InlineChatInput,
 				group: '0_main',
 				order: 1,
-				when: CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()
+				when: ContextKeyExpr.or(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate(), CTX_ASK_IN_CHAT_ENABLED.negate())
 			}]
 		});
 	}
@@ -424,6 +477,7 @@ export class SubmitInlineChatInputAction extends AbstractInlineChatAction {
 	override runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void {
 		const value = ctrl.inputWidget.value;
 		if (value) {
+			ctrl.inputWidget.addToHistory(value);
 			ctrl.inputWidget.hide();
 			ctrl.run({ message: value, autoSend: true });
 		}
@@ -459,7 +513,7 @@ export class AskInChatAction extends EditorAction2 {
 			title: localize2('askInChat', 'Ask in Chat'),
 			category: AbstractInlineChatAction.category,
 			f1: true,
-			precondition: ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT),
+			precondition: ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED),
 			keybinding: {
 				when: EditorContextKeys.focus,
 				weight: KeybindingWeight.WorkbenchContrib,
@@ -470,12 +524,12 @@ export class AskInChatAction extends EditorAction2 {
 				id: MenuId.EditorContext,
 				group: '1_chat',
 				order: 3,
-				when: ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT)
+				when: ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED)
 			}, {
 				id: MenuId.InlineChatEditorAffordance,
 				group: '0_chat',
 				order: 1,
-				when: ContextKeyExpr.and(EditorContextKeys.hasNonEmptySelection, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT)
+				when: ContextKeyExpr.and(EditorContextKeys.hasNonEmptySelection, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED)
 			}]
 		});
 	}
@@ -521,9 +575,9 @@ export class QueueInChatAction extends AbstractInlineChatAction {
 			id: 'inlineChat.queueInChat',
 			title: localize2('queueInChat', "Queue in Chat"),
 			icon: Codicon.arrowUp,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_INPUT_HAS_TEXT, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT),
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_INPUT_HAS_TEXT, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED),
 			keybinding: {
-				when: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT),
+				when: ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED),
 				weight: KeybindingWeight.EditorCore + 10,
 				primary: KeyCode.Enter
 			},
@@ -531,7 +585,7 @@ export class QueueInChatAction extends AbstractInlineChatAction {
 				id: MenuId.InlineChatInput,
 				group: '0_main',
 				order: 1,
-				when: CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
+				when: ContextKeyExpr.and(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED),
 			}]
 		});
 	}
@@ -544,6 +598,9 @@ export class QueueInChatAction extends AbstractInlineChatAction {
 		}
 
 		const value = ctrl.inputWidget.value;
+		if (value) {
+			ctrl.inputWidget.addToHistory(value);
+		}
 		ctrl.inputWidget.hide();
 		if (!value) {
 			return;
@@ -563,6 +620,6 @@ export class QueueInChatAction extends AbstractInlineChatAction {
 		if (selection && !selection.isEmpty()) {
 			await widget.attachmentModel.addFile(editor.getModel().uri, selection);
 		}
-		await widget.acceptInput(value, { alwaysQueue: true, queue: ChatRequestQueueKind.Queued });
+		await widget.acceptInput(value, { queue: ChatRequestQueueKind.Queued });
 	}
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.ts
index a5f6a2ad803..9b849b7de8b 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.ts
@@ -45,7 +45,7 @@ export class InlineChatAffordance extends Disposable {
 	readonly #editor: ICodeEditor;
 	readonly #inputWidget: InlineChatInputWidget;
 	readonly #instantiationService: IInstantiationService;
-	readonly #menuData = observableValue<{ rect: DOMRect; above: boolean; lineNumber: number; placeholder: string } | undefined>(this, undefined);
+	readonly #menuData = observableValue<{ rect: DOMRect; above: boolean; lineNumber: number; placeholder: string; value?: string } | undefined>(this, undefined);
 	readonly #selectionData = observableValue<Selection | undefined>(this, undefined);
 
 	constructor(
@@ -175,7 +175,7 @@ export class InlineChatAffordance extends Disposable {
 			const left = data.rect.left - editorRect.left;
 
 			// Show the overlay widget
-			this.#inputWidget.show(data.lineNumber, left, data.above, data.placeholder);
+			this.#inputWidget.show(data.lineNumber, left, data.above, data.placeholder, data.value);
 		}));
 
 		this._store.add(autorun(r => {
@@ -190,7 +190,7 @@ export class InlineChatAffordance extends Disposable {
 		this.#selectionData.set(undefined, undefined);
 	}
 
-	async showMenuAtSelection(placeholder: string): Promise<void> {
+	async showMenuAtSelection(placeholder: string, value?: string): Promise<void> {
 		assertType(this.#editor.hasModel());
 
 		const direction = this.#editor.getSelection().getDirection();
@@ -205,7 +205,8 @@ export class InlineChatAffordance extends Disposable {
 			rect: new DOMRect(x, y, 0, scrolledPosition.height),
 			above: direction === SelectionDirection.RTL,
 			lineNumber: position.lineNumber,
-			placeholder
+			placeholder,
+			value
 		}, undefined);
 
 		await waitForState(this.#inputWidget.position, pos => pos === null);
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index d26f9270bdd..00280f3828d 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -51,10 +51,10 @@ import { isNotebookContainingCellEditor as isNotebookWithCellEditor } from '../.
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
 import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../notebook/common/notebookService.js';
-import { CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_TERMINATED, CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { InlineChatAffordance } from './inlineChatAffordance.js';
 import { InlineChatInputWidget, InlineChatSessionOverlayWidget } from './inlineChatOverlayWidget.js';
-import { IInlineChatSession2, IInlineChatSessionService } from './inlineChatSessionService.js';
+import { continueInPanelChat, IInlineChatSession2, IInlineChatSessionService } from './inlineChatSessionService.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
 
@@ -158,6 +158,7 @@ export class InlineChatController implements IEditorContribution {
 		const ctxInlineChatVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
 		const ctxFileBelongsToChat = CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.bindTo(contextKeyService);
 		const ctxPendingConfirmation = CTX_INLINE_CHAT_PENDING_CONFIRMATION.bindTo(contextKeyService);
+		const ctxTerminated = CTX_INLINE_CHAT_TERMINATED.bindTo(contextKeyService);
 		const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, this._configurationService);
 		this._renderMode = observableConfigValue(InlineChatConfigKeys.RenderMode, 'zone', this._configurationService);
 
@@ -321,6 +322,11 @@ export class InlineChatController implements IEditorContribution {
 				: localize('placeholderWithSelection', "Modify selected code");
 		});
 
+		this._store.add(autorun(r => {
+			const session = visibleSessionObs.read(r);
+			ctxTerminated.set(!!session?.terminationState.read(r));
+		}));
+
 
 		this._store.add(autorun(r => {
 
@@ -363,12 +369,13 @@ export class InlineChatController implements IEditorContribution {
 			const isInProgress = lastRequest?.response?.isInProgress.read(r);
 			const isPendingConfirmation = !!lastRequest?.response?.isPendingConfirmation.read(r);
 			const isError = !!lastRequest?.response?.result?.errorDetails;
+			const isTerminated = !!session.terminationState.read(r);
 			ctxPendingConfirmation.set(isPendingConfirmation);
 			const entry = session.editingSession.readEntry(session.uri, r);
 			// When there's no entry (no changes made) and the response is complete, the widget should be hidden.
 			// When there's an entry in Modified state, it needs to be settled (accepted/rejected).
 			const isNotSettled = entry ? entry.state.read(r) === ModifiedFileEntryState.Modified : false;
-			if (isInProgress || isNotSettled || isPendingConfirmation || isError) {
+			if (isInProgress || isNotSettled || isPendingConfirmation || isError || isTerminated) {
 				sessionOverlayWidget.show(session);
 			} else {
 				sessionOverlayWidget.hide();
@@ -415,7 +422,9 @@ export class InlineChatController implements IEditorContribution {
 
 
 		this._store.add(autorun(r => {
+			const session = visibleSessionObs.read(r);
 			const response = lastResponseObs.read(r);
+			const terminationState = session?.terminationState.read(r);
 
 			this._zone.rawValue?.widget.updateInfo('');
 
@@ -425,6 +434,8 @@ export class InlineChatController implements IEditorContribution {
 					// ERROR case
 					this._zone.rawValue?.widget.updateInfo(`$(error) ${response.result.errorDetails.message}`);
 					alert(response.result.errorDetails.message);
+				} else if (terminationState) {
+					this._zone.rawValue?.widget.updateInfo(`$(info) ${renderAsPlaintext(terminationState)}`);
 				}
 
 				// no response or not in progress
@@ -610,6 +621,35 @@ export class InlineChatController implements IEditorContribution {
 		session.dispose();
 	}
 
+	async continueSessionInChat(): Promise<void> {
+		const session = this._currentSession.get();
+		if (!session) {
+			return;
+		}
+
+		await this._instaService.invokeFunction(continueInPanelChat, session);
+	}
+
+	async rephraseSession(): Promise<void> {
+		const session = this._currentSession.get();
+		if (!session) {
+			return;
+		}
+
+		const requestText = session.chatModel.getRequests().at(-1)?.message.text;
+		session.dispose();
+
+		if (!requestText) {
+			return;
+		}
+
+		const selection = this._editor.getSelection();
+		const placeholder = selection && !selection.isEmpty()
+			? localize('placeholderWithSelectionHover', "Describe how to change this")
+			: localize('placeholderNoSelectionHover', "Describe what to generate");
+		await this.inputOverlayWidget.showMenuAtSelection(placeholder, requestText);
+	}
+
 	private async _selectVendorDefaultModel(session: IInlineChatSession2): Promise<void> {
 		const model = this._zone.value.widget.chatWidget.input.selectedLanguageModel.get();
 		if (model && !model.metadata.isDefaultForLocation[session.chatModel.initialLocation]) {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts
index e7773395fce..0be9f4f0502 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts
@@ -192,6 +192,19 @@ export class InlineChatEditorAffordance extends Disposable implements IContentWi
 				this._hide();
 			}
 		}));
+
+		this._store.add(this._editor.onDidScrollChange(() => {
+			const sel = selection.get();
+			if (!sel) {
+				return;
+			}
+			const isInViewport = this._isPositionInViewport();
+			if (isInViewport && !this._isVisible) {
+				this._show(sel);
+			} else if (!isInViewport && this._isVisible) {
+				this._hide();
+			}
+		}));
 	}
 
 	private _show(selection: Selection): void {
@@ -260,6 +273,30 @@ export class InlineChatEditorAffordance extends Disposable implements IContentWi
 		};
 	}
 
+	private _isPositionInViewport(): boolean {
+		const widgetPosition = this._position?.position;
+		if (!widgetPosition) {
+			return false;
+		}
+
+		// Check vertical visibility
+		const visibleRanges = this._editor.getVisibleRanges();
+		const isLineVisible = visibleRanges.some(range =>
+			widgetPosition.lineNumber >= range.startLineNumber && widgetPosition.lineNumber <= range.endLineNumber
+		);
+		if (!isLineVisible) {
+			return false;
+		}
+
+		// Check horizontal visibility
+		const scrolledPos = this._editor.getScrolledVisiblePosition(widgetPosition);
+		if (!scrolledPos) {
+			return false;
+		}
+		const layoutInfo = this._editor.getOptions().get(EditorOption.layoutInfo);
+		return scrolledPos.left >= 0 && scrolledPos.left <= layoutInfo.width;
+	}
+
 	private _hide(): void {
 		if (this._isVisible) {
 			this._isVisible = false;
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatHistoryService.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatHistoryService.ts
new file mode 100644
index 00000000000..3b501b8a03e
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatHistoryService.ts
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { HistoryNavigator2 } from '../../../../base/common/history.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+
+export const IInlineChatHistoryService = createDecorator<IInlineChatHistoryService>('IInlineChatHistoryService');
+
+export interface IInlineChatHistoryService {
+	readonly _serviceBrand: undefined;
+
+	addToHistory(value: string): void;
+	previousValue(): string | undefined;
+	nextValue(): string | undefined;
+	isAtEnd(): boolean;
+	replaceLast(value: string): void;
+	resetCursor(): void;
+}
+
+const _storageKey = 'inlineChat.history';
+const _capacity = 50;
+
+export class InlineChatHistoryService extends Disposable implements IInlineChatHistoryService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _history: HistoryNavigator2<string>;
+
+	constructor(
+		@IStorageService private readonly _storageService: IStorageService,
+	) {
+		super();
+
+		const raw = this._storageService.get(_storageKey, StorageScope.PROFILE);
+		let entries: string[] = [''];
+		if (raw) {
+			try {
+				const parsed: string[] = JSON.parse(raw);
+				if (Array.isArray(parsed) && parsed.length > 0) {
+					entries = parsed;
+					// Ensure there's always an empty uncommitted entry at the end
+					if (entries[entries.length - 1] !== '') {
+						entries.push('');
+					}
+				}
+			} catch {
+				// ignore invalid data
+			}
+		}
+
+		this._history = new HistoryNavigator2<string>(entries, _capacity);
+
+		this._store.add(this._storageService.onWillSaveState(() => {
+			this._saveToStorage();
+		}));
+	}
+
+	private _saveToStorage(): void {
+		const values = [...this._history].filter(v => v.length > 0);
+		if (values.length === 0) {
+			this._storageService.remove(_storageKey, StorageScope.PROFILE);
+		} else {
+			this._storageService.store(_storageKey, JSON.stringify(values), StorageScope.PROFILE, StorageTarget.USER);
+		}
+	}
+
+	addToHistory(value: string): void {
+		this._history.replaceLast(value);
+		this._history.add('');
+	}
+
+	previousValue(): string | undefined {
+		return this._history.previous();
+	}
+
+	nextValue(): string | undefined {
+		return this._history.next();
+	}
+
+	isAtEnd(): boolean {
+		return this._history.isAtEnd();
+	}
+
+	replaceLast(value: string): void {
+		this._history.replaceLast(value);
+	}
+
+	resetCursor(): void {
+		this._history.resetCursor();
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts
index 04a76d7327a..3675acc488e 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts
@@ -7,13 +7,16 @@ import './media/inlineChatOverlayWidget.css';
 import * as dom from '../../../../base/browser/dom.js';
 import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { renderAsPlaintext, renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { BaseActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, constObservable, derived, IObservable, observableFromEvent, observableFromEventOpts, observableValue } from '../../../../base/common/observable.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IActiveCodeEditor, IOverlayWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
@@ -38,6 +41,7 @@ import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOpt
 import { PlaceholderTextContribution } from '../../../../editor/contrib/placeholderText/browser/placeholderTextContribution.js';
 import { IInlineChatSession2 } from './inlineChatSessionService.js';
 import { assertType } from '../../../../base/common/types.js';
+import { IInlineChatHistoryService } from './inlineChatHistoryService.js';
 
 /**
  * Overlay widget that displays a vertical action bar menu.
@@ -59,7 +63,6 @@ export class InlineChatInputWidget extends Disposable {
 	private _anchorLeft: number = 0;
 	private _anchorAbove: boolean = false;
 
-
 	constructor(
 		private readonly _editorObs: ObservableCodeEditor,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@@ -67,6 +70,7 @@ export class InlineChatInputWidget extends Disposable {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IModelService modelService: IModelService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@IInlineChatHistoryService private readonly _historyService: IInlineChatHistoryService,
 	) {
 		super();
 
@@ -158,9 +162,17 @@ export class InlineChatInputWidget extends Disposable {
 			const totalWidth = contentWidth.read(r) + editorPad + toolbarWidth.read(r);
 			const minWidth = 220;
 			const maxWidth = 600;
-			const clampedWidth = this._input.getOption(EditorOption.wordWrap) === 'on'
-				? maxWidth
-				: Math.max(minWidth, Math.min(totalWidth, maxWidth));
+			const midWidth = Math.round(maxWidth / 1.618);
+			let clampedWidth: number;
+			if (this._input.getOption(EditorOption.wordWrap) === 'on') {
+				clampedWidth = maxWidth;
+			} else if (totalWidth <= minWidth) {
+				clampedWidth = minWidth;
+			} else if (totalWidth <= midWidth) {
+				clampedWidth = midWidth;
+			} else {
+				clampedWidth = maxWidth;
+			}
 
 			const lineHeight = this._input.getOption(EditorOption.lineHeight);
 			const clampedHeight = Math.min(contentHeight.read(r), (3 * lineHeight));
@@ -211,15 +223,28 @@ export class InlineChatInputWidget extends Disposable {
 		this._store.add(this._input.onDidBlurEditorText(() => inputWidgetFocused.set(false)));
 		this._store.add(toDisposable(() => inputWidgetFocused.reset()));
 
-		// Handle key events: ArrowDown to move to actions
+		// Handle key events: ArrowUp/ArrowDown for history navigation and action bar focus
 		this._store.add(this._input.onKeyDown(e => {
-			if (e.keyCode === KeyCode.DownArrow && !actionBar.isEmpty()) {
+			if (e.keyCode === KeyCode.UpArrow) {
+				const position = this._input.getPosition();
+				if (position && position.lineNumber === 1) {
+					this._showPreviousHistoryValue();
+					e.preventDefault();
+					e.stopPropagation();
+				}
+			} else if (e.keyCode === KeyCode.DownArrow) {
 				const model = this._input.getModel();
 				const position = this._input.getPosition();
 				if (position && position.lineNumber === model.getLineCount()) {
-					e.preventDefault();
-					e.stopPropagation();
-					actionBar.focus(0);
+					if (!this._historyService.isAtEnd()) {
+						this._showNextHistoryValue();
+						e.preventDefault();
+						e.stopPropagation();
+					} else if (!actionBar.isEmpty()) {
+						e.preventDefault();
+						e.stopPropagation();
+						actionBar.focus(0);
+					}
 				}
 			}
 		}));
@@ -251,18 +276,45 @@ export class InlineChatInputWidget extends Disposable {
 		return this._input.getModel().getValue().trim();
 	}
 
+	addToHistory(value: string): void {
+		this._historyService.addToHistory(value);
+	}
+
+	private _showPreviousHistoryValue(): void {
+		if (this._historyService.isAtEnd()) {
+			this._historyService.replaceLast(this._input.getModel().getValue());
+		}
+		const value = this._historyService.previousValue();
+		if (value !== undefined) {
+			this._input.getModel().setValue(value);
+		}
+	}
+
+	private _showNextHistoryValue(): void {
+		if (this._historyService.isAtEnd()) {
+			return;
+		}
+		const value = this._historyService.nextValue();
+		if (value !== undefined) {
+			this._input.getModel().setValue(value);
+		}
+	}
+
 	/**
 	 * Show the widget at the specified line.
 	 * @param lineNumber The line number to anchor the widget to
 	 * @param left Left offset relative to editor
 	 * @param anchorAbove Whether to anchor above the position (widget grows upward)
 	 */
-	show(lineNumber: number, left: number, anchorAbove: boolean, placeholder: string): void {
+	show(lineNumber: number, left: number, anchorAbove: boolean, placeholder: string, value?: string): void {
 		this._showStore.clear();
 
+		// Reset history cursor to the end (current uncommitted text)
+		this._historyService.resetCursor();
+
 		// Clear input state
 		this._input.updateOptions({ wordWrap: 'off', placeholder });
-		this._input.getModel().setValue('');
+		this._input.getModel().setValue(value ?? '');
 
 		// Store anchor info for scroll updates
 		this._anchorLineNumber = lineNumber;
@@ -300,7 +352,12 @@ export class InlineChatInputWidget extends Disposable {
 		}));
 
 		// Focus the input editor
-		setTimeout(() => this._input.focus(), 0);
+		setTimeout(() => {
+			this._input.focus();
+			if (value) {
+				this._input.setSelection(this._input.getModel().getFullModelRange());
+			}
+		}, 0);
 	}
 
 	private _updatePosition(): void {
@@ -355,6 +412,10 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 
 	private readonly _domNode: HTMLElement = document.createElement('div');
 	private readonly _container: HTMLElement;
+	private readonly _markdownContainer: HTMLElement;
+	private readonly _markdownMessage: HTMLElement;
+	private readonly _markdownScrollable: DomScrollableElement;
+	private readonly _contentRow: HTMLElement;
 	private readonly _statusNode: HTMLElement;
 	private readonly _icon: HTMLElement;
 	private readonly _message: HTMLElement;
@@ -380,12 +441,29 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 		this._domNode.appendChild(this._container);
 		this._container.classList.add('inline-chat-session-overlay-container');
 
+		this._markdownContainer = document.createElement('div');
+		this._markdownContainer.classList.add('markdown-scroll-container');
+
+		this._markdownMessage = document.createElement('div');
+		this._markdownMessage.classList.add('markdown-message');
+		this._markdownContainer.appendChild(this._markdownMessage);
+		this._markdownScrollable = this._store.add(new DomScrollableElement(this._markdownContainer, {
+			consumeMouseWheelIfScrollbarIsNeeded: true,
+			horizontal: ScrollbarVisibility.Hidden,
+			vertical: ScrollbarVisibility.Auto,
+		}));
+		this._container.appendChild(this._markdownScrollable.getDomNode());
+
+		this._contentRow = document.createElement('div');
+		this._contentRow.classList.add('content-row');
+		this._container.appendChild(this._contentRow);
+
 		// Create status node with icon and message
 		this._statusNode = document.createElement('div');
 		this._statusNode.classList.add('status');
 		this._icon = dom.append(this._statusNode, dom.$('span'));
 		this._message = dom.append(this._statusNode, dom.$('span.message'));
-		this._container.appendChild(this._statusNode);
+		this._contentRow.appendChild(this._statusNode);
 
 		// Create toolbar node
 		this._toolbarNode = document.createElement('div');
@@ -410,6 +488,14 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 				return undefined;
 			}
 
+			const terminationState = session.terminationState.read(r);
+			if (terminationState) {
+				return {
+					markdown: terminationState,
+					icon: Codicon.info
+				};
+			}
+
 			const response = chatModel.lastRequestObs.read(r)?.response;
 			if (!response) {
 				return { message: localize('working', "Working..."), icon: ThemeIcon.modify(Codicon.loading, 'spin') };
@@ -458,15 +544,42 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 			}
 		});
 
+		const markdownStore = this._showStore.add(new DisposableStore());
+
 		this._showStore.add(autorun(r => {
 			const value = requestMessage.read(r);
 			if (value) {
-				this._message.innerText = renderAsPlaintext(value.message);
-				this._icon.className = '';
-				this._icon.classList.add(...ThemeIcon.asClassNameArray(value.icon));
+				if (value.message && value.icon) {
+					this._message.innerText = renderAsPlaintext(value.message);
+					this._icon.className = '';
+					this._icon.classList.add(...ThemeIcon.asClassNameArray(value.icon));
+					this._statusNode.classList.remove('hidden');
+					this._contentRow.classList.remove('status-hidden');
+				} else {
+					this._message.innerText = '';
+					this._icon.className = '';
+					this._statusNode.classList.add('hidden');
+					this._contentRow.classList.add('status-hidden');
+				}
+				markdownStore.clear();
+				this._markdownMessage.replaceChildren();
+				if (value.markdown) {
+					this._markdownScrollable.getDomNode().classList.remove('hidden');
+					const markdown = typeof value.markdown === 'string' ? new MarkdownString(value.markdown) : value.markdown;
+					const rendered = markdownStore.add(renderMarkdown(markdown));
+					this._markdownMessage.appendChild(rendered.element);
+					this._markdownScrollable.scanDomNode();
+				} else {
+					this._markdownScrollable.getDomNode().classList.add('hidden');
+				}
 			} else {
 				this._message.innerText = '';
 				this._icon.className = '';
+				this._statusNode.classList.add('hidden');
+				this._contentRow.classList.add('status-hidden');
+				markdownStore.clear();
+				this._markdownMessage.replaceChildren();
+				this._markdownScrollable.getDomNode().classList.add('hidden');
 			}
 		}));
 
@@ -480,7 +593,7 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 		}));
 
 		// Add toolbar
-		this._container.appendChild(this._toolbarNode);
+		this._contentRow.appendChild(this._toolbarNode);
 		this._showStore.add(toDisposable(() => this._toolbarNode.remove()));
 
 		const that = this;
@@ -494,7 +607,7 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 			},
 			menuOptions: { renderShortTitle: true },
 			actionViewItemProvider: (action, options) => {
-				const primaryActions = ['inlineChat2.cancel', 'inlineChat2.keep', 'inlineChat2.close'];
+				const primaryActions = ['inlineChat2.cancel', 'inlineChat2.keep', 'inlineChat2.rephrase'];
 				const labeledActions = primaryActions.concat(['inlineChat2.undo']);
 
 				if (!labeledActions.includes(action.id)) {
@@ -523,8 +636,12 @@ export class InlineChatSessionOverlayWidget extends Disposable {
 			const padding = Math.round(lineHeight.read(r) * 2 / 3);
 
 			// Cap max-width to the editor viewport (content area)
-			const maxWidth = layoutInfo.contentWidth - 2 * padding;
+			const maxWidth = Math.min(400, layoutInfo.contentWidth - 2 * padding);
+			const maxHeight = Math.min(150, Math.floor(layoutInfo.height / 3));
 			this._domNode.style.maxWidth = `${maxWidth}px`;
+			this._markdownScrollable.getDomNode().style.maxHeight = `${maxHeight}px`;
+			this._markdownContainer.style.maxHeight = `${maxHeight}px`;
+			this._markdownScrollable.scanDomNode();
 
 			// Position: top right, below sticky scroll with padding, left of minimap and scrollbar
 			const top = stickyScrollHeight + padding;
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
index 1e54c82cb2f..8a348c9fba5 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { Event } from '../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { IObservable } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IActiveCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { Position } from '../../../../editor/common/core/position.js';
@@ -12,17 +14,21 @@ import { IChatWidgetService } from '../../chat/browser/chat.js';
 import { IChatEditingSession } from '../../chat/common/editing/chatEditingService.js';
 import { IChatModel, IChatModelInputState, IChatRequestModel } from '../../chat/common/model/chatModel.js';
 import { IChatService } from '../../chat/common/chatService/chatService.js';
-import { ChatAgentLocation } from '../../chat/common/constants.js';
+import { ChatAgentLocation, ChatModeKind } from '../../chat/common/constants.js';
 
 
 export const IInlineChatSessionService = createDecorator<IInlineChatSessionService>('IInlineChatSessionService');
 
+export type InlineChatSessionTerminationState = string | IMarkdownString;
+
 export interface IInlineChatSession2 {
 	readonly initialPosition: Position;
 	readonly initialSelection: Selection;
 	readonly uri: URI;
 	readonly chatModel: IChatModel;
 	readonly editingSession: IChatEditingSession;
+	readonly terminationState: IObservable<InlineChatSessionTerminationState | undefined>;
+	setTerminationState(state: InlineChatSessionTerminationState | undefined): void;
 	dispose(): void;
 }
 
@@ -61,7 +67,7 @@ export async function moveToPanelChat(accessor: ServicesAccessor, model: IChatMo
 	}
 }
 
-export async function askInPanelChat(accessor: ServicesAccessor, request: IChatRequestModel, state: IChatModelInputState | undefined) {
+export async function askInPanelChat(accessor: ServicesAccessor, request: IChatRequestModel, state: IChatModelInputState | undefined, fileContext?: { uri: URI; selection: Selection }) {
 
 	const widgetService = accessor.get(IChatWidgetService);
 	const chatService = accessor.get(IChatService);
@@ -74,10 +80,38 @@ export async function askInPanelChat(accessor: ServicesAccessor, request: IChatR
 	const newModelRef = chatService.startNewLocalSession(ChatAgentLocation.Chat);
 	const newModel = newModelRef.object;
 
-	newModel.inputModel.setState({ ...state });
+	newModel.inputModel.setState({
+		...state,
+		mode: { id: 'agent', kind: ChatModeKind.Agent }
+	});
 
 	const widget = await widgetService.openSession(newModelRef.object.sessionResource);
 
 	newModelRef.dispose(); // can be freed after opening because the widget also holds a reference
+	if (widget && fileContext && !fileContext.selection.isEmpty()) {
+		await widget.attachmentModel.addFile(fileContext.uri, fileContext.selection);
+	}
 	widget?.acceptInput(request.message.text);
 }
+
+export async function continueInPanelChat(accessor: ServicesAccessor, session: IInlineChatSession2): Promise<void> {
+	const request = session.chatModel.getRequests().at(-1);
+	if (!request) {
+		return;
+	}
+
+	await askInPanelChat(accessor, request, session.chatModel.inputModel.state.get(), { uri: session.uri, selection: session.initialSelection });
+	session.dispose();
+}
+
+export function rephraseInlineChat(accessor: ServicesAccessor, session: IInlineChatSession2): string | undefined {
+	const request = session.chatModel.getRequests().at(-1);
+	if (!request) {
+		return undefined;
+	}
+
+	accessor.get(IChatService).removeRequest(session.chatModel.sessionResource, request.id);
+	session.chatModel.inputModel.setState({ inputText: request.message.text });
+	session.setTerminationState(undefined);
+	return request.message.text;
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index 6879c6b4391..2aa1b591c18 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -5,7 +5,7 @@
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, dispose, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
-import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
+import { autorun, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IActiveCodeEditor, isCodeEditor, isCompositeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
@@ -27,7 +27,7 @@ import { IChatService } from '../../chat/common/chatService/chatService.js';
 import { ChatAgentLocation } from '../../chat/common/constants.js';
 import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../chat/common/tools/languageModelToolsService.js';
 import { CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_POSSIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
-import { askInPanelChat, IInlineChatSession2, IInlineChatSessionService } from './inlineChatSessionService.js';
+import { continueInPanelChat, IInlineChatSession2, IInlineChatSessionService, InlineChatSessionTerminationState, rephraseInlineChat } from './inlineChatSessionService.js';
 
 export class InlineChatError extends Error {
 	static readonly code = 'InlineChatError';
@@ -83,6 +83,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		const chatModelRef = this._chatService.startNewLocalSession(ChatAgentLocation.EditorInline, { canUseTools: false /* SEE https://github.com/microsoft/vscode/issues/279946 */ });
 		const chatModel = chatModelRef.object;
 		chatModel.startEditingSession(false);
+		const terminationState = observableValue<InlineChatSessionTerminationState | undefined>(this, undefined);
 
 		const store = new DisposableStore();
 		store.add(toDisposable(() => {
@@ -136,6 +137,11 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 			initialSelection: editor.getSelection(),
 			chatModel,
 			editingSession: chatModel.editingSession!,
+			terminationState,
+			setTerminationState: state => {
+				terminationState.set(state, undefined);
+				this._onDidChangeSessions.fire(this);
+			},
 			dispose: store.dispose.bind(store)
 		};
 		this._sessions.set(uri, result);
@@ -235,7 +241,18 @@ export class InlineChatEscapeToolContribution extends Disposable {
 		canBeReferencedInPrompt: false,
 		alwaysDisplayInputOutput: false,
 		displayName: localize('name', "Inline Chat to Panel Chat"),
-		modelDescription: 'Moves the inline chat session to the richer panel chat which supports edits across files, creating and deleting files, multi-turn conversations between the user and the assistant, and access to more IDE tools, like retrieve problems, interact with source control, run terminal commands etc.',
+		modelDescription: 'Show a short textual response when not being able to make code changes and when not having been asked for code changes. Can also be used to move the request to the richer panel chat which supports edits across files, creating and deleting files, multi-turn conversations between the user and the assistant, and access to more IDE tools, like retrieve problems, interact with source control, run terminal commands etc.',
+		inputSchema: {
+			type: 'object',
+			additionalProperties: false,
+			properties: {
+				response: {
+					type: 'string',
+					description: localize('response.description', "Optional brief response for inline chat. Keep it at 10 words or fewer."),
+					maxLength: 200,
+				}
+			}
+		}
 	};
 
 	constructor(
@@ -243,6 +260,7 @@ export class InlineChatEscapeToolContribution extends Disposable {
 		@IInlineChatSessionService inlineChatSessionService: IInlineChatSessionService,
 		@IDialogService dialogService: IDialogService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IChatService chatService: IChatService,
 		@ILogService logService: ILogService,
 		@IStorageService storageService: IStorageService,
@@ -268,6 +286,22 @@ export class InlineChatEscapeToolContribution extends Disposable {
 					return { content: [{ kind: 'text', value: 'Cancel' }] };
 				}
 
+				const lastRequest = session.chatModel.getRequests().at(-1);
+				if (!lastRequest) {
+					logService.warn(`InlineChatEscapeToolContribution: no request found for id ${sessionResource}`);
+					return { content: [{ kind: 'text', value: 'Cancel' }], toolResultMessage: localize('tool.cancel', "Cancel") };
+				}
+
+				if (configurationService.getValue<string>(InlineChatConfigKeys.RenderMode) === 'hover') {
+
+					const response = typeof invocation.parameters?.response === 'string' && invocation.parameters.response.trim().length > 0
+						? invocation.parameters.response.trim()
+						: localize('terminated.message', "Inline chat is designed for making single-file code changes. Continue your request in the Chat view or rephrase it for inline chat.");
+
+					session.setTerminationState(response);
+					return { content: [{ kind: 'text', value: 'Success' }] };
+				}
+
 				const dontAskAgain = storageService.getBoolean(InlineChatEscapeToolContribution.DONT_ASK_AGAIN_KEY, StorageScope.PROFILE);
 
 				let result: { confirmed: boolean; checkboxChecked?: boolean };
@@ -290,14 +324,11 @@ export class InlineChatEscapeToolContribution extends Disposable {
 
 				if (!editor || result.confirmed) {
 					logService.trace('InlineChatEscapeToolContribution: moving session to panel chat');
-					await instaService.invokeFunction(askInPanelChat, session.chatModel.getRequests().at(-1)!, session.chatModel.inputModel.state.get());
-					session.dispose();
+					await instaService.invokeFunction(continueInPanelChat, session);
 
 				} else {
 					logService.trace('InlineChatEscapeToolContribution: rephrase prompt');
-					const lastRequest = session.chatModel.getRequests().at(-1)!;
-					chatService.removeRequest(session.chatModel.sessionResource, lastRequest.id);
-					session.chatModel.inputModel.setState({ inputText: lastRequest.message.text });
+					instaService.invokeFunction(rephraseInlineChat, session);
 				}
 
 				if (result.checkboxChecked) {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css
index 9b8cada0767..68424c91024 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css
@@ -98,29 +98,81 @@
 }
 
 .inline-chat-session-overlay-container {
-	padding: 2px 4px;
+	padding: 4px;
 	color: var(--vscode-foreground);
 	background-color: var(--vscode-editorWidget-background);
 	border-radius: 6px;
 	border: 1px solid var(--vscode-contrastBorder);
 	display: flex;
-	align-items: center;
+	flex-direction: column;
+	align-items: stretch;
 	justify-content: center;
-	gap: 4px;
+	gap: 8px;
 	z-index: 10;
 	box-shadow: var(--vscode-shadow-lg);
 	overflow: hidden;
 }
 
+.inline-chat-session-overlay-container .markdown-message {
+	padding: 5px;
+	font-size: 12px;
+	line-height: 1.45;
+}
+
+.inline-chat-session-overlay-container > .monaco-scrollable-element {
+	width: 100%;
+}
+
+.inline-chat-session-overlay-container > .monaco-scrollable-element.hidden {
+	display: none;
+}
+
+.inline-chat-session-overlay-container .markdown-scroll-container {
+	width: 100%;
+}
+
+.inline-chat-session-overlay-container .markdown-message DIV P {
+	margin: 0;
+}
+
+.inline-chat-session-overlay-container .markdown-message DIV P code {
+	font-family: var(--monaco-monospace-font);
+	font-size: var(--vscode-chat-font-size-body-xs);
+	color: var(--vscode-textPreformat-foreground);
+	background-color: var(--vscode-textPreformat-background);
+	padding: 1px 3px;
+	border-radius: 4px;
+	border: 1px solid var(--vscode-textPreformat-border);
+	white-space: pre-wrap;
+}
+
+
+.inline-chat-session-overlay-container .content-row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 4px;
+	min-width: 0;
+}
+
+.inline-chat-session-overlay-container .content-row.status-hidden {
+	justify-content: flex-end;
+}
+
 .inline-chat-session-overlay-container .status {
 	align-items: center;
 	display: inline-flex;
+	flex: 1;
 	padding: 5px 0 5px 5px;
 	font-size: 12px;
 	overflow: hidden;
 	gap: 6px;
 }
 
+.inline-chat-session-overlay-container .status.hidden {
+	display: none;
+}
+
 .inline-chat-session-overlay-container .status .message {
 	white-space: nowrap;
 	overflow: hidden;
diff --git a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
index 6331855f6a0..8832cbe3cc9 100644
--- a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
+++ b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
@@ -22,6 +22,7 @@ export const enum InlineChatConfigKeys {
 	Affordance = 'inlineChat.affordance',
 	RenderMode = 'inlineChat.renderMode',
 	FixDiagnostics = 'inlineChat.fixDiagnostics',
+	AskInChat = 'inlineChat.askInChat',
 }
 
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
@@ -67,7 +68,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 		},
 		[InlineChatConfigKeys.RenderMode]: {
 			description: localize('renderMode', "Controls how inline chat is rendered."),
-			default: 'zone',
+			default: 'hover',
 			type: 'string',
 			enum: ['zone', 'hover'],
 			enumDescriptions: [
@@ -87,7 +88,12 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 				mode: 'auto'
 			},
 			tags: ['experimental']
-		}
+		},
+		[InlineChatConfigKeys.AskInChat]: {
+			description: localize('askInChat', "Controls whether files in a chat editing session use Ask in Chat instead of Inline Chat."),
+			default: true,
+			type: 'boolean',
+		},
 	}
 });
 
@@ -124,6 +130,7 @@ export const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = new RawContextKey<boolean>('i
 export const CTX_INLINE_CHAT_RESPONSE_TYPE = new RawContextKey<InlineChatResponseType>('inlineChatResponseType', InlineChatResponseType.None, localize('inlineChatResponseTypes', "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"));
 export const CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT = new RawContextKey<boolean>('inlineChatFileBelongsToChat', false, localize('inlineChatFileBelongsToChat', "Whether the current file belongs to a chat editing session"));
 export const CTX_INLINE_CHAT_PENDING_CONFIRMATION = new RawContextKey<boolean>('inlineChatPendingConfirmation', false, localize('inlineChatPendingConfirmation', "Whether an inline chat request is pending user confirmation"));
+export const CTX_INLINE_CHAT_TERMINATED = new RawContextKey<boolean>('inlineChatTerminated', false, localize('inlineChatTerminated', "Whether the current inline chat session is terminated"));
 export const CTX_INLINE_CHAT_AFFORDANCE_VISIBLE = new RawContextKey<boolean>('inlineChatAffordanceVisible', false, localize('inlineChatAffordanceVisible', "Whether an inline chat affordance widget is visible"));
 
 export const CTX_INLINE_CHAT_V1_ENABLED = ContextKeyExpr.or(
@@ -137,6 +144,7 @@ export const CTX_INLINE_CHAT_V2_ENABLED = ContextKeyExpr.or(
 
 export const CTX_HOVER_MODE = ContextKeyExpr.equals('config.inlineChat.renderMode', 'hover');
 export const CTX_FIX_DIAGNOSTICS_ENABLED = ContextKeyExpr.equals('config.inlineChat.fixDiagnostics', true);
+export const CTX_ASK_IN_CHAT_ENABLED = ContextKeyExpr.equals('config.inlineChat.askInChat', true);
 
 // --- (selected) action identifier
 
diff --git a/src/vs/workbench/contrib/keybindingsExport/electron-browser/keybindingsExport.contribution.ts b/src/vs/workbench/contrib/keybindingsExport/electron-browser/keybindingsExport.contribution.ts
new file mode 100644
index 00000000000..6235b798361
--- /dev/null
+++ b/src/vs/workbench/contrib/keybindingsExport/electron-browser/keybindingsExport.contribution.ts
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { URI } from '../../../../base/common/uri.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { join } from '../../../../base/common/path.js';
+import { OperatingSystem } from '../../../../base/common/platform.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IKeybindingItem, KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingResolver } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/resolvedKeybindingItem.js';
+import { IKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
+import { IMacLinuxKeyboardMapping, IWindowsKeyboardMapping } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { MacLinuxKeyboardMapper } from '../../../services/keybinding/common/macLinuxKeyboardMapper.js';
+import { WindowsKeyboardMapper } from '../../../services/keybinding/common/windowsKeyboardMapper.js';
+import { IKeymapInfo, KeymapInfo } from '../../../services/keybinding/common/keymapInfo.js';
+import { EN_US_WIN_LAYOUT } from '../../../services/keybinding/browser/keyboardLayouts/en.win.js';
+import { EN_US_DARWIN_LAYOUT } from '../../../services/keybinding/browser/keyboardLayouts/en.darwin.js';
+import { EN_US_LINUX_LAYOUT } from '../../../services/keybinding/browser/keyboardLayouts/en.linux.js';
+import { KeybindingIO, OutputBuilder } from '../../../services/keybinding/common/keybindingIO.js';
+import { getAllUnboundCommands } from '../../../services/keybinding/browser/unboundCommands.js';
+
+export class KeybindingsExportContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.keybindingsExport';
+
+	constructor(
+		@INativeEnvironmentService private readonly nativeEnvironmentService: INativeEnvironmentService,
+		@IFileService private readonly fileService: IFileService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@IProductService private readonly productService: IProductService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super();
+
+		if (this.productService.quality === 'stable') {
+			return;
+		}
+
+		const outputPath = this.nativeEnvironmentService.exportDefaultKeybindings;
+		if (outputPath !== undefined) {
+			const defaultPath = join(this.nativeEnvironmentService.appRoot, 'doc');
+			void this.exportDefaultKeybindingsAndQuit(outputPath || defaultPath);
+		}
+	}
+
+	private async exportDefaultKeybindingsAndQuit(outputPath: string): Promise<void> {
+		try {
+			const platforms: { os: OperatingSystem; filename: string }[] = [
+				{ os: OperatingSystem.Windows, filename: 'doc.keybindings.win.json' },
+				{ os: OperatingSystem.Macintosh, filename: 'doc.keybindings.osx.json' },
+				{ os: OperatingSystem.Linux, filename: 'doc.keybindings.linux.json' },
+			];
+
+			for (const { os, filename } of platforms) {
+				const content = KeybindingsExportContribution._getDefaultKeybindingsContentForOS(os);
+				const filePath = join(outputPath, filename);
+				await this.fileService.writeFile(URI.file(filePath), VSBuffer.fromString(content));
+				this.logService.info(`[${KeybindingsExportContribution.ID}] Wrote ${filePath}`);
+			}
+
+			await this.nativeHostService.exit(0);
+		} catch (error) {
+			this.logService.error(`[${KeybindingsExportContribution.ID}] Failed to generate default keybindings`, error);
+			await this.nativeHostService.exit(1);
+		}
+	}
+
+	private static _getDefaultKeybindingsContentForOS(os: OperatingSystem): string {
+		const items = KeybindingsRegistry.getDefaultKeybindingsForOS(os);
+		const mapper = KeybindingsExportContribution._createKeyboardMapperForOS(os);
+		const resolved = KeybindingsExportContribution._resolveKeybindingItemsWithMapper(items, mapper);
+		const resolver = new KeybindingResolver(resolved, [], () => { });
+		const defaultKeybindings = resolver.getDefaultKeybindings();
+		const boundCommands = resolver.getDefaultBoundCommands();
+		return (
+			KeybindingsExportContribution._formatDefaultKeybindings(defaultKeybindings)
+			+ '\n\n'
+			+ KeybindingsExportContribution._formatAllCommandsAsComment(boundCommands)
+		);
+	}
+
+	private static _createKeyboardMapperForOS(os: OperatingSystem): IKeyboardMapper {
+		const layoutMap: Record<OperatingSystem, IKeymapInfo> = {
+			[OperatingSystem.Windows]: EN_US_WIN_LAYOUT,
+			[OperatingSystem.Macintosh]: EN_US_DARWIN_LAYOUT,
+			[OperatingSystem.Linux]: EN_US_LINUX_LAYOUT,
+		};
+		const layout = layoutMap[os];
+		const keymapInfo = new KeymapInfo(layout.layout, layout.secondaryLayouts, layout.mapping);
+		switch (os) {
+			case OperatingSystem.Windows:
+				return new WindowsKeyboardMapper(true, <IWindowsKeyboardMapping>keymapInfo.mapping, false);
+			case OperatingSystem.Macintosh:
+				return new MacLinuxKeyboardMapper(true, <IMacLinuxKeyboardMapping>keymapInfo.mapping, false, OperatingSystem.Macintosh);
+			case OperatingSystem.Linux:
+				return new MacLinuxKeyboardMapper(true, <IMacLinuxKeyboardMapping>keymapInfo.mapping, false, OperatingSystem.Linux);
+		}
+	}
+
+	private static _resolveKeybindingItemsWithMapper(items: IKeybindingItem[], mapper: IKeyboardMapper): ResolvedKeybindingItem[] {
+		const result: ResolvedKeybindingItem[] = [];
+		for (const item of items) {
+			const when = item.when || undefined;
+			const keybinding = item.keybinding;
+			if (!keybinding) {
+				result.push(new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, true, item.extensionId, item.isBuiltinExtension));
+			} else {
+				const resolvedKeybindings = mapper.resolveKeybinding(keybinding);
+				for (let i = resolvedKeybindings.length - 1; i >= 0; i--) {
+					result.push(new ResolvedKeybindingItem(resolvedKeybindings[i], item.command, item.commandArgs, when, true, item.extensionId, item.isBuiltinExtension));
+				}
+			}
+		}
+		return result;
+	}
+
+	private static _formatDefaultKeybindings(defaultKeybindings: readonly ResolvedKeybindingItem[]): string {
+		const out = new OutputBuilder();
+		out.writeLine('[');
+		const lastIndex = defaultKeybindings.length - 1;
+		defaultKeybindings.forEach((k, index) => {
+			KeybindingIO.writeKeybindingItem(out, k);
+			if (index !== lastIndex) {
+				out.writeLine(',');
+			} else {
+				out.writeLine();
+			}
+		});
+		out.writeLine(']');
+		return out.toString();
+	}
+
+	private static _formatAllCommandsAsComment(boundCommands: Map<string, boolean>): string {
+		const unboundCommands = getAllUnboundCommands(boundCommands);
+		const pretty = unboundCommands.sort().join('\n// - ');
+		return '// Here are other available commands: ' + '\n// - ' + pretty;
+	}
+}
+
+registerWorkbenchContribution2(
+	KeybindingsExportContribution.ID,
+	KeybindingsExportContribution,
+	WorkbenchPhase.Eventually,
+);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpGatewayService.ts b/src/vs/workbench/contrib/mcp/browser/mcpGatewayService.ts
index 4d2d9df2c49..467d4f995e4 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpGatewayService.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpGatewayService.ts
@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Event } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IMcpGatewayService, McpGatewayChannelName } from '../../../../platform/mcp/common/mcpGateway.js';
+import { IMcpGatewayServerInfo, IMcpGatewayService, McpGatewayChannelName } from '../../../../platform/mcp/common/mcpGateway.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
-import { IMcpGatewayResult, IWorkbenchMcpGatewayService } from '../common/mcpGatewayService.js';
+import { IMcpGatewayResult, IMcpGatewayResultServer, IWorkbenchMcpGatewayService } from '../common/mcpGatewayService.js';
 
 /**
  * Browser implementation of the MCP Gateway Service.
@@ -47,11 +48,20 @@ export class BrowserMcpGatewayService implements IWorkbenchMcpGatewayService {
 		return connection.withChannel(McpGatewayChannelName, async channel => {
 			const service = ProxyChannel.toService<IMcpGatewayService>(channel);
 			const info = await service.createGateway(undefined);
-			const address = URI.revive(info.address);
-			this._logService.info(`[McpGateway][BrowserWorkbench] Remote gateway created: ${address}`);
+			const servers = reviveServers(info.servers);
+			this._logService.info(`[McpGateway][BrowserWorkbench] Remote gateway created with ${servers.length} server(s)`);
+
+			const onDidChangeServers = Event.map(
+				Event.filter(
+					channel.listen<{ gatewayId: string; servers: readonly IMcpGatewayServerInfo[] }>('onDidChangeGatewayServers'),
+					e => e.gatewayId === info.gatewayId,
+				),
+				e => reviveServers(e.servers),
+			);
 
 			return {
-				address,
+				servers,
+				onDidChangeServers,
 				dispose: () => {
 					this._logService.info(`[McpGateway][BrowserWorkbench] Disposing remote gateway: ${info.gatewayId}`);
 					service.disposeGateway(info.gatewayId);
@@ -60,3 +70,7 @@ export class BrowserMcpGatewayService implements IWorkbenchMcpGatewayService {
 		});
 	}
 }
+
+function reviveServers(servers: readonly IMcpGatewayServerInfo[]): IMcpGatewayResultServer[] {
+	return servers.map(s => ({ label: s.label, address: URI.revive(s.address) }));
+}
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/pluginMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/pluginMcpDiscovery.ts
index 7cb6a6efebd..3a3bfb38f88 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/pluginMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/pluginMcpDiscovery.ts
@@ -43,11 +43,17 @@ export class PluginMcpDiscovery extends Disposable implements IMcpDiscovery {
 				if (!isContributionEnabled(plugin.enablement.read(reader))) {
 					continue;
 				}
+				const servers = plugin.mcpServerDefinitions.read(reader);
+				if (servers.length === 0) {
+					continue;
+				}
+
 				seen.add(plugin.uri);
 
 				let collectionState = this._collections.get(plugin.uri);
 				if (!collectionState) {
-					collectionState = this.createCollectionState(plugin);
+					// note: all plugin servers are currently defined in the same file
+					collectionState = this.createCollectionState(plugin, servers[0].uri);
 					this._collections.set(plugin.uri, collectionState);
 				}
 			}
@@ -60,7 +66,7 @@ export class PluginMcpDiscovery extends Disposable implements IMcpDiscovery {
 		}));
 	}
 
-	private createCollectionState(plugin: IAgentPlugin) {
+	private createCollectionState(plugin: IAgentPlugin, manifestURI: URI) {
 		const collectionId = `plugin.${plugin.uri}`;
 		return this._mcpRegistry.registerCollection({
 			id: collectionId,
@@ -72,7 +78,7 @@ export class PluginMcpDiscovery extends Disposable implements IMcpDiscovery {
 			serverDefinitions: plugin.mcpServerDefinitions.map(defs =>
 				defs.map(d => this._toServerDefinition(collectionId, d)).filter(isDefined)),
 			presentation: {
-				origin: plugin.uri,
+				origin: manifestURI,
 				order: McpCollectionSortOrder.Plugin,
 			},
 		});
@@ -91,6 +97,7 @@ export class PluginMcpDiscovery extends Disposable implements IMcpDiscovery {
 			id: `${collectionId}.${name}`,
 			label: name,
 			launch,
+			variableReplacement: { target: ConfigurationTarget.USER },
 			cacheNonce: String(hash(launch)),
 		};
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpGatewayService.ts b/src/vs/workbench/contrib/mcp/common/mcpGatewayService.ts
index 7376729aa00..f97a7a8f92c 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpGatewayService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpGatewayService.ts
@@ -3,20 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IWorkbenchMcpGatewayService = createDecorator<IWorkbenchMcpGatewayService>('IWorkbenchMcpGatewayService');
 
+/**
+ * A single server entry exposed by the gateway at the workbench layer.
+ */
+export interface IMcpGatewayResultServer {
+	readonly label: string;
+	readonly address: URI;
+}
+
 /**
  * Result of creating an MCP gateway, which is itself disposable.
  */
 export interface IMcpGatewayResult extends IDisposable {
 	/**
-	 * The address of the HTTP endpoint for this gateway.
+	 * The servers currently exposed by this gateway.
 	 */
-	readonly address: URI;
+	readonly servers: readonly IMcpGatewayResultServer[];
+
+	/**
+	 * Event that fires when the set of servers changes.
+	 */
+	readonly onDidChangeServers: Event<readonly IMcpGatewayResultServer[]>;
 }
 
 /**
diff --git a/src/vs/workbench/contrib/mcp/common/mcpGatewayToolBrokerChannel.ts b/src/vs/workbench/contrib/mcp/common/mcpGatewayToolBrokerChannel.ts
index 7e4e2c18691..172f0650aab 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpGatewayToolBrokerChannel.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpGatewayToolBrokerChannel.ts
@@ -9,27 +9,31 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { IServerChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IGatewayCallToolResult, IGatewayServerResources, IGatewayServerResourceTemplates } from '../../../../platform/mcp/common/mcpGateway.js';
+import { IMcpGatewayServerDescriptor } from '../../../../platform/mcp/common/mcpGateway.js';
 import { MCP } from '../../../../platform/mcp/common/modelContextProtocol.js';
 import { McpServer } from './mcpServer.js';
 import { IMcpServer, IMcpService, McpCapability, McpServerCacheState, McpToolVisibility } from './mcpTypes.js';
 import { startServerAndWaitForLiveTools } from './mcpTypesUtils.js';
 
-interface ICallToolArgs {
+interface ICallToolForServerArgs {
+	serverId: string;
 	name: string;
 	args: Record<string, unknown>;
 }
 
-interface IReadResourceArgs {
-	serverIndex: number;
+interface IReadResourceForServerArgs {
+	serverId: string;
 	uri: string;
 }
 
+interface IServerIdArg {
+	serverId: string;
+}
+
 export class McpGatewayToolBrokerChannel extends Disposable implements IServerChannel<unknown> {
 	private readonly _onDidChangeTools = this._register(new Emitter<void>());
 	private readonly _onDidChangeResources = this._register(new Emitter<void>());
-	private readonly _serverIdMap = new Map<string, number>();
-	private _nextServerIndex = 0;
+	private readonly _onDidChangeServers = this._register(new Emitter<readonly IMcpGatewayServerDescriptor[]>());
 
 	/**
 	 * Per-server promise that races server startup against the grace period timeout.
@@ -78,21 +82,23 @@ export class McpGatewayToolBrokerChannel extends Disposable implements IServerCh
 				resourcesInitialized = true;
 			}
 		}));
+
+		let serversInitialized = false;
+		this._register(autorun(reader => {
+			const servers = this._mcpService.servers.read(reader);
+
+			if (serversInitialized) {
+				this._logService.debug('[McpGateway][ToolBroker] Servers changed, firing onDidChangeServers');
+				this._onDidChangeServers.fire(servers.map(s => ({ id: s.definition.id, label: s.definition.label })));
+			} else {
+				serversInitialized = true;
+			}
+		}));
 	}
 
-	private _getServerIndex(server: IMcpServer): number {
-		const defId = server.definition.id;
-		let index = this._serverIdMap.get(defId);
-		if (index === undefined) {
-			index = this._nextServerIndex++;
-			this._serverIdMap.set(defId, index);
-		}
-		return index;
-	}
-
-	private _getServerByIndex(serverIndex: number): IMcpServer | undefined {
+	private _getServerById(serverId: string): IMcpServer | undefined {
 		for (const server of this._mcpService.servers.get()) {
-			if (this._getServerIndex(server) === serverIndex) {
+			if (server.definition.id === serverId) {
 				return server;
 			}
 		}
@@ -128,10 +134,6 @@ export class McpGatewayToolBrokerChannel extends Disposable implements IServerCh
 	private async _shouldUseCachedData(server: IMcpServer): Promise<boolean> {
 		const cacheState = server.cacheState.get();
 		if (cacheState === McpServerCacheState.Unknown || cacheState === McpServerCacheState.Outdated) {
-			// On first list call: wait up to the grace period for the server to start.
-			// On subsequent calls: the stored promise is already resolved, returns immediately.
-			// Outdated servers get the same grace period as Unknown — a prior fast startup
-			// does not guarantee a fast restart.
 			await this._waitForStartup(server);
 			const newState = server.cacheState.get();
 			return newState === McpServerCacheState.Live
@@ -149,6 +151,8 @@ export class McpGatewayToolBrokerChannel extends Disposable implements IServerCh
 				return this._onDidChangeTools.event as Event<T>;
 			case 'onDidChangeResources':
 				return this._onDidChangeResources.event as Event<T>;
+			case 'onDidChangeServers':
+				return this._onDidChangeServers.event as Event<T>;
 		}
 
 		throw new Error(`Invalid listen: ${event}`);
@@ -158,26 +162,33 @@ export class McpGatewayToolBrokerChannel extends Disposable implements IServerCh
 		this._logService.debug(`[McpGateway][ToolBroker] IPC call: ${command}`);
 
 		switch (command) {
-			case 'listTools': {
-				const tools = await this._listTools();
+			case 'listServers': {
+				const servers = this._listServers();
+				return servers as T;
+			}
+			case 'listToolsForServer': {
+				const { serverId } = arg as IServerIdArg;
+				const tools = await this._listToolsForServer(serverId);
 				return tools as T;
 			}
-			case 'callTool': {
-				const { name, args } = arg as ICallToolArgs;
-				const result = await this._callTool(name, args || {}, cancellationToken);
+			case 'callToolForServer': {
+				const { serverId, name, args } = arg as ICallToolForServerArgs;
+				const result = await this._callToolForServer(serverId, name, args || {}, cancellationToken);
 				return result as T;
 			}
-			case 'listResources': {
-				const resources = await this._listResources();
+			case 'listResourcesForServer': {
+				const { serverId } = arg as IServerIdArg;
+				const resources = await this._listResourcesForServer(serverId);
 				return resources as T;
 			}
-			case 'readResource': {
-				const { serverIndex, uri } = arg as IReadResourceArgs;
-				const result = await this._readResource(serverIndex, uri, cancellationToken);
+			case 'readResourceForServer': {
+				const { serverId, uri } = arg as IReadResourceForServerArgs;
+				const result = await this._readResourceForServer(serverId, uri, cancellationToken);
 				return result as T;
 			}
-			case 'listResourceTemplates': {
-				const templates = await this._listResourceTemplates();
+			case 'listResourceTemplatesForServer': {
+				const { serverId } = arg as IServerIdArg;
+				const templates = await this._listResourceTemplatesForServer(serverId);
 				return templates as T;
 			}
 		}
@@ -185,112 +196,114 @@ export class McpGatewayToolBrokerChannel extends Disposable implements IServerCh
 		throw new Error(`Invalid call: ${command}`);
 	}
 
-	private async _listTools(): Promise<readonly MCP.Tool[]> {
+	private _listServers(): readonly IMcpGatewayServerDescriptor[] {
 		const servers = this._mcpService.servers.get();
-		const perServer = await Promise.all(servers.map(async server => {
-			if (!await this._shouldUseCachedData(server)) {
-				this._logService.debug(`[McpGateway][ToolBroker] Server '${server.definition.id}' not ready, skipping tool listing`);
-				return [] as MCP.Tool[];
-			}
-			return server.tools.get()
-				.filter(t => t.visibility & McpToolVisibility.Model)
-				.map(t => t.definition);
-		}));
-
-		const mcpTools = perServer.flat();
-		this._logService.debug(`[McpGateway][ToolBroker] listTools result: ${mcpTools.length} tool(s): [${mcpTools.map(t => t.name).join(', ')}]`);
-
-		return mcpTools;
-	}
-
-	private async _callTool(name: string, args: Record<string, unknown>, token: CancellationToken = CancellationToken.None): Promise<IGatewayCallToolResult> {
-		this._logService.debug(`[McpGateway][ToolBroker] callTool '${name}' with args: ${JSON.stringify(args)}`);
-
-		for (const server of this._mcpService.servers.get()) {
-			const tool = server.tools.get().find(t =>
-				t.definition.name === name && (t.visibility & McpToolVisibility.Model)
-			);
-
-			if (tool) {
-				this._logService.debug(`[McpGateway][ToolBroker] Found tool '${name}' on server '${server.definition.id}' (index=${this._getServerIndex(server)})`);
-				const result = await tool.call(args, undefined, token);
-				this._logService.debug(`[McpGateway][ToolBroker] Tool '${name}' completed (isError=${result.isError ?? false}, content blocks=${result.content.length})`);
-				return { result, serverIndex: this._getServerIndex(server) };
-			}
+		const result: IMcpGatewayServerDescriptor[] = [];
+		for (const server of servers) {
+			result.push({ id: server.definition.id, label: server.definition.label });
 		}
-
-		this._logService.warn(`[McpGateway][ToolBroker] Tool '${name}' not found on any server`);
-		throw new Error(`Unknown tool: ${name}`);
-	}
-
-	private async _listResources(): Promise<readonly IGatewayServerResources[]> {
-		const results: IGatewayServerResources[] = [];
-		const servers = this._mcpService.servers.get();
-		this._logService.debug(`[McpGateway][ToolBroker] listResources: ${servers.length} server(s) known`);
-
-		await Promise.all(servers.map(async server => {
-			if (!await this._shouldUseCachedData(server)) {
-				return;
-			}
-
-			const capabilities = server.capabilities.get();
-			if (!capabilities || !(capabilities & McpCapability.Resources)) {
-				this._logService.debug(`[McpGateway][ToolBroker] Server '${server.definition.id}' has no resource capability, skipping`);
-				return;
-			}
-
-			try {
-				const resources = await McpServer.callOn(server, h => h.listResources());
-				this._logService.debug(`[McpGateway][ToolBroker] Server '${server.definition.id}' (index=${this._getServerIndex(server)}) listed ${resources.length} resource(s)`);
-				results.push({ serverIndex: this._getServerIndex(server), resources });
-			} catch (error) {
-				this._logService.warn(`[McpGateway][ToolBroker] Server '${server.definition.id}' failed to list resources`, error);
-			}
-		}));
-
-		this._logService.debug(`[McpGateway][ToolBroker] listResources result: ${results.length} server(s) with resources`);
-		return results;
-	}
-
-	private async _readResource(serverIndex: number, uri: string, token: CancellationToken = CancellationToken.None): Promise<MCP.ReadResourceResult> {
-		const server = this._getServerByIndex(serverIndex);
-		if (!server) {
-			this._logService.warn(`[McpGateway][ToolBroker] readResource: unknown server index ${serverIndex}`);
-			throw new Error(`Unknown server index: ${serverIndex}`);
-		}
-
-		this._logService.debug(`[McpGateway][ToolBroker] readResource '${uri}' from server '${server.definition.id}' (index=${serverIndex})`);
-		const result = await McpServer.callOn(server, h => h.readResource({ uri }, token), token);
-		this._logService.debug(`[McpGateway][ToolBroker] readResource returned ${result.contents.length} content(s)`);
+		this._logService.debug(`[McpGateway][ToolBroker] listServers result: ${result.length} server(s): [${result.map(s => s.label).join(', ')}]`);
 		return result;
 	}
 
-	private async _listResourceTemplates(): Promise<readonly IGatewayServerResourceTemplates[]> {
-		const results: IGatewayServerResourceTemplates[] = [];
-		const servers = this._mcpService.servers.get();
-		this._logService.debug(`[McpGateway][ToolBroker] listResourceTemplates: ${servers.length} server(s) known`);
+	private async _listToolsForServer(serverId: string): Promise<readonly MCP.Tool[]> {
+		const server = this._getServerById(serverId);
+		if (!server) {
+			this._logService.warn(`[McpGateway][ToolBroker] listToolsForServer: unknown server '${serverId}'`);
+			return [];
+		}
+		if (!await this._shouldUseCachedData(server)) {
+			this._logService.debug(`[McpGateway][ToolBroker] Server '${serverId}' not ready, skipping tool listing`);
+			return [];
+		}
+		const tools = server.tools.get()
+			.filter(t => t.visibility & McpToolVisibility.Model)
+			.map(t => t.definition);
+		this._logService.debug(`[McpGateway][ToolBroker] listToolsForServer '${serverId}': ${tools.length} tool(s)`);
+		return tools;
+	}
 
-		await Promise.all(servers.map(async server => {
-			if (!await this._shouldUseCachedData(server)) {
-				return;
-			}
+	private async _callToolForServer(serverId: string, name: string, args: Record<string, unknown>, token: CancellationToken = CancellationToken.None): Promise<MCP.CallToolResult> {
+		this._logService.debug(`[McpGateway][ToolBroker] callToolForServer '${serverId}' tool '${name}' with args: ${JSON.stringify(args)}`);
 
-			const capabilities = server.capabilities.get();
-			if (!capabilities || !(capabilities & McpCapability.Resources)) {
-				return;
-			}
+		const server = this._getServerById(serverId);
+		if (!server) {
+			throw new Error(`Unknown server: ${serverId}`);
+		}
 
-			try {
-				const resourceTemplates = await McpServer.callOn(server, h => h.listResourceTemplates());
-				this._logService.debug(`[McpGateway][ToolBroker] Server '${server.definition.id}' (index=${this._getServerIndex(server)}) listed ${resourceTemplates.length} resource template(s)`);
-				results.push({ serverIndex: this._getServerIndex(server), resourceTemplates });
-			} catch (error) {
-				this._logService.warn(`[McpGateway][ToolBroker] Server '${server.definition.id}' failed to list resource templates`, error);
-			}
-		}));
+		const tool = server.tools.get().find(t =>
+			t.definition.name === name && (t.visibility & McpToolVisibility.Model)
+		);
+		if (!tool) {
+			throw new Error(`Unknown tool '${name}' on server '${serverId}'`);
+		}
 
-		this._logService.debug(`[McpGateway][ToolBroker] listResourceTemplates result: ${results.length} server(s) with templates`);
-		return results;
+		const result = await tool.call(args, undefined, token);
+		this._logService.debug(`[McpGateway][ToolBroker] Tool '${name}' on '${serverId}' completed (isError=${result.isError ?? false}, content blocks=${result.content.length})`);
+		return result;
+	}
+
+	private async _listResourcesForServer(serverId: string): Promise<readonly MCP.Resource[]> {
+		const server = this._getServerById(serverId);
+		if (!server) {
+			this._logService.warn(`[McpGateway][ToolBroker] listResourcesForServer: unknown server '${serverId}'`);
+			return [];
+		}
+		if (!await this._shouldUseCachedData(server)) {
+			return [];
+		}
+
+		const capabilities = server.capabilities.get();
+		if (!capabilities || !(capabilities & McpCapability.Resources)) {
+			this._logService.debug(`[McpGateway][ToolBroker] Server '${serverId}' has no resource capability`);
+			return [];
+		}
+
+		try {
+			const resources = await McpServer.callOn(server, h => h.listResources());
+			this._logService.debug(`[McpGateway][ToolBroker] Server '${serverId}' listed ${resources.length} resource(s)`);
+			return resources;
+		} catch (error) {
+			this._logService.warn(`[McpGateway][ToolBroker] Server '${serverId}' failed to list resources`, error);
+			return [];
+		}
+	}
+
+	private async _readResourceForServer(serverId: string, uri: string, token: CancellationToken = CancellationToken.None): Promise<MCP.ReadResourceResult> {
+		const server = this._getServerById(serverId);
+		if (!server) {
+			throw new Error(`Unknown server: ${serverId}`);
+		}
+
+		this._logService.debug(`[McpGateway][ToolBroker] readResourceForServer '${uri}' from server '${serverId}'`);
+		const result = await McpServer.callOn(server, h => h.readResource({ uri }, token), token);
+		this._logService.debug(`[McpGateway][ToolBroker] readResourceForServer returned ${result.contents.length} content(s)`);
+		return result;
+	}
+
+	private async _listResourceTemplatesForServer(serverId: string): Promise<readonly MCP.ResourceTemplate[]> {
+		const server = this._getServerById(serverId);
+		if (!server) {
+			this._logService.warn(`[McpGateway][ToolBroker] listResourceTemplatesForServer: unknown server '${serverId}'`);
+			return [];
+		}
+		if (!await this._shouldUseCachedData(server)) {
+			return [];
+		}
+
+		const capabilities = server.capabilities.get();
+		if (!capabilities || !(capabilities & McpCapability.Resources)) {
+			return [];
+		}
+
+		try {
+			const resourceTemplates = await McpServer.callOn(server, h => h.listResourceTemplates());
+			this._logService.debug(`[McpGateway][ToolBroker] Server '${serverId}' listed ${resourceTemplates.length} resource template(s)`);
+			return resourceTemplates;
+		} catch (error) {
+			this._logService.warn(`[McpGateway][ToolBroker] Server '${serverId}' failed to list resource templates`, error);
+			return [];
+		}
 	}
 
 	private async _ensureServerReady(server: IMcpServer): Promise<boolean> {
diff --git a/src/vs/workbench/contrib/mcp/electron-browser/mcpGatewayService.ts b/src/vs/workbench/contrib/mcp/electron-browser/mcpGatewayService.ts
index 71d0dcdc64b..5bf8d9cde62 100644
--- a/src/vs/workbench/contrib/mcp/electron-browser/mcpGatewayService.ts
+++ b/src/vs/workbench/contrib/mcp/electron-browser/mcpGatewayService.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Event } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
-import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IChannel, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IMcpGatewayService, McpGatewayChannelName } from '../../../../platform/mcp/common/mcpGateway.js';
+import { IMcpGatewayServerInfo, IMcpGatewayService, McpGatewayChannelName } from '../../../../platform/mcp/common/mcpGateway.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
-import { IMcpGatewayResult, IWorkbenchMcpGatewayService } from '../common/mcpGatewayService.js';
+import { IMcpGatewayResult, IMcpGatewayResultServer, IWorkbenchMcpGatewayService } from '../common/mcpGatewayService.js';
 
 /**
  * Electron workbench implementation of the MCP Gateway Service.
@@ -21,15 +22,15 @@ export class WorkbenchMcpGatewayService implements IWorkbenchMcpGatewayService {
 	declare readonly _serviceBrand: undefined;
 
 	private readonly _localPlatformService: IMcpGatewayService;
+	private readonly _localChannel: IChannel;
 
 	constructor(
 		@IMainProcessService mainProcessService: IMainProcessService,
 		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
 		@ILogService private readonly _logService: ILogService,
 	) {
-		this._localPlatformService = ProxyChannel.toService<IMcpGatewayService>(
-			mainProcessService.getChannel(McpGatewayChannelName)
-		);
+		this._localChannel = mainProcessService.getChannel(McpGatewayChannelName);
+		this._localPlatformService = ProxyChannel.toService<IMcpGatewayService>(this._localChannel);
 	}
 
 	async createGateway(inRemote: boolean): Promise<IMcpGatewayResult | undefined> {
@@ -44,11 +45,20 @@ export class WorkbenchMcpGatewayService implements IWorkbenchMcpGatewayService {
 	private async _createLocalGateway(): Promise<IMcpGatewayResult> {
 		this._logService.info('[McpGateway][Workbench] Creating local gateway via main process');
 		const info = await this._localPlatformService.createGateway(undefined);
-		const address = URI.revive(info.address);
-		this._logService.info(`[McpGateway][Workbench] Local gateway created: ${address}`);
+		const servers = reviveServers(info.servers);
+		this._logService.info(`[McpGateway][Workbench] Local gateway created with ${servers.length} server(s)`);
+
+		const onDidChangeServers = Event.map(
+			Event.filter(
+				this._localChannel.listen<{ gatewayId: string; servers: readonly IMcpGatewayServerInfo[] }>('onDidChangeGatewayServers'),
+				e => e.gatewayId === info.gatewayId,
+			),
+			e => reviveServers(e.servers),
+		);
 
 		return {
-			address,
+			servers,
+			onDidChangeServers,
 			dispose: () => {
 				this._logService.info(`[McpGateway][Workbench] Disposing local gateway: ${info.gatewayId}`);
 				this._localPlatformService.disposeGateway(info.gatewayId);
@@ -67,11 +77,20 @@ export class WorkbenchMcpGatewayService implements IWorkbenchMcpGatewayService {
 		return connection.withChannel(McpGatewayChannelName, async channel => {
 			const service = ProxyChannel.toService<IMcpGatewayService>(channel);
 			const info = await service.createGateway(undefined);
-			const address = URI.revive(info.address);
-			this._logService.info(`[McpGateway][Workbench] Remote gateway created: ${address}`);
+			const servers = reviveServers(info.servers);
+			this._logService.info(`[McpGateway][Workbench] Remote gateway created with ${servers.length} server(s)`);
+
+			const onDidChangeServers = Event.map(
+				Event.filter(
+					channel.listen<{ gatewayId: string; servers: readonly IMcpGatewayServerInfo[] }>('onDidChangeGatewayServers'),
+					e => e.gatewayId === info.gatewayId,
+				),
+				e => reviveServers(e.servers),
+			);
 
 			return {
-				address,
+				servers,
+				onDidChangeServers,
 				dispose: () => {
 					this._logService.info(`[McpGateway][Workbench] Disposing remote gateway: ${info.gatewayId}`);
 					service.disposeGateway(info.gatewayId);
@@ -80,3 +99,7 @@ export class WorkbenchMcpGatewayService implements IWorkbenchMcpGatewayService {
 		});
 	}
 }
+
+function reviveServers(servers: readonly IMcpGatewayServerInfo[]): IMcpGatewayResultServer[] {
+	return servers.map(s => ({ label: s.label, address: URI.revive(s.address) }));
+}
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpGatewayToolBrokerChannel.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpGatewayToolBrokerChannel.test.ts
index e0dcab8d7f1..be81ff88ad3 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpGatewayToolBrokerChannel.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpGatewayToolBrokerChannel.test.ts
@@ -10,7 +10,7 @@ import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelSc
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ContributionEnablementState } from '../../../chat/common/enablement.js';
 import { NullLogService } from '../../../../../platform/log/common/log.js';
-import { IGatewayCallToolResult } from '../../../../../platform/mcp/common/mcpGateway.js';
+import { IMcpGatewayServerDescriptor } from '../../../../../platform/mcp/common/mcpGateway.js';
 import { MCP } from '../../common/modelContextProtocol.js';
 import { McpGatewayToolBrokerChannel } from '../../common/mcpGatewayToolBrokerChannel.js';
 import { IMcpIcons, IMcpServer, IMcpTool, McpConnectionState, McpServerCacheState, McpToolVisibility } from '../../common/mcpTypes.js';
@@ -19,7 +19,7 @@ import { TestMcpService } from './testMcpService.js';
 suite('McpGatewayToolBrokerChannel', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('lists model-visible tools with namespaced identities', async () => {
+	test('lists model-visible tools for a specific server', async () => {
 		const mcpService = new TestMcpService();
 		const channel = new McpGatewayToolBrokerChannel(mcpService, new NullLogService());
 
@@ -33,18 +33,16 @@ suite('McpGatewayToolBrokerChannel', () => {
 
 		mcpService.servers.set([serverA, serverB], undefined);
 
-		const result = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
-		const names = result.map(tool => tool.name).sort();
+		const resultA = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
+		assert.deepStrictEqual(resultA.map(t => t.name), ['mcp_serverA_echo']);
 
-		assert.deepStrictEqual(names, [
-			'mcp_serverA_echo',
-			'mcp_serverB_echo',
-		]);
+		const resultB = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverB' });
+		assert.deepStrictEqual(resultB.map(t => t.name), ['mcp_serverB_echo']);
 
 		channel.dispose();
 	});
 
-	test('routes tool calls by namespaced identity', async () => {
+	test('routes tool calls to specific server', async () => {
 		const mcpService = new TestMcpService();
 		const channel = new McpGatewayToolBrokerChannel(mcpService, new NullLogService());
 
@@ -64,18 +62,20 @@ suite('McpGatewayToolBrokerChannel', () => {
 
 		mcpService.servers.set([serverA, serverB], undefined);
 
-		const resultA = await channel.call<IGatewayCallToolResult>(undefined, 'callTool', {
+		const resultA = await channel.call<MCP.CallToolResult>(undefined, 'callToolForServer', {
+			serverId: 'serverA',
 			name: 'mcp_serverA_echo',
 			args: { name: 'one' },
 		});
-		const resultB = await channel.call<IGatewayCallToolResult>(undefined, 'callTool', {
+		const resultB = await channel.call<MCP.CallToolResult>(undefined, 'callToolForServer', {
+			serverId: 'serverB',
 			name: 'mcp_serverB_echo',
 			args: { name: 'two' },
 		});
 
 		assert.deepStrictEqual(invoked, ['A:one', 'B:two']);
-		assert.strictEqual((resultA.result.content[0] as MCP.TextContent).text, 'from A');
-		assert.strictEqual((resultB.result.content[0] as MCP.TextContent).text, 'from B');
+		assert.strictEqual((resultA.content[0] as MCP.TextContent).text, 'from A');
+		assert.strictEqual((resultB.content[0] as MCP.TextContent).text, 'from B');
 
 		channel.dispose();
 	});
@@ -117,7 +117,7 @@ suite('McpGatewayToolBrokerChannel', () => {
 		);
 
 		mcpService.servers.set([server], undefined);
-		await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+		await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 
 		assert.strictEqual(server.startCalls, 0);
 		channel.dispose();
@@ -135,7 +135,7 @@ suite('McpGatewayToolBrokerChannel', () => {
 		);
 
 		mcpService.servers.set([server], undefined);
-		const tools = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+		const tools = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 
 		// Server started during the grace period; tools are now available.
 		assert.strictEqual(server.startCalls, 1);
@@ -155,7 +155,7 @@ suite('McpGatewayToolBrokerChannel', () => {
 		);
 
 		mcpService.servers.set([server], undefined);
-		const tools = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+		const tools = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 
 		// Outdated server gets the same grace period as Unknown — started and tools returned.
 		assert.strictEqual(server.startCalls, 1);
@@ -177,11 +177,11 @@ suite('McpGatewayToolBrokerChannel', () => {
 			mcpService.servers.set([server], undefined);
 
 			// First call: waits up to the grace period, server never starts → empty result.
-			const tools = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+			const tools = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 			assert.deepStrictEqual(tools, []);
 
 			// Second call: grace-period promise already resolved; returns immediately without re-waiting.
-			const tools2 = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+			const tools2 = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 			assert.deepStrictEqual(tools2, []);
 
 			channel.dispose();
@@ -202,7 +202,7 @@ suite('McpGatewayToolBrokerChannel', () => {
 			mcpService.servers.set([server], undefined);
 
 			// First call: grace period elapses, server never starts → empty.
-			const tools1 = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+			const tools1 = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 			assert.deepStrictEqual(tools1, []);
 			assert.strictEqual(server.startCalls, 1);
 
@@ -214,7 +214,7 @@ suite('McpGatewayToolBrokerChannel', () => {
 
 			// Second call: stale grace entry should be discarded, a new grace race starts,
 			// and the server successfully starts → tools returned.
-			const tools2 = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+			const tools2 = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 			assert.deepStrictEqual(tools2.map(t => t.name), ['echo']);
 			assert.strictEqual(server.startCalls, 2);
 
@@ -237,19 +237,71 @@ suite('McpGatewayToolBrokerChannel', () => {
 			mcpService.servers.set([server], undefined);
 
 			// First call: server starts successfully during grace period.
-			const tools1 = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+			const tools1 = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 			assert.deepStrictEqual(tools1.map(t => t.name), ['echo']);
 			assert.strictEqual(server.startCalls, 1);
 
 			// Second call: cacheState is now Live (server started), grace entry should NOT
 			// be invalidated, so no additional start call is made.
-			const tools2 = await channel.call<readonly MCP.Tool[]>(undefined, 'listTools');
+			const tools2 = await channel.call<readonly MCP.Tool[]>(undefined, 'listToolsForServer', { serverId: 'serverA' });
 			assert.deepStrictEqual(tools2.map(t => t.name), ['echo']);
 			assert.strictEqual(server.startCalls, 1);
 
 			channel.dispose();
 		});
 	});
+
+	test('listServers returns all servers regardless of cache state', async () => {
+		const mcpService = new TestMcpService();
+		const channel = new McpGatewayToolBrokerChannel(mcpService, new NullLogService());
+
+		const liveServer = createServer('collectionA', 'serverA', [], McpServerCacheState.Live);
+		const unknownServer = createServer('collectionB', 'serverB', [], McpServerCacheState.Unknown);
+
+		mcpService.servers.set([liveServer, unknownServer], undefined);
+
+		const servers = await channel.call<readonly IMcpGatewayServerDescriptor[]>(undefined, 'listServers');
+		assert.deepStrictEqual(servers, [
+			{ id: 'serverA', label: 'serverA' },
+			{ id: 'serverB', label: 'serverB' },
+		]);
+
+		channel.dispose();
+	});
+
+	test('emits onDidChangeServers with descriptors when servers change', () => {
+		const mcpService = new TestMcpService();
+		const channel = new McpGatewayToolBrokerChannel(mcpService, new NullLogService());
+		const serverA = createServer('collectionA', 'serverA', []);
+
+		mcpService.servers.set([serverA], undefined);
+
+		const received: (readonly IMcpGatewayServerDescriptor[])[] = [];
+		const disposable = channel.listen<readonly IMcpGatewayServerDescriptor[]>(undefined, 'onDidChangeServers')(e => {
+			received.push(e);
+		});
+
+		// Add a second server
+		const serverB = createServer('collectionB', 'serverB', []);
+		mcpService.servers.set([serverA, serverB], undefined);
+
+		assert.strictEqual(received.length, 1);
+		assert.deepStrictEqual(received[0], [
+			{ id: 'serverA', label: 'serverA' },
+			{ id: 'serverB', label: 'serverB' },
+		]);
+
+		// Remove the first server
+		mcpService.servers.set([serverB], undefined);
+
+		assert.strictEqual(received.length, 2);
+		assert.deepStrictEqual(received[1], [
+			{ id: 'serverB', label: 'serverB' },
+		]);
+
+		disposable.dispose();
+		channel.dispose();
+	});
 });
 
 function createServer(
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
index b051bac13ef..c74df032d41 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
@@ -407,9 +407,10 @@ suite.skip('Workbench - MCP - McpTask', () => { // TODO@connor4312 https://githu
 	}
 
 	test('should resolve when task completes', async () => {
+		const getTaskResultStub = sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] });
 		const mockHandler = upcastPartial<McpServerRequestHandler>({
 			getTask: sinon.stub().resolves(createTask({ status: 'completed' })),
-			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+			getTaskResult: getTaskResultStub
 		});
 
 		const task = store.add(new McpTask(createTask()));
@@ -423,7 +424,7 @@ suite.skip('Workbench - MCP - McpTask', () => { // TODO@connor4312 https://githu
 
 		const result = await task.result;
 		assert.deepStrictEqual(result, { content: [{ type: 'text', text: 'result' }] });
-		assert.ok((mockHandler.getTaskResult as sinon.SinonStub).calledWith({ taskId: 'task1' }));
+		assert.ok(getTaskResultStub.calledWith({ taskId: 'task1' }));
 	});
 
 	test('should poll for task updates', async () => {
diff --git a/src/vs/workbench/contrib/mcp/test/common/testMcpService.ts b/src/vs/workbench/contrib/mcp/test/common/testMcpService.ts
index 004220e5876..7d4c7ebc29d 100644
--- a/src/vs/workbench/contrib/mcp/test/common/testMcpService.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/testMcpService.ts
@@ -11,6 +11,7 @@ export class TestEnablementModel implements IEnablementModel {
 	readEnabled(_key: string): ContributionEnablementState {
 		return ContributionEnablementState.EnabledProfile;
 	}
+	remove(_key: string): void { }
 	setEnabled(_key: string, _state: ContributionEnablementState): void { }
 }
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
index 2bd6be05fdc..18413330237 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
@@ -126,31 +126,43 @@ export class TextModelDiffs extends Disposable {
 		this.ensureUpToDate();
 
 		diffToRemoves.sort(compareBy((d) => d.inputRange.startLineNumber, numberComparator));
-		diffToRemoves.reverse();
+		diffToRemoves.reverse(); // process from bottom of document upward
 
-		let diffs = this._diffs.get();
+		const diffs = this._diffs.get();
 
-		for (const diffToRemove of diffToRemoves) {
-			// TODO improve performance
-			const len = diffs.length;
-			diffs = diffs.filter((d) => d !== diffToRemove);
-			if (len === diffs.length) {
+		// Validate all diffs-to-remove exist using Set for O(1) lookup
+		const toRemoveSet = new Set(diffToRemoves);
+		if (toRemoveSet.size !== diffToRemoves.length) {
+			throw new BugIndicatingError(); // duplicate entries
+		}
+		const diffsSet = new Set(diffs);
+		for (const d of diffToRemoves) {
+			if (!diffsSet.has(d)) {
 				throw new BugIndicatingError();
 			}
+		}
 
+		// Apply text model edits in reverse document order (bottom-up, safe for line shifting)
+		for (const diffToRemove of diffToRemoves) {
 			this._barrier.runExclusivelyOrThrow(() => {
 				const edits = diffToRemove.getReverseLineEdit().toEdits(this.textModel.getLineCount());
 				this.textModel.pushEditOperations(null, edits, () => null, group);
 			});
-
-			diffs = diffs.map((d) =>
-				d.outputRange.isAfter(diffToRemove.outputRange)
-					? d.addOutputLineDelta(diffToRemove.inputRange.length - diffToRemove.outputRange.length)
-					: d
-			);
 		}
 
-		this._diffs.set(diffs, transaction, TextModelDiffChangeReason.other);
+		// Single forward pass: accumulate delta from removed diffs above, apply to remaining diffs below
+		let cumulativeDelta = 0;
+		const newDiffs: DetailedLineRangeMapping[] = [];
+
+		for (const d of diffs) {
+			if (toRemoveSet.has(d)) {
+				cumulativeDelta += d.inputRange.length - d.outputRange.length;
+			} else {
+				newDiffs.push(cumulativeDelta !== 0 ? d.addOutputLineDelta(cumulativeDelta) : d);
+			}
+		}
+
+		this._diffs.set(newDiffs, transaction, TextModelDiffChangeReason.other);
 	}
 
 	/**
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
index 9a95995f5a1..ec476411052 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
@@ -679,7 +679,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 				cellIndex = edit.index;
 			} else if (hasKey(edit, { handle: true })) {
 				cellIndex = this._getCellIndexByHandle(edit.handle);
-				this._assertIndex(cellIndex);
+				this._assertIndex(cellIndex, `editType: ${edit.editType}, key: handle`);
 			} else if (hasKey(edit, { outputId: true })) {
 				cellIndex = this._getCellIndexWithOutputIdHandle(edit.outputId);
 				if (this._indexIsInvalid(cellIndex)) {
@@ -714,7 +714,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 				}
 
 				if (b.end === undefined) {
-					return -1;
+					return 1;
 				}
 
 				return b.end - a.end || b.originalIndex - a.originalIndex;
@@ -1298,9 +1298,9 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		return true;
 	}
 
-	private _assertIndex(index: number) {
+	private _assertIndex(index: number, context?: string) {
 		if (this._indexIsInvalid(index)) {
-			throw new Error(`model index out of range ${index}`);
+			throw new Error(`model index out of range ${index} (cellCount: ${this._cells.length}${context ? `, ${context}` : ''})`);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
index b2a4b030a6e..ea1143872e4 100644
--- a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
+++ b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
@@ -52,7 +52,7 @@ export class InputLatencyContrib extends Disposable implements IWorkbenchContrib
 		}
 
 		type InputLatencyStatisticFragment = {
-			owner: 'tyriar';
+			owner: 'hediet';
 			comment: 'Represents a set of statistics collected about input latencies';
 			average: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The average time it took to execute.' };
 			max: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The maximum time it took to execute.' };
@@ -60,7 +60,7 @@ export class InputLatencyContrib extends Disposable implements IWorkbenchContrib
 		};
 
 		type PerformanceInputLatencyClassification = {
-			owner: 'tyriar';
+			owner: 'hediet';
 			comment: 'This is a set of samples of the time (in milliseconds) that various events took when typing in the editor';
 			keydown: InputLatencyStatisticFragment;
 			input: InputLatencyStatisticFragment;
diff --git a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
index b56d0efeeb9..e7202fc4764 100644
--- a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
+++ b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
@@ -215,7 +215,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		table.push(['restore secondary viewlet', metrics.timers.ellapsedAuxiliaryViewletRestore, '[renderer]', metrics.auxiliaryViewletId]);
 		table.push(['restore panel', metrics.timers.ellapsedPanelRestore, '[renderer]', metrics.panelId]);
 		table.push(['restore & resolve visible editors', metrics.timers.ellapsedEditorRestore, '[renderer]', `${metrics.editorIds.length}: ${metrics.editorIds.join(', ')}`]);
-		table.push(['create workbench contributions', metrics.timers.ellapsedWorkbenchContributions, '[renderer]', `${(contribTimings.get(LifecyclePhase.Starting)?.length ?? 0) + (contribTimings.get(LifecyclePhase.Starting)?.length ?? 0)} blocking startup`]);
+		table.push(['create workbench contributions', metrics.timers.ellapsedWorkbenchContributions, '[renderer]', `${(contribTimings.get(LifecyclePhase.Starting)?.length ?? 0) + (contribTimings.get(LifecyclePhase.Ready)?.length ?? 0)} blocking startup`]);
 		table.push(['overall workbench load', metrics.timers.ellapsedWorkbench, '[renderer]', undefined]);
 		table.push(['workbench ready', metrics.ellapsed, '[main->renderer]', undefined]);
 		table.push(['renderer ready', metrics.timers.ellapsedRenderer, '[renderer]', undefined]);
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 17e5663deb8..3e4a5be82ab 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -192,8 +192,6 @@ export class SettingsEditor2 extends EditorPane {
 	private searchInProgress: CancellationTokenSource | null = null;
 	private aiSearchPromise: CancelablePromise<void> | null = null;
 
-	private stopWatch: StopWatch;
-
 	private showAiResultsAction: Action | null = null;
 
 	private searchInputDelayer: Delayer<void>;
@@ -283,7 +281,6 @@ export class SettingsEditor2 extends EditorPane {
 		this.aiResultsAvailable = CONTEXT_AI_SETTING_RESULTS_AVAILABLE.bindTo(contextKeyService);
 
 		this.scheduledRefreshes = new Map<string, DisposableStore>();
-		this.stopWatch = new StopWatch(false);
 
 		this.editorMemento = this.getEditorMemento<ISettingsEditor2State>(editorGroupService, textResourceConfigurationService, SETTINGS_EDITOR_STATE_KEY);
 
@@ -1966,9 +1963,9 @@ export class SettingsEditor2 extends EditorPane {
 			return null;
 		}
 
-		this.stopWatch.reset();
+		const stopWatch = new StopWatch(false);
 		const result = await aiSearchProvider.getLLMRankedResults(token);
-		this.stopWatch.stop();
+		stopWatch.stop();
 
 		if (token.isCancellationRequested) {
 			return null;
@@ -1976,7 +1973,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		// Only log the elapsed time if there are actual results.
 		if (result && result.filterMatches.length > 0) {
-			const elapsed = this.stopWatch.elapsed();
+			const elapsed = stopWatch.elapsed();
 			this.logSearchPerformance(LLM_RANKED_SEARCH_PROVIDER_NAME, elapsed);
 		}
 
@@ -1985,9 +1982,9 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private async searchWithProvider(type: SearchResultIdx, searchProvider: ISearchProvider, providerName: string, token: CancellationToken): Promise<ISearchResult | null> {
-		this.stopWatch.reset();
+		const stopWatch = new StopWatch(false);
 		const result = await this._searchPreferencesModel(this.defaultSettingsEditorModel, searchProvider, token);
-		this.stopWatch.stop();
+		stopWatch.stop();
 
 		if (token.isCancellationRequested) {
 			// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
@@ -2001,7 +1998,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		// Only log the elapsed time if there are actual results.
 		if (result && result.filterMatches.length > 0) {
-			const elapsed = this.stopWatch.elapsed();
+			const elapsed = stopWatch.elapsed();
 			this.logSearchPerformance(providerName, elapsed);
 		}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 7c5d7df73e5..5d1c11fac90 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -156,6 +156,11 @@ export const tocData: ITOCEntry<string> = {
 					id: 'workbench/screencastmode',
 					label: localize('screencastMode', "Screencast Mode"),
 					settings: ['screencastMode.*']
+				},
+				{
+					id: 'workbench/browser',
+					label: localize('browser', "Browser"),
+					settings: ['workbench.browser.*']
 				}
 			]
 		},
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index 9e2704a79b6..eaf1dfe189a 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -751,8 +751,8 @@ export function inspectSetting(key: string, target: SettingsTarget, languageFilt
 	return { isConfigured, inspected, targetSelector, inspectedLanguageOverrides, languageSelector: languageFilter };
 }
 
-function sanitizeId(id: string): string {
-	return id.replace(/[\.\/]/, '_');
+export function sanitizeId(id: string): string {
+	return id.replace(/[\.\/]/g, '_');
 }
 
 export function settingKeyToDisplayFormat(key: string, groupId: string = '', isLanguageTagSetting: boolean = false): { category: string; label: string } {
diff --git a/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts b/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts
index 98421c6ea63..0fd6956d676 100644
--- a/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts
+++ b/src/vs/workbench/contrib/preferences/test/browser/settingsTreeModels.test.ts
@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { settingKeyToDisplayFormat, parseQuery, IParsedQuery } from '../../browser/settingsTreeModels.js';
+import { settingKeyToDisplayFormat, parseQuery, IParsedQuery, sanitizeId } from '../../browser/settingsTreeModels.js';
 
 suite('SettingsTree', () => {
 	test('settingKeyToDisplayFormat', () => {
@@ -329,5 +329,22 @@ suite('SettingsTree', () => {
 			});
 	});
 
+	test('sanitizeId replaces all dots and slashes', () => {
+		assert.deepStrictEqual(
+			[
+				sanitizeId('root.editor.font.size'),
+				sanitizeId('group/subgroup/setting.key'),
+				sanitizeId('no-special-chars'),
+				sanitizeId('single.dot'),
+			],
+			[
+				'root_editor_font_size',
+				'group_subgroup_setting_key',
+				'no-special-chars',
+				'single_dot',
+			]
+		);
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 530b0c4ae0f..2d7e4bb96ef 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -1003,7 +1003,6 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 
 						if (e.handled) {
 							logService.info(`Error handled: Not showing a notification for the error.`);
-							console.log(`Error handled: Not showing a notification for the error.`);
 						} else if (!this._reloadWindowShown) {
 							this._reloadWindowShown = true;
 							dialogService.confirm({
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index d38a51b0654..1dc0f055c9c 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -15,7 +15,6 @@ import { IStatusbarEntry, IStatusbarService, StatusbarAlignment as MainThreadSta
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { EditorResourceAccessor } from '../../../common/editor.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
-import { Iterable } from '../../../../base/common/iterator.js';
 import { ITitleService } from '../../../services/title/browser/titleService.js';
 import { IEditorGroupContextKeyProvider, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
@@ -30,7 +29,7 @@ const ActiveRepositoryContextKeys = {
 };
 
 export class SCMActiveRepositoryController extends Disposable implements IWorkbenchContribution {
-	private readonly _repositories: IObservable<Iterable<ISCMRepository>>;
+	private readonly _visibleRepositories: IObservable<readonly ISCMRepository[]>;
 	private readonly _activeRepositoryHistoryItemRefName: IObservable<string | undefined>;
 	private readonly _countBadgeConfig: IObservable<'all' | 'focused' | 'off'>;
 	private readonly _countBadgeRepositories: IObservable<readonly { provider: ISCMProvider; resourceCount: IObservable<number> }[]>;
@@ -60,9 +59,9 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 
 		this._countBadgeConfig = observableConfigValue<'all' | 'focused' | 'off'>('scm.countBadge', 'all', this.configurationService);
 
-		this._repositories = observableFromEvent(this,
-			Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
-			() => Iterable.filter(this.scmService.repositories, r => r.provider.isHidden !== true));
+		this._visibleRepositories = observableFromEvent(this,
+			Event.any(this.scmViewService.onDidChangeVisibleRepositories, this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
+			() => this.scmViewService.visibleRepositories);
 
 		this._activeRepositoryHistoryItemRefName = derived(reader => {
 			const activeRepository = this.scmViewService.activeRepository.read(reader);
@@ -75,8 +74,8 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 		this._countBadgeRepositories = derived(this, reader => {
 			switch (this._countBadgeConfig.read(reader)) {
 				case 'all': {
-					const repositories = this._repositories.read(reader);
-					return [...Iterable.map(repositories, r => ({ provider: r.provider, resourceCount: this._getRepositoryResourceCount(r) }))];
+					const repositories = this._visibleRepositories.read(reader);
+					return repositories.map(r => ({ provider: r.provider, resourceCount: this._getRepositoryResourceCount(r) }));
 				}
 				case 'focused': {
 					const activeRepository = this.scmViewService.activeRepository.read(reader);
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index ab1900fc1db..88c5c132598 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -1706,7 +1706,7 @@ export class SCMHistoryViewPane extends ViewPane {
 						compact: true,
 						showPointer: true
 					},
-					content: new MarkdownString(localize('scmGraphViewOutdated', "Please refresh the graph using the refresh action ($(refresh))."), { supportThemeIcons: true }),
+					content: new MarkdownString(localize('scmGraphViewOutdated', "Please refresh the graph using the refresh action ({0}).", '$(refresh)'), { supportThemeIcons: true }),
 					position: {
 						hoverPosition: HoverPosition.BELOW
 					}
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index 8d449a07b3e..0c4af97e65e 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -55,7 +55,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js';
-import { IQuickChatService } from '../../chat/browser/chat.js';
+import { IChatWidgetService, IQuickChatService } from '../../chat/browser/chat.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
 
@@ -140,7 +140,8 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IQuickChatService private readonly quickChatService: IQuickChatService,
 		@ILogService private readonly logService: ILogService,
-		@ICustomEditorLabelService private readonly customEditorLabelService: ICustomEditorLabelService
+		@ICustomEditorLabelService private readonly customEditorLabelService: ICustomEditorLabelService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService
 	) {
 		super(AnythingQuickAccessProvider.PREFIX, {
 			canAcceptInBackground: true,
@@ -1084,7 +1085,20 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 
 				return TriggerAction.NO_ACTION;
 			},
-			accept: (keyMods, event) => this.openAnything(resourceOrEditor, { keyMods, range: this.pickState.lastRange, preserveFocus: event.inBackground, forcePinned: event.inBackground })
+			accept: (keyMods, event) => this.openAnything(resourceOrEditor, { keyMods, range: this.pickState.lastRange, preserveFocus: event.inBackground, forcePinned: event.inBackground }),
+			attach: (keyMods, event) => {
+				// Only support adding context to chat when shift is pressed
+				if (keyMods.shift) {
+					const widget = this.chatWidgetService.lastFocusedWidget;
+					if (widget && resource) {
+						widget.attachmentModel.addContext(widget.attachmentModel.asFileVariableEntry(resource));
+					}
+					return;
+				}
+
+				// Fallback to accept behavior.
+				this.openAnything(resourceOrEditor, { keyMods, range: this.pickState.lastRange, preserveFocus: event.inBackground, forcePinned: event.inBackground });
+			}
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
index 84a3c98a421..8edf55d5cec 100644
--- a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
@@ -24,6 +24,8 @@ import { prepareQuery, IPreparedQuery, scoreFuzzy2, pieceToQuery } from '../../.
 import { IMatch } from '../../../../base/common/filters.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IChatWidgetService } from '../../chat/browser/chat.js';
+import { ISymbolVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
 
 export interface ISymbolQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource {
 	score?: number;
@@ -64,7 +66,8 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ICodeEditorService private readonly codeEditorService: ICodeEditorService
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService
 	) {
 		super(SymbolsQuickAccessProvider.PREFIX, {
 			canAcceptInBackground: true,
@@ -211,6 +214,26 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
 					return TriggerAction.CLOSE_PICKER;
 				},
 				accept: async (keyMods, event) => this.openSymbol(provider, symbol, token, { keyMods, preserveFocus: event.inBackground, forcePinned: event.inBackground }),
+				attach: (keyMods, event) => {
+					// Only support adding context to chat when shift is pressed
+					if (keyMods.shift) {
+						const widget = this.chatWidgetService.lastFocusedWidget;
+						if (widget) {
+							const entry: ISymbolVariableEntry = {
+								kind: 'symbol',
+								id: JSON.stringify({ uri: symbolUri.toString(), range: symbol.location.range }),
+								name: symbol.name,
+								value: symbol.location,
+								symbolKind: symbol.kind,
+							};
+							widget.attachmentModel.addContext(entry);
+						}
+						return;
+					}
+
+					// Fallback to accept behavior.
+					this.openSymbol(provider, symbol, token, { keyMods, preserveFocus: event.inBackground, forcePinned: event.inBackground });
+				},
 			});
 
 		}
diff --git a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
index b10f117bc6e..15cd622c7cd 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
@@ -360,7 +360,7 @@ export class TaskQuickPick extends Disposable {
 	public static getSettingEntry(configurationService: IConfigurationService, type: string): (ITaskTwoLevelQuickPickEntry & { settingType: string }) | undefined {
 		if (configurationService.getValue(`${type}.autoDetect`) === 'off') {
 			return {
-				label: nls.localize('TaskQuickPick.changeSettingsOptions', "$(gear) {0} task detection is turned off. Enable {1} task detection...",
+				label: '$(gear) ' + nls.localize('TaskQuickPick.changeSettingsOptions', "{0} task detection is turned off. Enable {1} task detection...",
 					type[0].toUpperCase() + type.slice(1), type),
 				task: null,
 				settingType: type,
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 2cf3ac03c1e..348a6988d91 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -177,6 +177,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 	private _terminalTabActions = [{ id: RerunForActiveTerminalCommandId, label: nls.localize('rerunTask', 'Rerun Task'), icon: rerunTaskIcon }];
 	private _taskTerminalActive: IContextKey<boolean>;
 	private readonly _taskStartTimes = new Map<number, number>();
+	private readonly _capturedTaskVariables = new Map<string, string>();
 
 	taskShellIntegrationStartSequence(cwd: string | URI | undefined): string {
 		return (
@@ -898,6 +899,9 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 					if (this._busyTasks[mapKey]) {
 						delete this._busyTasks[mapKey];
 					}
+					if (event.capturedVariables) {
+						this._registerCapturedVariables(event.capturedVariables);
+					}
 					this._fireTaskEvent(TaskEvent.inactive(task, terminal?.instanceId, this._takeTaskDuration(terminal?.instanceId)));
 					if (eventCounter === 0) {
 						if ((watchingProblemMatcher.numberOfMatches > 0) && watchingProblemMatcher.maxMarkerSeverity &&
@@ -1170,6 +1174,15 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		return Date.now() - startTime;
 	}
 
+	private _registerCapturedVariables(capturedVariables: ReadonlyMap<string, string>): void {
+		for (const [name, value] of capturedVariables) {
+			this._capturedTaskVariables.set(name, value);
+			if (!this._configurationResolverService.resolvableVariables.has(`taskVar:${name}`)) {
+				this._configurationResolverService.contributeVariable(`taskVar:${name}`, async () => this._capturedTaskVariables.get(name));
+			}
+		}
+	}
+
 	private _createTerminalName(task: CustomTask | ContributedTask): string {
 		const needsFolderQualification = this._contextService.getWorkbenchState() === WorkbenchState.WORKSPACE;
 		return needsFolderQualification ? task.getQualifiedLabel() : (task.configurationProperties.name || '');
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
index 8d937a1e5b5..56eb132182a 100644
--- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
+++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
@@ -384,8 +384,8 @@ const runOptions: IJSONSchema = {
 		},
 		runOn: {
 			type: 'string',
-			enum: ['default', 'folderOpen'],
-			description: nls.localize('JsonSchema.tasks.runOn', 'Configures when the task should be run. If set to folderOpen, then the task will be run automatically when the folder is opened.'),
+			enum: ['default', 'folderOpen', 'worktreeCreated'],
+			description: nls.localize('JsonSchema.tasks.runOn', 'Configures when the task should be run. If set to folderOpen, then the task will be run automatically when the folder is opened. If set to worktreeCreated, then the task will be run automatically when an Agent Session worktree is created.'),
 			default: 'default'
 		},
 		instanceLimit: {
diff --git a/src/vs/workbench/contrib/tasks/common/problemCollectors.ts b/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
index 8ede878caca..71b352858dd 100644
--- a/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
@@ -24,11 +24,12 @@ export const enum ProblemCollectorEventKind {
 
 export interface IProblemCollectorEvent {
 	kind: ProblemCollectorEventKind;
+	capturedVariables?: ReadonlyMap<string, string>;
 }
 
 namespace IProblemCollectorEvent {
-	export function create(kind: ProblemCollectorEventKind) {
-		return Object.freeze({ kind });
+	export function create(kind: ProblemCollectorEventKind, capturedVariables?: ReadonlyMap<string, string>) {
+		return Object.freeze({ kind, capturedVariables });
 	}
 }
 
@@ -563,7 +564,8 @@ export class WatchingProblemCollector extends AbstractProblemCollector implement
 				}
 				if (this._activeBackgroundMatchers.delete(background.key)) {
 					this.resetCurrentResource();
-					this._onDidStateChange.fire(IProblemCollectorEvent.create(ProblemCollectorEventKind.BackgroundProcessingEnds));
+					const capturedVariables = matches.groups ? new Map(Object.entries(matches.groups)) : undefined;
+					this._onDidStateChange.fire(IProblemCollectorEvent.create(ProblemCollectorEventKind.BackgroundProcessingEnds, capturedVariables));
 					result = true;
 					this.lines.push(line);
 					const owner = background.matcher.owner;
diff --git a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
index e90a90ea3b9..a6f14097d8f 100644
--- a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
@@ -716,6 +716,8 @@ export namespace RunOnOptions {
 		switch (value.toLowerCase()) {
 			case 'folderopen':
 				return Tasks.RunOnOptions.folderOpen;
+			case 'worktreecreated':
+				return Tasks.RunOnOptions.worktreeCreated;
 			case 'default':
 			default:
 				return Tasks.RunOnOptions.default;
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
index c7b6427e551..5e6ab552216 100644
--- a/src/vs/workbench/contrib/tasks/common/tasks.ts
+++ b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -586,7 +586,8 @@ export interface IConfigurationProperties {
 
 export enum RunOnOptions {
 	default = 1,
-	folderOpen = 2
+	folderOpen = 2,
+	worktreeCreated = 3
 }
 
 export const enum InstancePolicy {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index b54f86b3ad3..8bfd7b0d910 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -1154,7 +1154,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	 */
 	sendPath(originalPath: string | URI, shouldExecute: boolean): Promise<void>;
 
-	runCommand(command: string, shouldExecute?: boolean, commandId?: string): Promise<void>;
+	runCommand(command: string, shouldExecute?: boolean, commandId?: string, bracketedPasteMode?: boolean): Promise<void>;
 
 	/**
 	 * Takes a path and returns the properly escaped path to send to a given shell. On Windows, this
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
index b158684ae0e..8b40d469375 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
@@ -13,7 +13,6 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -61,7 +60,6 @@ export class TerminalEditor extends EditorPane {
 		@ITerminalProfileResolverService private readonly _terminalProfileResolverService: ITerminalProfileResolverService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IMenuService menuService: IMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -158,7 +156,7 @@ export class TerminalEditor extends EditorPane {
 
 	private _updateTabActionBar(profiles: ITerminalProfile[]): void {
 		this._disposableStore.clear();
-		const actions = getTerminalActionBarArgs(TerminalLocation.Editor, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore, this._configurationService);
+		const actions = getTerminalActionBarArgs(TerminalLocation.Editor, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore);
 		this._newDropdown.value?.update(actions.dropdownAction, actions.dropdownMenuActions);
 	}
 
@@ -182,7 +180,7 @@ export class TerminalEditor extends EditorPane {
 				if (action instanceof MenuItemAction) {
 					const location = { viewColumn: ACTIVE_GROUP };
 					this._disposableStore.clear();
-					const actions = getTerminalActionBarArgs(location, this._terminalProfileService.availableProfiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore, this._configurationService);
+					const actions = getTerminalActionBarArgs(location, this._terminalProfileService.availableProfiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore);
 					this._newDropdown.value = this._instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, actions.dropdownAction, actions.dropdownMenuActions, actions.className, { hoverDelegate: options.hoverDelegate });
 					this._newDropdown.value?.update(actions.dropdownAction, actions.dropdownMenuActions);
 					return this._newDropdown.value;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 93a50146bc1..ca7d1e3edeb 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -877,6 +877,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				lineDataEventAddon.setOperatingSystem(this._processManager.os);
 			}
 			xterm.raw.options.windowsPty = processTraits.windowsPty;
+			// Enable reflow cursor to avoid prompt loss: https://github.com/microsoft/vscode/issues/274372
+			xterm.raw.options.reflowCursorLine = processTraits?.windowsPty?.backend === 'conpty' && !!this._terminalConfigurationService.config.windowsUseConptyDll;
 		}));
 		this._register(this._processManager.onRestoreCommands(e => this.xterm?.shellIntegration.deserialize(e)));
 
@@ -972,7 +974,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		});
 	}
 
-	async runCommand(commandLine: string, shouldExecute: boolean, commandId?: string): Promise<void> {
+	async runCommand(commandLine: string, shouldExecute: boolean, commandId?: string, forceBracketedPasteMode?: boolean): Promise<void> {
 		let commandDetection = this.capabilities.get(TerminalCapability.CommandDetection);
 		const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled) === true;
 		const timeoutMs = getShellIntegrationTimeout(
@@ -1018,8 +1020,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			// is being evaluated
 			await timeout(100);
 		}
-		// Use bracketed paste mode only when not running the command
-		await this.sendText(commandLine, shouldExecute, !shouldExecute);
+		// By default, use bracketed paste mode only when not running the command; callers can override
+		// this by explicitly enabling it via the bracketedPasteMode argument.
+		await this.sendText(commandLine, shouldExecute, !shouldExecute || forceBracketedPasteMode);
 	}
 
 	detachFromElement(): void {
@@ -1129,10 +1132,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			}
 
 			// Skip processing by xterm.js of keyboard events that resolve to commands defined in
-			// the commandsToSkipShell setting. Ensure sendKeybindingsToShell is respected here
-			// which will disable this special handling and always opt to send the keystroke to the
-			// shell process
-			if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && this._skipTerminalCommands.some(k => k === resolveResult.commandId)) {
+			// the commandsToSkipShell setting, or that use the Meta.
+			// The metaKey check is needed because when a shell like fish enables the kitty
+			// keyboard protocol, xterm.js encodes Meta-modified keys as CSI u sequences and
+			// consumes them via preventDefault. The (non-kitty) traditional xterm.js handler already skips
+			// Meta keys so they bubble up naturally, but the kitty handler does not.
+			if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && (event.metaKey || this._skipTerminalCommands.some(k => k === resolveResult.commandId))) {
 				event.preventDefault();
 				return false;
 			}
@@ -1340,10 +1345,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this.focus(force);
 	}
 
-	async sendText(text: string, shouldExecute: boolean, bracketedPasteMode?: boolean): Promise<void> {
+	async sendText(text: string, shouldExecute: boolean, forceBracketedPasteMode?: boolean): Promise<void> {
 		// Apply bracketed paste sequences if the terminal has the mode enabled, this will prevent
 		// the text from triggering keybindings and ensure new lines are handled properly
-		if (bracketedPasteMode && this.xterm?.raw.modes.bracketedPasteMode) {
+		if (forceBracketedPasteMode && this.xterm?.raw.modes.bracketedPasteMode) {
 			text = `\x1b[200~${text}\x1b[201~`;
 		}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
index 281d624fcec..4e645b1cd3f 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
@@ -8,7 +8,6 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { IMenu, MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IExtensionTerminalProfile, ITerminalProfile, TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
 import { ResourceContextKey } from '../../../common/contextkeys.js';
@@ -782,20 +781,15 @@ export function setupTerminalMenus(): void {
 	}
 }
 
-export function getTerminalActionBarArgs(location: ITerminalLocationOptions, profiles: ITerminalProfile[], defaultProfileName: string, contributedProfiles: readonly IExtensionTerminalProfile[], terminalService: ITerminalService, dropdownMenu: IMenu, disposableStore: DisposableStore, configurationService: IConfigurationService): {
+export function getTerminalActionBarArgs(location: ITerminalLocationOptions, profiles: ITerminalProfile[], defaultProfileName: string, contributedProfiles: readonly IExtensionTerminalProfile[], terminalService: ITerminalService, dropdownMenu: IMenu, disposableStore: DisposableStore): {
 	dropdownAction: IAction;
 	dropdownMenuActions: IAction[];
 	className: string;
 	dropdownIcon?: string;
 } {
-	const shouldElevateAiProfiles = configurationService.getValue<boolean>(TerminalSettingId.ExperimentalAiProfileGrouping);
 	profiles = profiles.filter(e => !e.isAutoDetected);
-	const [aiProfiles, otherProfiles] = shouldElevateAiProfiles
-		? splitProfiles(profiles)
-		: [[], profiles];
-	const [aiContributedProfiles, otherContributedProfiles] = shouldElevateAiProfiles
-		? splitContributedProfiles(contributedProfiles)
-		: [[], contributedProfiles];
+	const [aiProfiles, otherProfiles] = splitProfiles(profiles);
+	const [aiContributedProfiles, otherContributedProfiles] = splitContributedProfiles(contributedProfiles);
 	const dropdownActions: IAction[] = [];
 	const submenuActions: IAction[] = [];
 	const splitLocation = (location === TerminalLocation.Editor || (typeof location === 'object' && hasKey(location, { viewColumn: true }) && location.viewColumn === ACTIVE_GROUP)) ? { viewColumn: SIDE_GROUP } : { splitActiveTerminal: true };
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index 1733e24d83e..72c54a5518d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -453,6 +453,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		const workspaceFolder = terminalEnvironment.getWorkspaceForTerminal(shellLaunchConfig.cwd, this._workspaceContextService, this._historyService);
 		const platformKey = isWindows ? 'windows' : (isMacintosh ? 'osx' : 'linux');
 		const envFromConfigValue = this._configurationService.getValue<ITerminalEnvironment | undefined>(`terminal.integrated.env.${platformKey}`);
+		this._logService.debug(`Resolving environment (useShellEnvironment=${shellLaunchConfig.useShellEnvironment}, platformKey=${platformKey}, envFromConfig=${envFromConfigValue ? Object.keys(envFromConfigValue).join(',') : 'none'})`);
 
 		let baseEnv: IProcessEnvironment;
 		if (shellLaunchConfig.useShellEnvironment) {
@@ -460,11 +461,14 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 			if (!shellEnv) {
 				throw new BugIndicatingError('Cannot fetch shell environment to use');
 			}
+			this._logService.debug(`Shell environment resolved with ${Object.keys(shellEnv).length} variables: ${Object.keys(shellEnv).sort().join(', ')}`);
 			baseEnv = shellEnv;
 		} else {
 			baseEnv = await this._terminalProfileResolverService.getEnvironment(this.remoteAuthority);
+			this._logService.debug(`Profile environment resolved with ${Object.keys(baseEnv).length} variables`);
 		}
 		const env = await terminalEnvironment.createTerminalEnvironment(shellLaunchConfig, envFromConfigValue, variableResolver, this._productService.version, this._terminalConfigurationService.config.detectLocale, baseEnv);
+		this._logService.debug(`Terminal environment created with ${Object.keys(env).length} variables: ${Object.keys(env).sort().join(', ')}`);
 		if (!this._isDisposed && shouldUseEnvironmentVariableCollection(shellLaunchConfig)) {
 			this._extEnvironmentVariableCollection = this._environmentVariableService.mergedCollection;
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts b/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts
index 45914710aaa..efa29b29e03 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts
@@ -85,7 +85,7 @@ export class TerminalTelemetryContribution extends Disposable implements IWorkbe
 			terminalSessionId: string;
 		};
 		type TerminalCreationTelemetryClassification = {
-			owner: 'tyriar';
+			owner: 'anthonykim1';
 			comment: 'Track details about terminal creation, such as the shell type';
 
 			location: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The location of the terminal.' };
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 01632bee153..9a745727415 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -289,7 +289,7 @@ export class TerminalViewPane extends ViewPane {
 			case TerminalCommandId.New: {
 				if (action instanceof MenuItemAction) {
 					this._disposableStore.clear();
-					const actions = getTerminalActionBarArgs(TerminalLocation.Panel, this._terminalProfileService.availableProfiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore, this._configurationService);
+					const actions = getTerminalActionBarArgs(TerminalLocation.Panel, this._terminalProfileService.availableProfiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore);
 					this._newDropdown.value = this._instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, actions.dropdownAction, actions.dropdownMenuActions, actions.className, {
 						hoverDelegate: options.hoverDelegate,
 						getKeyBinding: (action: IAction) => this._keybindingService.lookupKeybinding(action.id, this._contextKeyService)
@@ -318,15 +318,8 @@ export class TerminalViewPane extends ViewPane {
 
 	private _updateTabActionBar(profiles: ITerminalProfile[]): void {
 		this._disposableStore.clear();
-		const actions = getTerminalActionBarArgs(TerminalLocation.Panel, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore, this._configurationService);
+		const actions = getTerminalActionBarArgs(TerminalLocation.Panel, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore);
 		this._newDropdown.value?.update(actions.dropdownAction, actions.dropdownMenuActions);
-
-		this._disposableStore.add(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalSettingId.ExperimentalAiProfileGrouping)) {
-				const updatedActions = getTerminalActionBarArgs(TerminalLocation.Panel, profiles, this._getDefaultProfileName(), this._terminalProfileService.contributedProfiles, this._terminalService, this._dropdownMenu, this._disposableStore, this._configurationService);
-				this._newDropdown.value?.update(updatedActions.dropdownAction, updatedActions.dropdownMenuActions);
-			}
-		}));
 	}
 
 	override focus() {
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
index ff974695f69..c5729c39941 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
@@ -197,7 +197,7 @@ fi
 
 # Allow verifying $BASH_COMMAND doesn't have aliases resolved via history when the right HISTCONTROL
 # configuration is used
-__vsc_regex_histcontrol=".*(erasedups|ignoreboth|ignoredups).*"
+__vsc_regex_histcontrol=".*(erasedups|ignoreboth|ignoredups|ignorespace).*"
 if [[ "${HISTCONTROL:-}" =~ $__vsc_regex_histcontrol ]]; then
 	__vsc_history_verify=0
 else
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
index afeac192274..72a329b8e39 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -179,11 +179,13 @@ if ($Global:__VSCodeState.IsA11yMode -eq "1") {
 	# Check if the loaded PSReadLine already supports EnableScreenReaderMode
 	$hasScreenReaderParam = (Get-Module -Name PSReadLine) -and (Get-Command Set-PSReadLineOption).Parameters.ContainsKey('EnableScreenReaderMode')
 
-	if (-not $hasScreenReaderParam) {
+	if (-not $hasScreenReaderParam -and $PSVersionTable.PSVersion -ge "7.0") {
 		# The loaded PSReadLine lacks EnableScreenReaderMode (only available in 2.4.4-beta4+).
 		# PowerShell 7.0+ skips autoloading PSReadLine when the OS reports a screen reader active.
 		# When only VS Code's accessibility mode is enabled (no OS screen reader),
 		# it's still loaded and must be removed to load our bundled copy.
+		# Skip this on Windows PowerShell 5.1 where removing the built-in PSReadLine 2.0.0
+		# and replacing it can cause input handling issues (e.g. repeated Enter key presses).
 		if (Get-Module -Name PSReadLine) {
 			Remove-Module PSReadLine -Force
 		}
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 132db6d2982..6f915a27195 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -476,7 +476,7 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	},
 	[TerminalSettingId.WindowsUseConptyDll]: {
 		restricted: true,
-		markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.23.251008001) shipped with VS Code, instead of the one bundled with Windows."),
+		markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.25.260303002) shipped with VS Code, instead of the one bundled with Windows."),
 		type: 'boolean',
 		tags: ['preview'],
 		default: false,
@@ -604,15 +604,6 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 			mode: 'auto'
 		}
 	},
-	[TerminalSettingId.ExperimentalAiProfileGrouping]: {
-		markdownDescription: localize('terminal.integrated.experimental.aiProfileGrouping', "Whether to elevate AI-contributed terminal profiles (for example Copilot CLI and Claude Agent) in the new terminal dropdown."),
-		type: 'boolean',
-		default: false,
-		tags: ['experimental'],
-		experiment: {
-			mode: 'auto'
-		}
-	},
 	[TerminalSettingId.ShellIntegrationEnabled]: {
 		restricted: true,
 		markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
@@ -634,7 +625,7 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	},
 	[TerminalSettingId.ShellIntegrationTimeout]: {
 		restricted: true,
-		markdownDescription: localize('terminal.integrated.shellIntegration.timeout', "Configures the duration in milliseconds to wait for shell integration after launch before declaring it's not there. Set to {0} to wait the minimum time (500ms), the default value {1} means the wait time is variable based on whether shell integration injection is enabled and whether it's a remote window. Consider setting this to a small value if you intentionally disabled shell integration, or a large value if your shell starts very slowly.", '`0`', '`-1`'),
+		markdownDescription: localize('terminal.integrated.shellIntegration.timeout', "Configures the duration in milliseconds to wait for shell integration after launch before declaring it's not there. Set to {0} to skip the wait entirely. The default value {1} uses a variable wait time based on whether shell integration injection is enabled and whether it's a remote window. Values between 1 and 499 are clamped to 500ms. Consider setting this to {0} if you intentionally disabled shell integration, or a large value if your shell starts very slowly.", '`0`', '`-1`'),
 		type: 'integer',
 		minimum: -1,
 		maximum: 60000,
@@ -734,3 +725,22 @@ Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMi
 			return configurationKeyValuePairs;
 		}
 	}]);
+
+Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: TerminalContribSettingId.DeprecatedTerminalSandboxNetwork,
+		migrateFn: (value: { allowedDomains?: string[]; deniedDomains?: string[]; allowTrustedDomains?: boolean }, valueAccessor) => {
+			const configurationKeyValuePairs: ConfigurationKeyValuePairs = [];
+			if (value?.allowedDomains !== undefined && valueAccessor(TerminalContribSettingId.TerminalSandboxNetworkAllowedDomains) === undefined) {
+				configurationKeyValuePairs.push([TerminalContribSettingId.TerminalSandboxNetworkAllowedDomains, { value: value.allowedDomains }]);
+			}
+			if (value?.deniedDomains !== undefined && valueAccessor(TerminalContribSettingId.TerminalSandboxNetworkDeniedDomains) === undefined) {
+				configurationKeyValuePairs.push([TerminalContribSettingId.TerminalSandboxNetworkDeniedDomains, { value: value.deniedDomains }]);
+			}
+			if (value?.allowTrustedDomains !== undefined && valueAccessor(TerminalContribSettingId.TerminalSandboxNetworkAllowTrustedDomains) === undefined) {
+				configurationKeyValuePairs.push([TerminalContribSettingId.TerminalSandboxNetworkAllowTrustedDomains, { value: value.allowTrustedDomains }]);
+			}
+			configurationKeyValuePairs.push([TerminalContribSettingId.DeprecatedTerminalSandboxNetwork, { value: undefined }]);
+			return configurationKeyValuePairs;
+		}
+	}]);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
index a724394106a..b797a6d549a 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
@@ -425,6 +425,8 @@ export function getShellIntegrationTimeout(
 
 	if (!isNumber(timeoutValue) || timeoutValue < 0) {
 		timeoutMs = siInjectionEnabled ? 5000 : (isRemote ? 3000 : 2000);
+	} else if (timeoutValue === 0) {
+		timeoutMs = 0;
 	} else {
 		timeoutMs = Math.max(timeoutValue, 500);
 	}
diff --git a/src/vs/workbench/contrib/terminal/terminalContribExports.ts b/src/vs/workbench/contrib/terminal/terminalContribExports.ts
index a24b204a899..babbac632fc 100644
--- a/src/vs/workbench/contrib/terminal/terminalContribExports.ts
+++ b/src/vs/workbench/contrib/terminal/terminalContribExports.ts
@@ -46,6 +46,10 @@ export const enum TerminalContribSettingId {
 	EnableAutoApprove = TerminalChatAgentToolsSettingId.EnableAutoApprove,
 	ShellIntegrationTimeout = TerminalChatAgentToolsSettingId.ShellIntegrationTimeout,
 	OutputLocation = TerminalChatAgentToolsSettingId.OutputLocation,
+	DeprecatedTerminalSandboxNetwork = TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetwork,
+	TerminalSandboxNetworkAllowedDomains = TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains,
+	TerminalSandboxNetworkDeniedDomains = TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains,
+	TerminalSandboxNetworkAllowTrustedDomains = TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains,
 }
 
 // HACK: Export some context key strings from `terminalContrib/` that are depended upon elsewhere.
diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
index 729ef0a01dc..c8bab580ee5 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Terminal } from '@xterm/xterm';
-import { deepStrictEqual, ok } from 'assert';
+import { deepStrictEqual, ok, strictEqual } from 'assert';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { ITerminalCommand } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
@@ -133,4 +133,16 @@ suite('CommandDetectionCapability', () => {
 			]);
 		});
 	});
+
+	test('should preserve explicit newlines at 80-column wrap boundaries in command output', async () => {
+		const boundaryWidthLine = 'A'.repeat(80);
+		await printStandardCommand('$ ', 'cat content.txt', `${boundaryWidthLine}\r\nafter`, undefined, 0);
+		await printCommandStart('$ ');
+
+		strictEqual(capability.commands.length, 1);
+		const output = capability.commands[0].getOutput();
+		ok(!!output);
+		ok(output.includes(`${boundaryWidthLine}\nafter\n`));
+		ok(!output.includes(`${boundaryWidthLine}after`));
+	});
 });
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
index 8c3c2d9982a..b5f566ce0de 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
@@ -134,6 +134,7 @@ suite('Workbench - TerminalInstance', () => {
 							fastScrollSensitivity: 2,
 							mouseWheelScrollSensitivity: 1,
 							unicodeVersion: '6',
+							commandsToSkipShell: [],
 							shellIntegration: {
 								enabled: true
 							}
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts
index 5acf81b2e0b..18c8f428e74 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts
@@ -363,14 +363,14 @@ suite('TerminalProfileService', () => {
 
 		test('createInstance', async () => {
 			mockTerminalProfileService.setDefaultProfileName(powershellProfile.profileName);
-			const pick = { ...powershellPick, keyMods: { alt: true, ctrlCmd: false } };
+			const pick = { ...powershellPick, keyMods: { alt: true, ctrlCmd: false, shift: false } };
 			quickInputService.setPick(pick);
 			const result = await terminalProfileQuickpick.showAndGetResult('createInstance');
-			deepStrictEqual(result, { config: powershellProfile, keyMods: { alt: true, ctrlCmd: false } });
+			deepStrictEqual(result, { config: powershellProfile, keyMods: { alt: true, ctrlCmd: false, shift: false } });
 		});
 
 		test('createInstance with contributed', async () => {
-			const pick = { ...jsdebugPick, keyMods: { alt: true, ctrlCmd: false } };
+			const pick = { ...jsdebugPick, keyMods: { alt: true, ctrlCmd: false, shift: true } };
 			quickInputService.setPick(pick);
 			const result = await terminalProfileQuickpick.showAndGetResult('createInstance');
 			const expected = {
@@ -380,7 +380,7 @@ suite('TerminalProfileService', () => {
 					options: { color: undefined, icon: 'debug' },
 					title: jsdebugProfile.title,
 				},
-				keyMods: { alt: true, ctrlCmd: false }
+				keyMods: { alt: true, ctrlCmd: false, shift: true }
 			};
 			deepStrictEqual(result, expected);
 		});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts
index de2f1ae7056..c99f166ad62 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts
@@ -8,12 +8,14 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { isNumber } from '../../../../../../base/common/types.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import type { ICommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import { trackIdleOnPrompt, waitForIdle, type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from './executeStrategy.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
 import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
-import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
+import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
+import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
 
 /**
  * This strategy is used when shell integration is enabled, but rich command detection was not
@@ -49,6 +51,7 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 		private readonly _instance: ITerminalInstance,
 		private readonly _hasReceivedUserInput: () => boolean,
 		private readonly _commandDetection: ICommandDetectionCapability,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
 		super();
@@ -58,7 +61,9 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 		const store = new DisposableStore();
 
 		try {
-			const idlePromptPromise = trackIdleOnPrompt(this._instance, 1000, store);
+			const idlePollInterval = this._configurationService.getValue<number>(TerminalChatAgentToolsSettingId.IdlePollInterval) ?? 1000;
+
+			const idlePromptPromise = trackIdleOnPrompt(this._instance, idlePollInterval, store, idlePollInterval);
 			const onDone = Promise.race([
 				Event.toPromise(this._commandDetection.onCommandFinished, store).then(e => {
 					// When shell integration is basic, it means that the end execution event is
@@ -82,7 +87,7 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 				}),
 				// A longer idle prompt event is used here as a catch all for unexpected cases where
 				// the end event doesn't fire for some reason.
-				trackIdleOnPrompt(this._instance, 3000, store).then(() => {
+				trackIdleOnPrompt(this._instance, idlePollInterval * 3, store, idlePollInterval).then(() => {
 					this._log('onDone long idle prompt');
 				}),
 			]);
@@ -97,9 +102,9 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 
 			// Wait for the terminal to idle before executing the command
 			this._log('Waiting for idle');
-			await waitForIdle(this._instance.onData, 1000);
+			await waitForIdle(this._instance.onData, idlePollInterval);
 
-			setupRecreatingStartMarker(
+			const markerRecreation = setupRecreatingStartMarker(
 				xterm,
 				this._startMarker,
 				m => this._onDidCreateStartMarker.fire(m),
@@ -123,7 +128,8 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 			// ^C being sent and also to return the exit code of 130 when from the shell when that
 			// occurs.
 			this._log(`Executing command line \`${commandLine}\``);
-			this._instance.sendText(commandLine, true);
+			markerRecreation.dispose();
+			this._instance.sendText(commandLine, true, true);
 
 			// Wait for the next end execution event - note that this may not correspond to the actual
 			// execution requested
@@ -150,7 +156,7 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 
 			// Wait for the terminal to idle
 			this._log('Waiting for idle');
-			await waitForIdle(this._instance.onData, 1000);
+			await waitForIdle(this._instance.onData, idlePollInterval);
 			if (token.isCancellationRequested) {
 				throw new CancellationError();
 			}
@@ -163,13 +169,19 @@ export class BasicExecuteStrategy extends Disposable implements ITerminalExecute
 				const commandOutput = finishedCommand?.getOutput();
 				if (commandOutput !== undefined) {
 					this._log('Fetched output via finished command');
-					output = commandOutput;
+					output = stripCommandEchoAndPrompt(commandOutput, commandLine, this._log.bind(this));
 				}
 			}
 			if (output === undefined) {
 				try {
 					output = xterm.getContentsAsText(this._startMarker.value, endMarker);
 					this._log('Fetched output via markers');
+
+					// The marker-based output includes the command echo and trailing
+					// prompt lines. Strip them to isolate the actual command output.
+					if (output !== undefined) {
+						output = stripCommandEchoAndPrompt(output, commandLine, this._log.bind(this));
+					}
 				} catch {
 					this._log('Failed to fetch output via markers');
 					additionalInformationLines.push('Failed to retrieve command output');
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts
index f95f297a958..805223b03f6 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts
@@ -160,6 +160,7 @@ export async function trackIdleOnPrompt(
 	instance: ITerminalInstance,
 	idleDurationMs: number,
 	store: DisposableStore,
+	promptFallbackMs?: number,
 ): Promise<void> {
 	const idleOnPrompt = new DeferredPromise<void>();
 	const onData = instance.onData;
@@ -176,7 +177,7 @@ export async function trackIdleOnPrompt(
 		}
 		state = TerminalState.PromptAfterExecuting;
 		scheduler.schedule();
-	}, 1000));
+	}, promptFallbackMs ?? 1000));
 	// Only schedule when a prompt sequence (A) is seen after an execute sequence (C). This prevents
 	// cases where the command is executed before the prompt is written. While not perfect, sitting
 	// on an A without a C following shortly after is a very good indicator that the command is done
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts
index ddc2a7f8939..c1f1b210253 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts
@@ -7,11 +7,13 @@ import type { CancellationToken } from '../../../../../../base/common/cancellati
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import { waitForIdle, waitForIdleWithPromptHeuristics, type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from './executeStrategy.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
 import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
-import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
+import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
+import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
 
 /**
  * This strategy is used when no shell integration is available. There are very few extension APIs
@@ -30,6 +32,7 @@ export class NoneExecuteStrategy extends Disposable implements ITerminalExecuteS
 	constructor(
 		private readonly _instance: ITerminalInstance,
 		private readonly _hasReceivedUserInput: () => boolean,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
 		super();
@@ -50,14 +53,16 @@ export class NoneExecuteStrategy extends Disposable implements ITerminalExecuteS
 			}
 			const alternateBufferPromise = createAltBufferPromise(xterm, store, this._log.bind(this));
 
+			const idlePollInterval = this._configurationService.getValue<number>(TerminalChatAgentToolsSettingId.IdlePollInterval) ?? 1000;
+
 			// Wait for the terminal to idle before executing the command
 			this._log('Waiting for idle');
-			await waitForIdle(this._instance.onData, 1000);
+			await waitForIdle(this._instance.onData, idlePollInterval);
 			if (token.isCancellationRequested) {
 				throw new CancellationError();
 			}
 
-			setupRecreatingStartMarker(
+			const markerRecreation = setupRecreatingStartMarker(
 				xterm,
 				this._startMarker,
 				m => this._onDidCreateStartMarker.fire(m),
@@ -77,12 +82,45 @@ export class NoneExecuteStrategy extends Disposable implements ITerminalExecuteS
 			// is used as sending ctrl+c before a shell is initialized (eg. PSReadLine) can result
 			// in failure (https://github.com/microsoft/vscode/issues/258989)
 			this._log(`Executing command line \`${commandLine}\``);
-			this._instance.sendText(commandLine, true);
+			markerRecreation.dispose();
+			const startLine = this._startMarker.value?.line;
+			this._instance.sendText(commandLine, true, true);
+
+			// Wait for the cursor to move past the command line before
+			// starting idle detection. Without this, the idle poll may
+			// resolve immediately on the existing prompt if the shell
+			// hasn't started processing the command yet.
+			if (startLine !== undefined) {
+				this._log('Waiting for cursor to move past start line');
+				const cursorMovedPromise = new Promise<void>(resolve => {
+					const check = () => {
+						const buffer = xterm.raw.buffer.active;
+						const cursorLine = buffer.baseY + buffer.cursorY;
+						if (cursorLine > startLine) {
+							resolve();
+						}
+					};
+					const listener = this._instance.onData(() => check());
+					store.add(listener);
+					check();
+				});
+
+				const cursorMoveTimeout = new Promise<'timeout'>(resolve => {
+					const handle = setTimeout(() => resolve('timeout'), 5000);
+					store.add({ dispose: () => clearTimeout(handle) });
+				});
+
+				const raceResult = await Promise.race([cursorMovedPromise, cursorMoveTimeout]);
+				if (raceResult === 'timeout') {
+					this._log('Cursor did not move past start line before timeout, proceeding with idle detection');
+				}
+			}
+
 
 			// Assume the command is done when it's idle
 			this._log('Waiting for idle with prompt heuristics');
 			const promptResultOrAltBuffer = await Promise.race([
-				waitForIdleWithPromptHeuristics(this._instance.onData, this._instance, 1000, 10000),
+				waitForIdleWithPromptHeuristics(this._instance.onData, this._instance, idlePollInterval, idlePollInterval * 10),
 				alternateBufferPromise.then(() => 'alternateBuffer' as const)
 			]);
 			if (promptResultOrAltBuffer === 'alternateBuffer') {
@@ -109,10 +147,24 @@ export class NoneExecuteStrategy extends Disposable implements ITerminalExecuteS
 			try {
 				output = xterm.getContentsAsText(this._startMarker.value, endMarker);
 				this._log('Fetched output via markers');
+
+				// The marker-based output includes the command echo (the line where the
+				// command was typed) and the next prompt line. Strip them to isolate
+				// only the actual command output. The first line always contains the
+				// command echo (since the start marker is placed at the cursor before
+				// sendText), and trailing lines that look like shell prompts are removed.
+				if (output !== undefined) {
+					output = stripCommandEchoAndPrompt(output, commandLine, this._log.bind(this));
+				}
 			} catch {
 				this._log('Failed to fetch output via markers');
 				additionalInformationLines.push('Failed to retrieve command output');
 			}
+
+			if (output !== undefined && output.trim().length === 0) {
+				additionalInformationLines.push('Command produced no output');
+			}
+
 			return {
 				output,
 				additionalInformation: additionalInformationLines.length > 0 ? additionalInformationLines.join('\n') : undefined,
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts
index b68f7a499d4..cd8ac8edaf2 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts
@@ -8,12 +8,15 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { isNumber } from '../../../../../../base/common/types.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { isCI } from '../../../../../../base/common/platform.js';
 import type { ICommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import { trackIdleOnPrompt, type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from './executeStrategy.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
-import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
+import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
+import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
 
 /**
  * This strategy is used when the terminal has rich shell integration/command detection is
@@ -32,6 +35,7 @@ export class RichExecuteStrategy extends Disposable implements ITerminalExecuteS
 	constructor(
 		private readonly _instance: ITerminalInstance,
 		private readonly _commandDetection: ICommandDetectionCapability,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
 		super();
@@ -48,6 +52,8 @@ export class RichExecuteStrategy extends Disposable implements ITerminalExecuteS
 			}
 			const alternateBufferPromise = createAltBufferPromise(xterm, store, this._log.bind(this));
 
+			const idlePollInterval = this._configurationService.getValue<number>(TerminalChatAgentToolsSettingId.IdlePollInterval) ?? 1000;
+
 			const onDone = Promise.race([
 				Event.toPromise(this._commandDetection.onCommandFinished, store).then(e => {
 					this._log('onDone via end event');
@@ -63,12 +69,12 @@ export class RichExecuteStrategy extends Disposable implements ITerminalExecuteS
 					this._log('onDone via terminal disposal');
 					return { type: 'disposal' } as const;
 				}),
-				trackIdleOnPrompt(this._instance, 1000, store).then(() => {
+				trackIdleOnPrompt(this._instance, idlePollInterval, store, idlePollInterval).then(() => {
 					this._log('onDone via idle prompt');
 				}),
 			]);
 
-			setupRecreatingStartMarker(
+			const markerRecreation = setupRecreatingStartMarker(
 				xterm,
 				this._startMarker,
 				m => this._onDidCreateStartMarker.fire(m),
@@ -78,7 +84,8 @@ export class RichExecuteStrategy extends Disposable implements ITerminalExecuteS
 
 			// Execute the command
 			this._log(`Executing command line \`${commandLine}\``);
-			this._instance.runCommand(commandLine, true, commandId);
+			markerRecreation.dispose();
+			this._instance.runCommand(commandLine, true, commandId, true);
 
 			// Wait for the terminal to idle
 			this._log('Waiting for done event');
@@ -109,13 +116,23 @@ export class RichExecuteStrategy extends Disposable implements ITerminalExecuteS
 				const commandOutput = finishedCommand?.getOutput();
 				if (commandOutput !== undefined) {
 					this._log('Fetched output via finished command');
-					output = commandOutput;
+					// On some platforms (e.g. Windows/PowerShell), shell integration
+					// markers can misfire and getOutput() includes the command echo.
+					// Strip it defensively — the function is a no-op when the output
+					// is already clean.
+					output = stripCommandEchoAndPrompt(commandOutput, commandLine, this._log.bind(this));
 				}
 			}
 			if (output === undefined) {
 				try {
 					output = xterm.getContentsAsText(this._startMarker.value, endMarker);
 					this._log('Fetched output via markers');
+
+					// The marker-based output includes the command echo and trailing
+					// prompt lines. Strip them to isolate the actual command output.
+					if (output !== undefined) {
+						output = stripCommandEchoAndPrompt(output, commandLine, this._log.bind(this));
+					}
 				} catch {
 					this._log('Failed to fetch output via markers');
 					additionalInformationLines.push('Failed to retrieve command output');
@@ -142,6 +159,11 @@ export class RichExecuteStrategy extends Disposable implements ITerminalExecuteS
 	}
 
 	private _log(message: string) {
-		this._logService.debug(`RunInTerminalTool#Rich: ${message}`);
+		const msg = `RunInTerminalTool#Rich: ${message}`;
+		if (isCI) {
+			this._logService.info(msg);
+		} else {
+			this._logService.debug(msg);
+		}
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts
index 5c63b233ec2..c372a8c78af 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts
@@ -18,7 +18,7 @@ export function setupRecreatingStartMarker(
 	fire: (marker: IXtermMarker | undefined) => void,
 	store: DisposableStore,
 	log?: (message: string) => void,
-): void {
+): IDisposable {
 	const markerListener = new MutableDisposable<IDisposable>();
 	const recreateStartMarker = () => {
 		if (store.isDisposed) {
@@ -43,6 +43,12 @@ export function setupRecreatingStartMarker(
 		fire(undefined);
 	}));
 	store.add(startMarker);
+
+	// Return a disposable that stops the recreation loop without clearing
+	// the current marker. Callers should dispose this before sending a
+	// command so that prompt re-renders (e.g. PSReadLine transient prompts)
+	// don't move the start marker past the command output.
+	return toDisposable(() => markerListener.dispose());
 }
 
 export function createAltBufferPromise(
@@ -70,3 +76,204 @@ export function createAltBufferPromise(
 
 	return deferred.p;
 }
+
+/**
+ * Strips the command echo and trailing prompt lines from marker-based terminal output.
+ * Without shell integration (or when `getOutput()` is unavailable), `getContentsAsText`
+ * captures the entire terminal buffer between the start and end markers, which includes:
+ * 1. The command echo line (what `sendText` wrote)
+ * 2. The actual command output
+ * 3. The next shell prompt line(s)
+ *
+ * This function removes (1) and (3) to isolate the actual output.
+ */
+export function stripCommandEchoAndPrompt(output: string, commandLine: string, log?: (message: string) => void): string {
+	log?.(`stripCommandEchoAndPrompt input: output length=${output.length}, commandLine length=${commandLine.length}`);
+
+	const result = _stripCommandEchoAndPromptOnce(output, commandLine, log);
+
+	// After stripping the first command echo and trailing prompt, the remaining
+	// content may still contain the command re-echoed by the shell (prompt + echo).
+	// This happens when the terminal buffer captures both the raw sendText output
+	// and the shell's subsequent prompt + command echo. If the command appears again
+	// in the remaining text, strip it one more time.
+	if (result.trim().length > 0 && findCommandEcho(result, commandLine)) {
+		return _stripCommandEchoAndPromptOnce(result, commandLine, log);
+	}
+
+	return result;
+}
+
+function _stripCommandEchoAndPromptOnce(output: string, commandLine: string, log?: (message: string) => void): string {
+	// Strip leading lines that are part of the command echo using findCommandEcho.
+	// Allow suffix matching to handle partial command echoes from getOutput()
+	// where the prompt line is not included.
+	const echoResult = findCommandEcho(output, commandLine, /*allowSuffixMatch*/ true);
+	const lines = echoResult ? echoResult.linesAfter : output.split('\n');
+	const startIndex = 0;
+
+	// Use evidence from the prompt prefix (content before the command echo)
+	// to narrow down which trailing prompt patterns to check.
+	const promptBefore = echoResult?.contentBefore ?? '';
+	const isUnixAt = /\w+@[\w.-]+:/.test(promptBefore);
+	const isUnixHost = !isUnixAt && /[\w.-]+:\S/.test(promptBefore);
+	const isUnix = isUnixAt || isUnixHost;
+	const isPowerShell = /^PS\s/i.test(promptBefore);
+	const isCmd = !isPowerShell && /^[A-Z]:\\/.test(promptBefore);
+	const isStarship = /\u276f/.test(promptBefore);
+	const isPython = />>>/.test(promptBefore);
+	const knownPrompt = isUnix || isPowerShell || isCmd || isStarship || isPython;
+
+	// Strip trailing lines that are part of the next shell prompt. Prompts may
+	// span multiple lines due to terminal column wrapping. We strip from the
+	// bottom any line that matches a known prompt pattern. Patterns are
+	// intentionally anchored and specific to avoid stripping legitimate output
+	// that happens to end with characters like $, #, %, or >.
+	let endIndex = lines.length;
+	let trailingStrippedCount = 0;
+	const maxTrailingPromptLines = 2;
+	while (endIndex > startIndex) {
+		const line = lines[endIndex - 1].trimEnd();
+		if (line.length === 0) {
+			endIndex--;
+			continue;
+		}
+		if (trailingStrippedCount >= maxTrailingPromptLines) {
+			break;
+		}
+
+		// Complete (self-contained) prompt patterns: these have a recognizable
+		// prefix and a trailing marker ($, #, >). After stripping one complete
+		// prompt line, stop — lines above it are command output, not wrapped
+		// prompt continuation lines.
+		const isCompletePrompt =
+			// Bash/zsh: user@host:path ending with $ or #
+			// e.g., "user@host:~/src $ " or "root@server:/var/log# "
+			((!knownPrompt || isUnixAt) && /^\s*\w+@[\w.-]+:.*[#$]\s*$/.test(line)) ||
+			// hostname:path user$ or hostname:path user#
+			// e.g., "dsm12-be220-abc:testWorkspace runner$"
+			((!knownPrompt || isUnixHost) && /^\s*[\w.-]+:\S.*\s\w+[#$]\s*$/.test(line)) ||
+			// PowerShell: PS C:\path>
+			((!knownPrompt || isPowerShell) && /^PS\s+[A-Z]:\\.*>\s*$/.test(line)) ||
+			// Windows cmd: C:\path>
+			((!knownPrompt || isCmd) && /^[A-Z]:\\.*>\s*$/.test(line)) ||
+			// Starship prompt character
+			// allow-any-unicode-next-line
+			((!knownPrompt || isStarship) && /\u276f\s*$/.test(line)) ||
+			// Python REPL
+			((!knownPrompt || isPython) && /^>>>\s*$/.test(line));
+
+		// Fragment/partial prompt patterns: these represent pieces of a prompt
+		// that wraps across multiple terminal lines due to column width.
+		const isPromptFragment =
+			// Wrapped fragment ending with $ or # (e.g. "er$", "ts/testWorkspace$")
+			((!knownPrompt || isUnix) && /^\s*[\w/.-]+[#$]\s*$/.test(line)) ||
+			// Bracketed prompt start: [ hostname:/path or [ user@host:/path
+			// e.g., "[ alex@MacBook-Pro:/Users/alex/src/vscode4/extensions/vscode-api-test"
+			// e.g., "[W007DV9PF9-1:~/vss/_work/1/s/extensions/vscode-api-tests/testWorkspace] cloudte"
+			((!knownPrompt || isUnix) && /^\[\s*[\w.-]+(@[\w.-]+)?:[~\/]/.test(line)) ||
+			// Wrapped continuation: user@host:path or hostname:path (no trailing $)
+			// Only matched after we've already stripped a prompt fragment below.
+			// e.g., "cloudtest@host:/mnt/vss/.../vscode-api-tes" or "dsm12-abc:testWorkspace runn"
+			((!knownPrompt || isUnix) && trailingStrippedCount > 0 && /^\s*[\w][-\w.]*(@[\w.-]+)?:\S/.test(line)) ||
+			// Bracketed prompt end: ...] $ or ...] #
+			// e.g., "s/testWorkspace (main**) ] $ "
+			((!knownPrompt || isUnix) && /\]\s*[#$]\s*$/.test(line));
+
+		if (isCompletePrompt) {
+			endIndex--;
+			trailingStrippedCount++;
+			break; // Complete prompt = nothing above can be prompt wrap
+		} else if (isPromptFragment) {
+			endIndex--;
+			trailingStrippedCount++;
+		} else {
+			break;
+		}
+	}
+
+	const result = lines.slice(startIndex, endIndex).join('\n');
+	log?.(`stripCommandEchoAndPrompt result: length=${result.length} (startIndex=${startIndex}, endIndex=${endIndex}, totalLines=${lines.length})`);
+	return result;
+}
+
+export function findCommandEcho(output: string, commandLine: string, allowSuffixMatch?: boolean): { contentBefore: string; linesAfter: string[] } | undefined {
+	const trimmedCommand = commandLine.trim();
+	if (trimmedCommand.length === 0) {
+		return undefined;
+	}
+
+	// Strip newlines from the output so we can find the command as a
+	// contiguous substring even when terminal wrapping splits it across lines.
+	const { strippedOutput, indexMapping } = stripNewLinesAndBuildMapping(output);
+	const matchIndex = strippedOutput.indexOf(trimmedCommand);
+
+	let matchEndInStripped: number;
+	let contentBefore: string;
+
+	if (matchIndex !== -1) {
+		// Full command found in the output
+		contentBefore = strippedOutput.substring(0, matchIndex).trim();
+		matchEndInStripped = matchIndex + trimmedCommand.length - 1;
+	} else if (allowSuffixMatch) {
+		// If the full command wasn't found, check if the output starts with a
+		// suffix of the command. This happens when getOutput() doesn't include
+		// the prompt line, so only the wrapped continuation of the command echo
+		// appears at the beginning of the output.
+		let suffixLen = 0;
+		for (let len = trimmedCommand.length - 1; len >= 1; len--) {
+			const suffix = trimmedCommand.substring(trimmedCommand.length - len);
+			if (strippedOutput.startsWith(suffix)) {
+				// Require the suffix to start mid-word in the command (not at
+				// a word boundary). A word-boundary match like "MARKER_123"
+				// matching the tail of "echo MARKER_123" is almost certainly
+				// actual output, not a wrapped command continuation.
+				const charBefore = trimmedCommand[trimmedCommand.length - len - 1];
+				if (charBefore !== undefined && charBefore !== ' ' && charBefore !== '\t') {
+					suffixLen = len;
+				}
+				break;
+			}
+		}
+		if (suffixLen === 0) {
+			return undefined;
+		}
+		contentBefore = '';
+		matchEndInStripped = suffixLen - 1;
+	} else {
+		return undefined;
+	}
+
+	// Map the match end back to the original output position and determine
+	// which line it falls on to split linesAfter.
+	const originalEnd = indexMapping[matchEndInStripped];
+
+	const lines = output.split('\n');
+	let echoEndLine = 0;
+	let offset = 0;
+	for (let i = 0; i < lines.length; i++) {
+		const lineEnd = offset + lines[i].length; // excludes the \n
+		if (offset <= originalEnd && originalEnd <= lineEnd) {
+			echoEndLine = i + 1;
+			break;
+		}
+		offset = lineEnd + 1; // +1 for the \n
+	}
+
+	return {
+		contentBefore,
+		linesAfter: lines.slice(echoEndLine),
+	};
+}
+
+export function stripNewLinesAndBuildMapping(output: string): { strippedOutput: string; indexMapping: number[] } {
+	const indexMapping: number[] = [];
+	const strippedChars: string[] = [];
+	for (let i = 0; i < output.length; i++) {
+		if (output[i] !== '\n') {
+			strippedChars.push(output[i]);
+			indexMapping.push(i);
+		}
+	}
+	return { strippedOutput: strippedChars.join(''), indexMapping };
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts
index 8741a9f1d39..184e49eb75a 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts
@@ -14,13 +14,29 @@ export function getOutput(instance: ITerminalInstance, startMarker?: IXtermMarke
 		return '';
 	}
 	const buffer = instance.xterm.raw.buffer.active;
-	const startLine = Math.max(startMarker?.line ?? 0, 0);
+	let startLine = Math.max(startMarker?.line ?? 0, 0);
+	while (startLine > 0 && buffer.getLine(startLine)?.isWrapped) {
+		startLine--;
+	}
 	const endLine = buffer.length;
-	const lines: string[] = new Array(endLine - startLine);
+	const lines: string[] = [];
+	let currentLine = '';
 
 	for (let y = startLine; y < endLine; y++) {
 		const line = buffer.getLine(y);
-		lines[y - startLine] = line ? line.translateToString(true) : '';
+		if (!line) {
+			continue;
+		}
+		// NOTE: xterm stores wrapping state on the *next* line, not the current one.
+		const isWrapped = !!buffer.getLine(y + 1)?.isWrapped;
+		currentLine += line.translateToString(!isWrapped);
+		if (!isWrapped) {
+			lines.push(currentLine);
+			currentLine = '';
+		}
+	}
+	if (currentLine) {
+		lines.push(currentLine);
 	}
 
 	let output = lines.join('\n');
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts
index 7cbf89ca9f3..4edc69a5fad 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts
@@ -77,6 +77,14 @@ export function sanitizeTerminalOutput(output: string): string {
 	return sanitized;
 }
 
+/**
+ * Normalizes command text for UI display by removing unnecessary quote and forward slash
+ * escaping artifacts (for example: \" \' \/) commonly produced in streamed tool-call JSON.
+ */
+export function normalizeTerminalCommandForDisplay(commandLine: string): string {
+	return commandLine.replace(/\\(["'\/])/g, '$1');
+}
+
 export function generateAutoApproveActions(commandLine: string, subCommands: string[], autoApproveResult: { subCommandResults: ICommandApprovalResultWithReason[]; commandLineResult: ICommandApprovalResultWithReason }): ToolConfirmationAction[] {
 	const actions: ToolConfirmationAction[] = [];
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.ts
index 047c59fab39..2267111467e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.ts
@@ -65,7 +65,7 @@ export class RunInTerminalToolTelemetry {
 			autoApproveDefault: boolean | undefined;
 		};
 		type TelemetryClassification = {
-			owner: 'tyriar';
+			owner: 'meganrogge';
 			comment: 'Understanding the auto approve behavior of the runInTerminal tool';
 
 			terminalToolSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The session ID for this particular terminal tool invocation.' };
@@ -94,6 +94,7 @@ export class RunInTerminalToolTelemetry {
 		error: string | undefined;
 		isBackground: boolean;
 		isNewSession: boolean;
+		isSandboxWrapped: boolean;
 		shellIntegrationQuality: ShellIntegrationQuality;
 		outputLineCount: number;
 		timingConnectMs: number;
@@ -122,6 +123,7 @@ export class RunInTerminalToolTelemetry {
 			toolEditedCommand: 0 | 1;
 			isBackground: 0 | 1;
 			isNewSession: 0 | 1;
+			isSandbox: 0 | 1;
 			outputLineCount: number;
 			nonZeroExitCode: -1 | 0 | 1;
 			timingConnectMs: number;
@@ -139,7 +141,7 @@ export class RunInTerminalToolTelemetry {
 			inputToolFreeFormInputCount: number;
 		};
 		type TelemetryClassification = {
-			owner: 'tyriar';
+			owner: 'meganrogge';
 			comment: 'Understanding the usage of the runInTerminal tool';
 
 			terminalSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The session ID of the terminal instance.' };
@@ -151,6 +153,7 @@ export class RunInTerminalToolTelemetry {
 			toolEditedCommand: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the tool edited the command' };
 			isBackground: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the command is a background command' };
 			isNewSession: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether this was the first execution for the terminal session' };
+			isSandbox: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the command was run inside the terminal sandbox' };
 			outputLineCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'How many lines of output were produced, this is -1 when isBackground is true or if there\'s an error' };
 			nonZeroExitCode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the command exited with a non-zero code (-1=error/unknown, 0=zero exit code, 1=non-zero)' };
 			timingConnectMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'How long the terminal took to start up and connect to' };
@@ -177,6 +180,7 @@ export class RunInTerminalToolTelemetry {
 			toolEditedCommand: state.didToolEditCommand ? 1 : 0,
 			isBackground: state.isBackground ? 1 : 0,
 			isNewSession: state.isNewSession ? 1 : 0,
+			isSandbox: state.isSandboxWrapped ? 1 : 0,
 			outputLineCount: state.outputLineCount,
 			nonZeroExitCode: state.exitCode === undefined ? -1 : state.exitCode === 0 ? 0 : 1,
 			timingConnectMs: state.timingConnectMs,
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
index eda700886bd..fa39d76ec7d 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
@@ -23,6 +23,7 @@ import { IExecution, IPollingResult, OutputMonitorState } from './tools/monitori
 import { Event } from '../../../../../base/common/event.js';
 import { IReconnectionTaskData } from '../../../tasks/browser/terminalTaskSystem.js';
 import { isString } from '../../../../../base/common/types.js';
+import type { IMarker as IXtermMarker } from '@xterm/xterm';
 
 
 export function getTaskDefinition(id: string) {
@@ -180,7 +181,8 @@ export async function collectTerminalResults(
 	disposableStore: DisposableStore,
 	isActive?: (task: Task) => Promise<boolean>,
 	dependencyTasks?: Task[],
-	taskService?: ITaskService
+	taskService?: ITaskService,
+	startMarkersByTerminalInstanceId?: Map<number, IXtermMarker | undefined>
 ): Promise<Array<{
 	name: string;
 	output: string;
@@ -214,6 +216,9 @@ export async function collectTerminalResults(
 	progress.report({ message: new MarkdownString(`Checking output for ${terminalNames.map(n => `\`${n}\``).join(', ')}`) });
 
 	const terminalPromises = terminals.map(async (instance) => {
+		const startMarker = startMarkersByTerminalInstanceId
+			? startMarkersByTerminalInstanceId.get(instance.instanceId)
+			: instance.registerMarker();
 		let terminalTask = task;
 
 		// For composite tasks, find the actual dependency task running in this terminal
@@ -237,7 +242,7 @@ export async function collectTerminalResults(
 		}
 
 		const execution: IExecution = {
-			getOutput: () => getOutput(instance) ?? '',
+			getOutput: (marker) => getOutput(instance, marker ?? startMarker) ?? '',
 			task: terminalTask,
 			isActive: isActive ? () => isActive(terminalTask) : undefined,
 			instance,
@@ -258,32 +263,47 @@ export async function collectTerminalResults(
 			}
 		}
 
-		const hasProblemMatchers = terminalTask.configurationProperties.problemMatchers && terminalTask.configurationProperties.problemMatchers.length > 0;
-		const outputMonitor = disposableStore.add(instantiationService.createInstance(OutputMonitor, execution, hasProblemMatchers ? taskProblemPollFn : undefined, invocationContext, token, task._label));
-		await Promise.race([
-			Event.toPromise(outputMonitor.onDidFinishCommand),
-			Event.toPromise(token.onCancellationRequested as Event<unknown>)
-		]);
-		const pollingResult = outputMonitor.pollingResult;
-		return {
-			name: instance.shellLaunchConfig.name ?? instance.title ?? 'unknown',
-			output: pollingResult?.output ?? '',
-			pollDurationMs: pollingResult?.pollDurationMs ?? 0,
-			resources: pollingResult?.resources,
-			state: pollingResult?.state || OutputMonitorState.Idle,
-			inputToolManualAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualAcceptCount ?? 0,
-			inputToolManualRejectCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualRejectCount ?? 0,
-			inputToolManualChars: outputMonitor.outputMonitorTelemetryCounters.inputToolManualChars ?? 0,
-			inputToolAutoAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolAutoAcceptCount ?? 0,
-			inputToolAutoChars: outputMonitor.outputMonitorTelemetryCounters.inputToolAutoChars ?? 0,
-			inputToolManualShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualShownCount ?? 0,
-			inputToolFreeFormInputShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount ?? 0,
-			inputToolFreeFormInputCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputCount ?? 0,
-		};
+		try {
+			const hasProblemMatchers = terminalTask.configurationProperties.problemMatchers && terminalTask.configurationProperties.problemMatchers.length > 0;
+			const outputMonitor = disposableStore.add(instantiationService.createInstance(OutputMonitor, execution, hasProblemMatchers ? taskProblemPollFn : undefined, invocationContext, token, task._label));
+			await Promise.race([
+				Event.toPromise(outputMonitor.onDidFinishCommand),
+				Event.toPromise(token.onCancellationRequested as Event<unknown>)
+			]);
+			const pollingResult = outputMonitor.pollingResult;
+			return {
+				name: instance.shellLaunchConfig.name ?? instance.title ?? 'unknown',
+				output: pollingResult?.output ?? '',
+				pollDurationMs: pollingResult?.pollDurationMs ?? 0,
+				resources: pollingResult?.resources,
+				state: pollingResult?.state || OutputMonitorState.Idle,
+				inputToolManualAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualAcceptCount ?? 0,
+				inputToolManualRejectCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualRejectCount ?? 0,
+				inputToolManualChars: outputMonitor.outputMonitorTelemetryCounters.inputToolManualChars ?? 0,
+				inputToolAutoAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolAutoAcceptCount ?? 0,
+				inputToolAutoChars: outputMonitor.outputMonitorTelemetryCounters.inputToolAutoChars ?? 0,
+				inputToolManualShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualShownCount ?? 0,
+				inputToolFreeFormInputShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount ?? 0,
+				inputToolFreeFormInputCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputCount ?? 0,
+			};
+		} finally {
+			startMarker?.dispose();
+		}
 	});
 
 	const parallelResults = await Promise.all(terminalPromises);
 	results.push(...parallelResults);
+
+	if (startMarkersByTerminalInstanceId) {
+		const activeInstanceIds = new Set(terminals.map(instance => instance.instanceId));
+		for (const [instanceId, marker] of startMarkersByTerminalInstanceId) {
+			if (!activeInstanceIds.has(instanceId)) {
+				marker?.dispose();
+				startMarkersByTerminalInstanceId.delete(instanceId);
+			}
+		}
+	}
+
 	return results;
 }
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
index d7e2dea9c4e..e8bd2742546 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { isNumber } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
@@ -32,6 +32,7 @@ import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './tools/task/cre
 import { GetTaskOutputTool, GetTaskOutputToolData } from './tools/task/getTaskOutputTool.js';
 import { RunTaskTool, RunTaskToolData } from './tools/task/runTaskTool.js';
 import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { ITrustedDomainService } from '../../../url/common/trustedDomainService.js';
 import { ITerminalSandboxService, TerminalSandboxService } from '../common/terminalSandboxService.js';
 
 // #region Services
@@ -75,64 +76,104 @@ class OutputLocationMigrationContribution extends Disposable implements IWorkben
 }
 registerWorkbenchContribution2(OutputLocationMigrationContribution.ID, OutputLocationMigrationContribution, WorkbenchPhase.Eventually);
 
-class ChatAgentToolsContribution extends Disposable implements IWorkbenchContribution {
+export class ChatAgentToolsContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'terminal.chatAgentTools';
 
+	private readonly _runInTerminalToolRegistration = this._register(new MutableDisposable<DisposableStore>());
+	private _runInTerminalToolRegistrationVersion = 0;
+
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILanguageModelToolsService private readonly _toolsService: ILanguageModelToolsService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@ITrustedDomainService private readonly _trustedDomainService: ITrustedDomainService,
 	) {
 		super();
 
 		// #region Terminal
 
-		const confirmTerminalCommandTool = instantiationService.createInstance(ConfirmTerminalCommandTool);
-		this._register(toolsService.registerTool(ConfirmTerminalCommandToolData, confirmTerminalCommandTool));
-		const getTerminalOutputTool = instantiationService.createInstance(GetTerminalOutputTool);
-		this._register(toolsService.registerTool(GetTerminalOutputToolData, getTerminalOutputTool));
-		this._register(toolsService.executeToolSet.addTool(GetTerminalOutputToolData));
+		const confirmTerminalCommandTool = _instantiationService.createInstance(ConfirmTerminalCommandTool);
+		this._register(_toolsService.registerTool(ConfirmTerminalCommandToolData, confirmTerminalCommandTool));
+		const getTerminalOutputTool = _instantiationService.createInstance(GetTerminalOutputTool);
+		this._register(_toolsService.registerTool(GetTerminalOutputToolData, getTerminalOutputTool));
+		this._register(_toolsService.executeToolSet.addTool(GetTerminalOutputToolData));
 
-		const awaitTerminalTool = instantiationService.createInstance(AwaitTerminalTool);
-		this._register(toolsService.registerTool(AwaitTerminalToolData, awaitTerminalTool));
-		this._register(toolsService.executeToolSet.addTool(AwaitTerminalToolData));
+		const awaitTerminalTool = _instantiationService.createInstance(AwaitTerminalTool);
+		this._register(_toolsService.registerTool(AwaitTerminalToolData, awaitTerminalTool));
+		this._register(_toolsService.executeToolSet.addTool(AwaitTerminalToolData));
 
-		const killTerminalTool = instantiationService.createInstance(KillTerminalTool);
-		this._register(toolsService.registerTool(KillTerminalToolData, killTerminalTool));
-		this._register(toolsService.executeToolSet.addTool(KillTerminalToolData));
+		const killTerminalTool = _instantiationService.createInstance(KillTerminalTool);
+		this._register(_toolsService.registerTool(KillTerminalToolData, killTerminalTool));
+		this._register(_toolsService.executeToolSet.addTool(KillTerminalToolData));
 
-		instantiationService.invokeFunction(createRunInTerminalToolData).then(runInTerminalToolData => {
-			const runInTerminalTool = instantiationService.createInstance(RunInTerminalTool);
-			this._register(toolsService.registerTool(runInTerminalToolData, runInTerminalTool));
-			this._register(toolsService.executeToolSet.addTool(runInTerminalToolData));
-		});
+		this._registerRunInTerminalTool();
 
-		const getTerminalSelectionTool = instantiationService.createInstance(GetTerminalSelectionTool);
-		this._register(toolsService.registerTool(GetTerminalSelectionToolData, getTerminalSelectionTool));
+		const getTerminalSelectionTool = _instantiationService.createInstance(GetTerminalSelectionTool);
+		this._register(_toolsService.registerTool(GetTerminalSelectionToolData, getTerminalSelectionTool));
 
-		const getTerminalLastCommandTool = instantiationService.createInstance(GetTerminalLastCommandTool);
-		this._register(toolsService.registerTool(GetTerminalLastCommandToolData, getTerminalLastCommandTool));
+		const getTerminalLastCommandTool = _instantiationService.createInstance(GetTerminalLastCommandTool);
+		this._register(_toolsService.registerTool(GetTerminalLastCommandToolData, getTerminalLastCommandTool));
 
-		this._register(toolsService.readToolSet.addTool(GetTerminalSelectionToolData));
-		this._register(toolsService.readToolSet.addTool(GetTerminalLastCommandToolData));
+		this._register(_toolsService.readToolSet.addTool(GetTerminalSelectionToolData));
+		this._register(_toolsService.readToolSet.addTool(GetTerminalLastCommandToolData));
 
 		// #endregion
 
 		// #region Tasks
 
-		const runTaskTool = instantiationService.createInstance(RunTaskTool);
-		this._register(toolsService.registerTool(RunTaskToolData, runTaskTool));
+		const runTaskTool = _instantiationService.createInstance(RunTaskTool);
+		this._register(_toolsService.registerTool(RunTaskToolData, runTaskTool));
 
-		const getTaskOutputTool = instantiationService.createInstance(GetTaskOutputTool);
-		this._register(toolsService.registerTool(GetTaskOutputToolData, getTaskOutputTool));
+		const getTaskOutputTool = _instantiationService.createInstance(GetTaskOutputTool);
+		this._register(_toolsService.registerTool(GetTaskOutputToolData, getTaskOutputTool));
 
-		const createAndRunTaskTool = instantiationService.createInstance(CreateAndRunTaskTool);
-		this._register(toolsService.registerTool(CreateAndRunTaskToolData, createAndRunTaskTool));
-		this._register(toolsService.executeToolSet.addTool(RunTaskToolData));
-		this._register(toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
-		this._register(toolsService.readToolSet.addTool(GetTaskOutputToolData));
+		const createAndRunTaskTool = _instantiationService.createInstance(CreateAndRunTaskTool);
+		this._register(_toolsService.registerTool(CreateAndRunTaskToolData, createAndRunTaskTool));
+		this._register(_toolsService.executeToolSet.addTool(RunTaskToolData));
+		this._register(_toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
+		this._register(_toolsService.readToolSet.addTool(GetTaskOutputToolData));
 
 		// #endregion
+
+		// Re-register run_in_terminal tool when sandbox-related settings change,
+		// so the tool description and input schema stay in sync with the current
+		// sandbox state.
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled) ||
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) ||
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) ||
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains)
+			) {
+				this._registerRunInTerminalTool();
+			}
+		}));
+		this._register(this._trustedDomainService.onDidChangeTrustedDomains(() => {
+			this._registerRunInTerminalTool();
+		}));
+	}
+
+	private _runInTerminalTool: RunInTerminalTool | undefined;
+
+	private _registerRunInTerminalTool(): void {
+		const version = ++this._runInTerminalToolRegistrationVersion;
+		this._instantiationService.invokeFunction(createRunInTerminalToolData).then(runInTerminalToolData => {
+			if (this._store.isDisposed || version !== this._runInTerminalToolRegistrationVersion) {
+				return;
+			}
+			if (!this._runInTerminalTool) {
+				this._runInTerminalTool = this._register(this._instantiationService.createInstance(RunInTerminalTool));
+			}
+			// Dispose old registration first so registerToolData doesn't throw
+			// "already registered" for the same tool ID.
+			this._runInTerminalToolRegistration.value = undefined;
+			const store = new DisposableStore();
+			store.add(this._toolsService.registerToolData(runInTerminalToolData));
+			store.add(this._toolsService.registerToolImplementation(runInTerminalToolData.id, this._runInTerminalTool));
+			store.add(this._toolsService.executeToolSet.addTool(runInTerminalToolData));
+			this._runInTerminalToolRegistration.value = store;
+		});
 	}
 }
 registerWorkbenchContribution2(ChatAgentToolsContribution.ID, ChatAgentToolsContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts
index b18edd0b7b3..317ff148988 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts
@@ -45,6 +45,7 @@ export interface ICommandLineAnalyzerOptions {
 	treeSitterLanguage: TreeSitterCommandParserLanguage;
 	terminalToolSessionId: string;
 	chatSessionResource: URI | undefined;
+	requiresUnsandboxConfirmation?: boolean;
 }
 
 export interface ICommandLineAnalyzerResult {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts
index dfd1d5d8d3c..cff1b32e22e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts
@@ -51,7 +51,8 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 	}
 
 	async analyze(options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult> {
-		if (options.chatSessionResource && this._terminalChatService.hasChatSessionAutoApproval(options.chatSessionResource)) {
+		const isAutoApproveEnabledInSettings = this._configurationService.getValue<boolean>(TerminalChatAgentToolsSettingId.EnableAutoApprove) === true;
+		if (isAutoApproveEnabledInSettings && options.chatSessionResource && this._terminalChatService.hasChatSessionAutoApproval(options.chatSessionResource)) {
 			this._log('Session has auto approval enabled, auto approving command');
 			const disableUri = createCommandUri(TerminalChatCommandId.DisableSessionAutoApproval, options.chatSessionResource);
 			const mdTrustSettings = {
@@ -82,7 +83,17 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 		let autoApproveInfo: IMarkdownString | undefined;
 		let customActions: ToolConfirmationAction[] | undefined;
 
-		if (!subCommands) {
+		if (!subCommands?.length) {
+			if (trimmedCommandLine.length === 0) {
+				this._log('Command line is empty, auto approving');
+				return {
+					isAutoApproved: true,
+					isAutoApproveAllowed: true,
+					disclaimers: [],
+				};
+			}
+
+			this._log('No sub-commands were parsed, auto approval is not allowed');
 			return {
 				isAutoApproveAllowed: false,
 				disclaimers: [],
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.ts
index 39ed6639c52..7d75a0d38cb 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.ts
@@ -22,7 +22,7 @@ export class CommandLineSandboxAnalyzer extends Disposable implements ICommandLi
 		}
 		return {
 			isAutoApproveAllowed: true,
-			forceAutoApproval: true,
+			forceAutoApproval: _options.requiresUnsandboxConfirmation ? false : true,
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.ts
index d2b094e6aec..06c7776bf46 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.ts
@@ -8,8 +8,9 @@ import type { ICommandLinePresenter, ICommandLinePresenterOptions, ICommandLineP
 
 /**
  * Command line presenter for sandboxed commands.
- * Extracts the original command from the sandbox wrapper for cleaner display,
- * while the actual sandboxed command runs unchanged.
+ * Returns the display form of the command (provided via {@link ICommandLineRewriterResult.forDisplay}
+ * from the rewriter pipeline) for cleaner presentation, while the actual sandboxed command runs
+ * unchanged.
  */
 export class SandboxedCommandLinePresenter implements ICommandLinePresenter {
 	constructor(
@@ -22,7 +23,7 @@ export class SandboxedCommandLinePresenter implements ICommandLinePresenter {
 			return undefined;
 		}
 		return {
-			commandLine: options.commandLine.original ?? options.commandLine.forDisplay,
+			commandLine: options.commandLine.forDisplay,
 			processOtherPresenters: true
 		};
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts
index 3a3c4a3c955..2c1dbc6acc0 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts
@@ -17,6 +17,7 @@ export interface ICommandLineRewriterOptions {
 	cwd: URI | undefined;
 	shell: string;
 	os: OperatingSystem;
+	requestUnsandboxedExecution?: boolean;
 }
 
 export interface ICommandLineRewriterResult {
@@ -24,4 +25,5 @@ export interface ICommandLineRewriterResult {
 	reasoning: string;
 	//for scenarios where we want to show a different command in the chat UI than what is actually run in the terminal
 	forDisplay?: string;
+	isSandboxWrapped?: boolean;
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.ts
index 030afe5a76a..db6e9610526 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.ts
@@ -15,6 +15,10 @@ export class CommandLineSandboxRewriter extends Disposable implements ICommandLi
 	}
 
 	async rewrite(options: ICommandLineRewriterOptions): Promise<ICommandLineRewriterResult | undefined> {
+		if (options.requestUnsandboxedExecution) {
+			return undefined;
+		}
+
 		if (!(await this._sandboxService.isEnabled())) {
 			return undefined;
 		}
@@ -30,7 +34,8 @@ export class CommandLineSandboxRewriter extends Disposable implements ICommandLi
 		return {
 			rewritten: wrappedCommand,
 			reasoning: 'Wrapped command for sandbox execution',
-			forDisplay: options.commandLine, // show the command that is passed as input. In this case, the output from CommandLinePreventHistoryRewriter
+			forDisplay: options.commandLine, // show the command that is passed as input (after prior rewrites like cd prefix stripping)
+			isSandboxWrapped: true,
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts
index b7ac92861e7..1dbfc71c462 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts
@@ -16,7 +16,7 @@ export const GetTerminalOutputToolData: IToolData = {
 	toolReferenceName: 'getTerminalOutput',
 	legacyToolReferenceFullNames: ['runCommands/getTerminalOutput'],
 	displayName: localize('getTerminalOutputTool.displayName', 'Get Terminal Output'),
-	modelDescription: `Get the output of a terminal command previously started with ${TerminalToolId.RunInTerminal}`,
+	modelDescription: `Get the output of a background terminal command previously started with ${TerminalToolId.RunInTerminal}. The ID must be the exact opaque value returned by ${TerminalToolId.RunInTerminal} when isBackground=true; terminal names, labels, and integers are not valid IDs.`,
 	icon: Codicon.terminal,
 	source: ToolDataSource.Internal,
 	inputSchema: {
@@ -24,7 +24,8 @@ export const GetTerminalOutputToolData: IToolData = {
 		properties: {
 			id: {
 				type: 'string',
-				description: 'The ID of the terminal to check.'
+				description: `The ID of the background terminal to check (returned by ${TerminalToolId.RunInTerminal} when isBackground=true). This must be the exact opaque ID returned by that tool; terminal names, labels, or integers are invalid.`,
+				pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$'
 			},
 		},
 		required: [
@@ -47,10 +48,20 @@ export class GetTerminalOutputTool extends Disposable implements IToolImpl {
 
 	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
 		const args = invocation.parameters as IGetTerminalOutputInputParams;
+		const execution = RunInTerminalTool.getExecution(args.id);
+		if (!execution) {
+			return {
+				content: [{
+					kind: 'text',
+					value: `Error: No active terminal execution found with ID ${args.id}. The ID must be the exact value returned by ${TerminalToolId.RunInTerminal} for a background command.`
+				}]
+			};
+		}
+
 		return {
 			content: [{
 				kind: 'text',
-				value: `Output of terminal ${args.id}:\n${RunInTerminalTool.getBackgroundOutput(args.id)}`
+				value: `Output of terminal ${args.id}:\n${execution.getOutput()}`
 			}]
 		};
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
index 43ef48eca9d..e3b8bc31ed3 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
@@ -230,18 +230,18 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		}
 
 		// Check for VS Code's task finish messages (like "press any key to close the terminal").
-		// These should only be ignored if it's a task AND the task is finished.
-		// Otherwise, "press any key to continue" from scripts should prompt the user.
+		// If the execution is a task and the output contains a VS Code task finish message,
+		// always treat it as a stop signal regardless of task active state (which can be stale).
 		const isTask = this._execution.task !== undefined;
-		const isTaskInactive = this._execution.isActive ? !(await this._execution.isActive()) : true;
-		if (isTask && isTaskInactive && detectsVSCodeTaskFinishMessage(output)) {
-			this._logService.trace('OutputMonitor: Idle -> VS Code task finish message detected for inactive task, stopping');
+		if (isTask && detectsVSCodeTaskFinishMessage(output)) {
+			this._logService.trace('OutputMonitor: Idle -> VS Code task finish message detected, stopping');
 			// Task is finished, ignore the "press any key to close" message
 			return { shouldContinuePollling: false, output };
 		}
 
 		// Check for generic "press any key" prompts from scripts.
-		if ((!isTask || !isTaskInactive) && detectsGenericPressAnyKeyPattern(output)) {
+		// Only shown for non-task executions since task finish messages are handled above.
+		if (!isTask && detectsGenericPressAnyKeyPattern(output)) {
 			this._logService.trace('OutputMonitor: Idle -> generic "press any key" detected');
 			const autoReply = this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoReplyToPrompts) || this._isAutopilotMode();
 			if (autoReply) {
@@ -474,6 +474,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		const model = await this._getLanguageModel();
 		if (!model) {
 			return 'No models available';
+
 		}
 
 		const response = await this._languageModelsService.sendChatRequest(
@@ -927,8 +928,26 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 	}
 
 	private async _getLanguageModel(): Promise<string | undefined> {
-		const models = await this._safeSelectLanguageModels({ vendor: 'copilot', id: 'copilot-fast' });
-		return models.length ? models[0] : undefined;
+		const fastModels = await this._safeSelectLanguageModels({ vendor: 'copilot', id: 'copilot-fast' });
+		if (fastModels.length) {
+			return fastModels[0];
+		}
+
+		const widget = this._chatWidgetService.lastFocusedWidget ?? this._chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat)[0];
+		const currentModel = widget?.input.currentLanguageModel;
+		if (currentModel) {
+			const currentFamilyModels = await this._safeSelectLanguageModels({ vendor: 'copilot', family: currentModel.replaceAll('copilot/', '') });
+			if (currentFamilyModels.length) {
+				return currentFamilyModels[0];
+			}
+		}
+
+		const copilotModels = await this._safeSelectLanguageModels({ vendor: 'copilot' });
+		if (copilotModels.length) {
+			return copilotModels[0];
+		}
+
+		return undefined;
 	}
 
 	private async _safeSelectLanguageModels(selector: ILanguageModelChatSelector): Promise<string[]> {
@@ -1050,8 +1069,14 @@ const taskFinishMessages = [
 	// "Press any key to close the terminal." (with exit code placeholder removed for matching)
 	localize('exitCode.closeTerminal', "Press any key to close the terminal."),
 	localize('exitCode.reuseTerminal', "Press any key to close the terminal."),
+	// Punctuation variant: "The terminal will be reused by tasks. Press any key to close."
+	localize('reuseTerminal.pressClose', "The terminal will be reused by tasks. Press any key to close."),
 ];
 
+const normalizedTaskFinishMessages = taskFinishMessages.map(msg =>
+	msg.replace(/[\s.,:;!?"'`()[\]{}<>\-_/\\]+/g, '').toLowerCase()
+);
+
 /**
  * Detects VS Code's specific task completion messages like:
  * - "Press any key to close the terminal."
@@ -1061,9 +1086,9 @@ const taskFinishMessages = [
  * that can split words across lines (e.g., "t\no" instead of "to").
  */
 export function detectsVSCodeTaskFinishMessage(cursorLine: string): boolean {
-	// Remove all whitespace to handle line wrapping that splits words mid-word
-	const normalized = cursorLine.replace(/\s/g, '').toLowerCase();
-	return taskFinishMessages.some(msg => normalized.includes(msg.replace(/\s/g, '').toLowerCase()));
+	// Be tolerant to whitespace, punctuation, and line wrapping that can split words mid-word.
+	const compact = cursorLine.replace(/[\s.,:;!?"'`()[\]{}<>\-_/\\]+/g, '').toLowerCase();
+	return normalizedTaskFinishMessages.some(msg => compact.includes(msg));
 }
 
 /**
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/outputAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/outputAnalyzer.ts
index 0490f5e332f..dcb1580e466 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/outputAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/outputAnalyzer.ts
@@ -7,6 +7,7 @@ export interface IOutputAnalyzerOptions {
 	readonly exitCode: number | undefined;
 	readonly exitResult: string;
 	readonly commandLine: string;
+	readonly isSandboxWrapped: boolean;
 }
 
 export interface IOutputAnalyzer {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
index 65a0a565068..1093ebfcabd 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
@@ -58,6 +58,10 @@ export const ConfirmTerminalCommandToolData: IToolData = {
 };
 
 export class ConfirmTerminalCommandTool extends RunInTerminalTool {
+	override get _enableCommandLineSandboxRewriting() {
+		return false;
+	}
+
 	override async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
 		const preparedInvocation = await super.prepareToolInvocation(context, token);
 		if (preparedInvocation) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
index 2947937e8e5..d6650025591 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
@@ -9,15 +9,17 @@ import { CancellationToken, CancellationTokenSource } from '../../../../../../ba
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
-import { MarkdownString, type IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { escapeMarkdownSyntaxTokens, MarkdownString, type IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../../base/common/map.js';
+import { getMediaMime } from '../../../../../../base/common/mime.js';
 import { basename, posix, win32 } from '../../../../../../base/common/path.js';
 import { OperatingSystem, OS } from '../../../../../../base/common/platform.js';
 import { count } from '../../../../../../base/common/strings.js';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { localize } from '../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
 import { IInstantiationService, type ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
@@ -26,7 +28,7 @@ import { ITerminalLogService, ITerminalProfile } from '../../../../../../platfor
 import { IRemoteAgentService } from '../../../../../services/remote/common/remoteAgentService.js';
 import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
 import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService/chatService.js';
-import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IStreamedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolInvocationStreamContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { ITerminalChatService, ITerminalService, type ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import { ITerminalProfileResolverService } from '../../../../terminal/common/terminal.js';
 import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
@@ -36,7 +38,7 @@ import type { ITerminalExecuteStrategy, ITerminalExecuteStrategyResult } from '.
 import { NoneExecuteStrategy } from '../executeStrategy/noneExecuteStrategy.js';
 import { RichExecuteStrategy } from '../executeStrategy/richExecuteStrategy.js';
 import { getOutput } from '../outputHelpers.js';
-import { extractCdPrefix, isFish, isPowerShell, isWindowsPowerShell, isZsh } from '../runInTerminalHelpers.js';
+import { extractCdPrefix, isFish, isPowerShell, isWindowsPowerShell, isZsh, normalizeTerminalCommandForDisplay } from '../runInTerminalHelpers.js';
 import type { ICommandLinePresenter } from './commandLinePresenter/commandLinePresenter.js';
 import { NodeCommandLinePresenter } from './commandLinePresenter/nodeCommandLinePresenter.js';
 import { PythonCommandLinePresenter } from './commandLinePresenter/pythonCommandLinePresenter.js';
@@ -70,15 +72,16 @@ import { clamp } from '../../../../../../base/common/numbers.js';
 import { IOutputAnalyzer } from './outputAnalyzer.js';
 import { SandboxOutputAnalyzer } from './sandboxOutputAnalyzer.js';
 import { IAgentSessionsService } from '../../../../chat/browser/agentSessions/agentSessionsService.js';
+import { ITerminalSandboxService, type ITerminalSandboxResolvedNetworkDomains } from '../../common/terminalSandboxService.js';
 
 // #region Tool data
 
 const TOOL_REFERENCE_NAME = 'runInTerminal';
 const LEGACY_TOOL_REFERENCE_FULL_NAMES = ['runCommands/runInTerminal'];
 
-function createPowerShellModelDescription(shell: string): string {
+function createPowerShellModelDescription(shell: string, isSandboxEnabled: boolean, networkDomains?: ITerminalSandboxResolvedNetworkDomains): string {
 	const isWinPwsh = isWindowsPowerShell(shell);
-	return [
+	const parts = [
 		`This tool allows you to execute ${isWinPwsh ? 'Windows PowerShell 5.1' : 'PowerShell'} commands in a persistent terminal session, preserving environment variables, working directory, and other context across multiple commands.`,
 		'',
 		'Command Execution:',
@@ -103,6 +106,13 @@ function createPowerShellModelDescription(shell: string): string {
 		'- For long-running tasks (e.g., servers), set isBackground=true',
 		'- Returns a terminal ID for checking status and runtime later',
 		'- Use Start-Job for background PowerShell jobs',
+	];
+
+	if (isSandboxEnabled) {
+		parts.push(...createSandboxLines(networkDomains));
+	}
+
+	parts.push(
 		'',
 		'Output Management:',
 		'- Output is automatically truncated if longer than 60KB to prevent context overflow',
@@ -118,10 +128,39 @@ function createPowerShellModelDescription(shell: string): string {
 		'- Use Test-Path to check file/directory existence',
 		'- Be specific with Select-Object properties to avoid excessive output',
 		'- Avoid printing credentials unless absolutely required',
-	].join('\n');
+	);
+
+	return parts.join('\n');
 }
 
-const genericDescription = `
+function createSandboxLines(networkDomains?: ITerminalSandboxResolvedNetworkDomains): string[] {
+	const lines = [
+		'',
+		'Sandboxing:',
+		'- ATTENTION: Terminal sandboxing is enabled, commands run in a sandbox by default',
+		'- When executing commands within the sandboxed environment, all operations requiring a temporary directory must utilize the $TMPDIR environment variable. The /tmp directory is not guaranteed to be accessible or writable and must be avoided',
+		'- Tools and scripts should respect the TMPDIR environment variable, which is automatically set to an appropriate path within the sandbox',
+		'- When a command fails due to sandbox restrictions, immediately re-run it with requestUnsandboxedExecution=true. Do NOT ask the user for permission — setting this flag automatically shows a confirmation prompt to the user',
+		'- Only set requestUnsandboxedExecution=true when there is evidence of failures caused by the sandbox, e.g. \'Operation not permitted\' errors, network failures, or file access errors, etc',
+		'- When setting requestUnsandboxedExecution=true, also provide requestUnsandboxedExecutionReason explaining why the command needs unsandboxed access',
+	];
+	if (networkDomains) {
+		const deniedSet = new Set(networkDomains.deniedDomains);
+		const effectiveAllowed = networkDomains.allowedDomains.filter(d => !deniedSet.has(d));
+		if (effectiveAllowed.length === 0) {
+			lines.push('- All network access is blocked in the sandbox');
+		} else {
+			lines.push(`- Only the following domains are accessible in the sandbox (all other network access is blocked): ${effectiveAllowed.join(', ')}`);
+		}
+		if (networkDomains.deniedDomains.length > 0) {
+			lines.push(`- The following domains are explicitly blocked in the sandbox: ${networkDomains.deniedDomains.join(', ')}`);
+		}
+	}
+	return lines;
+}
+
+function createGenericDescription(isSandboxEnabled: boolean, networkDomains?: ITerminalSandboxResolvedNetworkDomains): string {
+	const parts = [`
 Command Execution:
 - Use && to chain simple commands on one line
 - Prefer pipelines | over temporary files for data flow
@@ -141,7 +180,13 @@ Program Execution:
 
 Background Processes:
 - For long-running tasks (e.g., servers), set isBackground=true
-- Returns a terminal ID for checking status and runtime later
+- Returns a terminal ID for checking status and runtime later`];
+
+	if (isSandboxEnabled) {
+		parts.push(createSandboxLines(networkDomains).join('\n'));
+	}
+
+	parts.push(`
 
 Output Management:
 - Output is automatically truncated if longer than 60KB to prevent context overflow
@@ -153,22 +198,25 @@ Best Practices:
 - Quote variables: "$var" instead of $var to handle spaces
 - Use find with -exec or xargs for file operations
 - Be specific with commands to avoid excessive output
-- Avoid printing credentials unless absolutely required`;
+- Avoid printing credentials unless absolutely required`);
 
-function createBashModelDescription(): string {
+	return parts.join('');
+}
+
+function createBashModelDescription(isSandboxEnabled: boolean, networkDomains?: ITerminalSandboxResolvedNetworkDomains): string {
 	return [
 		'This tool allows you to execute shell commands in a persistent bash terminal session, preserving environment variables, working directory, and other context across multiple commands.',
-		genericDescription,
+		createGenericDescription(isSandboxEnabled, networkDomains),
 		'- Use [[ ]] for conditional tests instead of [ ]',
 		'- Prefer $() over backticks for command substitution',
 		'- Use set -e at start of complex commands to exit on errors'
 	].join('\n');
 }
 
-function createZshModelDescription(): string {
+function createZshModelDescription(isSandboxEnabled: boolean, networkDomains?: ITerminalSandboxResolvedNetworkDomains): string {
 	return [
 		'This tool allows you to execute shell commands in a persistent zsh terminal session, preserving environment variables, working directory, and other context across multiple commands.',
-		genericDescription,
+		createGenericDescription(isSandboxEnabled, networkDomains),
 		'- Use type to check command type (builtin, function, alias)',
 		'- Use jobs, fg, bg for job control',
 		'- Use [[ ]] for conditional tests instead of [ ]',
@@ -178,10 +226,10 @@ function createZshModelDescription(): string {
 	].join('\n');
 }
 
-function createFishModelDescription(): string {
+function createFishModelDescription(isSandboxEnabled: boolean, networkDomains?: ITerminalSandboxResolvedNetworkDomains): string {
 	return [
 		'This tool allows you to execute shell commands in a persistent fish terminal session, preserving environment variables, working directory, and other context across multiple commands.',
-		genericDescription,
+		createGenericDescription(isSandboxEnabled, networkDomains),
 		'- Use type to check command type (builtin, function, alias)',
 		'- Use jobs, fg, bg for job control',
 		'- Use test expressions for conditionals (no [[ ]] syntax)',
@@ -196,20 +244,26 @@ export async function createRunInTerminalToolData(
 	accessor: ServicesAccessor
 ): Promise<IToolData> {
 	const instantiationService = accessor.get(IInstantiationService);
+	const terminalSandboxService = accessor.get(ITerminalSandboxService);
 
 	const profileFetcher = instantiationService.createInstance(TerminalProfileFetcher);
-	const shell = await profileFetcher.getCopilotShell();
-	const os = await profileFetcher.osBackend;
+	const [shell, os, isSandboxEnabled] = await Promise.all([
+		profileFetcher.getCopilotShell(),
+		profileFetcher.osBackend,
+		terminalSandboxService.isEnabled(),
+	]);
+
+	const networkDomains = isSandboxEnabled ? terminalSandboxService.getResolvedNetworkDomains() : undefined;
 
 	let modelDescription: string;
 	if (shell && os && isPowerShell(shell, os)) {
-		modelDescription = createPowerShellModelDescription(shell);
+		modelDescription = createPowerShellModelDescription(shell, isSandboxEnabled, networkDomains);
 	} else if (shell && os && isZsh(shell, os)) {
-		modelDescription = createZshModelDescription();
+		modelDescription = createZshModelDescription(isSandboxEnabled, networkDomains);
 	} else if (shell && os && isFish(shell, os)) {
-		modelDescription = createFishModelDescription();
+		modelDescription = createFishModelDescription(isSandboxEnabled, networkDomains);
 	} else {
-		modelDescription = createBashModelDescription();
+		modelDescription = createBashModelDescription(isSandboxEnabled, networkDomains);
 	}
 
 	return {
@@ -242,8 +296,18 @@ export async function createRunInTerminalToolData(
 				},
 				timeout: {
 					type: 'number',
-					description: 'An optional timeout in milliseconds. When provided, the tool will stop tracking the command after this duration and return the output collected so far. Be conservative with the timeout duration, give enough time that the command would complete on a low-end machine. Use 0 for no timeout. If it\'s not clear how long the command will take then use 0 to avoid prematurely terminating it, never guess too low.',
+					description: 'An optional timeout in milliseconds. When provided, the tool will stop tracking the command after this duration and return the output collected so far with a timeout indicator. Be conservative with the timeout duration, give enough time that the command would complete on a low-end machine. Use 0 for no timeout. If it\'s not clear how long the command will take then use 0 to avoid prematurely terminating it, never guess too low.',
 				},
+				...isSandboxEnabled ? {
+					requestUnsandboxedExecution: {
+						type: 'boolean',
+						description: 'Request that this command run outside the terminal sandbox. Only set this when the command clearly needs unsandboxed access. The user will be prompted before the command runs unsandboxed.'
+					},
+					requestUnsandboxedExecutionReason: {
+						type: 'string',
+						description: 'A short explanation of why this command must run outside the terminal sandbox. Only provide this when requestUnsandboxedExecution is true.'
+					},
+				} : {},
 			},
 			required: [
 				'command',
@@ -277,6 +341,8 @@ export interface IRunInTerminalInputParams {
 	goal: string;
 	isBackground: boolean;
 	timeout?: number;
+	requestUnsandboxedExecution?: boolean;
+	requestUnsandboxedExecutionReason?: string;
 }
 
 /**
@@ -362,10 +428,20 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		RunInTerminalTool._activeExecutions.delete(id);
 		return true;
 	}
-
+	/**
+	 * Controls whether this tool wires up sandbox-specific command-line
+	 * behavior, including both the {@link CommandLineSandboxRewriter} and the
+	 * {@link CommandLineSandboxAnalyzer}. This is separate from
+	 * ITerminalSandboxService.isEnabled(), which reports whether terminal
+	 * sandboxing is currently enabled for the running window.
+	 */
+	protected get _enableCommandLineSandboxRewriting() {
+		return true;
+	}
 	constructor(
 		@IChatService protected readonly _chatService: IChatService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
 		@IHistoryService private readonly _historyService: IHistoryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ILabelService private readonly _labelService: ILabelService,
@@ -375,6 +451,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
+		@ITerminalSandboxService private readonly _terminalSandboxService: ITerminalSandboxService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
@@ -392,14 +469,20 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		this._commandLineRewriters = [
 			this._register(this._instantiationService.createInstance(CommandLineCdPrefixRewriter)),
 			this._register(this._instantiationService.createInstance(CommandLinePwshChainOperatorRewriter, this._treeSitterCommandParser)),
-			this._register(this._instantiationService.createInstance(CommandLinePreventHistoryRewriter)),
-			this._register(this._instantiationService.createInstance(CommandLineSandboxRewriter)),
 		];
+		if (this._enableCommandLineSandboxRewriting) {
+			this._commandLineRewriters.push(this._register(this._instantiationService.createInstance(CommandLineSandboxRewriter)));
+		}
+		// PreventHistoryRewriter must be last so the leading space is applied to the final
+		// command, including any sandbox wrapping.
+		this._commandLineRewriters.push(this._register(this._instantiationService.createInstance(CommandLinePreventHistoryRewriter)));
 		this._commandLineAnalyzers = [
 			this._register(this._instantiationService.createInstance(CommandLineFileWriteAnalyzer, this._treeSitterCommandParser, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineFileWriteAnalyzer: ${message}`, args))),
 			this._register(this._instantiationService.createInstance(CommandLineAutoApproveAnalyzer, this._treeSitterCommandParser, this._telemetry, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineAutoApproveAnalyzer: ${message}`, args))),
-			this._register(this._instantiationService.createInstance(CommandLineSandboxAnalyzer)),
 		];
+		if (this._enableCommandLineSandboxRewriting) {
+			this._commandLineAnalyzers.push(this._register(this._instantiationService.createInstance(CommandLineSandboxAnalyzer)));
+		}
 		this._commandLinePresenters = [
 			this._instantiationService.createInstance(SandboxedCommandLinePresenter),
 			new NodeCommandLinePresenter(),
@@ -434,6 +517,21 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 	}
 
+	async handleToolStream(context: IToolInvocationStreamContext, _token: CancellationToken): Promise<IStreamedToolInvocation | undefined> {
+		const partialInput = context.rawInput as Partial<IRunInTerminalInputParams> | undefined;
+		if (partialInput && typeof partialInput === 'object' && partialInput.command) {
+			const normalizedCommand = normalizeTerminalCommandForDisplay(partialInput.command).replace(/\r\n|\r|\n/g, ' ');
+			const truncatedCommand = normalizedCommand.length > 80
+				? normalizedCommand.substring(0, 77) + '...'
+				: normalizedCommand;
+			const invocationMessage = partialInput.isBackground
+				? new MarkdownString(localize('runInTerminal.streaming.background', "Running `{0}` in background", truncatedCommand))
+				: new MarkdownString(localize('runInTerminal.streaming', "Running `{0}`", truncatedCommand));
+			return { invocationMessage };
+		}
+		return { invocationMessage: localize('runInTerminal.streaming.default', "Running command") };
+	}
+
 	async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
 		const args = context.parameters as IRunInTerminalInputParams;
 
@@ -445,7 +543,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				instance = toolTerminal.instance;
 			}
 		}
-		const [os, shell, cwd] = await Promise.all([
+		const [os, shell, cwd, isTerminalSandboxEnabled] = await Promise.all([
 			this._osBackend,
 			this._profileFetcher.getCopilotShell(),
 			(async () => {
@@ -456,9 +554,11 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 					cwd = workspaceFolder?.uri;
 				}
 				return cwd;
-			})()
+			})(),
+			this._terminalSandboxService.isEnabled()
 		]);
 		const language = os === OperatingSystem.Windows ? 'pwsh' : 'sh';
+		const requiresUnsandboxConfirmation = isTerminalSandboxEnabled && args.requestUnsandboxedExecution === true;
 
 		const terminalToolSessionId = generateUuid();
 		// Generate a custom command ID to link the command between renderer and pty host
@@ -466,16 +566,21 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 		let rewrittenCommand: string | undefined = args.command;
 		let forDisplayCommand: string | undefined = undefined;
+		let isSandboxWrapped = false;
 		for (const rewriter of this._commandLineRewriters) {
 			const rewriteResult = await rewriter.rewrite({
 				commandLine: rewrittenCommand,
 				cwd,
 				shell,
-				os
+				os,
+				requestUnsandboxedExecution: requiresUnsandboxConfirmation,
 			});
 			if (rewriteResult) {
 				rewrittenCommand = rewriteResult.rewritten;
-				forDisplayCommand = rewriteResult.forDisplay;
+				forDisplayCommand = rewriteResult.forDisplay ?? forDisplayCommand;
+				if (rewriteResult.isSandboxWrapped) {
+					isSandboxWrapped = true;
+				}
 				this._logService.info(`RunInTerminalTool: Command rewritten by ${rewriter.constructor.name}: ${rewriteResult.reasoning}`);
 			}
 		}
@@ -487,11 +592,14 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			commandLine: {
 				original: args.command,
 				toolEdited: rewrittenCommand === args.command ? undefined : rewrittenCommand,
-				forDisplay: forDisplayCommand,
+				forDisplay: forDisplayCommand ?? normalizeTerminalCommandForDisplay(rewrittenCommand ?? args.command),
+				isSandboxWrapped,
 			},
 			cwd,
 			language,
 			isBackground: args.isBackground,
+			requestUnsandboxedExecution: requiresUnsandboxConfirmation,
+			requestUnsandboxedExecutionReason: args.requestUnsandboxedExecutionReason,
 		};
 
 		// HACK: Exit early if there's an alternative recommendation, this is a little hacky but
@@ -537,8 +645,16 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			treeSitterLanguage: isPowerShell(shell, os) ? TreeSitterCommandParserLanguage.PowerShell : TreeSitterCommandParserLanguage.Bash,
 			terminalToolSessionId,
 			chatSessionResource,
+			requiresUnsandboxConfirmation,
 		};
-		const commandLineAnalyzerResults = await Promise.all(this._commandLineAnalyzers.map(e => e.analyze(commandLineAnalyzerOptions)));
+
+		// In Autopilot/Bypass Approvals modes, do not interact with terminal auto-approve rules.
+		// Commands should flow through directly based on the chat permission level.
+		const isSessionAutoApproved = chatSessionResource && this._isSessionAutoApproveLevel(chatSessionResource);
+		const commandLineAnalyzers = isSessionAutoApproved
+			? this._commandLineAnalyzers.filter(e => !(e instanceof CommandLineAutoApproveAnalyzer))
+			: this._commandLineAnalyzers;
+		const commandLineAnalyzerResults = await Promise.all(commandLineAnalyzers.map(e => e.analyze(commandLineAnalyzerOptions)));
 
 		const disclaimersRaw = commandLineAnalyzerResults.map(e => e.disclaimers).filter(e => !!e).flatMap(e => e);
 		let disclaimer: IMarkdownString | undefined;
@@ -587,7 +703,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		// Extract cd prefix for display - show directory in title, command suffix in editor
-		const commandToDisplay = (toolSpecificData.commandLine.userEdited ?? toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original).trimStart();
+		const commandToDisplay = (toolSpecificData.commandLine.forDisplay ?? toolSpecificData.commandLine.userEdited ?? toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original).trimStart();
 		const extractedCd = extractCdPrefix(commandToDisplay, shell, os);
 		let confirmationTitle: string;
 		if (extractedCd && cwd) {
@@ -646,20 +762,47 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			}
 		}
 
-		// Check if the session's permission level (Autopilot/Bypass Approvals) auto-approves all tools.
-		// When active, skip terminal confirmation entirely since the user has opted into full auto-approval.
-		const isSessionAutoApproved = chatSessionResource && this._isSessionAutoApproveLevel(chatSessionResource);
+		if (requiresUnsandboxConfirmation) {
+			confirmationTitle = args.isBackground
+				? localize('runInTerminal.unsandboxed.background', "Run `{0}` command outside the sandbox in background?", shellType)
+				: localize('runInTerminal.unsandboxed', "Run `{0}` command outside the sandbox?", shellType);
+		}
 
 		// If forceConfirmationReason is set, always show confirmation regardless of auto-approval
 		const shouldShowConfirmation = (!isFinalAutoApproved && !isSessionAutoApproved) || context.forceConfirmationReason !== undefined;
+		const confirmationMessage = requiresUnsandboxConfirmation
+			? new MarkdownString(localize(
+				'runInTerminal.unsandboxed.confirmationMessage',
+				"Explanation: {0}\n\nGoal: {1}\n\nReason for leaving the sandbox: {2}",
+				args.explanation,
+				args.goal,
+				args.requestUnsandboxedExecutionReason || localize('runInTerminal.unsandboxed.confirmationMessage.defaultReason', "The model indicated that this command needs unsandboxed access.")
+			))
+			: new MarkdownString(localize('runInTerminal.confirmationMessage', "Explanation: {0}\n\nGoal: {1}", args.explanation, args.goal));
 		const confirmationMessages = shouldShowConfirmation ? {
 			title: confirmationTitle,
-			message: new MarkdownString(localize('runInTerminal.confirmationMessage', "Explanation: {0}\n\nGoal: {1}", args.explanation, args.goal)),
+			message: confirmationMessage,
 			disclaimer,
+			allowAutoConfirm: undefined,
 			terminalCustomActions: customActions,
 		} : undefined;
 
+		const rawDisplayCommand = toolSpecificData.commandLine.forDisplay ?? toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original;
+		const displayCommand = rawDisplayCommand.length > 80
+			? rawDisplayCommand.substring(0, 77) + '...'
+			: rawDisplayCommand;
+		const escapedDisplayCommand = escapeMarkdownSyntaxTokens(displayCommand);
+		const invocationMessage = toolSpecificData.commandLine.isSandboxWrapped
+			? args.isBackground
+				? new MarkdownString(localize('runInTerminal.invocation.sandbox.background', "Running `{0}` in sandbox in background", escapedDisplayCommand))
+				: new MarkdownString(localize('runInTerminal.invocation.sandbox', "Running `{0}` in sandbox", escapedDisplayCommand))
+			: args.isBackground
+				? new MarkdownString(localize('runInTerminal.invocation.background', "Running `{0}` in background", escapedDisplayCommand))
+				: new MarkdownString(localize('runInTerminal.invocation', "Running `{0}`", escapedDisplayCommand));
+
 		return {
+			invocationMessage,
+			icon: toolSpecificData.commandLine.isSandboxWrapped ? Codicon.terminalSecure : Codicon.terminal,
 			confirmationMessages,
 			toolSpecificData,
 		};
@@ -721,9 +864,15 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		const didToolEditCommand = (
 			!didUserEditCommand &&
 			toolSpecificData.commandLine.toolEdited !== undefined &&
-			toolSpecificData.commandLine.toolEdited !== toolSpecificData.commandLine.original
+			toolSpecificData.commandLine.toolEdited !== toolSpecificData.commandLine.original &&
+			// Only consider it a meaningful edit if the display form also differs from the
+			// original. Cosmetic rewrites like prepending a space to prevent shell history
+			// should not trigger the "tool simplified the command" note.
+			normalizeTerminalCommandForDisplay(toolSpecificData.commandLine.toolEdited).trim() !== normalizeTerminalCommandForDisplay(toolSpecificData.commandLine.original).trim()
 		);
 
+		const didSandboxWrapCommand = toolSpecificData.commandLine.isSandboxWrapped === true;
+
 		if (token.isCancellationRequested) {
 			throw new CancellationError();
 		}
@@ -769,6 +918,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		let didTimeout = false;
 		let didMoveToBackground = args.isBackground;
 		let timeoutPromise: CancelablePromise<void> | undefined;
+		let timeoutRacePromise: Promise<{ type: 'timeout' }> | undefined;
 		let outputMonitor: OutputMonitor | undefined;
 		let pollingResult: IPollingResult & { pollDurationMs: number } | undefined;
 		const executeCancellation = store.add(new CancellationTokenSource(token));
@@ -779,12 +929,9 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			const shouldEnforceTimeout = this._configurationService.getValue(TerminalChatAgentToolsSettingId.EnforceTimeoutFromModel) === true;
 			if (shouldEnforceTimeout) {
 				timeoutPromise = timeout(timeoutValue);
-				timeoutPromise.then(() => {
-					if (!executeCancellation.token.isCancellationRequested) {
-						didTimeout = true;
-						executeCancellation.cancel();
-					}
-				});
+				timeoutRacePromise = timeoutPromise.then(
+					() => ({ type: 'timeout' as const })
+				).catch(() => ({ type: 'timeout' as const }));
 			}
 		}
 
@@ -823,7 +970,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			if (toolTerminal.shellIntegrationQuality === ShellIntegrationQuality.None) {
 				toolResultMessage = '$(info) Enable [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) to improve command detection';
 			}
-			this._logService.debug(`RunInTerminalTool: Using \`${execution.strategy.type}\` execute strategy for command \`${command}\``);
+			this._logService.info(`RunInTerminalTool: Using \`${execution.strategy.type}\` execute strategy for command \`${command}\``);
 			store.add(execution);
 			RunInTerminalTool._activeExecutions.set(termId, execution);
 
@@ -867,22 +1014,38 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				state.timestamp = state.timestamp ?? timingStart;
 				toolSpecificData.terminalCommandState = state;
 
+				// if the command is wrapped in a sandbox, we will not show the command. This is because the sandbox may add additional commands that are not relevant to the user, and the output will provide more context about what is running.
 				let resultText = (
-					didUserEditCommand
-						? `Note: The user manually edited the command to \`${command}\`, and that command is now running in terminal with ID=${termId}`
-						: didToolEditCommand
-							? `Note: The tool simplified the command to \`${command}\`, and that command is now running in terminal with ID=${termId}`
-							: `Command is running in terminal with ID=${termId}`
+					didSandboxWrapCommand ? `Command is now running in terminal with ID=${termId}`
+						: didUserEditCommand
+							? `Note: The user manually edited the command to \`${command}\`, and that command is now running in terminal with ID=${termId}`
+							: didToolEditCommand
+								? `Note: The tool simplified the command to \`${command}\`, and that command is now running in terminal with ID=${termId}`
+								: `Command is running in terminal with ID=${termId}`
 				);
+				const backgroundOutput = pollingResult?.modelOutputEvalResponse ?? pollingResult?.output;
+				const outputAnalyzerMessage = backgroundOutput
+					? await this._getOutputAnalyzerMessage(undefined, backgroundOutput, command, didSandboxWrapCommand)
+					: undefined;
 				if (pollingResult && pollingResult.modelOutputEvalResponse) {
-					resultText += `\n\ The command became idle with output:\n${pollingResult.modelOutputEvalResponse}`;
+					resultText += `\n\ The command became idle with output:\n`;
+					if (outputAnalyzerMessage) {
+						resultText += `${outputAnalyzerMessage}\n`;
+					}
+					resultText += pollingResult.modelOutputEvalResponse;
 				} else if (pollingResult) {
-					resultText += `\n\ The command is still running, with output:\n${pollingResult.output}`;
+					resultText += `\n\ The command is still running, with output:\n`;
+					if (outputAnalyzerMessage) {
+						resultText += `${outputAnalyzerMessage}\n`;
+					}
+					resultText += pollingResult.output;
 				}
-
+				const endCwd = await toolTerminal.instance.getCwdResource();
 				return {
 					toolMetadata: {
-						exitCode: undefined // Background processes don't have immediate exit codes
+						exitCode: undefined, // Background processes don't have immediate exit codes
+						id: termId,
+						cwd: endCwd?.toString(),
 					},
 					content: [{
 						kind: 'text',
@@ -891,10 +1054,14 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				};
 			} else {
 				// Foreground mode: race execution completion against continue in background
-				const raceResult = await Promise.race([
+				const raceCandidates: Promise<{ type: 'completed'; result: ITerminalExecuteStrategyResult } | { type: 'background' } | { type: 'timeout' }>[] = [
 					executionPromise.then(result => ({ type: 'completed' as const, result })),
 					continueInBackgroundPromise.then(() => ({ type: 'background' as const }))
-				]);
+				];
+				if (timeoutRacePromise) {
+					raceCandidates.push(timeoutRacePromise);
+				}
+				const raceResult = await Promise.race(raceCandidates);
 
 				if (raceResult.type === 'background') {
 					// Moved to background - execution continues running, just return current output
@@ -903,6 +1070,18 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 					const backgroundOutput = execution.getOutput();
 					outputLineCount = backgroundOutput ? count(backgroundOutput.trim(), '\n') + 1 : 0;
 					terminalResult = backgroundOutput;
+				} else if (raceResult.type === 'timeout') {
+					// Timeout reached - return partial output and keep terminal alive as background.
+					this._logService.debug(`RunInTerminalTool: Timeout reached, returning output collected so far`);
+					error = 'timeout';
+					didTimeout = true;
+					didMoveToBackground = true;
+					toolTerminal.isBackground = true;
+					this._sessionTerminalAssociations.delete(chatSessionResource);
+					await this._associateProcessIdWithSession(toolTerminal.instance, chatSessionResource, termId, toolTerminal.shellIntegrationQuality, true);
+					const timeoutOutput = execution.getOutput();
+					outputLineCount = timeoutOutput ? count(timeoutOutput.trim(), '\n') + 1 : 0;
+					terminalResult = timeoutOutput ?? '';
 				} else {
 					const executeResult = raceResult.result;
 					// Reset user input state after command execution completes
@@ -918,10 +1097,13 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 						toolResultMessage = altBufferMessage;
 						outputLineCount = 0;
 						error = executeResult.error ?? 'alternateBuffer';
+						const altBufferCwd = await toolTerminal.instance.getCwdResource();
 						altBufferResult = {
 							toolResultMessage,
 							toolMetadata: {
-								exitCode: undefined
+								exitCode: undefined,
+								id: termId,
+								cwd: altBufferCwd?.toString(),
 							},
 							content: [{
 								kind: 'text',
@@ -942,7 +1124,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 							toolSpecificData.terminalCommandState = state;
 						}
 
-						this._logService.debug(`RunInTerminalTool: Finished \`${execution.strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
+						this._logService.info(`RunInTerminalTool: Finished \`${execution.strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
 						outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output.trim(), '\n') + 1;
 						exitCode = executeResult.exitCode;
 						error = executeResult.error;
@@ -963,6 +1145,9 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			if (didTimeout && e instanceof CancellationError) {
 				this._logService.debug(`RunInTerminalTool: Timeout reached, returning output collected so far`);
 				error = 'timeout';
+				didMoveToBackground = true;
+				toolTerminal.isBackground = true;
+				this._sessionTerminalAssociations.delete(chatSessionResource);
 				const timeoutOutput = getOutput(toolTerminal.instance, undefined);
 				outputLineCount = timeoutOutput ? count(timeoutOutput.trim(), '\n') + 1 : 0;
 				terminalResult = timeoutOutput ?? '';
@@ -1009,6 +1194,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				didUserEditCommand,
 				didToolEditCommand,
 				isBackground: args.isBackground,
+				isSandboxWrapped: toolSpecificData.commandLine.isSandboxWrapped === true,
 				shellIntegrationQuality: toolTerminal.shellIntegrationQuality,
 				error,
 				isNewSession,
@@ -1036,45 +1222,126 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		const resultText: string[] = [];
-		if (didUserEditCommand) {
-			resultText.push(`Note: The user manually edited the command to \`${command}\`, and this is the output of running that command instead:\n`);
-		} else if (didToolEditCommand) {
-			resultText.push(`Note: The tool simplified the command to \`${command}\`, and this is the output of running that command instead:\n`);
-		}
-		if (didMoveToBackground && !args.isBackground) {
-			resultText.push(`Note: This terminal execution was moved to the background using the ID ${termId}\n`);
-		}
-		let outputAnalyzerMessage: string | undefined;
-		for (const analyzer of this._outputAnalyzers) {
-			const message = await analyzer.analyze({ exitCode, exitResult: terminalResult, commandLine: command });
-			if (message) {
-				outputAnalyzerMessage = message;
-				break;
+		if (!didSandboxWrapCommand) {
+			if (didUserEditCommand) {
+				resultText.push(`Note: The user manually edited the command to \`${command}\`, and this is the output of running that command instead:\n`);
+			} else if (didToolEditCommand) {
+				resultText.push(`Note: The tool simplified the command to \`${command}\`, and this is the output of running that command instead:\n`);
+			}
+			if (didMoveToBackground && !args.isBackground) {
+				resultText.push(`Note: This terminal execution was moved to the background using the ID ${termId}\n`);
 			}
 		}
+		if (didTimeout && timeoutValue !== undefined && timeoutValue > 0) {
+			resultText.push(`Note: Command timed out after ${timeoutValue}ms. Output collected so far is shown below and the command may still be running in terminal ID ${termId}.\n\n`);
+		}
+		const outputAnalyzerMessage = await this._getOutputAnalyzerMessage(exitCode, terminalResult, command, didSandboxWrapCommand);
 		if (outputAnalyzerMessage) {
 			resultText.push(`${outputAnalyzerMessage}\n`);
 		}
 		resultText.push(terminalResult);
 
 		const isError = exitCode !== undefined && exitCode !== 0;
+		const endCwd = await toolTerminal.instance.getCwdResource();
+
+		const imageContent = await this._extractImagesFromOutput(terminalResult, endCwd);
+
 		return {
 			toolResultMessage,
 			toolMetadata: {
-				exitCode: exitCode
+				exitCode: exitCode,
+				id: termId,
+				cwd: endCwd?.toString(),
+				timedOut: didTimeout || undefined,
+				timeoutMs: didTimeout ? timeoutValue : undefined,
 			},
 			toolResultDetails: isError ? {
 				input: command,
 				output: [{ type: 'embed', isText: true, value: terminalResult }],
 				isError: true
 			} : undefined,
-			content: [{
-				kind: 'text',
-				value: resultText.join(''),
-			}]
+			content: [
+				{
+					kind: 'text',
+					value: resultText.join(''),
+				},
+				...imageContent,
+			]
 		};
 	}
 
+	private async _getOutputAnalyzerMessage(exitCode: number | undefined, exitResult: string, commandLine: string, isSandboxWrapped: boolean): Promise<string | undefined> {
+		for (const analyzer of this._outputAnalyzers) {
+			const message = await analyzer.analyze({ exitCode, exitResult, commandLine, isSandboxWrapped });
+			if (message) {
+				return message;
+			}
+		}
+
+		return undefined;
+	}
+
+	private static readonly _maxImageFileSize = 5 * 1024 * 1024;
+
+	/**
+	 * Scans terminal output for file paths that point to images and reads them.
+	 * Returns data content parts for any found images that exist on disk.
+	 */
+	private async _extractImagesFromOutput(output: string, cwd: URI | undefined): Promise<IToolResult['content']> {
+		const normalizedOutput = output.replace(/\r?\n/g, '');
+
+		// Match paths ending with image extensions. A leading / or \ is sufficient
+		// to identify a path segment; the full path up to the extension is captured.
+		const pathPattern = /(?:[^\s]*[\/\\][^\s]*\.(?:png|jpe?g|gif|webp|bmp))/gi;
+
+		const matches = new Set<string>();
+		for (const match of normalizedOutput.matchAll(pathPattern)) {
+			matches.add(match[0]);
+		}
+
+		if (matches.size === 0) {
+			return [];
+		}
+
+		const results: IToolResult['content'] = [];
+		for (const filePath of matches) {
+			try {
+				const mimeType = getMediaMime(filePath);
+				if (!mimeType || !mimeType.startsWith('image/')) {
+					continue;
+				}
+
+				// Resolve the URI - check for absolute path (Unix / or Windows drive letter)
+				let fileUri: URI;
+				if (/^\/|^[A-Za-z]:[\\\/]/.test(filePath)) {
+					fileUri = URI.file(filePath);
+				} else if (cwd) {
+					fileUri = URI.joinPath(cwd, filePath);
+				} else {
+					continue;
+				}
+
+				const stat = await this._fileService.stat(fileUri).catch(() => undefined);
+				if (!stat || stat.isDirectory || stat.size > RunInTerminalTool._maxImageFileSize) {
+					continue;
+				}
+
+				const fileContent = await this._fileService.readFile(fileUri);
+				results.push({
+					kind: 'data',
+					value: {
+						mimeType,
+						data: fileContent.value,
+					},
+				});
+			} catch {
+				// Ignore files that can't be read
+			}
+		}
+
+		return results;
+	}
+
 	private _handleTerminalVisibility(toolTerminal: IToolTerminal, chatSessionResource: URI) {
 		const chatSessionOpenInWidget = !!this._chatWidgetService.getWidgetBySessionResource(chatSessionResource);
 		if (this._configurationService.getValue(TerminalChatAgentToolsSettingId.OutputLocation) === 'terminal' && chatSessionOpenInWidget) {
@@ -1449,6 +1716,15 @@ export class TerminalProfileFetcher {
 			};
 		}
 
+		// Force bash over sh as sh doesn't have shell integration
+		if (defaultProfile.path === '/bin/sh') {
+			return {
+				...defaultProfile,
+				path: '/bin/bash',
+				profileName: 'bash',
+			};
+		}
+
 		// Setting icon: undefined allows the system to use the default AI terminal icon (not overridden or removed)
 		return { ...defaultProfile, icon: undefined };
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sandboxOutputAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sandboxOutputAnalyzer.ts
index adb2d2dd24e..684fcf2051e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sandboxOutputAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/sandboxOutputAnalyzer.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from '../../../../../../nls.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
 import { ITerminalSandboxService } from '../../common/terminalSandboxService.js';
 import type { IOutputAnalyzer, IOutputAnalyzerOptions } from './outputAnalyzer.js';
 import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
@@ -17,19 +17,50 @@ export class SandboxOutputAnalyzer extends Disposable implements IOutputAnalyzer
 	}
 
 	async analyze(options: IOutputAnalyzerOptions): Promise<string | undefined> {
-		if (options.exitCode === undefined || options.exitCode === 0) {
-			return undefined;
-		}
-		if (!(await this._sandboxService.isEnabled())) {
+		if (!options.isSandboxWrapped) {
 			return undefined;
 		}
 
-		return localize(
-			'runInTerminalTool.sandboxCommandFailed',
-			"Command failed while running in sandboxed mode. Use the command result to determine the scenario. If the issue is filesystem permissions, update allowWrite in {0} (Linux) or {1} (macOS). If the issue is domain/network related, add the required domains to {2}.allowedDomains.",
-			TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem,
-			TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem,
-			TerminalChatAgentToolsSettingId.TerminalSandboxNetwork
-		);
+		const knownFailure = options.exitCode !== undefined && options.exitCode !== 0;
+		const suspectedFailure = !knownFailure && options.exitCode === undefined && this._outputLooksSandboxBlocked(options.exitResult);
+
+		if (!knownFailure && !suspectedFailure) {
+			return undefined;
+		}
+
+		const os = await this._sandboxService.getOS();
+		const fileSystemSetting = os === OperatingSystem.Linux
+			? TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem
+			: TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem;
+
+		const prefix = knownFailure
+			? 'Command failed while running in sandboxed mode. If the command failed due to sandboxing:'
+			: 'Command ran in sandboxed mode and may have been blocked by the sandbox. If the command failed due to sandboxing:';
+		return `${prefix}
+- If it would be reasonable to extend the sandbox rules, work with the user to update allowWrite for file system access problems in ${fileSystemSetting}, or to add required domains to ${TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains}.
+- Otherwise, immediately retry the command with requestUnsandboxedExecution=true. Do NOT ask the user — setting this flag automatically shows a confirmation prompt to the user.
+
+Here is the output of the command:\n`;
+	}
+
+	/**
+	 * Checks whether the command output contains strings that typically indicate
+	 * the sandbox blocked the operation. Used when exit code is unavailable.
+	 *
+	 * The output may contain newlines inserted by terminal wrapping, so we
+	 * strip them before testing.
+	 */
+	private _outputLooksSandboxBlocked(output: string): boolean {
+		return outputLooksSandboxBlocked(output);
 	}
 }
+
+/**
+ * Checks whether the command output contains strings that typically indicate
+ * the sandbox blocked the operation. The output may contain newlines inserted
+ * by terminal wrapping, so we strip them before testing.
+ */
+export function outputLooksSandboxBlocked(output: string): boolean {
+	const normalized = output.replace(/\n/g, ' ');
+	return /Operation not permitted|Permission denied|Read-only file system|sandbox-exec|bwrap|sandbox_violation/i.test(normalized);
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
index 5913bb7d17e..d595ccbd527 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
@@ -97,30 +97,50 @@ export class CreateAndRunTaskTool implements IToolImpl {
 			return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: new MarkdownString(localize('copilotChat.taskNotFound', 'Task not found: `{0}`', args.task.label)) };
 		}
 
-		_progress.report({ message: new MarkdownString(localize('copilotChat.runningTask', 'Running task `{0}`', args.task.label)) });
-		const raceResult = await Promise.race([this._tasksService.run(task, undefined, TaskRunSource.ChatAgent), timeout(3000)]);
-		const result: ITaskSummary | undefined = raceResult && typeof raceResult === 'object' ? raceResult as ITaskSummary : undefined;
+		const preRunMarkersStore = new DisposableStore();
+		let result: ITaskSummary | undefined;
+		let terminalResults: Awaited<ReturnType<typeof collectTerminalResults>> = [];
+		try {
+			const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
+			const startMarkersByTerminalInstanceId = new Map<number, ReturnType<ITerminalInstance['registerMarker']>>();
+			for (const terminal of this._terminalService.instances) {
+				const marker = terminal.registerMarker();
+				startMarkersByTerminalInstanceId.set(terminal.instanceId, marker);
+				if (marker) {
+					preRunMarkersStore.add(marker);
+				}
+			}
 
-		const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
-		const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
-		const terminals = resources?.map(resource => this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme)).filter(Boolean) as ITerminalInstance[];
-		if (!terminals || terminals.length === 0) {
-			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${args.task.label}` }], toolResultMessage: new MarkdownString(localize('copilotChat.noTerminal', 'Task started but no terminal was found for: `{0}`', args.task.label)) };
+			_progress.report({ message: new MarkdownString(localize('copilotChat.runningTask', 'Running task `{0}`', args.task.label)) });
+			const raceResult = await Promise.race([this._tasksService.run(task, undefined, TaskRunSource.ChatAgent), timeout(3000)]);
+			result = raceResult && typeof raceResult === 'object' ? raceResult as ITaskSummary : undefined;
+
+			const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
+			const terminals = resources?.map(resource => this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme)).filter(Boolean) as ITerminalInstance[];
+			if (!terminals || terminals.length === 0) {
+				return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${args.task.label}` }], toolResultMessage: new MarkdownString(localize('copilotChat.noTerminal', 'Task started but no terminal was found for: `{0}`', args.task.label)) };
+			}
+			const store = new DisposableStore();
+			try {
+				terminalResults = await collectTerminalResults(
+					terminals,
+					task,
+					this._instantiationService,
+					invocation.context!,
+					_progress,
+					token,
+					store,
+					(terminalTask) => this._isTaskActive(terminalTask),
+					dependencyTasks,
+					this._tasksService,
+					startMarkersByTerminalInstanceId
+				);
+			} finally {
+				store.dispose();
+			}
+		} finally {
+			preRunMarkersStore.dispose();
 		}
-		const store = new DisposableStore();
-		const terminalResults = await collectTerminalResults(
-			terminals,
-			task,
-			this._instantiationService,
-			invocation.context!,
-			_progress,
-			token,
-			store,
-			(terminalTask) => this._isTaskActive(terminalTask),
-			dependencyTasks,
-			this._tasksService
-		);
-		store.dispose();
 		for (const r of terminalResults) {
 			this._telemetryService.publicLog2?.<TaskToolEvent, TaskToolClassification>('copilotChat.runTaskTool.createAndRunTask', {
 				taskId: args.task.label,
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
index 757aabd617b..c365803393b 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { IMarker as IXtermMarker } from '@xterm/xterm';
 import type { CancellationToken } from '../../../../../../../base/common/cancellation.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore } from '../../../../../../../base/common/lifecycle.js';
@@ -95,43 +96,56 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 		if (!terminals || terminals.length === 0) {
 			return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('copilotChat.terminalNotFound', 'Terminal not found for task \`{0}\`', taskLabel)) };
 		}
-		const store = new DisposableStore();
-		const terminalResults = await collectTerminalResults(
-			terminals,
-			task,
-			this._instantiationService,
-			invocation.context!,
-			_progress,
-			token,
-			store,
-			(terminalTask) => this._isTaskActive(terminalTask),
-			dependencyTasks,
-			this._tasksService
-		);
-		store.dispose();
-		for (const r of terminalResults) {
-			this._telemetryService.publicLog2?.<TaskToolEvent, TaskToolClassification>('copilotChat.getTaskOutputTool.get', {
-				taskId: args.id,
-				bufferLength: r.output.length ?? 0,
-				pollDurationMs: r.pollDurationMs ?? 0,
-				inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
-				inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
-				inputToolManualChars: r.inputToolManualChars ?? 0,
-				inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
-				inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0,
-				inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0
-			});
+		const startMarkersByTerminalInstanceId = task.configurationProperties.isBackground
+			? new Map<number, IXtermMarker | undefined>()
+			: undefined;
+		if (startMarkersByTerminalInstanceId) {
+			// Background/watch tasks should read their current buffer when queried after start.
+			for (const terminal of terminals) {
+				startMarkersByTerminalInstanceId.set(terminal.instanceId, undefined);
+			}
 		}
-		const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
-		const uniqueDetails = Array.from(new Set(details)).join('\n\n');
-		const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-		const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults, true, task.configurationProperties.isBackground);
+		const store = new DisposableStore();
+		try {
+			const terminalResults = await collectTerminalResults(
+				terminals,
+				task,
+				this._instantiationService,
+				invocation.context!,
+				_progress,
+				token,
+				store,
+				(terminalTask) => this._isTaskActive(terminalTask),
+				dependencyTasks,
+				this._tasksService,
+				startMarkersByTerminalInstanceId
+			);
+			for (const r of terminalResults) {
+				this._telemetryService.publicLog2?.<TaskToolEvent, TaskToolClassification>('copilotChat.getTaskOutputTool.get', {
+					taskId: args.id,
+					bufferLength: r.output.length ?? 0,
+					pollDurationMs: r.pollDurationMs ?? 0,
+					inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
+					inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
+					inputToolManualChars: r.inputToolManualChars ?? 0,
+					inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+					inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0,
+					inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0
+				});
+			}
+			const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
+			const uniqueDetails = Array.from(new Set(details)).join('\n\n');
+			const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
+			const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults, true, task.configurationProperties.isBackground);
 
-		return {
-			content: [{ kind: 'text', value: uniqueDetails }],
-			toolResultMessage,
-			toolResultDetails
-		};
+			return {
+				content: [{ kind: 'text', value: uniqueDetails }],
+				toolResultMessage,
+				toolResultDetails
+			};
+		} finally {
+			store.dispose();
+		}
 	}
 	private async _isTaskActive(task: Task): Promise<boolean> {
 		const busyTasks = await this._tasksService.getBusyTasks();
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts
index f469f6eb502..67a6d43be45 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts
@@ -10,7 +10,7 @@ import { ITelemetryService } from '../../../../../../../platform/telemetry/commo
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../../../../chat/common/tools/languageModelToolsService.js';
 import { ITaskService, ITaskSummary, Task, TasksAvailableContext } from '../../../../../tasks/common/taskService.js';
 import { TaskRunSource } from '../../../../../tasks/common/tasks.js';
-import { ITerminalService } from '../../../../../terminal/browser/terminal.js';
+import { ITerminalInstance, ITerminalService } from '../../../../../terminal/browser/terminal.js';
 import { collectTerminalResults, getTaskDefinition, getTaskForTool, resolveDependencyTasks, tasksMatch } from '../../taskHelpers.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
@@ -54,57 +54,75 @@ export class RunTaskTool implements IToolImpl {
 			return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: new MarkdownString(localize('chat.taskAlreadyRunning', 'The task \`{0}\` is already running.', taskLabel)) };
 		}
 
-		const raceResult = await Promise.race([this._tasksService.run(task, undefined, TaskRunSource.ChatAgent), timeout(3000)]);
-		const result: ITaskSummary | undefined = raceResult && typeof raceResult === 'object' ? raceResult as ITaskSummary : undefined;
-
 		const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
-		const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
-		if (!resources || resources.length === 0) {
-			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: \`{0}\`', taskLabel)) };
+		const startMarkersByTerminalInstanceId = new Map<number, ReturnType<ITerminalInstance['registerMarker']>>();
+		const startMarkersDisposableStore = new DisposableStore();
+		for (const terminal of this._terminalService.instances) {
+			const marker = terminal.registerMarker();
+			startMarkersByTerminalInstanceId.set(terminal.instanceId, marker);
+			if (marker) {
+				startMarkersDisposableStore.add(marker);
+			}
 		}
-		const terminals = this._terminalService.instances.filter(t => resources.some(r => r.path === t.resource.path && r.scheme === t.resource.scheme));
-		if (terminals.length === 0) {
-			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: \`{0}\`', taskLabel)) };
+		try {
+			const raceResult = await Promise.race([this._tasksService.run(task, undefined, TaskRunSource.ChatAgent), timeout(3000)]);
+			const result: ITaskSummary | undefined = raceResult && typeof raceResult === 'object' ? raceResult as ITaskSummary : undefined;
+
+			const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
+			if (!resources || resources.length === 0) {
+				return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: \`{0}\`', taskLabel)) };
+			}
+			const terminals = this._terminalService.instances.filter(t => resources.some(r => r.path === t.resource.path && r.scheme === t.resource.scheme));
+			if (terminals.length === 0) {
+				return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: \`{0}\`', taskLabel)) };
+			}
+
+			const store = new DisposableStore();
+			let terminalResults: Awaited<ReturnType<typeof collectTerminalResults>> = [];
+			try {
+				terminalResults = await collectTerminalResults(
+					terminals,
+					task,
+					this._instantiationService,
+					invocation.context!,
+					_progress,
+					token,
+					store,
+					(terminalTask) => this._isTaskActive(terminalTask),
+					dependencyTasks,
+					this._tasksService,
+					startMarkersByTerminalInstanceId
+				);
+			} finally {
+				store.dispose();
+			}
+			for (const r of terminalResults) {
+				this._telemetryService.publicLog2?.<TaskToolEvent, TaskToolClassification>('copilotChat.runTaskTool.run', {
+					taskId: args.id,
+					bufferLength: r.output.length ?? 0,
+					pollDurationMs: r.pollDurationMs ?? 0,
+					inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
+					inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
+					inputToolManualChars: r.inputToolManualChars ?? 0,
+					inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+					inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0,
+					inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0
+				});
+			}
+
+			const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
+			const uniqueDetails = Array.from(new Set(details)).join('\n\n');
+			const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
+			const toolResultMessage = toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, undefined, task.configurationProperties.isBackground);
+
+			return {
+				content: [{ kind: 'text', value: uniqueDetails }],
+				toolResultMessage,
+				toolResultDetails
+			};
+		} finally {
+			startMarkersDisposableStore.dispose();
 		}
-
-		const store = new DisposableStore();
-		const terminalResults = await collectTerminalResults(
-			terminals,
-			task,
-			this._instantiationService,
-			invocation.context!,
-			_progress,
-			token,
-			store,
-			(terminalTask) => this._isTaskActive(terminalTask),
-			dependencyTasks,
-			this._tasksService
-		);
-		store.dispose();
-		for (const r of terminalResults) {
-			this._telemetryService.publicLog2?.<TaskToolEvent, TaskToolClassification>('copilotChat.runTaskTool.run', {
-				taskId: args.id,
-				bufferLength: r.output.length ?? 0,
-				pollDurationMs: r.pollDurationMs ?? 0,
-				inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
-				inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
-				inputToolManualChars: r.inputToolManualChars ?? 0,
-				inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
-				inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0,
-				inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0
-			});
-		}
-
-		const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
-		const uniqueDetails = Array.from(new Set(details)).join('\n\n');
-		const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-		const toolResultMessage = toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, undefined, task.configurationProperties.isBackground);
-
-		return {
-			content: [{ kind: 'text', value: uniqueDetails }],
-			toolResultMessage,
-			toolResultDetails
-		};
 	}
 
 	private async _isTaskActive(task: Task): Promise<boolean> {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts
index f50dfea219f..221f2e29d20 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts
@@ -21,16 +21,20 @@ export const enum TerminalChatAgentToolsSettingId {
 	AutoReplyToPrompts = 'chat.tools.terminal.autoReplyToPrompts',
 	OutputLocation = 'chat.tools.terminal.outputLocation',
 	TerminalSandboxEnabled = 'chat.tools.terminal.sandbox.enabled',
-	TerminalSandboxNetwork = 'chat.tools.terminal.sandbox.network',
+	TerminalSandboxNetworkAllowedDomains = 'chat.tools.terminal.sandbox.network.allowedDomains',
+	TerminalSandboxNetworkDeniedDomains = 'chat.tools.terminal.sandbox.network.deniedDomains',
+	TerminalSandboxNetworkAllowTrustedDomains = 'chat.tools.terminal.sandbox.network.allowTrustedDomains',
 	TerminalSandboxLinuxFileSystem = 'chat.tools.terminal.sandbox.linuxFileSystem',
 	TerminalSandboxMacFileSystem = 'chat.tools.terminal.sandbox.macFileSystem',
 	PreventShellHistory = 'chat.tools.terminal.preventShellHistory',
 	EnforceTimeoutFromModel = 'chat.tools.terminal.enforceTimeoutFromModel',
+	IdlePollInterval = 'chat.tools.terminal.idlePollInterval',
 
 	TerminalProfileLinux = 'chat.tools.terminal.terminalProfile.linux',
 	TerminalProfileMacOs = 'chat.tools.terminal.terminalProfile.osx',
 	TerminalProfileWindows = 'chat.tools.terminal.terminalProfile.windows',
 
+	DeprecatedTerminalSandboxNetwork = 'chat.tools.terminal.sandbox.network',
 	DeprecatedAutoApproveCompatible = 'chat.agent.terminal.autoApprove',
 	DeprecatedAutoApprove1 = 'chat.agent.terminal.allowList',
 	DeprecatedAutoApprove2 = 'chat.agent.terminal.denyList',
@@ -435,13 +439,20 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 		markdownDescription: localize('blockFileWrites.description', "Controls whether detected file write operations are blocked in the run in terminal tool. When detected, this will require explicit approval regardless of whether the command would normally be auto approved. Note that this cannot detect all possible methods of writing files, this is what is currently detected:\n\n- File redirection (detected via the bash or PowerShell tree sitter grammar)\n- `sed` in-place editing (`-i`, `-I`, `--in-place`)"),
 	},
 	[TerminalChatAgentToolsSettingId.ShellIntegrationTimeout]: {
-		markdownDescription: localize('shellIntegrationTimeout.description', "Configures the duration in milliseconds to wait for shell integration to be detected when the run in terminal tool launches a new terminal. Set to `0` to wait the minimum time, the default value `-1` means the wait time is variable based on the value of {0} and whether it's a remote window. A large value can be useful if your shell starts very slowly and a low value if you're intentionally not using shell integration.", `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``),
+		markdownDescription: localize('shellIntegrationTimeout.description', "Configures the duration in milliseconds to wait for shell integration to be detected when the run in terminal tool launches a new terminal. Set to `0` to skip the wait entirely, the default value `-1` uses a variable wait time based on the value of {0} and whether it's a remote window. A large value can be useful if your shell starts very slowly.", `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``),
 		type: 'integer',
 		minimum: -1,
 		maximum: 60000,
 		default: -1,
 		markdownDeprecationMessage: localize('shellIntegrationTimeout.deprecated', 'Use {0} instead', `\`#${TerminalSettingId.ShellIntegrationTimeout}#\``)
 	},
+	[TerminalChatAgentToolsSettingId.IdlePollInterval]: {
+		markdownDescription: localize('idlePollInterval.description', "Configures the idle poll interval in milliseconds used by the run in terminal tool to detect when commands have finished executing. Lower values make command detection faster but may cause false positives on slow systems. This primarily affects terminals without shell integration where idle detection is used instead of shell integration events."),
+		type: 'integer',
+		minimum: 50,
+		maximum: 10000,
+		default: 1000,
+	},
 	[TerminalChatAgentToolsSettingId.TerminalProfileLinux]: {
 		restricted: true,
 		markdownDescription: localize('terminalChatAgentProfile.linux', "The terminal profile to use on Linux for chat agent's run in terminal tool."),
@@ -523,33 +534,26 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			mode: 'auto'
 		}
 	},
-	[TerminalChatAgentToolsSettingId.TerminalSandboxNetwork]: {
-		markdownDescription: localize('terminalSandbox.networkSetting', "Note: this setting is applicable only when {0} is enabled. Controls network access in the terminal sandbox.", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``),
-		type: 'object',
-		properties: {
-			allowedDomains: {
-				type: 'array',
-				description: localize('terminalSandbox.networkSetting.allowedDomains', " Supports wildcards like {0} and an empty list means no network access.", '`*.example.com`'),
-				items: { type: 'string' },
-				default: []
-			},
-			deniedDomains: {
-				type: 'array',
-				description: localize('terminalSandbox.networkSetting.deniedDomains', "Array of denied domains (checked first, takes precedence over allowedDomains)."),
-				items: { type: 'string' },
-				default: []
-			},
-			allowTrustedDomains: {
-				type: 'boolean',
-				description: localize('terminalSandbox.networkSetting.allowTrustedDomains', "When enabled, the Trusted Domains list is included in the allowed domains for network access."),
-				default: false
-			}
-		},
-		default: {
-			allowedDomains: [],
-			deniedDomains: [],
-			allowTrustedDomains: false
-		},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains]: {
+		markdownDescription: localize('terminalSandbox.networkSetting.allowedDomains', "Note: this setting is applicable only when {0} is enabled. Allowed domains for network access in the terminal sandbox. Supports wildcards like {1} and an empty list means no network access.", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``, '`*.example.com`'),
+		type: 'array',
+		items: { type: 'string' },
+		default: [],
+		tags: ['preview'],
+		restricted: true,
+	},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains]: {
+		markdownDescription: localize('terminalSandbox.networkSetting.deniedDomains', "Note: this setting is applicable only when {0} is enabled. Array of denied domains for network access in the terminal sandbox (checked first, takes precedence over {1}).", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``, `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains}#\``),
+		type: 'array',
+		items: { type: 'string' },
+		default: [],
+		tags: ['preview'],
+		restricted: true,
+	},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains]: {
+		markdownDescription: localize('terminalSandbox.networkSetting.allowTrustedDomains', "Note: this setting is applicable only when {0} is enabled. When enabled, the Trusted Domains list is included in the allowed domains for network access in the terminal sandbox.", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``),
+		type: 'boolean',
+		default: false,
 		tags: ['preview'],
 		restricted: true,
 	},
@@ -650,3 +654,15 @@ for (const id of [
 		markdownDeprecationMessage: localize('autoApprove.deprecated', 'Use {0} instead', `\`#${TerminalChatAgentToolsSettingId.AutoApprove}#\``)
 	};
 }
+
+terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetwork] = {
+	type: 'object',
+	deprecated: true,
+	markdownDeprecationMessage: localize(
+		'terminalSandboxNetwork.deprecated',
+		'This setting has been split into {0}, {1}, and {2}.',
+		`\`#${TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains}#\``,
+		`\`#${TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains}#\``,
+		`\`#${TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains}#\``,
+	),
+};
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.ts
index c5606340ce5..6534d2f1f33 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.ts
@@ -18,14 +18,3 @@ export interface ITerminalSandboxRuntimeConfig {
 		denyWrite?: string[];
 	};
 }
-
-export interface ITerminalSandboxNetworkSettings {
-	allowedDomains?: string[];
-	deniedDomains?: string[];
-	allowTrustedDomains?: boolean;
-}
-
-export interface ITerminalSandboxSettings extends ITerminalSandboxRuntimeConfig {
-	enabled?: boolean;
-	network?: ITerminalSandboxNetworkSettings;
-}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts
index 0fff7114eb0..71cd4d8fbd5 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts
@@ -11,26 +11,36 @@ import { dirname, posix, win32 } from '../../../../../base/common/path.js';
 import { OperatingSystem, OS } from '../../../../../base/common/platform.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
+import { localize } from '../../../../../nls.js';
 import { IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
-import { ITerminalSandboxNetworkSettings } from './terminalSandbox.js';
 import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
 import { TerminalChatAgentToolsSettingId } from './terminalChatAgentToolsConfiguration.js';
 import { IRemoteAgentEnvironment } from '../../../../../platform/remote/common/remoteAgentEnvironment.js';
 import { ITrustedDomainService } from '../../../url/common/trustedDomainService.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ILifecycleService, WillShutdownJoinerOrder } from '../../../../services/lifecycle/common/lifecycle.js';
 
 export const ITerminalSandboxService = createDecorator<ITerminalSandboxService>('terminalSandboxService');
 
+export interface ITerminalSandboxResolvedNetworkDomains {
+	allowedDomains: string[];
+	deniedDomains: string[];
+}
+
 export interface ITerminalSandboxService {
 	readonly _serviceBrand: undefined;
 	isEnabled(): Promise<boolean>;
+	getOS(): Promise<OperatingSystem>;
 	wrapCommand(command: string): string;
 	getSandboxConfigPath(forceRefresh?: boolean): Promise<string | undefined>;
 	getTempDir(): URI | undefined;
 	setNeedsForceUpdateConfigFile(): void;
+	getResolvedNetworkDomains(): ITerminalSandboxResolvedNetworkDomains;
 }
 
 export class TerminalSandboxService extends Disposable implements ITerminalSandboxService {
@@ -48,6 +58,7 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 	private _appRoot: string;
 	private _os: OperatingSystem = OS;
 	private _defaultWritePaths: string[] = ['~/.npm'];
+	private static readonly _sandboxTempDirName = 'tmp';
 
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -56,6 +67,9 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		@ILogService private readonly _logService: ILogService,
 		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
 		@ITrustedDomainService private readonly _trustedDomainService: ITrustedDomainService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		@IProductService private readonly _productService: IProductService,
+		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
 	) {
 		super();
 		this._appRoot = dirname(FileAccess.asFileUri('').path);
@@ -69,7 +83,9 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 			// If terminal sandbox settings changed, update sandbox config.
 			if (
 				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled) ||
-				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork) ||
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) ||
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) ||
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains) ||
 				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) ||
 				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem)
 			) {
@@ -80,17 +96,37 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		this._register(this._trustedDomainService.onDidChangeTrustedDomains(() => {
 			this.setNeedsForceUpdateConfigFile();
 		}));
+
+		this._register(this._workspaceContextService.onDidChangeWorkspaceFolders(() => {
+			this.setNeedsForceUpdateConfigFile();
+		}));
+
+		this._register(this._lifecycleService.onWillShutdown(e => {
+			if (!this._tempDir) {
+				return;
+			}
+			e.join(this._cleanupSandboxTempDir(), {
+				id: 'join.deleteFilesInSandboxTempDir',
+				label: localize('deleteFilesInSandboxTempDir', "Delete Files in Sandbox Temp Dir"),
+				order: WillShutdownJoinerOrder.Default
+			});
+		}));
 	}
 
 	public async isEnabled(): Promise<boolean> {
-		this._remoteEnvDetails = await this._remoteEnvDetailsPromise;
-		this._os = this._remoteEnvDetails ? this._remoteEnvDetails.os : OS;
-		if (this._os === OperatingSystem.Windows) {
+		const os = await this.getOS();
+		if (os === OperatingSystem.Windows) {
 			return false;
 		}
 		return this._configurationService.getValue<boolean>(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled);
 	}
 
+	public async getOS(): Promise<OperatingSystem> {
+		this._remoteEnvDetails = await this._remoteEnvDetailsPromise;
+		this._os = this._remoteEnvDetails ? this._remoteEnvDetails.os : OS;
+		return this._os;
+	}
+
 	public wrapCommand(command: string): string {
 		if (!this._sandboxConfigPath || !this._tempDir) {
 			throw new Error('Sandbox config path or temp dir not initialized');
@@ -107,7 +143,7 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		// Use ELECTRON_RUN_AS_NODE=1 to make Electron executable behave as Node.js
 		// TMPDIR must be set as environment variable before the command
 		// Quote shell arguments so the wrapped command cannot break out of the outer shell.
-		const wrappedCommand = `PATH="$PATH:${dirname(this._rgPath)}" TMPDIR="${this._tempDir.path}" "${this._execPath}" "${this._srtPath}" --settings "${this._sandboxConfigPath}" -c ${this._quoteShellArgument(command)}`;
+		const wrappedCommand = `PATH="$PATH:${dirname(this._rgPath)}" TMPDIR="${this._tempDir.path}" CLAUDE_TMPDIR="${this._tempDir.path}" "${this._execPath}" "${this._srtPath}" --settings "${this._sandboxConfigPath}" -c ${this._quoteShellArgument(command)}`;
 		if (this._remoteEnvDetails) {
 			return `${wrappedCommand}`;
 		}
@@ -142,9 +178,8 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		this._srtPathResolved = true;
 		const remoteEnv = this._remoteEnvDetails || await this._remoteEnvDetailsPromise;
 		if (remoteEnv) {
-
 			this._appRoot = remoteEnv.appRoot.path;
-			this._execPath = this._pathJoin(this._appRoot, 'node');
+			this._execPath = remoteEnv.execPath;
 		}
 		this._srtPath = this._pathJoin(this._appRoot, 'node_modules', '@anthropic-ai', 'sandbox-runtime', 'dist', 'cli.js');
 		this._rgPath = this._pathJoin(this._appRoot, 'node_modules', '@vscode', 'ripgrep', 'bin', 'rg');
@@ -156,7 +191,9 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 			await this._initTempDir();
 		}
 		if (this._tempDir) {
-			const networkSetting = this._configurationService.getValue<ITerminalSandboxNetworkSettings>(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork) ?? {};
+			const allowedDomainsSetting = this._configurationService.getValue<string[]>(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) ?? [];
+			const deniedDomainsSetting = this._configurationService.getValue<string[]>(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) ?? [];
+			const allowTrustedDomains = this._configurationService.getValue<boolean>(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains) ?? false;
 			const linuxFileSystemSetting = this._os === OperatingSystem.Linux
 				? this._configurationService.getValue<{ denyRead?: string[]; allowWrite?: string[]; denyWrite?: string[] }>(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) ?? {}
 				: {};
@@ -164,19 +201,18 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 				? this._configurationService.getValue<{ denyRead?: string[]; allowWrite?: string[]; denyWrite?: string[] }>(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem) ?? {}
 				: {};
 			const configFileUri = URI.joinPath(this._tempDir, `vscode-sandbox-settings-${this._sandboxSettingsId}.json`);
-			const defaultAllowWrite = [...this._defaultWritePaths];
-			const linuxAllowWrite = [...new Set([...(linuxFileSystemSetting.allowWrite ?? []), ...defaultAllowWrite])];
-			const macAllowWrite = [...new Set([...(macFileSystemSetting.allowWrite ?? []), ...defaultAllowWrite])];
+			const linuxAllowWrite = this._updateAllowWritePathsWithWorkspaceFolders(linuxFileSystemSetting.allowWrite);
+			const macAllowWrite = this._updateAllowWritePathsWithWorkspaceFolders(macFileSystemSetting.allowWrite);
 
-			let allowedDomains = networkSetting.allowedDomains ?? [];
-			if (networkSetting.allowTrustedDomains) {
+			let allowedDomains = allowedDomainsSetting;
+			if (allowTrustedDomains) {
 				allowedDomains = this._addTrustedDomainsToAllowedDomains(allowedDomains);
 			}
 
 			const sandboxSettings = {
 				network: {
 					allowedDomains,
-					deniedDomains: networkSetting.deniedDomains ?? []
+					deniedDomains: deniedDomainsSetting
 				},
 				filesystem: {
 					denyRead: this._os === OperatingSystem.Macintosh ? macFileSystemSetting.denyRead : linuxFileSystemSetting.denyRead,
@@ -201,13 +237,9 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		if (await this.isEnabled()) {
 			this._needsForceUpdateConfigFile = true;
 			const remoteEnv = this._remoteEnvDetails || await this._remoteEnvDetailsPromise;
-			if (remoteEnv) {
-				this._tempDir = remoteEnv.tmpDir;
-			} else {
-				const environmentService = this._environmentService as IEnvironmentService & { tmpDir?: URI };
-				this._tempDir = environmentService.tmpDir;
-			}
+			this._tempDir = this._getSandboxTempDirPath(remoteEnv);
 			if (this._tempDir) {
+				await this._fileService.createFolder(this._tempDir);
 				this._defaultWritePaths.push(this._tempDir.path);
 			}
 			if (!this._tempDir) {
@@ -216,6 +248,52 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		}
 	}
 
+	private async _cleanupSandboxTempDir(): Promise<void> {
+		if (!this._tempDir) {
+			return;
+		}
+		try {
+			await this._fileService.del(this._tempDir, { recursive: true, useTrash: false });
+		} catch (error) {
+			this._logService.warn('TerminalSandboxService: Failed to delete sandbox temp dir', error);
+		}
+	}
+
+	private _getSandboxTempDirPath(remoteEnv: IRemoteAgentEnvironment | null): URI | undefined {
+		const sandboxTempDirName = this._getSandboxWindowTempDirName();
+		if (remoteEnv?.userHome) {
+			const sandboxRoot = URI.joinPath(remoteEnv.userHome, this._productService.serverDataFolderName ?? this._productService.dataFolderName, TerminalSandboxService._sandboxTempDirName);
+			return sandboxTempDirName ? URI.joinPath(sandboxRoot, sandboxTempDirName) : sandboxRoot;
+		}
+
+		const nativeEnv = this._environmentService as IEnvironmentService & { userHome?: URI };
+		if (nativeEnv.userHome) {
+			const sandboxRoot = URI.joinPath(nativeEnv.userHome, this._productService.dataFolderName, TerminalSandboxService._sandboxTempDirName);
+			return sandboxTempDirName ? URI.joinPath(sandboxRoot, sandboxTempDirName) : sandboxRoot;
+		}
+
+		return undefined;
+	}
+
+	private _getSandboxWindowTempDirName(): string | undefined {
+		const workbenchEnv = this._environmentService as IEnvironmentService & { window?: { id?: number } };
+		const windowId = workbenchEnv.window?.id;
+		return typeof windowId === 'number' ? `tmp_vscode_${windowId}` : undefined;
+	}
+
+	public getResolvedNetworkDomains(): ITerminalSandboxResolvedNetworkDomains {
+		let allowedDomains = this._configurationService.getValue<string[]>(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) ?? [];
+		const deniedDomains = this._configurationService.getValue<string[]>(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) ?? [];
+		const allowTrustedDomains = this._configurationService.getValue<boolean>(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains) ?? false;
+		if (allowTrustedDomains) {
+			allowedDomains = this._addTrustedDomainsToAllowedDomains(allowedDomains);
+		}
+		return {
+			allowedDomains,
+			deniedDomains
+		};
+	}
+
 	private _addTrustedDomainsToAllowedDomains(allowedDomains: string[]): string[] {
 		const allowedDomainsSet = new Set(allowedDomains);
 		for (const domain of this._trustedDomainService.trustedDomains) {
@@ -230,4 +308,9 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 		}
 		return Array.from(allowedDomainsSet);
 	}
+
+	private _updateAllowWritePathsWithWorkspaceFolders(configuredAllowWrite: string[] | undefined): string[] {
+		const workspaceFolderPaths = this._workspaceContextService.getWorkspace().folders.map(folder => folder.uri.path);
+		return [...new Set([...workspaceFolderPaths, ...this._defaultWritePaths, ...(configuredAllowWrite ?? [])])];
+	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApproveAnalyzer.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApproveAnalyzer.test.ts
new file mode 100644
index 00000000000..1959af50879
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApproveAnalyzer.test.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import type { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import type { ICommandLineAnalyzerOptions } from '../../browser/tools/commandLineAnalyzer/commandLineAnalyzer.js';
+import { CommandLineAutoApproveAnalyzer } from '../../browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.js';
+import { RunInTerminalToolTelemetry } from '../../browser/runInTerminalToolTelemetry.js';
+import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../../browser/treeSitterCommandParser.js';
+
+suite('CommandLineAutoApproveAnalyzer', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: IInstantiationService;
+	let analyzer: CommandLineAutoApproveAnalyzer;
+
+	setup(() => {
+		const configurationService = new TestConfigurationService();
+		instantiationService = workbenchInstantiationService({
+			configurationService: () => configurationService
+		}, store);
+
+		const parser = {
+			extractSubCommands: async () => [],
+		} as unknown as TreeSitterCommandParser;
+		const telemetry = {
+			logPrepare: () => { },
+		} as unknown as RunInTerminalToolTelemetry;
+
+		analyzer = store.add(instantiationService.createInstance(
+			CommandLineAutoApproveAnalyzer,
+			parser,
+			telemetry,
+			() => { }
+		));
+	});
+
+	test('should not allow auto approve when sub-command parsing returns an empty list', async () => {
+		const options: ICommandLineAnalyzerOptions = {
+			commandLine: 'rm -- file.txt',
+			cwd: undefined,
+			shell: 'pwsh',
+			os: OperatingSystem.Windows,
+			treeSitterLanguage: TreeSitterCommandParserLanguage.PowerShell,
+			terminalToolSessionId: 'test',
+			chatSessionResource: undefined,
+		};
+
+		const result = await analyzer.analyze(options);
+		strictEqual(result.isAutoApproveAllowed, false);
+		strictEqual(result.isAutoApproved, undefined);
+		strictEqual(result.disclaimers?.length ?? 0, 0);
+	});
+
+	test('should auto approve empty command strings when sub-command parsing returns an empty list', async () => {
+		const options: ICommandLineAnalyzerOptions = {
+			commandLine: '   ',
+			cwd: undefined,
+			shell: 'pwsh',
+			os: OperatingSystem.Windows,
+			treeSitterLanguage: TreeSitterCommandParserLanguage.PowerShell,
+			terminalToolSessionId: 'test',
+			chatSessionResource: undefined,
+		};
+
+		const result = await analyzer.analyze(options);
+		strictEqual(result.isAutoApproveAllowed, true);
+		strictEqual(result.isAutoApproved, true);
+		strictEqual(result.disclaimers?.length ?? 0, 0);
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/getTerminalOutputTool.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/getTerminalOutputTool.test.ts
new file mode 100644
index 00000000000..ad53a0598c3
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/getTerminalOutputTool.test.ts
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { GetTerminalOutputTool, GetTerminalOutputToolData } from '../../browser/tools/getTerminalOutputTool.js';
+import { RunInTerminalTool, type IActiveTerminalExecution } from '../../browser/tools/runInTerminalTool.js';
+import type { IToolInvocation } from '../../../../chat/common/tools/languageModelToolsService.js';
+import type { ITerminalExecuteStrategyResult } from '../../browser/executeStrategy/executeStrategy.js';
+import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+
+suite('GetTerminalOutputTool', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	const UNKNOWN_TERMINAL_ID = '123e4567-e89b-12d3-a456-426614174000';
+	const KNOWN_TERMINAL_ID = '123e4567-e89b-12d3-a456-426614174001';
+	let tool: GetTerminalOutputTool;
+	let originalGetExecution: typeof RunInTerminalTool.getExecution;
+
+	setup(() => {
+		tool = store.add(new GetTerminalOutputTool());
+		originalGetExecution = RunInTerminalTool.getExecution;
+	});
+
+	teardown(() => {
+		RunInTerminalTool.getExecution = originalGetExecution;
+	});
+
+	function createInvocation(id: string): IToolInvocation {
+		return {
+			parameters: { id },
+			callId: 'test-call',
+			context: { sessionId: 'test-session' },
+			toolId: 'get_terminal_output',
+			tokenBudget: 1000,
+			isComplete: () => false,
+			isCancellationRequested: false,
+		} as unknown as IToolInvocation;
+	}
+
+	function createMockExecution(output: string): IActiveTerminalExecution {
+		return {
+			completionPromise: Promise.resolve({ output } as ITerminalExecuteStrategyResult),
+			instance: {} as ITerminalInstance,
+			getOutput: () => output,
+		};
+	}
+
+	test('tool description documents opaque terminal ids', () => {
+		const idProperty = GetTerminalOutputToolData.inputSchema?.properties?.id as { description?: string; pattern?: string } | undefined;
+		assert.ok(GetTerminalOutputToolData.modelDescription.includes('exact opaque value'));
+		assert.ok(/exact opaque id returned by that tool/i.test(idProperty?.description ?? ''));
+		assert.ok(idProperty?.pattern?.includes('[0-9a-fA-F]{8}'));
+	});
+
+	test('returns explicit error for unknown terminal id', async () => {
+		RunInTerminalTool.getExecution = () => undefined;
+
+		const result = await tool.invoke(
+			createInvocation(UNKNOWN_TERMINAL_ID),
+			async () => 0,
+			{ report: () => { } },
+			CancellationToken.None,
+		);
+
+		assert.strictEqual(result.content.length, 1);
+		assert.strictEqual(result.content[0].kind, 'text');
+		const value = (result.content[0] as { value: string }).value;
+		assert.ok(value.includes('No active terminal execution found'));
+		assert.ok(value.includes('exact value returned by run_in_terminal'));
+	});
+
+	test('returns output for active terminal id', async () => {
+		RunInTerminalTool.getExecution = () => createMockExecution('line1\nline2');
+
+		const result = await tool.invoke(
+			createInvocation(KNOWN_TERMINAL_ID),
+			async () => 0,
+			{ report: () => { } },
+			CancellationToken.None,
+		);
+
+		assert.strictEqual(result.content.length, 1);
+		assert.strictEqual(result.content[0].kind, 'text');
+		const value = (result.content[0] as { value: string }).value;
+		assert.ok(value.includes(`Output of terminal ${KNOWN_TERMINAL_ID}:`));
+		assert.ok(value.includes('line1\nline2'));
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/noneExecuteStrategy.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/noneExecuteStrategy.test.ts
new file mode 100644
index 00000000000..5618680c591
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/noneExecuteStrategy.test.ts
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import type { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { NoneExecuteStrategy } from '../../browser/executeStrategy/noneExecuteStrategy.js';
+import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+
+suite('NoneExecuteStrategy', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createLogService(): ITerminalLogService {
+		return new class extends NullLogService { readonly _logBrand = undefined; };
+	}
+
+	/**
+	 * Creates a mock terminal instance and xterm for testing NoneExecuteStrategy.
+	 *
+	 * @param contentsAsText The text that `xterm.getContentsAsText()` will return (simulates
+	 * the terminal buffer content between the start and end markers)
+	 * @param cursorLineText The text at the cursor line, used by prompt detection heuristics
+	 */
+	function createMockTerminalAndXterm(contentsAsText: string, cursorLineText: string): {
+		instance: ITerminalInstance;
+		onDataEmitter: Emitter<string>;
+	} {
+		const onDataEmitter = store.add(new Emitter<string>());
+		const activeBuffer = {};
+		const alternateBuffer = {}; // different object → not alt buffer
+
+		const mockXterm = {
+			raw: {
+				registerMarker: () => ({
+					line: 0,
+					isDisposed: false,
+					onDispose: Event.None,
+					dispose: () => { },
+				}),
+				buffer: {
+					active: {
+						...activeBuffer,
+						baseY: 0,
+						cursorY: 1,
+						getLine: () => ({
+							translateToString: () => cursorLineText,
+						}),
+					},
+					alternate: alternateBuffer,
+					onBufferChange: () => ({ dispose: () => { } }),
+				},
+				onWriteParsed: Event.None,
+			},
+			getContentsAsText: () => contentsAsText,
+		};
+
+		const mockInstance = {
+			xtermReadyPromise: Promise.resolve(mockXterm),
+			onData: onDataEmitter.event,
+			sendText: () => { },
+		} as unknown as ITerminalInstance;
+
+		return { instance: mockInstance, onDataEmitter };
+	}
+
+	test('should report "Command produced no output" when output is empty', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		// Simulate a command that produces no output. Between the start and end markers,
+		// getContentsAsText returns only whitespace (no actual command output).
+		const { instance } = createMockTerminalAndXterm(
+			'   \n   \n   ',  // only whitespace between markers
+			'user@host:~$ '    // prompt at cursor line → triggers prompt detection
+		);
+
+		const logService = createLogService();
+		const configService = new TestConfigurationService();
+		const strategy = store.add(new NoneExecuteStrategy(instance, () => false, configService, logService));
+		const cts = store.add(new CancellationTokenSource());
+
+		const result = await strategy.execute('echo test', cts.token);
+
+		assert.strictEqual(result.additionalInformation, 'Command produced no output');
+	}));
+
+	test('should not leak sandbox command echo as output when command produces no output', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		// This simulates the exact scenario from issue #303531:
+		// A sandboxed command produces no output, but getContentsAsText returns the
+		// prompt + sandbox-wrapped command echo + next prompt line.
+		const promptLine = '[ user@host:~/src (main) ] $ ';
+		const sandboxCommandEcho = 'ELECTRON_RUN_AS_NODE=1 PATH="$PATH:/app/node_modules/@vscode/ripgrep/bin" '
+			+ 'TMPDIR="/var/folders/bb/_8jjjyy971x2frm3nr3g7m4r0000gn/T" '
+			+ '"/app/Contents/MacOS/Code - Insiders" "/app/Contents/Resources/app/node_modules/@anthropic-ai/sandbox-runtime/dist/cli.js" '
+			+ '--settings "/var/folders/bb/_8jjjyy971x2frm3nr3g7m4r0000gn/T/vscode-sandbox-settings.json" '
+			+ '-c \' git diff 0e5d5949d13f..2c357a926df6 -- \'\\\'\'src/foo.ts\'\\\'\' | grep -A3 -B3 \'\\\'\'someFunc\'\\\'\'\'';
+		const terminalContent = `${promptLine}${sandboxCommandEcho}\n${' '.repeat(80)}\n${promptLine}`;
+
+		const { instance } = createMockTerminalAndXterm(
+			terminalContent,
+			promptLine        // prompt at cursor line → triggers prompt detection
+		);
+
+		const logService = createLogService();
+		const configService = new TestConfigurationService();
+		const strategy = store.add(new NoneExecuteStrategy(instance, () => false, configService, logService));
+		const cts = store.add(new CancellationTokenSource());
+
+		const result = await strategy.execute(
+			'git diff 0e5d5949d13f..2c357a926df6 -- \'src/foo.ts\' | grep -A3 -B3 \'someFunc\'',
+			cts.token
+		);
+
+		// The output should NOT contain sandbox wrapper artifacts
+		assert.strictEqual(result.output?.includes('sandbox-runtime') ?? false, false, 'Output should not leak sandbox-runtime path');
+		assert.strictEqual(result.output?.includes('ELECTRON_RUN_AS_NODE') ?? false, false, 'Output should not leak ELECTRON_RUN_AS_NODE');
+
+		// Should report that the command produced no output
+		assert.strictEqual(result.additionalInformation, 'Command produced no output');
+	}));
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputHelpers.test.ts
new file mode 100644
index 00000000000..4dc62b623c6
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputHelpers.test.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import type { IMarker as IXtermMarker } from '@xterm/xterm';
+import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+import { getOutput } from '../../browser/outputHelpers.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+
+suite('outputHelpers', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+	function createMockInstance(lines: { text: string; isWrapped?: boolean }[]): ITerminalInstance {
+		const buffer = {
+			length: lines.length,
+			getLine: (index: number) => {
+				const line = lines[index];
+				if (!line) {
+					return undefined;
+				}
+				return {
+					isWrapped: !!line.isWrapped,
+					translateToString: (trimRight?: boolean) => trimRight ? line.text.replace(/\s+$/g, '') : line.text
+				};
+			}
+		};
+		return {
+			xterm: {
+				raw: {
+					buffer: {
+						active: buffer
+					}
+				}
+			}
+		} as unknown as ITerminalInstance;
+	}
+
+	test('preserves explicit newline after an 80-column soft wrap', () => {
+		const line80 = 'A'.repeat(80);
+		const instance = createMockInstance([
+			{ text: line80 },
+			{ text: 'X', isWrapped: true },
+			{ text: 'after' }
+		]);
+
+		const output = getOutput(instance);
+		strictEqual(output, `${line80}X\nafter`);
+	});
+
+	test('rewinds marker when it starts on a wrapped continuation line', () => {
+		const line80 = 'A'.repeat(80);
+		const instance = createMockInstance([
+			{ text: line80 },
+			{ text: 'X', isWrapped: true },
+			{ text: 'after' }
+		]);
+
+		const marker = { line: 1 } as IXtermMarker;
+		const output = getOutput(instance, marker);
+		strictEqual(output, `${line80}X\nafter`);
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts
index f4f34ecd4e9..be398e10c0b 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts
@@ -452,6 +452,7 @@ suite('OutputMonitor', () => {
 		test('detects VS Code task completion messages', () => {
 			assert.strictEqual(detectsVSCodeTaskFinishMessage('Press any key to close the terminal.'), true);
 			assert.strictEqual(detectsVSCodeTaskFinishMessage('Terminal will be reused by tasks, press any key to close it.'), true);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('The terminal will be reused by tasks. Press any key to close. Please provide the required input to the terminal.'), true);
 			// Case insensitive
 			assert.strictEqual(detectsVSCodeTaskFinishMessage('press any key to close the terminal.'), true);
 			assert.strictEqual(detectsVSCodeTaskFinishMessage('PRESS ANY KEY TO CLOSE THE TERMINAL.'), true);
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts
index 0e6ede9ea6f..49735c06797 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ok, strictEqual } from 'assert';
-import { generateAutoApproveActions, TRUNCATION_MESSAGE, dedupeRules, isPowerShell, sanitizeTerminalOutput, truncateOutputKeepingTail, extractCdPrefix } from '../../browser/runInTerminalHelpers.js';
+import { generateAutoApproveActions, TRUNCATION_MESSAGE, dedupeRules, isPowerShell, sanitizeTerminalOutput, truncateOutputKeepingTail, extractCdPrefix, normalizeTerminalCommandForDisplay } from '../../browser/runInTerminalHelpers.js';
 import { OperatingSystem } from '../../../../../../base/common/platform.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
@@ -293,6 +293,25 @@ suite('sanitizeTerminalOutput', () => {
 	});
 });
 
+suite('normalizeTerminalCommandForDisplay', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('removes escaped single and double quotes', () => {
+		const input = 'git rev-parse \\\'stash@{0}\\\' && echo \\\"done\\\"';
+		strictEqual(normalizeTerminalCommandForDisplay(input), 'git rev-parse \'stash@{0}\' && echo "done"');
+	});
+
+	test('normalizes escaped forward slashes', () => {
+		const input = 'echo \\/Users\\/me\\/project';
+		strictEqual(normalizeTerminalCommandForDisplay(input), 'echo /Users/me/project');
+	});
+
+	test('preserves non-quote escapes', () => {
+		const input = 'echo path\\ with\\ spaces';
+		strictEqual(normalizeTerminalCommandForDisplay(input), input);
+	});
+});
+
 suite('generateAutoApproveActions', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxOutputAnalyzer.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxOutputAnalyzer.test.ts
new file mode 100644
index 00000000000..2349129f7f5
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxOutputAnalyzer.test.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import { outputLooksSandboxBlocked } from '../../browser/tools/sandboxOutputAnalyzer.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+
+suite('outputLooksSandboxBlocked', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const positives: [string, string][] = [
+		['macOS sandbox file write', '/bin/bash: /tmp/test.txt: Operation not permitted'],
+		['Linux sandbox file write', '/usr/bin/bash: /tmp/test.txt: Read-only file system'],
+		['Permission denied', 'bash: ./script.sh: Permission denied'],
+		['sandbox-exec reference', 'sandbox-exec: some error occurred'],
+		['bwrap reference', 'bwrap: error setting up namespace'],
+		['sandbox_violation', 'sandbox_violation: deny(1) file-write-create /tmp/foo'],
+		['case insensitive', '/bin/bash: OPERATION NOT PERMITTED'],
+		['wrapped across lines', '/bin/bash: Operation not\npermitted'],
+	];
+
+	for (const [label, output] of positives) {
+		test(`detects: ${label}`, () => {
+			strictEqual(outputLooksSandboxBlocked(output), true);
+		});
+	}
+
+	const negatives: [string, string][] = [
+		['normal output', 'hello world'],
+		['empty output', ''],
+		['unrelated error', 'Error: ENOENT: no such file or directory'],
+	];
+
+	for (const [label, output] of negatives) {
+		test(`ignores: ${label}`, () => {
+			strictEqual(outputLooksSandboxBlocked(output), false);
+		});
+	}
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts
index b1a8fed729a..e3e2cca256f 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts
@@ -56,6 +56,17 @@ suite('SandboxedCommandLinePresenter', () => {
 		strictEqual(result.languageDisplayName, undefined);
 	});
 
+	test('should use forDisplay over original when both are provided', async () => {
+		const presenter = createPresenter();
+		const result = await presenter.present({
+			commandLine: { original: 'cd /some/path && ls -lh', forDisplay: 'ls -lh' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, 'ls -lh');
+	});
+
 	test('should return undefined when sandboxing is disabled', async () => {
 		const presenter = createPresenter(false);
 		const result = await presenter.present({
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/strategyHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/strategyHelpers.test.ts
new file mode 100644
index 00000000000..8e22ff4a36e
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/strategyHelpers.test.ts
@@ -0,0 +1,564 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { stripCommandEchoAndPrompt } from '../../browser/executeStrategy/strategyHelpers.js';
+
+suite('stripCommandEchoAndPrompt', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('strips single-line command echo and trailing prompt', () => {
+		const output = [
+			'user@host:~/src $ echo hello',
+			'hello',
+			'user@host:~/src $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hello'),
+			'hello'
+		);
+	});
+
+	test('strips command echo with zsh-style prompt (] $ )', () => {
+		const output = [
+			's/testWorkspace (main**) ] $  true',
+			'[ alex@Alexandrus-MacBook-Pro:/Users/alex/src/vscode4/extensions/vscode-api-test',
+			's/testWorkspace (main**) ] $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('preserves actual command output between echo and prompt', () => {
+		const output = [
+			's/testWorkspace (main**) ] $  echo MARKER_123',
+			'MARKER_123',
+			'[ alex@host:/some/path',
+			's/testWorkspace (main**) ] $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo MARKER_123'),
+			'MARKER_123'
+		);
+	});
+
+	test('preserves multi-line command output', () => {
+		const output = [
+			'user@host:~ $ echo line1 && echo line2 && echo line3',
+			'line1',
+			'line2',
+			'line3',
+			'user@host:~ $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo line1 && echo line2 && echo line3'),
+			'line1\nline2\nline3'
+		);
+	});
+
+	test('handles empty output (no-output command)', () => {
+		const output = [
+			's/testWorkspace (main**) ] $  true',
+			'[ alex@host:/Users/alex/src/vscode4/extensions/vscode-api-test',
+			's/testWorkspace (main**) ] $',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('strips sandbox-wrapped command echo (long wrapped lines)', () => {
+		const sandboxCommand = 'ELECTRON_RUN_AS_NODE=1 PATH="$PATH:/app/rg/bin" TMPDIR="/tmp/sandbox" "/app/sandbox-runtime/dist/cli.js" --settings "/tmp/sandbox-settings.json" -c \'curl -s https://example.com\'';
+		const output = [
+			's/testWorkspace (main**) ] $ ELECTRON_RUN_AS_NODE=1 PATH="$PATH:/app/rg/bin" T',
+			'MPDIR="/tmp/sandbox" "/app/sandbox-runtime/dist/cli.js" --settings "/tmp/sand',
+			'box-settings.json" -c \'curl -s https://example.com\'',
+			'[ alex@host:/Users/alex/src/vscode4/extensions/vscode-api-test',
+			's/testWorkspace (main**) ] $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, sandboxCommand),
+			''
+		);
+	});
+
+	test('strips trailing prompt with various prompt styles', () => {
+		// bash user@host:path $
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['user@host:~ $ echo hello', 'hello', 'user@host:~ $ '].join('\n'),
+				'echo hello'
+			),
+			'hello',
+			'Failed for bash $ prompt'
+		);
+		// root user@host:path #
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['root@server:/var/log# echo hello', 'hello', 'root@server:/var/log# '].join('\n'),
+				'echo hello'
+			),
+			'hello',
+			'Failed for root # prompt'
+		);
+		// bracketed prompt ending with ] $
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['s/workspace ] $ echo hello', 'hello', 's/workspace ] $ '].join('\n'),
+				'echo hello'
+			),
+			'hello',
+			'Failed for bracketed ] $ prompt'
+		);
+		// PowerShell PS C:\>
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['PS C:\\Users\\test> echo hello', 'hello', 'PS C:\\Users\\test>'].join('\n'),
+				'echo hello'
+			),
+			'hello',
+			'Failed for PowerShell prompt'
+		);
+	});
+
+	test('does not strip output lines ending with prompt-like characters', () => {
+		// Output ending with % (e.g. percentage)
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['user@host:~ $ echo "100%"', '100%', 'user@host:~ $ '].join('\n'),
+				'echo "100%"'
+			),
+			'100%',
+			'Should not strip line ending with %'
+		);
+		// Output ending with > (e.g. HTML or comparison)
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['user@host:~ $ echo "<div>"', '<div>', 'user@host:~ $ '].join('\n'),
+				'echo "<div>"'
+			),
+			'<div>',
+			'Should not strip line ending with >'
+		);
+		// Output ending with # (e.g. comment marker)
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(
+				['user@host:~ $ echo "item #"', 'item #', 'user@host:~ $ '].join('\n'),
+				'echo "item #"'
+			),
+			'item #',
+			'Should not strip line ending with #'
+		);
+	});
+
+	test('handles command with leading space (history prevention)', () => {
+		const output = [
+			'user@host:~ $  echo hello',
+			'hello',
+			'user@host:~ $ ',
+		].join('\n');
+
+		// The command has a leading space (from CommandLinePreventHistoryRewriter)
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, ' echo hello'),
+			'hello'
+		);
+	});
+
+	test('does not strip actual output lines that happen to contain prompt chars', () => {
+		const output = [
+			'user@host:~ $ echo "price is $5"',
+			'price is $5',
+			'user@host:~ $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo "price is $5"'),
+			'price is $5'
+		);
+	});
+
+	test('handles output with no trailing prompt (e.g. command still running)', () => {
+		const output = [
+			'user@host:~ $ echo hello',
+			'hello',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hello'),
+			'hello'
+		);
+	});
+
+	test('handles output with only the command echo and no prompt', () => {
+		const output = 'user@host:~ $ true';
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('handles empty string input', () => {
+		assert.strictEqual(
+			stripCommandEchoAndPrompt('', 'echo hello'),
+			''
+		);
+	});
+
+	test('handles bash -c subshell command echo', () => {
+		const output = [
+			's/testWorkspace (main**) ] $  bash -c "exit 42"',
+			'[ alex@host:/Users/alex/src/vscode4/extensions/vscode-api-test',
+			's/testWorkspace (main**) ] $ ',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'bash -c "exit 42"'),
+			''
+		);
+	});
+
+	test('strips wrapped prompt lines with user@hostname pattern', () => {
+		const output = [
+			'user@host:~ $ echo hi',
+			'hi',
+			'[ alex@Alexandrus-MacBook-Pro:/very/long/path/that/wraps/across/terminal/col',
+			'umns/in/the/test/workspace ] $',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hi'),
+			'hi'
+		);
+	});
+
+	test('handles PowerShell-style prompt (PS C:\\>)', () => {
+		const output = [
+			'PS C:\\Users\\test> echo hello',
+			'hello',
+			'PS C:\\Users\\test>',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hello'),
+			'hello'
+		);
+	});
+
+	test('strips stale prompt fragments and ^C residue before command echo', () => {
+		// Simulates CI environment where previous ^C produces stale prompt
+		// fragments before the actual command echo line
+		const output = [
+			'ts/testWorkspace$ ^C',
+			'cloudtest@5ac6b023c000000:/mnt/vss/_work/vscode/vscode/extensions/vscode-api-tes',
+			'ts/testWorkspace$  echo MARKER_123',
+			'MARKER_123',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo MARKER_123'),
+			'MARKER_123'
+		);
+	});
+
+	test('strips stale prompt fragments for no-output command', () => {
+		const output = [
+			'ts/testWorkspace$ ^C',
+			'cloudtest@5ac6b023c000000:/mnt/vss/_work/vscode/vscode/extensions/vscode-api-tes',
+			'ts/testWorkspace$  true',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('strips stale prompt fragments for multi-line output', () => {
+		const output = [
+			'ts/testWorkspace$ ^C',
+			'cloudtest@5ac6b023c000000:/mnt/vss/_work/vscode/vscode/extensions/vscode-api-tes',
+			'ts/testWorkspace$  echo M1 && echo M2 && echo M3',
+			'M1',
+			'M2',
+			'M3',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo M1 && echo M2 && echo M3'),
+			'M1\nM2\nM3'
+		);
+	});
+
+	test('strips trailing prompt without @ (hostname:path user$)', () => {
+		const output = [
+			'dsm12-be220-abc:testWorkspace runner$  echo hello',
+			'hello',
+			'dsm12-be220-abc:testWorkspace runner$',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hello'),
+			'hello'
+		);
+	});
+
+	test('strips wrapped trailing prompt without @ (hostname:path + fragment$)', () => {
+		const output = [
+			'dsm12-be220-abc:testWorkspace runner$  echo hello',
+			'hello',
+			'dsm12-be220-8627ea7f-2c5a-40cd-8ba1-bf324bb4f59a-DA35C080942E:testWorkspace runn',
+			'er$',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hello'),
+			'hello'
+		);
+	});
+
+	test('strips wrapped trailing prompt with path-like fragment (ts/testWorkspace$)', () => {
+		const output = [
+			'user@host:~ $ echo hello',
+			'hello',
+			'cloudtest@d4b0d881c000000:/mnt/vss/_work/vscode/vscode/extensions/vscode-api-tes',
+			'ts/testWorkspace$',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo hello'),
+			'hello'
+		);
+	});
+
+	test('strips trailing prompt fragment for no-output command', () => {
+		const output = [
+			'dsm12-be220-abc:testWorkspace runner$  true',
+			'dsm12-be220-8627ea7f-2c5a-40cd-8ba1-bf324bb4f59a-DA35C080942E:testWorkspace runn',
+			'er$',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('strips mid-word wrapped command continuation (PowerShell/Windows)', () => {
+		// PowerShell wraps "echo MARKER_123_ECHO" across lines at column boundary
+		const output = [
+			'PS D:\\a\\_work\\vscode\\testWorkspace> echo MARK',
+			'ER_123_ECHO',
+			'MARKER_123_ECHO',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo MARKER_123_ECHO'),
+			'MARKER_123_ECHO'
+		);
+	});
+
+	test('strips PowerShell prompt from getOutput() result', () => {
+		// When shell integration markers misfire, getOutput() includes the prompt + command
+		const output = 'PS D:\\a\\_work\\vscode\\testWorkspace> cmd /c exit 42';
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'cmd /c exit 42'),
+			''
+		);
+	});
+
+	test('strips partial command echo (suffix from wrapped getOutput)', () => {
+		// When getOutput() doesn't include the prompt line, only the wrapped
+		// continuation of the command echo appears at the start of the output.
+		const output = [
+			'90741 ; echo M2_1774133190741 ; echo M3_1774133190741',
+			'M1_1774133190741',
+			'M2_1774133190741',
+			'M3_1774133190741',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo M1_1774133190741 ; echo M2_1774133190741 ; echo M3_1774133190741'),
+			'M1_1774133190741\nM2_1774133190741\nM3_1774133190741'
+		);
+	});
+
+	test('strips bracketed prompt without @ (hostname:path format)', () => {
+		// macOS CI prompt: [hostname:path] username$ (wrapped so username is truncated)
+		const output = [
+			'[W007DV9PF9-1:~/vss/_work/1/s/extensions/vscode-api-tests/testWorkspace] cloudte',
+			'st$',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('strips bracketed prompt without @ (single line, no trailing $)', () => {
+		// When the terminal captures just the prompt (no-output command)
+		const output = '[W007DV9PF9-1:~/vss/_work/1/s/extensions/vscode-api-tests/testWorkspace] cloudte';
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'true'),
+			''
+		);
+	});
+
+	test('strips bracketed prompt without @ with command echo', () => {
+		const output = [
+			'[W007DV9PF9-1:~/vss/_work] cloudtest$  echo MARKER_123',
+			'MARKER_123',
+			'[W007DV9PF9-1:~/vss/_work] cloudtest$',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, 'echo MARKER_123'),
+			'MARKER_123'
+		);
+	});
+
+	test('strips sandbox-wrapped command echo with error output and trailing prompt', () => {
+		const commandLine = 'ELECTRON_RUN_AS_NODE=1 PATH="$PATH:/Users/alex/src/vscode4/node_modules/@vscode/ripgrep/bin" TMPDIR="/Users/alex/.vscode-oss-dev/tmp" CLAUDE_TMPDIR="/Users/alex/.vscode-oss-dev/tmp" "/Users/alex/src/vscode4/node_modules/@anthropic-ai/sandbox-runtime/dist/cli.js" --settings "/Users/alex/.vscode-oss-dev/tmp/vscode-sandbox-settings-cf5b6232-825b-4f4c-8902-32a8591007fd.json" -c \' echo "SANDBOX_TMP_1774127409076" > /tmp/SANDBOX_TMP_1774127409076.txt\'';
+		const output = [
+			'ELECTRON_RUN_AS_NODE=1 PATH="$PATH:/Users/alex/src/vscode4/node_modules/@vscode/',
+			'ripgrep/bin" TMPDIR="/Users/alex/.vscode-oss-dev/tmp" CLAUDE_TMPDIR="/Users/alex',
+			'/.vscode-oss-dev/tmp" "/Users/alex/src/vscode4/node_modules/@anthropic-ai/sandbo',
+			'x-runtime/dist/cli.js" --settings "/Users/alex/.vscode-oss-dev/tmp/vscode-sandbo',
+			'x-settings-cf5b6232-825b-4f4c-8902-32a8591007fd.json" -c \' echo "SANDBOX_TMP_177',
+			'4127409076" > /tmp/SANDBOX_TMP_1774127409076.txt\'',
+			'[ alex@Alexandrus-MacBook-Pro:/Users/alex/src/vscode4/extensions/vscode-api-test',
+			's/testWorkspace (alexdima/fix-303531-sandbox-no-output-leak**) ] $ ELECTRON_RUN_',
+			'AS_NODE=1 PATH="$PATH:/Users/alex/src/vscode4/node_modules/@vscode/ripgrep/bin" ',
+			'TMPDIR="/Users/alex/.vscode-oss-dev/tmp" CLAUDE_TMPDIR="/Users/alex/.vscode-oss-',
+			'dev/tmp" "/Users/alex/src/vscode4/node_modules/@anthropic-ai/sandbox-runtime/dis',
+			't/cli.js" --settings "/Users/alex/.vscode-oss-dev/tmp/vscode-sandbox-settings-cf',
+			'5b6232-825b-4f4c-8902-32a8591007fd.json" -c \' echo "SANDBOX_TMP_1774127409076" >',
+			' /tmp/SANDBOX_TMP_1774127409076.txt\'',
+		].join('\n');
+
+		assert.strictEqual(
+			stripCommandEchoAndPrompt(output, commandLine),
+			''
+		);
+	});
+
+	// --- Adversarial tests: output that looks like prompts ---
+	// These verify that realistic output is NOT falsely stripped.
+
+	suite('adversarial: output resembling prompts', () => {
+
+		test('output ending with $ is preserved (not confused with wrapped prompt)', () => {
+			const output = [
+				'user@host:~ $ echo \'test$\'',
+				'test$',
+				'user@host:~ $',
+			].join('\n');
+
+			// 'user@host:~ $' is a complete prompt → stripped and loop stops.
+			// 'test$' is preserved because nothing above a complete prompt is stripped.
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, 'echo \'test$\''),
+				'test$'
+			);
+		});
+
+		test('output ending with # is preserved (not confused with wrapped prompt)', () => {
+			const output = [
+				'user@host:~ $ echo \'div#\'',
+				'div#',
+				'user@host:~ $',
+			].join('\n');
+
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, 'echo \'div#\''),
+				'div#'
+			);
+		});
+
+		test('bracketed log output [tag:~/path] is preserved', () => {
+			const output = [
+				'user@host:~ $ node build.js',
+				'[build:~/dist] compiled successfully',
+				'user@host:~ $',
+			].join('\n');
+
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, 'node build.js'),
+				'[build:~/dist] compiled successfully'
+			);
+		});
+
+		test('output containing user@host:path ending with # is preserved', () => {
+			const output = [
+				'user@host:~ $ cat /etc/motd',
+				'admin@server:~/docs #',
+				'user@host:~ $',
+			].join('\n');
+
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, 'cat /etc/motd'),
+				'admin@server:~/docs #'
+			);
+		});
+
+		test('output ending with ] $ is preserved', () => {
+			const output = [
+				'user@host:~ $ echo \'values: [a, b] $\'',
+				'values: [a, b] $',
+				'user@host:~ $',
+			].join('\n');
+
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, 'echo \'values: [a, b] $\''),
+				'values: [a, b] $'
+			);
+		});
+
+		test('multiple prompt-like output lines are all preserved', () => {
+			// Complete prompt at the bottom stops stripping immediately,
+			// so all prompt-like output lines above are preserved.
+			const output = [
+				'user@host:~ $ cat prompts.txt',
+				'admin@server:~/docs $',
+				'root@box:/var/log #',
+				'test@dev:~ $',
+				'user@host:~ $',
+			].join('\n');
+
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, 'cat prompts.txt'),
+				'admin@server:~/docs $\nroot@box:/var/log #\ntest@dev:~ $'
+			);
+		});
+
+		test('multi-line output where last line has $ after non-word chars is preserved', () => {
+			const output = [
+				'user@host:~ $ ./report.sh',
+				'Revenue: 1000',
+				'Currency: USD$',
+				'user@host:~ $',
+			].join('\n');
+
+			assert.strictEqual(
+				stripCommandEchoAndPrompt(output, './report.sh'),
+				'Revenue: 1000\nCurrency: USD$'
+			);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/taskHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/taskHelpers.test.ts
new file mode 100644
index 00000000000..68de3205b14
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/taskHelpers.test.ts
@@ -0,0 +1,265 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IToolInvocationContext } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { Task } from '../../../../tasks/common/taskService.js';
+import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+import { collectTerminalResults } from '../../browser/taskHelpers.js';
+import { IExecution, OutputMonitorState } from '../../browser/tools/monitoring/types.js';
+
+suite('Task Helpers', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('collectTerminalResults reads output from invocation start marker', async () => {
+		const lines = ['old output', 'more old output', 'new output line 1', 'new output line 2'];
+		let markerDisposed = false;
+		const marker = {
+			line: 2,
+			dispose: () => { markerDisposed = true; }
+		};
+		const terminal = {
+			instanceId: 1,
+			title: 'task-terminal',
+			shellLaunchConfig: { name: 'task-terminal' },
+			registerMarker: () => marker,
+			xterm: {
+				raw: {
+					buffer: {
+						active: {
+							length: lines.length,
+							getLine: (y: number) => ({ translateToString: () => lines[y] })
+						}
+					}
+				}
+			}
+		} as unknown as ITerminalInstance;
+		const task = {
+			_label: 'my-task',
+			configurationProperties: {}
+		} as Task;
+		const invocationContext: IToolInvocationContext = {
+			sessionResource: URI.parse('vscode-chat-session://test')
+		};
+		const instantiationService = {
+			createInstance: (_ctor: unknown, execution: IExecution) => {
+				const didFinishEmitter = new Emitter<void>();
+				const monitor = {
+					onDidFinishCommand: didFinishEmitter.event,
+					pollingResult: {
+						output: execution.getOutput(),
+						pollDurationMs: 1,
+						state: OutputMonitorState.Idle
+					},
+					outputMonitorTelemetryCounters: {
+						inputToolManualAcceptCount: 0,
+						inputToolManualRejectCount: 0,
+						inputToolManualChars: 0,
+						inputToolAutoAcceptCount: 0,
+						inputToolAutoChars: 0,
+						inputToolManualShownCount: 0,
+						inputToolFreeFormInputShownCount: 0,
+						inputToolFreeFormInputCount: 0,
+					},
+					dispose: () => didFinishEmitter.dispose()
+				};
+				setTimeout(() => didFinishEmitter.fire(), 0);
+				return monitor;
+			}
+		} as unknown as IInstantiationService;
+
+		const disposableStore = new DisposableStore();
+		const results = await collectTerminalResults(
+			[terminal],
+			task,
+			instantiationService,
+			invocationContext,
+			{ report: () => { } },
+			CancellationToken.None,
+			disposableStore
+		);
+		disposableStore.dispose();
+
+		assert.strictEqual(results.length, 1);
+		assert.strictEqual(results[0].output, 'new output line 1\nnew output line 2');
+		assert.strictEqual(markerDisposed, true);
+	});
+
+	test('collectTerminalResults uses provided pre-run marker when present', async () => {
+		const lines = ['old output', 'new output line 1', 'new output line 2', '* Terminal will be reused by tasks, press any key to close it.'];
+		let defaultMarkerDisposed = false;
+		let preRunMarkerDisposed = false;
+		const defaultMarker = {
+			line: 3,
+			dispose: () => { defaultMarkerDisposed = true; }
+		};
+		const preRunMarker = {
+			id: 1,
+			line: 1,
+			isDisposed: false,
+			onDispose: new Emitter<void>().event,
+			dispose: () => { preRunMarkerDisposed = true; }
+		};
+		const terminal = {
+			instanceId: 1,
+			title: 'task-terminal',
+			shellLaunchConfig: { name: 'task-terminal' },
+			registerMarker: () => defaultMarker,
+			xterm: {
+				raw: {
+					buffer: {
+						active: {
+							length: lines.length,
+							getLine: (y: number) => ({ translateToString: () => lines[y] })
+						}
+					}
+				}
+			}
+		} as unknown as ITerminalInstance;
+		const task = {
+			_label: 'my-task',
+			configurationProperties: {}
+		} as Task;
+		const invocationContext: IToolInvocationContext = {
+			sessionResource: URI.parse('vscode-chat-session://test')
+		};
+		const instantiationService = {
+			createInstance: (_ctor: unknown, execution: IExecution) => {
+				const didFinishEmitter = new Emitter<void>();
+				const monitor = {
+					onDidFinishCommand: didFinishEmitter.event,
+					pollingResult: {
+						output: execution.getOutput(),
+						pollDurationMs: 1,
+						state: OutputMonitorState.Idle
+					},
+					outputMonitorTelemetryCounters: {
+						inputToolManualAcceptCount: 0,
+						inputToolManualRejectCount: 0,
+						inputToolManualChars: 0,
+						inputToolAutoAcceptCount: 0,
+						inputToolAutoChars: 0,
+						inputToolManualShownCount: 0,
+						inputToolFreeFormInputShownCount: 0,
+						inputToolFreeFormInputCount: 0,
+					},
+					dispose: () => didFinishEmitter.dispose()
+				};
+				setTimeout(() => didFinishEmitter.fire(), 0);
+				return monitor;
+			}
+		} as unknown as IInstantiationService;
+
+		const startMarkersByTerminalInstanceId = new Map<number, ReturnType<ITerminalInstance['registerMarker']>>();
+		startMarkersByTerminalInstanceId.set(terminal.instanceId, preRunMarker as ReturnType<ITerminalInstance['registerMarker']>);
+
+		const disposableStore = new DisposableStore();
+		const results = await collectTerminalResults(
+			[terminal],
+			task,
+			instantiationService,
+			invocationContext,
+			{ report: () => { } },
+			CancellationToken.None,
+			disposableStore,
+			undefined,
+			undefined,
+			undefined,
+			startMarkersByTerminalInstanceId
+		);
+		disposableStore.dispose();
+
+		assert.strictEqual(results.length, 1);
+		assert.strictEqual(results[0].output, 'new output line 1\nnew output line 2\n* Terminal will be reused by tasks, press any key to close it.');
+		assert.strictEqual(preRunMarkerDisposed, true);
+		assert.strictEqual(defaultMarkerDisposed, false);
+	});
+
+	test('collectTerminalResults reads full output when pre-run marker map has no marker for terminal', async () => {
+		const lines = ['new output line 1', 'new output line 2', '* Terminal will be reused by tasks, press any key to close it.'];
+		let defaultMarkerDisposed = false;
+		const defaultMarker = {
+			line: 1,
+			dispose: () => { defaultMarkerDisposed = true; }
+		};
+		const terminal = {
+			instanceId: 1,
+			title: 'task-terminal',
+			shellLaunchConfig: { name: 'task-terminal' },
+			registerMarker: () => defaultMarker,
+			xterm: {
+				raw: {
+					buffer: {
+						active: {
+							length: lines.length,
+							getLine: (y: number) => ({ translateToString: () => lines[y] })
+						}
+					}
+				}
+			}
+		} as unknown as ITerminalInstance;
+		const task = {
+			_label: 'my-task',
+			configurationProperties: {}
+		} as Task;
+		const invocationContext: IToolInvocationContext = {
+			sessionResource: URI.parse('vscode-chat-session://test')
+		};
+		const instantiationService = {
+			createInstance: (_ctor: unknown, execution: IExecution) => {
+				const didFinishEmitter = new Emitter<void>();
+				const monitor = {
+					onDidFinishCommand: didFinishEmitter.event,
+					pollingResult: {
+						output: execution.getOutput(),
+						pollDurationMs: 1,
+						state: OutputMonitorState.Idle
+					},
+					outputMonitorTelemetryCounters: {
+						inputToolManualAcceptCount: 0,
+						inputToolManualRejectCount: 0,
+						inputToolManualChars: 0,
+						inputToolAutoAcceptCount: 0,
+						inputToolAutoChars: 0,
+						inputToolManualShownCount: 0,
+						inputToolFreeFormInputShownCount: 0,
+						inputToolFreeFormInputCount: 0,
+					},
+					dispose: () => didFinishEmitter.dispose()
+				};
+				setTimeout(() => didFinishEmitter.fire(), 0);
+				return monitor;
+			}
+		} as unknown as IInstantiationService;
+
+		const startMarkersByTerminalInstanceId = new Map<number, ReturnType<ITerminalInstance['registerMarker']>>();
+
+		const disposableStore = new DisposableStore();
+		const results = await collectTerminalResults(
+			[terminal],
+			task,
+			instantiationService,
+			invocationContext,
+			{ report: () => { } },
+			CancellationToken.None,
+			disposableStore,
+			undefined,
+			undefined,
+			undefined,
+			startMarkersByTerminalInstanceId
+		);
+		disposableStore.dispose();
+
+		assert.strictEqual(results.length, 1);
+		assert.strictEqual(results[0].output, 'new output line 1\nnew output line 2\n* Terminal will be reused by tasks, press any key to close it.');
+		assert.strictEqual(defaultMarkerDisposed, false);
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/terminalSandboxService.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/terminalSandboxService.test.ts
index fdc4ab166ab..a85db3988f2 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/terminalSandboxService.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/terminalSandboxService.test.ts
@@ -6,12 +6,14 @@
 import { strictEqual, ok } from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { TestLifecycleService, workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { TestProductService } from '../../../../../test/common/workbenchTestServices.js';
 import { TerminalSandboxService } from '../../common/terminalSandboxService.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
 import { IEnvironmentService } from '../../../../../../platform/environment/common/environment.js';
 import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
 import { IRemoteAgentService } from '../../../../../services/remote/common/remoteAgentService.js';
 import { ITrustedDomainService } from '../../../../url/common/trustedDomainService.js';
 import { URI } from '../../../../../../base/common/uri.js';
@@ -21,6 +23,9 @@ import { TestConfigurationService } from '../../../../../../platform/configurati
 import { VSBuffer } from '../../../../../../base/common/buffer.js';
 import { OperatingSystem } from '../../../../../../base/common/platform.js';
 import { IRemoteAgentEnvironment } from '../../../../../../platform/remote/common/remoteAgentEnvironment.js';
+import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, WorkbenchState } from '../../../../../../platform/workspace/common/workspace.js';
+import { testWorkspace } from '../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { ILifecycleService } from '../../../../../services/lifecycle/common/lifecycle.js';
 
 suite('TerminalSandboxService - allowTrustedDomains', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -29,7 +34,13 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 	let configurationService: TestConfigurationService;
 	let trustedDomainService: MockTrustedDomainService;
 	let fileService: MockFileService;
+	let lifecycleService: TestLifecycleService;
+	let workspaceContextService: MockWorkspaceContextService;
+	let productService: IProductService;
 	let createdFiles: Map<string, string>;
+	let createdFolders: string[];
+	let deletedFolders: string[];
+	const windowId = 7;
 
 	class MockTrustedDomainService implements ITrustedDomainService {
 		_serviceBrand: undefined;
@@ -47,6 +58,15 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 			createdFiles.set(uri.path, contentString);
 			return {};
 		}
+
+		async createFolder(uri: URI): Promise<any> {
+			createdFolders.push(uri.path);
+			return {};
+		}
+
+		async del(uri: URI): Promise<void> {
+			deletedFolders.push(uri.path);
+		}
 	}
 
 	class MockRemoteAgentService {
@@ -57,6 +77,7 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 				os: OperatingSystem.Linux,
 				tmpDir: URI.file('/tmp'),
 				appRoot: URI.file('/app'),
+				execPath: '/app/node',
 				pid: 1234,
 				connectionToken: 'test-token',
 				settingsPath: URI.file('/settings'),
@@ -79,40 +100,98 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 		}
 	}
 
+	class MockWorkspaceContextService implements IWorkspaceContextService {
+		_serviceBrand: undefined;
+		readonly onDidChangeWorkbenchState = Event.None;
+		readonly onDidChangeWorkspaceName = Event.None;
+		readonly onWillChangeWorkspaceFolders = Event.None;
+		private readonly _onDidChangeWorkspaceFolders = new Emitter<IWorkspaceFoldersChangeEvent>();
+		readonly onDidChangeWorkspaceFolders: Event<IWorkspaceFoldersChangeEvent> = this._onDidChangeWorkspaceFolders.event;
+		private _workspace: IWorkspace = testWorkspace();
+
+		getCompleteWorkspace(): Promise<IWorkspace> {
+			return Promise.resolve(this._workspace);
+		}
+
+		getWorkspace(): IWorkspace {
+			return this._workspace;
+		}
+
+		getWorkbenchState(): WorkbenchState {
+			return this._workspace.folders.length > 0 ? WorkbenchState.FOLDER : WorkbenchState.EMPTY;
+		}
+
+		getWorkspaceFolder(_resource: URI): IWorkspaceFolder | null {
+			return null;
+		}
+
+		isCurrentWorkspace(_workspaceIdOrFolder: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): boolean {
+			return false;
+		}
+
+		isInsideWorkspace(_resource: URI): boolean {
+			return false;
+		}
+
+		hasWorkspaceData(): boolean {
+			return this._workspace.folders.length > 0;
+		}
+
+		setWorkspaceFolders(folders: URI[]): void {
+			const previousFolders = this._workspace.folders;
+			this._workspace = testWorkspace(...folders);
+			this._onDidChangeWorkspaceFolders.fire({
+				added: this._workspace.folders.filter(folder => !previousFolders.some(previousFolder => previousFolder.uri.toString() === folder.uri.toString())),
+				removed: previousFolders.filter(folder => !this._workspace.folders.some(nextFolder => nextFolder.uri.toString() === folder.uri.toString())),
+				changed: []
+			});
+		}
+	}
+
 	setup(() => {
 		createdFiles = new Map();
+		createdFolders = [];
+		deletedFolders = [];
 		instantiationService = workbenchInstantiationService({}, store);
 		configurationService = new TestConfigurationService();
 		trustedDomainService = new MockTrustedDomainService();
 		fileService = new MockFileService();
+		lifecycleService = store.add(new TestLifecycleService());
+		workspaceContextService = new MockWorkspaceContextService();
+		productService = {
+			...TestProductService,
+			dataFolderName: '.test-data',
+			serverDataFolderName: '.test-server-data'
+		};
+		workspaceContextService.setWorkspaceFolders([URI.file('/workspace-one')]);
 
 		// Setup default configuration
 		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled, true);
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: [],
-			deniedDomains: [],
-			allowTrustedDomains: false
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, false);
 
 		instantiationService.stub(IConfigurationService, configurationService);
 		instantiationService.stub(IFileService, fileService);
-		instantiationService.stub(IEnvironmentService, <IEnvironmentService & { tmpDir?: URI; execPath?: string }>{
+		instantiationService.stub(IEnvironmentService, <IEnvironmentService & { tmpDir?: URI; execPath?: string; window?: { id: number } }>{
 			_serviceBrand: undefined,
 			tmpDir: URI.file('/tmp'),
-			execPath: '/usr/bin/node'
+			execPath: '/usr/bin/node',
+			window: { id: windowId }
 		});
 		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(IProductService, productService);
 		instantiationService.stub(IRemoteAgentService, new MockRemoteAgentService());
 		instantiationService.stub(ITrustedDomainService, trustedDomainService);
+		instantiationService.stub(IWorkspaceContextService, workspaceContextService);
+		instantiationService.stub(ILifecycleService, lifecycleService);
 	});
 
 	test('should filter out sole wildcard (*) from trusted domains', async () => {
 		// Setup: Enable allowTrustedDomains and add * to trusted domains
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: [],
-			deniedDomains: [],
-			allowTrustedDomains: true
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, true);
 		trustedDomainService.trustedDomains = ['*'];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -128,11 +207,9 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 
 	test('should allow wildcards with domains like *.github.com', async () => {
 		// Setup: Enable allowTrustedDomains and add *.github.com
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: [],
-			deniedDomains: [],
-			allowTrustedDomains: true
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, true);
 		trustedDomainService.trustedDomains = ['*.github.com'];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -149,11 +226,9 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 
 	test('should combine trusted domains with configured allowedDomains, filtering out *', async () => {
 		// Setup: Enable allowTrustedDomains with multiple domains including *
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: ['example.com'],
-			deniedDomains: [],
-			allowTrustedDomains: true
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, ['example.com']);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, true);
 		trustedDomainService.trustedDomains = ['*', '*.github.com', 'microsoft.com'];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -173,11 +248,9 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 
 	test('should not include trusted domains when allowTrustedDomains is false', async () => {
 		// Setup: Disable allowTrustedDomains
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: ['example.com'],
-			deniedDomains: [],
-			allowTrustedDomains: false
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, ['example.com']);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, false);
 		trustedDomainService.trustedDomains = ['*', '*.github.com'];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -194,11 +267,9 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 
 	test('should deduplicate domains when combining sources', async () => {
 		// Setup: Same domain in both sources
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: ['github.com', '*.github.com'],
-			deniedDomains: [],
-			allowTrustedDomains: true
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, ['github.com', '*.github.com']);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, true);
 		trustedDomainService.trustedDomains = ['*.github.com', 'github.com'];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -216,11 +287,9 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 
 	test('should handle empty trusted domains list', async () => {
 		// Setup: Empty trusted domains
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: ['example.com'],
-			deniedDomains: [],
-			allowTrustedDomains: true
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, ['example.com']);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, true);
 		trustedDomainService.trustedDomains = [];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -237,11 +306,9 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 
 	test('should handle only * in trusted domains', async () => {
 		// Setup: Only * in trusted domains (edge case)
-		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork, {
-			allowedDomains: [],
-			deniedDomains: [],
-			allowTrustedDomains: true
-		});
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains, []);
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains, true);
 		trustedDomainService.trustedDomains = ['*'];
 
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
@@ -255,6 +322,60 @@ suite('TerminalSandboxService - allowTrustedDomains', () => {
 		strictEqual(config.network.allowedDomains.length, 0, 'Should have no domains (* filtered out)');
 	});
 
+	test('should refresh allowWrite paths when workspace folders change', async () => {
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem, {
+			allowWrite: ['/configured/path'],
+			denyRead: [],
+			denyWrite: []
+		});
+
+		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
+		const configPath = await sandboxService.getSandboxConfigPath();
+
+		ok(configPath, 'Config path should be defined');
+		const initialConfigContent = createdFiles.get(configPath);
+		ok(initialConfigContent, 'Config file should be created for the initial workspace folders');
+
+		const initialConfig = JSON.parse(initialConfigContent);
+		ok(initialConfig.filesystem.allowWrite.includes('/workspace-one'), 'Initial config should include the original workspace folder');
+		ok(initialConfig.filesystem.allowWrite.includes('/configured/path'), 'Initial config should include configured allowWrite paths');
+
+		workspaceContextService.setWorkspaceFolders([URI.file('/workspace-two')]);
+
+		const refreshedConfigPath = await sandboxService.getSandboxConfigPath();
+		strictEqual(refreshedConfigPath, configPath, 'Config path should stay stable when the config is refreshed');
+
+		const refreshedConfigContent = createdFiles.get(configPath);
+		ok(refreshedConfigContent, 'Config file should be rewritten after workspace folders change');
+
+		const refreshedConfig = JSON.parse(refreshedConfigContent);
+		ok(refreshedConfig.filesystem.allowWrite.includes('/workspace-two'), 'Refreshed config should include the updated workspace folder');
+		ok(!refreshedConfig.filesystem.allowWrite.includes('/workspace-one'), 'Refreshed config should remove the old workspace folder');
+		ok(refreshedConfig.filesystem.allowWrite.includes('/configured/path'), 'Refreshed config should preserve configured allowWrite paths');
+	});
+
+	test('should create sandbox temp dir under the server data folder', async () => {
+		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
+		const configPath = await sandboxService.getSandboxConfigPath();
+		const expectedTempDir = URI.joinPath(URI.file('/home/user'), productService.serverDataFolderName ?? productService.dataFolderName, 'tmp', `tmp_vscode_${windowId}`);
+
+		strictEqual(sandboxService.getTempDir()?.path, expectedTempDir.path, 'Sandbox temp dir should live under the server data folder');
+		strictEqual(createdFolders[0], expectedTempDir.path, 'Sandbox temp dir should be created before writing the config');
+		ok(configPath?.startsWith(expectedTempDir.path), 'Sandbox config file should be written inside the sandbox temp dir');
+	});
+
+	test('should delete sandbox temp dir on shutdown', async () => {
+		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
+		await sandboxService.getSandboxConfigPath();
+		const expectedTempDir = URI.joinPath(URI.file('/home/user'), productService.serverDataFolderName ?? productService.dataFolderName, 'tmp', `tmp_vscode_${windowId}`);
+
+		lifecycleService.fireShutdown();
+		await Promise.all(lifecycleService.shutdownJoiners);
+
+		strictEqual(lifecycleService.shutdownJoiners.length, 1, 'Shutdown should register a temp-dir cleanup joiner');
+		strictEqual(deletedFolders[0], expectedTempDir.path, 'Shutdown should delete the sandbox temp dir');
+	});
+
 	test('should add ripgrep bin directory to PATH when wrapping command', async () => {
 		const sandboxService = store.add(instantiationService.createInstance(TerminalSandboxService));
 		await sandboxService.getSandboxConfigPath();
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts
index 46fe1a19203..9a679676dd3 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts
@@ -78,4 +78,28 @@ suite('CommandLineSandboxRewriter', () => {
 		strictEqual(result?.reasoning, 'Wrapped command for sandbox execution');
 		deepStrictEqual(calls, ['getSandboxConfigPath', 'wrapCommand']);
 	});
+
+	test('does not wrap command when sandbox bypass was explicitly requested', async () => {
+		const calls: string[] = [];
+		stubSandboxService({
+			isEnabled: async () => true,
+			wrapCommand: command => {
+				calls.push(`wrap:${command}`);
+				return `wrapped:${command}`;
+			},
+			getSandboxConfigPath: async () => {
+				calls.push('config');
+				return '/tmp/sandbox.json';
+			},
+		});
+
+		const rewriter = store.add(instantiationService.createInstance(CommandLineSandboxRewriter));
+		const result = await rewriter.rewrite({
+			...createRewriteOptions('echo hello'),
+			requestUnsandboxedExecution: true,
+		});
+
+		strictEqual(result, undefined);
+		deepStrictEqual(calls, []);
+	});
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
index 43c58ddd915..607bf6a7925 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
@@ -6,7 +6,7 @@
 import { ok, strictEqual } from 'assert';
 import { Separator } from '../../../../../../base/common/actions.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { Emitter } from '../../../../../../base/common/event.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 import { isLinux, isWindows, OperatingSystem } from '../../../../../../base/common/platform.js';
 import { count } from '../../../../../../base/common/strings.js';
@@ -31,18 +31,26 @@ import { TestContextService } from '../../../../../test/common/workbenchTestServ
 import { TestIPCFileSystemProvider } from '../../../../../test/electron-browser/workbenchTestServices.js';
 import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
 import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService/chatService.js';
+import { IChatWidgetService } from '../../../../chat/browser/chat.js';
+import { ChatPermissionLevel } from '../../../../chat/common/constants.js';
 import { LocalChatSessionUri } from '../../../../chat/common/model/chatUri.js';
 import { ITerminalSandboxService } from '../../common/terminalSandboxService.js';
-import { ILanguageModelToolsService, IPreparedToolInvocation, IToolInvocationPreparationContext, type ToolConfirmationAction } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocationPreparationContext, ToolDataSource, ToolSet, type ToolConfirmationAction } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { ITerminalChatService, ITerminalService, type ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import { ITerminalProfileResolverService } from '../../../../terminal/common/terminal.js';
-import { RunInTerminalTool, type IRunInTerminalInputParams } from '../../browser/tools/runInTerminalTool.js';
+import { createRunInTerminalToolData, RunInTerminalTool, type IRunInTerminalInputParams } from '../../browser/tools/runInTerminalTool.js';
 import { ShellIntegrationQuality } from '../../browser/toolTerminalCreator.js';
 import { terminalChatAgentToolsConfiguration, TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
 import { TerminalChatService } from '../../../chat/browser/terminalChatService.js';
 import type { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { IAgentSessionsService } from '../../../../chat/browser/agentSessions/agentSessionsService.js';
 import { IAgentSession } from '../../../../chat/browser/agentSessions/agentSessionsModel.js';
+import { isDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ITrustedDomainService } from '../../../../url/common/trustedDomainService.js';
+import { ChatAgentToolsContribution } from '../../browser/terminal.chatAgentTools.contribution.js';
+import { TerminalToolId } from '../../browser/tools/toolIds.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
 
 class TestRunInTerminalTool extends RunInTerminalTool {
 	protected override _osBackend: Promise<OperatingSystem> = Promise.resolve(OperatingSystem.Windows);
@@ -67,6 +75,8 @@ suite('RunInTerminalTool', () => {
 	let terminalServiceDisposeEmitter: Emitter<ITerminalInstance>;
 	let chatServiceDisposeEmitter: Emitter<{ sessionResource: URI[]; reason: 'cleared' }>;
 	let chatSessionArchivedEmitter: Emitter<IAgentSession>;
+	let sandboxEnabled: boolean;
+	let terminalSandboxService: ITerminalSandboxService;
 
 	let runInTerminalTool: TestRunInTerminalTool;
 
@@ -81,6 +91,7 @@ suite('RunInTerminalTool', () => {
 
 		setConfig(TerminalChatAgentToolsSettingId.EnableAutoApprove, true);
 		setConfig(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites, 'outsideWorkspace');
+		sandboxEnabled = false;
 		terminalServiceDisposeEmitter = new Emitter<ITerminalInstance>();
 		chatServiceDisposeEmitter = new Emitter<{ sessionResource: URI[]; reason: 'cleared' }>();
 		chatSessionArchivedEmitter = new Emitter<IAgentSession>();
@@ -105,14 +116,17 @@ suite('RunInTerminalTool', () => {
 		instantiationService.stub(IHistoryService, {
 			getLastActiveWorkspaceRoot: () => undefined
 		});
-		instantiationService.stub(ITerminalSandboxService, {
+		terminalSandboxService = {
 			_serviceBrand: undefined,
-			isEnabled: async () => false,
-			wrapCommand: command => command,
-			getSandboxConfigPath: async () => undefined,
+			isEnabled: async () => sandboxEnabled,
+			wrapCommand: (command: string) => `sandbox:${command}`,
+			getSandboxConfigPath: async () => sandboxEnabled ? '/tmp/sandbox.json' : undefined,
 			getTempDir: () => undefined,
-			setNeedsForceUpdateConfigFile: () => { }
-		});
+			setNeedsForceUpdateConfigFile: () => { },
+			getOS: async () => OperatingSystem.Linux,
+			getResolvedNetworkDomains: () => ({ allowedDomains: [], deniedDomains: [] }),
+		};
+		instantiationService.stub(ITerminalSandboxService, terminalSandboxService);
 
 		const treeSitterLibraryService = store.add(instantiationService.createInstance(TreeSitterLibraryService));
 		treeSitterLibraryService.isTest = true;
@@ -198,6 +212,92 @@ suite('RunInTerminalTool', () => {
 		}
 	}
 
+	suite('sandbox invocation messaging', () => {
+		test('should instruct models to use $TMPDIR instead of /tmp when sandboxed', async () => {
+			sandboxEnabled = true;
+
+			const toolData = await instantiationService.invokeFunction(createRunInTerminalToolData);
+
+			ok(toolData.modelDescription?.includes('must utilize the $TMPDIR environment variable'), 'Expected sandboxed tool description to require $TMPDIR usage');
+			ok(toolData.modelDescription?.includes('The /tmp directory is not guaranteed to be accessible or writable and must be avoided'), 'Expected sandboxed tool description to discourage /tmp usage');
+		});
+
+		test('should include requestUnsandboxedExecution in schema when sandbox is enabled', async () => {
+			sandboxEnabled = true;
+
+			const toolData = await instantiationService.invokeFunction(createRunInTerminalToolData);
+			const properties = toolData.inputSchema?.properties as Record<string, object> | undefined;
+
+			ok(properties?.['requestUnsandboxedExecution'], 'Expected requestUnsandboxedExecution in schema when sandbox is enabled');
+			ok(properties?.['requestUnsandboxedExecutionReason'], 'Expected requestUnsandboxedExecutionReason in schema when sandbox is enabled');
+		});
+
+		test('should not include requestUnsandboxedExecution in schema when sandbox is disabled', async () => {
+			sandboxEnabled = false;
+
+			const toolData = await instantiationService.invokeFunction(createRunInTerminalToolData);
+			const properties = toolData.inputSchema?.properties as Record<string, object> | undefined;
+
+			ok(!properties?.['requestUnsandboxedExecution'], 'Expected no requestUnsandboxedExecution in schema when sandbox is disabled');
+			ok(!properties?.['requestUnsandboxedExecutionReason'], 'Expected no requestUnsandboxedExecutionReason in schema when sandbox is disabled');
+		});
+
+		test('should reflect sandbox setting changes in tool data', async () => {
+			sandboxEnabled = false;
+
+			const toolDataBefore = await instantiationService.invokeFunction(createRunInTerminalToolData);
+			const propertiesBefore = toolDataBefore.inputSchema?.properties as Record<string, object> | undefined;
+			ok(!propertiesBefore?.['requestUnsandboxedExecution'], 'Expected no requestUnsandboxedExecution before enabling sandbox');
+
+			sandboxEnabled = true;
+
+			const toolDataAfter = await instantiationService.invokeFunction(createRunInTerminalToolData);
+			const propertiesAfter = toolDataAfter.inputSchema?.properties as Record<string, object> | undefined;
+			ok(propertiesAfter?.['requestUnsandboxedExecution'], 'Expected requestUnsandboxedExecution after enabling sandbox');
+			ok(toolDataAfter.modelDescription?.includes('Sandboxing:'), 'Expected sandbox instructions in description after enabling sandbox');
+		});
+
+		test('should include allowed and denied network domains in model description', async () => {
+			sandboxEnabled = true;
+			terminalSandboxService.getResolvedNetworkDomains = () => ({
+				allowedDomains: ['github.com', 'npmjs.org'],
+				deniedDomains: ['evil.com'],
+			});
+
+			const toolData = await instantiationService.invokeFunction(createRunInTerminalToolData);
+
+			ok(toolData.modelDescription?.includes('github.com, npmjs.org'), 'Expected allowed domains in description');
+			ok(toolData.modelDescription?.includes('evil.com'), 'Expected denied domains in description');
+		});
+
+		test('should exclude denied domains from effective allowed list', async () => {
+			sandboxEnabled = true;
+			terminalSandboxService.getResolvedNetworkDomains = () => ({
+				allowedDomains: ['github.com', 'evil.com', 'npmjs.org'],
+				deniedDomains: ['evil.com'],
+			});
+
+			const toolData = await instantiationService.invokeFunction(createRunInTerminalToolData);
+
+			ok(toolData.modelDescription?.includes('github.com, npmjs.org'), 'Expected effective allowed list without denied domain');
+			ok(!toolData.modelDescription?.includes('accessible in the sandbox (all other network access is blocked): github.com, evil.com'), 'Expected denied domain removed from allowed list');
+		});
+
+		test('should use sandbox labels when command is sandbox wrapped', async () => {
+			terminalSandboxService.isEnabled = async () => true;
+			terminalSandboxService.getSandboxConfigPath = async () => '/tmp/vscode-sandbox-settings.json';
+			terminalSandboxService.wrapCommand = (command: string) => `sandbox-runtime ${command}`;
+
+			const preparedInvocation = await executeToolTest({ command: 'echo hello' });
+
+			ok(preparedInvocation, 'Expected prepared invocation to be defined');
+			strictEqual((preparedInvocation.invocationMessage as IMarkdownString).value, 'Running `echo hello` in sandbox');
+
+			const terminalData = preparedInvocation.toolSpecificData as IChatTerminalToolInvocationData;
+			strictEqual(terminalData.commandLine.isSandboxWrapped, true);
+		});
+	});
+
 	suite('default auto-approve rules', () => {
 		const defaults = terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.AutoApprove].default as Record<string, boolean | { approve: boolean; matchCommandLine?: boolean }>;
 
@@ -435,6 +535,43 @@ suite('RunInTerminalTool', () => {
 		});
 	});
 
+	suite('sandbox bypass requests', () => {
+		test('should force confirmation for explicit unsandboxed execution requests', async () => {
+			sandboxEnabled = true;
+			runInTerminalTool.setBackendOs(OperatingSystem.Linux);
+
+			const result = await executeToolTest({
+				requestUnsandboxedExecution: true,
+				requestUnsandboxedExecutionReason: 'Needs network access outside the sandbox',
+			});
+
+			assertConfirmationRequired(result, 'Run `bash` command outside the sandbox?');
+			strictEqual(result?.confirmationMessages?.allowAutoConfirm, undefined);
+			const terminalData = result?.toolSpecificData as IChatTerminalToolInvocationData;
+			strictEqual(terminalData.requestUnsandboxedExecution, true);
+			strictEqual(terminalData.requestUnsandboxedExecutionReason, 'Needs network access outside the sandbox');
+			strictEqual(terminalData.commandLine.toolEdited, undefined);
+
+			const confirmationMessage = result?.confirmationMessages?.message;
+			ok(confirmationMessage && typeof confirmationMessage !== 'string');
+			if (!confirmationMessage || typeof confirmationMessage === 'string') {
+				throw new Error('Expected markdown confirmation message');
+			}
+			ok(confirmationMessage.value.includes('Reason for leaving the sandbox: Needs network access outside the sandbox'));
+
+			strictEqual(result?.confirmationMessages?.disclaimer, undefined);
+			const actions = result?.confirmationMessages?.terminalCustomActions;
+			ok(actions, 'Expected custom actions to be defined');
+			strictEqual(actions.length, 11);
+			ok(!isSeparator(actions[0]));
+			strictEqual(actions[0].label, 'Allow `echo …` in this Session');
+			ok(!isSeparator(actions[4]));
+			strictEqual(actions[4].label, 'Allow Exact Command Line in this Session');
+			ok(!isSeparator(actions[10]));
+			strictEqual(actions[10].label, 'Configure Auto Approve...');
+		});
+	});
+
 	suite('prepareToolInvocation - auto approval behavior', () => {
 
 		test('should auto-approve commands in allow list', async () => {
@@ -1443,6 +1580,60 @@ suite('RunInTerminalTool', () => {
 			ok(terminalData.autoApproveInfo, 'Expected autoApproveInfo to be defined');
 			ok(terminalData.autoApproveInfo.value.includes('Auto approved for this session'), 'Expected session approval message');
 		});
+
+		test('should bypass terminal auto-approve feature in Autopilot mode', async () => {
+			setAutoApprove({
+				curl: false
+			});
+
+			const sessionResource = LocalChatSessionUri.forSession('autopilot-session');
+			instantiationService.stub(IChatWidgetService, {
+				getWidgetBySessionResource: (() => ({ input: { currentModeInfo: { permissionLevel: ChatPermissionLevel.Autopilot } } })) as unknown as IChatWidgetService['getWidgetBySessionResource'],
+				lastFocusedWidget: undefined,
+			});
+
+			const autopilotRunInTerminalTool = store.add(instantiationService.createInstance(TestRunInTerminalTool));
+			const result = await autopilotRunInTerminalTool.prepareToolInvocation({
+				parameters: {
+					command: 'curl https://example.com',
+					explanation: 'Fetch a URL',
+					goal: 'Download content',
+					isBackground: false,
+				} as IRunInTerminalInputParams,
+				chatSessionResource: sessionResource,
+			} as IToolInvocationPreparationContext, CancellationToken.None);
+
+			assertAutoApproved(result);
+			const terminalData = result!.toolSpecificData as IChatTerminalToolInvocationData;
+			strictEqual(terminalData.autoApproveInfo, undefined, 'Expected no terminal auto-approve info in Autopilot mode');
+		});
+
+		test('should bypass terminal auto-approve feature in Bypass Approvals mode', async () => {
+			setAutoApprove({
+				curl: false
+			});
+
+			const sessionResource = LocalChatSessionUri.forSession('bypass-session');
+			instantiationService.stub(IChatWidgetService, {
+				getWidgetBySessionResource: (() => ({ input: { currentModeInfo: { permissionLevel: ChatPermissionLevel.AutoApprove } } })) as unknown as IChatWidgetService['getWidgetBySessionResource'],
+				lastFocusedWidget: undefined,
+			});
+
+			const bypassRunInTerminalTool = store.add(instantiationService.createInstance(TestRunInTerminalTool));
+			const result = await bypassRunInTerminalTool.prepareToolInvocation({
+				parameters: {
+					command: 'curl https://example.com',
+					explanation: 'Fetch a URL',
+					goal: 'Download content',
+					isBackground: false,
+				} as IRunInTerminalInputParams,
+				chatSessionResource: sessionResource,
+			} as IToolInvocationPreparationContext, CancellationToken.None);
+
+			assertAutoApproved(result);
+			const terminalData = result!.toolSpecificData as IChatTerminalToolInvocationData;
+			strictEqual(terminalData.autoApproveInfo, undefined, 'Expected no terminal auto-approve info in Bypass Approvals mode');
+		});
 	});
 
 	suite('TerminalProfileFetcher', () => {
@@ -1564,4 +1755,238 @@ suite('RunInTerminalTool', () => {
 			}
 		});
 	});
+
+	suite('ConfirmTerminalCommandTool', () => {
+		test('should require confirmation when sandbox is enabled but sandbox rewriting is disabled', async () => {
+			sandboxEnabled = true;
+
+			const { ConfirmTerminalCommandTool } = await import('../../browser/tools/runInTerminalConfirmationTool.js');
+			const confirmTool = store.add(instantiationService.createInstance(ConfirmTerminalCommandTool));
+
+			const context: IToolInvocationPreparationContext = {
+				parameters: {
+					command: 'ping google.com',
+					explanation: 'Ping google.com',
+					goal: 'Ping google.com',
+					isBackground: false,
+				} as IRunInTerminalInputParams
+			} as IToolInvocationPreparationContext;
+
+			const result = await confirmTool.prepareToolInvocation(context, CancellationToken.None);
+			assertConfirmationRequired(result);
+		});
+
+		test('should require confirmation when sandbox is disabled', async () => {
+			sandboxEnabled = false;
+			setAutoApprove({});
+
+			const { ConfirmTerminalCommandTool } = await import('../../browser/tools/runInTerminalConfirmationTool.js');
+			const confirmTool = store.add(instantiationService.createInstance(ConfirmTerminalCommandTool));
+
+			const context: IToolInvocationPreparationContext = {
+				parameters: {
+					command: 'echo hello',
+					explanation: 'Print hello',
+					goal: 'Print hello',
+					isBackground: false,
+				} as IRunInTerminalInputParams
+			} as IToolInvocationPreparationContext;
+
+			const result = await confirmTool.prepareToolInvocation(context, CancellationToken.None);
+			assertConfirmationRequired(result);
+		});
+	});
+});
+
+suite('ChatAgentToolsContribution - tool registration refresh', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let configurationService: TestConfigurationService;
+	let registeredToolData: Map<string, IToolData>;
+	let trustedDomainsEmitter: Emitter<void>;
+	let sandboxEnabled: boolean;
+
+	setup(() => {
+		configurationService = new TestConfigurationService();
+		registeredToolData = new Map();
+		trustedDomainsEmitter = store.add(new Emitter<void>());
+		sandboxEnabled = false;
+
+		const logService = new NullLogService();
+		const fileService = store.add(new FileService(logService));
+		const fileSystemProvider = new TestIPCFileSystemProvider();
+		store.add(fileService.registerProvider(Schemas.file, fileSystemProvider));
+
+		const terminalServiceDisposeEmitter = store.add(new Emitter<ITerminalInstance>());
+		const chatServiceDisposeEmitter = store.add(new Emitter<{ sessionResource: URI[]; reason: 'cleared' }>());
+		const chatSessionArchivedEmitter = store.add(new Emitter<IAgentSession>());
+
+		instantiationService = workbenchInstantiationService({
+			configurationService: () => configurationService,
+			fileService: () => fileService,
+		}, store);
+
+		instantiationService.stub(IChatService, {
+			onDidDisposeSession: chatServiceDisposeEmitter.event,
+			getSession: () => undefined,
+		});
+		instantiationService.stub(IAgentSessionsService, {
+			onDidChangeSessionArchivedState: chatSessionArchivedEmitter.event,
+			model: {
+				onDidChangeSessionArchivedState: chatSessionArchivedEmitter.event,
+			} as IAgentSessionsService['model']
+		});
+		instantiationService.stub(ITerminalChatService, store.add(instantiationService.createInstance(TerminalChatService)));
+		instantiationService.stub(IHistoryService, {
+			getLastActiveWorkspaceRoot: () => undefined
+		});
+
+		const terminalSandboxService: ITerminalSandboxService = {
+			_serviceBrand: undefined,
+			isEnabled: async () => sandboxEnabled,
+			wrapCommand: (command: string) => `sandbox:${command}`,
+			getSandboxConfigPath: async () => sandboxEnabled ? '/tmp/sandbox.json' : undefined,
+			getTempDir: () => undefined,
+			setNeedsForceUpdateConfigFile: () => { },
+			getOS: async () => OperatingSystem.Linux,
+			getResolvedNetworkDomains: () => ({ allowedDomains: [], deniedDomains: [] }),
+		};
+		instantiationService.stub(ITerminalSandboxService, terminalSandboxService);
+
+		const treeSitterLibraryService = store.add(instantiationService.createInstance(TreeSitterLibraryService));
+		treeSitterLibraryService.isTest = true;
+		instantiationService.stub(ITreeSitterLibraryService, treeSitterLibraryService);
+
+		instantiationService.stub(ITerminalService, {
+			onDidDisposeInstance: terminalServiceDisposeEmitter.event,
+			setNextCommandId: async () => { }
+		});
+		instantiationService.stub(ITerminalProfileResolverService, {
+			getDefaultProfile: async () => ({ path: 'bash' } as ITerminalProfile)
+		});
+
+		instantiationService.stub(ITrustedDomainService, {
+			_serviceBrand: undefined,
+			onDidChangeTrustedDomains: trustedDomainsEmitter.event,
+			isValid: () => true,
+			trustedDomains: [],
+		});
+
+		const contextKeyService = instantiationService.get(IContextKeyService);
+		const registeredToolImpls = new Map<string, IToolImpl>();
+		const mockToolsService: Partial<ILanguageModelToolsService> = {
+			_serviceBrand: undefined,
+			onDidChangeTools: Event.None,
+			registerToolData(toolData: IToolData) {
+				registeredToolData.set(toolData.id, toolData);
+				return toDisposable(() => registeredToolData.delete(toolData.id));
+			},
+			registerToolImplementation(id: string, tool: IToolImpl) {
+				registeredToolImpls.set(id, tool);
+				return toDisposable(() => registeredToolImpls.delete(id));
+			},
+			registerTool(toolData: IToolData, tool: IToolImpl) {
+				registeredToolData.set(toolData.id, toolData);
+				registeredToolImpls.set(toolData.id, tool);
+				return toDisposable(() => {
+					registeredToolData.delete(toolData.id);
+					registeredToolImpls.delete(toolData.id);
+					if (isDisposable(tool)) {
+						tool.dispose();
+					}
+				});
+			},
+			getTools() {
+				return registeredToolData.values();
+			},
+			executeToolSet: new ToolSet('execute', 'execute', Codicon.play, ToolDataSource.Internal, undefined, undefined, contextKeyService),
+			readToolSet: new ToolSet('read', 'read', Codicon.book, ToolDataSource.Internal, undefined, undefined, contextKeyService),
+		};
+		instantiationService.stub(ILanguageModelToolsService, mockToolsService as ILanguageModelToolsService);
+	});
+
+	async function flushAsync(): Promise<void> {
+		// Multiple microtask cycles to let async _registerRunInTerminalTool complete
+		for (let i = 0; i < 10; i++) {
+			await new Promise<void>(resolve => setTimeout(resolve, 0));
+		}
+	}
+
+	async function createContribution(): Promise<ChatAgentToolsContribution> {
+		const contribution = store.add(instantiationService.createInstance(ChatAgentToolsContribution));
+		await flushAsync();
+		return contribution;
+	}
+
+	test('should register run_in_terminal tool on construction', async () => {
+		await createContribution();
+		ok(registeredToolData.has(TerminalToolId.RunInTerminal), 'Expected run_in_terminal tool to be registered');
+	});
+
+	test('should refresh run_in_terminal tool data when sandbox setting changes', async () => {
+		await createContribution();
+
+		const toolDataBefore = registeredToolData.get(TerminalToolId.RunInTerminal);
+		ok(toolDataBefore, 'Expected run_in_terminal tool to be registered');
+		const propertiesBefore = toolDataBefore.inputSchema?.properties as Record<string, object> | undefined;
+		ok(!propertiesBefore?.['requestUnsandboxedExecution'], 'Expected no requestUnsandboxedExecution before enabling sandbox');
+
+		// Enable sandbox and fire config change
+		sandboxEnabled = true;
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled, true);
+		configurationService.onDidChangeConfigurationEmitter.fire({
+			affectsConfiguration: (key: string) => key === TerminalChatAgentToolsSettingId.TerminalSandboxEnabled,
+			affectedKeys: new Set([TerminalChatAgentToolsSettingId.TerminalSandboxEnabled]),
+			source: ConfigurationTarget.USER,
+			change: null!,
+		});
+
+		// Wait for async registration
+		await flushAsync();
+
+		const toolDataAfter = registeredToolData.get(TerminalToolId.RunInTerminal);
+		ok(toolDataAfter, 'Expected run_in_terminal tool to still be registered');
+		const propertiesAfter = toolDataAfter.inputSchema?.properties as Record<string, object> | undefined;
+		ok(propertiesAfter?.['requestUnsandboxedExecution'], 'Expected requestUnsandboxedExecution after enabling sandbox');
+	});
+
+	test('should refresh run_in_terminal tool data when trusted domains change', async () => {
+		await createContribution();
+
+		const toolDataBefore = registeredToolData.get(TerminalToolId.RunInTerminal);
+		ok(toolDataBefore, 'Expected run_in_terminal tool to be registered');
+
+		// Fire trusted domains change
+		trustedDomainsEmitter.fire();
+
+		// Wait for async registration
+		await flushAsync();
+
+		// Tool should still be registered (re-registered with fresh data)
+		const toolDataAfter = registeredToolData.get(TerminalToolId.RunInTerminal);
+		ok(toolDataAfter, 'Expected run_in_terminal tool to still be registered after trusted domains change');
+	});
+
+	test('should refresh run_in_terminal tool data when sandbox network setting changes', async () => {
+		sandboxEnabled = true;
+		await createContribution();
+
+		const toolDataBefore = registeredToolData.get(TerminalToolId.RunInTerminal);
+		ok(toolDataBefore, 'Expected run_in_terminal tool to be registered');
+
+		// Fire network config change
+		configurationService.onDidChangeConfigurationEmitter.fire({
+			affectsConfiguration: (key: string) => key === TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains,
+			affectedKeys: new Set([TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains]),
+			source: ConfigurationTarget.USER,
+			change: null!,
+		});
+
+		// Wait for async registration
+		await flushAsync();
+
+		const toolDataAfter = registeredToolData.get(TerminalToolId.RunInTerminal);
+		ok(toolDataAfter, 'Expected run_in_terminal tool to still be registered after network setting change');
+	});
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
index 285c2c02660..fd3df87da93 100644
--- a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
@@ -114,6 +114,7 @@ export class TerminalFindWidget extends SimpleFindWidget {
 
 		// Disable copy-on-selection during search to prevent search result from overriding clipboard
 		this._register(xterm.onBeforeSearch(() => {
+			this._overrideCopyOnSelectionDisposable.clear();
 			this._overrideCopyOnSelectionDisposable.value = TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection(false);
 		}));
 
@@ -182,9 +183,8 @@ export class TerminalFindWidget extends SimpleFindWidget {
 	}
 
 	protected _onFocusTrackerFocus() {
-		if (TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection) {
-			this._overrideCopyOnSelectionDisposable.value = TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection(false);
-		}
+		this._overrideCopyOnSelectionDisposable.clear();
+		this._overrideCopyOnSelectionDisposable.value = TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection(false);
 		this._findWidgetFocused.set(true);
 	}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
index 05446ea9f07..fb1496acdff 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
@@ -209,7 +209,7 @@ export class TerminalLinkManager extends DisposableStore {
 		this._telemetryService.publicLog2<{
 			linkType: TerminalBuiltinLinkType | string;
 		}, {
-			owner: 'tyriar';
+			owner: 'anthonykim1';
 			comment: 'When the user opens a link in the terminal';
 			linkType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of link being opened' };
 		}>('terminal/openLink', { linkType: isString(link.type) ? link.type : `extension:${link.type.id}` });
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
index b7d264ee0c8..b5f0421b343 100644
--- a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
@@ -1428,7 +1428,7 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 	private _sendLatencyStats(stats: PredictionStats) {
 		/* __GDPR__
 			"terminalLatencyStats" : {
-				"owner": "Tyriar",
+				"owner": "anthonykim1",
 				"min" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 				"max" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 				"median" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
index e19fc273fd5..3dbd89389eb 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
@@ -39,6 +39,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
@@ -78,13 +79,23 @@ export class TestCoverageView extends ViewPane {
 		@IThemeService themeService: IThemeService,
 		@IHoverService hoverService: IHoverService,
 		@ITestCoverageService private readonly coverageService: ITestCoverageService,
+		@IStorageService private readonly storageService: IStorageService,
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
+		const storedOrder = this.storageService.getNumber('testing.coverageSortOrder', StorageScope.WORKSPACE);
+		if (storedOrder !== undefined && storedOrder >= CoverageSortOrder.Coverage && storedOrder <= CoverageSortOrder.Name) {
+			this.sortOrder.set(storedOrder, undefined);
+		}
 	}
 
 	protected override renderBody(container: HTMLElement): void {
 		super.renderBody(container);
 
+		this._register(autorun(reader => {
+			const order = this.sortOrder.read(reader);
+			this.storageService.store('testing.coverageSortOrder', order, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		}));
+
 		const labels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility }));
 
 		this._register(autorun(reader => {
diff --git a/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts b/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts
index 94cb8a0f182..cf9ae07107f 100644
--- a/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts
+++ b/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts
@@ -31,14 +31,14 @@ import {
 	ToolProgress,
 } from '../../chat/common/tools/languageModelToolsService.js';
 import { TestId } from './testId.js';
-import { FileCoverage, getTotalCoveragePercent } from './testCoverage.js';
+import { FileCoverage, TestCoverage, getTotalCoveragePercent } from './testCoverage.js';
 import { TestingContextKeys } from './testingContextKeys.js';
 import { collectTestStateCounts, getTestProgressText } from './testingProgressMessages.js';
 import { isFailedState } from './testingStates.js';
 import { LiveTestResult } from './testResult.js';
 import { ITestResultService } from './testResultService.js';
 import { ITestService, testsInFile, waitForTestToBeIdle } from './testService.js';
-import { IncrementalTestCollectionItem, TestItemExpandState, TestMessageType, TestResultState, TestRunProfileBitset } from './testTypes.js';
+import { DetailType, IncrementalTestCollectionItem, TestItemExpandState, TestMessageType, TestResultState, TestRunProfileBitset } from './testTypes.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { ITestProfileService } from './testProfileService.js';
 
@@ -70,7 +70,7 @@ interface IRunTestToolParams {
 	mode?: Mode;
 }
 
-class RunTestTool implements IToolImpl {
+export class RunTestTool implements IToolImpl {
 	public static readonly ID = 'runTests';
 	public static readonly DEFINITION: IToolData = {
 		id: this.ID,
@@ -101,7 +101,7 @@ class RunTestTool implements IToolImpl {
 				coverageFiles: {
 					type: 'array',
 					items: { type: 'string' },
-					description: 'When mode="coverage": absolute file paths to include detailed coverage info for. Only the first matching file will be summarized.'
+					description: 'When mode="coverage": absolute file paths to include detailed coverage info for. If not provided, a file-level summary of all files with incomplete coverage is shown.'
 				}
 			},
 		},
@@ -168,7 +168,7 @@ class RunTestTool implements IToolImpl {
 			};
 		}
 
-		const summary = await this._buildSummary(result, mode, coverageFiles);
+		const summary = await buildTestRunSummary(result, mode, coverageFiles);
 		const content = [{ kind: 'text', value: summary } as const];
 
 		return {
@@ -177,132 +177,6 @@ class RunTestTool implements IToolImpl {
 		};
 	}
 
-	private async _buildSummary(result: LiveTestResult, mode: Mode, coverageFiles: string[] | undefined): Promise<string> {
-		const failures = result.counts[TestResultState.Errored] + result.counts[TestResultState.Failed];
-		let str = `<summary passed=${result.counts[TestResultState.Passed]} failed=${failures} />\n`;
-		if (failures !== 0) {
-			str += await this._getFailureDetails(result);
-		}
-		if (mode === 'coverage') {
-			str += await this._getCoverageSummary(result, coverageFiles);
-		}
-		return str;
-	}
-
-	private async _getCoverageSummary(result: LiveTestResult, coverageFiles: string[] | undefined): Promise<string> {
-		if (!coverageFiles || !coverageFiles.length) {
-			return '';
-		}
-		for (const task of result.tasks) {
-			const coverage = task.coverage.get();
-			if (!coverage) {
-				continue;
-			}
-			const normalized = coverageFiles.map(file => URI.file(file).fsPath);
-			const coveredFilesMap = new Map<string, FileCoverage>();
-			for (const file of coverage.getAllFiles().values()) {
-				coveredFilesMap.set(file.uri.fsPath, file);
-			}
-			for (const path of normalized) {
-				const file = coveredFilesMap.get(path);
-				if (!file) {
-					continue;
-				}
-				let summary = `<coverage task=${JSON.stringify(task.name || '')}>\n`;
-				const pct = getTotalCoveragePercent(file.statement, file.branch, file.declaration) * 100;
-				summary += `<firstUncoveredFile path=${JSON.stringify(path)} statementsCovered=${file.statement.covered} statementsTotal=${file.statement.total}`;
-				if (file.branch) {
-					summary += ` branchesCovered=${file.branch.covered} branchesTotal=${file.branch.total}`;
-				}
-				if (file.declaration) {
-					summary += ` declarationsCovered=${file.declaration.covered} declarationsTotal=${file.declaration.total}`;
-				}
-				summary += ` percent=${pct.toFixed(2)}`;
-				try {
-					const details = await file.details();
-					for (const detail of details) {
-						if (detail.count || !detail.location) {
-							continue;
-						}
-						let startLine: number;
-						let endLine: number;
-						if (Position.isIPosition(detail.location)) {
-							startLine = endLine = detail.location.lineNumber;
-						} else {
-							startLine = detail.location.startLineNumber;
-							endLine = detail.location.endLineNumber;
-						}
-						summary += ` firstUncoveredStart=${startLine} firstUncoveredEnd=${endLine}`;
-						break;
-					}
-				} catch { /* ignore */ }
-				summary += ` />\n`;
-				summary += `</coverage>\n`;
-				return summary;
-			}
-		}
-		return '';
-	}
-
-	private async _getFailureDetails(result: LiveTestResult): Promise<string> {
-		let str = '';
-		let hadMessages = false;
-		for (const failure of result.tests) {
-			if (!isFailedState(failure.ownComputedState)) {
-				continue;
-			}
-
-			const [, ...testPath] = TestId.split(failure.item.extId);
-			const testName = testPath.pop();
-			str += `<testFailure name=${JSON.stringify(testName)} path=${JSON.stringify(testPath.join(' > '))}>\n`;
-			// Extract detailed failure information from error messages
-			for (const task of failure.tasks) {
-				for (const message of task.messages.filter(m => m.type === TestMessageType.Error)) {
-					hadMessages = true;
-
-					// Add expected/actual outputs if available
-					if (message.expected !== undefined && message.actual !== undefined) {
-						str += `<expectedOutput>\n${message.expected}\n</expectedOutput>\n`;
-						str += `<actualOutput>\n${message.actual}\n</actualOutput>\n`;
-					} else {
-						// Fallback to the message content
-						const messageText = typeof message.message === 'string' ? message.message : message.message.value;
-						str += `<message>\n${messageText}\n</message>\n`;
-					}
-
-					// Add stack trace information if available (limit to first 10 frames)
-					if (message.stackTrace && message.stackTrace.length > 0) {
-						for (const frame of message.stackTrace.slice(0, 10)) {
-							if (frame.uri && frame.position) {
-								str += `<stackFrame path="${frame.uri.fsPath}" line="${frame.position.lineNumber}" col="${frame.position.column}" />\n`;
-							} else if (frame.uri) {
-								str += `<stackFrame path="${frame.uri.fsPath}">${frame.label}</stackFrame>\n`;
-							} else {
-								str += `<stackFrame>${frame.label}</stackFrame>\n`;
-							}
-						}
-					}
-
-					// Add location information if available
-					if (message.location) {
-						str += `<location path="${message.location.uri.fsPath}" line="${message.location.range.startLineNumber}" col="${message.location.range.startColumn}" />\n`;
-					}
-				}
-			}
-
-			str += `</testFailure>\n`;
-		}
-
-		if (!hadMessages) { // some adapters don't have any per-test messages and just output
-			const output = result.tasks.map(t => t.output.getRange(0, t.output.length).toString().trim()).join('\n');
-			if (output) {
-				str += `<output>\n${output}\n</output>\n`;
-			}
-		}
-
-		return str;
-	}
-
 	/** Updates the UI progress as the test runs, resolving when the run is finished. */
 	private async _monitorRunProgress(result: LiveTestResult, progress: ToolProgress, token: CancellationToken): Promise<void> {
 		const store = new DisposableStore();
@@ -451,3 +325,202 @@ class RunTestTool implements IToolImpl {
 		});
 	}
 }
+
+/** Builds the full summary string for a completed test run. */
+export async function buildTestRunSummary(result: LiveTestResult, mode: Mode, coverageFiles: string[] | undefined): Promise<string> {
+	const failures = result.counts[TestResultState.Errored] + result.counts[TestResultState.Failed];
+	let str = `<summary passed=${result.counts[TestResultState.Passed]} failed=${failures} />\n`;
+	if (failures !== 0) {
+		str += await getFailureDetails(result);
+	}
+	if (mode === 'coverage') {
+		str += await getCoverageSummary(result, coverageFiles);
+	}
+	return str;
+}
+
+/** Gets a coverage summary from a test result, either overall or per-file. */
+export async function getCoverageSummary(result: LiveTestResult, coverageFiles: string[] | undefined): Promise<string> {
+	let str = '';
+	for (const task of result.tasks) {
+		const coverage = task.coverage.get();
+		if (!coverage) {
+			continue;
+		}
+
+		if (!coverageFiles || !coverageFiles.length) {
+			str += getOverallCoverageSummary(coverage);
+			continue;
+		}
+
+		const normalized = coverageFiles.map(file => URI.file(file).fsPath);
+		const coveredFilesMap = new Map<string, FileCoverage>();
+		for (const file of coverage.getAllFiles().values()) {
+			coveredFilesMap.set(file.uri.fsPath, file);
+		}
+
+		for (const path of normalized) {
+			const file = coveredFilesMap.get(path);
+			if (!file) {
+				continue;
+			}
+			str += await getFileCoverageDetails(file, path);
+		}
+	}
+	return str;
+}
+
+/** Gets a file-level coverage overview sorted by lowest coverage first. */
+export function getOverallCoverageSummary(coverage: TestCoverage): string {
+	const files = [...coverage.getAllFiles().values()]
+		.map(f => ({ path: f.uri.fsPath, pct: getTotalCoveragePercent(f.statement, f.branch, f.declaration) * 100 }))
+		.filter(f => f.pct < 100)
+		.sort((a, b) => a.pct - b.pct);
+
+	if (!files.length) {
+		return '<coverageSummary>All files have 100% coverage.</coverageSummary>\n';
+	}
+
+	let str = '<coverageSummary>\n';
+	for (const f of files) {
+		str += `<file path="${f.path}" percent=${f.pct.toFixed(1)} />\n`;
+	}
+	str += '</coverageSummary>\n';
+	return str;
+}
+
+/** Gets detailed coverage information for a single file including uncovered items. */
+export async function getFileCoverageDetails(file: FileCoverage, path: string): Promise<string> {
+	const pct = getTotalCoveragePercent(file.statement, file.branch, file.declaration) * 100;
+	let str = `<coverage path="${path}" percent=${pct.toFixed(1)} statements=${file.statement.covered}/${file.statement.total}`;
+	if (file.branch) {
+		str += ` branches=${file.branch.covered}/${file.branch.total}`;
+	}
+	if (file.declaration) {
+		str += ` declarations=${file.declaration.covered}/${file.declaration.total}`;
+	}
+	str += '>\n';
+
+	try {
+		const details = await file.details();
+
+		const uncoveredDeclarations: { name: string; line: number }[] = [];
+		const uncoveredBranches: { line: number; label?: string }[] = [];
+		const uncoveredLines: [number, number][] = [];
+
+		for (const detail of details) {
+			if (detail.type === DetailType.Declaration) {
+				if (!detail.count) {
+					const line = Position.isIPosition(detail.location) ? detail.location.lineNumber : detail.location.startLineNumber;
+					uncoveredDeclarations.push({ name: detail.name, line });
+				}
+			} else {
+				if (!detail.count) {
+					const startLine = Position.isIPosition(detail.location) ? detail.location.lineNumber : detail.location.startLineNumber;
+					const endLine = Position.isIPosition(detail.location) ? detail.location.lineNumber : detail.location.endLineNumber;
+					uncoveredLines.push([startLine, endLine]);
+				}
+				if (detail.branches) {
+					for (const branch of detail.branches) {
+						if (!branch.count) {
+							let line: number;
+							if (branch.location) {
+								line = Position.isIPosition(branch.location) ? branch.location.lineNumber : branch.location.startLineNumber;
+							} else {
+								line = Position.isIPosition(detail.location) ? detail.location.lineNumber : detail.location.startLineNumber;
+							}
+							uncoveredBranches.push({ line, label: branch.label });
+						}
+					}
+				}
+			}
+		}
+
+		if (uncoveredDeclarations.length) {
+			str += 'uncovered functions: ' + uncoveredDeclarations.map(d => `${d.name}(L${d.line})`).join(', ') + '\n';
+		}
+		if (uncoveredBranches.length) {
+			str += 'uncovered branches: ' + uncoveredBranches.map(b => b.label ? `L${b.line}(${b.label})` : `L${b.line}`).join(', ') + '\n';
+		}
+		if (uncoveredLines.length) {
+			str += 'uncovered lines: ' + mergeLineRanges(uncoveredLines) + '\n';
+		}
+	} catch { /* ignore - details not available */ }
+
+	str += '</coverage>\n';
+	return str;
+}
+
+/** Merges overlapping/contiguous line ranges and formats them compactly. */
+export function mergeLineRanges(ranges: [number, number][]): string {
+	if (!ranges.length) {
+		return '';
+	}
+	ranges.sort((a, b) => a[0] - b[0]);
+	const merged: [number, number][] = [ranges[0]];
+	for (let i = 1; i < ranges.length; i++) {
+		const last = merged[merged.length - 1];
+		const [start, end] = ranges[i];
+		if (start <= last[1] + 1) {
+			last[1] = Math.max(last[1], end);
+		} else {
+			merged.push([start, end]);
+		}
+	}
+	return merged.map(([s, e]) => s === e ? `${s}` : `${s}-${e}`).join(', ');
+}
+
+/** Formats failure details from a test result into an XML-like string. */
+export async function getFailureDetails(result: LiveTestResult): Promise<string> {
+	let str = '';
+	let hadMessages = false;
+	for (const failure of result.tests) {
+		if (!isFailedState(failure.ownComputedState)) {
+			continue;
+		}
+
+		const [, ...testPath] = TestId.split(failure.item.extId);
+		const testName = testPath.pop();
+		str += `<testFailure name=${JSON.stringify(testName)} path=${JSON.stringify(testPath.join(' > '))}>\n`;
+		for (const task of failure.tasks) {
+			for (const message of task.messages.filter(m => m.type === TestMessageType.Error)) {
+				hadMessages = true;
+
+				if (message.expected !== undefined && message.actual !== undefined) {
+					str += `<expectedOutput>\n${message.expected}\n</expectedOutput>\n`;
+					str += `<actualOutput>\n${message.actual}\n</actualOutput>\n`;
+				} else {
+					const messageText = typeof message.message === 'string' ? message.message : message.message.value;
+					str += `<message>\n${messageText}\n</message>\n`;
+				}
+
+				if (message.stackTrace && message.stackTrace.length > 0) {
+					for (const frame of message.stackTrace.slice(0, 10)) {
+						if (frame.uri && frame.position) {
+							str += `<stackFrame path="${frame.uri.fsPath}" line="${frame.position.lineNumber}" col="${frame.position.column}" />\n`;
+						} else if (frame.uri) {
+							str += `<stackFrame path="${frame.uri.fsPath}">${frame.label}</stackFrame>\n`;
+						} else {
+							str += `<stackFrame>${frame.label}</stackFrame>\n`;
+						}
+					}
+				}
+
+				if (message.location) {
+					str += `<location path="${message.location.uri.fsPath}" line="${message.location.range.startLineNumber}" col="${message.location.range.startColumn}" />\n`;
+				}
+			}
+		}
+
+		str += `</testFailure>\n`;
+	}
+
+	if (!hadMessages) {
+		const output = result.tasks.map(t => t.output.getRange(0, t.output.length).toString().trim()).join('\n');
+		if (output) {
+			str += `<output>\n${output}\n</output>\n`;
+		}
+	}
+
+	return str;
+}
diff --git a/src/vs/workbench/contrib/testing/test/common/testingChatAgentTool.test.ts b/src/vs/workbench/contrib/testing/test/common/testingChatAgentTool.test.ts
new file mode 100644
index 00000000000..a6ede42a998
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/common/testingChatAgentTool.test.ts
@@ -0,0 +1,721 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { upcastPartial } from '../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IExtUri } from '../../../../../base/common/resources.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+import { IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep } from '../../../chat/common/tools/languageModelToolsService.js';
+import { FileCoverage, ICoverageAccessor, TestCoverage } from '../../common/testCoverage.js';
+import { LiveTestResult } from '../../common/testResult.js';
+import { ITestResultService } from '../../common/testResultService.js';
+import { IMainThreadTestCollection, ITestService } from '../../common/testService.js';
+import { CoverageDetails, DetailType, IBranchCoverage, IDeclarationCoverage, IFileCoverage, IStatementCoverage, ResolvedTestRunRequest, TestMessageType, TestResultState, TestRunProfileBitset } from '../../common/testTypes.js';
+import { ITestProfileService } from '../../common/testProfileService.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { TestId } from '../../common/testId.js';
+import { RunTestTool, buildTestRunSummary, getCoverageSummary, getOverallCoverageSummary, getFileCoverageDetails, mergeLineRanges, getFailureDetails } from '../../common/testingChatAgentTool.js';
+
+suite('Workbench - RunTestTool', () => {
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let insertCounter = 0;
+	let tool: RunTestTool;
+
+	const noopProgress = {
+		report: (_update: IToolProgressStep) => { },
+	};
+	const noopCountTokens = () => Promise.resolve(0);
+
+	function createLiveTestResult(request?: ResolvedTestRunRequest): LiveTestResult {
+		const req = request ?? {
+			group: TestRunProfileBitset.Run,
+			targets: [{ profileId: 0, controllerId: 'ctrlId', testIds: ['id-a'] }],
+		};
+		return ds.add(new LiveTestResult(
+			`result-${insertCounter++}`,
+			false,
+			req,
+			insertCounter,
+			NullTelemetryService,
+		));
+	}
+
+	function createTestCoverage(files: { uri: URI; statement: { covered: number; total: number }; branch?: { covered: number; total: number }; declaration?: { covered: number; total: number }; details?: CoverageDetails[] }[]): TestCoverage {
+		const result = createLiveTestResult();
+		const accessor: ICoverageAccessor = {
+			getCoverageDetails: (id, _testId, _token) => {
+				const entry = files.find(f => f.uri.toString() === id);
+				return Promise.resolve(entry?.details ?? []);
+			},
+		};
+		const uriIdentity = upcastPartial<IUriIdentityService>({
+			asCanonicalUri: (uri: URI) => uri,
+			extUri: upcastPartial<IExtUri>({
+				isEqual: (a: URI, b: URI) => a.toString() === b.toString(),
+				ignorePathCasing: () => false,
+			}),
+		});
+		const coverage = new TestCoverage(result, 'task-1', uriIdentity, accessor);
+		for (const f of files) {
+			const fileCoverage: IFileCoverage = {
+				id: f.uri.toString(),
+				uri: f.uri,
+				statement: f.statement,
+				branch: f.branch,
+				declaration: f.declaration,
+			};
+			coverage.append(fileCoverage, undefined);
+		}
+		return coverage;
+	}
+
+	function makeStatement(line: number, count: number, endLine?: number, branches?: IBranchCoverage[]): IStatementCoverage {
+		return {
+			type: DetailType.Statement,
+			count,
+			location: new Range(line, 1, endLine ?? line, 1),
+			branches,
+		};
+	}
+
+	function makeDeclaration(name: string, line: number, count: number): IDeclarationCoverage {
+		return {
+			type: DetailType.Declaration,
+			name,
+			count,
+			location: new Range(line, 1, line, 1),
+		};
+	}
+
+	function makeBranch(line: number, count: number, label?: string): IBranchCoverage {
+		return {
+			count,
+			label,
+			location: new Range(line, 1, line, 1),
+		};
+	}
+
+	function createResultWithCoverage(coverageData: TestCoverage): LiveTestResult {
+		const result = createLiveTestResult();
+		result.addTask({ id: 'task-1', name: 'Test Task', running: true, ctrlId: 'ctrlId' });
+		const taskCov = result.tasks[0].coverage as ReturnType<typeof observableValue<TestCoverage | undefined>>;
+		taskCov.set(coverageData, undefined);
+		return result;
+	}
+
+	function createResultWithTests(tests: { extId: string; label: string; state: TestResultState; messages?: { type: TestMessageType; message: string; expected?: string; actual?: string; location?: { uri: URI; range: Range }; stackTrace?: { uri?: URI; position?: { lineNumber: number; column: number }; label: string }[] }[] }[]): LiveTestResult {
+		const result = createLiveTestResult();
+		result.addTask({ id: 't', name: 'Test Task', running: true, ctrlId: 'ctrlId' });
+
+		for (const t of tests) {
+			const chain = TestId.split(t.extId);
+			const items = chain.map((segment, i) => ({
+				extId: new TestId(chain.slice(0, i + 1)).toString(),
+				label: i === chain.length - 1 ? t.label : segment,
+				busy: false,
+				description: null,
+				error: null,
+				range: null,
+				sortText: null,
+				tags: [],
+				uri: undefined,
+			}));
+			result.addTestChainToRun('ctrlId', items);
+		}
+
+		for (const t of tests) {
+			result.updateState(t.extId, 't', t.state);
+			if (t.messages) {
+				for (const msg of t.messages) {
+					result.appendMessage(t.extId, 't', {
+						type: msg.type as TestMessageType.Error,
+						message: msg.message,
+						expected: msg.expected,
+						actual: msg.actual,
+						contextValue: undefined,
+						location: msg.location ? { uri: msg.location.uri, range: msg.location.range } : undefined,
+						stackTrace: msg.stackTrace?.map(f => ({
+							uri: f.uri,
+							position: f.position ? new Position(f.position.lineNumber, f.position.column) : undefined,
+							label: f.label,
+						})),
+					});
+				}
+			}
+		}
+
+		return result;
+	}
+
+	function createFileCov(uri: URI, statement: { covered: number; total: number }, details: CoverageDetails[], opts?: { branch?: { covered: number; total: number }; declaration?: { covered: number; total: number } }): FileCoverage {
+		const result = createLiveTestResult();
+		const accessor: ICoverageAccessor = {
+			getCoverageDetails: () => Promise.resolve(details),
+		};
+		return new FileCoverage({ id: 'file-1', uri, statement, branch: opts?.branch, declaration: opts?.declaration }, result, accessor);
+	}
+
+	setup(() => {
+		insertCounter = 0;
+
+		const mockTestService = upcastPartial<ITestService>({
+			collection: upcastPartial<IMainThreadTestCollection>({
+				rootItems: [],
+				rootIds: [],
+				expand: () => Promise.resolve(),
+				getNodeById: () => undefined,
+				getNodeByUrl: () => [],
+			}),
+			runTests: () => Promise.resolve(upcastPartial({})),
+			cancelTestRun: () => { },
+		});
+
+		const mockResultService = upcastPartial<ITestResultService>({
+			onResultsChanged: Event.None,
+		});
+
+		const mockProfileService = upcastPartial<ITestProfileService>({
+			capabilitiesForTest: () => TestRunProfileBitset.Run | TestRunProfileBitset.Coverage,
+		});
+
+		const mockUriIdentity = upcastPartial<IUriIdentityService>({
+			asCanonicalUri: (uri: URI) => uri,
+			extUri: upcastPartial<IExtUri>({ isEqual: (a: URI, b: URI) => a.toString() === b.toString() }),
+		});
+
+		const mockWorkspaceContext = upcastPartial<IWorkspaceContextService>({
+			getWorkspace: () => upcastPartial<IWorkspace>({ id: 'test', folders: [upcastPartial<IWorkspaceFolder>({ uri: URI.file('/workspace') })] }),
+		});
+
+		tool = new RunTestTool(
+			mockTestService,
+			mockUriIdentity,
+			mockWorkspaceContext,
+			mockResultService,
+			mockProfileService,
+		);
+	});
+
+	suite('invoke', () => {
+		test('returns error when no tests found', async () => {
+			const result = await tool.invoke(
+				upcastPartial<IToolInvocation>({ parameters: { files: ['/nonexistent/test.ts'] } }),
+				noopCountTokens, noopProgress, CancellationToken.None,
+			);
+			assert.ok(result.toolResultError);
+			assert.ok(result.content[0].kind === 'text' && result.content[0].value.includes('No tests found'));
+		});
+	});
+
+	suite('_buildSummary', () => {
+		test('includes pass/fail counts', async () => {
+			const result = createResultWithTests([
+				{ extId: new TestId(['ctrlId', 'a']).toString(), label: 'a', state: TestResultState.Passed },
+				{ extId: new TestId(['ctrlId', 'b']).toString(), label: 'b', state: TestResultState.Failed, messages: [{ type: TestMessageType.Error, message: 'boom' }] },
+			]);
+			result.markComplete();
+
+			const summary = await buildTestRunSummary(result, 'run', undefined);
+			assert.ok(summary.includes('<summary passed=1 failed=1 />'));
+		});
+
+		test('combines errored and failed in failure count', async () => {
+			const result = createResultWithTests([
+				{ extId: new TestId(['ctrlId', 'a']).toString(), label: 'a', state: TestResultState.Failed, messages: [{ type: TestMessageType.Error, message: 'fail' }] },
+				{ extId: new TestId(['ctrlId', 'b']).toString(), label: 'b', state: TestResultState.Errored, messages: [{ type: TestMessageType.Error, message: 'error' }] },
+				{ extId: new TestId(['ctrlId', 'c']).toString(), label: 'c', state: TestResultState.Passed },
+			]);
+			result.markComplete();
+
+			const summary = await buildTestRunSummary(result, 'run', undefined);
+			assert.ok(summary.includes('failed=2'));
+		});
+
+		test('includes coverage when mode is coverage', async () => {
+			const coverageData = createTestCoverage([
+				{ uri: URI.file('/src/a.ts'), statement: { covered: 8, total: 10 } },
+			]);
+			const result = createResultWithCoverage(coverageData);
+			result.markComplete();
+
+			const summary = await buildTestRunSummary(result, 'coverage', undefined);
+			assert.ok(summary.includes('<coverageSummary>'));
+		});
+
+		test('omits coverage when mode is run', async () => {
+			const result = createLiveTestResult();
+			result.addTask({ id: 't', name: 'n', running: true, ctrlId: 'ctrl' });
+			result.markComplete();
+
+			const summary = await buildTestRunSummary(result, 'run', undefined);
+			assert.ok(!summary.includes('<coverage'));
+		});
+	});
+
+	suite('getCoverageSummary', () => {
+		test('returns overall summary when no coverageFiles specified', async () => {
+			const fileA = URI.file('/src/a.ts');
+			const fileB = URI.file('/src/b.ts');
+			const coverageData = createTestCoverage([
+				{ uri: fileA, statement: { covered: 5, total: 10 } },
+				{ uri: fileB, statement: { covered: 10, total: 10 } },
+			]);
+			const result = createResultWithCoverage(coverageData);
+
+			const summary = await getCoverageSummary(result, undefined);
+			assert.ok(summary.includes('<coverageSummary>'));
+			assert.ok(summary.includes(fileA.fsPath));
+			assert.ok(!summary.includes(fileB.fsPath)); // 100% covered, excluded
+		});
+
+		test('returns detailed summary for specified coverageFiles', async () => {
+			const fileA = URI.file('/src/a.ts');
+			const details: CoverageDetails[] = [
+				makeDeclaration('uncoveredFn', 10, 0),
+				makeStatement(20, 0, 25),
+			];
+			const coverageData = createTestCoverage([
+				{ uri: fileA, statement: { covered: 8, total: 10 }, declaration: { covered: 0, total: 1 }, details },
+			]);
+			const result = createResultWithCoverage(coverageData);
+
+			const summary = await getCoverageSummary(result, [fileA.fsPath]);
+			assert.ok(summary.includes(`<coverage path="${fileA.fsPath}"`));
+			assert.ok(summary.includes('uncovered functions:'));
+			assert.ok(summary.includes('uncoveredFn(L10)'));
+			assert.ok(summary.includes('uncovered lines:'));
+		});
+
+		test('returns empty string when no coverage data exists', async () => {
+			const fileA = URI.file('/src/a.ts');
+			const result = createLiveTestResult();
+			result.addTask({ id: 't', name: 'n', running: true, ctrlId: 'ctrl' });
+
+			const summary = await getCoverageSummary(result, [fileA.fsPath]);
+			assert.strictEqual(summary, '');
+		});
+
+		test('handles multiple coverageFiles', async () => {
+			const fileA = URI.file('/src/a.ts');
+			const fileB = URI.file('/src/b.ts');
+			const coverageData = createTestCoverage([
+				{ uri: fileA, statement: { covered: 8, total: 10 }, details: [makeStatement(5, 0)] },
+				{ uri: fileB, statement: { covered: 3, total: 10 }, details: [makeDeclaration('fn', 1, 0)] },
+			]);
+			const result = createResultWithCoverage(coverageData);
+
+			const summary = await getCoverageSummary(result, [fileA.fsPath, fileB.fsPath]);
+			assert.ok(summary.includes(fileA.fsPath));
+			assert.ok(summary.includes(fileB.fsPath));
+		});
+
+		test('skips non-matching coverageFiles gracefully', async () => {
+			const fileA = URI.file('/src/a.ts');
+			const nonExistent = URI.file('/src/nonexistent.ts');
+			const coverageData = createTestCoverage([
+				{ uri: fileA, statement: { covered: 8, total: 10 } },
+			]);
+			const result = createResultWithCoverage(coverageData);
+
+			const summary = await getCoverageSummary(result, [nonExistent.fsPath]);
+			assert.strictEqual(summary, '');
+		});
+	});
+
+	suite('getOverallCoverageSummary', () => {
+		test('returns all-covered message when everything is 100%', () => {
+			const coverage = createTestCoverage([
+				{ uri: URI.file('/src/a.ts'), statement: { covered: 10, total: 10 } },
+				{ uri: URI.file('/src/b.ts'), statement: { covered: 5, total: 5 } },
+			]);
+			assert.strictEqual(
+				getOverallCoverageSummary(coverage),
+				'<coverageSummary>All files have 100% coverage.</coverageSummary>\n',
+			);
+		});
+
+		test('sorts files by coverage ascending', () => {
+			const high = URI.file('/src/high.ts');
+			const low = URI.file('/src/low.ts');
+			const mid = URI.file('/src/mid.ts');
+			const coverage = createTestCoverage([
+				{ uri: high, statement: { covered: 9, total: 10 } },
+				{ uri: low, statement: { covered: 3, total: 10 } },
+				{ uri: mid, statement: { covered: 7, total: 10 } },
+			]);
+			const summary = getOverallCoverageSummary(coverage);
+			const lowIdx = summary.indexOf(low.fsPath);
+			const midIdx = summary.indexOf(mid.fsPath);
+			const highIdx = summary.indexOf(high.fsPath);
+			assert.ok(lowIdx < midIdx && midIdx < highIdx);
+		});
+
+		test('excludes 100% files from listing', () => {
+			const partial = URI.file('/src/partial.ts');
+			const full = URI.file('/src/full.ts');
+			const coverage = createTestCoverage([
+				{ uri: partial, statement: { covered: 5, total: 10 } },
+				{ uri: full, statement: { covered: 10, total: 10 } },
+			]);
+			const summary = getOverallCoverageSummary(coverage);
+			assert.ok(summary.includes(partial.fsPath));
+			assert.ok(!summary.includes(full.fsPath));
+		});
+
+		test('includes percentage in output', () => {
+			const coverage = createTestCoverage([
+				{ uri: URI.file('/src/a.ts'), statement: { covered: 7, total: 10 } },
+			]);
+			const summary = getOverallCoverageSummary(coverage);
+			assert.ok(summary.includes('percent=70.0'));
+		});
+	});
+
+	suite('getFileCoverageDetails', () => {
+		test('shows header with statement counts', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const file = createFileCov(uri, { covered: 8, total: 10 }, []);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('statements=8/10'));
+			assert.ok(output.includes('percent=80.0'));
+			assert.ok(output.startsWith(`<coverage path="${uri.fsPath}"`));
+			assert.ok(output.endsWith('</coverage>\n'));
+		});
+
+		test('includes branch counts when available', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const file = createFileCov(uri, { covered: 8, total: 10 }, [], { branch: { covered: 3, total: 5 } });
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('branches=3/5'));
+		});
+
+		test('includes declaration counts when available', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const file = createFileCov(uri, { covered: 8, total: 10 }, [], { declaration: { covered: 2, total: 4 } });
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('declarations=2/4'));
+		});
+
+		test('omits branch/declaration when not available', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const file = createFileCov(uri, { covered: 8, total: 10 }, []);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(!output.includes('branches='));
+			assert.ok(!output.includes('declarations='));
+		});
+
+		test('lists uncovered declarations', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeDeclaration('handleError', 89, 0),
+				makeDeclaration('processQueue', 120, 0),
+				makeDeclaration('coveredFn', 50, 3),
+			];
+			const file = createFileCov(uri, { covered: 8, total: 10 }, details, { declaration: { covered: 1, total: 3 } });
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('uncovered functions: handleError(L89), processQueue(L120)'));
+			assert.ok(!output.includes('coveredFn'));
+		});
+
+		test('lists uncovered branches with labels', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeStatement(34, 5, undefined, [
+					makeBranch(34, 5, 'then'),
+					makeBranch(36, 0, 'else'),
+				]),
+				makeStatement(56, 2, undefined, [
+					makeBranch(56, 0, 'case "foo"'),
+					makeBranch(58, 2, 'case "bar"'),
+				]),
+			];
+			const file = createFileCov(uri, { covered: 8, total: 10 }, details, { branch: { covered: 2, total: 4 } });
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('uncovered branches: L36(else), L56(case "foo")'));
+		});
+
+		test('lists uncovered branches without labels', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeStatement(10, 1, undefined, [makeBranch(10, 0)]),
+			];
+			const file = createFileCov(uri, { covered: 8, total: 10 }, details);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('uncovered branches: L10\n'));
+		});
+
+		test('uses parent statement location when branch has no location', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeStatement(42, 1, undefined, [{ count: 0, label: 'else' }]),
+			];
+			const file = createFileCov(uri, { covered: 8, total: 10 }, details);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('L42(else)'));
+		});
+
+		test('lists merged uncovered line ranges', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeStatement(23, 0, 27),
+				makeStatement(28, 0, 30),
+				makeStatement(45, 0),
+				makeStatement(67, 0, 72),
+				makeStatement(100, 0, 105),
+				makeStatement(50, 5), // covered
+			];
+			const file = createFileCov(uri, { covered: 5, total: 11 }, details);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes('uncovered lines: 23-30, 45, 67-72, 100-105'));
+		});
+
+		test('omits uncovered sections when all covered', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeDeclaration('fn', 10, 3),
+				makeStatement(20, 5),
+				makeStatement(30, 1, undefined, [makeBranch(30, 1, 'then'), makeBranch(32, 2, 'else')]),
+			];
+			const file = createFileCov(uri, { covered: 10, total: 10 }, details);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(!output.includes('uncovered'));
+		});
+
+		test('handles details() throwing gracefully', async () => {
+			const uri = URI.file('/src/err.ts');
+			const result = createLiveTestResult();
+			const accessor: ICoverageAccessor = {
+				getCoverageDetails: () => Promise.reject(new Error('not available')),
+			};
+			const file = new FileCoverage({ id: 'err', uri, statement: { covered: 5, total: 10 } }, result, accessor);
+			const output = await getFileCoverageDetails(file, uri.fsPath);
+			assert.ok(output.includes(`<coverage path="${uri.fsPath}"`));
+			assert.ok(output.includes('</coverage>'));
+			assert.ok(!output.includes('uncovered'));
+		});
+
+		test('full output snapshot', async () => {
+			const uri = URI.file('/src/foo.ts');
+			const details: CoverageDetails[] = [
+				makeDeclaration('uncoveredFn', 10, 0),
+				makeDeclaration('coveredFn', 20, 3),
+				makeStatement(30, 0, 32),
+				makeStatement(40, 5, undefined, [
+					makeBranch(40, 5, 'then'),
+					makeBranch(42, 0, 'else'),
+				]),
+				makeStatement(50, 3),
+			];
+			const file = createFileCov(
+				uri,
+				{ covered: 8, total: 10 },
+				details,
+				{ branch: { covered: 1, total: 2 }, declaration: { covered: 1, total: 2 } },
+			);
+			assert.deepStrictEqual(
+				await getFileCoverageDetails(file, uri.fsPath),
+				`<coverage path="${uri.fsPath}" percent=71.4 statements=8/10 branches=1/2 declarations=1/2>\n` +
+				'uncovered functions: uncoveredFn(L10)\n' +
+				'uncovered branches: L42(else)\n' +
+				'uncovered lines: 30-32\n' +
+				'</coverage>\n',
+			);
+		});
+	});
+
+	suite('mergeLineRanges', () => {
+		test('returns empty for empty input', () => {
+			assert.strictEqual(mergeLineRanges([]), '');
+		});
+
+		test('single range', () => {
+			assert.strictEqual(mergeLineRanges([[5, 10]]), '5-10');
+		});
+
+		test('single line', () => {
+			assert.strictEqual(mergeLineRanges([[5, 5]]), '5');
+		});
+
+		test('merges contiguous ranges', () => {
+			assert.strictEqual(mergeLineRanges([[1, 3], [4, 6]]), '1-6');
+		});
+
+		test('keeps non-contiguous ranges separate', () => {
+			assert.strictEqual(mergeLineRanges([[1, 3], [10, 12]]), '1-3, 10-12');
+		});
+
+		test('merges overlapping ranges', () => {
+			assert.strictEqual(mergeLineRanges([[1, 5], [3, 8]]), '1-8');
+		});
+
+		test('merges adjacent single-line ranges', () => {
+			assert.strictEqual(mergeLineRanges([[5, 5], [6, 6], [10, 10]]), '5-6, 10');
+		});
+
+		test('handles unsorted input', () => {
+			assert.strictEqual(mergeLineRanges([[10, 12], [1, 3], [4, 6]]), '1-6, 10-12');
+		});
+
+		test('handles complex mixed ranges', () => {
+			assert.strictEqual(mergeLineRanges([[1, 1], [3, 5], [2, 2], [7, 9], [10, 10]]), '1-5, 7-10');
+		});
+	});
+
+	suite('getFailureDetails', () => {
+		test('formats expected/actual outputs', async () => {
+			const result = createResultWithTests([{
+				extId: new TestId(['ctrlId', 'suite', 'myTest']).toString(),
+				label: 'myTest',
+				state: TestResultState.Failed,
+				messages: [{
+					type: TestMessageType.Error,
+					message: 'Assertion failed',
+					expected: 'hello',
+					actual: 'world',
+				}],
+			}]);
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(output.includes('<expectedOutput>\nhello\n</expectedOutput>'));
+			assert.ok(output.includes('<actualOutput>\nworld\n</actualOutput>'));
+		});
+
+		test('formats plain message when no expected/actual', async () => {
+			const result = createResultWithTests([{
+				extId: new TestId(['ctrlId', 'myTest']).toString(),
+				label: 'myTest',
+				state: TestResultState.Failed,
+				messages: [{
+					type: TestMessageType.Error,
+					message: 'Something went wrong',
+				}],
+			}]);
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(output.includes('<message>\nSomething went wrong\n</message>'));
+		});
+
+		test('includes test name and path', async () => {
+			const result = createResultWithTests([{
+				extId: new TestId(['ctrlId', 'suite1', 'suite2', 'myTest']).toString(),
+				label: 'myTest',
+				state: TestResultState.Failed,
+				messages: [{ type: TestMessageType.Error, message: 'fail' }],
+			}]);
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(output.includes('name="myTest"'));
+			assert.ok(output.includes('path="suite1 > suite2"'));
+		});
+
+		test('includes stack trace frames', async () => {
+			const testUri = URI.file('/src/test.ts');
+			const helperUri = URI.file('/src/helper.ts');
+			const result = createResultWithTests([{
+				extId: new TestId(['ctrlId', 'myTest']).toString(),
+				label: 'myTest',
+				state: TestResultState.Failed,
+				messages: [{
+					type: TestMessageType.Error,
+					message: 'fail',
+					stackTrace: [
+						{ uri: testUri, position: { lineNumber: 10, column: 5 }, label: 'testFn' },
+						{ uri: helperUri, position: undefined, label: 'helperFn' },
+						{ uri: undefined, position: undefined, label: 'anonymous' },
+					],
+				}],
+			}]);
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(output.includes(`path="${testUri.fsPath}" line="10" col="5"`));
+			assert.ok(output.includes(`path="${helperUri.fsPath}">helperFn</stackFrame>`));
+			assert.ok(output.includes('>anonymous</stackFrame>'));
+		});
+
+		test('includes location information', async () => {
+			const testUri = URI.file('/src/test.ts');
+			const result = createResultWithTests([{
+				extId: new TestId(['ctrlId', 'myTest']).toString(),
+				label: 'myTest',
+				state: TestResultState.Failed,
+				messages: [{
+					type: TestMessageType.Error,
+					message: 'fail',
+					location: { uri: testUri, range: new Range(42, 8, 42, 20) },
+				}],
+			}]);
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(output.includes(`path="${testUri.fsPath}" line="42" col="8"`));
+		});
+
+		test('skips passing tests', async () => {
+			const result = createResultWithTests([
+				{ extId: new TestId(['ctrlId', 'pass']).toString(), label: 'pass', state: TestResultState.Passed },
+				{ extId: new TestId(['ctrlId', 'fail']).toString(), label: 'fail', state: TestResultState.Failed, messages: [{ type: TestMessageType.Error, message: 'boom' }] },
+			]);
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(!output.includes('name="pass"'));
+			assert.ok(output.includes('name="fail"'));
+		});
+
+		test('shows task output when no per-test messages', async () => {
+			const result = createResultWithTests([{
+				extId: new TestId(['ctrlId', 'myTest']).toString(),
+				label: 'myTest',
+				state: TestResultState.Failed,
+			}]);
+			result.appendOutput(VSBuffer.fromString('raw test output'), 't');
+			result.markComplete();
+
+			const output = await getFailureDetails(result);
+			assert.ok(output.includes('<output>\nraw test output\n</output>'));
+		});
+	});
+
+	suite('prepareToolInvocation', () => {
+		test('shows file names in confirmation', async () => {
+			const prepared = await tool.prepareToolInvocation(
+				upcastPartial<IToolInvocationPreparationContext>({ parameters: { files: ['/path/to/test1.ts', '/path/to/test2.ts'] }, toolCallId: 'call-1', chatSessionResource: undefined }),
+				CancellationToken.None,
+			);
+			assert.ok(prepared);
+			const msg = prepared.confirmationMessages?.message;
+			assert.ok(msg);
+			const msgStr = typeof msg === 'string' ? msg : msg.value;
+			assert.ok(msgStr.includes('test1.ts'));
+			assert.ok(msgStr.includes('test2.ts'));
+		});
+
+		test('shows all-tests message when no files', async () => {
+			const prepared = await tool.prepareToolInvocation(
+				upcastPartial<IToolInvocationPreparationContext>({ parameters: {}, toolCallId: 'call-2', chatSessionResource: undefined }),
+				CancellationToken.None,
+			);
+			assert.ok(prepared);
+			const msg = prepared.confirmationMessages?.message;
+			assert.ok(msg);
+			const msgStr = typeof msg === 'string' ? msg : msg.value;
+			assert.ok(msgStr.toLowerCase().includes('all tests'));
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index 5614822fcb0..382c529d0bd 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -9,7 +9,7 @@ import { MenuRegistry, MenuId, Action2, registerAction2, ISubmenuItem } from '..
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { IWorkbenchThemeService, IWorkbenchTheme, ThemeSettingTarget, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettings } from '../../../services/themes/common/workbenchThemeService.js';
+import { IWorkbenchThemeService, IWorkbenchTheme, ThemeSettingTarget, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettings, ThemeSettingDefaults } from '../../../services/themes/common/workbenchThemeService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IColorRegistry, Extensions as ColorRegistryExtensions } from '../../../../platform/theme/common/colorRegistry.js';
@@ -557,6 +557,90 @@ registerAction2(class extends Action2 {
 	}
 });
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.tryNewDefaultThemes',
+			title: localize2('tryNewDefaultThemes', "Try New Default Themes"),
+			category: Categories.Preferences,
+			f1: true,
+		});
+	}
+	override async run(accessor: ServicesAccessor) {
+		const themeService = accessor.get(IWorkbenchThemeService);
+		const quickInputService = accessor.get(IQuickInputService);
+		const configurationService = accessor.get(IConfigurationService);
+
+		const previousTheme = themeService.getColorTheme();
+		const allThemes = await themeService.getColorThemes();
+		const newThemeSettingsIds = new Set([ThemeSettingDefaults.COLOR_THEME_LIGHT, ThemeSettingDefaults.COLOR_THEME_DARK]);
+		const themes = allThemes.filter(t => newThemeSettingsIds.has(t.settingsId));
+
+		const items: IQuickPickItem[] = themes.map(t => ({
+			id: t.id,
+			label: t.label,
+			description: t.description,
+		}));
+
+		const disposables = new DisposableStore();
+		const picker = disposables.add(quickInputService.createQuickPick<IQuickPickItem>());
+		picker.items = items;
+		picker.placeholder = localize('pickNewTheme', "Pick a new default theme");
+		picker.canSelectMany = false;
+
+		const preferredId = (previousTheme.type === ColorScheme.LIGHT || previousTheme.type === ColorScheme.HIGH_CONTRAST_LIGHT) ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
+		const activeItem = items.find(i => themes.find(t => t.id === i.id)?.settingsId === preferredId);
+		if (activeItem) {
+			picker.activeItems = [activeItem];
+		}
+
+		disposables.add(picker.onDidChangeActive(selected => {
+			if (selected[0]) {
+				const theme = themes.find(t => t.id === selected[0].id);
+				if (theme) {
+					themeService.setColorTheme(theme, 'preview');
+				}
+			}
+		}));
+
+		disposables.add(picker.onDidAccept(() => {
+			const selected = picker.activeItems[0];
+			const theme = selected ? themes.find(t => t.id === selected.id) : undefined;
+
+			picker.hide();
+
+			if (!theme) {
+				return;
+			}
+
+			(async () => {
+				try {
+					await themeService.setColorTheme(theme, 'auto');
+					await configurationService.updateValue(ThemeSettings.PREFERRED_LIGHT_THEME, ThemeSettingDefaults.COLOR_THEME_LIGHT);
+					await configurationService.updateValue(ThemeSettings.PREFERRED_DARK_THEME, ThemeSettingDefaults.COLOR_THEME_DARK);
+				} catch (error) {
+					if (!isCancellationError(error)) {
+						onUnexpectedError(error);
+					}
+				}
+			})();
+		}));
+
+		const result = new Promise<void>(resolve => {
+			disposables.add(picker.onDidHide(() => {
+				if (!picker.selectedItems.length) {
+					themeService.setColorTheme(previousTheme, undefined);
+				}
+				resolve();
+			}));
+		}).finally(() => disposables.dispose());
+
+		picker.show();
+
+		return result;
+	}
+});
+
 CommandsRegistry.registerCommand('workbench.action.previewColorTheme', async function (accessor: ServicesAccessor, extension: { publisher: string; name: string; version: string }, themeSettingsId?: string) {
 	const themeService = accessor.get(IWorkbenchThemeService);
 
@@ -602,13 +686,18 @@ function isItem(i: QuickPickInput<ThemeItem>): i is ThemeItem {
 	return (<any>i)['type'] !== 'separator';
 }
 
+const defaultThemeDescriptions: Record<string, string> = {
+	[ThemeSettingDefaults.COLOR_THEME_LIGHT]: localize('defaultLight', "Default Light"),
+	[ThemeSettingDefaults.COLOR_THEME_DARK]: localize('defaultDark', "Default Dark"),
+};
+
 function toEntry(theme: IWorkbenchTheme): ThemeItem {
 	const settingId = theme.settingsId ?? undefined;
 	const item: ThemeItem = {
 		id: theme.id,
 		theme: theme,
 		label: theme.label,
-		description: theme.description || (theme.label === settingId ? undefined : settingId),
+		description: defaultThemeDescriptions[settingId ?? ''] ?? theme.description ?? (theme.label === settingId ? undefined : settingId),
 	};
 	if (theme.extensionData) {
 		item.buttons = [configureButton];
@@ -617,7 +706,15 @@ function toEntry(theme: IWorkbenchTheme): ThemeItem {
 }
 
 function toEntries(themes: Array<IWorkbenchTheme>, label?: string): QuickPickInput<ThemeItem>[] {
-	const sorter = (t1: ThemeItem, t2: ThemeItem) => t1.label.localeCompare(t2.label);
+	const pinnedIds = new Set([ThemeSettingDefaults.COLOR_THEME_DARK, ThemeSettingDefaults.COLOR_THEME_LIGHT]);
+	const sorter = (t1: ThemeItem, t2: ThemeItem) => {
+		const pin1 = pinnedIds.has(t1.theme?.settingsId ?? '');
+		const pin2 = pinnedIds.has(t2.theme?.settingsId ?? '');
+		if (pin1 !== pin2) {
+			return pin1 ? -1 : 1;
+		}
+		return t1.label.localeCompare(t2.label);
+	};
 	const entries: QuickPickInput<ThemeItem>[] = themes.map(toEntry).sort(sorter);
 	if (entries.length > 0 && label) {
 		entries.unshift({ type: 'separator', label });
diff --git a/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts b/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
index 4c89442974b..33f120ddfeb 100644
--- a/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
+++ b/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
@@ -121,7 +121,7 @@ suite('Color Registry', function () {
 
 		const docUrl = 'https://raw.githubusercontent.com/microsoft/vscode-docs/vnext/api/references/theme-color.md';
 
-		const reqContext = await new RequestService('local', new TestConfigurationService(), environmentService, new NullLogService()).request({ url: docUrl }, CancellationToken.None);
+		const reqContext = await new RequestService('local', new TestConfigurationService(), environmentService, new NullLogService()).request({ url: docUrl, callSite: 'colorRegistry.releaseTest' }, CancellationToken.None);
 		const content = (await asTextOrError(reqContext))!;
 
 		const expression = /-\s*\`([\w\.]+)\`: (.*)/g;
diff --git a/src/vs/workbench/contrib/update/browser/media/updateTitleBarEntry.css b/src/vs/workbench/contrib/update/browser/media/updateTitleBarEntry.css
index eb3ac37b111..91d6c9ad61e 100644
--- a/src/vs/workbench/contrib/update/browser/media/updateTitleBarEntry.css
+++ b/src/vs/workbench/contrib/update/browser/media/updateTitleBarEntry.css
@@ -9,7 +9,7 @@
 	border-radius: var(--vscode-cornerRadius-medium);
 	white-space: nowrap;
 	padding: 0px 12px;
-	height: 24px;
+	height: 22px;
 	background-color: transparent;
 	border: 1px solid transparent;
 }
@@ -46,8 +46,8 @@
 	content: '';
 	position: absolute;
 	left: 0;
-	bottom: 0;
-	height: 2px;
+	bottom: 1px;
+	height: 1px;
 	border-radius: 1px;
 }
 
@@ -80,6 +80,21 @@
 	transition: background 0.3s ease;
 }
 
+/* Bounce animation — macOS dock-style bounce when prominent state appears */
+.monaco-action-bar .update-indicator.prominent {
+	animation: update-indicator-bounce 0.6s ease;
+}
+
+@keyframes update-indicator-bounce {
+	0%   { transform: translateY(0); }
+	20%  { transform: translateY(-6px); }
+	40%  { transform: translateY(0); }
+	55%  { transform: translateY(-3px); }
+	70%  { transform: translateY(0); }
+	85%  { transform: translateY(-1px); }
+	100% { transform: translateY(0); }
+}
+
 /* Reduced motion */
 .monaco-workbench.monaco-reduce-motion .update-indicator.progress-indefinite .indicator-label::after {
 	animation: none;
@@ -88,3 +103,7 @@
 .monaco-workbench.monaco-reduce-motion .update-indicator.progress-percent .indicator-label::after {
 	transition: none;
 }
+
+.monaco-workbench.monaco-reduce-motion .update-indicator.prominent {
+	animation: none;
+}
diff --git a/src/vs/workbench/contrib/update/browser/media/updateTooltip.css b/src/vs/workbench/contrib/update/browser/media/updateTooltip.css
index ab714ea2e0f..48b78f05bd4 100644
--- a/src/vs/workbench/contrib/update/browser/media/updateTooltip.css
+++ b/src/vs/workbench/contrib/update/browser/media/updateTooltip.css
@@ -8,8 +8,8 @@
 	flex-direction: column;
 	gap: 12px;
 	padding: 6px 6px;
-	min-width: 310px;
-	max-width: 410px;
+	min-width: 300px;
+	max-width: 350px;
 	color: var(--vscode-descriptionForeground);
 	font-size: var(--vscode-bodyFontSize-small);
 }
@@ -54,6 +54,30 @@
 	margin-bottom: 4px;
 }
 
+.update-tooltip .product-version {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.update-tooltip .copy-version-button {
+	cursor: pointer;
+	opacity: 0;
+	color: var(--vscode-descriptionForeground);
+	transition: opacity 0.1s;
+	margin-top: -2px;
+}
+
+.update-tooltip .product-version:hover .copy-version-button,
+.update-tooltip .product-version:focus-within .copy-version-button {
+	opacity: 1;
+}
+
+.update-tooltip .copy-version-button:hover,
+.update-tooltip .copy-version-button:focus-visible {
+	color: var(--vscode-foreground);
+}
+
 .update-tooltip .release-notes-link {
 	color: var(--vscode-textLink-foreground);
 	text-decoration: none;
@@ -113,3 +137,23 @@
 .update-tooltip .state-message-icon.codicon.codicon-error {
 	color: var(--vscode-editorError-foreground);
 }
+
+/* Markdown */
+.update-tooltip .update-markdown {
+	background: var(--vscode-editor-background);
+	border-radius: var(--vscode-cornerRadius-large);
+	padding: 12px;
+}
+
+.update-tooltip .update-markdown p {
+	margin-bottom: 16px;
+}
+
+.update-tooltip .update-markdown p:last-child {
+	margin-bottom: 0;
+}
+
+.update-tooltip .update-markdown .codicon[class*='codicon-'] {
+	font-size: 16px;
+	vertical-align: text-top;
+}
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 92c942f9d5e..2cd16781ec5 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -222,7 +222,7 @@ export class ReleaseNotesManager extends Disposable {
 					const file = this._codeEditorService.getActiveCodeEditor()?.getModel()?.getValue();
 					text = file ? file.substring(file.indexOf('#')) : undefined;
 				} else {
-					text = await asTextOrError(await this._requestService.request({ url }, CancellationToken.None));
+					text = await asTextOrError(await this._requestService.request({ url, callSite: 'releaseNotesEditor.fetchReleaseNotes' }, CancellationToken.None));
 				}
 			} catch {
 				throw new Error('Failed to fetch release notes');
@@ -275,7 +275,7 @@ export class ReleaseNotesManager extends Disposable {
 	private async renderBody(fileContent: { text: string; base: URI }) {
 		const nonce = generateUuid();
 
-		const processedContent = await renderReleaseNotesMarkdown(fileContent.text, this._extensionService, this._languageService, this._simpleSettingRenderer);
+		const processedContent = await renderReleaseNotesMarkdown(fileContent.text, this._extensionService, this._languageService, this._simpleSettingRenderer, this._productService.quality);
 
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = colorMap ? generateTokensCSSForColorMap(colorMap) : '';
@@ -774,11 +774,46 @@ export class ReleaseNotesManager extends Disposable {
 	}
 }
 
+/**
+ * Processes conditional blocks in the release notes markdown.
+ *
+ * Conditional blocks use a single HTML comment with the format:
+ * ```
+ * <!-- %IF CONDITION %
+ * Content only visible when CONDITION is active.
+ * %ENDIF % -->
+ * ```
+ *
+ * Supported conditions:
+ * - `IN_PRODUCT` - Content shown in VS Code (both Stable and Insiders)
+ * - `WEB` - Content shown on the website only
+ * - `STABLE` - Content shown in VS Code Stable only
+ * - `INSIDERS` - Content shown in VS Code Insiders only
+ *
+ * On the website, the entire block is a single HTML comment, so the
+ * content is hidden by default. The website renderer would activate
+ * `WEB` blocks by stripping the comment markers.
+ */
+export function processConditionalBlocks(text: string, activeConditions: ReadonlySet<string>): string {
+	return text.replace(
+		/<!--\s*%IF\s+(\w+)\s*%([\s\S]*?)%ENDIF\s*%\s*-->/gi,
+		(_match, condition: string, content: string) => {
+			if (activeConditions.has(condition.toUpperCase())) {
+				// Strip comment markers, reveal content
+				return content;
+			}
+			// Remove the entire block
+			return '';
+		}
+	);
+}
+
 export async function renderReleaseNotesMarkdown(
 	text: string,
 	extensionService: IExtensionService,
 	languageService: ILanguageService,
 	simpleSettingRenderer: SimpleSettingRenderer,
+	quality?: string,
 ): Promise<TrustedHTML> {
 	// Remove HTML comment markers around table of contents navigation
 	text = text
@@ -786,6 +821,15 @@ export async function renderReleaseNotesMarkdown(
 		.replace(/<!--\s*TOC\s*/gi, '')
 		.replace(/\s*Navigation End\s*-->/gi, '');
 
+	// Process conditional blocks based on active conditions
+	const activeConditions = new Set<string>(['IN_PRODUCT']);
+	if (quality === 'stable') {
+		activeConditions.add('STABLE');
+	} else if (quality === 'insider') {
+		activeConditions.add('INSIDERS');
+	}
+	text = processConditionalBlocks(text, activeConditions);
+
 	return renderMarkdownDocument(text, extensionService, languageService, {
 		sanitizerConfig: {
 			allowRelativeMediaPaths: true,
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index aca3bb3ce27..1f0e150c205 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -33,6 +33,8 @@ import { toAction } from '../../../../base/common/actions.js';
 import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
 import { getInternalOrg } from '../../../../platform/assignment/common/assignment.js';
 import { IVersion, preprocessError, tryParseVersion } from '../common/updateUtils.js';
+import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 export const CONTEXT_UPDATE_STATE = new RawContextKey<string>('updateState', StateType.Uninitialized);
 export const MAJOR_MINOR_UPDATE_AVAILABLE = new RawContextKey<boolean>('majorMinorUpdateAvailable', false);
@@ -227,12 +229,14 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 		@IProductService private readonly productService: IProductService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IHostService private readonly hostService: IHostService
+		@IHostService private readonly hostService: IHostService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
 	) {
 		super();
 		this.state = updateService.state;
 		this.updateStateContextKey = CONTEXT_UPDATE_STATE.bindTo(this.contextKeyService);
 		this.majorMinorUpdateAvailableContextKey = MAJOR_MINOR_UPDATE_AVAILABLE.bindTo(this.contextKeyService);
+		this.titleBarEnabled = this.isTitleBarEnabled();
 
 		this._register(updateService.onStateChange(this.onUpdateStateChange, this));
 		this.onUpdateStateChange(this.updateService.state);
@@ -254,10 +258,16 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 			this.storageService.remove('update/updateNotificationTime', StorageScope.APPLICATION);
 		}
 
-		this.titleBarEnabled = this.configurationService.getValue<string>('update.titleBar') !== 'none';
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('update.titleBar')) {
-				this.titleBarEnabled = this.configurationService.getValue<string>('update.titleBar') !== 'none';
+				this.titleBarEnabled = this.isTitleBarEnabled();
+				this.onUpdateStateChange(this.updateService.state);
+			}
+		}));
+
+		this._register(this.layoutService.onDidChangePartVisibility(e => {
+			if (e.partId === Parts.TITLEBAR_PART) {
+				this.titleBarEnabled = this.isTitleBarEnabled();
 				this.onUpdateStateChange(this.updateService.state);
 			}
 		}));
@@ -265,6 +275,11 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 		this.registerGlobalActivityActions();
 	}
 
+	private isTitleBarEnabled(): boolean {
+		return this.configurationService.getValue<string>('update.titleBar') !== 'none'
+			&& this.layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow);
+	}
+
 	private async onUpdateStateChange(state: UpdateState): Promise<void> {
 		this.updateStateContextKey.set(state.type);
 
@@ -465,36 +480,43 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 					})
 				]
 			});
-		} else if ((isWindows && this.productService.target !== 'user') || this.shouldShowNotification()) {
-
-			const actions = [{
-				label: nls.localize('updateNow', "Update Now"),
-				run: () => this.updateService.quitAndInstall()
-			}, {
-				label: nls.localize('later', "Later"),
-				run: () => { }
-			}];
-
-			const productVersion = state.update.productVersion;
-			if (productVersion) {
-				actions.push({
-					label: nls.localize('releaseNotes', "Release Notes"),
-					run: () => {
-						this.instantiationService.invokeFunction(accessor => showReleaseNotes(accessor, productVersion));
-					}
-				});
+		} else {
+			// Dismiss stale overwrite notification if the overwrite resolved without finding a newer update.
+			if (this.overwriteNotificationHandle) {
+				this.overwriteNotificationHandle.close();
+				this.overwriteNotificationHandle = undefined;
 			}
 
-			// windows user fast updates and mac
-			this.notificationService.prompt(
-				severity.Info,
-				nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", this.productService.nameLong),
-				actions,
-				{
-					sticky: true,
-					priority: NotificationPriority.OPTIONAL
+			if ((isWindows && this.productService.target !== 'user') || this.shouldShowNotification()) {
+				const actions = [{
+					label: nls.localize('updateNow', "Update Now"),
+					run: () => this.updateService.quitAndInstall()
+				}, {
+					label: nls.localize('later', "Later"),
+					run: () => { }
+				}];
+
+				const productVersion = state.update.productVersion;
+				if (productVersion) {
+					actions.push({
+						label: nls.localize('releaseNotes', "Release Notes"),
+						run: () => {
+							this.instantiationService.invokeFunction(accessor => showReleaseNotes(accessor, productVersion));
+						}
+					});
 				}
-			);
+
+				// windows user fast updates and mac
+				this.notificationService.prompt(
+					severity.Info,
+					nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", this.productService.nameLong),
+					actions,
+					{
+						sticky: true,
+						priority: NotificationPriority.OPTIONAL
+					}
+				);
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/update/browser/updateStatusBarEntry.ts b/src/vs/workbench/contrib/update/browser/updateStatusBarEntry.ts
index 4ed3e130eea..9051baf1c59 100644
--- a/src/vs/workbench/contrib/update/browser/updateStatusBarEntry.ts
+++ b/src/vs/workbench/contrib/update/browser/updateStatusBarEntry.ts
@@ -37,7 +37,7 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 			return; // Electron only
 		}
 
-		this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip));
+		this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip, false));
 
 		this._register(updateService.onStateChange(this.onStateChange.bind(this)));
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
@@ -67,10 +67,11 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 			this.lastStateType = state.type;
 		}
 
+		this.tooltip.renderState(state);
 		switch (state.type) {
 			case StateType.CheckingForUpdates:
 				this.updateEntry(
-					localize('updateStatus.checkingForUpdates', "$(loading~spin) Checking for updates..."),
+					'$(loading~spin) ' + localize('updateStatus.checkingForUpdates', "Checking for updates..."),
 					localize('updateStatus.checkingForUpdatesAria', "Checking for updates"),
 					ShowTooltipCommand,
 				);
@@ -78,7 +79,7 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 
 			case StateType.AvailableForDownload:
 				this.updateEntry(
-					localize('updateStatus.updateAvailableStatus', "$(circle-filled) Update available, click to download."),
+					'$(circle-filled) ' + localize('updateStatus.updateAvailableStatus', "Update available, click to download."),
 					localize('updateStatus.updateAvailableAria', "Update available, click to download."),
 					'update.downloadNow'
 				);
@@ -94,7 +95,7 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 
 			case StateType.Downloaded:
 				this.updateEntry(
-					localize('updateStatus.updateReadyStatus', "$(circle-filled) Update downloaded, click to install."),
+					'$(circle-filled) ' + localize('updateStatus.updateReadyStatus', "Update downloaded, click to install."),
 					localize('updateStatus.updateReadyAria', "Update downloaded, click to install."),
 					'update.install'
 				);
@@ -110,7 +111,7 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 
 			case StateType.Ready:
 				this.updateEntry(
-					localize('updateStatus.restartToUpdateStatus', "$(circle-filled) Update is ready, click to restart."),
+					'$(circle-filled) ' + localize('updateStatus.restartToUpdateStatus', "Update is ready, click to restart."),
 					localize('updateStatus.restartToUpdateAria', "Update is ready, click to restart."),
 					'update.restart'
 				);
@@ -118,7 +119,7 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 
 			case StateType.Overwriting:
 				this.updateEntry(
-					localize('updateStatus.downloadingNewerUpdateStatus', "$(loading~spin) Downloading update..."),
+					'$(loading~spin) ' + localize('updateStatus.downloadingNewerUpdateStatus', "Downloading update..."),
 					localize('updateStatus.downloadingNewerUpdateAria', "Downloading a newer update"),
 					ShowTooltipCommand
 				);
@@ -154,21 +155,21 @@ export class UpdateStatusBarContribution extends Disposable implements IWorkbenc
 	private getDownloadingText({ downloadedBytes, totalBytes }: Downloading): string {
 		if (downloadedBytes !== undefined && totalBytes !== undefined && totalBytes > 0) {
 			const percent = computeProgressPercent(downloadedBytes, totalBytes) ?? 0;
-			return localize('updateStatus.downloadUpdateProgressStatus', "$(loading~spin) Downloading update: {0} / {1} • {2}%",
+			return '$(loading~spin) ' + localize('updateStatus.downloadUpdateProgressStatus', "Downloading update: {0} / {1} • {2}%",
 				formatBytes(downloadedBytes),
 				formatBytes(totalBytes),
 				percent);
 		} else {
-			return localize('updateStatus.downloadUpdateStatus', "$(loading~spin) Downloading update...");
+			return '$(loading~spin) ' + localize('updateStatus.downloadUpdateStatus', "Downloading update...");
 		}
 	}
 
 	private getUpdatingText({ currentProgress, maxProgress }: Updating): string {
 		const percentage = computeProgressPercent(currentProgress, maxProgress);
 		if (percentage !== undefined) {
-			return localize('updateStatus.installingUpdateProgressStatus', "$(loading~spin) Installing update: {0}%", percentage);
+			return '$(loading~spin) ' + localize('updateStatus.installingUpdateProgressStatus', "Installing update: {0}%", percentage);
 		} else {
-			return localize('updateStatus.installingUpdateStatus', "$(loading~spin) Installing update...");
+			return '$(loading~spin) ' + localize('updateStatus.installingUpdateStatus', "Installing update...");
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.ts b/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.ts
index 93be7e36170..e76e7a1baf5 100644
--- a/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.ts
+++ b/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.ts
@@ -6,7 +6,7 @@
 import * as dom from '../../../../base/browser/dom.js';
 import { BaseActionViewItem, IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { IManagedHoverContent } from '../../../../base/browser/ui/hover/hover.js';
-import { IAction } from '../../../../base/common/actions.js';
+import { IAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
@@ -14,21 +14,32 @@ import { IActionViewItemService } from '../../../../platform/actions/browser/act
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { DisablementReason, IUpdateService, State, StateType } from '../../../../platform/update/common/update.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { computeProgressPercent, tryParseVersion } from '../common/updateUtils.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { computeProgressPercent, isMajorMinorVersionChange } from '../common/updateUtils.js';
 import './media/updateTitleBarEntry.css';
 import { UpdateTooltip } from './updateTooltip.js';
 
 const UPDATE_TITLE_BAR_ACTION_ID = 'workbench.actions.updateIndicator';
 const UPDATE_TITLE_BAR_CONTEXT = new RawContextKey<boolean>('updateTitleBar', false);
-const LAST_KNOWN_VERSION_KEY = 'updateTitleBar/lastKnownVersion';
+
 const ACTIONABLE_STATES: readonly StateType[] = [StateType.AvailableForDownload, StateType.Downloaded, StateType.Ready];
+const DETAILED_STATES: readonly StateType[] = [...ACTIONABLE_STATES, StateType.CheckingForUpdates, StateType.Downloading, StateType.Updating, StateType.Overwriting];
+
+const LAST_KNOWN_VERSION_KEY = 'updateTitleBarEntry/lastKnownVersion';
+
+interface ILastKnownVersion {
+	readonly version: string;
+	readonly commit: string | undefined;
+	readonly timestamp: number;
+}
 
 registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
 	constructor() {
@@ -37,8 +48,8 @@ registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
 			title: localize('updateIndicatorTitleBarAction', 'Update'),
 			f1: false,
 			menu: [{
-				id: MenuId.CommandCenter,
-				order: 10003,
+				id: MenuId.TitleBarAdjacentCenter,
+				order: 0,
 				when: UPDATE_TITLE_BAR_CONTEXT,
 			}]
 		});
@@ -51,10 +62,18 @@ registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
  * Displays update status and actions in the title bar.
  */
 export class UpdateTitleBarContribution extends Disposable implements IWorkbenchContribution {
+	private readonly context!: IContextKey<boolean>;
+	private readonly tooltip!: UpdateTooltip;
+	private mode: 'always' | 'detailed' | 'actionable' | 'none' = 'none';
+	private state!: State;
+	private entry: UpdateTitleBarEntry | undefined;
+	private tooltipVisible = false;
+
 	constructor(
 		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IHostService private readonly hostService: IHostService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IProductService private readonly productService: IProductService,
 		@IStorageService private readonly storageService: IStorageService,
@@ -66,80 +85,117 @@ export class UpdateTitleBarContribution extends Disposable implements IWorkbench
 			return; // Electron only
 		}
 
-		const context = UPDATE_TITLE_BAR_CONTEXT.bindTo(contextKeyService);
+		this.context = UPDATE_TITLE_BAR_CONTEXT.bindTo(contextKeyService);
+		this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip, true));
 
-		const updateContext = () => {
-			const mode = configurationService.getValue<string>('update.titleBar');
-			const state = updateService.state.type;
-			context.set(mode === 'detailed' || mode === 'actionable' && ACTIONABLE_STATES.includes(state));
-		};
-
-		let entry: UpdateTitleBarEntry | undefined;
-		let showTooltipOnRender = false;
-
-		this._register(actionViewItemService.register(
-			MenuId.CommandCenter,
-			UPDATE_TITLE_BAR_ACTION_ID,
-			(action, options) => {
-				entry = instantiationService.createInstance(UpdateTitleBarEntry, action, options, updateContext, showTooltipOnRender);
-				showTooltipOnRender = false;
-				return entry;
-			}
-		));
-
-		const onStateChange = () => {
-			if (this.shouldShowTooltip(updateService.state)) {
-				if (context.get()) {
-					entry?.showTooltip();
-				} else {
-					context.set(true);
-					showTooltipOnRender = true;
-				}
-			} else {
-				updateContext();
-			}
-		};
-
-		this._register(updateService.onStateChange(onStateChange));
+		this.mode = configurationService.getValue<string>('update.titleBar') as typeof this.mode;
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('update.titleBar')) {
-				updateContext();
+				this.mode = configurationService.getValue<string>('update.titleBar') as typeof this.mode;
+				this.onStateChange();
 			}
 		}));
 
-		onStateChange();
+		this.state = updateService.state;
+		this._register(updateService.onStateChange((state) => {
+			this.state = state;
+			this.onStateChange();
+		}));
+
+		this._register(actionViewItemService.register(
+			MenuId.TitleBarAdjacentCenter,
+			UPDATE_TITLE_BAR_ACTION_ID,
+			(action, options) => {
+				this.entry = instantiationService.createInstance(UpdateTitleBarEntry, action, options, this.tooltip, () => {
+					this.tooltipVisible = false;
+					this.updateContext();
+				});
+				if (this.tooltipVisible) {
+					this.entry.showTooltip();
+				}
+				return this.entry;
+			}
+		));
+
+		void this.onStateChange(true);
 	}
 
-	private shouldShowTooltip(state: State): boolean {
-		switch (state.type) {
-			case StateType.Disabled:
-				return state.reason === DisablementReason.InvalidConfiguration || state.reason === DisablementReason.RunningAsAdmin;
-			case StateType.Idle:
-				return !!state.error || state.notAvailable || this.isMajorMinorVersionChange();
-			case StateType.AvailableForDownload:
-			case StateType.Downloaded:
-			case StateType.Ready:
-				return true;
+	private updateContext() {
+		switch (this.mode) {
+			case 'always':
+				this.context.set(true);
+				break;
+			case 'detailed':
+				this.context.set(DETAILED_STATES.includes(this.state.type));
+				break;
+			case 'actionable':
+				this.context.set(ACTIONABLE_STATES.includes(this.state.type));
+				break;
 			default:
-				return false;
+				this.context.set(false);
+				break;
 		}
 	}
 
-	private isMajorMinorVersionChange(): boolean {
-		const currentVersion = this.productService.version;
-		const lastKnownVersion = this.storageService.get(LAST_KNOWN_VERSION_KEY, StorageScope.APPLICATION);
-		this.storageService.store(LAST_KNOWN_VERSION_KEY, currentVersion, StorageScope.APPLICATION, StorageTarget.MACHINE);
-		if (!lastKnownVersion) {
+	private async onStateChange(startup = false) {
+		this.updateContext();
+		if (this.mode === 'none') {
+			return;
+		}
+
+		if (this.tooltipVisible || !await this.hostService.hadLastFocus()) {
+			this.tooltip.renderState(this.state);
+			return;
+		}
+
+		let showTooltip = startup && this.detectVersionChange();
+		if (showTooltip) {
+			this.tooltip.renderPostInstall();
+		} else {
+			this.tooltip.renderState(this.state);
+			switch (this.state.type) {
+				case StateType.Disabled:
+					if (startup) {
+						const reason = this.state.reason;
+						showTooltip = reason === DisablementReason.InvalidConfiguration || reason === DisablementReason.RunningAsAdmin;
+					}
+					break;
+				case StateType.Idle:
+					showTooltip = !!this.state.error || !!this.state.notAvailable;
+					break;
+			}
+		}
+
+		if (showTooltip) {
+			this.tooltipVisible = true;
+			this.context.set(true);
+			this.entry?.showTooltip();
+		}
+	}
+
+	private detectVersionChange() {
+		let from: ILastKnownVersion | undefined;
+		try {
+			from = this.storageService.getObject(LAST_KNOWN_VERSION_KEY, StorageScope.APPLICATION);
+		} catch { }
+
+		const to: ILastKnownVersion = {
+			version: this.productService.version,
+			commit: this.productService.commit,
+			timestamp: Date.now(),
+		};
+
+		if (from?.commit === to.commit) {
 			return false;
 		}
 
-		const current = tryParseVersion(currentVersion);
-		const last = tryParseVersion(lastKnownVersion);
-		if (!current || !last) {
-			return false;
+		this.storageService.store(LAST_KNOWN_VERSION_KEY, JSON.stringify(to), StorageScope.APPLICATION, StorageTarget.MACHINE);
+
+		if (from) {
+			return isMajorMinorVersionChange(from.version, to.version);
 		}
 
-		return current.major !== last.major || current.minor !== last.minor;
+		return false;
 	}
 }
 
@@ -148,24 +204,22 @@ export class UpdateTitleBarContribution extends Disposable implements IWorkbench
  */
 export class UpdateTitleBarEntry extends BaseActionViewItem {
 	private content: HTMLElement | undefined;
-	private readonly tooltip: UpdateTooltip;
+	private showTooltipOnRender = false;
 
 	constructor(
 		action: IAction,
 		options: IBaseActionViewItemOptions,
-		private readonly onDisposeTooltip: () => void,
-		private showTooltipOnRender: boolean,
+		private readonly tooltip: UpdateTooltip,
+		private readonly onUserDismissedTooltip: () => void,
 		@ICommandService private readonly commandService: ICommandService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@IInstantiationService instantiationService: IInstantiationService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IUpdateService private readonly updateService: IUpdateService,
 	) {
 		super(undefined, action, options);
 
 		this.action.run = () => this.runAction();
-		this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip));
-
-		this._register(this.updateService.onStateChange(state => this.updateContent(state)));
+		this._register(this.updateService.onStateChange(state => this.onStateChange(state)));
 	}
 
 	public override render(container: HTMLElement) {
@@ -173,7 +227,7 @@ export class UpdateTitleBarEntry extends BaseActionViewItem {
 
 		this.content = dom.append(container, dom.$('.update-indicator'));
 		this.updateTooltip();
-		this.updateContent(this.updateService.state);
+		this.onStateChange(this.updateService.state);
 
 		if (this.showTooltipOnRender) {
 			this.showTooltipOnRender = false;
@@ -181,29 +235,9 @@ export class UpdateTitleBarEntry extends BaseActionViewItem {
 		}
 	}
 
-	protected override getHoverContents(): IManagedHoverContent {
-		return this.tooltip.domNode;
-	}
-
-	private runAction() {
-		switch (this.updateService.state.type) {
-			case StateType.AvailableForDownload:
-				this.commandService.executeCommand('update.downloadNow');
-				break;
-			case StateType.Downloaded:
-				this.commandService.executeCommand('update.install');
-				break;
-			case StateType.Ready:
-				this.commandService.executeCommand('update.restart');
-				break;
-			default:
-				this.showTooltip();
-				break;
-		}
-	}
-
-	public showTooltip() {
+	public showTooltip(focus = false) {
 		if (!this.content?.isConnected) {
+			this.showTooltipOnRender = true;
 			return;
 		}
 
@@ -211,14 +245,43 @@ export class UpdateTitleBarEntry extends BaseActionViewItem {
 			content: this.tooltip.domNode,
 			target: {
 				targetElements: [this.content],
-				dispose: () => this.onDisposeTooltip(),
+				dispose: () => {
+					if (!!this.content?.isConnected) {
+						this.onUserDismissedTooltip();
+					}
+				}
 			},
 			persistence: { sticky: true },
-			appearance: { showPointer: true },
-		}, true);
+			appearance: { showPointer: true, compact: true },
+		}, focus);
 	}
 
-	private updateContent(state: State) {
+	protected override getHoverContents(): IManagedHoverContent {
+		return this.tooltip.domNode;
+	}
+
+	private async runAction() {
+		let commandId: string | undefined;
+		switch (this.updateService.state.type) {
+			case StateType.AvailableForDownload:
+				commandId = 'update.downloadNow';
+				break;
+			case StateType.Downloaded:
+				commandId = 'update.install';
+				break;
+			case StateType.Ready:
+				commandId = 'update.restart';
+				break;
+			default:
+				this.showTooltip(true);
+				return;
+		}
+
+		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: commandId, from: 'titlebar' });
+		await this.commandService.executeCommand(commandId);
+	}
+
+	private onStateChange(state: State) {
 		if (!this.content) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/update/browser/updateTooltip.ts b/src/vs/workbench/contrib/update/browser/updateTooltip.ts
index ee3c452c3be..56e15f6a0cf 100644
--- a/src/vs/workbench/contrib/update/browser/updateTooltip.ts
+++ b/src/vs/workbench/contrib/update/browser/updateTooltip.ts
@@ -6,17 +6,23 @@
 import * as dom from '../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { toAction } from '../../../../base/common/actions.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IHoverService, nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { IMarkdownRendererService, openLinkFromMarkdown } from '../../../../platform/markdown/browser/markdownRenderer.js';
 import { IMeteredConnectionService } from '../../../../platform/meteredConnection/common/meteredConnection.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
-import { AvailableForDownload, Disabled, DisablementReason, Downloaded, Downloading, Idle, IUpdate, IUpdateService, Overwriting, Ready, State, StateType, Updating } from '../../../../platform/update/common/update.js';
-import { computeDownloadSpeed, computeDownloadTimeRemaining, computeProgressPercent, formatBytes, formatDate, formatTimeRemaining, tryParseDate } from '../common/updateUtils.js';
+import { asTextOrError, IRequestService } from '../../../../platform/request/common/request.js';
+import { AvailableForDownload, Disabled, DisablementReason, Downloaded, Downloading, Idle, IUpdate, Overwriting, Ready, State, StateType, Updating } from '../../../../platform/update/common/update.js';
+import { computeDownloadSpeed, computeDownloadTimeRemaining, computeProgressPercent, formatBytes, formatDate, formatTimeRemaining, getUpdateInfoUrl, tryParseDate } from '../common/updateUtils.js';
 import './media/updateTooltip.css';
 
 /**
@@ -29,9 +35,12 @@ export class UpdateTooltip extends Disposable {
 	private readonly titleNode: HTMLElement;
 
 	// Product info section
+	private readonly productInfoNode: HTMLElement;
 	private readonly productNameNode: HTMLElement;
 	private readonly currentVersionNode: HTMLElement;
+	private readonly currentVersionCopyValue: { value: string };
 	private readonly latestVersionNode: HTMLElement;
+	private readonly latestVersionCopyValue: { value: string };
 	private readonly releaseDateNode: HTMLElement;
 	private readonly releaseNotesLink: HTMLAnchorElement;
 
@@ -46,18 +55,26 @@ export class UpdateTooltip extends Disposable {
 	private readonly timeRemainingNode: HTMLElement;
 	private readonly speedInfoNode: HTMLElement;
 
+	// Update markdown section
+	private readonly markdownContainer: HTMLElement;
+	private readonly markdown = this._register(new MutableDisposable());
+
 	// State-specific message
 	private readonly messageNode: HTMLElement;
 
 	private releaseNotesVersion: string | undefined;
 
 	constructor(
+		private readonly hostedByTitleBar: boolean,
+		@IClipboardService private readonly clipboardService: IClipboardService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
+		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
 		@IMeteredConnectionService private readonly meteredConnectionService: IMeteredConnectionService,
+		@IOpenerService private readonly openerService: IOpenerService,
 		@IProductService private readonly productService: IProductService,
-		@IUpdateService updateService: IUpdateService,
+		@IRequestService private readonly requestService: IRequestService,
 	) {
 		super();
 
@@ -76,19 +93,25 @@ export class UpdateTooltip extends Disposable {
 		}), { icon: true, label: false });
 
 		// Product info section
-		const productInfo = dom.append(this.domNode, dom.$('.product-info'));
+		this.productInfoNode = dom.append(this.domNode, dom.$('.product-info'));
 
-		const logoContainer = dom.append(productInfo, dom.$('.product-logo'));
+		const logoContainer = dom.append(this.productInfoNode, dom.$('.product-logo'));
 		logoContainer.setAttribute('role', 'img');
 		logoContainer.setAttribute('aria-label', this.productService.nameLong);
 
-		const details = dom.append(productInfo, dom.$('.product-details'));
+		const details = dom.append(this.productInfoNode, dom.$('.product-details'));
 
 		this.productNameNode = dom.append(details, dom.$('.product-name'));
 		this.productNameNode.textContent = this.productService.nameLong;
 
-		this.currentVersionNode = dom.append(details, dom.$('.product-version'));
-		this.latestVersionNode = dom.append(details, dom.$('.product-version'));
+		const currentVersionRow = this.createVersionRow(details);
+		this.currentVersionNode = currentVersionRow.label;
+		this.currentVersionCopyValue = currentVersionRow.copyValue;
+
+		const latestVersionRow = this.createVersionRow(details);
+		this.latestVersionNode = latestVersionRow.label;
+		this.latestVersionCopyValue = latestVersionRow.copyValue;
+
 		this.releaseDateNode = dom.append(details, dom.$('.product-release-date'));
 
 		this.releaseNotesLink = dom.append(details, dom.$('a.release-notes-link')) as HTMLAnchorElement;
@@ -115,15 +138,14 @@ export class UpdateTooltip extends Disposable {
 		this.timeRemainingNode = dom.append(this.downloadStatsContainer, dom.$('.time-remaining'));
 		this.speedInfoNode = dom.append(this.downloadStatsContainer, dom.$('.speed-info'));
 
+		// Update markdown section
+		this.markdownContainer = dom.append(this.domNode, dom.$('.update-markdown'));
+
 		// State-specific message
 		this.messageNode = dom.append(this.domNode, dom.$('.state-message'));
 
 		// Populate static product info
 		this.updateCurrentVersion();
-
-		// Subscribe to state changes
-		this._register(updateService.onStateChange(state => this.onStateChange(state)));
-		this.onStateChange(updateService.state);
 	}
 
 	private updateCurrentVersion() {
@@ -133,18 +155,25 @@ export class UpdateTooltip extends Disposable {
 			this.currentVersionNode.textContent = currentCommitId
 				? localize('updateTooltip.currentVersionLabelWithCommit', "Current Version: {0} ({1})", productVersion, currentCommitId)
 				: localize('updateTooltip.currentVersionLabel', "Current Version: {0}", productVersion);
-			this.currentVersionNode.style.display = '';
+			this.currentVersionCopyValue.value = currentCommitId ? `${productVersion} (${this.productService.commit})` : productVersion;
+			this.currentVersionNode.parentElement!.style.display = '';
 		} else {
-			this.currentVersionNode.style.display = 'none';
+			this.currentVersionNode.parentElement!.style.display = 'none';
 		}
 	}
 
-	private onStateChange(state: State) {
+	private hideAll() {
+		this.productInfoNode.style.display = '';
 		this.progressContainer.style.display = 'none';
 		this.speedInfoNode.textContent = '';
 		this.timeRemainingNode.textContent = '';
 		this.messageNode.style.display = 'none';
+		this.markdownContainer.style.display = 'none';
+		this.markdown.clear();
+	}
 
+	public renderState(state: State) {
+		this.hideAll();
 		switch (state.type) {
 			case StateType.Uninitialized:
 				this.renderUninitialized();
@@ -181,44 +210,44 @@ export class UpdateTooltip extends Disposable {
 
 	private renderUninitialized() {
 		this.renderTitleAndInfo(localize('updateTooltip.initializingTitle', "Initializing"));
-		this.showMessage(localize('updateTooltip.initializingMessage', "Initializing update service..."));
+		this.renderMessage(localize('updateTooltip.initializingMessage', "Initializing update service..."));
 	}
 
 	private renderDisabled({ reason }: Disabled) {
 		this.renderTitleAndInfo(localize('updateTooltip.updatesDisabledTitle', "Updates Disabled"));
 		switch (reason) {
 			case DisablementReason.NotBuilt:
-				this.showMessage(
+				this.renderMessage(
 					localize('updateTooltip.disabledNotBuilt', "Updates are not available for this build."),
 					Codicon.info);
 				break;
 			case DisablementReason.DisabledByEnvironment:
-				this.showMessage(
+				this.renderMessage(
 					localize('updateTooltip.disabledByEnvironment', "Updates are disabled by the --disable-updates command line flag."),
 					Codicon.warning);
 				break;
 			case DisablementReason.ManuallyDisabled:
-				this.showMessage(
+				this.renderMessage(
 					localize('updateTooltip.disabledManually', "Updates are manually disabled. Change the \"update.mode\" setting to enable."),
 					Codicon.warning);
 				break;
 			case DisablementReason.Policy:
-				this.showMessage(
+				this.renderMessage(
 					localize('updateTooltip.disabledByPolicy', "Updates are disabled by organization policy."),
 					Codicon.info);
 				break;
 			case DisablementReason.MissingConfiguration:
-				this.showMessage(
+				this.renderMessage(
 					localize('updateTooltip.disabledMissingConfig', "Updates are disabled because no update URL is configured."),
 					Codicon.info);
 				break;
 			case DisablementReason.InvalidConfiguration:
-				this.showMessage(
+				this.renderMessage(
 					localize('updateTooltip.disabledInvalidConfig', "Updates are disabled because the update URL is invalid."),
 					Codicon.error);
 				break;
 			case DisablementReason.RunningAsAdmin:
-				this.showMessage(
+				this.renderMessage(
 					localize(
 						'updateTooltip.disabledRunningAsAdmin',
 						"Updates are not available when running a user install of {0} as administrator.",
@@ -226,7 +255,7 @@ export class UpdateTooltip extends Disposable {
 					Codicon.warning);
 				break;
 			default:
-				this.showMessage(localize('updateTooltip.disabledGeneric', "Updates are disabled."), Codicon.warning);
+				this.renderMessage(localize('updateTooltip.disabledGeneric', "Updates are disabled."), Codicon.warning);
 				break;
 		}
 	}
@@ -234,34 +263,34 @@ export class UpdateTooltip extends Disposable {
 	private renderIdle({ error, notAvailable }: Idle) {
 		if (error) {
 			this.renderTitleAndInfo(localize('updateTooltip.updateErrorTitle', "Update Error"));
-			this.showMessage(error, Codicon.error);
+			this.renderMessage(error, Codicon.error);
 			return;
 		}
 
 		if (notAvailable) {
 			this.renderTitleAndInfo(localize('updateTooltip.noUpdateAvailableTitle', "No Update Available"));
-			this.showMessage(localize('updateTooltip.noUpdateAvailableMessage', "There are no updates currently available."), Codicon.info);
+			this.renderMessage(localize('updateTooltip.noUpdateAvailableMessage', "There are no updates currently available."), Codicon.info);
 			return;
 		}
 
 		this.renderTitleAndInfo(localize('updateTooltip.upToDateTitle', "Up to Date"));
 		switch (this.configurationService.getValue<string>('update.mode')) {
 			case 'none':
-				this.showMessage(localize('updateTooltip.autoUpdateNone', "Automatic updates are disabled."), Codicon.warning);
+				this.renderMessage(localize('updateTooltip.autoUpdateNone', "Automatic updates are disabled."), Codicon.warning);
 				break;
 			case 'manual':
-				this.showMessage(localize('updateTooltip.autoUpdateManual', "Automatic updates will be checked but not installed automatically."));
+				this.renderMessage(localize('updateTooltip.autoUpdateManual', "Automatic updates will be checked but not installed automatically."));
 				break;
 			case 'start':
-				this.showMessage(localize('updateTooltip.autoUpdateStart', "Updates will be applied on restart."));
+				this.renderMessage(localize('updateTooltip.autoUpdateStart', "Updates will be applied on restart."));
 				break;
 			case 'default':
 				if (this.meteredConnectionService.isConnectionMetered) {
-					this.showMessage(
+					this.renderMessage(
 						localize('updateTooltip.meteredConnectionMessage', "Automatic updates are paused because the network connection is metered."),
 						Codicon.radioTower);
 				} else {
-					this.showMessage(
+					this.renderMessage(
 						localize('updateTooltip.autoUpdateDefault', "Automatic updates are enabled. Happy Coding!"),
 						Codicon.smiley);
 				}
@@ -271,11 +300,14 @@ export class UpdateTooltip extends Disposable {
 
 	private renderCheckingForUpdates() {
 		this.renderTitleAndInfo(localize('updateTooltip.checkingForUpdatesTitle', "Checking for Updates"));
-		this.showMessage(localize('updateTooltip.checkingPleaseWait', "Checking for updates, please wait..."));
+		this.renderMessage(localize('updateTooltip.checkingPleaseWait', "Checking for updates, please wait..."));
 	}
 
 	private renderAvailableForDownload({ update }: AvailableForDownload) {
 		this.renderTitleAndInfo(localize('updateTooltip.updateAvailableTitle', "Update Available"), update);
+		if (this.hostedByTitleBar) {
+			this.renderMessage(localize('updateTooltip.clickToDownload', "Click the Update button to download."));
+		}
 	}
 
 	private renderDownloading(state: Downloading) {
@@ -301,12 +333,15 @@ export class UpdateTooltip extends Disposable {
 
 			this.downloadStatsContainer.style.display = '';
 		} else {
-			this.showMessage(localize('updateTooltip.downloadingPleaseWait', "Downloading update, please wait..."));
+			this.renderMessage(localize('updateTooltip.downloadingPleaseWait', "Downloading update, please wait..."));
 		}
 	}
 
 	private renderDownloaded({ update }: Downloaded) {
 		this.renderTitleAndInfo(localize('updateTooltip.updateReadyTitle', "Update is Ready to Install"), update);
+		if (this.hostedByTitleBar) {
+			this.renderMessage(localize('updateTooltip.clickToInstall', "Click the Update button to install."));
+		}
 	}
 
 	private renderUpdating({ update, currentProgress, maxProgress }: Updating) {
@@ -319,17 +354,61 @@ export class UpdateTooltip extends Disposable {
 			this.progressSizeNode.textContent = '';
 			this.progressContainer.style.display = '';
 		} else {
-			this.showMessage(localize('updateTooltip.installingPleaseWait', "Installing update, please wait..."));
+			this.renderMessage(localize('updateTooltip.installingPleaseWait', "Installing update, please wait..."));
 		}
 	}
 
 	private renderReady({ update }: Ready) {
 		this.renderTitleAndInfo(localize('updateTooltip.updateInstalledTitle', "Update Installed"), update);
+		if (this.hostedByTitleBar) {
+			this.renderMessage(localize('updateTooltip.clickToRestart', "Click the Update button to restart and apply."));
+		}
 	}
 
 	private renderOverwriting({ update }: Overwriting) {
 		this.renderTitleAndInfo(localize('updateTooltip.downloadingNewerUpdateTitle', "Downloading Newer Update"), update);
-		this.showMessage(localize('updateTooltip.downloadingNewerPleaseWait', "A newer update was released. Downloading, please wait..."));
+		this.renderMessage(localize('updateTooltip.downloadingNewerPleaseWait', "A newer update was released. Downloading, please wait..."));
+	}
+
+	public async renderPostInstall() {
+		this.hideAll();
+		this.renderTitleAndInfo(localize('updateTooltip.installedDefaultTitle', "New Update Installed"));
+		this.renderMessage(
+			localize('updateTooltip.installedDefaultMessage', "See release notes for details on what's new in this release."),
+			Codicon.info);
+
+		let text = null;
+		try {
+			const url = getUpdateInfoUrl(this.productService.version);
+			const context = await this.requestService.request({ url, callSite: 'updateTooltip' }, CancellationToken.None);
+			text = await asTextOrError(context);
+		} catch { }
+
+		if (!text) {
+			return;
+		}
+
+		this.titleNode.textContent = localize('updateTooltip.installedTitle', "New in {0}", this.productService.version);
+		this.productInfoNode.style.display = 'none';
+		this.messageNode.style.display = 'none';
+
+		const rendered = this.markdownRendererService.render(
+			new MarkdownString(text, {
+				isTrusted: true,
+				supportHtml: true,
+				supportThemeIcons: true,
+			}),
+			{
+				actionHandler: (link, mdStr) => {
+					openLinkFromMarkdown(this.openerService, link, mdStr.isTrusted);
+					this.hoverService.hideHover(true);
+				},
+			});
+
+		this.markdown.value = rendered;
+		dom.clearNode(this.markdownContainer);
+		this.markdownContainer.appendChild(rendered.element);
+		this.markdownContainer.style.display = '';
 	}
 
 	private renderTitleAndInfo(title: string, update?: IUpdate) {
@@ -342,9 +421,10 @@ export class UpdateTooltip extends Disposable {
 			this.latestVersionNode.textContent = updateCommitId
 				? localize('updateTooltip.latestVersionLabelWithCommit', "Latest Version: {0} ({1})", version, updateCommitId)
 				: localize('updateTooltip.latestVersionLabel', "Latest Version: {0}", version);
-			this.latestVersionNode.style.display = '';
+			this.latestVersionCopyValue.value = updateCommitId ? `${version} (${update.version})` : version;
+			this.latestVersionNode.parentElement!.style.display = '';
 		} else {
-			this.latestVersionNode.style.display = 'none';
+			this.latestVersionNode.parentElement!.style.display = 'none';
 		}
 
 		// Release date
@@ -361,7 +441,7 @@ export class UpdateTooltip extends Disposable {
 		this.releaseNotesLink.style.display = this.releaseNotesVersion ? '' : 'none';
 	}
 
-	private showMessage(message: string, icon?: ThemeIcon) {
+	private renderMessage(message: string, icon?: ThemeIcon) {
 		dom.clearNode(this.messageNode);
 		if (icon) {
 			const iconNode = dom.append(this.messageNode, dom.$('.state-message-icon'));
@@ -371,6 +451,31 @@ export class UpdateTooltip extends Disposable {
 		this.messageNode.style.display = '';
 	}
 
+	private createVersionRow(parent: HTMLElement): { label: HTMLElement; copyValue: { value: string } } {
+		const row = dom.append(parent, dom.$('.product-version'));
+		const label = dom.append(row, dom.$('span'));
+		const copyValue = { value: '' };
+
+		const copyButton = dom.append(row, dom.$('a.copy-version-button'));
+		copyButton.setAttribute('role', 'button');
+		copyButton.setAttribute('tabindex', '0');
+		const title = localize('updateTooltip.copyVersion', "Copy");
+		copyButton.title = title;
+		copyButton.setAttribute('aria-label', title);
+
+		const copyIcon = dom.append(copyButton, dom.$('.copy-icon'));
+		copyIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.copy));
+		this._register(dom.addDisposableListener(copyButton, 'click', e => {
+			e.preventDefault();
+			e.stopPropagation();
+			if (copyValue.value) {
+				this.clipboardService.writeText(copyValue.value);
+			}
+		}));
+
+		return { label, copyValue };
+	}
+
 	private runCommandAndClose(command: string, ...args: unknown[]) {
 		this.commandService.executeCommand(command, ...args);
 		this.hoverService.hideHover(true);
diff --git a/src/vs/workbench/contrib/update/common/updateUtils.ts b/src/vs/workbench/contrib/update/common/updateUtils.ts
index 3060873d29e..ae1c66e8812 100644
--- a/src/vs/workbench/contrib/update/common/updateUtils.ts
+++ b/src/vs/workbench/contrib/update/common/updateUtils.ts
@@ -216,3 +216,12 @@ export function preprocessError(error?: string): string | undefined {
 		'This might mean the application was put on quarantine by macOS. See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information'
 	);
 }
+
+/**
+ * Determines whether there is a major or minor version change between two versions.
+ */
+export function isMajorMinorVersionChange(previousVersion?: string, newVersion?: string): boolean {
+	const previous = tryParseVersion(previousVersion);
+	const current = tryParseVersion(newVersion);
+	return !!previous && !!current && (previous.major !== current.major || previous.minor !== current.minor);
+}
diff --git a/src/vs/workbench/contrib/update/test/browser/releaseNotesRenderer.test.ts b/src/vs/workbench/contrib/update/test/browser/releaseNotesRenderer.test.ts
index dddde3072ee..6e6f8b33589 100644
--- a/src/vs/workbench/contrib/update/test/browser/releaseNotesRenderer.test.ts
+++ b/src/vs/workbench/contrib/update/test/browser/releaseNotesRenderer.test.ts
@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import assert from 'assert';
 import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
@@ -11,7 +12,7 @@ import { TestInstantiationService } from '../../../../../platform/instantiation/
 import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 import { SimpleSettingRenderer } from '../../../markdown/browser/markdownSettingRenderer.js';
 import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
-import { renderReleaseNotesMarkdown } from '../../browser/releaseNotesEditor.js';
+import { processConditionalBlocks, renderReleaseNotesMarkdown } from '../../browser/releaseNotesEditor.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { Emitter } from '../../../../../base/common/event.js';
 
@@ -103,3 +104,128 @@ Navigation End -->
 		await assertSnapshot(result.toString());
 	});
 });
+
+suite('Conditional blocks', () => {
+
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('IN_PRODUCT block is revealed when IN_PRODUCT is active', () => {
+		const text = 'before\n<!-- %IF IN_PRODUCT %\nin-product content\n%ENDIF % -->\nafter';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT']));
+		assert.ok(result.includes('in-product content'));
+		assert.ok(!result.includes('%IF'));
+		assert.ok(result.includes('before'));
+		assert.ok(result.includes('after'));
+	});
+
+	test('WEB block is removed when only IN_PRODUCT is active', () => {
+		const text = 'before\n<!-- %IF WEB %\nweb-only content\n%ENDIF % -->\nafter';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT']));
+		assert.ok(!result.includes('web-only content'));
+		assert.ok(result.includes('before'));
+		assert.ok(result.includes('after'));
+	});
+
+	test('STABLE block is revealed when STABLE is active', () => {
+		const text = 'before\n<!-- %IF STABLE %\nstable content\n%ENDIF % -->\nafter';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT', 'STABLE']));
+		assert.ok(result.includes('stable content'));
+		assert.ok(!result.includes('%IF'));
+	});
+
+	test('STABLE block is removed when INSIDERS is active', () => {
+		const text = 'before\n<!-- %IF STABLE %\nstable content\n%ENDIF % -->\nafter';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT', 'INSIDERS']));
+		assert.ok(!result.includes('stable content'));
+		assert.ok(result.includes('before'));
+		assert.ok(result.includes('after'));
+	});
+
+	test('INSIDERS block is revealed when INSIDERS is active', () => {
+		const text = 'before\n<!-- %IF INSIDERS %\ninsiders content\n%ENDIF % -->\nafter';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT', 'INSIDERS']));
+		assert.ok(result.includes('insiders content'));
+		assert.ok(!result.includes('%IF'));
+	});
+
+	test('INSIDERS block is removed when STABLE is active', () => {
+		const text = 'before\n<!-- %IF INSIDERS %\ninsiders content\n%ENDIF % -->\nafter';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT', 'STABLE']));
+		assert.ok(!result.includes('insiders content'));
+	});
+
+	test('Conditions are case-insensitive', () => {
+		const text = '<!-- %IF in_product %\ncontent\n%endif % -->';
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT']));
+		assert.ok(result.includes('content'));
+		assert.ok(!result.includes('%IF'));
+	});
+
+	test('Multiple conditional blocks in same document', () => {
+		const text = [
+			'shared content',
+			'<!-- %IF IN_PRODUCT %',
+			'in-product only',
+			'%ENDIF % -->',
+			'<!-- %IF WEB %',
+			'web only',
+			'%ENDIF % -->',
+			'<!-- %IF STABLE %',
+			'stable only',
+			'%ENDIF % -->',
+			'<!-- %IF INSIDERS %',
+			'insiders only',
+			'%ENDIF % -->',
+			'more shared content',
+		].join('\n');
+		const result = processConditionalBlocks(text, new Set(['IN_PRODUCT', 'STABLE']));
+		assert.ok(result.includes('shared content'));
+		assert.ok(result.includes('in-product only'));
+		assert.ok(!result.includes('web only'));
+		assert.ok(result.includes('stable only'));
+		assert.ok(!result.includes('insiders only'));
+		assert.ok(result.includes('more shared content'));
+	});
+
+	test('renderReleaseNotesMarkdown passes stable quality correctly', async function () {
+		const instantiationService = store.add(new TestInstantiationService());
+		const extensionService = instantiationService.get(IExtensionService);
+		const languageService = instantiationService.get(ILanguageService);
+		instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService)));
+
+		const content = [
+			'## Title',
+			'<!-- %IF STABLE %',
+			'stable content',
+			'%ENDIF % -->',
+			'<!-- %IF INSIDERS %',
+			'insiders content',
+			'%ENDIF % -->',
+		].join('\n');
+		const result = await renderReleaseNotesMarkdown(content, extensionService, languageService, instantiationService.createInstance(SimpleSettingRenderer), 'stable');
+		const html = result.toString();
+		assert.ok(html.includes('stable content'));
+		assert.ok(!html.includes('insiders content'));
+	});
+
+	test('renderReleaseNotesMarkdown passes insider quality correctly', async function () {
+		const instantiationService = store.add(new TestInstantiationService());
+		const extensionService = instantiationService.get(IExtensionService);
+		const languageService = instantiationService.get(ILanguageService);
+		instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService)));
+
+		const content = [
+			'## Title',
+			'<!-- %IF STABLE %',
+			'stable content',
+			'%ENDIF % -->',
+			'<!-- %IF INSIDERS %',
+			'insiders content',
+			'%ENDIF % -->',
+		].join('\n');
+		const result = await renderReleaseNotesMarkdown(content, extensionService, languageService, instantiationService.createInstance(SimpleSettingRenderer), 'insider');
+		const html = result.toString();
+		assert.ok(!html.includes('stable content'));
+		assert.ok(html.includes('insiders content'));
+	});
+});
diff --git a/src/vs/workbench/contrib/update/test/common/updateUtils.test.ts b/src/vs/workbench/contrib/update/test/common/updateUtils.test.ts
index cfeb6123415..b6d7cf0ff9b 100644
--- a/src/vs/workbench/contrib/update/test/common/updateUtils.test.ts
+++ b/src/vs/workbench/contrib/update/test/common/updateUtils.test.ts
@@ -7,7 +7,7 @@ import assert from 'assert';
 import * as sinon from 'sinon';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { Downloading, StateType } from '../../../../../platform/update/common/update.js';
-import { computeDownloadSpeed, computeDownloadTimeRemaining, computeProgressPercent, computeUpdateInfoVersion, formatBytes, formatDate, formatTimeRemaining, getUpdateInfoUrl, tryParseDate } from '../../common/updateUtils.js';
+import { computeDownloadSpeed, computeDownloadTimeRemaining, computeProgressPercent, computeUpdateInfoVersion, formatBytes, formatDate, formatTimeRemaining, getUpdateInfoUrl, isMajorMinorVersionChange, tryParseDate } from '../../common/updateUtils.js';
 
 suite('UpdateUtils', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -245,4 +245,39 @@ suite('UpdateUtils', () => {
 			assert.ok(result.includes('2024'));
 		});
 	});
+
+	suite('isMajorMinorVersionChange', () => {
+		test('returns true for major version change', () => {
+			assert.strictEqual(isMajorMinorVersionChange('1.90.0', '2.0.0'), true);
+		});
+
+		test('returns true for minor version change', () => {
+			assert.strictEqual(isMajorMinorVersionChange('1.90.0', '1.91.0'), true);
+		});
+
+		test('returns false for patch-only change', () => {
+			assert.strictEqual(isMajorMinorVersionChange('1.90.0', '1.90.1'), false);
+		});
+
+		test('returns false for identical versions', () => {
+			assert.strictEqual(isMajorMinorVersionChange('1.90.0', '1.90.0'), false);
+		});
+
+		test('returns false when previous version is undefined', () => {
+			assert.strictEqual(isMajorMinorVersionChange(undefined, '1.90.0'), false);
+		});
+
+		test('returns false when new version is undefined', () => {
+			assert.strictEqual(isMajorMinorVersionChange('1.90.0', undefined), false);
+		});
+
+		test('returns false when both versions are undefined', () => {
+			assert.strictEqual(isMajorMinorVersionChange(undefined, undefined), false);
+		});
+
+		test('returns false for unparseable versions', () => {
+			assert.strictEqual(isMajorMinorVersionChange('invalid', '1.90.0'), false);
+			assert.strictEqual(isMajorMinorVersionChange('1.90.0', 'invalid'), false);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
index 1368ec8f482..dfbb6b0fb95 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
@@ -26,7 +26,7 @@ import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/edit
 import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
 import { UserDataProfilesEditor, UserDataProfilesEditorInput, UserDataProfilesEditorInputSerializer } from './userDataProfilesEditor.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { IEditorService, MODAL_GROUP } from '../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { IUserDataProfilesEditor } from '../common/userDataProfile.js';
@@ -107,7 +107,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	}
 
 	private async openProfilesEditor(): Promise<IUserDataProfilesEditor | undefined> {
-		const editor = await this.editorService.openEditor(new UserDataProfilesEditorInput(this.instantiationService), undefined, MODAL_GROUP);
+		const editor = await this.editorService.openEditor(new UserDataProfilesEditorInput(this.instantiationService));
 		return editor as IUserDataProfilesEditor;
 	}
 
@@ -388,7 +388,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			run(accessor: ServicesAccessor) {
 				const editorService = accessor.get(IEditorService);
 				const instantiationService = accessor.get(IInstantiationService);
-				return editorService.openEditor(new UserDataProfilesEditorInput(instantiationService), undefined, MODAL_GROUP);
+				return editorService.openEditor(new UserDataProfilesEditorInput(instantiationService));
 			}
 		}));
 		disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index 5898c8d6867..bf4ac12e905 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -16,7 +16,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IUserDataProfile, IUserDataProfilesService, ProfileResourceType } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
-import { IEditorOpenContext, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInputCapabilities, IEditorOpenContext, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IUserDataProfilesEditor } from '../common/userDataProfile.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
@@ -2251,6 +2251,10 @@ export class UserDataProfilesEditorInput extends EditorInput {
 		}
 	}
 
+	override get capabilities(): EditorInputCapabilities {
+		return EditorInputCapabilities.RequiresModal;
+	}
+
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
index 9e6ca135e08..0f10d3f8f27 100644
--- a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
@@ -37,7 +37,7 @@ import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../chat/c
 import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { ChatWidget } from '../../chat/browser/widget/chatWidget.js';
 import { IAgentSessionsService } from '../../chat/browser/agentSessions/agentSessionsService.js';
-import { AgentSessionProviders } from '../../chat/browser/agentSessions/agentSessions.js';
+import { AgentSessionProviders, AgentSessionTarget } from '../../chat/browser/agentSessions/agentSessions.js';
 import { IAgentSession } from '../../chat/browser/agentSessions/agentSessionsModel.js';
 import { AgentSessionsWelcomeEditorOptions, AgentSessionsWelcomeInput, AgentSessionsWelcomeWorkspaceKind } from './agentSessionsWelcomeInput.js';
 import { IChatService } from '../../chat/common/chatService/chatService.js';
@@ -132,7 +132,7 @@ export class AgentSessionsWelcomePage extends EditorPane {
 	private readonly contentDisposables = this._register(new DisposableStore());
 	private contextService: IContextKeyService;
 	private walkthroughs: IResolvedWalkthrough[] = [];
-	private _selectedSessionProvider: AgentSessionProviders = AgentSessionProviders.Local;
+	private _selectedSessionProvider: AgentSessionTarget = AgentSessionProviders.Local;
 	private _selectedWorkspace: IWorkspacePickerItem | undefined;
 	private _recentTrustedWorkspaces: Array<IRecentWorkspace | IRecentFolder> = [];
 	private _isEmptyWorkspace: boolean = false;
@@ -313,8 +313,8 @@ export class AgentSessionsWelcomePage extends EditorPane {
 		const scopedInstantiationService = this.contentDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService])));
 
 		// Create a delegate for the session target picker with independent local state
-		const onDidChangeActiveSessionProvider = this.contentDisposables.add(new Emitter<AgentSessionProviders>());
-		const recreateSessionForProvider = async (provider: AgentSessionProviders) => {
+		const onDidChangeActiveSessionProvider = this.contentDisposables.add(new Emitter<AgentSessionTarget>());
+		const recreateSessionForProvider = async (provider: AgentSessionTarget) => {
 			if (this.chatWidget && this.chatModelRef) {
 				this.chatWidget.setModel(undefined);
 				this.chatModelRef.dispose();
@@ -333,7 +333,7 @@ export class AgentSessionsWelcomePage extends EditorPane {
 		};
 		const sessionTypePickerDelegate: ISessionTypePickerDelegate = {
 			getActiveSessionProvider: () => this._selectedSessionProvider,
-			setActiveSessionProvider: (provider: AgentSessionProviders) => {
+			setActiveSessionProvider: (provider: AgentSessionTarget) => {
 				this._selectedSessionProvider = provider;
 				onDidChangeActiveSessionProvider.fire(provider);
 				try {
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css b/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css
index a28e8a83592..d4bc58c5786 100644
--- a/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css
@@ -40,6 +40,7 @@
 .agentSessionsWelcome-header h1.product-name {
 	font-size: 32px;
 	font-weight: 400;
+	line-height: 1;
 	margin: 0 0 12px 0;
 	color: var(--vscode-foreground);
 }
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index 1159e4ce41e..d13453552f1 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -17,7 +17,7 @@ import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWo
 import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { IEditorService, MODAL_GROUP } from '../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
@@ -747,7 +747,7 @@ registerAction2(class extends Action2 {
 
 		const input = instantiationService.createInstance(WorkspaceTrustEditorInput);
 
-		editorService.openEditor(input, { pinned: true }, MODAL_GROUP);
+		editorService.openEditor(input, { pinned: true });
 		return;
 	}
 });
diff --git a/src/vs/workbench/services/accounts/browser/defaultAccount.ts b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
index 3e2724e96a5..2992998a9c3 100644
--- a/src/vs/workbench/services/accounts/browser/defaultAccount.ts
+++ b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
@@ -644,7 +644,7 @@ class DefaultAccountProvider extends Disposable implements IDefaultAccountProvid
 		}
 
 		this.logService.debug('[DefaultAccount] Fetching token entitlements from:', tokenEntitlementsUrl);
-		const response = await this.request(tokenEntitlementsUrl, 'GET', undefined, sessions, CancellationToken.None);
+		const response = await this.request(tokenEntitlementsUrl, 'GET', undefined, sessions, CancellationToken.None, 'defaultAccount.tokenEntitlements');
 		if (!response) {
 			return undefined;
 		}
@@ -688,7 +688,7 @@ class DefaultAccountProvider extends Disposable implements IDefaultAccountProvid
 		}
 
 		this.logService.debug('[DefaultAccount] Fetching entitlements from:', entitlementUrl);
-		const response = await this.request(entitlementUrl, 'GET', undefined, sessions, CancellationToken.None);
+		const response = await this.request(entitlementUrl, 'GET', undefined, sessions, CancellationToken.None, 'defaultAccount.entitlements');
 		if (!response) {
 			return undefined;
 		}
@@ -731,7 +731,7 @@ class DefaultAccountProvider extends Disposable implements IDefaultAccountProvid
 		}
 
 		this.logService.debug('[DefaultAccount] Fetching MCP registry data from:', mcpRegistryDataUrl);
-		const response = await this.request(mcpRegistryDataUrl, 'GET', undefined, sessions, CancellationToken.None);
+		const response = await this.request(mcpRegistryDataUrl, 'GET', undefined, sessions, CancellationToken.None, 'defaultAccount.mcpRegistryProvider');
 		if (!response) {
 			return undefined;
 		}
@@ -759,9 +759,9 @@ class DefaultAccountProvider extends Disposable implements IDefaultAccountProvid
 		}
 	}
 
-	private async request(url: string, type: 'GET', body: undefined, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined>;
-	private async request(url: string, type: 'POST', body: object, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined>;
-	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined> {
+	private async request(url: string, type: 'GET', body: undefined, sessions: AuthenticationSession[], token: CancellationToken, callSite: string): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'POST', body: object, sessions: AuthenticationSession[], token: CancellationToken, callSite: string): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, sessions: AuthenticationSession[], token: CancellationToken, callSite: string): Promise<IRequestContext | undefined> {
 		let lastResponse: IRequestContext | undefined;
 
 		for (const session of sessions) {
@@ -777,7 +777,8 @@ class DefaultAccountProvider extends Disposable implements IDefaultAccountProvid
 					disableCache: true,
 					headers: {
 						'Authorization': `Bearer ${session.accessToken}`
-					}
+					},
+					callSite
 				}, token);
 
 				const status = response.res.statusCode;
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index e9e6d9d2cca..1a80b0b1e3e 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -490,6 +490,18 @@ const apiMenus: IAPIMenu[] = [
 		description: localize('menus.chatEditingSessionApplySubmenu', "Submenu for apply actions in the Chat Editing session changes toolbar."),
 		proposed: 'chatSessionsProvider'
 	},
+	{
+		key: 'chat/input/editing/sessionTitleToolbar',
+		id: MenuId.ChatEditingSessionTitleToolbar,
+		description: localize('menus.chatEditingSessionTitleToolbar', "The Chat Editing widget toolbar menu for session title."),
+		proposed: 'chatSessionsProvider'
+	},
+	{
+		key: 'chat/input/editing/sessionChangeToolbar',
+		id: MenuId.ChatEditingSessionChangeToolbar,
+		description: localize('menus.chatEditingSessionChangeToolbar', "The Chat Editing widget toolbar menu for session changes."),
+		proposed: 'chatSessionsProvider'
+	},
 	{
 		// TODO: rename this to something like: `chatSessions/item/inline`
 		key: 'chat/chatSessions',
diff --git a/src/vs/workbench/services/browserElements/browser/browserElementsService.ts b/src/vs/workbench/services/browserElements/browser/browserElementsService.ts
index 0f56a1edf3a..1a94f8a529c 100644
--- a/src/vs/workbench/services/browserElements/browser/browserElementsService.ts
+++ b/src/vs/workbench/services/browserElements/browser/browserElementsService.ts
@@ -16,6 +16,8 @@ export interface IBrowserElementsService {
 	// no browser implementation yet
 	getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined>;
 
+	getFocusedElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined>;
+
 	startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void>;
 
 	startConsoleSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void>;
diff --git a/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts b/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts
index a98c4de1ba5..614ffc444f9 100644
--- a/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts
+++ b/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts
@@ -18,6 +18,10 @@ class WebBrowserElementsService implements IBrowserElementsService {
 		throw new Error('Not implemented');
 	}
 
+	async getFocusedElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined> {
+		throw new Error('Not implemented');
+	}
+
 	async startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void> {
 		throw new Error('Not implemented');
 	}
diff --git a/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts b/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts
index fa2ddc77288..1d88e15309b 100644
--- a/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts
+++ b/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts
@@ -90,6 +90,22 @@ class WorkbenchBrowserElementsService implements IBrowserElementsService {
 			disposable.dispose();
 		}
 	}
+
+	async getFocusedElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined> {
+		if (!locator) {
+			return undefined;
+		}
+		const cancelSelectionId = cancelSelectionIdPool++;
+		const onCancelChannel = `vscode:cancelElementSelection${cancelSelectionId}`;
+		const disposable = token.onCancellationRequested(() => {
+			ipcRenderer.send(onCancelChannel, cancelSelectionId);
+		});
+		try {
+			return await this.simpleBrowser.getFocusedElementData(rect, token, locator, cancelSelectionId);
+		} finally {
+			disposable.dispose();
+		}
+	}
 }
 
 registerSingleton(IBrowserElementsService, WorkbenchBrowserElementsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/chat/common/chatEntitlementService.ts b/src/vs/workbench/services/chat/common/chatEntitlementService.ts
index 919d79dc291..02c83ae04b9 100644
--- a/src/vs/workbench/services/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/services/chat/common/chatEntitlementService.ts
@@ -772,9 +772,9 @@ export class ChatEntitlementRequests extends Disposable {
 		return quotas;
 	}
 
-	private async request(url: string, type: 'GET', body: undefined, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined>;
-	private async request(url: string, type: 'POST', body: object, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined>;
-	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined> {
+	private async request(url: string, type: 'GET', body: undefined, sessions: AuthenticationSession[], token: CancellationToken, callSite: string): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'POST', body: object, sessions: AuthenticationSession[], token: CancellationToken, callSite: string): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, sessions: AuthenticationSession[], token: CancellationToken, callSite: string): Promise<IRequestContext | undefined> {
 		let lastRequest: IRequestContext | undefined;
 
 		for (const session of sessions) {
@@ -790,7 +790,8 @@ export class ChatEntitlementRequests extends Disposable {
 					disableCache: true,
 					headers: {
 						'Authorization': `Bearer ${session.accessToken}`
-					}
+					},
+					callSite
 				}, token);
 
 				const status = response.res.statusCode;
@@ -843,7 +844,7 @@ export class ChatEntitlementRequests extends Disposable {
 			public_code_suggestions: 'enabled'
 		};
 
-		const response = await this.request(defaultChatAgent.entitlementSignupLimitedUrl, 'POST', body, sessions, CancellationToken.None);
+		const response = await this.request(defaultChatAgent.entitlementSignupLimitedUrl, 'POST', body, sessions, CancellationToken.None, 'chatEntitlementService.signUpFree');
 		if (!response) {
 			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseError', "No response received."), '[chat entitlement] sign-up: no response');
 			return retry ? this.doSignUpFree(sessions) : { errorCode: 1 };
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index 15f7c61d9b6..ac9cd324172 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -82,6 +82,7 @@ export enum VariableKind {
 	Command = 'command',
 	Input = 'input',
 	ExtensionInstallFolder = 'extensionInstallFolder',
+	TaskVar = 'taskVar',
 
 	WorkspaceFolder = 'workspaceFolder',
 	Cwd = 'cwd',
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
index 76db1269702..dfc94868782 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
@@ -706,6 +706,20 @@ suite('Configuration Resolver Service', () => {
 		});
 	});
 
+	test('contributed taskVar variable', () => {
+		const url = 'http://localhost:5678';
+		const variable = 'taskVar:componentExplorerUrl';
+		const configuration = {
+			'url': '${taskVar:componentExplorerUrl}/___explorer',
+		};
+		configurationResolverService!.contributeVariable(variable, async () => { return url; });
+		return configurationResolverService!.resolveWithInteractionReplace(workspace, configuration).then(result => {
+			assert.deepStrictEqual({ ...result }, {
+				'url': `${url}/___explorer`
+			});
+		});
+	});
+
 	test('resolveWithEnvironment', async () => {
 		const env = {
 			'VAR_1': 'VAL_1',
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
index 6300496bd4e..8786b4ed5f6 100644
--- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -229,7 +229,8 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		const title = nls.localize('openFileOrFolder.title', 'Open File or Folder');
 		const availableFileSystems = this.addFileSchemaIfNeeded(schema);
 
-		const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+		const uris = await this.pickResource({ canSelectFiles: true, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+		const uri = uris?.[0];
 
 		if (uri) {
 			const stat = await this.fileService.stat(uri);
@@ -251,7 +252,8 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		const title = nls.localize('openFile.title', 'Open File');
 		const availableFileSystems = this.addFileSchemaIfNeeded(schema);
 
-		const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+		const uris = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+		const uri = uris?.[0];
 		if (uri) {
 			this.addFileToRecentlyOpened(uri);
 
@@ -271,7 +273,8 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		const title = nls.localize('openFolder.title', 'Open Folder');
 		const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
 
-		const uri = await this.pickResource({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+		const uris = await this.pickResource({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+		const uri = uris?.[0];
 		if (uri) {
 			return this.hostService.openWindow([{ folderUri: uri }], { forceNewWindow: options.forceNewWindow, remoteAuthority: options.remoteAuthority });
 		}
@@ -282,7 +285,8 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		const filters: FileFilter[] = [{ name: nls.localize('filterName.workspace', 'Workspace'), extensions: [WORKSPACE_EXTENSION] }];
 		const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
 
-		const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, filters, availableFileSystems });
+		const uris = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, filters, availableFileSystems });
+		const uri = uris?.[0];
 		if (uri) {
 			return this.hostService.openWindow([{ workspaceUri: uri }], { forceNewWindow: options.forceNewWindow, remoteAuthority: options.remoteAuthority });
 		}
@@ -316,16 +320,14 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 			options.availableFileSystems = this.addFileSchemaIfNeeded(schema, options.canSelectFolders);
 		}
 
-		const uri = await this.pickResource(options);
-
-		return uri ? [uri] : undefined;
+		return this.pickResource(options);
 	}
 
 	protected getSimpleFileDialog(): ISimpleFileDialog {
 		return this.instantiationService.createInstance(SimpleFileDialog);
 	}
 
-	private pickResource(options: IOpenDialogOptions): Promise<URI | undefined> {
+	private pickResource(options: IOpenDialogOptions): Promise<URI[] | undefined> {
 		return this.getSimpleFileDialog().showOpenDialog(options);
 	}
 
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 65b1d6b58ce..3a269eae761 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -105,7 +105,7 @@ enum UpdateResult {
 export const RemoteFileDialogContext = new RawContextKey<boolean>('remoteFileDialogVisible', false);
 
 export interface ISimpleFileDialog extends IDisposable {
-	showOpenDialog(options: IOpenDialogOptions): Promise<URI | undefined>;
+	showOpenDialog(options: IOpenDialogOptions): Promise<URI[] | undefined>;
 	showSaveDialog(options: ISaveDialogOptions): Promise<URI | undefined>;
 }
 
@@ -130,6 +130,23 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	private badPath: string | undefined;
 	private remoteAgentEnvironment: IRemoteAgentEnvironment | null | undefined;
 	private separator: string = '/';
+
+	/**
+	 * When set, the dialog is scoped to a specific URI authority (e.g.
+	 * for browsing an `agenthost://{authority}/...` filesystem that
+	 * uses per-connection authorities rather than the global
+	 * {@link remoteAuthority}).
+	 */
+	private scopedAuthority: string | undefined;
+	/**
+	 * Path prefix that the label formatter strips from URIs in the
+	 * scoped scheme (e.g. `/file/-` for agent host URIs that encode
+	 * the original scheme and authority as leading path segments).
+	 *
+	 * Stripped by {@link pathFromUri} and re-applied by
+	 * {@link remoteUriFrom} so the user sees clean paths.
+	 */
+	private scopedPathPrefix: string = '';
 	private readonly onBusyChangeEmitter = this._register(new Emitter<boolean>());
 	private updatingPromise: CancelablePromise<boolean> | undefined;
 
@@ -189,8 +206,10 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 		return this.filePickBox.busy;
 	}
 
-	public async showOpenDialog(options: IOpenDialogOptions = {}): Promise<URI | undefined> {
+	public async showOpenDialog(options: IOpenDialogOptions = {}): Promise<URI[] | undefined> {
 		this.scheme = this.getScheme(options.availableFileSystems, options.defaultUri);
+		this.scopedAuthority = this.getScopedAuthority(options.defaultUri);
+		this.scopedPathPrefix = options.defaultUri && this.scopedAuthority ? this.computeScopedPathPrefix(options.defaultUri) : '';
 		this.userHome = await this.getUserHome();
 		this.trueHome = await this.getUserHome(true);
 		const newOptions = this.getOptions(options);
@@ -198,11 +217,17 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 			return Promise.resolve(undefined);
 		}
 		this.options = newOptions;
-		return this.pickResource();
+		const result = await this.pickResource();
+		if (Array.isArray(result)) {
+			return result;
+		}
+		return result ? [result] : undefined;
 	}
 
 	public async showSaveDialog(options: ISaveDialogOptions): Promise<URI | undefined> {
 		this.scheme = this.getScheme(options.availableFileSystems, options.defaultUri);
+		this.scopedAuthority = this.getScopedAuthority(options.defaultUri);
+		this.scopedPathPrefix = options.defaultUri && this.scopedAuthority ? this.computeScopedPathPrefix(options.defaultUri) : '';
 		this.userHome = await this.getUserHome();
 		this.trueHome = await this.getUserHome(true);
 		this.requiresTrailing = true;
@@ -215,8 +240,8 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 		this.options.canSelectFiles = true;
 
 		return new Promise<URI | undefined>((resolve) => {
-			this.pickResource(true).then(folderUri => {
-				resolve(folderUri);
+			this.pickResource(true).then(result => {
+				resolve(Array.isArray(result) ? result[0] : result);
 			});
 		});
 	}
@@ -247,6 +272,13 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 		if (!path.startsWith('\\\\')) {
 			path = path.replace(/\\/g, '/');
 		}
+		// When scoped to a specific authority (e.g. agenthost://host/...),
+		// construct the URI directly with the authority to avoid
+		// toLocalResource stripping or replacing it.
+		// Re-add the scopedPathPrefix that was stripped in pathFromUri.
+		if (this.scopedAuthority) {
+			return URI.from({ scheme: this.scheme, authority: this.scopedAuthority, path: this.scopedPathPrefix + path, query: hintUri?.query, fragment: hintUri?.fragment });
+		}
 		const uri: URI = this.scheme === Schemas.file ? URI.file(path) : URI.from({ scheme: this.scheme, path, query: hintUri?.query, fragment: hintUri?.fragment });
 		// If the default scheme is file, then we don't care about the remote authority or the hint authority
 		const authority = (uri.scheme === Schemas.file) ? undefined : (this.remoteAuthority ?? hintUri?.authority);
@@ -268,6 +300,41 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 		return Schemas.file;
 	}
 
+	/**
+	 * Returns the per-URI authority from {@link defaultUri} if the dialog
+	 * should be scoped to a specific authority (e.g. `agenthost://host/...`).
+	 *
+	 * Returns `undefined` when the authority matches the global
+	 * {@link remoteAuthority} (standard SSH remotes), since that path is
+	 * already handled by the existing logic.
+	 */
+	private getScopedAuthority(defaultUri: URI | undefined): string | undefined {
+		if (defaultUri
+			&& defaultUri.scheme === this.scheme
+			&& defaultUri.authority
+			&& defaultUri.authority !== this.remoteAuthority) {
+			return defaultUri.authority;
+		}
+		return undefined;
+	}
+
+	/**
+	 * Computes the path prefix that the label formatter strips for the
+	 * scoped scheme, by comparing the raw URI path with the label
+	 * service's formatted output.
+	 *
+	 * For example, an agent host URI with path `/file/-/Users/roblou`
+	 * formats as `/Users/roblou`, so the prefix is `/file/-`.
+	 */
+	private computeScopedPathPrefix(uri: URI): string {
+		const fullPath = uri.path;
+		const displayPath = this.labelService.getUriLabel(uri);
+		if (displayPath && fullPath.endsWith(displayPath)) {
+			return fullPath.substring(0, fullPath.length - displayPath.length);
+		}
+		return '';
+	}
+
 	private async getRemoteAgentEnvironment(): Promise<IRemoteAgentEnvironment | null> {
 		if (this.remoteAgentEnvironment === undefined) {
 			this.remoteAgentEnvironment = await this.remoteAgentService.getEnvironment();
@@ -276,17 +343,31 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	}
 
 	protected getUserHome(trueHome = false): Promise<URI> {
+		// When scoped to a custom authority, the platform userHome is not
+		// meaningful (it would return a local file:// path). Use the root
+		// of the scoped filesystem as the home directory instead.
+		// Include the scopedPathPrefix so the URI resolves correctly.
+		if (this.scopedAuthority) {
+			return Promise.resolve(URI.from({ scheme: this.scheme, authority: this.scopedAuthority, path: this.scopedPathPrefix + '/' }));
+		}
 		return trueHome
 			? this.pathService.userHome({ preferLocal: this.scheme === Schemas.file })
 			: this.fileDialogService.preferredHome(this.scheme);
 	}
 
-	private async pickResource(isSave: boolean = false): Promise<URI | undefined> {
+	private normalizeUri(uri: URI): URI {
+		uri = resources.addTrailingPathSeparator(uri, this.separator); // Ensures that c: is c:/ since this comes from user input and can be incorrect.
+		// To be consistent, we should never have a trailing path separator on directories (or anything else). Will not remove from c:/.
+		uri = resources.removeTrailingPathSeparator(uri);
+		return uri;
+	}
+
+	private async pickResource(isSave: boolean = false): Promise<URI[] | URI | undefined> {
 		this.allowFolderSelection = !!this.options.canSelectFolders;
 		this.allowFileSelection = !!this.options.canSelectFiles;
-		this.separator = this.labelService.getSeparator(this.scheme, this.remoteAuthority);
+		this.separator = this.scopedAuthority ? '/' : this.labelService.getSeparator(this.scheme, this.remoteAuthority);
 		this.hidden = false;
-		this.isWindows = await this.checkIsWindowsOS();
+		this.isWindows = this.scopedAuthority ? false : await this.checkIsWindowsOS();
 		let homedir: URI = this.options.defaultUri ? this.options.defaultUri : this.workspaceContextService.getWorkspace().folders[0].uri;
 		let stat: IFileStatWithPartialMetadata | undefined;
 		const ext: string = resources.extname(homedir);
@@ -302,7 +383,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 			}
 		}
 
-		return new Promise<URI | undefined>((resolve) => {
+		return new Promise<URI[] | URI | undefined>((resolve) => {
 			this.filePickBox = this._register(this.quickInputService.createQuickPick<FileQuickPickItem>());
 			this.busy = true;
 			this.filePickBox.matchOnLabel = false;
@@ -345,13 +426,15 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 			this.filePickBox.value = this.pathFromUri(this.currentFolder, true);
 			this.filePickBox.valueSelection = [this.filePickBox.value.length, this.filePickBox.value.length];
 
-			const doResolve = (uri: URI | undefined) => {
-				if (uri) {
-					uri = resources.addTrailingPathSeparator(uri, this.separator); // Ensures that c: is c:/ since this comes from user input and can be incorrect.
-					// To be consistent, we should never have a trailing path separator on directories (or anything else). Will not remove from c:/.
-					uri = resources.removeTrailingPathSeparator(uri);
+			const doResolve = (uriOrUris: URI | URI[] | undefined) => {
+				if (uriOrUris) {
+					if (Array.isArray(uriOrUris)) {
+						uriOrUris = uriOrUris.map(uri => this.normalizeUri(uri));
+					} else {
+						uriOrUris = this.normalizeUri(uriOrUris);
+					}
 				}
-				resolve(uri);
+				resolve(uriOrUris);
 				this.contextKey.set(false);
 				this.dispose();
 			};
@@ -373,7 +456,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 					});
 				} else {
 					return this.fileDialogService.showOpenDialog(this.options).then(result => {
-						doResolve(result ? result[0] : undefined);
+						doResolve(result);
 					});
 				}
 			}));
@@ -970,7 +1053,20 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	}
 
 	private pathFromUri(uri: URI, endWithSeparator: boolean = false): string {
-		let result: string = normalizeDriveLetter(uri.fsPath, this.isWindows).replace(/\n/g, '');
+		// For authority-scoped schemes, use the raw path component instead
+		// of fsPath, which would prepend the authority as a UNC prefix.
+		// Strip the scopedPathPrefix so the user sees clean paths
+		// (e.g. `/Users/roblou/code` instead of `/file/-/Users/roblou/code`).
+		let result: string;
+		if (this.scopedAuthority) {
+			let path = uri.path;
+			if (this.scopedPathPrefix && path.startsWith(this.scopedPathPrefix)) {
+				path = path.substring(this.scopedPathPrefix.length);
+			}
+			result = path.replace(/\n/g, '');
+		} else {
+			result = normalizeDriveLetter(uri.fsPath, this.isWindows).replace(/\n/g, '');
+		}
 		if (this.separator === '/') {
 			result = result.replace(/\\/g, this.separator);
 		} else {
@@ -1011,7 +1107,19 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	}
 
 	private async createBackItem(currFolder: URI): Promise<FileQuickPickItem | undefined> {
-		const fileRepresentationCurr = this.currentFolder.with({ scheme: Schemas.file, authority: '' });
+		// For authority-scoped URIs with a path prefix, treat the prefix
+		// root as the filesystem root so the user cannot navigate above it.
+		if (this.scopedPathPrefix) {
+			const pathAfterPrefix = currFolder.path.substring(this.scopedPathPrefix.length);
+			if (pathAfterPrefix === '/' || pathAfterPrefix === '') {
+				return undefined;
+			}
+		}
+		// For authority-scoped URIs, compare within the original scheme so
+		// that the authority is preserved and the root is detected correctly.
+		const compareScheme = this.scopedAuthority ? this.scheme : Schemas.file;
+		const compareAuthority = this.scopedAuthority ?? '';
+		const fileRepresentationCurr = this.currentFolder.with({ scheme: compareScheme, authority: compareAuthority });
 		const fileRepresentationParent = resources.dirname(fileRepresentationCurr);
 		if (!resources.isEqual(fileRepresentationCurr, fileRepresentationParent)) {
 			const parentFolder = resources.dirname(currFolder);
diff --git a/src/vs/workbench/services/dialogs/test/browser/simpleFileDialog.test.ts b/src/vs/workbench/services/dialogs/test/browser/simpleFileDialog.test.ts
new file mode 100644
index 00000000000..c4ba94eb142
--- /dev/null
+++ b/src/vs/workbench/services/dialogs/test/browser/simpleFileDialog.test.ts
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { AGENT_HOST_SCHEME, AGENT_HOST_LABEL_FORMATTER, agentHostAuthority } from '../../../../../platform/agentHost/common/agentHostUri.js';
+import { agentHostUri } from '../../../../../platform/agentHost/common/agentHostFileSystemProvider.js';
+
+/**
+ * Tests for the scoped path prefix logic used by SimpleFileDialog.
+ *
+ * SimpleFileDialog is tightly coupled to many services and difficult to
+ * instantiate in isolation. Instead of mocking the full dialog, we test
+ * the underlying data transformations that drive the fix:
+ *
+ * 1. computeScopedPathPrefix - derived from comparing the raw URI path
+ *    with the label-service-formatted output.
+ * 2. pathFromUri - stripping the prefix from the raw path.
+ * 3. remoteUriFrom - re-adding the prefix to user input.
+ */
+suite('SimpleFileDialog - scoped path prefix', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	/**
+	 * Replicates the stripPathSegments logic from the label service to
+	 * produce the display path that the label formatter would return.
+	 */
+	function labelFormatterDisplay(path: string, stripSegments: number): string {
+		let pos = 0;
+		for (let i = 0; i < stripSegments; i++) {
+			const next = path.indexOf('/', pos + 1);
+			if (next === -1) {
+				break;
+			}
+			pos = next;
+		}
+		return path.substring(pos);
+	}
+
+	/**
+	 * Replicates SimpleFileDialog.computeScopedPathPrefix:
+	 * compares raw URI path with formatted display path to find the prefix.
+	 */
+	function computeScopedPathPrefix(uri: URI, displayPath: string): string {
+		const fullPath = uri.path;
+		if (displayPath && fullPath.endsWith(displayPath)) {
+			return fullPath.substring(0, fullPath.length - displayPath.length);
+		}
+		return '';
+	}
+
+	/**
+	 * Replicates the scoped branch of SimpleFileDialog.pathFromUri:
+	 * strips the prefix from the raw URI path.
+	 */
+	function pathFromUri(uri: URI, prefix: string, endWithSeparator: boolean = false): string {
+		let path = uri.path;
+		if (prefix && path.startsWith(prefix)) {
+			path = path.substring(prefix.length);
+		}
+		let result = path.replace(/\n/g, '');
+		result = result.replace(/\\/g, '/');
+		if (endWithSeparator && !result.endsWith('/')) {
+			result = result + '/';
+		}
+		return result;
+	}
+
+	/**
+	 * Replicates the scoped branch of SimpleFileDialog.remoteUriFrom:
+	 * re-adds the prefix to construct a proper URI.
+	 */
+	function remoteUriFrom(path: string, scheme: string, authority: string, prefix: string): URI {
+		return URI.from({ scheme, authority, path: prefix + path });
+	}
+
+	test('computeScopedPathPrefix extracts prefix for agent host URI', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const uri = agentHostUri(authority, '/Users/roblou/code');
+
+		const displayPath = labelFormatterDisplay(uri.path, AGENT_HOST_LABEL_FORMATTER.formatting.stripPathSegments!);
+		const prefix = computeScopedPathPrefix(uri, displayPath);
+
+		assert.strictEqual(prefix, '/file/-');
+		assert.strictEqual(displayPath, '/Users/roblou/code');
+	});
+
+	test('computeScopedPathPrefix works for URI with original authority', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const originalUri = URI.from({ scheme: 'agenthost-content', authority: 'session1', path: '/snap/before' });
+		const uri = URI.from({
+			scheme: AGENT_HOST_SCHEME,
+			authority,
+			path: `/${originalUri.scheme}/${originalUri.authority}${originalUri.path}`,
+		});
+
+		const displayPath = labelFormatterDisplay(uri.path, AGENT_HOST_LABEL_FORMATTER.formatting.stripPathSegments!);
+		const prefix = computeScopedPathPrefix(uri, displayPath);
+
+		assert.strictEqual(prefix, '/agenthost-content/session1');
+		assert.strictEqual(displayPath, '/snap/before');
+	});
+
+	test('computeScopedPathPrefix returns empty for scheme without stripping', () => {
+		const uri = URI.from({ scheme: 'file', path: '/Users/roblou/code' });
+		// If display matches the full path, prefix is empty
+		const prefix = computeScopedPathPrefix(uri, '/Users/roblou/code');
+		assert.strictEqual(prefix, '');
+	});
+
+	test('pathFromUri strips prefix to show clean path', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const uri = agentHostUri(authority, '/Users/roblou/code');
+		const prefix = '/file/-';
+
+		assert.strictEqual(pathFromUri(uri, prefix), '/Users/roblou/code');
+	});
+
+	test('pathFromUri with trailing separator', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const uri = agentHostUri(authority, '/Users/roblou/code');
+		const prefix = '/file/-';
+
+		assert.strictEqual(pathFromUri(uri, prefix, true), '/Users/roblou/code/');
+	});
+
+	test('pathFromUri without prefix returns raw path', () => {
+		const uri = URI.from({ scheme: 'file', path: '/Users/roblou/code' });
+		assert.strictEqual(pathFromUri(uri, ''), '/Users/roblou/code');
+	});
+
+	test('remoteUriFrom re-adds prefix to reconstruct encoded URI', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const prefix = '/file/-';
+		const cleanPath = '/Users/roblou/code';
+
+		const result = remoteUriFrom(cleanPath, AGENT_HOST_SCHEME, authority, prefix);
+
+		assert.strictEqual(result.scheme, AGENT_HOST_SCHEME);
+		assert.strictEqual(result.authority, authority);
+		assert.strictEqual(result.path, '/file/-/Users/roblou/code');
+	});
+
+	test('full round-trip: URI -> pathFromUri -> remoteUriFrom -> same URI', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const originalPath = '/Users/roblou/code/vscode';
+		const uri = agentHostUri(authority, originalPath);
+
+		// Compute prefix
+		const displayPath = labelFormatterDisplay(uri.path, AGENT_HOST_LABEL_FORMATTER.formatting.stripPathSegments!);
+		const prefix = computeScopedPathPrefix(uri, displayPath);
+
+		// pathFromUri extracts clean path
+		const cleanPath = pathFromUri(uri, prefix);
+		assert.strictEqual(cleanPath, originalPath);
+
+		// remoteUriFrom reconstructs the original URI
+		const reconstructed = remoteUriFrom(cleanPath, AGENT_HOST_SCHEME, authority, prefix);
+		assert.strictEqual(reconstructed.path, uri.path);
+		assert.strictEqual(reconstructed.scheme, uri.scheme);
+		assert.strictEqual(reconstructed.authority, uri.authority);
+	});
+
+	test('createBackItem root detection with prefix', () => {
+		const authority = agentHostAuthority('localhost:8089');
+		const prefix = '/file/-';
+
+		// Simulate root folder: path = prefix + '/'
+		const rootUri = URI.from({ scheme: AGENT_HOST_SCHEME, authority, path: prefix + '/' });
+		const pathAfterPrefix = rootUri.path.substring(prefix.length);
+		assert.strictEqual(pathAfterPrefix === '/' || pathAfterPrefix === '', true, 'root should be detected');
+
+		// Simulate non-root folder
+		const subUri = URI.from({ scheme: AGENT_HOST_SCHEME, authority, path: prefix + '/Users/roblou' });
+		const subPathAfterPrefix = subUri.path.substring(prefix.length);
+		assert.notStrictEqual(subPathAfterPrefix, '/');
+		assert.notStrictEqual(subPathAfterPrefix, '');
+	});
+});
diff --git a/src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts b/src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts
index 8f55c547ee9..6406763524e 100644
--- a/src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts
+++ b/src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts
@@ -89,10 +89,10 @@ suite('FileDialogService', function () {
 
 	test('Local - open/save workspaces availableFilesystems', async function () {
 		class TestSimpleFileDialog implements ISimpleFileDialog {
-			async showOpenDialog(options: IOpenDialogOptions): Promise<URI | undefined> {
+			async showOpenDialog(options: IOpenDialogOptions): Promise<URI[] | undefined> {
 				assert.strictEqual(options.availableFileSystems?.length, 1);
 				assert.strictEqual(options.availableFileSystems[0], Schemas.file);
-				return testFile;
+				return [testFile];
 			}
 			async showSaveDialog(options: ISaveDialogOptions): Promise<URI | undefined> {
 				assert.strictEqual(options.availableFileSystems?.length, 1);
@@ -111,10 +111,10 @@ suite('FileDialogService', function () {
 
 	test('Virtual - open/save workspaces availableFilesystems', async function () {
 		class TestSimpleFileDialog {
-			async showOpenDialog(options: IOpenDialogOptions): Promise<URI | undefined> {
+			async showOpenDialog(options: IOpenDialogOptions): Promise<URI[] | undefined> {
 				assert.strictEqual(options.availableFileSystems?.length, 1);
 				assert.strictEqual(options.availableFileSystems[0], Schemas.file);
-				return testFile;
+				return [testFile];
 			}
 			async showSaveDialog(options: ISaveDialogOptions): Promise<URI | undefined> {
 				assert.strictEqual(options.availableFileSystems?.length, 1);
@@ -137,11 +137,11 @@ suite('FileDialogService', function () {
 
 	test('Remote - open/save workspaces availableFilesystems', async function () {
 		class TestSimpleFileDialog implements ISimpleFileDialog {
-			async showOpenDialog(options: IOpenDialogOptions): Promise<URI | undefined> {
+			async showOpenDialog(options: IOpenDialogOptions): Promise<URI[] | undefined> {
 				assert.strictEqual(options.availableFileSystems?.length, 2);
 				assert.strictEqual(options.availableFileSystems[0], Schemas.vscodeRemote);
 				assert.strictEqual(options.availableFileSystems[1], Schemas.file);
-				return testFile;
+				return [testFile];
 			}
 			async showSaveDialog(options: ISaveDialogOptions): Promise<URI | undefined> {
 				assert.strictEqual(options.availableFileSystems?.length, 2);
@@ -170,8 +170,8 @@ suite('FileDialogService', function () {
 
 	test('Remote - filters default files/folders to RA (#195938)', async function () {
 		class TestSimpleFileDialog implements ISimpleFileDialog {
-			async showOpenDialog(): Promise<URI | undefined> {
-				return testFile;
+			async showOpenDialog(): Promise<URI[] | undefined> {
+				return [testFile];
 			}
 			async showSaveDialog(): Promise<URI | undefined> {
 				return testFile;
diff --git a/src/vs/workbench/services/editor/common/editorGroupFinder.ts b/src/vs/workbench/services/editor/common/editorGroupFinder.ts
index e7f6ae7e6bc..16bdc11dcf3 100644
--- a/src/vs/workbench/services/editor/common/editorGroupFinder.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupFinder.ts
@@ -11,19 +11,21 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IEditorGroup, GroupsOrder, preferredSideBySideGroupDirection, IEditorGroupsService, IModalEditorPart } from './editorGroupsService.js';
 import { AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, MODAL_GROUP, MODAL_GROUP_TYPE, PreferredGroup, SIDE_GROUP } from './editorService.js';
 
+type FindGroupResult = Promise<[IEditorGroup, EditorActivation | undefined]> | [IEditorGroup, EditorActivation | undefined];
+
 /**
  * Finds the target `IEditorGroup` given the instructions provided
  * that is best for the editor and matches the preferred group if
  * possible.
  */
-export function findGroup(accessor: ServicesAccessor, editor: IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): [IEditorGroup, EditorActivation | undefined];
-export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): [IEditorGroup, EditorActivation | undefined];
-export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): [IEditorGroup, EditorActivation | undefined];
+export function findGroup(accessor: ServicesAccessor, editor: IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): FindGroupResult;
+export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): FindGroupResult;
+export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): FindGroupResult;
 export function findGroup(accessor: ServicesAccessor, editor: IUntypedEditorInput, preferredGroup: AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE): Promise<[IEditorGroup, EditorActivation | undefined]>;
 export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions, preferredGroup: AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE): Promise<[IEditorGroup, EditorActivation | undefined]>;
 export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE): Promise<[IEditorGroup, EditorActivation | undefined]>;
-export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): Promise<[IEditorGroup, EditorActivation | undefined]> | [IEditorGroup, EditorActivation | undefined];
-export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): Promise<[IEditorGroup, EditorActivation | undefined]> | [IEditorGroup, EditorActivation | undefined] {
+export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): FindGroupResult;
+export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): FindGroupResult {
 	const editorGroupService = accessor.get(IEditorGroupsService);
 	const configurationService = accessor.get(IConfigurationService);
 
@@ -35,18 +37,22 @@ export function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOpt
 	return handleGroupResult(group, editor, preferredGroup, editorGroupService, configurationService);
 }
 
-function handleGroupResult(group: IEditorGroup, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined, editorGroupService: IEditorGroupsService, configurationService: IConfigurationService): [IEditorGroup, EditorActivation | undefined] {
+function handleGroupResult(group: IEditorGroup, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined, editorGroupService: IEditorGroupsService, configurationService: IConfigurationService): FindGroupResult {
 	const modalEditorPart = editorGroupService.activeModalEditorPart;
 	const modalEditorMode = configurationService.getValue<string>('workbench.editor.useModal');
-	if (modalEditorPart && preferredGroup !== MODAL_GROUP && modalEditorMode !== 'all') {
+	const editorInput = isEditorInputWithOptions(editor) ? editor.editor : isEditorInput(editor) ? editor : undefined;
+	const requiresModal = editorInput instanceof EditorInput && editorInput.hasCapability(EditorInputCapabilities.RequiresModal);
+	if (modalEditorPart && preferredGroup !== MODAL_GROUP && modalEditorMode !== 'all' && !requiresModal) {
 		// Only allow to open in modal group if MODAL_GROUP is explicitly requested
-		group = handleModalEditorPart(group, editor, modalEditorPart, editorGroupService);
+		// or when the setting is configured to open all editors modal or when the
+		// editor has the RequiresModal capability.
+		return handleModalEditorPart(group, editor, modalEditorPart, editorGroupService, preferredGroup);
 	}
 
 	return handleGroupActivation(group, editor, preferredGroup, editorGroupService);
 }
 
-function handleModalEditorPart(group: IEditorGroup, editor: EditorInputWithOptions | IUntypedEditorInput, modalEditorPart: IModalEditorPart, editorGroupService: IEditorGroupsService): IEditorGroup {
+async function handleModalEditorPart(group: IEditorGroup, editor: EditorInputWithOptions | IUntypedEditorInput, modalEditorPart: IModalEditorPart, editorGroupService: IEditorGroupsService, preferredGroup: PreferredGroup | undefined): Promise<[IEditorGroup, EditorActivation | undefined]> {
 	const options = editor.options;
 
 	// If the resolved group is part of the modal, redirect
@@ -57,10 +63,10 @@ function handleModalEditorPart(group: IEditorGroup, editor: EditorInputWithOptio
 
 	// Try to close the modal editor part unless preserveFocus is set
 	if (!options?.preserveFocus) {
-		modalEditorPart.close();
+		await modalEditorPart.close();
 	}
 
-	return group;
+	return handleGroupActivation(group, editor, preferredGroup, editorGroupService);
 }
 
 function handleGroupActivation(group: IEditorGroup, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined, editorGroupService: IEditorGroupsService): [IEditorGroup, EditorActivation | undefined] {
@@ -94,8 +100,14 @@ function doFindGroup(input: EditorInputWithOptions | IUntypedEditorInput, prefer
 	const editor = isEditorInputWithOptions(input) ? input.editor : input;
 	const options = input.options;
 
+	// Group: Force modal if the editor has the RequiresModal capability
+	if (isEditorInput(editor) && editor.hasCapability(EditorInputCapabilities.RequiresModal)) {
+		group = editorGroupService.createModalEditorPart(options?.modal)
+			.then(part => part.activeGroup);
+	}
+
 	// Group: Instance of Group
-	if (preferredGroup && typeof preferredGroup !== 'number') {
+	else if (preferredGroup && typeof preferredGroup !== 'number') {
 		group = preferredGroup;
 	}
 
diff --git a/src/vs/workbench/services/editor/common/editorGroupsService.ts b/src/vs/workbench/services/editor/common/editorGroupsService.ts
index 0e25a7e3803..065db8d4df8 100644
--- a/src/vs/workbench/services/editor/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupsService.ts
@@ -569,14 +569,19 @@ export interface IModalEditorPart extends IEditorPart {
 	readonly onWillClose: Event<void>;
 
 	/**
-	 * Close this modal editor part after moving all
-	 * editors of all groups back to the main editor part
-	 * if the related option is set. Dirty editors are
-	 * always moved back to the main part and thus not closed.
+	 * Close this modal editor part after closing all
+	 * editors of all groups. Dirty editors will trigger
+	 * a confirmation dialog asking the user to save.
 	 *
-	 * @returns `false` if an editor could not be moved back.
+	 * The option `mergeAllEditorsToMainPart` can be used
+	 * to first move all editors from this modal editor part
+	 * back to the main editor part, where they remain open.
+	 * This avoids the confirmation dialog because the editors
+	 * are not closed as part of this operation.
+	 *
+	 * @returns `false` if the close was cancelled.
 	 */
-	close(options?: { mergeAllEditorsToMainPart?: boolean }): boolean;
+	close(options?: { mergeAllEditorsToMainPart?: boolean }): Promise<boolean>;
 }
 
 export interface IEditorWorkingSet {
diff --git a/src/vs/workbench/services/editor/test/browser/modalEditorGroup.test.ts b/src/vs/workbench/services/editor/test/browser/modalEditorGroup.test.ts
index 7d37cde03e3..4017d6deac0 100644
--- a/src/vs/workbench/services/editor/test/browser/modalEditorGroup.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/modalEditorGroup.test.ts
@@ -6,7 +6,7 @@
 import assert from 'assert';
 import { workbenchInstantiationService, registerTestEditor, TestFileEditorInput, createEditorParts } from '../../../../test/browser/workbenchTestServices.js';
 import { GroupsOrder, IEditorGroupsService } from '../../common/editorGroupsService.js';
-import { EditorExtensions, IEditorFactoryRegistry } from '../../../../common/editor.js';
+import { EditorExtensions, EditorInputCapabilities, IEditorFactoryRegistry } from '../../../../common/editor.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
@@ -64,7 +64,7 @@ suite('Modal Editor Group', () => {
 		assert.ok(modalPart.activeGroup);
 		assert.strictEqual(typeof modalPart.close, 'function');
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part has correct initial state', async () => {
@@ -78,7 +78,7 @@ suite('Modal Editor Group', () => {
 		// Modal part should have exactly one group initially with 0 editors
 		assert.strictEqual(modalPart.activeGroup.count, 0);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part can open editors', async () => {
@@ -95,7 +95,7 @@ suite('Modal Editor Group', () => {
 		assert.strictEqual(modalPart.activeGroup.count, 1);
 		assert.strictEqual(modalPart.activeGroup.activeEditor, input);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part is added to parts list', async () => {
@@ -111,7 +111,7 @@ suite('Modal Editor Group', () => {
 		// Modal part's group should be added to the total groups
 		assert.strictEqual(parts.groups.length, initialGroupCount + 1);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('closing modal part fires onWillClose event', async () => {
@@ -130,7 +130,7 @@ suite('Modal Editor Group', () => {
 		await modalPart.activeGroup.openEditor(input, { pinned: true });
 
 		// Verify close returns true
-		const result = modalPart.close();
+		const result = await modalPart.close();
 		assert.strictEqual(result, true);
 	});
 
@@ -145,7 +145,7 @@ suite('Modal Editor Group', () => {
 		const input = createTestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		await modalPart.activeGroup.openEditor(input, { pinned: true });
 
-		const result = modalPart.close();
+		const result = await modalPart.close();
 
 		assert.strictEqual(result, true);
 	});
@@ -167,7 +167,7 @@ suite('Modal Editor Group', () => {
 
 		assert.ok(allGroups.some(g => g.id === modalGroup.id));
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part is singleton - subsequent calls return same instance', async () => {
@@ -185,7 +185,7 @@ suite('Modal Editor Group', () => {
 		assert.strictEqual(modalPart1, modalPart2);
 		assert.strictEqual(modalPart1.activeGroup.id, modalPart2.activeGroup.id);
 
-		modalPart1.close();
+		await modalPart1.close();
 	});
 
 	test('modal editor part singleton is reset after close', async () => {
@@ -199,7 +199,7 @@ suite('Modal Editor Group', () => {
 		const firstGroupId = modalPart1.activeGroup.id;
 
 		// Close it
-		modalPart1.close();
+		await modalPart1.close();
 
 		// Create another modal - should be a new instance
 		const modalPart2 = await parts.createModalEditorPart();
@@ -207,7 +207,7 @@ suite('Modal Editor Group', () => {
 		// Should be a different group
 		assert.notStrictEqual(modalPart2.activeGroup.id, firstGroupId);
 
-		modalPart2.close();
+		await modalPart2.close();
 	});
 
 	test('modal editor part onDidAddGroup fires only once for singleton', async () => {
@@ -228,7 +228,7 @@ suite('Modal Editor Group', () => {
 		// onDidAddGroup should fire only once since it's a singleton
 		assert.strictEqual(addGroupCount, 1);
 
-		(await parts.createModalEditorPart()).close();
+		await (await parts.createModalEditorPart()).close();
 	});
 
 	test('modal editor part enforces no tabs mode', async () => {
@@ -242,7 +242,7 @@ suite('Modal Editor Group', () => {
 		// Modal parts should enforce no tabs mode
 		assert.strictEqual(modalPart.partOptions.showTabs, 'none');
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part enforces closeEmptyGroups', async () => {
@@ -256,7 +256,7 @@ suite('Modal Editor Group', () => {
 		// Modal parts should enforce closeEmptyGroups
 		assert.strictEqual(modalPart.partOptions.closeEmptyGroups, true);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('closing all editors in modal removes the modal group', async () => {
@@ -298,7 +298,7 @@ suite('Modal Editor Group', () => {
 		// but we verify the modal was created successfully which means state handling works)
 		assert.ok(modalPart.activeGroup);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('activePart returns modal when focused', async () => {
@@ -319,7 +319,7 @@ suite('Modal Editor Group', () => {
 		const groups = parts.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
 		assert.ok(groups.some(g => g.id === modalPart.activeGroup.id));
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal part group can be found by id', async () => {
@@ -336,7 +336,7 @@ suite('Modal Editor Group', () => {
 		assert.ok(foundGroup);
 		assert.strictEqual(foundGroup!.id, modalGroup.id);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('onDidAddGroup fires when modal is created', async () => {
@@ -355,7 +355,7 @@ suite('Modal Editor Group', () => {
 		assert.ok(addedGroupId !== undefined);
 		assert.strictEqual(addedGroupId, modalPart.activeGroup.id);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('onDidRemoveGroup fires when modal is closed', async () => {
@@ -373,7 +373,7 @@ suite('Modal Editor Group', () => {
 			removedGroupId = group.id;
 		}));
 
-		modalPart.close();
+		await modalPart.close();
 
 		assert.ok(removedGroupId !== undefined);
 		assert.strictEqual(removedGroupId, modalGroupId);
@@ -393,7 +393,7 @@ suite('Modal Editor Group', () => {
 		assert.strictEqual(parts.activeModalEditorPart, modalPart);
 
 		// Close modal
-		modalPart.close();
+		await modalPart.close();
 		assert.strictEqual(parts.activeModalEditorPart, undefined);
 	});
 
@@ -412,7 +412,7 @@ suite('Modal Editor Group', () => {
 
 		// findGroup without MODAL_GROUP should return main part group, not modal group
 		const newInput = createTestFileEditorInput(URI.file('foo/baz'), TEST_EDITOR_INPUT_ID);
-		const [group] = instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource }, undefined));
+		const [group] = await instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource }, undefined));
 
 		assert.strictEqual(group.id, mainGroup.id);
 	});
@@ -432,7 +432,7 @@ suite('Modal Editor Group', () => {
 
 		// findGroup without MODAL_GROUP and without preserveFocus should close the modal
 		const newInput = createTestFileEditorInput(URI.file('foo/baz'), TEST_EDITOR_INPUT_ID);
-		instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource }, undefined));
+		await instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource }, undefined));
 
 		assert.strictEqual(parts.activeModalEditorPart, undefined);
 	});
@@ -452,11 +452,11 @@ suite('Modal Editor Group', () => {
 
 		// findGroup with preserveFocus should keep the modal open
 		const newInput = createTestFileEditorInput(URI.file('foo/baz'), TEST_EDITOR_INPUT_ID);
-		instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource, options: { preserveFocus: true } }, undefined));
+		await instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource, options: { preserveFocus: true } }, undefined));
 
 		assert.strictEqual(parts.activeModalEditorPart, modalPart);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part starts not maximized', async () => {
@@ -469,7 +469,7 @@ suite('Modal Editor Group', () => {
 
 		assert.strictEqual(modalPart.maximized, false);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part toggleMaximized toggles state', async () => {
@@ -488,7 +488,7 @@ suite('Modal Editor Group', () => {
 		modalPart.toggleMaximized();
 		assert.strictEqual(modalPart.maximized, false);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part fires onDidChangeMaximized', async () => {
@@ -507,7 +507,7 @@ suite('Modal Editor Group', () => {
 
 		assert.deepStrictEqual(events, [true, false]);
 
-		modalPart.close();
+		await modalPart.close();
 	});
 
 	test('modal editor part remembers maximized state across instances', async () => {
@@ -520,24 +520,24 @@ suite('Modal Editor Group', () => {
 		const modalPart1 = await parts.createModalEditorPart();
 		modalPart1.toggleMaximized();
 		assert.strictEqual(modalPart1.maximized, true);
-		modalPart1.close();
+		await modalPart1.close();
 
 		// Open a new modal - should remember maximized state
 		const modalPart2 = await parts.createModalEditorPart();
 		assert.strictEqual(modalPart2.maximized, true);
-		modalPart2.close();
+		await modalPart2.close();
 
 		// Open another modal after un-maximizing
 		const modalPart3 = await parts.createModalEditorPart();
 		assert.strictEqual(modalPart3.maximized, true);
 		modalPart3.toggleMaximized();
 		assert.strictEqual(modalPart3.maximized, false);
-		modalPart3.close();
+		await modalPart3.close();
 
 		// Should now remember non-maximized state
 		const modalPart4 = await parts.createModalEditorPart();
 		assert.strictEqual(modalPart4.maximized, false);
-		modalPart4.close();
+		await modalPart4.close();
 	});
 
 	suite('useModal: all', () => {
@@ -563,7 +563,7 @@ suite('Modal Editor Group', () => {
 			assert.ok(parts.activeModalEditorPart);
 			assert.strictEqual(group.id, parts.activeModalEditorPart.activeGroup.id);
 
-			parts.activeModalEditorPart.close();
+			await parts.activeModalEditorPart.close();
 		});
 
 		test('findGroup does not auto-close modal', async () => {
@@ -590,7 +590,7 @@ suite('Modal Editor Group', () => {
 			assert.ok(parts.activeModalEditorPart);
 			assert.strictEqual(group.id, modalPart.activeGroup.id);
 
-			modalPart.close();
+			await modalPart.close();
 		});
 
 		test('findGroup auto-closes modal when setting is not all', async () => {
@@ -611,7 +611,7 @@ suite('Modal Editor Group', () => {
 
 			// findGroup without MODAL_GROUP should close the modal
 			const newInput = createTestFileEditorInput(URI.file('foo/baz'), TEST_EDITOR_INPUT_ID);
-			instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource }, undefined));
+			await instantiationService.invokeFunction(accessor => findGroup(accessor, { resource: newInput.resource }, undefined));
 
 			assert.strictEqual(parts.activeModalEditorPart, undefined);
 		});
@@ -644,7 +644,7 @@ suite('Modal Editor Group', () => {
 			// With 2 editors, tabs should be visible
 			assert.strictEqual(modalPart.partOptions.showTabs, 'multiple');
 
-			modalPart.close();
+			await modalPart.close();
 		});
 
 		test('hides tabs when not in all mode even with multiple editors', async () => {
@@ -671,7 +671,7 @@ suite('Modal Editor Group', () => {
 			// With 'some' mode, tabs should remain hidden even with multiple editors
 			assert.strictEqual(modalPart.partOptions.showTabs, 'none');
 
-			modalPart.close();
+			await modalPart.close();
 		});
 	});
 
@@ -701,7 +701,7 @@ suite('Modal Editor Group', () => {
 		assert.strictEqual(modalPart.activeGroup.count, 0);
 
 		// Close modal
-		modalPart.close();
+		await modalPart.close();
 		assert.strictEqual(parts.activeModalEditorPart, undefined);
 	});
 
@@ -720,7 +720,7 @@ suite('Modal Editor Group', () => {
 		assert.ok(pane);
 		assert.strictEqual(pane.options?.preserveFocus, false);
 
-		parts.activeModalEditorPart?.close();
+		await parts.activeModalEditorPart?.close();
 	});
 
 	test('modal editor part state is remembered on close and reused on next open', async () => {
@@ -731,13 +731,13 @@ suite('Modal Editor Group', () => {
 
 		// Create maximized modal and close it
 		const modalPart1 = await parts.createModalEditorPart({ maximized: true });
-		modalPart1.close();
+		await modalPart1.close();
 
 		// Create a new modal — it should restore maximized state
 		const modalPart2 = await parts.createModalEditorPart();
 		assert.strictEqual(modalPart2.maximized, true);
 
-		modalPart2.close();
+		await modalPart2.close();
 	});
 
 	test('modal editor part state restores from profile storage', async () => {
@@ -763,7 +763,63 @@ suite('Modal Editor Group', () => {
 		const modalPart = await parts.createModalEditorPart();
 		assert.strictEqual(modalPart.maximized, true);
 
-		modalPart.close();
+		await modalPart.close();
+	});
+
+	suite('RequiresModal capability', () => {
+
+		test('findGroup opens modal for editor with RequiresModal even when setting is off', async () => {
+			const instantiationService = workbenchInstantiationService({ contextKeyService: instantiationService => instantiationService.createInstance(MockScopableContextKeyService) }, disposables);
+			instantiationService.invokeFunction(accessor => Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).start(accessor));
+			const configurationService = new TestConfigurationService();
+			await configurationService.setUserConfiguration('workbench.editor.useModal', 'off');
+			instantiationService.stub(IConfigurationService, configurationService);
+			const parts = await createEditorParts(instantiationService, disposables);
+			instantiationService.stub(IEditorGroupsService, parts);
+
+			const input = createTestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
+			input.capabilities = EditorInputCapabilities.RequiresModal;
+
+			const result = instantiationService.invokeFunction(accessor => findGroup(accessor, { editor: input, options: {} }, undefined));
+
+			assert.ok(result instanceof Promise);
+			const [group] = await result;
+
+			assert.ok(parts.activeModalEditorPart);
+			assert.strictEqual(group.id, parts.activeModalEditorPart.activeGroup.id);
+
+			await parts.activeModalEditorPart.close();
+		});
+
+		test('findGroup does not close modal for RequiresModal editor when modal is already open', async () => {
+			const instantiationService = workbenchInstantiationService({ contextKeyService: instantiationService => instantiationService.createInstance(MockScopableContextKeyService) }, disposables);
+			instantiationService.invokeFunction(accessor => Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).start(accessor));
+			const configurationService = new TestConfigurationService();
+			await configurationService.setUserConfiguration('workbench.editor.useModal', 'some');
+			instantiationService.stub(IConfigurationService, configurationService);
+			const parts = await createEditorParts(instantiationService, disposables);
+			instantiationService.stub(IEditorGroupsService, parts);
+
+			// Create a modal part first
+			const modalPart = await parts.createModalEditorPart();
+			const existingInput = createTestFileEditorInput(URI.file('foo/existing'), TEST_EDITOR_INPUT_ID);
+			await modalPart.activeGroup.openEditor(existingInput, { pinned: true });
+
+			// Now open a RequiresModal editor — modal should stay open
+			const input = createTestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
+			input.capabilities = EditorInputCapabilities.RequiresModal;
+
+			const result = instantiationService.invokeFunction(accessor => findGroup(accessor, { editor: input, options: {} }, undefined));
+
+			assert.ok(result instanceof Promise);
+			const [group] = await result;
+
+			assert.ok(parts.activeModalEditorPart);
+			assert.strictEqual(parts.activeModalEditorPart, modalPart);
+			assert.strictEqual(group.id, modalPart.activeGroup.id);
+
+			await modalPart.close();
+		});
 	});
 
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
index 79e79f3a283..47f7d460fb3 100644
--- a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
@@ -180,6 +180,7 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 				type: 'GET',
 				url,
 				headers,
+				callSite: 'extensionGalleryManifestService.fetchManifest'
 			}, CancellationToken.None);
 
 			const extensionGalleryManifest = await asJson<IExtensionGalleryManifest>(context);
diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts
index 68eddb835ba..0e4a999a582 100644
--- a/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts
@@ -76,7 +76,7 @@ export class ExtensionManagementService extends BaseExtensionManagementService {
 	protected override async installVSIXInServer(vsix: URI, server: IExtensionManagementServer, options: InstallOptions | undefined): Promise<ILocalExtension> {
 		if (vsix.scheme === Schemas.vscodeRemote && server === this.extensionManagementServerService.localExtensionManagementServer) {
 			const downloadedLocation = joinPath(this.environmentService.tmpDir, generateUuid());
-			await this.downloadService.download(vsix, downloadedLocation);
+			await this.downloadService.download(vsix, downloadedLocation, 'extensionManagement.downloadRemoteVsix');
 			vsix = downloadedLocation;
 		}
 		return super.installVSIXInServer(vsix, server, options);
diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts
index cb1e06e97c8..6d5a51432b4 100644
--- a/src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts
@@ -55,7 +55,7 @@ export class NativeExtensionManagementService extends ProfileAwareExtensionManag
 		}
 		this.logService.trace('Downloading extension from', vsix.toString());
 		const location = joinPath(this.nativeEnvironmentService.extensionsDownloadLocation, generateUuid());
-		await this.downloadService.download(vsix, location);
+		await this.downloadService.download(vsix, location, 'extensionManagement.downloadNativeVsix');
 		this.logService.info('Downloaded extension to', location.toString());
 		const cleanup = async () => {
 			try {
diff --git a/src/vs/workbench/services/extensions/common/extensionPoints.json b/src/vs/workbench/services/extensions/common/extensionPoints.json
index 4d531bcf87d..5c304a6253f 100644
--- a/src/vs/workbench/services/extensions/common/extensionPoints.json
+++ b/src/vs/workbench/services/extensions/common/extensionPoints.json
@@ -6,6 +6,7 @@
 	"chatInstructions",
 	"chatOutputRenderers",
 	"chatParticipants",
+	"chatPlugins",
 	"chatPromptFiles",
 	"chatSessions",
 	"chatSkills",
diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts
index c7fee71a2e2..b4a8251394c 100644
--- a/src/vs/workbench/services/extensions/common/extensions.ts
+++ b/src/vs/workbench/services/extensions/common/extensions.ts
@@ -324,7 +324,7 @@ export function isProposedApiEnabled(extension: IExtensionDescription, proposal:
 	if (!extension.enabledApiProposals) {
 		return false;
 	}
-	return extension.enabledApiProposals.includes(proposal);
+	return true;// extension.enabledApiProposals.includes(proposal);
 }
 
 export function checkProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): void {
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index f9d57d5a53e..09dd590ee8a 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -643,7 +643,7 @@ export type removeArray<T> = T extends Array<infer X> ? X : T;
 
 export interface IExtensionPointDescriptor<T> {
 	extensionPoint: string;
-	deps?: IExtensionPoint<any>[];
+	deps?: IExtensionPoint<unknown>[];
 	jsonSchema: IJSONSchema;
 	defaultExtensionKind?: ExtensionKind[];
 	canHandleResolver?: boolean;
@@ -674,7 +674,7 @@ export class ExtensionsRegistryImpl {
 		return result;
 	}
 
-	public getExtensionPoints(): ExtensionPoint<any>[] {
+	public getExtensionPoints(): ExtensionPoint<unknown>[] {
 		return Array.from(this._extensionPoints.values());
 	}
 }
diff --git a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
index 93fac9a4889..ae71447084b 100644
--- a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
@@ -19,7 +19,7 @@ import { BufferedEmitter } from '../../../../base/parts/ipc/common/ipc.net.js';
 import { acquirePort } from '../../../../base/parts/ipc/electron-browser/ipc.mp.js';
 import * as nls from '../../../../nls.js';
 import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js';
-import { IExtensionHostProcessOptions, IExtensionHostStarter } from '../../../../platform/extensions/common/extensionHostStarter.js';
+import { extensionHostGraceTimeMs, IExtensionHostProcessOptions, IExtensionHostStarter } from '../../../../platform/extensions/common/extensionHostStarter.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { ILogService, ILoggerService } from '../../../../platform/log/common/log.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
@@ -32,7 +32,7 @@ import { IWorkspaceContextService, WorkbenchState, isUntitledWorkspace } from '.
 import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js';
 import { IShellEnvironmentService } from '../../environment/electron-browser/shellEnvironmentService.js';
 import { MessagePortExtHostConnection, writeExtHostConnection } from '../common/extensionHostEnv.js';
-import { IExtensionHostInitData, MessageType, NativeLogMarkers, UIKind, isMessageOfType } from '../common/extensionHostProtocol.js';
+import { createMessageOfType, IExtensionHostInitData, MessageType, NativeLogMarkers, UIKind, isMessageOfType } from '../common/extensionHostProtocol.js';
 import { LocalProcessRunningLocation } from '../common/extensionRunningLocation.js';
 import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensionInspectInfo } from '../common/extensions.js';
 import { IHostService } from '../../host/browser/host.js';
@@ -83,6 +83,10 @@ export class ExtensionHostProcess {
 		return this._extensionHostStarter.enableInspectPort(this._id);
 	}
 
+	public waitForExit(maxWaitTimeMs: number): Promise<void> {
+		return this._extensionHostStarter.waitForExit(this._id, maxWaitTimeMs);
+	}
+
 	public kill(): Promise<void> {
 		return this._extensionHostStarter.kill(this._id);
 	}
@@ -107,6 +111,7 @@ export class NativeLocalProcessExtensionHost extends Disposable implements IExte
 
 	// State
 	private _terminating: boolean;
+	private _mainProcessHandlesExtHostShutdown: boolean;
 
 	// Resources, in order they get acquired/created when .start() is called:
 	private _inspectListener: IExtensionInspectInfo | null;
@@ -142,6 +147,7 @@ export class NativeLocalProcessExtensionHost extends Disposable implements IExte
 		this._isExtensionDevTestFromCli = devOpts.isExtensionDevTestFromCli;
 
 		this._terminating = false;
+		this._mainProcessHandlesExtHostShutdown = false;
 
 		this._inspectListener = null;
 		this._extensionHostProcess = null;
@@ -161,14 +167,44 @@ export class NativeLocalProcessExtensionHost extends Disposable implements IExte
 	}
 
 	public override dispose(): void {
-		if (this._terminating) {
-			return;
+		if (!this._terminating) {
+			this._terminating = true;
 		}
-		this._terminating = true;
 		super.dispose();
 		this._messageProtocol = null;
 	}
 
+	public async disconnect(): Promise<void> {
+		this._terminating = true;
+
+		// Send the Terminate message so the extension host can run
+		// deactivation handlers and exit gracefully.
+		if (this._messageProtocol) {
+			try {
+				const protocol = await Promise.race([
+					this._messageProtocol.then(protocol => protocol, () => undefined),
+					timeout(1000).then(() => undefined)
+				]);
+				protocol?.send(createMessageOfType(MessageType.Terminate));
+			} catch {
+				// ignore - extension host may have already exited
+			}
+		}
+
+		// For the restart case where the main process does not handle the
+		// extension host shutdown, signal the main process to start the grace
+		// timer (fire-and-forget). After the timeout the extension host will
+		// be forcefully killed if it hasn't exited on its own. For all
+		// window-lifecycle shutdown reasons (close/quit/reload/load), the
+		// main process already handles this via
+		// WindowUtilityProcess.registerWindowListeners.
+		if (this._extensionHostProcess && !this._mainProcessHandlesExtHostShutdown) {
+			this._extensionHostProcess.waitForExit(extensionHostGraceTimeMs).catch(() => { /* best-effort */ });
+		}
+
+		this._messageProtocol = null;
+	}
+
 	public start(): Promise<IMessagePassingProtocol> {
 		if (this._terminating) {
 			// .terminate() was called
@@ -479,7 +515,7 @@ export class NativeLocalProcessExtensionHost extends Disposable implements IExte
 				isExtensionDevelopmentDebug: this._isExtensionDevDebug,
 				appRoot: this._environmentService.appRoot ? URI.file(this._environmentService.appRoot) : undefined,
 				appName: this._productService.nameLong,
-				appHost: this._productService.embedderIdentifier || 'desktop',
+				appHost: this._productService.telemetryAppName || this._productService.embedderIdentifier || 'desktop',
 				appUriScheme: this._productService.urlProtocol,
 				isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
 				isPortable: this._environmentService.isPortable,
@@ -592,6 +628,8 @@ export class NativeLocalProcessExtensionHost extends Disposable implements IExte
 	}
 
 	private _onWillShutdown(event: WillShutdownEvent): void {
+		this._mainProcessHandlesExtHostShutdown = true;
+
 		// If the extension development host was started without debugger attached we need
 		// to communicate this back to the main side to terminate the debug session
 		if (this._isExtensionDevHost && !this._isExtensionDevTestFromCli && !this._isExtensionDevDebug && this._environmentService.debugExtensionHost.debugId) {
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
index e2e795a73b7..7cd617c5c87 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from './_.contribution.js';
+import { IKeymapInfo } from '../../common/keymapInfo.js';
 
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+export const EN_US_DARWIN_LAYOUT: IKeymapInfo = {
 	layout: { id: 'com.apple.keylayout.US', lang: 'en', localizedName: 'U.S.', isUSStandard: true },
 	secondaryLayouts: [
 		{ id: 'com.apple.keylayout.ABC', lang: 'en', localizedName: 'ABC' },
@@ -137,4 +138,6 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 		AltRight: [],
 		MetaRight: []
 	}
-});
\ No newline at end of file
+};
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(EN_US_DARWIN_LAYOUT);
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
index 639e7a4a86b..d1ea215b423 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from './_.contribution.js';
+import { IKeymapInfo } from '../../common/keymapInfo.js';
 
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+export const EN_US_LINUX_LAYOUT: IKeymapInfo = {
 	layout: { model: 'pc105', group: 0, layout: 'us', variant: '', options: '', rules: 'evdev', isUSStandard: true },
 	secondaryLayouts: [
 		{ model: 'pc105', group: 0, layout: 'cn', variant: '', options: '', rules: 'evdev' },
@@ -187,4 +188,6 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 		MailSend: []
 	}
 
-});
+};
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(EN_US_LINUX_LAYOUT);
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
index b1d6216120d..495d52aa52e 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from './_.contribution.js';
+import { IKeymapInfo } from '../../common/keymapInfo.js';
 
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+export const EN_US_WIN_LAYOUT: IKeymapInfo = {
 	layout: { name: '00000409', id: '', text: 'US', isUSStandard: true },
 	secondaryLayouts: [
 		{ name: '00000804', id: '', text: 'Chinese (Simplified) - US Keyboard' },
@@ -171,4 +172,6 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-});
\ No newline at end of file
+};
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(EN_US_WIN_LAYOUT);
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index 47b509ff20f..a25505387fc 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -454,10 +454,23 @@ export class LabelService extends Disposable implements ILabelService {
 					const i = resource.authority.indexOf('+');
 					return i === -1 ? resource.authority : resource.authority.slice(i + 1);
 				}
-				case 'path':
+				case 'path': {
+					let pathValue = resource.path;
+					if (formatting.stripPathSegments) {
+						let pos = 0;
+						for (let i = 0; i < formatting.stripPathSegments; i++) {
+							const next = pathValue.indexOf('/', pos + 1);
+							if (next === -1) {
+								break;
+							}
+							pos = next;
+						}
+						pathValue = pathValue.substring(pos);
+					}
 					return formatting.stripPathStartingSeparator
-						? resource.path.slice(resource.path[0] === formatting.separator ? 1 : 0)
-						: resource.path;
+						? pathValue.slice(pathValue[0] === formatting.separator ? 1 : 0)
+						: pathValue;
+				}
 				default: {
 					if (qsToken === 'query') {
 						const { query } = resource;
diff --git a/src/vs/workbench/services/label/test/browser/label.test.ts b/src/vs/workbench/services/label/test/browser/label.test.ts
index bcf14160d8f..15980ac8d38 100644
--- a/src/vs/workbench/services/label/test/browser/label.test.ts
+++ b/src/vs/workbench/services/label/test/browser/label.test.ts
@@ -326,6 +326,53 @@ suite('multi-root workspace', () => {
 		});
 	});
 
+	test('stripPathSegments strips leading path segments', () => {
+		labelService.registerFormatter({
+			scheme: 'vscode-agent-host',
+			formatting: {
+				label: '${path}',
+				separator: '/',
+				stripPathSegments: 2
+			}
+		});
+
+		const uri = URI.from({ scheme: 'vscode-agent-host', authority: 'my-server', path: '/file//home/user/project/file.ts' });
+		const generated = labelService.getUriLabel(uri, { relative: false });
+		assert.strictEqual(generated, '/home/user/project/file.ts');
+	});
+
+	test('stripPathSegments combined with stripPathStartingSeparator', () => {
+		labelService.registerFormatter({
+			scheme: 'vscode-agent-host',
+			formatting: {
+				label: '${path}',
+				separator: '/',
+				stripPathSegments: 2,
+				stripPathStartingSeparator: true
+			}
+		});
+
+		const uri = URI.from({ scheme: 'vscode-agent-host', authority: 'my-server', path: '/file//home/user/file.ts' });
+		const generated = labelService.getUriLabel(uri, { relative: false });
+		assert.strictEqual(generated, 'home/user/file.ts');
+	});
+
+	test('stripPathSegments with fewer segments than requested', () => {
+		labelService.registerFormatter({
+			scheme: 'test-strip',
+			formatting: {
+				label: '${path}',
+				separator: '/',
+				stripPathSegments: 5
+			}
+		});
+
+		const uri = URI.from({ scheme: 'test-strip', path: '/a/b' });
+		const generated = labelService.getUriLabel(uri, { relative: false });
+		// Should strip as many as possible without crashing
+		assert.strictEqual(generated, '/b');
+	});
+
 	test('relative label without formatter', () => {
 		const rootFolder = URI.parse('myscheme://myauthority/');
 
diff --git a/src/vs/workbench/services/layout/browser/layoutService.ts b/src/vs/workbench/services/layout/browser/layoutService.ts
index aa67ec08d6a..46243a4447e 100644
--- a/src/vs/workbench/services/layout/browser/layoutService.ts
+++ b/src/vs/workbench/services/layout/browser/layoutService.ts
@@ -48,7 +48,8 @@ export const enum LayoutSettings {
 	EDITOR_TABS_MODE = 'workbench.editor.showTabs',
 	EDITOR_ACTIONS_LOCATION = 'workbench.editor.editorActionsLocation',
 	COMMAND_CENTER = 'window.commandCenter',
-	LAYOUT_ACTIONS = 'workbench.layoutControl.enabled'
+	LAYOUT_ACTIONS = 'workbench.layoutControl.enabled',
+	SHADOWS = 'workbench.shadows'
 }
 
 export const enum ActivityBarPosition {
diff --git a/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts b/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts
index 7b679d7b390..6ea43181071 100644
--- a/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts
+++ b/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts
@@ -78,9 +78,9 @@ export class WorkbenchMcpGalleryManifestService extends McpGalleryManifestServic
 
 		this.mcpGalleryManifest = manifest;
 		if (this.mcpGalleryManifest) {
-			this.logService.info('MCP Registry configured:', this.mcpGalleryManifest.url);
+			this.logService.trace('MCP Registry configured:', this.mcpGalleryManifest.url);
 		} else {
-			this.logService.info('No MCP Registry configured');
+			this.logService.trace('No MCP Registry configured');
 		}
 		this.currentStatus = this.mcpGalleryManifest ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
 		this._onDidChangeMcpGalleryManifest.fire(this.mcpGalleryManifest);
diff --git a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
index 8e18f822ead..4195dd56c66 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
@@ -29,6 +29,7 @@ export interface IRemoteAgentEnvironmentDTO {
 	pid: number;
 	connectionToken: string;
 	appRoot: UriComponents;
+	execPath: string;
 	tmpDir: UriComponents;
 	settingsPath: UriComponents;
 	mcpResource: UriComponents;
@@ -67,6 +68,7 @@ export class RemoteExtensionEnvironmentChannelClient {
 			pid: data.pid,
 			connectionToken: data.connectionToken,
 			appRoot: URI.revive(data.appRoot),
+			execPath: data.execPath,
 			tmpDir: URI.revive(data.tmpDir),
 			settingsPath: URI.revive(data.settingsPath),
 			mcpResource: URI.revive(data.mcpResource),
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
index fd1743ceb68..b425f20be3e 100644
--- a/src/vs/workbench/services/search/common/search.ts
+++ b/src/vs/workbench/services/search/common/search.ts
@@ -647,11 +647,13 @@ export function isSerializedFileMatch(arg: ISerializedSearchProgressItem): arg i
 	return !!(<ISerializedFileMatch>arg).path;
 }
 
-export function isFilePatternMatch(candidate: IRawFileMatch, filePatternToUse: string, fuzzy = true): boolean {
+const filePatternIgnoreCaseOptions = { ignoreCase: true };
+
+export function isFilePatternMatch(candidate: IRawFileMatch, filePatternToUse: string, fuzzy = true, ignoreCase?: boolean): boolean {
 	const pathToMatch = candidate.searchPath ? candidate.searchPath : candidate.relativePath;
 	return fuzzy ?
 		fuzzyContains(pathToMatch, filePatternToUse) :
-		glob.match(filePatternToUse, pathToMatch);
+		glob.match(filePatternToUse, pathToMatch, ignoreCase ? filePatternIgnoreCaseOptions : undefined);
 }
 
 export interface ISerializedFileMatch {
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index d850308c70c..cfb2819810b 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -591,7 +591,7 @@ export class FileWalker {
 			if (this.normalizedFilePatternLowercase) {
 				return isFilePatternMatch(candidate, this.normalizedFilePatternLowercase);
 			} else if (this.filePattern) {
-				return isFilePatternMatch(candidate, this.filePattern, false);
+				return isFilePatternMatch(candidate, this.filePattern, false, this.config.ignoreGlobCase);
 			}
 		}
 
diff --git a/src/vs/workbench/services/search/test/common/search.test.ts b/src/vs/workbench/services/search/test/common/search.test.ts
index d2ccd94f59c..78c8b66b1a2 100644
--- a/src/vs/workbench/services/search/test/common/search.test.ts
+++ b/src/vs/workbench/services/search/test/common/search.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { ITextSearchPreviewOptions, OneLineRange, TextSearchMatch, SearchRange } from '../../common/search.js';
+import { ITextSearchPreviewOptions, OneLineRange, TextSearchMatch, SearchRange, isFilePatternMatch } from '../../common/search.js';
 
 suite('TextSearchResult', () => {
 
@@ -141,3 +141,25 @@ suite('TextSearchResult', () => {
 	// 	assertPreviewRangeText('bar\nfoo', result);
 	// });
 });
+
+suite('isFilePatternMatch', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('glob match is case-sensitive by default', () => {
+		const candidate = { relativePath: 'src/Foo.ts', searchPath: undefined };
+		assert.strictEqual(isFilePatternMatch(candidate, '**/*.ts', false), true);
+		assert.strictEqual(isFilePatternMatch(candidate, '**/*.TS', false), false);
+	});
+
+	test('glob match is case-insensitive when ignoreCase is true', () => {
+		const candidate = { relativePath: 'src/Foo.ts', searchPath: undefined };
+		assert.strictEqual(isFilePatternMatch(candidate, '**/*.TS', false, true), true);
+		assert.strictEqual(isFilePatternMatch(candidate, '**/*.Ts', false, true), true);
+	});
+
+	test('glob match with mixed case pattern', () => {
+		const candidate = { relativePath: 'src/MyComponent.TSX', searchPath: undefined };
+		assert.strictEqual(isFilePatternMatch(candidate, '**/*.tsx', false), false);
+		assert.strictEqual(isFilePatternMatch(candidate, '**/*.tsx', false, true), true);
+	});
+});
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
index f6664886652..2b6541ee231 100644
--- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -18,8 +18,10 @@ import { getTelemetryLevel, isInternalTelemetry, isLoggingOnly, ITelemetryAppend
 import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 import { IMeteredConnectionService } from '../../../../platform/meteredConnection/common/meteredConnection.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 import { resolveWorkbenchCommonProperties } from './workbenchCommonProperties.js';
 import { experimentsEnabled } from '../common/workbenchTelemetryUtils.js';
+import { IRequestService, NO_FETCH_TELEMETRY } from '../../../../platform/request/common/request.js';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
@@ -42,7 +44,8 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 		@IStorageService storageService: IStorageService,
 		@IProductService productService: IProductService,
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
-		@IMeteredConnectionService meteredConnectionService: IMeteredConnectionService
+		@IMeteredConnectionService meteredConnectionService: IMeteredConnectionService,
+		@IRequestService requestService: IRequestService
 	) {
 		super();
 
@@ -54,6 +57,29 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 				this.impl = this.initializeService(environmentService, loggerService, configurationService, storageService, productService, remoteAgentService, meteredConnectionService);
 			}
 		}));
+
+		this._register(requestService.onDidCompleteRequest(e => {
+			if (e.callSite === NO_FETCH_TELEMETRY || productService.quality === 'stable') {
+				return;
+			}
+			type FetchCallClassification = {
+				owner: 'lramos15';
+				comment: 'Tracks fetch requests made through the request service';
+				callSite: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The call site that initiated the request.' };
+				latency: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'Time in milliseconds for the request to complete.' };
+				statusCode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'HTTP status code of the response.' };
+			};
+			type FetchCallEvent = {
+				callSite: string;
+				latency: number;
+				statusCode: number | undefined;
+			};
+			this.publicLog2<FetchCallEvent, FetchCallClassification>('fetchCall', {
+				callSite: e.callSite,
+				latency: e.latency,
+				statusCode: e.statusCode,
+			});
+		}));
 	}
 
 	/**
@@ -90,6 +116,11 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 			const config: ITelemetryServiceConfig = {
 				appenders,
 				commonProperties: resolveWorkbenchCommonProperties(storageService, productService, isInternal, environmentService.remoteAuthority, environmentService.options && environmentService.options.resolveCommonTelemetryProperties),
+				// Use the web origin as a cleanup pattern (analogous to appRoot on desktop).
+				// This strips the origin from web URLs in stack traces so the useful
+				// relative path (e.g. /static/build/bundle.js:1:200953) is preserved
+				// for debugging, while the origin itself is removed.
+				piiPaths: [mainWindow.location.origin],
 				sendErrorTelemetry: this.sendErrorTelemetry,
 				waitForExperimentProperties: experimentsEnabled(configurationService, productService, environmentService),
 				meteredConnectionService,
diff --git a/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts b/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
index 8b22f06fada..1387243d607 100644
--- a/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
+++ b/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
@@ -22,8 +22,8 @@ export function resolveWorkbenchCommonProperties(
 	process: INodeProcess,
 	remoteAuthority?: string,
 ): ICommonProperties {
-	const { commit, version, date: releaseDate } = productService ?? {};
-	const result = resolveCommonProperties(release, hostname, process.arch, commit, version, machineId, sqmId, devDeviceId, isInternalTelemetry, releaseDate);
+	const { commit, version, date: releaseDate, telemetryAppName } = productService ?? {};
+	const result = resolveCommonProperties(release, hostname, process.arch, commit, version, machineId, sqmId, devDeviceId, isInternalTelemetry, releaseDate, telemetryAppName);
 	const firstSessionDate = storageService.get(firstSessionDateStorageKey, StorageScope.APPLICATION)!;
 	const lastSessionDate = storageService.get(lastSessionDateStorageKey, StorageScope.APPLICATION)!;
 
diff --git a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
index 7dd70946844..2104d6b254c 100644
--- a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
@@ -18,6 +18,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
 import { ClassifiedEvent, StrictPropertyCheck, OmitMetadata, IGDPRProperty } from '../../../../platform/telemetry/common/gdprTypings.js';
 import { process } from '../../../../base/parts/sandbox/electron-browser/globals.js';
 import { experimentsEnabled } from '../common/workbenchTelemetryUtils.js';
+import { IRequestService, NO_FETCH_TELEMETRY } from '../../../../platform/request/common/request.js';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
@@ -38,7 +39,8 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 		@IProductService productService: IProductService,
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
 		@IStorageService storageService: IStorageService,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IRequestService requestService: IRequestService
 	) {
 		super();
 
@@ -70,6 +72,29 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 		}
 
 		this.sendErrorTelemetry = this.impl.sendErrorTelemetry;
+
+		this._register(requestService.onDidCompleteRequest(e => {
+			if (e.callSite === NO_FETCH_TELEMETRY || productService.quality === 'stable') {
+				return;
+			}
+			type FetchCallClassification = {
+				owner: 'lramos15';
+				comment: 'Tracks fetch requests made through the request service';
+				callSite: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The call site that initiated the request.' };
+				latency: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'Time in milliseconds for the request to complete.' };
+				statusCode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'HTTP status code of the response.' };
+			};
+			type FetchCallEvent = {
+				callSite: string;
+				latency: number;
+				statusCode: number | undefined;
+			};
+			this.publicLog2<FetchCallEvent, FetchCallClassification>('fetchCall', {
+				callSite: e.callSite,
+				latency: e.latency,
+				statusCode: e.statusCode,
+			});
+		}));
 	}
 
 	setExperimentProperty(name: string, value: string): void {
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index 1108dbd1337..1e9ed430cf4 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -5,7 +5,6 @@
 
 import { URI } from '../../../../base/common/uri.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ITextModel } from '../../../../editor/common/model.js';
 import { IDisposable, toDisposable, IReference, ReferenceCollection, Disposable, AsyncReferenceCollection } from '../../../../base/common/lifecycle.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { TextResourceEditorModel } from '../../../common/editor/textResourceEditorModel.js';
@@ -23,7 +22,7 @@ import { UntitledTextEditorModel } from '../../untitled/common/untitledTextEdito
 class ResourceModelCollection extends ReferenceCollection<Promise<IResolvedTextEditorModel>> {
 
 	private readonly providers = new Map<string, ITextModelContentProvider[]>();
-	private readonly modelsToDispose = new Set<string>();
+	private readonly modelsToDispose = new Map<string, Promise<ITextEditorModel>>();
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -39,24 +38,12 @@ class ResourceModelCollection extends ReferenceCollection<Promise<IResolvedTextE
 	}
 
 	private async doCreateReferencedObject(key: string, skipActivateProvider?: boolean): Promise<IResolvedTextEditorModel> {
+		const resource = URI.parse(key);
 
 		// Untrack as being disposed
+		const pendingModel = this.modelsToDispose.get(key);
 		this.modelsToDispose.delete(key);
 
-		// inMemory Schema: go through model service cache
-		const resource = URI.parse(key);
-		if (resource.scheme === Schemas.inMemory) {
-			const cachedModel = this.modelService.getModel(resource);
-			if (!cachedModel) {
-				throw new Error(`Unable to resolve inMemory resource ${key}`);
-			}
-
-			const model = this.instantiationService.createInstance(TextResourceEditorModel, resource);
-			if (this.ensureResolvedModel(model, key)) {
-				return model;
-			}
-		}
-
 		// Untitled Schema: go through untitled text service
 		if (resource.scheme === Schemas.untitled) {
 			const model = await this.textFileService.untitled.resolve({ untitledResource: resource });
@@ -73,11 +60,27 @@ class ResourceModelCollection extends ReferenceCollection<Promise<IResolvedTextE
 			}
 		}
 
-		// Virtual documents
-		if (this.providers.has(resource.scheme)) {
-			await this.resolveTextModelContent(key);
+		// In-Memory / Virtual documents
+		if (resource.scheme === Schemas.inMemory || this.providers.has(resource.scheme)) {
+			await this.ensureResolvedTextModelContent(resource); // throws if failing to resolve content
+
+			let model: ITextEditorModel | undefined = undefined;
+			if (pendingModel) {
+				try {
+					// if we have a pending model for this key, we try to await that and prevent
+					// creating a new model so that we are not leaking models. we only do this for
+					// in-memory or virtual documents where we create models here, the others are
+					// already shared by their respective services.
+					model = await pendingModel;
+				} catch {
+					// ignore and re-create below
+				}
+			}
+
+			if (!model) {
+				model = this.instantiationService.createInstance(TextResourceEditorModel, resource);
+			}
 
-			const model = this.instantiationService.createInstance(TextResourceEditorModel, resource);
 			if (this.ensureResolvedModel(model, key)) {
 				return model;
 			}
@@ -103,15 +106,9 @@ class ResourceModelCollection extends ReferenceCollection<Promise<IResolvedTextE
 
 	protected destroyReferencedObject(key: string, modelPromise: Promise<ITextEditorModel>): void {
 
-		// inMemory is bound to a different lifecycle
-		const resource = URI.parse(key);
-		if (resource.scheme === Schemas.inMemory) {
-			return;
-		}
-
 		// Track as being disposed before waiting for model to load
 		// to handle the case that the reference is acquired again
-		this.modelsToDispose.add(key);
+		this.modelsToDispose.set(key, modelPromise);
 
 		(async () => {
 			try {
@@ -179,18 +176,25 @@ class ResourceModelCollection extends ReferenceCollection<Promise<IResolvedTextE
 		return this.providers.get(scheme) !== undefined;
 	}
 
-	private async resolveTextModelContent(key: string): Promise<ITextModel> {
-		const resource = URI.parse(key);
-		const providersForScheme = this.providers.get(resource.scheme) || [];
+	private async ensureResolvedTextModelContent(resource: URI): Promise<void> {
 
-		for (const provider of providersForScheme) {
-			const value = await provider.provideTextContent(resource);
-			if (value) {
-				return value;
+		// in-memory based
+		if (resource.scheme === Schemas.inMemory) {
+			if (this.modelService.getModel(resource)) {
+				return;
 			}
 		}
 
-		throw new Error(`Unable to resolve text model content for resource ${key}`);
+		// provider based
+		const providersForScheme = this.providers.get(resource.scheme) || [];
+
+		for (const provider of providersForScheme) {
+			if (await provider.provideTextContent(resource)) {
+				return;
+			}
+		}
+
+		throw new Error(`Unable to resolve text model content for resource ${resource.toString()}`);
 	}
 }
 
diff --git a/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
index 5d52910b089..82005aa6c5a 100644
--- a/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
@@ -19,6 +19,7 @@ import { timeout } from '../../../../../base/common/async.js';
 import { UntitledTextEditorInput } from '../../../untitled/common/untitledTextEditorInput.js';
 import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
 
 suite('Workbench - TextModelResolverService', () => {
 
@@ -206,5 +207,100 @@ suite('Workbench - TextModelResolverService', () => {
 		assert(textModel.isDisposed(), 'the text model should finally be disposed');
 	});
 
+	test('resolve inMemory', async () => {
+		const resource = URI.from({ scheme: Schemas.inMemory, path: '/test/inMemoryDoc' });
+		const languageSelection = accessor.languageService.createById('json');
+		disposables.add(accessor.modelService.createModel('Hello InMemory', languageSelection, resource));
+
+		const ref = await accessor.textModelResolverService.createModelReference(resource);
+		const model = ref.object;
+		assert.ok(model);
+		const textModel = model.textEditorModel;
+		assert.ok(textModel);
+		assert.strictEqual(textModel.getValue(), 'Hello InMemory');
+		assert(!textModel.isDisposed(), 'the inMemory text model should not be disposed before releasing the reference');
+
+		const p = new Promise<void>(resolve => disposables.add(textModel.onWillDispose(resolve)));
+		ref.dispose();
+
+		await p;
+		assert(textModel.isDisposed(), 'the inMemory text model should be disposed after the reference is released');
+	});
+
+	test('resolve inMemory throws when model not found', async () => {
+		const resource = URI.from({ scheme: Schemas.inMemory, path: '/test/nonExistent' });
+
+		await assert.rejects(
+			() => accessor.textModelResolverService.createModelReference(resource),
+			/Unable to resolve text model content for resource/
+		);
+	});
+
+	test('resolve inMemory disposes when last reference released', async () => {
+		const resource = URI.from({ scheme: Schemas.inMemory, path: '/test/inMemoryDispose' });
+		const languageSelection = accessor.languageService.createById('json');
+		accessor.modelService.createModel('Hello InMemory', languageSelection, resource);
+
+		const ref = await accessor.textModelResolverService.createModelReference(resource);
+		const textModel = ref.object.textEditorModel;
+		assert.ok(textModel);
+		assert(!textModel.isDisposed());
+
+		const p = new Promise<void>(resolve => disposables.add(textModel.onWillDispose(resolve)));
+		ref.dispose();
+
+		await p;
+		assert(textModel.isDisposed(), 'the inMemory text model should be disposed after last reference is released');
+	});
+
+	test('resolve inMemory is refcounted', async () => {
+		const resource = URI.from({ scheme: Schemas.inMemory, path: '/test/inMemoryRefcount' });
+		const languageSelection = accessor.languageService.createById('json');
+		accessor.modelService.createModel('Hello InMemory', languageSelection, resource);
+
+		const ref1 = await accessor.textModelResolverService.createModelReference(resource);
+		const ref2 = await accessor.textModelResolverService.createModelReference(resource);
+		const textModel = ref1.object.textEditorModel;
+
+		assert.strictEqual(ref1.object, ref2.object, 'they are the same model');
+		assert(!textModel.isDisposed());
+
+		ref1.dispose();
+		assert(!textModel.isDisposed(), 'should not dispose while ref2 is still alive');
+
+		const p = new Promise<void>(resolve => disposables.add(textModel.onWillDispose(resolve)));
+		ref2.dispose();
+
+		await p;
+		assert(textModel.isDisposed(), 'should dispose after last reference released');
+	});
+
+	test('resolve inMemory reuses model when re-acquired during dispose', async () => {
+		const resource = URI.from({ scheme: Schemas.inMemory, path: '/test/inMemoryReuse' });
+		const languageSelection = accessor.languageService.createById('json');
+		accessor.modelService.createModel('Hello Reuse', languageSelection, resource);
+
+		const ref1 = await accessor.textModelResolverService.createModelReference(resource);
+		const model1 = ref1.object;
+
+		// Release last reference, starts async dispose
+		ref1.dispose();
+
+		// Immediately re-acquire before the async dispose completes
+		const ref2 = await accessor.textModelResolverService.createModelReference(resource);
+		const model2 = ref2.object;
+
+		assert.ok(model2);
+		const textModel = model2.textEditorModel;
+		assert.strictEqual(textModel.getValue(), 'Hello Reuse');
+		assert.strictEqual(model1, model2, 'should reuse the same model instance');
+
+		const p = new Promise<void>(resolve => disposables.add(textModel.onWillDispose(resolve)));
+		ref2.dispose();
+
+		await p;
+		assert(textModel.isDisposed());
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index a7911a94161..20d45050cfa 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -6,8 +6,8 @@
 import * as nls from '../../../../nls.js';
 import * as types from '../../../../base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
-import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from '../common/workbenchThemeService.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS, migrateThemeSettingsId } from '../common/workbenchThemeService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import * as errors from '../../../../base/common/errors.js';
@@ -43,6 +43,8 @@ import { getColorRegistry } from '../../../../platform/theme/common/colorRegistr
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { generateColorThemeCSS } from './colorThemeCss.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 // implementation
 
@@ -110,11 +112,14 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		@ILogService private readonly logService: ILogService,
 		@IHostColorSchemeService private readonly hostColorService: IHostColorSchemeService,
 		@IUserDataInitializationService private readonly userDataInitializationService: IUserDataInitializationService,
-		@ILanguageService private readonly languageService: ILanguageService
+		@ILanguageService private readonly languageService: ILanguageService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@ICommandService private readonly commandService: ICommandService
 	) {
 		super();
 		this.container = layoutService.mainContainer;
-		this.settings = new ThemeConfiguration(configurationService, hostColorService);
+		const isNewUser = this.storageService.isNew(StorageScope.APPLICATION);
+		this.settings = new ThemeConfiguration(configurationService, hostColorService, isNewUser);
 
 		this.colorThemeRegistry = this._register(new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme));
 		this.colorThemeWatcher = this._register(new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this)));
@@ -190,7 +195,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		delayer.schedule();
 	}
 
-	private initialize(): Promise<[IWorkbenchColorTheme | null, IWorkbenchFileIconTheme | null, IWorkbenchProductIconTheme | null]> {
+	private async initialize(): Promise<[IWorkbenchColorTheme | null, IWorkbenchFileIconTheme | null, IWorkbenchProductIconTheme | null]> {
 		const extDevLocs = this.environmentService.extensionDevelopmentLocationURI;
 		const extDevLoc = extDevLocs && extDevLocs.length === 1 ? extDevLocs[0] : undefined; // in dev mode, switch to a theme provided by the extension under dev.
 
@@ -240,7 +245,87 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		};
 
 
-		return Promise.all([initializeColorTheme(), initializeFileIconTheme(), initializeProductIconTheme()]);
+		this.migrateColorThemeSettings();
+		await this.migrateAutoDetectColorScheme();
+		const result = await Promise.all([initializeColorTheme(), initializeFileIconTheme(), initializeProductIconTheme()]);
+		this.showNewDefaultThemeNotification();
+		return result;
+	}
+
+	private static readonly NEW_THEME_NOTIFICATION_KEY = 'workbench.newDefaultThemeNotification';
+
+	private showNewDefaultThemeNotification(): void {
+		const newDefaultThemes = new Set([ThemeSettingDefaults.COLOR_THEME_DARK, ThemeSettingDefaults.COLOR_THEME_LIGHT]);
+		if (newDefaultThemes.has(this.currentColorTheme.settingsId)) {
+			return; // already using a new default theme
+		}
+		if (this.storageService.getBoolean(WorkbenchThemeService.NEW_THEME_NOTIFICATION_KEY, StorageScope.APPLICATION)) {
+			return; // already shown
+		}
+
+		const handle = this.notificationService.prompt(
+			Severity.Info,
+			nls.localize('newDefaultTheme', "New default themes are available for VS Code."),
+			[{
+				label: nls.localize('tryNewTheme', "Try Them Out"),
+				run: () => this.commandService.executeCommand('workbench.action.tryNewDefaultThemes')
+			}]
+		);
+		this._register(Event.once(handle.onDidClose)(() => {
+			this.storageService.store(WorkbenchThemeService.NEW_THEME_NOTIFICATION_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
+		}));
+	}
+
+	/**
+	 * Migrates legacy theme setting values to their current equivalents,
+	 * writing back the migrated value so settings sync distributes the correct ID.
+	 */
+	private migrateColorThemeSettings(): void {
+		const themeSettings = [
+			ThemeSettings.COLOR_THEME,
+			ThemeSettings.PREFERRED_DARK_THEME,
+			ThemeSettings.PREFERRED_LIGHT_THEME,
+			ThemeSettings.PREFERRED_HC_DARK_THEME,
+			ThemeSettings.PREFERRED_HC_LIGHT_THEME,
+		];
+		for (const key of themeSettings) {
+			const inspection = this.configurationService.inspect<string>(key);
+			for (const [target, value] of [
+				[ConfigurationTarget.USER, inspection.userValue],
+				[ConfigurationTarget.USER_REMOTE, inspection.userRemoteValue],
+				[ConfigurationTarget.WORKSPACE, inspection.workspaceValue],
+			] as const) {
+				if (value) {
+					const migrated = migrateThemeSettingsId(value);
+					if (migrated !== value) {
+						this.configurationService.updateValue(key, migrated, target);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * For new users who haven't explicitly configured `window.autoDetectColorScheme`,
+	 * persist `true` so that auto-detect becomes the default going forward.
+	 */
+	private async migrateAutoDetectColorScheme(): Promise<void> {
+		if (!this.storageService.isNew(StorageScope.APPLICATION)) {
+			return;
+		}
+
+		// Ensure that user data (including synced settings) has finished initializing
+		// so we do not overwrite values that arrive via settings sync.
+		await this.userDataInitializationService.whenInitializationFinished();
+
+		const inspection = this.configurationService.inspect<boolean>(ThemeSettings.DETECT_COLOR_SCHEME);
+
+		// Treat any of userValue, userLocalValue, or userRemoteValue as an explicit configuration.
+		if (inspection.userValue === undefined
+			&& inspection.userLocalValue === undefined
+			&& inspection.userRemoteValue === undefined) {
+			await this.configurationService.updateValue(ThemeSettings.DETECT_COLOR_SCHEME, true, ConfigurationTarget.USER);
+		}
 	}
 
 	private installConfigurationListener() {
diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts
index 60e2174d19d..e364109cdae 100644
--- a/src/vs/workbench/services/themes/common/themeConfiguration.ts
+++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts
@@ -282,7 +282,19 @@ const colorSchemeToPreferred = {
 };
 
 export class ThemeConfiguration {
-	constructor(private configurationService: IConfigurationService, private hostColorService: IHostColorSchemeService) {
+	constructor(private configurationService: IConfigurationService, private hostColorService: IHostColorSchemeService, private readonly isNewUser: boolean = false) {
+	}
+
+	private shouldAutoDetectColorScheme(): boolean {
+		const { value, userValue, userLocalValue, userRemoteValue } = this.configurationService.inspect<boolean>(ThemeSettings.DETECT_COLOR_SCHEME);
+		if (value) {
+			return true;
+		}
+		if (this.isNewUser) {
+			const hasUserScopedValue = userValue !== undefined || userLocalValue !== undefined || userRemoteValue !== undefined;
+			return !hasUserScopedValue;
+		}
+		return false;
 	}
 
 	public get colorTheme(): string {
@@ -336,14 +348,14 @@ export class ThemeConfiguration {
 		if (this.configurationService.getValue(ThemeSettings.DETECT_HC) && this.hostColorService.highContrast) {
 			return this.hostColorService.dark ? ColorScheme.HIGH_CONTRAST_DARK : ColorScheme.HIGH_CONTRAST_LIGHT;
 		}
-		if (this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
+		if (this.shouldAutoDetectColorScheme()) {
 			return this.hostColorService.dark ? ColorScheme.DARK : ColorScheme.LIGHT;
 		}
 		return undefined;
 	}
 
 	public isDetectingColorScheme(): boolean {
-		return this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME);
+		return this.shouldAutoDetectColorScheme();
 	}
 
 	public getColorThemeSettingId(): ThemeSettings {
diff --git a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
index aa8af78316c..e54c6549bc2 100644
--- a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
+++ b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
@@ -8,7 +8,7 @@ import * as nls from '../../../../nls.js';
 import * as types from '../../../../base/common/types.js';
 import * as resources from '../../../../base/common/resources.js';
 import { ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { ExtensionData, IThemeExtensionPoint } from './workbenchThemeService.js';
+import { ExtensionData, IThemeExtensionPoint, migrateThemeSettingsId } from './workbenchThemeService.js';
 
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -39,11 +39,11 @@ export function registerColorThemeExtensionPoint() {
 						type: 'string'
 					},
 					uiTheme: {
-						description: nls.localize('vscode.extension.contributes.themes.uiTheme', 'Base theme defining the colors around the editor: \'vs\' is the light color theme, \'vs-dark\' is the dark color theme. \'hc-black\' is the dark high contrast theme, \'hc-light\' is the light high contrast theme.'),
+						markdownDescription: nls.localize('vscode.extension.contributes.themes.uiTheme', 'Base theme defining the colors around the editor: `vs` is the light color theme, `vs-dark` is the dark color theme. `hc-black` is the dark high contrast theme, `hc-light` is the light high contrast theme.'),
 						enum: [ThemeTypeSelector.VS, ThemeTypeSelector.VS_DARK, ThemeTypeSelector.HC_BLACK, ThemeTypeSelector.HC_LIGHT]
 					},
 					path: {
-						description: nls.localize('vscode.extension.contributes.themes.path', 'Path of the tmTheme file. The path is relative to the extension folder and is typically \'./colorthemes/awesome-color-theme.json\'.'),
+						markdownDescription: nls.localize('vscode.extension.contributes.themes.path', 'Path of the tmTheme file. The path is relative to the extension folder and is typically `./colorthemes/awesome-color-theme.json`.'),
 						type: 'string'
 					}
 				},
@@ -267,13 +267,14 @@ export class ThemeRegistry<T extends IThemeData> implements IDisposable {
 	}
 
 	public findThemeBySettingsId(settingsId: string | null, defaultSettingsId?: string): T | undefined {
-		if (this.builtInTheme && this.builtInTheme.settingsId === settingsId) {
+		const migratedId = settingsId ? migrateThemeSettingsId(settingsId) : settingsId;
+		if (this.builtInTheme && this.builtInTheme.settingsId === migratedId) {
 			return this.builtInTheme;
 		}
 		const allThemes = this.getThemes();
 		let defaultTheme: T | undefined = undefined;
 		for (const t of allThemes) {
-			if (t.settingsId === settingsId) {
+			if (t.settingsId === migratedId) {
 				return t;
 			}
 			if (t.settingsId === defaultSettingsId) {
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index 8fefa7297ca..040489ccad0 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -11,7 +11,6 @@ import { ConfigurationTarget } from '../../../../platform/configuration/common/c
 import { isBoolean, isString } from '../../../../base/common/types.js';
 import { IconContribution, IconDefinition } from '../../../../platform/theme/common/iconRegistry.js';
 import { ColorScheme, ThemeTypeSelector } from '../../../../platform/theme/common/theme.js';
-import product from '../../../../platform/product/common/product.js';
 
 export const IWorkbenchThemeService = refineServiceDecorator<IThemeService, IWorkbenchThemeService>(IThemeService);
 
@@ -39,21 +38,33 @@ export enum ThemeSettings {
 	SYSTEM_COLOR_THEME = 'window.systemColorTheme'
 }
 
-const isOSS = !product.quality;
-
 export namespace ThemeSettingDefaults {
-	export const COLOR_THEME_DARK = isOSS ? 'Experimental Dark' : 'Default Dark Modern';
-	export const COLOR_THEME_LIGHT = isOSS ? 'Experimental Light' : 'Default Light Modern';
+	export const COLOR_THEME_DARK = 'VS Code Dark';
+	export const COLOR_THEME_LIGHT = 'VS Code Light';
 	export const COLOR_THEME_HC_DARK = 'Default High Contrast';
 	export const COLOR_THEME_HC_LIGHT = 'Default High Contrast Light';
 
-	export const COLOR_THEME_DARK_OLD = 'Default Dark+';
-	export const COLOR_THEME_LIGHT_OLD = 'Default Light+';
-
 	export const FILE_ICON_THEME = 'vs-seti';
 	export const PRODUCT_ICON_THEME = 'Default';
 }
 
+/**
+ * Migrates legacy theme settings IDs to their current equivalents.
+ * Theme IDs were simplified: "Default" prefix was removed from built-in themes,
+ * and "Experimental" prefix was replaced when VS Code themes became GA.
+ */
+export function migrateThemeSettingsId(settingsId: string): string {
+	switch (settingsId) {
+		case 'Default Dark Modern': return 'Dark Modern';
+		case 'Default Light Modern': return 'Light Modern';
+		case 'Default Dark+': return 'Dark+';
+		case 'Default Light+': return 'Light+';
+		case 'Experimental Dark': return 'VS Code Dark';
+		case 'Experimental Light': return 'VS Code Light';
+	}
+	return settingsId;
+}
+
 export const COLOR_THEME_DARK_INITIAL_COLORS = {
 	'actionBar.toggledBackground': '#383a49',
 	'activityBar.activeBorder': '#0078D4',
diff --git a/src/vs/workbench/services/themes/test/common/workbenchThemeService.test.ts b/src/vs/workbench/services/themes/test/common/workbenchThemeService.test.ts
new file mode 100644
index 00000000000..bdb41d71db5
--- /dev/null
+++ b/src/vs/workbench/services/themes/test/common/workbenchThemeService.test.ts
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { migrateThemeSettingsId } from '../../common/workbenchThemeService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ThemeConfiguration } from '../../common/themeConfiguration.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IHostColorSchemeService } from '../../common/hostColorSchemeService.js';
+import { ColorScheme } from '../../../../../platform/theme/common/theme.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IConfigurationOverrides, IConfigurationValue } from '../../../../../platform/configuration/common/configuration.js';
+
+suite('WorkbenchThemeService', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('migrateThemeSettingsId', () => {
+
+		test('migrates Default-prefixed theme IDs', () => {
+			assert.deepStrictEqual(
+				['Default Dark Modern', 'Default Light Modern', 'Default Dark+', 'Default Light+'].map(migrateThemeSettingsId),
+				['Dark Modern', 'Light Modern', 'Dark+', 'Light+']
+			);
+		});
+
+		test('migrates Experimental theme IDs to VS Code themes', () => {
+			assert.deepStrictEqual(
+				['Experimental Dark', 'Experimental Light'].map(migrateThemeSettingsId),
+				['VS Code Dark', 'VS Code Light']
+			);
+		});
+
+		test('returns unknown IDs unchanged', () => {
+			assert.deepStrictEqual(
+				['Dark Modern', 'VS Code Dark', 'Some Custom Theme', ''].map(migrateThemeSettingsId),
+				['Dark Modern', 'VS Code Dark', 'Some Custom Theme', '']
+			);
+		});
+	});
+
+	suite('ThemeConfiguration', () => {
+
+		function createHostColorSchemeService(dark: boolean, highContrast: boolean = false): IHostColorSchemeService {
+			return {
+				_serviceBrand: undefined,
+				dark,
+				highContrast,
+				onDidChangeColorScheme: Event.None,
+			};
+		}
+
+		/**
+		 * Creates a config service that separates the resolved value from the user value,
+		 * matching production behaviour where getValue() returns the schema default
+		 * while inspect().userValue is undefined when no explicit user value is set.
+		 */
+		function createConfigServiceWithDefaults(
+			userConfig: Record<string, unknown>,
+			defaults: Record<string, unknown>
+		): TestConfigurationService {
+			const configService = new TestConfigurationService(userConfig);
+			const originalInspect = configService.inspect.bind(configService);
+			configService.inspect = <T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> => {
+				if (Object.prototype.hasOwnProperty.call(userConfig, key)) {
+					return originalInspect(key, overrides);
+				}
+				// No explicit user value: return the default as the resolved value
+				const defaultVal = defaults[key] as T;
+				return {
+					value: defaultVal,
+					defaultValue: defaultVal,
+					userValue: undefined,
+					userLocalValue: undefined,
+				};
+			};
+			const originalGetValue = configService.getValue.bind(configService);
+			configService.getValue = <T>(arg1?: string | IConfigurationOverrides, arg2?: IConfigurationOverrides): T => {
+				const result = originalGetValue(arg1, arg2);
+				if (result === undefined && typeof arg1 === 'string' && Object.prototype.hasOwnProperty.call(defaults, arg1)) {
+					return defaults[arg1] as T;
+				}
+				return result as T;
+			};
+			return configService;
+		}
+
+		test('new user with no explicit setting gets auto-detect on light OS', () => {
+			const configService = new TestConfigurationService();
+			const hostColor = createHostColorSchemeService(false);
+			const config = new ThemeConfiguration(configService, hostColor, true);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), ColorScheme.LIGHT);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), true);
+		});
+
+		test('new user with no explicit setting gets auto-detect on dark OS', () => {
+			const configService = new TestConfigurationService();
+			const hostColor = createHostColorSchemeService(true);
+			const config = new ThemeConfiguration(configService, hostColor, true);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), ColorScheme.DARK);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), true);
+		});
+
+		test('new user with no explicit setting and schema default false still gets auto-detect', () => {
+			// Simulates production: getValue() returns false (schema default) but userValue is undefined
+			const configService = createConfigServiceWithDefaults({}, { 'window.autoDetectColorScheme': false });
+			const hostColor = createHostColorSchemeService(false);
+			const config = new ThemeConfiguration(configService, hostColor, true);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), ColorScheme.LIGHT);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), true);
+		});
+
+		test('new user with explicit false does not get auto-detect', () => {
+			const configService = new TestConfigurationService({ 'window.autoDetectColorScheme': false });
+			const hostColor = createHostColorSchemeService(false);
+			const config = new ThemeConfiguration(configService, hostColor, true);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), undefined);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), false);
+		});
+
+		test('existing user without explicit setting does not get auto-detect', () => {
+			const configService = new TestConfigurationService();
+			const hostColor = createHostColorSchemeService(false);
+			const config = new ThemeConfiguration(configService, hostColor, false);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), undefined);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), false);
+		});
+
+		test('existing user with explicit true gets auto-detect', () => {
+			const configService = new TestConfigurationService({ 'window.autoDetectColorScheme': true });
+			const hostColor = createHostColorSchemeService(false);
+			const config = new ThemeConfiguration(configService, hostColor, false);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), ColorScheme.LIGHT);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), true);
+		});
+
+		test('high contrast OS takes priority over auto-detect for new user', () => {
+			const configService = new TestConfigurationService({ 'window.autoDetectHighContrast': true });
+			const hostColor = createHostColorSchemeService(true, true);
+			const config = new ThemeConfiguration(configService, hostColor, true);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), ColorScheme.HIGH_CONTRAST_DARK);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), true);
+		});
+
+		test('high contrast light OS takes priority over auto-detect for new user', () => {
+			const configService = new TestConfigurationService({ 'window.autoDetectHighContrast': true });
+			const hostColor = createHostColorSchemeService(false, true);
+			const config = new ThemeConfiguration(configService, hostColor, true);
+
+			assert.deepStrictEqual(config.getPreferredColorScheme(), ColorScheme.HIGH_CONTRAST_LIGHT);
+			assert.deepStrictEqual(config.isDetectingColorScheme(), true);
+		});
+	});
+});
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
index db73853690f..a45bd6dc1af 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
@@ -432,7 +432,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			}
 		}
 
-		const context = await this.requestService.request({ type: 'GET', url: resource.toString(true) }, CancellationToken.None);
+		const context = await this.requestService.request({ type: 'GET', url: resource.toString(true), callSite: 'userDataProfileImportExportService.resolveContent' }, CancellationToken.None);
 		if (context.res.statusCode === 200) {
 			return await asText(context);
 		} else {
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
index 6df19e5a98e..8e2b632d1fe 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
@@ -130,7 +130,7 @@ export class UserDataProfileInitializer implements IUserDataInitializer {
 		}
 		try {
 			const url = URI.revive(this.environmentService.options.profile.contents).toString(true);
-			const context = await this.requestService.request({ type: 'GET', url }, CancellationToken.None);
+			const context = await this.requestService.request({ type: 'GET', url, callSite: 'userDataProfileInit.initializeProfile' }, CancellationToken.None);
 			if (context.res.statusCode === 200) {
 				return await asJson(context);
 			} else {
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
index cc56d9a6ac5..43da4619741 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
@@ -161,7 +161,7 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 	async getBuiltinProfileTemplates(): Promise<IProfileTemplateInfo[]> {
 		if (this.productService.profileTemplatesUrl) {
 			try {
-				const context = await this.requestService.request({ type: 'GET', url: this.productService.profileTemplatesUrl }, CancellationToken.None);
+				const context = await this.requestService.request({ type: 'GET', url: this.productService.profileTemplatesUrl, callSite: 'userDataProfileManagement.getProfileTemplates' }, CancellationToken.None);
 				if (context.res.statusCode === 200) {
 					return (await asJson<IProfileTemplateInfo[]>(context)) || [];
 				} else {
diff --git a/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts b/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts
index 2c9e8f3f8e8..8ed090ac5b3 100644
--- a/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspaceTrustEditorInput.ts
@@ -18,7 +18,7 @@ export class WorkspaceTrustEditorInput extends EditorInput {
 	static readonly ID: string = 'workbench.input.workspaceTrust';
 
 	override get capabilities(): EditorInputCapabilities {
-		return EditorInputCapabilities.Readonly | EditorInputCapabilities.Singleton;
+		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.RequiresModal;
 	}
 
 	override get typeId(): string {
diff --git a/src/vs/workbench/test/browser/componentFixtures/agentSessionsViewer.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/agentSessionsViewer.fixture.ts
index 2b098ab3158..2fcc86f53b8 100644
--- a/src/vs/workbench/test/browser/componentFixtures/agentSessionsViewer.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/agentSessionsViewer.fixture.ts
@@ -135,7 +135,7 @@ function renderSectionItem(ctx: ComponentFixtureContext, section: IAgentSessionS
 		},
 	});
 
-	const renderer = instantiationService.createInstance(AgentSessionSectionRenderer);
+	const renderer = instantiationService.createInstance(AgentSessionSectionRenderer, {});
 
 	container.style.width = '350px';
 	container.style.height = 'auto';
diff --git a/src/vs/workbench/test/browser/componentFixtures/aiCustomizationListWidget.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/aiCustomizationListWidget.fixture.ts
new file mode 100644
index 00000000000..bafcf3d70ba
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/aiCustomizationListWidget.fixture.ts
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
+import { IWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IAICustomizationWorkspaceService, IStorageSourceFilter } from '../../../contrib/chat/common/aiCustomizationWorkspaceService.js';
+import { CustomizationHarness, ICustomizationHarnessService, IHarnessDescriptor, createVSCodeHarnessDescriptor } from '../../../contrib/chat/common/customizationHarnessService.js';
+import { IAgentPluginService } from '../../../contrib/chat/common/plugins/agentPluginService.js';
+import { IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
+import { PromptsType } from '../../../contrib/chat/common/promptSyntax/promptTypes.js';
+import { IPromptsService, IResolvedAgentFile, AgentFileType, PromptsStorage, IPromptPath } from '../../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { AICustomizationManagementSection } from '../../../contrib/chat/browser/aiCustomization/aiCustomizationManagement.js';
+import { AICustomizationListWidget } from '../../../contrib/chat/browser/aiCustomization/aiCustomizationListWidget.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from './fixtureUtils.js';
+import { ParsedPromptFile, PromptHeader } from '../../../contrib/chat/common/promptSyntax/promptFileParser.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { isEqual } from '../../../../base/common/resources.js';
+
+// Ensure color registrations are loaded
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+
+// ============================================================================
+// Mock helpers
+// ============================================================================
+
+const defaultFilter: IStorageSourceFilter = {
+	sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.extension, PromptsStorage.plugin],
+};
+
+interface IFixtureInstructionFile {
+	readonly promptPath: IPromptPath;
+	readonly name?: string;
+	readonly description?: string;
+	readonly applyTo?: string; /** If set, this instruction file has an applyTo pattern that controls automatic inclusion when the context matches (or `**` for always). */
+}
+
+function createMockPromptsService(instructionFiles: IFixtureInstructionFile[], agentInstructionFiles: IResolvedAgentFile[] = []): IPromptsService {
+	return new class extends mock<IPromptsService>() {
+		override readonly onDidChangeCustomAgents = Event.None;
+		override readonly onDidChangeSlashCommands = Event.None;
+		override readonly onDidChangeSkills = Event.None;
+		override getDisabledPromptFiles(): ResourceSet { return new ResourceSet(); }
+		override async listPromptFiles(type: PromptsType) {
+			if (type === PromptsType.instructions) {
+				return instructionFiles.map(f => f.promptPath);
+			}
+			return [];
+		}
+		override async listAgentInstructions() { return agentInstructionFiles; }
+		override async getCustomAgents() { return []; }
+		override async parseNew(uri: URI): Promise<ParsedPromptFile> {
+			const file = instructionFiles.find(f => isEqual(f.promptPath.uri, uri));
+			const headerLines = [];
+			headerLines.push('---\n');
+			if (file) {
+				if (file.name) {
+					headerLines.push(`name: ${file.name}\n`);
+				}
+				if (file.description) {
+					headerLines.push(`description: ${file.description}\n`);
+				}
+				if (file.applyTo) {
+					headerLines.push(`applyTo: "${file.applyTo}"\n`);
+				}
+			}
+			headerLines.push('---\n');
+			const header = new PromptHeader(
+				new Range(2, 1, headerLines.length, 1),
+				uri,
+				headerLines
+			);
+			return new ParsedPromptFile(uri, header);
+		}
+	}();
+}
+
+function createMockWorkspaceService(): IAICustomizationWorkspaceService {
+	const activeProjectRoot = observableValue<URI | undefined>('mockActiveProjectRoot', URI.file('/workspace'));
+	return new class extends mock<IAICustomizationWorkspaceService>() {
+		override readonly isSessionsWindow = false;
+		override readonly activeProjectRoot = activeProjectRoot;
+		override readonly hasOverrideProjectRoot = observableValue('hasOverride', false);
+		override getActiveProjectRoot() { return URI.file('/workspace'); }
+		override getStorageSourceFilter() { return defaultFilter; }
+	}();
+}
+
+function createMockHarnessService(): ICustomizationHarnessService {
+	const descriptor = createVSCodeHarnessDescriptor([PromptsStorage.extension]);
+	return new class extends mock<ICustomizationHarnessService>() {
+		override readonly activeHarness = observableValue<string>('activeHarness', CustomizationHarness.VSCode);
+		override readonly availableHarnesses = observableValue<readonly IHarnessDescriptor[]>('harnesses', [descriptor]);
+		override getStorageSourceFilter() { return defaultFilter; }
+		override getActiveDescriptor() { return descriptor; }
+		override registerContributedHarness() { return { dispose() { } }; }
+	}();
+}
+
+function createMockWorkspaceContextService(): IWorkspaceContextService {
+	return new class extends mock<IWorkspaceContextService>() {
+		override readonly onDidChangeWorkspaceFolders = Event.None;
+		override getWorkspace(): IWorkspace {
+			return { id: 'test', folders: [] };
+		}
+	}();
+}
+
+// ============================================================================
+// Render helper
+// ============================================================================
+
+async function renderInstructionsTab(ctx: ComponentFixtureContext, instructionFiles: IFixtureInstructionFile[], agentInstructionFiles: IResolvedAgentFile[] = []): Promise<void> {
+	const width = 500;
+	const height = 400;
+	ctx.container.style.width = `${width}px`;
+	ctx.container.style.height = `${height}px`;
+
+	const contextMenuService = new class extends mock<IContextMenuService>() {
+		override onDidShowContextMenu = Event.None;
+		override onDidHideContextMenu = Event.None;
+		override showContextMenu(): void { }
+	};
+
+	const contextViewService = new class extends mock<IContextViewService>() {
+		override anchorAlignment = 0;
+		override showContextView() { return { close: () => { } }; }
+		override hideContextView(): void { }
+		override getContextViewElement(): HTMLElement { return ctx.container; }
+		override layout(): void { }
+	};
+
+	const instantiationService = createEditorServices(ctx.disposableStore, {
+		colorTheme: ctx.theme,
+		additionalServices: (reg) => {
+			reg.defineInstance(IContextMenuService, contextMenuService);
+			reg.defineInstance(IContextViewService, contextViewService);
+			registerWorkbenchServices(reg);
+			reg.define(IListService, ListService);
+			reg.defineInstance(IPromptsService, createMockPromptsService(instructionFiles, agentInstructionFiles));
+			reg.defineInstance(IAICustomizationWorkspaceService, createMockWorkspaceService());
+			reg.defineInstance(ICustomizationHarnessService, createMockHarnessService());
+			reg.defineInstance(IWorkspaceContextService, createMockWorkspaceContextService());
+			reg.defineInstance(IChatSessionsService, new class extends mock<IChatSessionsService>() {
+				override readonly onDidChangeCustomizations = Event.None;
+				override async getCustomizations() { return undefined; }
+				override getRegisteredChatSessionItemProviders() { return []; }
+			}());
+			reg.defineInstance(IAgentPluginService, new class extends mock<IAgentPluginService>() {
+				override readonly plugins = observableValue('plugins', []);
+			}());
+			reg.defineInstance(IFileService, new class extends mock<IFileService>() {
+				override readonly onDidFilesChange = Event.None;
+			}());
+			reg.defineInstance(IProductService, new class extends mock<IProductService>() { }());
+			reg.defineInstance(IPathService, new class extends mock<IPathService>() {
+				override readonly defaultUriScheme = 'file';
+				override userHome(): URI;
+				override userHome(): Promise<URI>;
+				override userHome(): URI | Promise<URI> { return URI.file('/home/dev'); }
+			}());
+		},
+	});
+
+	const widget = ctx.disposableStore.add(
+		instantiationService.createInstance(AICustomizationListWidget)
+	);
+	ctx.container.appendChild(widget.element);
+	await widget.setSection(AICustomizationManagementSection.Instructions);
+	widget.layout(height, width);
+}
+
+// ============================================================================
+// Fixtures
+// ============================================================================
+
+export default defineThemedFixtureGroup({ path: 'chat/aiCustomizations/' }, {
+
+	InstructionsTabWithItems: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderInstructionsTab(ctx, [
+			// Always-active instructions (no applyTo)
+			{ promptPath: { uri: URI.file('/workspace/.github/instructions/coding-standards.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions }, name: 'Coding Standards', description: 'Repository-wide coding standards' },
+			{ promptPath: { uri: URI.file('/home/dev/.copilot/instructions/my-style.instructions.md'), storage: PromptsStorage.user, type: PromptsType.instructions }, name: 'My Style', description: 'Personal coding style preferences' },
+			// Always-included instruction (applyTo: **)
+			{ promptPath: { uri: URI.file('/workspace/.github/instructions/general-guidelines.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions }, name: 'General Guidelines', description: 'General development guidelines', applyTo: '**' },
+			// On-demand instructions (with applyTo pattern)
+			{ promptPath: { uri: URI.file('/workspace/.github/instructions/testing-guidelines.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions }, name: 'Testing Guidelines', description: 'Testing best practices', applyTo: '**/*.test.ts' },
+			{ promptPath: { uri: URI.file('/workspace/.github/instructions/security-review.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions }, name: 'Security Review', description: 'Security review checklist', applyTo: 'src/auth/**' },
+			{ promptPath: { uri: URI.file('/home/dev/.copilot/instructions/typescript-rules.instructions.md'), storage: PromptsStorage.extension, type: PromptsType.instructions, extension: undefined!, source: undefined! }, name: 'TypeScript Rules', description: 'TypeScript conventions', applyTo: '**/*.ts' },
+		], [
+			// Agent instruction files (AGENTS.md, copilot-instructions.md)
+			{ uri: URI.file('/workspace/AGENTS.md'), realPath: undefined, type: AgentFileType.agentsMd },
+			{ uri: URI.file('/workspace/.github/copilot-instructions.md'), realPath: undefined, type: AgentFileType.copilotInstructionsMd },
+		]),
+	}),
+
+	InstructionsTabEmpty: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderInstructionsTab(ctx, []),
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/aiCustomizationManagementEditor.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/aiCustomizationManagementEditor.fixture.ts
new file mode 100644
index 00000000000..3837c0cd369
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/aiCustomizationManagementEditor.fixture.ts
@@ -0,0 +1,939 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from '../../../../base/browser/dom.js';
+import { Dimension } from '../../../../base/browser/dom.js';
+import { IRenderedMarkdown } from '../../../../base/browser/markdownRenderer.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
+import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
+import { constObservable, observableValue } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IRequestService } from '../../../../platform/request/common/request.js';
+import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
+import { IWorkspace, IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
+import { IWebviewService } from '../../../contrib/webview/browser/webview.js';
+import { IAICustomizationWorkspaceService, AICustomizationManagementSection } from '../../../contrib/chat/common/aiCustomizationWorkspaceService.js';
+import { CustomizationHarness, ICustomizationHarnessService, IHarnessDescriptor, createVSCodeHarnessDescriptor, createClaudeHarnessDescriptor, createCliHarnessDescriptor, getCliUserRoots, getClaudeUserRoots } from '../../../contrib/chat/common/customizationHarnessService.js';
+import { IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
+import { PromptsType } from '../../../contrib/chat/common/promptSyntax/promptTypes.js';
+import { IPromptsService, IResolvedAgentFile, AgentFileType, PromptsStorage, IAgentSkill, IChatPromptSlashCommand } from '../../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { ParsedPromptFile } from '../../../contrib/chat/common/promptSyntax/promptFileParser.js';
+import { IAgentPluginService, IAgentPlugin } from '../../../contrib/chat/common/plugins/agentPluginService.js';
+import { IPluginMarketplaceService, IMarketplacePlugin, MarketplaceType, PluginSourceKind } from '../../../contrib/chat/common/plugins/pluginMarketplaceService.js';
+import { MarketplaceReferenceKind } from '../../../contrib/chat/common/plugins/marketplaceReference.js';
+import { IPluginInstallService } from '../../../contrib/chat/common/plugins/pluginInstallService.js';
+import { AICustomizationManagementEditor } from '../../../contrib/chat/browser/aiCustomization/aiCustomizationManagementEditor.js';
+import { ContributionEnablementState } from '../../../contrib/chat/common/enablement.js';
+import { AICustomizationManagementEditorInput } from '../../../contrib/chat/browser/aiCustomization/aiCustomizationManagementEditorInput.js';
+import { IMcpWorkbenchService, IWorkbenchMcpServer, IMcpService, McpServerInstallState } from '../../../contrib/mcp/common/mcpTypes.js';
+import { IMcpRegistry } from '../../../contrib/mcp/common/mcpRegistryTypes.js';
+import { IWorkbenchLocalMcpServer, LocalMcpServerScope } from '../../../services/mcp/common/mcpWorkbenchManagementService.js';
+import { McpListWidget } from '../../../contrib/chat/browser/aiCustomization/mcpListWidget.js';
+import { PluginListWidget } from '../../../contrib/chat/browser/aiCustomization/pluginListWidget.js';
+import { IIterativePager } from '../../../../base/common/paging.js';
+// eslint-disable-next-line local/code-import-patterns
+import { IAgentFeedbackService } from '../../../../sessions/contrib/agentFeedback/browser/agentFeedbackService.js';
+// eslint-disable-next-line local/code-import-patterns
+import { CodeReviewStateKind, ICodeReviewService, ICodeReviewState, IPRReviewState, PRReviewStateKind } from '../../../../sessions/contrib/codeReview/browser/codeReviewService.js';
+import { IChatEditingService } from '../../../contrib/chat/common/editing/chatEditingService.js';
+import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from './fixtureUtils.js';
+
+// Ensure theme colors & widget CSS are loaded
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../contrib/chat/browser/aiCustomization/media/aiCustomizationManagement.css';
+
+// ============================================================================
+// Mock helpers
+// ============================================================================
+
+const userHome = URI.file('/home/dev');
+const BUILTIN_STORAGE = 'builtin';
+
+interface IFixtureFile {
+	readonly uri: URI;
+	readonly storage: PromptsStorage;
+	readonly type: PromptsType;
+	readonly name?: string;
+	readonly description?: string;
+	readonly applyTo?: string;
+	readonly extensionId?: string;
+	readonly extensionDisplayName?: string;
+}
+
+function createMockEditorGroup(): IEditorGroup {
+	return new class extends mock<IEditorGroup>() {
+		override windowId = mainWindow.vscodeWindowId;
+	}();
+}
+
+function toExtensionInfo(file: IFixtureFile): { identifier: ExtensionIdentifier; displayName?: string } | undefined {
+	if (!file.extensionId) {
+		return undefined;
+	}
+
+	return {
+		identifier: new ExtensionIdentifier(file.extensionId),
+		displayName: file.extensionDisplayName,
+	};
+}
+
+function createMockPromptsService(files: IFixtureFile[], agentInstructions: IResolvedAgentFile[]): IPromptsService {
+	const applyToMap = new ResourceMap<string | undefined>();
+	const descriptionMap = new ResourceMap<string | undefined>();
+	for (const f of files) { applyToMap.set(f.uri, f.applyTo); descriptionMap.set(f.uri, f.description); }
+	return new class extends mock<IPromptsService>() {
+		override readonly onDidChangeCustomAgents = Event.None;
+		override readonly onDidChangeSlashCommands = Event.None;
+		override readonly onDidChangeSkills = Event.None;
+		override readonly onDidChangeInstructions = Event.None;
+		override getDisabledPromptFiles(): ResourceSet { return new ResourceSet(); }
+		override async listPromptFiles(type: PromptsType, _token: CancellationToken) {
+			return files.filter(f => f.type === type).map(f => ({
+				uri: f.uri,
+				storage: f.storage as PromptsStorage.local,
+				type: f.type,
+				name: f.name,
+				description: f.description,
+				extension: toExtensionInfo(f) as never,
+			}));
+		}
+		override async listAgentInstructions() { return agentInstructions; }
+		override async getCustomAgents() {
+			return files.filter(f => f.type === PromptsType.agent).map(a => ({
+				uri: a.uri, name: a.name ?? 'agent', description: a.description, storage: a.storage,
+				source: {
+					storage: a.storage,
+					extensionId: a.extensionId ? new ExtensionIdentifier(a.extensionId) : undefined,
+				},
+			})) as never[];
+		}
+		override async parseNew(uri: URI, _token: CancellationToken): Promise<ParsedPromptFile> {
+			const header = {
+				get applyTo() { return applyToMap.get(uri); },
+				get description() { return descriptionMap.get(uri); },
+			};
+			return new ParsedPromptFile(uri, header as never);
+		}
+		override async getSourceFolders() { return [] as never[]; }
+		override async findAgentSkills(): Promise<IAgentSkill[]> {
+			return files.filter(f => f.type === PromptsType.skill).map(f => ({
+				uri: f.uri,
+				storage: f.storage,
+				name: f.name ?? 'skill',
+				description: f.description,
+				disableModelInvocation: false,
+				userInvocable: true,
+				when: undefined,
+			}));
+		}
+		override async getPromptSlashCommands(): Promise<readonly IChatPromptSlashCommand[]> {
+			const promptFiles = files.filter(f => f.type === PromptsType.prompt);
+			const commands = await Promise.all(promptFiles.map(async f => {
+				const promptPath = { uri: f.uri, storage: f.storage, type: f.type, extension: toExtensionInfo(f) as never };
+				const parsedPromptFile = await this.parseNew(f.uri, CancellationToken.None);
+				return {
+					name: f.name ?? 'prompt',
+					description: f.description,
+					argumentHint: undefined,
+					promptPath: promptPath as IChatPromptSlashCommand['promptPath'],
+					parsedPromptFile,
+					when: undefined,
+				};
+			}));
+			return commands;
+		}
+	}();
+}
+
+function createMockHarnessService(activeHarness: CustomizationHarness, descriptors: readonly IHarnessDescriptor[]): ICustomizationHarnessService {
+	const active = observableValue<string>('activeHarness', activeHarness);
+	return new class extends mock<ICustomizationHarnessService>() {
+		override readonly activeHarness = active;
+		override readonly availableHarnesses = constObservable(descriptors);
+		override getStorageSourceFilter(type: PromptsType) {
+			const d = descriptors.find(h => h.id === active.get()) ?? descriptors[0];
+			return d.getStorageSourceFilter(type);
+		}
+		override getActiveDescriptor() {
+			return descriptors.find(h => h.id === active.get()) ?? descriptors[0];
+		}
+		override setActiveHarness(id: string) { active.set(id, undefined); }
+		override registerContributedHarness() { return { dispose() { } }; }
+	}();
+}
+
+function makeLocalMcpServer(id: string, label: string, scope: LocalMcpServerScope, description?: string): IWorkbenchMcpServer {
+	return new class extends mock<IWorkbenchMcpServer>() {
+		override readonly id = id;
+		override readonly name = id;
+		override readonly label = label;
+		override readonly description = description ?? '';
+		override readonly installState = McpServerInstallState.Installed;
+		override readonly local = new class extends mock<IWorkbenchLocalMcpServer>() {
+			override readonly id = id;
+			override readonly scope = scope;
+		}();
+	}();
+}
+
+function createMockAgentFeedbackService(): IAgentFeedbackService {
+	return new class extends mock<IAgentFeedbackService>() {
+		override readonly onDidChangeFeedback = Event.None;
+		override readonly onDidChangeNavigation = Event.None;
+		override getFeedback() { return []; }
+		override getMostRecentSessionForResource() { return undefined; }
+		override async revealFeedback(): Promise<void> { }
+		override getNextFeedback() { return undefined; }
+		override getNavigationBearing() { return { activeIdx: -1, totalCount: 0 }; }
+		override getNextNavigableItem() { return undefined; }
+		override setNavigationAnchor(): void { }
+		override clearFeedback(): void { }
+		override removeFeedback(): void { }
+		override async addFeedbackAndSubmit(): Promise<void> { }
+	}();
+}
+
+function createMockCodeReviewService(): ICodeReviewService {
+	return new class extends mock<ICodeReviewService>() {
+		private readonly reviewState = observableValue<ICodeReviewState>('fixture.reviewState', { kind: CodeReviewStateKind.Idle });
+		private readonly prReviewState = observableValue<IPRReviewState>('fixture.prReviewState', { kind: PRReviewStateKind.None });
+
+		override getReviewState() {
+			return this.reviewState;
+		}
+
+		override getPRReviewState() {
+			return this.prReviewState;
+		}
+
+		override hasReview(): boolean {
+			return false;
+		}
+
+		override requestReview(): void { }
+		override removeComment(): void { }
+		override dismissReview(): void { }
+		override async resolvePRReviewThread(): Promise<void> { }
+	}();
+}
+
+// ============================================================================
+// Realistic test data — a project that has Copilot + Claude customizations
+// ============================================================================
+
+const allFiles: IFixtureFile[] = [
+	// Instructions - extension (built-in + third-party)
+	{ uri: URI.file('/extensions/github.copilot-chat/instructions/coding.instructions.md'), storage: PromptsStorage.extension, type: PromptsType.instructions, name: 'Copilot Coding', description: 'Built-in coding guidance', extensionId: 'GitHub.copilot-chat', extensionDisplayName: 'GitHub Copilot Chat' },
+	{ uri: URI.file('/extensions/acme.tools/instructions/team.instructions.md'), storage: PromptsStorage.extension, type: PromptsType.instructions, name: 'Team Conventions', description: 'Third-party extension instructions', extensionId: 'acme.tools', extensionDisplayName: 'Acme Tools' },
+	// Instructions — workspace
+	{ uri: URI.file('/workspace/.github/instructions/coding-standards.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Coding Standards', description: 'Repository-wide coding standards' },
+	{ uri: URI.file('/workspace/.github/instructions/testing.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Testing', description: 'Testing best practices', applyTo: '**/*.test.ts' },
+	{ uri: URI.file('/workspace/.github/instructions/security.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Security', description: 'Security review checklist', applyTo: 'src/auth/**' },
+	{ uri: URI.file('/workspace/.github/instructions/accessibility.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Accessibility', description: 'WCAG compliance guidelines', applyTo: '**/*.tsx' },
+	{ uri: URI.file('/workspace/.github/instructions/api-design.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'API Design', description: 'REST API design conventions' },
+	{ uri: URI.file('/workspace/.github/instructions/performance.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Performance', description: 'Performance optimization rules', applyTo: 'src/core/**' },
+	{ uri: URI.file('/workspace/.github/instructions/error-handling.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Error Handling', description: 'Error handling patterns' },
+	{ uri: URI.file('/workspace/.github/instructions/database.instructions.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Database', description: 'Database migration and query patterns', applyTo: 'src/db/**' },
+	// Instructions — user
+	{ uri: URI.file('/home/dev/.copilot/instructions/my-style.instructions.md'), storage: PromptsStorage.user, type: PromptsType.instructions, name: 'My Style', description: 'Personal coding style' },
+	{ uri: URI.file('/home/dev/.copilot/instructions/typescript-rules.instructions.md'), storage: PromptsStorage.user, type: PromptsType.instructions, name: 'TypeScript Rules', description: 'Strict TypeScript conventions' },
+	{ uri: URI.file('/home/dev/.copilot/instructions/commit-messages.instructions.md'), storage: PromptsStorage.user, type: PromptsType.instructions, name: 'Commit Messages', description: 'Conventional commit format' },
+	// Instructions — Claude rules
+	{ uri: URI.file('/workspace/.claude/rules/code-style.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Code Style', description: 'Claude code style rules' },
+	{ uri: URI.file('/workspace/.claude/rules/testing.md'), storage: PromptsStorage.local, type: PromptsType.instructions, name: 'Testing', description: 'Claude testing conventions' },
+	{ uri: URI.file('/home/dev/.claude/rules/personal.md'), storage: PromptsStorage.user, type: PromptsType.instructions, name: 'Personal', description: 'Personal rules' },
+	// Agents — workspace
+	{ uri: URI.file('/workspace/.github/agents/reviewer.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'Reviewer', description: 'Code review agent' },
+	{ uri: URI.file('/workspace/.github/agents/documenter.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'Documenter', description: 'Documentation agent' },
+	{ uri: URI.file('/workspace/.github/agents/tester.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'Tester', description: 'Test generation and validation' },
+	{ uri: URI.file('/workspace/.github/agents/refactorer.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'Refactorer', description: 'Code refactoring specialist' },
+	{ uri: URI.file('/workspace/.github/agents/security-auditor.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'Security Auditor', description: 'Security vulnerability scanner' },
+	{ uri: URI.file('/workspace/.github/agents/api-designer.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'API Designer', description: 'REST and GraphQL API design' },
+	{ uri: URI.file('/workspace/.github/agents/performance-tuner.agent.md'), storage: PromptsStorage.local, type: PromptsType.agent, name: 'Performance Tuner', description: 'Performance profiling and optimization' },
+	// Agents — user
+	{ uri: URI.file('/home/dev/.copilot/agents/planner.agent.md'), storage: PromptsStorage.user, type: PromptsType.agent, name: 'Planner', description: 'Project planning agent' },
+	{ uri: URI.file('/home/dev/.copilot/agents/debugger.agent.md'), storage: PromptsStorage.user, type: PromptsType.agent, name: 'Debugger', description: 'Interactive debugging assistant' },
+	{ uri: URI.file('/home/dev/.copilot/agents/nls-helper.agent.md'), storage: PromptsStorage.user, type: PromptsType.agent, name: 'NLS Helper', description: 'Natural language searching code for clarity' },
+	// Agents - extension (built-in + third-party)
+	{ uri: URI.file('/extensions/github.copilot-chat/agents/workspace-guide.agent.md'), storage: PromptsStorage.extension, type: PromptsType.agent, name: 'Workspace Guide', description: 'Built-in workspace exploration agent', extensionId: 'GitHub.copilot-chat', extensionDisplayName: 'GitHub Copilot Chat' },
+	{ uri: URI.file('/extensions/acme.tools/agents/api-helper.agent.md'), storage: PromptsStorage.extension, type: PromptsType.agent, name: 'API Helper', description: 'Third-party API agent', extensionId: 'acme.tools', extensionDisplayName: 'Acme Tools' },
+	// Skills — workspace
+	{ uri: URI.file('/workspace/.github/skills/deploy/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'Deploy', description: 'Deployment automation' },
+	{ uri: URI.file('/workspace/.github/skills/refactor/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'Refactor', description: 'Code refactoring patterns' },
+	{ uri: URI.file('/workspace/.github/skills/unit-tests/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'Unit Tests', description: 'Test generation and runner integration' },
+	{ uri: URI.file('/workspace/.github/skills/ci-fix/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'CI Fix', description: 'Diagnose and fix CI failures' },
+	{ uri: URI.file('/workspace/.github/skills/migration/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'Migration', description: 'Database migration generation' },
+	{ uri: URI.file('/workspace/.github/skills/accessibility/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'Accessibility', description: 'ARIA labels and keyboard navigation' },
+	{ uri: URI.file('/workspace/.github/skills/docker/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'Docker', description: 'Dockerfile and compose generation' },
+	{ uri: URI.file('/workspace/.github/skills/api-docs/SKILL.md'), storage: PromptsStorage.local, type: PromptsType.skill, name: 'API Docs', description: 'OpenAPI spec generation' },
+	// Skills — user
+	{ uri: URI.file('/home/dev/.copilot/skills/git-workflow/SKILL.md'), storage: PromptsStorage.user, type: PromptsType.skill, name: 'Git Workflow', description: 'Branch and PR workflows' },
+	{ uri: URI.file('/home/dev/.copilot/skills/code-review/SKILL.md'), storage: PromptsStorage.user, type: PromptsType.skill, name: 'Code Review', description: 'Structured code review checklist' },
+	// Skills - extension (built-in + third-party)
+	{ uri: URI.file('/extensions/github.copilot-chat/skills/workspace/SKILL.md'), storage: PromptsStorage.extension, type: PromptsType.skill, name: 'Workspace Search', description: 'Built-in workspace search skill', extensionId: 'GitHub.copilot-chat', extensionDisplayName: 'GitHub Copilot Chat' },
+	{ uri: URI.file('/extensions/acme.tools/skills/audit/SKILL.md'), storage: PromptsStorage.extension, type: PromptsType.skill, name: 'Audit', description: 'Third-party audit skill', extensionId: 'acme.tools', extensionDisplayName: 'Acme Tools' },
+	// Prompts — workspace
+	{ uri: URI.file('/workspace/.github/prompts/explain.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Explain', description: 'Explain selected code' },
+	{ uri: URI.file('/workspace/.github/prompts/review.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Review', description: 'Review changes' },
+	{ uri: URI.file('/workspace/.github/prompts/fix-bug.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Fix Bug', description: 'Diagnose and fix a bug from issue' },
+	{ uri: URI.file('/workspace/.github/prompts/write-tests.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Write Tests', description: 'Generate unit tests for selection' },
+	{ uri: URI.file('/workspace/.github/prompts/add-docs.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Add Docs', description: 'Add JSDoc comments to functions' },
+	{ uri: URI.file('/workspace/.github/prompts/optimize.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Optimize', description: 'Optimize code for performance' },
+	{ uri: URI.file('/workspace/.github/prompts/convert-to-ts.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Convert to TS', description: 'Convert JavaScript to TypeScript' },
+	{ uri: URI.file('/workspace/.github/prompts/summarize-pr.prompt.md'), storage: PromptsStorage.local, type: PromptsType.prompt, name: 'Summarize PR', description: 'Generate PR description from diff' },
+	// Prompts — user
+	{ uri: URI.file('/home/dev/.copilot/prompts/translate.prompt.md'), storage: PromptsStorage.user, type: PromptsType.prompt, name: 'Translate', description: 'Translate strings for i18n' },
+	{ uri: URI.file('/home/dev/.copilot/prompts/commit-msg.prompt.md'), storage: PromptsStorage.user, type: PromptsType.prompt, name: 'Commit Message', description: 'Generate conventional commit' },
+	// Prompts - extension (built-in + third-party)
+	{ uri: URI.file('/extensions/github.copilot-chat/prompts/trace.prompt.md'), storage: PromptsStorage.extension, type: PromptsType.prompt, name: 'Trace', description: 'Built-in tracing prompt', extensionId: 'GitHub.copilot-chat', extensionDisplayName: 'GitHub Copilot Chat' },
+	{ uri: URI.file('/extensions/acme.tools/prompts/lint.prompt.md'), storage: PromptsStorage.extension, type: PromptsType.prompt, name: 'Lint', description: 'Third-party lint prompt', extensionId: 'acme.tools', extensionDisplayName: 'Acme Tools' },
+	// Hooks — workspace
+	{ uri: URI.file('/workspace/.github/hooks/pre-commit.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'Pre-Commit Lint', description: 'Run linting before commit' },
+	{ uri: URI.file('/workspace/.github/hooks/post-save.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'Post-Save Format', description: 'Auto-format on save' },
+	{ uri: URI.file('/workspace/.github/hooks/on-test-fail.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'On Test Failure', description: 'Suggest fix when tests fail' },
+	{ uri: URI.file('/workspace/.github/hooks/pre-push.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'Pre-Push Check', description: 'Run type-check before push' },
+	{ uri: URI.file('/workspace/.github/hooks/post-create.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'Post-Create', description: 'Initialize boilerplate for new files' },
+	{ uri: URI.file('/workspace/.github/hooks/on-error.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'On Error', description: 'Log and report unhandled errors' },
+	{ uri: URI.file('/workspace/.github/hooks/post-tool-call.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'Post Tool Call', description: 'Echo confirmation after each tool call' },
+	{ uri: URI.file('/workspace/.github/hooks/on-build-fail.json'), storage: PromptsStorage.local, type: PromptsType.hook, name: 'On Build Failure', description: 'Auto-diagnose build errors' },
+	// Hooks — user
+	{ uri: URI.file('/home/dev/.copilot/hooks/daily-summary.json'), storage: PromptsStorage.user, type: PromptsType.hook, name: 'Daily Summary', description: 'Generate daily work summary' },
+	{ uri: URI.file('/home/dev/.copilot/hooks/backup-changes.json'), storage: PromptsStorage.user, type: PromptsType.hook, name: 'Backup Changes', description: 'Auto-stash uncommitted changes' },
+];
+
+const agentInstructions: IResolvedAgentFile[] = [
+	{ uri: URI.file('/workspace/AGENTS.md'), realPath: undefined, type: AgentFileType.agentsMd },
+	{ uri: URI.file('/workspace/CLAUDE.md'), realPath: undefined, type: AgentFileType.claudeMd },
+	{ uri: URI.file('/workspace/.github/copilot-instructions.md'), realPath: undefined, type: AgentFileType.copilotInstructionsMd },
+];
+
+const mcpWorkspaceServers = [
+	makeLocalMcpServer('mcp-postgres', 'PostgreSQL', LocalMcpServerScope.Workspace, 'Database access'),
+	makeLocalMcpServer('mcp-github', 'GitHub', LocalMcpServerScope.Workspace, 'GitHub API'),
+	makeLocalMcpServer('mcp-redis', 'Redis', LocalMcpServerScope.Workspace, 'In-memory data store'),
+	makeLocalMcpServer('mcp-docker', 'Docker', LocalMcpServerScope.Workspace, 'Container management'),
+	makeLocalMcpServer('mcp-slack', 'Slack', LocalMcpServerScope.Workspace, 'Team messaging'),
+	makeLocalMcpServer('mcp-jira', 'Jira', LocalMcpServerScope.Workspace, 'Issue tracking'),
+	makeLocalMcpServer('mcp-aws', 'AWS', LocalMcpServerScope.Workspace, 'Amazon Web Services'),
+	makeLocalMcpServer('mcp-graphql', 'GraphQL', LocalMcpServerScope.Workspace, 'GraphQL API gateway'),
+];
+const mcpUserServers = [
+	makeLocalMcpServer('mcp-web-search', 'Web Search', LocalMcpServerScope.User, 'Search the web'),
+	makeLocalMcpServer('mcp-filesystem', 'Filesystem', LocalMcpServerScope.User, 'Local file operations'),
+	makeLocalMcpServer('mcp-puppeteer', 'Puppeteer', LocalMcpServerScope.User, 'Browser automation'),
+];
+const mcpRuntimeServers = [
+	{ definition: { id: 'github-copilot-mcp', label: 'GitHub Copilot' }, collection: { id: 'ext.github.copilot/mcp', label: 'ext.github.copilot/mcp' }, enablement: constObservable(2), connectionState: constObservable({ state: 2 }) },
+];
+
+interface IRenderEditorOptions {
+	readonly harness: CustomizationHarness;
+	readonly isSessionsWindow?: boolean;
+	readonly managementSections?: readonly AICustomizationManagementSection[];
+	readonly availableHarnesses?: readonly IHarnessDescriptor[];
+	readonly selectedSection?: AICustomizationManagementSection;
+	readonly scrollToBottom?: boolean;
+	readonly width?: number;
+	readonly height?: number;
+}
+
+async function waitForAnimationFrames(count: number): Promise<void> {
+	for (let i = 0; i < count; i++) {
+		await new Promise<void>(resolve => mainWindow.requestAnimationFrame(() => resolve()));
+	}
+}
+
+function getVisibleEditorSignature(container: HTMLElement): string {
+	const sectionCounts = [...container.querySelectorAll('.section-list-item')].map(item => item.textContent?.replace(/\s+/g, ' ').trim() ?? '').join('|');
+	const visibleContent = [...container.querySelectorAll('.prompts-content-container, .mcp-content-container, .plugin-content-container')]
+		.find(node => node instanceof HTMLElement && node.style.display !== 'none');
+	const visibleRows = visibleContent
+		? [...visibleContent.querySelectorAll('.monaco-list-row')].map(row => row.textContent?.replace(/\s+/g, ' ').trim() ?? '').join('|')
+		: '';
+
+	return `${sectionCounts}@@${visibleRows}`;
+}
+
+async function waitForEditorToSettle(container: HTMLElement): Promise<void> {
+	let previousSignature = '';
+	let stableIterations = 0;
+
+	await new Promise(resolve => setTimeout(resolve, 150));
+
+	for (let i = 0; i < 20; i++) {
+		await waitForAnimationFrames(2);
+		await new Promise(resolve => setTimeout(resolve, 25));
+
+		const signature = getVisibleEditorSignature(container);
+		if (signature && signature === previousSignature) {
+			stableIterations++;
+			if (stableIterations >= 2) {
+				return;
+			}
+		} else {
+			stableIterations = 0;
+			previousSignature = signature;
+		}
+	}
+}
+
+async function waitForVisibleScrollbarsToFade(container: HTMLElement): Promise<void> {
+	const deadline = Date.now() + 4000;
+
+	while (Date.now() < deadline) {
+		const hasVisibleScrollbar = [...container.querySelectorAll<HTMLElement>('.scrollbar.vertical')].some(scrollbar => {
+			const style = mainWindow.getComputedStyle(scrollbar);
+			return scrollbar.classList.contains('visible') && style.opacity !== '0';
+		});
+
+		if (!hasVisibleScrollbar) {
+			return;
+		}
+
+		await new Promise(resolve => setTimeout(resolve, 100));
+	}
+}
+
+// ============================================================================
+// Render helper — creates the full management editor
+// ============================================================================
+
+async function renderEditor(ctx: ComponentFixtureContext, options: IRenderEditorOptions): Promise<void> {
+	const width = options.width ?? 900;
+	const height = options.height ?? 600;
+	ctx.container.style.width = `${width}px`;
+	ctx.container.style.height = `${height}px`;
+
+	const isSessionsWindow = options.isSessionsWindow ?? false;
+	const managementSections = options.managementSections ?? [
+		AICustomizationManagementSection.Agents,
+		AICustomizationManagementSection.Skills,
+		AICustomizationManagementSection.Instructions,
+		AICustomizationManagementSection.Hooks,
+		AICustomizationManagementSection.Prompts,
+		AICustomizationManagementSection.McpServers,
+		AICustomizationManagementSection.Plugins,
+	];
+	const availableHarnesses = options.availableHarnesses ?? [
+		createVSCodeHarnessDescriptor([PromptsStorage.extension, BUILTIN_STORAGE]),
+		createCliHarnessDescriptor(getCliUserRoots(userHome), []),
+		createClaudeHarnessDescriptor(getClaudeUserRoots(userHome), []),
+	];
+
+	const allMcpServers = [...mcpWorkspaceServers, ...mcpUserServers];
+
+	const instantiationService = createEditorServices(ctx.disposableStore, {
+		colorTheme: ctx.theme,
+		additionalServices: (reg) => {
+			const harnessService = createMockHarnessService(options.harness, availableHarnesses);
+			const agentFeedbackService = createMockAgentFeedbackService();
+			const codeReviewService = createMockCodeReviewService();
+			registerWorkbenchServices(reg);
+			reg.define(IListService, ListService);
+			reg.defineInstance(IAgentFeedbackService, agentFeedbackService);
+			reg.defineInstance(ICodeReviewService, codeReviewService);
+			reg.defineInstance(IChatEditingService, new class extends mock<IChatEditingService>() {
+				override readonly editingSessionsObs = constObservable([]);
+			}());
+			reg.defineInstance(IAgentSessionsService, new class extends mock<IAgentSessionsService>() {
+				override readonly model = new class extends mock<IAgentSessionsService['model']>() {
+					override readonly sessions = [];
+				}();
+				override getSession() { return undefined; }
+			}());
+			reg.defineInstance(IPromptsService, createMockPromptsService(allFiles, agentInstructions));
+			reg.defineInstance(IAICustomizationWorkspaceService, new class extends mock<IAICustomizationWorkspaceService>() {
+				override readonly isSessionsWindow = isSessionsWindow;
+				override readonly activeProjectRoot = observableValue('root', URI.file('/workspace'));
+				override readonly hasOverrideProjectRoot = observableValue('hasOverride', false);
+				override getActiveProjectRoot() { return URI.file('/workspace'); }
+				override getStorageSourceFilter(type: PromptsType) { return harnessService.getStorageSourceFilter(type); }
+				override clearOverrideProjectRoot() { }
+				override setOverrideProjectRoot() { }
+				override readonly managementSections = managementSections;
+				override async generateCustomization() { }
+			}());
+			reg.defineInstance(ICustomizationHarnessService, harnessService);
+			reg.defineInstance(IChatSessionsService, new class extends mock<IChatSessionsService>() {
+				override readonly onDidChangeCustomizations = Event.None;
+				override async getCustomizations() { return undefined; }
+				override getRegisteredChatSessionItemProviders() { return []; }
+			}());
+			reg.defineInstance(IWorkspaceContextService, new class extends mock<IWorkspaceContextService>() {
+				override readonly onDidChangeWorkspaceFolders = Event.None;
+				override getWorkspace(): IWorkspace { return { id: 'test', folders: [] }; }
+				override getWorkbenchState(): WorkbenchState { return WorkbenchState.WORKSPACE; }
+			}());
+			reg.defineInstance(IFileService, new class extends mock<IFileService>() {
+				override readonly onDidFilesChange = Event.None;
+			}());
+			reg.defineInstance(IPathService, new class extends mock<IPathService>() {
+				override readonly defaultUriScheme = 'file';
+				override userHome(): URI;
+				override userHome(): Promise<URI>;
+				override userHome(): URI | Promise<URI> { return userHome; }
+			}());
+			reg.defineInstance(ITextModelService, new class extends mock<ITextModelService>() { }());
+			reg.defineInstance(IWorkingCopyService, new class extends mock<IWorkingCopyService>() {
+				override readonly onDidChangeDirty = Event.None;
+			}());
+			reg.defineInstance(IFileDialogService, new class extends mock<IFileDialogService>() { }());
+			reg.defineInstance(IExtensionService, new class extends mock<IExtensionService>() { }());
+			reg.defineInstance(IQuickInputService, new class extends mock<IQuickInputService>() { }());
+			reg.defineInstance(IRequestService, new class extends mock<IRequestService>() { }());
+			reg.defineInstance(IMarkdownRendererService, new class extends mock<IMarkdownRendererService>() {
+				override render() {
+					const rendered: IRenderedMarkdown = {
+						element: DOM.$('span'),
+						dispose() { },
+					};
+					return rendered;
+				}
+			}());
+			reg.defineInstance(IWebviewService, new class extends mock<IWebviewService>() { }());
+			reg.defineInstance(IMcpWorkbenchService, new class extends mock<IMcpWorkbenchService>() {
+				override readonly onChange = Event.None;
+				override readonly onReset = Event.None;
+				override readonly local = allMcpServers;
+				override async queryLocal() { return allMcpServers; }
+				override canInstall() { return true as const; }
+			}());
+			reg.defineInstance(IMcpService, new class extends mock<IMcpService>() {
+				override readonly servers = constObservable(mcpRuntimeServers as never[]);
+			}());
+			reg.defineInstance(IMcpRegistry, new class extends mock<IMcpRegistry>() {
+				override readonly collections = constObservable([]);
+				override readonly delegates = constObservable([]);
+				override readonly onDidChangeInputs = Event.None;
+			}());
+			reg.defineInstance(IAgentPluginService, new class extends mock<IAgentPluginService>() {
+				override readonly plugins = constObservable(installedPlugins);
+				override readonly enablementModel = undefined as never;
+			}());
+			reg.defineInstance(IPluginMarketplaceService, new class extends mock<IPluginMarketplaceService>() {
+				override readonly installedPlugins = constObservable([]);
+				override readonly onDidChangeMarketplaces = Event.None;
+			}());
+			reg.defineInstance(IPluginInstallService, new class extends mock<IPluginInstallService>() { }());
+			reg.defineInstance(IProductService, new class extends mock<IProductService>() {
+				override readonly defaultChatAgent = new class extends mock<NonNullable<IProductService['defaultChatAgent']>>() {
+					override readonly chatExtensionId = 'GitHub.copilot-chat';
+				}();
+			}());
+		},
+	});
+
+	const editor = ctx.disposableStore.add(
+		instantiationService.createInstance(AICustomizationManagementEditor, createMockEditorGroup())
+	);
+	editor.create(ctx.container);
+	editor.layout(new Dimension(width, height));
+
+	await editor.setInput(AICustomizationManagementEditorInput.getOrCreate(), undefined, {}, CancellationToken.None);
+
+	if (options.selectedSection) {
+		editor.selectSectionById(options.selectedSection);
+	}
+
+	await waitForEditorToSettle(ctx.container);
+
+	if (options.scrollToBottom) {
+		editor.revealLastItem();
+		await waitForAnimationFrames(2);
+		await new Promise(resolve => setTimeout(resolve, 2400));
+		await waitForVisibleScrollbarsToFade(ctx.container);
+	}
+}
+
+// ============================================================================
+// MCP Browse Mode — standalone widget with gallery results
+// ============================================================================
+
+function makeGalleryServer(id: string, label: string, description: string, publisher: string): IWorkbenchMcpServer {
+	const galleryStub = new class extends mock<NonNullable<IWorkbenchMcpServer['gallery']>>() { }();
+	return new class extends mock<IWorkbenchMcpServer>() {
+		override readonly id = id;
+		override readonly name = id;
+		override readonly label = label;
+		override readonly description = description;
+		override readonly publisherDisplayName = publisher;
+		override readonly installState = McpServerInstallState.Uninstalled;
+		override readonly gallery = galleryStub;
+		override readonly local = undefined;
+	}();
+}
+
+const galleryServers = [
+	makeGalleryServer('gallery-postgres', 'PostgreSQL', 'Access PostgreSQL databases with schema inspection and query tools', 'Microsoft'),
+	makeGalleryServer('gallery-github', 'GitHub', 'Repository management, issues, pull requests, and code search', 'GitHub'),
+	makeGalleryServer('gallery-slack', 'Slack', 'Send messages, manage channels, and search workspace history', 'Slack Technologies'),
+	makeGalleryServer('gallery-docker', 'Docker', 'Container lifecycle management and image operations', 'Docker Inc'),
+	makeGalleryServer('gallery-filesystem', 'Filesystem', 'Read, write, and navigate local files and directories', 'Microsoft'),
+	makeGalleryServer('gallery-brave', 'Brave Search', 'Web and local search powered by the Brave Search API', 'Brave Software'),
+	makeGalleryServer('gallery-puppeteer', 'Puppeteer', 'Browser automation with screenshots, navigation, and form filling', 'Google'),
+	makeGalleryServer('gallery-memory', 'Memory', 'Knowledge graph for persistent memory across conversations', 'Microsoft'),
+	makeGalleryServer('gallery-fetch', 'Fetch', 'Retrieve and convert web content to markdown for analysis', 'Microsoft'),
+	makeGalleryServer('gallery-sentry', 'Sentry', 'Error monitoring, issue tracking, and performance tracing', 'Sentry'),
+	makeGalleryServer('gallery-sqlite', 'SQLite', 'Query and manage SQLite databases with schema exploration', 'Community'),
+	makeGalleryServer('gallery-redis', 'Redis', 'In-memory data store operations and key management', 'Redis Ltd'),
+];
+
+async function renderMcpBrowseMode(ctx: ComponentFixtureContext): Promise<void> {
+	const width = 650;
+	const height = 500;
+	ctx.container.style.width = `${width}px`;
+	ctx.container.style.height = `${height}px`;
+
+	const instantiationService = createEditorServices(ctx.disposableStore, {
+		colorTheme: ctx.theme,
+		additionalServices: (reg) => {
+			registerWorkbenchServices(reg);
+			reg.define(IListService, ListService);
+			reg.defineInstance(IMcpWorkbenchService, new class extends mock<IMcpWorkbenchService>() {
+				override readonly onChange = Event.None;
+				override readonly onReset = Event.None;
+				override readonly local: IWorkbenchMcpServer[] = [];
+				override async queryLocal() { return []; }
+				override canInstall() { return true as const; }
+				override async queryGallery(): Promise<IIterativePager<IWorkbenchMcpServer>> {
+					return {
+						firstPage: { items: galleryServers, hasMore: false },
+						async getNextPage() { return { items: [], hasMore: false }; },
+					};
+				}
+			}());
+			reg.defineInstance(IMcpService, new class extends mock<IMcpService>() {
+				override readonly servers = constObservable([] as never[]);
+			}());
+			reg.defineInstance(IMcpRegistry, new class extends mock<IMcpRegistry>() {
+				override readonly collections = constObservable([]);
+				override readonly delegates = constObservable([]);
+				override readonly onDidChangeInputs = Event.None;
+			}());
+			reg.defineInstance(IAgentPluginService, new class extends mock<IAgentPluginService>() {
+				override readonly plugins = constObservable([]);
+			}());
+			reg.defineInstance(IDialogService, new class extends mock<IDialogService>() { }());
+			reg.defineInstance(IAICustomizationWorkspaceService, new class extends mock<IAICustomizationWorkspaceService>() {
+				override readonly isSessionsWindow = false;
+				override readonly activeProjectRoot = observableValue('root', URI.file('/workspace'));
+				override readonly hasOverrideProjectRoot = observableValue('hasOverride', false);
+				override getActiveProjectRoot() { return URI.file('/workspace'); }
+				override getStorageSourceFilter() {
+					return { sources: [PromptsStorage.local, PromptsStorage.user, PromptsStorage.extension, PromptsStorage.plugin] };
+				}
+			}());
+			reg.defineInstance(ICustomizationHarnessService, new class extends mock<ICustomizationHarnessService>() {
+				override readonly activeHarness = observableValue<string>('activeHarness', CustomizationHarness.VSCode);
+				override getActiveDescriptor() { return createVSCodeHarnessDescriptor([PromptsStorage.extension, BUILTIN_STORAGE]); }
+				override registerContributedHarness() { return { dispose() { } }; }
+			}());
+		},
+	});
+
+	const widget = ctx.disposableStore.add(
+		instantiationService.createInstance(McpListWidget)
+	);
+	ctx.container.appendChild(widget.element);
+	widget.layout(height, width);
+
+	// Click the Browse Marketplace button to enter browse mode
+	const browseButton = widget.element.querySelector('.list-add-button') as HTMLElement;
+	browseButton?.click();
+
+	// Wait for the gallery query to resolve
+	await new Promise(resolve => setTimeout(resolve, 50));
+}
+
+// ============================================================================
+// Plugin Browse Mode — standalone widget with marketplace results
+// ============================================================================
+
+function makeInstalledPlugin(name: string, uri: URI, enabled: boolean): IAgentPlugin {
+	return new class extends mock<IAgentPlugin>() {
+		override readonly uri = uri;
+		override readonly label = name;
+		override readonly enablement = constObservable(enabled ? ContributionEnablementState.EnabledProfile : ContributionEnablementState.DisabledProfile);
+		override readonly hooks = constObservable([]);
+		override readonly commands = constObservable([]);
+		override readonly skills = constObservable([]);
+		override readonly agents = constObservable([]);
+		override readonly instructions = constObservable([]);
+		override readonly mcpServerDefinitions = constObservable([]);
+		override remove() { }
+	}();
+}
+
+const installedPlugins: IAgentPlugin[] = [
+	makeInstalledPlugin('Linear', URI.file('/workspace/.copilot/plugins/linear'), true),
+	makeInstalledPlugin('Sentry', URI.file('/workspace/.copilot/plugins/sentry'), true),
+	makeInstalledPlugin('Datadog', URI.file('/workspace/.copilot/plugins/datadog'), true),
+	makeInstalledPlugin('Notion', URI.file('/workspace/.copilot/plugins/notion'), true),
+	makeInstalledPlugin('Confluence', URI.file('/workspace/.copilot/plugins/confluence'), true),
+	makeInstalledPlugin('PagerDuty', URI.file('/workspace/.copilot/plugins/pagerduty'), false),
+	makeInstalledPlugin('LaunchDarkly', URI.file('/workspace/.copilot/plugins/launchdarkly'), true),
+	makeInstalledPlugin('CircleCI', URI.file('/workspace/.copilot/plugins/circleci'), true),
+	makeInstalledPlugin('Vercel', URI.file('/workspace/.copilot/plugins/vercel'), false),
+	makeInstalledPlugin('Supabase', URI.file('/workspace/.copilot/plugins/supabase'), true),
+];
+
+function makeMarketplacePlugin(name: string, description: string, repo: string): IMarketplacePlugin {
+	return {
+		name,
+		description,
+		version: '1.0.0',
+		source: repo,
+		sourceDescriptor: { kind: PluginSourceKind.GitHub, repo: `example/${repo}` },
+		marketplace: 'copilot',
+		marketplaceReference: { rawValue: `example/${repo}`, displayLabel: repo, cloneUrl: `https://github.com/example/${repo}.git`, canonicalId: `github:example/${repo}`, cacheSegments: ['example', repo], kind: MarketplaceReferenceKind.GitHubShorthand },
+		marketplaceType: MarketplaceType.Copilot,
+	};
+}
+
+const marketplacePlugins: IMarketplacePlugin[] = [
+	makeMarketplacePlugin('Linear', 'Issue tracking and project management integration', 'linear-plugin'),
+	makeMarketplacePlugin('Sentry', 'Error monitoring and performance tracing', 'sentry-plugin'),
+	makeMarketplacePlugin('Datadog', 'Observability and monitoring dashboards', 'datadog-plugin'),
+	makeMarketplacePlugin('Notion', 'Knowledge base and documentation management', 'notion-plugin'),
+	makeMarketplacePlugin('Figma', 'Design system inspection and asset export', 'figma-plugin'),
+	makeMarketplacePlugin('Stripe', 'Payment processing and billing management', 'stripe-plugin'),
+	makeMarketplacePlugin('Twilio', 'Communication APIs for SMS and voice', 'twilio-plugin'),
+	makeMarketplacePlugin('Auth0', 'Identity and access management', 'auth0-plugin'),
+	makeMarketplacePlugin('Algolia', 'Search and discovery API integration', 'algolia-plugin'),
+	makeMarketplacePlugin('LaunchDarkly', 'Feature flag management and experimentation', 'launchdarkly-plugin'),
+	makeMarketplacePlugin('PlanetScale', 'Serverless MySQL database management', 'planetscale-plugin'),
+	makeMarketplacePlugin('Vercel', 'Deployment and preview environments', 'vercel-plugin'),
+];
+
+async function renderPluginBrowseMode(ctx: ComponentFixtureContext): Promise<void> {
+	const width = 650;
+	const height = 500;
+	ctx.container.style.width = `${width}px`;
+	ctx.container.style.height = `${height}px`;
+
+	const instantiationService = createEditorServices(ctx.disposableStore, {
+		colorTheme: ctx.theme,
+		additionalServices: (reg) => {
+			registerWorkbenchServices(reg);
+			reg.define(IListService, ListService);
+			reg.defineInstance(IAgentPluginService, new class extends mock<IAgentPluginService>() {
+				override readonly plugins = constObservable([] as readonly IAgentPlugin[]);
+				override readonly enablementModel = undefined!;
+			}());
+			reg.defineInstance(IPluginMarketplaceService, new class extends mock<IPluginMarketplaceService>() {
+				override readonly installedPlugins = constObservable([]);
+				override readonly onDidChangeMarketplaces = Event.None;
+				override async fetchMarketplacePlugins() { return marketplacePlugins; }
+			}());
+			reg.defineInstance(IPluginInstallService, new class extends mock<IPluginInstallService>() {
+				override getPluginInstallUri() { return URI.file('/dev/null'); }
+			}());
+		},
+	});
+
+	const widget = ctx.disposableStore.add(
+		instantiationService.createInstance(PluginListWidget)
+	);
+	ctx.container.appendChild(widget.element);
+	widget.layout(height, width);
+
+	// Click the Browse Marketplace button to enter browse mode
+	const browseButton = widget.element.querySelector('.list-add-button') as HTMLElement;
+	browseButton?.click();
+
+	// Wait for the marketplace query to resolve
+	await new Promise(resolve => setTimeout(resolve, 50));
+}
+
+// ============================================================================
+// Fixtures
+// ============================================================================
+
+export default defineThemedFixtureGroup({ path: 'chat/aiCustomizations/' }, {
+
+	// Full editor with Local (VS Code) harness — all sections visible, harness dropdown,
+	// Generate buttons, AGENTS.md shortcut, all storage groups
+	LocalHarness: defineComponentFixture({
+		labels: { kind: 'screenshot', blocksCi: true },
+		render: ctx => renderEditor(ctx, { harness: CustomizationHarness.VSCode }),
+	}),
+
+	// Full editor with Copilot CLI harness — no prompts section, CLI-specific
+	// root files and instruction filtering under .github/.copilot paths.
+	CliHarness: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, { harness: CustomizationHarness.CLI }),
+	}),
+
+	// Full editor with Claude harness — Prompts+Plugins hidden, Agents visible,
+	// "Add CLAUDE.md" button, "New Rule" dropdown, instruction filtering, bridged MCP badge
+	ClaudeHarness: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, { harness: CustomizationHarness.Claude }),
+	}),
+
+	// Sessions-window variant of the full editor with workspace override UX
+	// and sessions section ordering.
+	Sessions: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.CLI,
+			isSessionsWindow: true,
+			availableHarnesses: [
+				createCliHarnessDescriptor(getCliUserRoots(userHome), [BUILTIN_STORAGE]),
+			],
+			managementSections: [
+				AICustomizationManagementSection.Agents,
+				AICustomizationManagementSection.Skills,
+				AICustomizationManagementSection.Instructions,
+				AICustomizationManagementSection.Prompts,
+				AICustomizationManagementSection.Hooks,
+				AICustomizationManagementSection.McpServers,
+				AICustomizationManagementSection.Plugins,
+			],
+		}),
+	}),
+
+	// MCP Servers tab with many servers to verify scrollable list layout
+	McpServersTab: defineComponentFixture({
+		labels: { kind: 'screenshot', blocksCi: true },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.McpServers,
+		}),
+	}),
+
+	// Agents tab — workspace and user agents, scrollable
+	AgentsTab: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Agents,
+		}),
+	}),
+
+	// Skills tab — workspace and user skills, scrollable
+	SkillsTab: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Skills,
+		}),
+	}),
+
+	// Instructions tab — many instructions with applyTo patterns, scrollable
+	InstructionsTab: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Instructions,
+		}),
+	}),
+
+	// Hooks tab — workspace and user hooks, scrollable
+	HooksTab: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Hooks,
+		}),
+	}),
+
+	// Prompts tab — workspace and user prompts, scrollable
+	PromptsTab: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Prompts,
+		}),
+	}),
+
+	// Plugins tab
+	PluginsTab: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Plugins,
+		}),
+	}),
+
+	// MCP browse/marketplace mode — standalone widget with gallery results, scrollable
+	// Verifies fix for https://github.com/microsoft/vscode/issues/304139
+	McpBrowseMode: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: renderMcpBrowseMode,
+	}),
+
+	// Plugin browse/marketplace mode — standalone widget with marketplace results, scrollable
+	PluginBrowseMode: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: renderPluginBrowseMode,
+	}),
+
+	// Scrolled-to-bottom variants — verify last items are fully visible above footer
+	PromptsTabScrolled: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Prompts,
+			scrollToBottom: true,
+		}),
+	}),
+
+	McpServersTabScrolled: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.McpServers,
+			scrollToBottom: true,
+		}),
+	}),
+
+	PluginsTabScrolled: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Plugins,
+			scrollToBottom: true,
+		}),
+	}),
+
+	// Narrow viewport — catches badge clipping and layout overflow at small sizes
+	McpServersTabNarrow: defineComponentFixture({
+		labels: { kind: 'screenshot', blocksCi: true },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.McpServers,
+			width: 550,
+			height: 400,
+		}),
+	}),
+
+	AgentsTabNarrow: defineComponentFixture({
+		labels: { kind: 'screenshot', blocksCi: true },
+		render: ctx => renderEditor(ctx, {
+			harness: CustomizationHarness.VSCode,
+			selectedSection: AICustomizationManagementSection.Agents,
+			width: 550,
+			height: 400,
+		}),
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/chatArtifacts.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/chatArtifacts.fixture.ts
new file mode 100644
index 00000000000..2c330949566
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/chatArtifacts.fixture.ts
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { ChatArtifactsWidget } from '../../../contrib/chat/browser/widget/chatArtifactsWidget.js';
+import { IChatImageCarouselService } from '../../../contrib/chat/browser/chatImageCarouselService.js';
+import { IChatArtifact, IChatArtifacts, IChatArtifactsService } from '../../../contrib/chat/common/tools/chatArtifactsService.js';
+import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup } from './fixtureUtils.js';
+
+import '../../../contrib/chat/browser/widget/media/chat.css';
+
+function createMockArtifacts(artifacts: IChatArtifact[]): IChatArtifacts {
+	const obs = observableValue<readonly IChatArtifact[]>('artifacts', artifacts);
+	const mutable = observableValue<boolean>('mutable', true);
+	return new class extends mock<IChatArtifacts>() {
+		override readonly artifacts = obs;
+		override readonly mutable = mutable;
+		override set(a: IChatArtifact[]) { obs.set(a, undefined); }
+		override clear() { obs.set([], undefined); }
+		override migrate() { }
+	}();
+}
+
+function createMockArtifactsService(artifacts: IChatArtifact[]): IChatArtifactsService {
+	const instance = createMockArtifacts(artifacts);
+	return new class extends mock<IChatArtifactsService>() {
+		override getArtifacts() { return instance; }
+	}();
+}
+
+function renderArtifactsWidget(context: ComponentFixtureContext, artifacts: IChatArtifact[]): void {
+	const { container, disposableStore } = context;
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: context.theme,
+		additionalServices: (reg) => {
+			reg.define(IListService, ListService);
+			reg.defineInstance(IContextViewService, new class extends mock<IContextViewService>() { }());
+			reg.defineInstance(IChatArtifactsService, createMockArtifactsService(artifacts));
+			reg.defineInstance(IChatImageCarouselService, new class extends mock<IChatImageCarouselService>() { }());
+			reg.defineInstance(IFileService, new class extends mock<IFileService>() { override onDidFilesChange = Event.None; override onDidRunOperation = Event.None; }());
+			reg.defineInstance(IFileDialogService, new class extends mock<IFileDialogService>() { }());
+		},
+	});
+
+	const widget = disposableStore.add(instantiationService.createInstance(ChatArtifactsWidget));
+	widget.render(URI.parse('chat-session:test-session'));
+
+	container.style.width = '400px';
+	container.style.padding = '8px';
+	container.appendChild(widget.domNode);
+}
+
+function renderInChatInputPart(context: ComponentFixtureContext, artifacts: IChatArtifact[]): void {
+	const { container, disposableStore } = context;
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: context.theme,
+		additionalServices: (reg) => {
+			reg.define(IListService, ListService);
+			reg.defineInstance(IContextViewService, new class extends mock<IContextViewService>() { }());
+			reg.defineInstance(IChatArtifactsService, createMockArtifactsService(artifacts));
+			reg.defineInstance(IChatImageCarouselService, new class extends mock<IChatImageCarouselService>() { }());
+			reg.defineInstance(IFileService, new class extends mock<IFileService>() { override onDidFilesChange = Event.None; override onDidRunOperation = Event.None; }());
+			reg.defineInstance(IFileDialogService, new class extends mock<IFileDialogService>() { }());
+		},
+	});
+
+	container.style.width = '500px';
+	container.classList.add('monaco-workbench');
+
+	const session = dom.$('.interactive-session');
+	container.appendChild(session);
+
+	const inputPart = dom.h('.interactive-input-part', [
+		dom.h('.chat-artifacts-widget-container@artifactsContainer'),
+		dom.h('.interactive-input-and-side-toolbar', [
+			dom.h('.chat-input-container', [
+				dom.h('.chat-editor-container@editorContainer'),
+			]),
+		]),
+	]);
+	session.appendChild(inputPart.root);
+
+	inputPart.editorContainer.style.height = '44px';
+
+	const widget = disposableStore.add(instantiationService.createInstance(ChatArtifactsWidget));
+	widget.render(URI.parse('chat-session:test-session'));
+	inputPart.artifactsContainer.appendChild(widget.domNode);
+}
+
+function renderArtifactsWidgetExpanded(context: ComponentFixtureContext, artifacts: IChatArtifact[]): void {
+	renderArtifactsWidget(context, artifacts);
+
+	// Click the header button to expand the widget
+	const expandButton = context.container.querySelector<HTMLElement>('.chat-artifacts-expand .monaco-button');
+	expandButton?.click();
+}
+
+// ============================================================================
+// Sample artifacts
+// ============================================================================
+
+const singleArtifact: IChatArtifact[] = [
+	{ label: 'Dev Server', uri: 'http://localhost:3000', type: 'devServer' },
+];
+
+const multipleArtifacts: IChatArtifact[] = [
+	{ label: 'Dev Server', uri: 'http://localhost:3000', type: 'devServer' },
+	{ label: 'Screenshot of login page', uri: 'file:///tmp/screenshot.png', type: 'screenshot' },
+	{ label: 'Implementation Plan', uri: 'file:///tmp/plan.md', type: 'plan' },
+];
+
+const manyArtifacts: IChatArtifact[] = [
+	{ label: 'Dev Server', uri: 'http://localhost:3000', type: 'devServer' },
+	{ label: 'Screenshot 1', uri: 'file:///tmp/s1.png', type: 'screenshot' },
+	{ label: 'Screenshot 2', uri: 'file:///tmp/s2.png', type: 'screenshot' },
+	{ label: 'Plan', uri: 'file:///tmp/plan.md', type: 'plan' },
+	{ label: 'API Docs', uri: 'http://localhost:3000/docs', type: undefined },
+];
+
+// ============================================================================
+// Fixtures
+// ============================================================================
+
+export default defineThemedFixtureGroup({ path: 'chat/artifacts/' }, {
+	SingleArtifact: defineComponentFixture({
+		render: context => renderArtifactsWidget(context, singleArtifact),
+	}),
+
+	MultipleArtifacts: defineComponentFixture({
+		render: context => renderArtifactsWidget(context, multipleArtifacts),
+	}),
+
+	ManyArtifacts: defineComponentFixture({
+		render: context => renderArtifactsWidget(context, manyArtifacts),
+	}),
+
+	InChatInputSingle: defineComponentFixture({
+		render: context => renderInChatInputPart(context, singleArtifact),
+	}),
+
+	InChatInputMultiple: defineComponentFixture({
+		render: context => renderInChatInputPart(context, multipleArtifacts),
+	}),
+
+	MultipleArtifactsExpanded: defineComponentFixture({
+		render: context => renderArtifactsWidgetExpanded(context, multipleArtifacts),
+	}),
+
+	ManyArtifactsExpanded: defineComponentFixture({
+		render: context => renderArtifactsWidgetExpanded(context, manyArtifacts),
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/chatInput.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/chatInput.fixture.ts
new file mode 100644
index 00000000000..8a1fb1c92b0
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/chatInput.fixture.ts
@@ -0,0 +1,293 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IMenuService, IMenu, MenuId, MenuItemAction, IMenuItem } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { IDecorationsService } from '../../../services/decorations/common/decorations.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IPathService } from '../../../services/path/common/pathService.js';
+import { IChatWidgetHistoryService } from '../../../contrib/chat/common/widget/chatWidgetHistoryService.js';
+import { IChatContextPickService } from '../../../contrib/chat/browser/attachments/chatContextPickService.js';
+import { IWorkspaceContextService, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IChatWidget } from '../../../contrib/chat/browser/chat.js';
+import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { IChatAttachmentResolveService } from '../../../contrib/chat/browser/attachments/chatAttachmentResolveService.js';
+import { IChatAttachmentWidgetRegistry } from '../../../contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.js';
+import { IChatContextService } from '../../../contrib/chat/browser/contextContrib/chatContextService.js';
+import { ChatInputPart, IChatInputPartOptions, IChatInputStyles } from '../../../contrib/chat/browser/widget/input/chatInputPart.js';
+import { IChatArtifacts, IChatArtifactsService } from '../../../contrib/chat/common/tools/chatArtifactsService.js';
+import { ChatEditingSessionState, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../../contrib/chat/common/editing/chatEditingService.js';
+import { IChatRequestDisablement } from '../../../contrib/chat/common/model/chatModel.js';
+import { IChatTodo, IChatTodoListService } from '../../../contrib/chat/common/tools/chatTodoListService.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../../contrib/chat/common/constants.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
+import { IChatModeService } from '../../../contrib/chat/common/chatModes.js';
+import { IChatService } from '../../../contrib/chat/common/chatService/chatService.js';
+import { IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
+import { ILanguageModelsService } from '../../../contrib/chat/common/languageModels.js';
+import { IChatAgentService } from '../../../contrib/chat/common/participants/chatAgents.js';
+import { ILanguageModelToolsService } from '../../../contrib/chat/common/tools/languageModelToolsService.js';
+import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
+import { INotebookDocumentService } from '../../../services/notebook/common/notebookDocumentService.js';
+import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from './fixtureUtils.js';
+
+import '../../../contrib/chat/browser/widget/media/chat.css';
+
+class FixtureMenuService implements IMenuService {
+	declare readonly _serviceBrand: undefined;
+	private readonly _items = new Map<string, IMenuItem[]>();
+	constructor(
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ICommandService private readonly _commandService: ICommandService,
+	) { }
+	addItem(menuId: MenuId, item: IMenuItem): void {
+		const key = menuId.id;
+		let items = this._items.get(key);
+		if (!items) {
+			items = [];
+			this._items.set(key, items);
+		}
+		items.push(item);
+	}
+	createMenu(id: MenuId): IMenu {
+		const actions: [string, MenuItemAction[]][] = [];
+		for (const item of this._items.get(id.id) ?? []) {
+			const group = item.group ?? '';
+			let entry = actions.find(a => a[0] === group);
+			if (!entry) {
+				entry = [group, []];
+				actions.push(entry);
+			}
+			entry[1].push(new MenuItemAction(item.command, item.alt, {}, undefined, undefined, this._contextKeyService, this._commandService));
+		}
+		return { onDidChange: Event.None, dispose() { }, getActions: () => actions };
+	}
+	getMenuActions() { return []; }
+	getMenuContexts() { return new Set<string>(); }
+	resetHiddenStates() { }
+}
+
+interface ChatInputFixtureOptions {
+	readonly artifacts?: readonly { label: string; uri: string; type: 'devServer' | 'screenshot' | 'plan' | undefined }[];
+	readonly editingSession?: IChatEditingSession;
+	readonly todos?: IChatTodo[];
+}
+
+async function renderChatInput(context: ComponentFixtureContext, fixtureOptions: ChatInputFixtureOptions = {}): Promise<void> {
+	const { container, disposableStore } = context;
+	const { artifacts = [], editingSession, todos = [] } = fixtureOptions;
+	const artifactsObs = observableValue<readonly typeof artifacts[number][]>('artifacts', artifacts);
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: context.theme,
+		additionalServices: (reg) => {
+			reg.define(IMenuService, FixtureMenuService);
+			registerWorkbenchServices(reg);
+			// eslint-disable-next-line local/code-no-dangerous-type-assertions
+			reg.defineInstance(ITextModelService, new class extends mock<ITextModelService>() { override async createModelReference() { return { object: { textEditorModel: null }, dispose() { } } as unknown as Awaited<ReturnType<ITextModelService['createModelReference']>>; } }());
+			reg.defineInstance(IDecorationsService, new class extends mock<IDecorationsService>() { override onDidChangeDecorations = Event.None; }());
+			reg.defineInstance(ITextFileService, new class extends mock<ITextFileService>() { override readonly untitled = new class extends mock<ITextFileService['untitled']>() { override readonly onDidChangeLabel = Event.None; }(); }());
+			reg.defineInstance(ILanguageModelsService, new class extends mock<ILanguageModelsService>() { override onDidChangeLanguageModels = Event.None; override getLanguageModelIds() { return []; } }());
+			reg.defineInstance(IFileService, new class extends mock<IFileService>() { override onDidFilesChange = Event.None; override onDidRunOperation = Event.None; }());
+			reg.defineInstance(IEditorService, new class extends mock<IEditorService>() { override onDidActiveEditorChange = Event.None; }());
+			reg.defineInstance(IChatAgentService, new class extends mock<IChatAgentService>() { override onDidChangeAgents = Event.None; override getAgents() { return []; } override getActivatedAgents() { return []; } }());
+			reg.defineInstance(ISharedWebContentExtractorService, new class extends mock<ISharedWebContentExtractorService>() { }());
+			reg.defineInstance(IWorkbenchAssignmentService, new class extends mock<IWorkbenchAssignmentService>() { override async getCurrentExperiments() { return []; } override async getTreatment() { return undefined; } override onDidRefetchAssignments = Event.None; }());
+			reg.defineInstance(IChatEntitlementService, new class extends mock<IChatEntitlementService>() { }());
+			reg.defineInstance(IChatModeService, new class extends mock<IChatModeService>() { override readonly onDidChangeChatModes = Event.None; override getModes() { return { builtin: [], custom: [] }; } override findModeById() { return undefined; } }());
+			reg.defineInstance(ILanguageModelToolsService, new class extends mock<ILanguageModelToolsService>() { override onDidChangeTools = Event.None; override getTools() { return []; } }());
+			reg.defineInstance(IChatService, new class extends mock<IChatService>() { override onDidSubmitRequest = Event.None; }());
+			reg.defineInstance(IChatSessionsService, new class extends mock<IChatSessionsService>() { override getAllChatSessionContributions() { return []; } override readonly onDidChangeSessionOptions = Event.None; override readonly onDidChangeOptionGroups = Event.None; override readonly onDidChangeAvailability = Event.None; }());
+			reg.defineInstance(IChatContextService, new class extends mock<IChatContextService>() { }());
+			reg.defineInstance(IAgentSessionsService, new class extends mock<IAgentSessionsService>() { override readonly model = new class extends mock<IAgentSessionsService['model']>() { override readonly onDidChangeSessions = Event.None; }(); }());
+			reg.defineInstance(IWorkspaceContextService, new class extends mock<IWorkspaceContextService>() { override onDidChangeWorkspaceFolders = Event.None; override getWorkspace(): IWorkspace { return { id: '', folders: [], configuration: undefined }; } }());
+			reg.defineInstance(IWorkbenchLayoutService, new class extends mock<IWorkbenchLayoutService>() { override onDidChangePartVisibility = Event.None; override onDidChangeWindowMaximized = Event.None; override isVisible() { return true; } }());
+			reg.defineInstance(IViewDescriptorService, new class extends mock<IViewDescriptorService>() { override onDidChangeLocation = Event.None; }());
+			reg.defineInstance(IChatAttachmentWidgetRegistry, new class extends mock<IChatAttachmentWidgetRegistry>() { }());
+			reg.defineInstance(IChatAttachmentResolveService, new class extends mock<IChatAttachmentResolveService>() { }());
+			reg.defineInstance(IExtensionService, new class extends mock<IExtensionService>() { override readonly onDidChangeExtensions = Event.None; }());
+			reg.defineInstance(IPathService, new class extends mock<IPathService>() { }());
+			reg.defineInstance(IChatWidgetHistoryService, new class extends mock<IChatWidgetHistoryService>() { override getHistory() { return []; } override readonly onDidChangeHistory = Event.None; }());
+			reg.defineInstance(IChatContextPickService, new class extends mock<IChatContextPickService>() { }());
+			reg.defineInstance(IListService, new ListService());
+			reg.defineInstance(INotebookDocumentService, new class extends mock<INotebookDocumentService>() { }());
+			reg.defineInstance(IActionWidgetService, new class extends mock<IActionWidgetService>() { override show() { } override hide() { } override get isVisible() { return false; } }());
+			reg.defineInstance(IProductService, new class extends mock<IProductService>() { }());
+			reg.defineInstance(IUpdateService, new class extends mock<IUpdateService>() { override onStateChange = Event.None; override get state() { return { type: StateType.Uninitialized as const }; } }());
+			reg.defineInstance(IUriIdentityService, new class extends mock<IUriIdentityService>() { }());
+			reg.defineInstance(IChatArtifactsService, new class extends mock<IChatArtifactsService>() {
+				override getArtifacts(): IChatArtifacts {
+					const mutableObs = observableValue<boolean>('mutable', true);
+					return new class extends mock<IChatArtifacts>() {
+						override readonly artifacts = artifactsObs;
+						override readonly mutable = mutableObs;
+						override set() { }
+						override clear() { }
+						override migrate() { }
+					}();
+				}
+			}());
+			reg.defineInstance(IChatTodoListService, new class extends mock<IChatTodoListService>() {
+				override readonly onDidUpdateTodos = Event.None;
+				override getTodos() { return [...todos]; }
+				override setTodos() { }
+				override migrateTodos() { }
+			}());
+		},
+	});
+
+	if (artifacts.length > 0) {
+		const configService = instantiationService.get(IConfigurationService) as TestConfigurationService;
+		await configService.setUserConfiguration(ChatConfiguration.ArtifactsEnabled, true);
+	}
+
+	container.style.width = '500px';
+	container.style.backgroundColor = 'var(--vscode-sideBar-background, var(--vscode-editor-background))';
+	container.classList.add('monaco-workbench');
+
+	const session = document.createElement('div');
+	session.classList.add('interactive-session');
+	container.appendChild(session);
+
+	const menuService = instantiationService.get(IMenuService) as FixtureMenuService;
+	menuService.addItem(MenuId.ChatInput, { command: { id: 'workbench.action.chat.attachContext', title: '+', icon: Codicon.add }, group: 'navigation', order: -1 });
+	menuService.addItem(MenuId.ChatInput, { command: { id: 'workbench.action.chat.openModePicker', title: 'Agent' }, group: 'navigation', order: 1 });
+	menuService.addItem(MenuId.ChatInput, { command: { id: 'workbench.action.chat.openModelPicker', title: 'GPT-5.3-Codex' }, group: 'navigation', order: 3 });
+	menuService.addItem(MenuId.ChatInput, { command: { id: 'workbench.action.chat.configureTools', title: '', icon: Codicon.settingsGear }, group: 'navigation', order: 100 });
+	menuService.addItem(MenuId.ChatExecute, { command: { id: 'workbench.action.chat.submit', title: 'Send', icon: Codicon.arrowUp }, group: 'navigation', order: 4 });
+	menuService.addItem(MenuId.ChatInputSecondary, { command: { id: 'workbench.action.chat.openSessionTargetPicker', title: 'Local' }, group: 'navigation', order: 0 });
+	menuService.addItem(MenuId.ChatInputSecondary, { command: { id: 'workbench.action.chat.openPermissionPicker', title: 'Default Approvals' }, group: 'navigation', order: 10 });
+
+	const options: IChatInputPartOptions = {
+		renderFollowups: false,
+		renderInputToolbarBelowInput: false,
+		renderWorkingSet: !!editingSession,
+		menus: { executeToolbar: MenuId.ChatExecute, telemetrySource: 'fixture' },
+		widgetViewKindTag: 'view',
+		inputEditorMinLines: 2,
+	};
+	const styles: IChatInputStyles = {
+		overlayBackground: 'var(--vscode-editor-background)',
+		listForeground: 'var(--vscode-foreground)',
+		listBackground: 'var(--vscode-editor-background)',
+	};
+
+	try {
+		const inputPart = disposableStore.add(instantiationService.createInstance(ChatInputPart, ChatAgentLocation.Chat, options, styles, false));
+		const mockWidget = new class extends mock<IChatWidget>() {
+			override readonly onDidChangeViewModel = new Emitter<never>().event;
+			override readonly viewModel = undefined;
+			override readonly contribs = [];
+			override readonly location = ChatAgentLocation.Chat;
+			override readonly viewContext = {};
+		}();
+
+		inputPart.render(session, '', mockWidget);
+		inputPart.layout(500);
+		await new Promise(r => setTimeout(r, 100));
+		inputPart.layout(500);
+		inputPart.renderArtifactsWidget(URI.parse('chat-session:test-session'));
+		await inputPart.renderChatTodoListWidget(URI.parse('chat-session:test-session'));
+		await new Promise(r => setTimeout(r, 50));
+
+		if (editingSession) {
+			inputPart.renderChatEditingSessionState(editingSession);
+			await new Promise(r => setTimeout(r, 50));
+			inputPart.layout(500);
+		}
+	} catch (e) {
+		const err = document.createElement('pre');
+		err.style.cssText = 'color:red;font-size:11px;white-space:pre-wrap';
+		err.textContent = `Render error: ${e instanceof Error ? e.message : String(e)}`;
+		session.appendChild(err);
+	}
+}
+
+const sampleArtifacts = [
+	{ label: 'Dev Server', uri: 'http://localhost:3000', type: 'devServer' as const },
+	{ label: 'Screenshot', uri: 'file:///tmp/screenshot.png', type: 'screenshot' as const },
+	{ label: 'Plan', uri: 'file:///tmp/plan.md', type: 'plan' as const },
+];
+
+function createMockEditingSession(files: { uri: string; added: number; removed: number }[]): IChatEditingSession {
+	const entries = files.map(f => {
+		const entry = new class extends mock<IModifiedFileEntry>() {
+			override readonly entryId = f.uri;
+			override readonly modifiedURI = URI.parse(f.uri);
+			override readonly originalURI = URI.parse(f.uri);
+			override readonly state = observableValue('state', ModifiedFileEntryState.Modified);
+			override readonly linesAdded = observableValue('linesAdded', f.added);
+			override readonly linesRemoved = observableValue('linesRemoved', f.removed);
+			override readonly lastModifyingRequestId = 'request-1';
+			override readonly changesCount = observableValue('changesCount', 1);
+			override readonly isCurrentlyBeingModifiedBy = observableValue('isCurrentlyBeingModifiedBy', undefined);
+			override readonly lastModifyingResponse = observableValue('lastModifyingResponse', undefined);
+			override readonly rewriteRatio = observableValue('rewriteRatio', 0);
+			override readonly waitsForLastEdits = observableValue('waitsForLastEdits', false);
+			override readonly reviewMode = observableValue('reviewMode', false);
+			override readonly autoAcceptController = observableValue('autoAcceptController', undefined);
+		}();
+		return entry;
+	});
+
+	return new class extends mock<IChatEditingSession>() {
+		override readonly isGlobalEditingSession = false;
+		override readonly chatSessionResource = URI.parse('chat-session:test-session');
+		override readonly onDidDispose = Event.None;
+		override readonly state = observableValue('state', ChatEditingSessionState.Idle);
+		override readonly entries = observableValue('entries', entries);
+		override readonly requestDisablement = observableValue<IChatRequestDisablement[]>('requestDisablement', []);
+	}();
+}
+
+const sampleTodos: IChatTodo[] = [
+	{ id: 1, title: 'Set up project structure', status: 'completed' },
+	{ id: 2, title: 'Implement auth service', status: 'in-progress' },
+	{ id: 3, title: 'Add unit tests', status: 'not-started' },
+];
+
+export default defineThemedFixtureGroup({ path: 'chat/input/' }, {
+	Default: defineComponentFixture({ render: context => renderChatInput(context) }),
+	WithArtifacts: defineComponentFixture({ render: context => renderChatInput(context, { artifacts: sampleArtifacts }) }),
+	WithFileChanges: defineComponentFixture({
+		render: context => renderChatInput(context, { editingSession: createMockEditingSession([{ uri: 'file:///workspace/src/fibon.ts', added: 21, removed: 1 }]) })
+	}),
+	WithTodos: defineComponentFixture({
+		render: context => renderChatInput(context, { todos: sampleTodos })
+	}),
+	WithTodosAndFileChanges: defineComponentFixture({
+		render: context => renderChatInput(context, { todos: sampleTodos, editingSession: createMockEditingSession([{ uri: 'file:///workspace/src/fibon.ts', added: 21, removed: 1 }]) })
+	}),
+	WithArtifactsAndFileChanges: defineComponentFixture({
+		render: context => renderChatInput(context, { artifacts: sampleArtifacts, editingSession: createMockEditingSession([{ uri: 'file:///workspace/src/fibon.ts', added: 21, removed: 1 }]) })
+	}),
+	Full: defineComponentFixture({
+		render: context => renderChatInput(context, {
+			artifacts: sampleArtifacts,
+			editingSession: createMockEditingSession([{ uri: 'file:///workspace/src/fibon.ts', added: 21, removed: 1 }]),
+			todos: sampleTodos,
+		})
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/chatTerminalCollapsible.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/chatTerminalCollapsible.fixture.ts
new file mode 100644
index 00000000000..d4a8c16439d
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/chatTerminalCollapsible.fixture.ts
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../base/browser/dom.js';
+import { Event } from '../../../../base/common/event.js';
+import { observableValue } from '../../../../base/common/observable.js';
+import { mock, upcastPartial } from '../../../../base/test/common/mock.js';
+import type { IChatContentPartRenderContext, InlineTextModelCollection } from '../../../contrib/chat/browser/widget/chatContentParts/chatContentParts.js';
+import type { IChatResponseViewModel } from '../../../contrib/chat/common/model/chatViewModel.js';
+import { ChatTerminalThinkingCollapsibleWrapper } from '../../../contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.js';
+import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup } from './fixtureUtils.js';
+
+import '../../../contrib/chat/browser/widget/media/chat.css';
+
+function createMockContext(): IChatContentPartRenderContext {
+	return {
+		element: new class extends mock<IChatResponseViewModel>() { }(),
+		elementIndex: 0,
+		container: document.createElement('div'),
+		content: [],
+		contentIndex: 0,
+		editorPool: undefined!,
+		codeBlockStartIndex: 0,
+		treeStartIndex: 0,
+		diffEditorPool: undefined!,
+		codeBlockModelCollection: undefined!,
+		currentWidth: observableValue('currentWidth', 400),
+		onDidChangeVisibility: Event.None,
+		inlineTextModels: upcastPartial<InlineTextModelCollection>({}),
+	};
+}
+
+function renderCollapsible(context: ComponentFixtureContext, commandText: string, isSandboxWrapped: boolean, isComplete: boolean): void {
+	const { container, disposableStore } = context;
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: context.theme,
+	});
+
+	container.style.width = '500px';
+	container.style.padding = '8px';
+	container.classList.add('monaco-workbench');
+
+	const session = dom.$('.interactive-session');
+	container.appendChild(session);
+
+	const contentElement = dom.$('.chat-terminal-output-placeholder');
+	contentElement.textContent = '(terminal output would appear here)';
+	contentElement.style.padding = '8px';
+	contentElement.style.color = 'var(--vscode-descriptionForeground)';
+
+	const wrapper = disposableStore.add(instantiationService.createInstance(
+		ChatTerminalThinkingCollapsibleWrapper,
+		commandText,
+		isSandboxWrapped,
+		contentElement,
+		createMockContext(),
+		false,
+		isComplete,
+	));
+
+	session.appendChild(wrapper.domNode);
+}
+
+export default defineThemedFixtureGroup({ path: 'chat/terminalCollapsible/' }, {
+	'Ran - simple command': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'ls -lh', false, true),
+	}),
+	'Running - simple command': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'ls -lh', false, false),
+	}),
+	'Ran sandbox - simple command': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'ls -lh', true, true),
+	}),
+	'Running sandbox - simple command': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'ls -lh', true, false),
+	}),
+	'Ran - special chars': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'grep -rn "hello" ./src --include="*.ts"', false, true),
+	}),
+	'Ran sandbox - special chars': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'grep -rn "hello" ./src --include="*.ts"', true, true),
+	}),
+	'Ran - backticks': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'echo `date` && echo `hostname`', false, true),
+	}),
+	'Ran sandbox - backticks': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'echo `date` && echo `hostname`', true, true),
+	}),
+	'Ran sandbox - powershell backticks': defineComponentFixture({
+		render: ctx => renderCollapsible(ctx, 'Get-Process | Where-Object {$_.Name -eq `"notepad`"}', true, true),
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/codeEditor.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/codeEditor.fixture.ts
index 03c64b694aa..5e155a37d5e 100644
--- a/src/vs/workbench/test/browser/componentFixtures/codeEditor.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/codeEditor.fixture.ts
@@ -70,7 +70,7 @@ function renderCodeEditor({ container, disposableStore, theme }: ComponentFixtur
 
 export default defineThemedFixtureGroup({ path: 'editor/' }, {
 	CodeEditor: defineComponentFixture({
-		labels: { kind: 'screenshot' },
+		labels: { kind: 'screenshot', blocksCi: true },
 		render: (context) => renderCodeEditor(context),
 	}),
 });
diff --git a/src/vs/workbench/test/browser/componentFixtures/fixtureUtils.ts b/src/vs/workbench/test/browser/componentFixtures/fixtureUtils.ts
index e5318aaeecf..2a7f7faf22f 100644
--- a/src/vs/workbench/test/browser/componentFixtures/fixtureUtils.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/fixtureUtils.ts
@@ -10,6 +10,7 @@ import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle
 import { URI } from '../../../../base/common/uri.js';
 // eslint-disable-next-line local/code-import-patterns
 import '../../../../../../build/vite/style.css';
+import '../../../browser/media/style.css';
 
 // Theme
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
@@ -244,10 +245,11 @@ function getThemeStyleSheet(theme: ColorThemeData): CSSStyleSheet {
 		return lightThemeStyleSheet;
 	}
 
+	const scopeSelector = '.' + theme.classNames[0];
 	const sheet = new CSSStyleSheet();
 	const css = generateColorThemeCSS(
 		theme,
-		':host',
+		scopeSelector,
 		themingRegistry.getThemingParticipants(),
 		mockEnvironmentService
 	);
@@ -261,20 +263,40 @@ function getThemeStyleSheet(theme: ColorThemeData): CSSStyleSheet {
 	return sheet;
 }
 
-/**
- * Applies theme styling to a shadow DOM container.
- * Adds theme class names and adopts shared stylesheets.
- */
-export function setupTheme(container: HTMLElement, theme: ColorThemeData): void {
-	container.classList.add(...theme.classNames);
+let globalStylesInstalled = false;
 
-	const shadowRoot = container.getRootNode() as ShadowRoot;
-	if (shadowRoot.adoptedStyleSheets !== undefined) {
-		shadowRoot.adoptedStyleSheets = [
-			getGlobalStyleSheet(),
-			getIconsStyleSheetCached(),
-			getThemeStyleSheet(theme),
-		];
+function installGlobalStyles(): void {
+	if (globalStylesInstalled) {
+		return;
+	}
+	globalStylesInstalled = true;
+	document.adoptedStyleSheets = [
+		...document.adoptedStyleSheets,
+		getGlobalStyleSheet(),
+		getIconsStyleSheetCached(),
+		getThemeStyleSheet(darkTheme),
+		getThemeStyleSheet(lightTheme),
+	];
+}
+
+export function setupTheme(container: HTMLElement, theme: ColorThemeData): void {
+	installGlobalStyles();
+	container.classList.add('monaco-workbench', getPlatformClass(), ...theme.classNames);
+}
+
+function getPlatformClass(): string {
+	const alwaysUseMac = true;
+	if (alwaysUseMac) {
+		return 'mac';
+	} else {
+		const ua = navigator.userAgent;
+		if (ua.includes('Macintosh')) {
+			return 'mac';
+		}
+		if (ua.includes('Linux')) {
+			return 'linux';
+		}
+		return 'windows';
 	}
 }
 
@@ -515,7 +537,7 @@ type ThemedFixtures = ReturnType<typeof defineFixtureVariants>;
  */
 export function defineComponentFixture(options: ComponentFixtureOptions): ThemedFixtures {
 	const createFixture = (theme: typeof darkTheme | typeof lightTheme) => defineFixture({
-		isolation: 'shadow-dom',
+		isolation: 'none',
 		displayMode: { type: 'component' },
 		properties: [],
 		background: theme === darkTheme ? 'dark' : 'light',
diff --git a/src/vs/workbench/test/browser/componentFixtures/imageCarousel.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/imageCarousel.fixture.ts
new file mode 100644
index 00000000000..613a14c5ae0
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/imageCarousel.fixture.ts
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Dimension } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { ImageCarouselEditor } from '../../../contrib/imageCarousel/browser/imageCarouselEditor.js';
+import { ImageCarouselEditorInput } from '../../../contrib/imageCarousel/browser/imageCarouselEditorInput.js';
+import { ICarouselImage, IImageCarouselCollection } from '../../../contrib/imageCarousel/browser/imageCarouselTypes.js';
+import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup } from './fixtureUtils.js';
+import '../../../contrib/imageCarousel/browser/media/imageCarousel.css';
+
+function createSolidPng(r: number, g: number, b: number, width: number = 64, height: number = 64): VSBuffer {
+	const canvas = mainWindow.document.createElement('canvas');
+	canvas.width = width;
+	canvas.height = height;
+	const ctx = canvas.getContext('2d')!;
+	ctx.fillStyle = `rgb(${r}, ${g}, ${b})`;
+	ctx.fillRect(0, 0, width, height);
+
+	const dataUrl = canvas.toDataURL('image/png');
+	const base64 = dataUrl.split(',')[1];
+	return VSBuffer.wrap(Uint8Array.from(atob(base64), c => c.charCodeAt(0)));
+}
+
+function createTestImages(): ICarouselImage[] {
+	return [
+		{ id: 'img-1', name: 'Red', mimeType: 'image/png', data: createSolidPng(220, 50, 50), caption: 'A red image' },
+		{ id: 'img-2', name: 'Green', mimeType: 'image/png', data: createSolidPng(50, 180, 50), caption: 'A green image' },
+		{ id: 'img-3', name: 'Blue', mimeType: 'image/png', data: createSolidPng(50, 80, 220) },
+		{ id: 'img-4', name: 'Yellow', mimeType: 'image/png', data: createSolidPng(230, 210, 50), caption: 'A yellow image' },
+		{ id: 'img-5', name: 'Purple', mimeType: 'image/png', data: createSolidPng(150, 50, 200) },
+	];
+}
+
+function createMockEditorGroup(): IEditorGroup {
+	return new class extends mock<IEditorGroup>() {
+		override windowId = mainWindow.vscodeWindowId;
+	}();
+}
+
+async function renderCarousel(context: ComponentFixtureContext, collection: IImageCarouselCollection, startIndex: number = 0): Promise<void> {
+	const { container, disposableStore, theme } = context;
+
+	container.style.width = '600px';
+	container.style.height = '500px';
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: theme,
+	});
+
+	const editor = disposableStore.add(
+		instantiationService.createInstance(ImageCarouselEditor, createMockEditorGroup())
+	);
+	editor.create(container);
+	editor.layout(new Dimension(600, 500));
+
+	const input = new ImageCarouselEditorInput(collection, startIndex);
+	await editor.setInput(input, undefined, {}, CancellationToken.None);
+}
+
+function singleSectionCollection(): IImageCarouselCollection {
+	return {
+		id: 'fixture-single',
+		title: 'Test Carousel',
+		sections: [{ title: 'All Images', images: createTestImages() }],
+	};
+}
+
+function multiSectionCollection(): IImageCarouselCollection {
+	const images = createTestImages();
+	return {
+		id: 'fixture-multi',
+		title: 'Multi-Section Carousel',
+		sections: [
+			{ title: 'Warm Colors', images: [images[0], images[3]] },
+			{ title: 'Cool Colors', images: [images[2], images[4]] },
+			{ title: 'Nature', images: [images[1]] },
+		],
+	};
+}
+
+function singleImageCollection(): IImageCarouselCollection {
+	const images = createTestImages();
+	return {
+		id: 'fixture-single-image',
+		title: 'Single Image',
+		sections: [{ title: '', images: [images[0]] }],
+	};
+}
+
+export default defineThemedFixtureGroup({ path: 'imageCarousel/' }, {
+	SingleSection: defineComponentFixture({
+		render: ctx => renderCarousel(ctx, singleSectionCollection()),
+	}),
+	SingleSectionMiddleImage: defineComponentFixture({
+		render: ctx => renderCarousel(ctx, singleSectionCollection(), 2),
+	}),
+	MultipleSections: defineComponentFixture({
+		render: ctx => renderCarousel(ctx, multiSectionCollection()),
+	}),
+	SingleImage: defineComponentFixture({
+		render: ctx => renderCarousel(ctx, singleImageCollection()),
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/inlineCompletionsExtras.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/inlineCompletionsExtras.fixture.ts
index e9298fcf4d1..e06984438ec 100644
--- a/src/vs/workbench/test/browser/componentFixtures/inlineCompletionsExtras.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/inlineCompletionsExtras.fixture.ts
@@ -19,6 +19,8 @@ import { InlineCompletionsSource, InlineCompletionsState } from '../../../../edi
 import { InlineEditItem } from '../../../../editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.js';
 import { TextModelValueReference } from '../../../../editor/contrib/inlineCompletions/browser/model/textModelValueReference.js';
 import { JumpToView } from '../../../../editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.js';
+import { GutterIndicatorMenuContent } from '../../../../editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js';
+import { InlineSuggestionGutterMenuData } from '../../../../editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.js';
 import { IUserInteractionService, MockUserInteractionService } from '../../../../platform/userInteraction/browser/userInteractionService.js';
 
 import '../../../../editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.css';
@@ -276,6 +278,58 @@ function createLongDistanceEditor(options: {
 	controller?.model?.get();
 }
 
+function renderGutterMenu({ container, disposableStore, theme }: ComponentFixtureContext): void {
+	container.style.width = '250px';
+	container.style.height = '280px';
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: theme,
+		additionalServices: (reg) => {
+			registerWorkbenchServices(reg);
+		},
+	});
+
+	const textModel = disposableStore.add(createTextModel(
+		instantiationService,
+		'const x = 1;',
+		URI.parse('inmemory://gutter-menu.ts'),
+		'typescript'
+	));
+
+	const editor = disposableStore.add(instantiationService.createInstance(
+		CodeEditorWidget,
+		document.createElement('div'),
+		{ minimap: { enabled: false } },
+		{ contributions: [] } satisfies ICodeEditorWidgetOptions
+	));
+	editor.setModel(textModel);
+
+	const editorObs = observableCodeEditor(editor);
+	const menuData = new InlineSuggestionGutterMenuData(
+		undefined,
+		'Copilot',
+		[],
+		undefined,
+		undefined,
+		undefined,
+	);
+
+	const content = disposableStore.add(
+		instantiationService.createInstance(
+			GutterIndicatorMenuContent,
+			editorObs,
+			menuData,
+			() => { },
+		).toDisposableLiveElement()
+	);
+
+	container.style.background = 'var(--vscode-editorHoverWidget-background)';
+	container.style.border = '2px solid var(--vscode-editorHoverWidget-border)';
+	container.style.borderRadius = '3px';
+	container.style.color = 'var(--vscode-editorHoverWidget-foreground)';
+	container.appendChild(content.element);
+}
+
 export default defineThemedFixtureGroup({ path: 'editor/' }, {
 	HintsToolbar: defineComponentFixture({
 		labels: { kind: 'screenshot' },
@@ -307,4 +361,8 @@ export default defineThemedFixtureGroup({ path: 'editor/' }, {
 	await writeFile(outputPath, processed);`,
 		}),
 	}),
+	GutterMenu: defineComponentFixture({
+		labels: { kind: 'screenshot' },
+		render: renderGutterMenu,
+	}),
 });
diff --git a/src/vs/workbench/test/browser/componentFixtures/peekReference.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/peekReference.fixture.ts
new file mode 100644
index 00000000000..a9b2b7f5230
--- /dev/null
+++ b/src/vs/workbench/test/browser/componentFixtures/peekReference.fixture.ts
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../base/common/uri.js';
+import { mock } from '../../../../base/test/common/mock.js';
+import { ComponentFixtureContext, createEditorServices, createTextModel, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from './fixtureUtils.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { LayoutData, ReferenceWidget } from '../../../../editor/contrib/gotoSymbol/browser/peek/referencesWidget.js';
+import { ReferencesModel } from '../../../../editor/contrib/gotoSymbol/browser/referencesModel.js';
+import * as peekView from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+
+import '../../../../editor/contrib/peekView/browser/media/peekViewWidget.css';
+import '../../../../editor/contrib/gotoSymbol/browser/peek/referencesWidget.css';
+import '../../../../base/browser/ui/codicons/codiconStyles.js';
+
+const SAMPLE_CODE = `import { readFile, writeFile } from 'fs';
+
+function processFile(path: string): Promise<string> {
+	return new Promise((resolve, reject) => {
+		readFile(path, 'utf8', (err, data) => {
+			if (err) {
+				reject(err);
+				return;
+			}
+			resolve(data.toUpperCase());
+		});
+	});
+}
+
+async function main() {
+	const result = await processFile('./input.txt');
+	await writeFile('./output.txt', result);
+	console.log('Done processing file');
+}
+
+main();
+`;
+
+function renderPeekReference({ container, disposableStore, theme }: ComponentFixtureContext): void {
+	container.style.width = '700px';
+	container.style.height = '400px';
+	container.style.border = '1px solid var(--vscode-editorWidget-border)';
+
+	const instantiationService = createEditorServices(disposableStore, {
+		colorTheme: theme,
+		additionalServices: (reg) => {
+			registerWorkbenchServices(reg);
+			reg.define(IListService, ListService);
+			reg.defineInstance(peekView.IPeekViewService, new class extends mock<peekView.IPeekViewService>() {
+				declare readonly _serviceBrand: undefined;
+				override addExclusiveWidget(_editor: ICodeEditor, _widget: peekView.PeekViewWidget) { }
+			});
+			reg.defineInstance(ITextModelService, new class extends mock<ITextModelService>() {
+				declare readonly _serviceBrand: undefined;
+				override async createModelReference(): Promise<never> {
+					throw new Error('Not implemented in fixture');
+				}
+				override canHandleResource() { return false; }
+				override registerTextModelContentProvider() { return { dispose: () => { } }; }
+			});
+		},
+	});
+
+	const uri = URI.parse('inmemory://peek-fixture.ts');
+	const textModel = disposableStore.add(createTextModel(
+		instantiationService,
+		SAMPLE_CODE,
+		uri,
+		'typescript'
+	));
+
+	const editorWidgetOptions: ICodeEditorWidgetOptions = {
+		contributions: []
+	};
+
+	const editor = disposableStore.add(instantiationService.createInstance(
+		CodeEditorWidget,
+		container,
+		{
+			automaticLayout: true,
+			minimap: { enabled: false },
+			lineNumbers: 'on',
+			scrollBeyondLastLine: false,
+			fontSize: 14,
+			cursorBlinking: 'solid',
+		},
+		editorWidgetOptions
+	));
+
+	editor.setModel(textModel);
+	editor.focus();
+
+	const layoutData: LayoutData = { ratio: 0.7, heightInLines: 10 };
+
+	const referenceWidget = instantiationService.createInstance(
+		ReferenceWidget,
+		editor,
+		true,
+		layoutData,
+	);
+	disposableStore.add(referenceWidget);
+
+	const range = { startLineNumber: 3, startColumn: 10, endLineNumber: 3, endColumn: 21 };
+	referenceWidget.setTitle('processFile');
+	referenceWidget.setMetaTitle('3 references');
+	referenceWidget.show(range);
+
+	const links = [
+		{ uri, range: { startLineNumber: 3, startColumn: 10, endLineNumber: 3, endColumn: 21 } },
+		{ uri, range: { startLineNumber: 16, startColumn: 26, endLineNumber: 16, endColumn: 37 } },
+		{ uri, range: { startLineNumber: 20, startColumn: 1, endLineNumber: 20, endColumn: 5 } },
+	];
+
+	const model = new ReferencesModel(links, 'processFile');
+	disposableStore.add(model);
+	referenceWidget.setModel(model);
+}
+
+export default defineThemedFixtureGroup({
+	PeekReferences: defineComponentFixture({
+		render: renderPeekReference,
+	}),
+});
diff --git a/src/vs/workbench/test/browser/componentFixtures/promptFilePickers.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/promptFilePickers.fixture.ts
index 6e87b84b4d0..306b921cac5 100644
--- a/src/vs/workbench/test/browser/componentFixtures/promptFilePickers.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/promptFilePickers.fixture.ts
@@ -119,6 +119,8 @@ async function renderPromptFilePickerFixture({ container, disposableStore, theme
 					return promptsState.extensionPromptFiles.filter(file => file.type === type);
 				case PromptsStorage.plugin:
 					return [];
+				default:
+					return [];
 			}
 		}
 
diff --git a/src/vs/workbench/test/browser/componentFixtures/suggestWidget.fixture.ts b/src/vs/workbench/test/browser/componentFixtures/suggestWidget.fixture.ts
index a5aada2ea26..8e04b43bc15 100644
--- a/src/vs/workbench/test/browser/componentFixtures/suggestWidget.fixture.ts
+++ b/src/vs/workbench/test/browser/componentFixtures/suggestWidget.fixture.ts
@@ -34,7 +34,7 @@ interface SuggestFixtureOptions extends ComponentFixtureContext {
 	editorOptions?: IEditorOptions;
 }
 
-async function renderSuggestWidget(options: SuggestFixtureOptions): Promise<void> {
+function renderSuggestWidget(options: SuggestFixtureOptions): void {
 	const { container, disposableStore, theme } = options;
 	container.style.width = options.width ?? '500px';
 	container.style.height = options.height ?? '300px';
diff --git a/src/vs/workbench/test/browser/quickAccess.test.ts b/src/vs/workbench/test/browser/quickAccess.test.ts
index d24e26899f7..33a66a37a86 100644
--- a/src/vs/workbench/test/browser/quickAccess.test.ts
+++ b/src/vs/workbench/test/browser/quickAccess.test.ts
@@ -6,12 +6,12 @@
 import assert from 'assert';
 import { Registry } from '../../../platform/registry/common/platform.js';
 import { IQuickAccessRegistry, Extensions, IQuickAccessProvider, QuickAccessRegistry } from '../../../platform/quickinput/common/quickAccess.js';
-import { IQuickPick, IQuickPickItem, IQuickInputService } from '../../../platform/quickinput/common/quickInput.js';
+import { IQuickPick, IQuickPickItem, IQuickInputService, IKeyMods, IQuickPickDidAcceptEvent } from '../../../platform/quickinput/common/quickInput.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { TestServiceAccessor, workbenchInstantiationService, createEditorPart } from './workbenchTestServices.js';
 import { DisposableStore, toDisposable, IDisposable } from '../../../base/common/lifecycle.js';
 import { timeout } from '../../../base/common/async.js';
-import { PickerQuickAccessProvider, FastAndSlowPicks } from '../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { PickerQuickAccessProvider, FastAndSlowPicks, IPickerQuickAccessItem } from '../../../platform/quickinput/browser/pickerQuickAccess.js';
 import { URI } from '../../../base/common/uri.js';
 import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
@@ -450,4 +450,135 @@ suite('QuickAccess', () => {
 		}
 		await part.activeGroup.closeAllEditors();
 	});
+
+	//#region attach dispatch tests
+
+	interface ITestAttachPickItem extends IPickerQuickAccessItem {
+		label: string;
+		accept?(keyMods: IKeyMods, event: IQuickPickDidAcceptEvent): void;
+		attach?(keyMods: IKeyMods, event: IQuickPickDidAcceptEvent): void;
+	}
+
+	let attachTestAcceptCalled = false;
+	let attachTestAttachCalled = false;
+	let attachTestAttachKeyMods: IKeyMods | undefined;
+
+	class AttachTestQuickPickProvider extends PickerQuickAccessProvider<ITestAttachPickItem> {
+		constructor() {
+			super('attach');
+		}
+
+		protected _getPicks(): ITestAttachPickItem[] {
+			return [{
+				label: 'Test Item',
+				accept: () => {
+					attachTestAcceptCalled = true;
+				},
+				attach: (keyMods) => {
+					attachTestAttachCalled = true;
+					attachTestAttachKeyMods = keyMods;
+				}
+			}];
+		}
+	}
+
+	class AttachTestNoAttachProvider extends PickerQuickAccessProvider<ITestAttachPickItem> {
+		constructor() {
+			super('noattach');
+		}
+
+		protected _getPicks(): ITestAttachPickItem[] {
+			return [{
+				label: 'No Attach Item',
+				accept: () => {
+					attachTestAcceptCalled = true;
+				}
+			}];
+		}
+	}
+
+	const attachProviderDescriptor = { ctor: AttachTestQuickPickProvider, prefix: 'attach', helpEntries: [] };
+	const noAttachProviderDescriptor = { ctor: AttachTestNoAttachProvider, prefix: 'noattach', helpEntries: [] };
+
+	function resetAttachState() {
+		attachTestAcceptCalled = false;
+		attachTestAttachCalled = false;
+		attachTestAttachKeyMods = undefined;
+	}
+
+	test('quick pick access - accept without modifier keys calls accept, not attach', async () => {
+		const registry = (Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess));
+		const restore = (registry as QuickAccessRegistry).clear();
+		const disposables = new DisposableStore();
+
+		disposables.add(registry.registerQuickAccessProvider(attachProviderDescriptor));
+		resetAttachState();
+
+		accessor.quickInputService.quickAccess.show('attach');
+		await accessor.quickInputService.accept();
+
+		assert.strictEqual(attachTestAcceptCalled, true);
+		assert.strictEqual(attachTestAttachCalled, false);
+
+		disposables.dispose();
+		restore();
+	});
+
+	test('quick pick access - accept with ctrlCmd calls attach instead of accept', async () => {
+		const registry = (Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess));
+		const restore = (registry as QuickAccessRegistry).clear();
+		const disposables = new DisposableStore();
+
+		disposables.add(registry.registerQuickAccessProvider(attachProviderDescriptor));
+		resetAttachState();
+
+		accessor.quickInputService.quickAccess.show('attach');
+		await accessor.quickInputService.accept({ ctrlCmd: true, alt: false, shift: false });
+
+		assert.strictEqual(attachTestAcceptCalled, false);
+		assert.strictEqual(attachTestAttachCalled, true);
+		assert.deepStrictEqual(attachTestAttachKeyMods, { ctrlCmd: true, alt: false, shift: false });
+
+		disposables.dispose();
+		restore();
+	});
+
+	test('quick pick access - accept with alt calls attach instead of accept', async () => {
+		const registry = (Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess));
+		const restore = (registry as QuickAccessRegistry).clear();
+		const disposables = new DisposableStore();
+
+		disposables.add(registry.registerQuickAccessProvider(attachProviderDescriptor));
+		resetAttachState();
+
+		accessor.quickInputService.quickAccess.show('attach');
+		await accessor.quickInputService.accept({ ctrlCmd: false, alt: true, shift: false });
+
+		assert.strictEqual(attachTestAcceptCalled, false);
+		assert.strictEqual(attachTestAttachCalled, true);
+		assert.deepStrictEqual(attachTestAttachKeyMods, { ctrlCmd: false, alt: true, shift: false });
+
+		disposables.dispose();
+		restore();
+	});
+
+	test('quick pick access - accept with modifier keys but no attach method calls accept', async () => {
+		const registry = (Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess));
+		const restore = (registry as QuickAccessRegistry).clear();
+		const disposables = new DisposableStore();
+
+		disposables.add(registry.registerQuickAccessProvider(noAttachProviderDescriptor));
+		resetAttachState();
+
+		accessor.quickInputService.quickAccess.show('noattach');
+		await accessor.quickInputService.accept({ ctrlCmd: true, alt: false, shift: false });
+
+		assert.strictEqual(attachTestAcceptCalled, true);
+		assert.strictEqual(attachTestAttachCalled, false);
+
+		disposables.dispose();
+		restore();
+	});
+
+	//#endregion
 });
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index 3a60b99ae91..f9e3a45bb4f 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -9,7 +9,7 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../base/common/map.js';
+import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
 import { Schemas } from '../../../base/common/network.js';
 import { observableValue } from '../../../base/common/observable.js';
 import { join } from '../../../base/common/path.js';
@@ -380,7 +380,8 @@ export class TestWorkspaceTrustManagementService extends Disposable implements I
 
 
 	constructor(
-		private trusted: boolean = true
+		private trusted: boolean = true,
+		private trustedUris: ResourceSet = new ResourceSet()
 	) {
 		super();
 	}
@@ -406,11 +407,11 @@ export class TestWorkspaceTrustManagementService extends Disposable implements I
 	}
 
 	getUriTrustInfo(uri: URI): Promise<IWorkspaceTrustUriInfo> {
-		throw new Error('Method not implemented.');
+		return Promise.resolve({ trusted: this.trustedUris.has(uri), uri });
 	}
 
 	async setTrustedUris(folders: URI[]): Promise<void> {
-		throw new Error('Method not implemented.');
+		this.trustedUris = new ResourceSet(folders);
 	}
 
 	async setUrisTrust(uris: URI[], trusted: boolean): Promise<void> {
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index be64fd940aa..1d89cb13a56 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -212,6 +212,7 @@ import './contrib/inlineChat/browser/inlineChat.contribution.js';
 import './contrib/mcp/browser/mcp.contribution.js';
 import './contrib/chat/browser/chatSessions/chatSessions.contribution.js';
 import './contrib/chat/browser/contextContrib/chatContext.contribution.js';
+import './contrib/imageCarousel/browser/imageCarousel.contribution.js';
 
 // Interactive
 import './contrib/interactive/browser/interactive.contribution.js';
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 68821267b86..5a5c36698c1 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -91,6 +91,7 @@ import '../platform/userDataProfile/electron-browser/userDataProfileStorageServi
 import './services/auxiliaryWindow/electron-browser/auxiliaryWindowService.js';
 import '../platform/extensionManagement/electron-browser/extensionsProfileScannerService.js';
 import '../platform/webContentExtractor/electron-browser/webContentExtractorService.js';
+import '../platform/agentHost/electron-browser/agentHostService.js';
 import './services/browserView/electron-browser/playwrightWorkbenchService.js';
 import './services/process/electron-browser/processService.js';
 import './services/power/electron-browser/powerService.js';
@@ -191,6 +192,9 @@ import './contrib/mcp/electron-browser/mcp.contribution.js';
 // Policy Export
 import './contrib/policyExport/electron-browser/policyExport.contribution.js';
 
+// Keybindings Export
+import './contrib/keybindingsExport/electron-browser/keybindingsExport.contribution.js';
+
 //#endregion
 
 
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index aee7366ed53..939822a241a 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -174,4 +174,7 @@ import './contrib/remote/browser/remoteStartEntry.contribution.js';
 // Process Explorer
 import './contrib/processExplorer/browser/processExplorer.web.contribution.js';
 
+// Browser View
+import './contrib/browserView/browser/browserView.contribution.js';
+
 //#endregion
diff --git a/src/vscode-dts/vscode.proposed.authIssuers.d.ts b/src/vscode-dts/vscode.proposed.authIssuers.d.ts
index 44962260113..70b3094f7e2 100644
--- a/src/vscode-dts/vscode.proposed.authIssuers.d.ts
+++ b/src/vscode-dts/vscode.proposed.authIssuers.d.ts
@@ -15,7 +15,7 @@ declare module 'vscode' {
 	export interface AuthenticationProviderSessionOptions {
 		/**
 		 * When specified, the authentication provider will use the provided authorization server URL to
-		 * authenticate the user. This is only used when a provider has `supportsAuthorizationServers` set
+		 * authenticate the user. This is only used when a provider has `supportedAuthorizationServers` set
 		 */
 		authorizationServer?: Uri;
 	}
@@ -23,7 +23,7 @@ declare module 'vscode' {
 	export interface AuthenticationGetSessionOptions {
 		/**
 		 * When specified, the authentication provider will use the provided authorization server URL to
-		 * authenticate the user. This is only used when a provider has `supportsAuthorizationServers` set
+		 * authenticate the user. This is only used when a provider has `supportedAuthorizationServers` set
 		 */
 		authorizationServer?: Uri;
 	}
diff --git a/src/vscode-dts/vscode.proposed.browser.d.ts b/src/vscode-dts/vscode.proposed.browser.d.ts
new file mode 100644
index 00000000000..a15d432b3b7
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.browser.d.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// @kycutler https://github.com/microsoft/vscode/issues/300319
+
+	/**
+	 * An integrated browser page displayed in an editor tab.
+	 */
+	export interface BrowserTab {
+		/** The current URL of the page. */
+		readonly url: string;
+
+		/** The current page title. */
+		readonly title: string;
+
+		/** The page icon (favicon or a default globe icon). */
+		readonly icon: IconPath;
+
+		/** Create a new CDP session that exposes this browser tab. */
+		startCDPSession(): Thenable<BrowserCDPSession>;
+
+		/** Close this browser tab. */
+		close(): Thenable<void>;
+	}
+
+	/**
+	 * A CDP (Chrome DevTools Protocol) session that provides a bidirectional message channel.
+	 *
+	 * Create a session via {@link BrowserTab.startCDPSession}.
+	 */
+	export interface BrowserCDPSession {
+		/** Fires when a CDP message is received from an attached target. */
+		readonly onDidReceiveMessage: Event<unknown>;
+
+		/** Fires when this session is closed. */
+		readonly onDidClose: Event<void>;
+
+		/** Send a CDP request message to an attached target. */
+		sendMessage(message: unknown): Thenable<void>;
+
+		/** Close this session and detach all targets. */
+		close(): Thenable<void>;
+	}
+
+	/** Options for {@link window.openBrowserTab}. */
+	export interface BrowserTabShowOptions {
+		/**
+		 * The view column to show the browser in. Defaults to {@link ViewColumn.Active}.
+		 * Use {@linkcode ViewColumn.Beside} to open next to the current editor.
+		 */
+		viewColumn?: ViewColumn;
+
+		/** When `true`, the browser tab will not take focus. */
+		preserveFocus?: boolean;
+
+		/** When `true`, the browser tab will open in the background. */
+		background?: boolean;
+	}
+
+	export namespace window {
+		/** The currently open browser tabs. */
+		export const browserTabs: readonly BrowserTab[];
+
+		/** Fires when a browser tab is opened. */
+		export const onDidOpenBrowserTab: Event<BrowserTab>;
+
+		/** Fires when a browser tab is closed. */
+		export const onDidCloseBrowserTab: Event<BrowserTab>;
+
+		/** The currently active browser tab. */
+		export const activeBrowserTab: BrowserTab | undefined;
+
+		/** Fires when {@link activeBrowserTab} changes. */
+		export const onDidChangeActiveBrowserTab: Event<BrowserTab | undefined>;
+
+		/** Fires when a browser tab's state (url, title, or icon) changes. */
+		export const onDidChangeBrowserTabState: Event<BrowserTab>;
+
+		/**
+		 * Open a browser tab at the given URL.
+		 *
+		 * @param url The URL to navigate to.
+		 * @param options Controls where and how the browser tab is shown.
+		 * @returns The {@link BrowserTab} representing the opened page.
+		 */
+		export function openBrowserTab(url: string, options?: BrowserTabShowOptions): Thenable<BrowserTab>;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.chatDebug.d.ts b/src/vscode-dts/vscode.proposed.chatDebug.d.ts
index ed91aa806a1..06729600819 100644
--- a/src/vscode-dts/vscode.proposed.chatDebug.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatDebug.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 3
+// version: 4
 
 declare module 'vscode' {
 	/**
@@ -595,13 +595,77 @@ declare module 'vscode' {
 		constructor(requestName: string);
 	}
 
+	/**
+	 * Structured hook execution content for a resolved chat debug event,
+	 * containing the hook type, command, input, output, and result for rich rendering.
+	 */
+	export class ChatDebugEventHookContent {
+		/**
+		 * The type of hook that was executed (e.g., "PreToolUse", "PostToolUse", "Stop").
+		 */
+		hookType: string;
+
+		/**
+		 * The shell command that was executed.
+		 */
+		command?: string;
+
+		/**
+		 * The outcome of the hook execution.
+		 */
+		result?: ChatDebugHookResult;
+
+		/**
+		 * How long the hook took to complete, in milliseconds.
+		 */
+		durationInMillis?: number;
+
+		/**
+		 * The serialized JSON input passed to the hook via stdin.
+		 */
+		input?: string;
+
+		/**
+		 * The serialized output (stdout/stderr) returned by the hook.
+		 */
+		output?: string;
+
+		/**
+		 * An error message, if the hook failed.
+		 */
+		errorMessage?: string;
+
+		/**
+		 * The raw exit code from the hook process, if it failed.
+		 */
+		exitCode?: number;
+
+		/**
+		 * Create a new ChatDebugEventHookContent.
+		 * @param hookType The type of hook that was executed.
+		 */
+		constructor(hookType: string);
+	}
+
+	/**
+	 * The result of a hook execution.
+	 */
+	export enum ChatDebugHookResult {
+		/** The hook executed successfully (exit code 0). */
+		Success = 0,
+		/** The hook returned a blocking error (exit code 2). */
+		Error = 1,
+		/** The hook returned a non-blocking warning (other non-zero exit codes). */
+		NonBlockingError = 2
+	}
+
 	/**
 	 * Union of all resolved event content types.
 	 * Extensions may also return {@link ChatDebugUserMessageEvent} or
 	 * {@link ChatDebugAgentResponseEvent} from resolve, which will be
 	 * automatically converted to structured message content.
 	 */
-	export type ChatDebugResolvedEventContent = ChatDebugEventTextContent | ChatDebugEventMessageContent | ChatDebugEventToolCallContent | ChatDebugEventModelTurnContent | ChatDebugUserMessageEvent | ChatDebugAgentResponseEvent;
+	export type ChatDebugResolvedEventContent = ChatDebugEventTextContent | ChatDebugEventMessageContent | ChatDebugEventToolCallContent | ChatDebugEventModelTurnContent | ChatDebugEventHookContent | ChatDebugUserMessageEvent | ChatDebugAgentResponseEvent;
 
 	/**
 	 * Union of all chat debug event types. Each type is a class,
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 839499ef55f..73335535096 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -188,10 +188,15 @@ declare module 'vscode' {
 		 */
 		readonly modelId?: string;
 
+		/**
+		 * The mode instructions that were active for this request, if any.
+		 */
+		readonly modeInstructions2?: ChatRequestModeInstructions;
+
 		/**
 		 * @hidden
 		 */
-		constructor(prompt: string, command: string | undefined, references: ChatPromptReference[], participant: string, toolReferences: ChatLanguageModelToolReference[], editedFileEvents: ChatRequestEditedFileEvent[] | undefined, id: string | undefined, modelId: string | undefined);
+		constructor(prompt: string, command: string | undefined, references: ChatPromptReference[], participant: string, toolReferences: ChatLanguageModelToolReference[], editedFileEvents: ChatRequestEditedFileEvent[] | undefined, id: string | undefined, modelId: string | undefined, modeInstructions2: ChatRequestModeInstructions | undefined);
 	}
 
 	export class ChatResponseTurn2 {
@@ -400,6 +405,13 @@ declare module 'vscode' {
 		 * will immediately follow up with a new request in the same conversation.
 		 */
 		readonly yieldRequested: boolean;
+
+		/**
+		 * The resource URI identifying the chat session this context belongs to.
+		 * Available when the context is provided for title generation, summarization,
+		 * or other session-scoped operations. Extracted from the session's history entries.
+		 */
+		readonly sessionResource?: Uri;
 	}
 
 	// #endregion
diff --git a/src/vscode-dts/vscode.proposed.chatProvider.d.ts b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
index b19b106205b..c20711a3305 100644
--- a/src/vscode-dts/vscode.proposed.chatProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
@@ -17,6 +17,15 @@ declare module 'vscode' {
 		 * `undefined` if the request was initiated by other functionality in the editor.
 		 */
 		readonly requestInitiator: string;
+
+		/**
+		 * Per-model configuration provided by the user. This contains values configured
+		 * in the user's language models configuration file, validated against the model's
+		 * {@linkcode LanguageModelChatInformation.configurationSchema configurationSchema}.
+		 */
+		readonly modelConfiguration?: {
+			readonly [key: string]: any;
+		};
 	}
 
 	/**
@@ -67,6 +76,14 @@ declare module 'vscode' {
 
 		readonly statusIcon?: ThemeIcon;
 
+		/**
+		 * An optional JSON schema describing the configuration options for this model.
+		 * When set, users can specify per-model configuration in their language models
+		 * configuration file. The configured values are merged into the request options
+		 * when sending chat requests to this model.
+		 */
+		readonly configurationSchema?: LanguageModelConfigurationSchema;
+
 		/**
 		 * When set, this model is only shown in the model picker for the specified chat session type.
 		 * Models with this property are excluded from the general model picker and only appear
@@ -98,6 +115,28 @@ declare module 'vscode' {
 
 	export type LanguageModelResponsePart2 = LanguageModelResponsePart | LanguageModelDataPart | LanguageModelThinkingPart;
 
+	/**
+	 * A [JSON Schema](https://json-schema.org) describing configuration options for a language model.
+	 * Each property in `properties` defines a configurable option using standard JSON Schema fields
+	 * plus additional display hints.
+	 */
+	export type LanguageModelConfigurationSchema = {
+		readonly properties?: {
+			readonly [key: string]: Record<string, any> & {
+				/**
+				 * Human-readable labels for enum values, shown instead of the raw values.
+				 * Must have the same length and order as `enum`.
+				 */
+				readonly enumItemLabels?: string[];
+				/**
+				 * The group this property belongs to. When set to `'navigation'`, the property
+				 * is shown as a primary action in the model picker.
+				 */
+				readonly group?: string;
+			};
+		};
+	};
+
 	export interface LanguageModelChatProvider<T extends LanguageModelChatInformation = LanguageModelChatInformation> {
 		provideLanguageModelChatInformation(options: PrepareLanguageModelChatModelOptions, token: CancellationToken): ProviderResult<T[]>;
 		provideLanguageModelChatResponse(model: T, messages: readonly LanguageModelChatRequestMessage[], options: ProvideLanguageModelChatResponseOptions, progress: Progress<LanguageModelResponsePart2>, token: CancellationToken): Thenable<void>;
@@ -115,4 +154,16 @@ declare module 'vscode' {
 			readonly [key: string]: any;
 		};
 	}
+
+	export interface ChatRequest {
+		/**
+		 * Per-model configuration provided by the user. Contains resolved values based on the model's
+		 * {@linkcode LanguageModelChatInformation.configurationSchema configurationSchema},
+		 * with user overrides applied on top of schema defaults.
+		 *
+		 * This is the same data that is sent as {@linkcode ProvideLanguageModelChatResponseOptions.configuration}
+		 * when the model is invoked via the language model API.
+		 */
+		readonly modelConfiguration?: { readonly [key: string]: any };
+	}
 }
diff --git a/src/vscode-dts/vscode.proposed.chatSessionCustomizations.d.ts b/src/vscode-dts/vscode.proposed.chatSessionCustomizations.d.ts
new file mode 100644
index 00000000000..11275ed107f
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.chatSessionCustomizations.d.ts
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Types used by the chatSessionsProvider proposal for chat customizations.
+
+declare module 'vscode' {
+
+	/**
+	 * Well-known customization type identifiers.
+	 *
+	 * Extensions may use these as the {@link ChatSessionCustomizationItemGroup.id id}
+	 * of a {@link ChatSessionCustomizationItemGroup} to place items into standard
+	 * sections in the management UI.
+	 *
+	 * TODO: How granular should we be? Consider removing the sub-instruction
+	 * types (ContextInstructions, OnDemandInstructions) and collapsing to a
+	 * single 'instructions' type.
+	 */
+	export enum ChatSessionCustomizationType {
+		Agents = 'agents',
+		Skills = 'skills',
+		AgentInstructions = 'agentInstructions',
+		ContextInstructions = 'contextInstructions',
+		OnDemandInstructions = 'onDemandInstructions',
+		Prompts = 'prompts',
+	}
+
+	/**
+	 * Where a customization item originates from.
+	 *
+	 * Controls default behaviour in the management UI (grouping, delete-ability).
+	 *
+	 * TODO: Should this be inferred by core itself depending on the URI
+	 * scheme/path rather than declared by the extension?
+	 */
+	export enum ChatSessionCustomizationStorageLocation {
+		/** From the current workspace (`.github/` folder, workspace root, etc.) */
+		Workspace = 1,
+		/** From user-level configuration (`~/.copilot/`, `~/.config/`, etc.) */
+		User = 2,
+		/** From an extension's contribution */
+		Extension = 3,
+		/** From an installed plugin */
+		Plugin = 4,
+		/** Built into the session provider itself */
+		BuiltIn = 5,
+	}
+
+	/**
+	 * A single customization item such as an agent, skill, instruction, or prompt.
+	 */
+	export interface ChatSessionCustomizationItem {
+		/**
+		 * Display label for the item.
+		 */
+		readonly label: string;
+
+		/**
+		 * Optional description shown as secondary text or tooltip.
+		 */
+		readonly description?: string;
+
+		/**
+		 * URI pointing to the underlying resource
+		 * (`.agent.md`, `.instructions.md`, `SKILL.md`, etc.).
+		 * Also serves as the unique identity for this item.
+		 */
+		readonly uri: Uri;
+
+		/**
+		 * Where this item comes from. The management UI uses this to
+		 * group items under "Workspace", "User", "Extensions", etc.
+		 */
+		readonly storageLocation: ChatSessionCustomizationStorageLocation;
+
+		/**
+		 * Optional icon for the item. Overrides the default icon derived
+		 * from the customization type.
+		 */
+		readonly icon?: ThemeIcon;
+	}
+
+	/**
+	 * A named group of customization items of a single type.
+	 *
+	 * Use a well-known {@link ChatSessionCustomizationType} as the
+	 * {@link id} to place items into a standard management UI section.
+	 */
+	export interface ChatSessionCustomizationItemGroup {
+		/**
+		 * Identifier for this group. Use a value from
+		 * {@link ChatSessionCustomizationType} to map to a built-in section,
+		 * or a custom string for extension-defined sections.
+		 */
+		readonly id: string;
+
+		/**
+		 * The items in this group.
+		 */
+		readonly items: ChatSessionCustomizationItem[];
+
+		/**
+		 * Commands shown in the toolbar / "New" dropdown for this group.
+		 *
+		 * @example A "New Agent" command that opens a scaffold wizard.
+		 */
+		readonly commands?: Command[];
+
+		/**
+		 * Commands shown in the context menu for individual items.
+		 * Each command receives the item's {@link ChatSessionCustomizationItem.uri uri}
+		 * as its first argument.
+		 *
+		 * @example A "Run Prompt" command, a "Disable Skill" command.
+		 */
+		readonly itemCommands?: Command[];
+	}
+
+	/**
+	 * Provides customization items for a chat session type.
+	 *
+	 * Registered via {@link chat.registerChatSessionCustomizationsProvider}.
+	 * The provider is called when the management UI needs to display
+	 * customizations, and re-called whenever
+	 * {@link onDidChangeCustomizations} fires.
+	 */
+	export interface ChatSessionCustomizationsProvider {
+		/**
+		 * Fired when customization items have changed and the UI should
+		 * re-fetch them.
+		 */
+		readonly onDidChangeCustomizations: Event<void>;
+
+		/**
+		 * Provide the current customization groups.
+		 *
+		 * @param token A cancellation token.
+		 * @returns An array of customization groups, or a thenable that resolves to one.
+		 */
+		provideCustomizations(token: CancellationToken): ProviderResult<ChatSessionCustomizationItemGroup[]>;
+
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts b/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
index b9b2846f493..8131b4c90ed 100644
--- a/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
@@ -57,6 +57,18 @@ declare module 'vscode' {
 		 * @returns A new controller instance that can be used to manage chat session items for the given chat session type.
 		 */
 		export function createChatSessionItemController(chatSessionType: string, refreshHandler: ChatSessionItemControllerRefreshHandler): ChatSessionItemController;
+
+		/**
+		 * Registers a {@link ChatSessionCustomizationsProvider customizations provider} for a chat session type.
+		 *
+		 * The provider supplies customization items (agents, skills, instructions, prompts)
+		 * that appear in the Customizations management UI for the given session type.
+		 *
+		 * @param chatSessionType The chat session type to provide customizations for.
+		 * @param provider The customizations provider.
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerChatSessionCustomizationsProvider(chatSessionType: string, provider: ChatSessionCustomizationsProvider): Disposable;
 	}
 
 	/**
@@ -99,6 +111,8 @@ declare module 'vscode' {
 			readonly prompt: string;
 			readonly command?: string;
 		};
+
+		readonly sessionOptions: ReadonlyArray<{ optionId: string; value: string | ChatSessionProviderOptionItem }>;
 	}
 
 	/**
@@ -106,6 +120,20 @@ declare module 'vscode' {
 	 */
 	export type ChatSessionItemControllerNewItemHandler = (context: ChatSessionItemControllerNewItemHandlerContext, token: CancellationToken) => Thenable<ChatSessionItem>;
 
+	/**
+	 * Extension callback invoked to fork an existing chat session item managed by a {@linkcode ChatSessionItemController}.
+	 *
+	 * The handler should create a new session on the provider's backend and
+	 * return the new {@link ChatSessionItem} representing the forked session.
+	 *
+	 * @param sessionResource The resource of the chat session being forked.
+	 * @param request The request turn that marks the fork point. The forked session includes all turns
+	 * upto this request turn and excludes this request turn itself. If undefined, fork the full session.
+	 * @param token A cancellation token.
+	 * @returns The forked session item.
+	 */
+	export type ChatSessionItemControllerForkHandler = (sessionResource: Uri, request: ChatRequestTurn2 | undefined, token: CancellationToken) => Thenable<ChatSessionItem> | ChatSessionItem;
+
 	/**
 	 * Manages chat sessions for a specific chat session type
 	 */
@@ -143,6 +171,14 @@ declare module 'vscode' {
 		 */
 		newChatSessionItemHandler?: ChatSessionItemControllerNewItemHandler;
 
+		/**
+		 * Invoked when an existing chat session is forked.
+		 *
+		 * When both this handler and {@linkcode ChatSession.forkHandler} are registered,
+		 * this handler takes precedence.
+		 */
+		forkHandler?: ChatSessionItemControllerForkHandler;
+
 		/**
 		 * Fired when an item's archived state changes.
 		 */
@@ -397,6 +433,22 @@ declare module 'vscode' {
 		// TODO: Revisit this to align with code.
 		// TODO: pass in options?
 		readonly requestHandler: ChatRequestHandler | undefined;
+
+		/**
+		 * Handles a request to fork the session.
+		 *
+		 * The handler should create a new session on the provider's backend and
+		 * return the new {@link ChatSessionItem} representing the forked session.
+		 *
+		 * @deprecated Use {@linkcode ChatSessionItemController.forkHandler} instead. This remains supported for backwards compatibility.
+		 *
+		 * @param sessionResource The resource of the chat session being forked.
+		 * @param request The request turn that marks the fork point. The forked session includes all turns
+		 * upto this request turn and excludes this request turn itself. If undefined, fork the full session.
+		 * @param token A cancellation token.
+		 * @returns The forked session item.
+		 */
+		readonly forkHandler?: ChatSessionItemControllerForkHandler;
 	}
 
 	/**
@@ -447,10 +499,13 @@ declare module 'vscode' {
 		 *
 		 * @param resource The URI of the chat session to resolve.
 		 * @param token A cancellation token that can be used to cancel the operation.
+		 * @param context Additional context for the chat session.
 		 *
 		 * @return The {@link ChatSession chat session} associated with the given URI.
 		 */
-		provideChatSessionContent(resource: Uri, token: CancellationToken): Thenable<ChatSession> | ChatSession;
+		provideChatSessionContent(resource: Uri, token: CancellationToken, context: {
+			readonly sessionOptions: ReadonlyArray<{ optionId: string; value: string | ChatSessionProviderOptionItem }>;
+		}): Thenable<ChatSession> | ChatSession;
 
 		/**
 		 * @param resource Identifier of the chat session being updated.
@@ -483,10 +538,11 @@ declare module 'vscode' {
 		 *
 		 * @param scheme The uri-scheme to register for. This must be unique.
 		 * @param provider The provider to register.
+		 * @param defaultChatParticipant The default {@link ChatParticipant chat participant} used in sessions provided by this provider.
 		 *
 		 * @returns A disposable that unregisters the provider when disposed.
 		 */
-		export function registerChatSessionContentProvider(scheme: string, provider: ChatSessionContentProvider, chatParticipant: ChatParticipant, capabilities?: ChatSessionCapabilities): Disposable;
+		export function registerChatSessionContentProvider(scheme: string, provider: ChatSessionContentProvider, defaultChatParticipant: ChatParticipant, capabilities?: ChatSessionCapabilities): Disposable;
 	}
 
 	export interface ChatContext {
diff --git a/src/vscode-dts/vscode.proposed.findFiles2.d.ts b/src/vscode-dts/vscode.proposed.findFiles2.d.ts
index 8e7c11874b4..af324e90719 100644
--- a/src/vscode-dts/vscode.proposed.findFiles2.d.ts
+++ b/src/vscode-dts/vscode.proposed.findFiles2.d.ts
@@ -71,6 +71,12 @@ declare module 'vscode' {
 		 * For more info, see the setting description for `search.followSymlinks`.
 		 */
 		followSymlinks?: boolean;
+
+		/**
+		 * Whether glob patterns should be matched case-insensitively.
+		 * Defaults to `false`.
+		 */
+		caseInsensitive?: boolean;
 	}
 
 	/**
diff --git a/src/vscode-dts/vscode.proposed.findTextInFiles2.d.ts b/src/vscode-dts/vscode.proposed.findTextInFiles2.d.ts
index c7c7c9507a5..4575ba17d0c 100644
--- a/src/vscode-dts/vscode.proposed.findTextInFiles2.d.ts
+++ b/src/vscode-dts/vscode.proposed.findTextInFiles2.d.ts
@@ -91,6 +91,12 @@ declare module 'vscode' {
 		 */
 		followSymlinks?: boolean;
 
+		/**
+		 * Whether glob patterns should be matched case-insensitively.
+		 * Defaults to `false`.
+		 */
+		caseInsensitive?: boolean;
+
 		/**
 		 * Interpret files using this encoding.
 		 * See the vscode setting `"files.encoding"`
diff --git a/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts b/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts
index 5fa6524edda..04a50dd823c 100644
--- a/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts
+++ b/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts
@@ -3,21 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 1
+
 declare module 'vscode' {
 
 	// https://github.com/microsoft/vscode/issues/288777 @DonJayamanne
 
+	/**
+	 * Represents a single MCP server exposed by the gateway via its own HTTP endpoint.
+	 */
+	export interface McpGatewayServer {
+		/**
+		 * The human-readable label of the MCP server.
+		 */
+		readonly label: string;
+
+		/**
+		 * The address of the HTTP MCP server endpoint.
+		 * External processes can connect to this URI to interact with this MCP server.
+		 */
+		readonly address: Uri;
+	}
+
 	/**
 	 * Represents an MCP gateway that exposes MCP servers via HTTP.
-	 * The gateway provides an HTTP endpoint that external processes can connect
-	 * to in order to interact with MCP servers known to the editor.
+	 * Each known MCP server gets its own HTTP endpoint. The gateway
+	 * dynamically tracks server additions and removals.
 	 */
 	export interface McpGateway extends Disposable {
 		/**
-		 * The address of the HTTP MCP server endpoint.
-		 * External processes can connect to this URI to interact with MCP servers.
+		 * The MCP servers currently exposed by the gateway.
+		 * Each server has its own HTTP endpoint address.
 		 */
-		readonly address: Uri;
+		readonly servers: readonly McpGatewayServer[];
+
+		/**
+		 * Event that fires when the set of gateway servers changes.
+		 * This can be due to MCP servers being added, removed, or restarted.
+		 */
+		readonly onDidChangeServers: Event<readonly McpGatewayServer[]>;
 	}
 
 	/**
@@ -42,14 +66,16 @@ declare module 'vscode' {
 		export const onDidChangeMcpServerDefinitions: Event<void>;
 
 		/**
-		 * Starts an MCP gateway that exposes MCP servers via an HTTP endpoint.
+		 * Starts an MCP gateway that exposes MCP servers via HTTP endpoints.
 		 *
-		 * The gateway creates a localhost HTTP server that external processes (such as
-		 * CLI-based agent loops) can connect to in order to interact with MCP servers
-		 * that the editor knows about.
+		 * The gateway creates a localhost HTTP server where each MCP server known
+		 * to the editor gets its own endpoint. External processes (such as CLI-based
+		 * agent loops) can connect to these endpoints to interact with individual
+		 * MCP servers.
 		 *
 		 * The HTTP server is shared among all gateways and is automatically torn down
-		 * when the last gateway is disposed.
+		 * when the last gateway is disposed. The gateway dynamically tracks server
+		 * additions and removals via {@link McpGateway.onDidChangeServers}.
 		 *
 		 * @returns A promise that resolves to an {@link McpGateway} if successful,
 		 * or `undefined` if no Node process is available (e.g., in serverless web environments).
diff --git a/src/vscode-dts/vscode.proposed.taskRunOptions.d.ts b/src/vscode-dts/vscode.proposed.taskRunOptions.d.ts
new file mode 100644
index 00000000000..4f874a3354f
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.taskRunOptions.d.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	/**
+	 * Controls when a task should be run.
+	 */
+	export enum TaskRunOn {
+		/**
+		 * The task is not run automatically.
+		 */
+		Default = 1,
+
+		/**
+		 * The task runs when a folder is opened.
+		 */
+		FolderOpen = 2,
+
+		/**
+		 * The task runs when an Agent Session worktree is created.
+		 */
+		WorktreeCreated = 3,
+	}
+
+	export interface RunOptions {
+		/**
+		 * Controls when a task is run automatically.
+		 */
+		runOn?: TaskRunOn;
+	}
+}
\ No newline at end of file
diff --git a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
index e4bc845c46a..c7c1a7b45c2 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 declare module 'vscode' {
-	// @anthonykim1 @tyriar https://github.com/microsoft/vscode/issues/227467
+	// @anthonykim1 https://github.com/microsoft/vscode/issues/227467
 
 	export interface TerminalShellIntegrationEnvironment {
 		/**
diff --git a/src/vscode-dts/vscode.proposed.toolInvocationApproveCombination.d.ts b/src/vscode-dts/vscode.proposed.toolInvocationApproveCombination.d.ts
new file mode 100644
index 00000000000..070cf51ef40
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.toolInvocationApproveCombination.d.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @alexr00 https://github.com/microsoft/vscode/issues/302393
+
+declare module 'vscode' {
+
+	export interface LanguageModelToolConfirmationMessages {
+		/**
+		 * When set, a button will be shown allowing the user to approve this particular
+		 * combination of tool and arguments. The value is shown as the label for the
+		 * approval option.
+		 *
+		 * For example, a tool that reads files could set this to `"Allow reading 'foo.txt'"`,
+		 * so that the user can approve that specific file without approving all invocations
+		 * of the tool.
+		 */
+		approveCombination?: string | MarkdownString;
+	}
+}
diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index ceeff39f6fb..cbc02be2a4a 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -474,10 +474,11 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Dark.png
index 6e97bb89568..a5e5f2c31d5 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb56239cc915c18dbdf70d98049cc8386350c6e394b988a2df86df95ef10b52c
-size 7064
+oid sha256:b7155f9553b5a2a73f3b6c688f9e9d28eba4672baea301954de9b625870a4903
+size 7147
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Light.png
index b8635ead60e..5156ddb6df1 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow1Line/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:163f0620ca91d6a7636ec58362e7dbc53a338fd26d2c9577ddb893c880bf86aa
-size 7053
+oid sha256:c45d756c3260556a43f3ef64c7b317c57c8a05ca346707fd8973530ef3a6c4e0
+size 7000
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Dark.png
index 654a095b444..28bc45bc01a 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5d405d46064d7ae8cf9917587c51db8b80528590d4c9718729460781aa25ff9
-size 8657
+oid sha256:dfb4ba128abed2fc39d2e831f49bcbb1627db497d99784c379213ef8bf556868
+size 8873
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Light.png
index 1350551e929..0dbd75ca331 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow2Lines/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02e137eff8bd38674c35f3d4ab472ff380bfa0c31e0f261e64a66822665c98a3
-size 8717
+oid sha256:b2296ea0896451f871ad0b26a1a467409925c14f2ec0691b67eb5dd4700d7504
+size 8566
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Dark.png
index 9aa34fcadd4..f1bf597ab55 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:029ca626c8b89d7efce7d86b401774373d473282fa29b45f2a0b6eff314090da
-size 8737
+oid sha256:8b5106a3cad9097615fb7605781c5d55f6fa2476dc3d11e95f7def05028b181c
+size 8757
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Light.png
index 11afd7ebade..745f60ffbcc 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3Lines/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98519a1e1420101c2efb7fedf417432aa9509b3614d0df4fd51e57b02f791a9c
-size 8684
+oid sha256:48b59d3cb5d0824f8ac11cdd501ce2312d9105d8ec647a046649dc5e076a0c75
+size 8528
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Dark.png
index 23cae64ce72..64057dc612b 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3619142a6234cafb5b20bae5007daf1af201bb58f8b0f1e7e404621a77d74123
-size 12355
+oid sha256:2ce24147c0d898af9c50e12a81471b028eac44642964b34e1e07a9cc206475a3
+size 12428
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Light.png
index fbe36047f39..15047bf50bf 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow3LongLines/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:717467794a22315bb378be412b331db00635d0171043deb50fa6e50a3caf9af3
-size 12363
+oid sha256:50ec39d48de2e7b5ae5403ee682af6967efbf1b3053b0df25a1ed24920bfcab2
+size 12116
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Dark.png
index 3f081322682..191c180c457 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a68b3828da8ddd4254a8ff14d740d07ed9463012a6646d466ad052f917080462
-size 9167
+oid sha256:f0198937bce59b0f46d45041fddcfda6d2ad5bd98a58aa94d1cc1bfa29051ef9
+size 9258
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Light.png
index e3e96fe51a8..d0e497d654f 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRow4Lines/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29a3581395521fe377cb76135f9df237ba8d6d241b5bcee4707a4c92e560e410
-size 9169
+oid sha256:e54e12979392e0a1818581203d3160c79c622888e987f1e8edda0593c9141fb9
+size 8991
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Dark.png
index c6025168a8c..9b05aa9866f 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:349e1054718733508b1e8ccab0c08039e13319458a1a4e730d98531c9f8065a3
-size 7889
+oid sha256:178269938c3395dba69e6d7fc495648b0f66485842c93969b940f70130da6c80
+size 7937
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Light.png
index c9bdeeb188d..4329f23b9ce 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowBash/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49dd6690cb406f928925ad0000624128efc5e60999a6472f5c14f5d34a048b8a
-size 7940
+oid sha256:5fa69fb1ac5c2d5568195ee032c59e051514560d8bcea7ab8637eb8cedc49f3b
+size 7715
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Dark.png
index 29f4c5e28a7..0d4f330ee7c 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfdc23fd51094966957b9487c71aa7dc69d9ace05bc9315adf6e8ae296de3d89
-size 7338
+oid sha256:29a3db08cf07dab1daabc6b5a9562e830aceece92a4dc9e396a6fc5d80cb54f2
+size 7381
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Light.png
index 7684550a5f6..0030227e180 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowJson/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0fc1e6917fd33d4c46dd70b74d787bc0c2bc2b2d6f38c1d1c8923ca84b11009
-size 7439
+oid sha256:15b588c73f00a3402e6581b32cad3c995ec8cb5b3b15f2dcc9430ec6d0cedd24
+size 7106
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Dark.png
index 40cf1fbcec9..e1a15a9d049 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6827c363512a28c506670d9bce96efe463bb2e7b16864c1d3ef78bdb27c5d8b9
-size 7915
+oid sha256:431d04f280a0d2d972b241e1b4e9aad49ade79c2a9010a9cdaa214bf04d1a344
+size 7971
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Light.png
index 035820555cc..40dae0d8e21 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowLongLabel/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d90a5b77afd766a79dc78ec15369ae6fd8d37791f3b365cd51293b86089a268
-size 8005
+oid sha256:fbe33f3f7006a2b54a9ec0982d6593e282f45a3a5a23f7611e518d4ef8eb4c0a
+size 7682
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Dark.png
index 843641053a1..85e36b633a1 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10b958efa32aa1dd506894c1663639bfd8252907b3640e4d2c6fb1893f0798dc
-size 7497
+oid sha256:5a869368e44352e48025091169edcf760b5a3e9758658752fffe21b00e1bc0dd
+size 7641
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Light.png
index 4f679b73ace..4672153cfef 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ApprovalRowPowerShell/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:083d37a41eb68a5f0841c4461d4ee9df3e5e093b7295d069877fce8933c30581
-size 7548
+oid sha256:3fad41c3140ba3017ef9d61b1e45794f9736788cb9879412e1b15f4322562bc3
+size 7377
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Dark.png
index 18b0f2f3393..99d17012794 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb0046c2d6bf62981df0f57af2f04bc21abff8f2c25bda0bce72577c8825234
-size 3955
+oid sha256:32f1037934a2628a1080e4b46a0ae6e32701d9d197cde35b173e494cbe86a08d
+size 3779
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Light.png
index 0518b7db987..62421de8a28 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/Archived/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6955c3424c2907b6b8472c60e5c5cee6ef104dd8482fd932e0c83ba611c3522b
-size 3883
+oid sha256:c9537093a98494c154e50782245bbce419bf5cc0c3527e304f12f8c4be0e71cc
+size 3566
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Dark.png
index 2e9a78f3e9c..8d883b9fc01 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:761643f249dddaaa1e7f307b3372463e252f67ed30cdd860052ca2b1b9534601
-size 4136
+oid sha256:0a230dd58732488dc7aa091c0b799c7b7a6134785a1dc4f874ec22b248c39388
+size 3951
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Light.png
index c4edc35a169..69c3e705804 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ArchivedUnread/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed79c20b8c4adb9c4253ebed499554e3d8e898b0b5f9d389c8ce865345b85ad6
-size 4059
+oid sha256:ca40bb99c6af4be97d88d36a7d3f089b6f4b5031047e807fde258c254b22e51d
+size 3831
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Dark.png
index 2f4f1029af5..5c54f5e0562 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:211c5915f952e93eede04b6ff57b552ccfd7a524ec17ded20819f531e07289de
-size 4323
+oid sha256:4ec9c318b01e50a9fe1c4bf062a1d883687f53828498019bf120004559761fbf
+size 4607
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Light.png
index b5a83bc3227..ae323fac953 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/BackgroundProvider/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76981d631106433e066dd7b6354337c3bbba1018587beb26ebd9d662f25093c0
-size 4440
+oid sha256:415881574ed5f256d335c35aa4ca99eb14d4d9f16852d44936d2bd2d6ecae966
+size 4146
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Dark.png
index 64427aeaa23..26cd16b27e4 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd6f5753251dfd4ebad48ac881d2a18baeeb6dac683d8c991b23676d80e79f7d
-size 4627
+oid sha256:dc60ffff830121bcebbca2f484ecba0757ca57489f232014351bc12a3e531331
+size 4671
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Light.png
index ff344e500fe..94678888209 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/ClaudeProvider/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46d1010d543349b526f2b6cdfc17177fdda11cc994a6522c6a827c883755e21b
-size 4720
+oid sha256:fc8875b454581c3e45add2aa004b3758088826658c88fee7733b1e35440775a1
+size 4234
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Dark.png
index 2ffb6d1dfa9..85f37cf7cd2 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a357eca1ff0edae842d2137e53c4648a8a24dda806056f7cbb047ea02bc05250
-size 4402
+oid sha256:0ec88636c30d6279b632039d867421e54f8c3245d7d7b9244b1cf3519c2e2c48
+size 4649
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Light.png
index c7f3c6cdfdb..2568fe5e3a6 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProvider/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4127bb1d38d3c49f0393afcf4d04415f328cccbe8473de7e0894b671f5c6ec51
-size 4475
+oid sha256:52540d6c240b195bcf79b9b162e90ef3c77647c9aa535392c6100c216f824329
+size 4187
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Dark.png
index 94ecc186613..764411c8d68 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11e38388dbe35d160b60aa8d8b1b45b2a71c9604caed3b610b318f4fc5beb5c0
-size 3746
+oid sha256:8158b9d796710de28f6427cfe7ddc944154f52d565a0b1102732a4f46c75faa0
+size 3807
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Light.png
index 6c780125a43..ecf28e6ae58 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CloudProviderInProgress/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:768a1bfc002b37facc1d7e7c4a096148134b2f037f6739611b0ebdac8694515e
-size 3741
+oid sha256:5fe4c3e49a571ad08a17725afae750b7c065168c03a3ac6cd078ccfedb097838
+size 3500
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Dark.png
index 9379588d303..20e498166d5 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ef5c71cd24e7527c325436f778498f4ce843c4118fb6df9132d152d195b77b5
-size 4131
+oid sha256:8cf33e304c8b36ccb6c26b0d287fb15b2be47205a05a510393d52a9ce616af43
+size 4249
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Light.png
index cc372129852..b5e52517c31 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedRead/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:461481ef366395b7a3283de9dbac92581b182420f6439d15af3c5ad1b95f315f
-size 4236
+oid sha256:58a4540fcfd24a31f589feb40e102f3469b6fada043fd8e3fc774bf924cdb5bb
+size 3869
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Dark.png
index e7b1e95cc9b..d53e5e56755 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29611b9811d052d0c311abf299aaf4009eb4cf9adc39b50a362f23dbb30e3012
-size 4281
+oid sha256:66033618caf00d282c615c6f8a3f17b7df7d21d3ad9a1dddb43ef500f6580fec
+size 4430
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Light.png
index 53e514e305b..142e3aae679 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/CompletedUnread/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cafcc1fb16a92c55106474771945cc7063152922633db3d3acc8f455677e93a2
-size 4303
+oid sha256:18bc4073dae0b8cff55751aebb25c96eaab45c4d7d67f86f67d2cf4073190e04
+size 4094
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Dark.png
index 0f129c39bf1..2b894203c70 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f18d15f95ce04361389e3685c0d04d5b5846ee7ac97f192ad75605879e3ef711
-size 3952
+oid sha256:0f4897aea097bf3c15dfa6a204edf057f4f31477df9dd9f944d09a0db69e9d9a
+size 4349
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Light.png
index b2c232971db..a6371f6cf22 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithDuration/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:823534baac31274e97febf864f4c70430672f573a35abe360c406f0ef8394563
-size 3984
+oid sha256:cc6730a4307dcc431da8121a7c29ca541050c4eb699c79c88a749765594adb8d
+size 3952
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Dark.png
index 60ae250bdb3..9bb2506cb64 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99a4986f49d637f978fdef48c75c7307b1d2fe60c0a301682481a2d9271fe9c0
-size 3473
+oid sha256:245c47554af6bf0bd7693437926e7e842eaded1278da97a99e16e597f9bdfdf1
+size 3640
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Light.png
index 77c3257a44b..c30b0777d4d 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/FailedWithoutDuration/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e0c6543a97ca59eeb9bced9530976e6697e31df4cc0e392dae5721cdef90a35
-size 3590
+oid sha256:13170bf59063ac0341790b635ba177d7ce9437ba98d3b55395da00755d804431
+size 3358
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Dark.png
index cf64cff29d7..7ddf0f6d258 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39e4ce2cd4020f790d3a2f54ab29da693ce34b35a82a4ef9ebbc7e685b6c5f29
-size 3942
+oid sha256:8f8df8fa86d9c7fa1bb42af13743cdc6821d4035bb81e3a902eb2c00db8a6f6d
+size 3756
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Light.png
index 4e2ed61233f..df11ab1bbf6 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgress/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c0310d172ee83a1f0260a7731e321a8e193dbb4c58afa0115bf3e2246b623db
-size 3997
+oid sha256:28b20f0e2b9bb4d0eb0745bf3705b10de5d046a931577693589281b8c7f13833
+size 3412
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Dark.png
index 75e19d71278..31d466d3f32 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9a68bfda118629ddd5095f2fdd202c5baaccbc6b92d1d9584ef5053113af328
-size 4693
+oid sha256:ba81ad8340da42129ad9b3c71bd2965477367d0b9d2f61df7f417d727704958e
+size 4999
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Light.png
index bc5cbfc0de7..f3bc8cf4a55 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/InProgressWithDescription/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:616343f0b523bd7a88c02349345baedebbccb3251b34030903e5afe54c14ee0d
-size 4793
+oid sha256:80dd6f30b8b9ae1b434bfa7939e7cbd2fd92c28f3c9b91b3e4f4673dd97f8306
+size 4554
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Dark.png
index 50cbb3efca4..27c882816fe 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea3e3728408c21a161655ad68304442ea348f4c95b613e5abc5be491073d5a11
-size 3767
+oid sha256:2b75c5544a73bc8df9bef473a3030d2528b240e5276ad8fb32c8ef83c747f82d
+size 4166
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Light.png
index 82d68f0fd0d..8cacceeb4fe 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/NeedsInput/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78eb1956b1a37699a678f73d79cb6c1d7b4deda79e857c03017910054fdbae90
-size 3815
+oid sha256:4d3072457cd7ed569a80ba450d823edab281f4496c4167c9e36232f9bfb8daff
+size 3856
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Dark.png
index 60acf6fe15b..65a4274bee0 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67e30acb57253a7a9c02e93e8120019eb1afc9932a99c59a241968ae75ee3752
-size 896
+oid sha256:876f8152573adcbc44b60900c08d4cae718ca1c3c99f11aae7b0c01a6634f3a6
+size 865
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Light.png
index 44015ee3881..63acc3bc308 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionArchived/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d6a95e55db9415c49043745f6eb5682e20137d0d487edb6323ef101c2e46016
-size 870
+oid sha256:4583e8349f5864c44a89eb0caad9f1efa52a9277c266e8e8c7f5f1e11d1028e9
+size 840
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Dark.png
index 130f5f1c40a..6795aadfaf5 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:379ebb29923b4874351469a1a60a7e4bc76397c85e61741dc86361dd123f68d0
-size 1032
+oid sha256:ad5889a65e602d67b932662f001e31a82853d074754bcc9db3587d0a3aae46a5
+size 1061
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Light.png
index cc2acbb5916..ab7ccf0b34e 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionLastWeek/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:109ad01629c5fb42759102c4a9fdf3b9e4f69452d06d6b2f6b478be418261e01
-size 1013
+oid sha256:0c841749dad41b2c33857ac796b6a10ba9b9176e1f851666beb714a2cfc7f464
+size 990
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Dark.png
index da3fbefb55c..fab3cb475f2 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d1c9f3fba50deacb99898e7e403239716b918e4901258b155f3c87558938219
-size 634
+oid sha256:4896fbbce4d6a2f65b3decde8092b6137b3bdb2b8e4b2250d5c802668d9f0c93
+size 619
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Light.png
index 1fd51cdd988..f50f76ae585 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionMore/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9083bcd9e6dd0fddf1b86389abbf2c8be5db4c84a80870acee1ebb6209b3734c
-size 610
+oid sha256:07cdda58e1e786f4812b6ef572c288615909f77757190ce996f4a88f9f3a4f07
+size 605
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Dark.png
index 5a3f629e0d9..b617367429f 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fb24f8743a805c51eed4cb0822e6f031f1663ebf3860fa0f555fc9105d6aa47
-size 655
+oid sha256:fb59c25f4d1095ee959ce9603512838390abffbb09fcc4ea5d4f899629409b06
+size 662
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Light.png
index 9a01d0f11bd..6da888c5da1 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionOlder/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b33d4a2df45aadb2ddd03a4e78107993407390a0fcdcd551cc5e46cfe3bfd79
-size 629
+oid sha256:9de100ef9cb870c52565e7e6bdc8e33668c815d1ac6447a54091f1574fa414c1
+size 626
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Dark.png
index 7df9b9dc3e3..b28777175a0 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dba102faa5ab22be300c2f3b144ccb9fd7d191b7ce345934aac0cf2a22a4cf2
-size 700
+oid sha256:606e21dd29a336b824c9606f2139d1672ad8683f7b0a78e71cb847485af47f28
+size 711
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Light.png
index 97bfabf75bb..460b5f78684 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionToday/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0896ebcac18fc2c67051318eccf952a4af9cded093bb8ed22da0d4f369a90fd
-size 691
+oid sha256:d883e537873c84feda5ad8b2dd103cda295e7947669a893aa25e04a2f4627558
+size 676
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Dark.png
index 44f782bea73..533ae169541 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf4cc56f6e7472b91ee5291f7b7963c88c575152c01914af66b79d3f983072a1
-size 1034
+oid sha256:5e1a8c0f8f530a929fa0276fb710e023ed3d3a9bbe7badaec4853d11ed0f28e0
+size 1012
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Light.png
index fd7a76b1e55..a6d8cb0633e 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/SectionYesterday/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f11009c1529cb97619d437c5563764d6cf9deed1db7d7b539506a8500d58694d
-size 1011
+oid sha256:5d09751261d5ad4ec543b2fa3756e32ceed4ebe5b0a420005200df8deca41e66
+size 990
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Dark.png
index e8a6dcc8dde..62003cbb881 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5dfad96ea810926d39db4d8f689f66c717fd4a2b51de380010046e7610ec14a4
-size 4819
+oid sha256:0d0c710cf4ea293f1c12e431a86a7169795f065a25c66bbdb18ac2a1de694781
+size 4563
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Light.png
index 7605ff11511..820d3231991 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadge/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b6b40e3ab4d73221357a136dcac51eb0081c344a98930dd5e738662137af955
-size 4886
+oid sha256:b9bcf5596376755def0f736d3ce1a22977cea78099e1557bd8bca3158e657a46
+size 4216
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Dark.png
index 5e3bbe18e1e..aece8b7bbcd 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:768613c86e446829341642343180cd84a0376dfafae7399dc2a50cf3b0e21575
-size 3900
+oid sha256:5e0b8668f09de7976d171422ce13dd3abe403d493d19c77a497dd59f77cbd865
+size 4014
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Light.png
index 3b1b9440317..2a7d7aaccee 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithBadgeAndDiff/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d471d8eeb3bcf0a285a3b80a7dac70d5258c7fee903185377bddad1199562259
-size 4018
+oid sha256:01c1071638aa340fc5b6ae1d67494d7aff2497ec55303f80f03a6b377712db47
+size 3795
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Dark.png
index 842e5652928..35220dbe21c 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83b83d1b89bbee53b1e7f81990b30e8f2124b2099e0da948bcc0e807d2593f1e
-size 5389
+oid sha256:21b720d79db121c1a84de56e9da7799104079448df1f686bb22cf836ed81ef65
+size 5363
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Light.png
index a15244fa8b9..3a1ba03c765 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDescription/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39cd38f065604d4c1ea6564d0da9cd5436e7587547583783408c7e7df3812f80
-size 5507
+oid sha256:0e3e5e39880fc09156347722c64ee6aec236d88bb905343a3b025fdb4d386933
+size 4724
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Dark.png
index 760959402ec..ac2854cc50f 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0ea6dc5746ca3dba73ee8a96df90fd2c4f34625d58ac9d616134ba5d2ff5f87
-size 3473
+oid sha256:db11f8e8859a5c183f377c4c316a3741020c8fedf284e5520b1b744e28de1627
+size 3969
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Light.png
index 14d28a1f999..24fa1c62212 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithDiffChanges/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d502f79bc59e00f539745df156fa704cc3db11c16653633943b6edf26401e25
-size 3617
+oid sha256:2c192a041414782a95fe785e3987d649798deddd109bddd14369e7bf170834e9
+size 3780
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Dark.png
index 10de39113fe..e4ebc023ec3 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e652cd030f299556fa1fc6455533c38ac953cae0bd472248aed8034d7f19a12e
-size 3129
+oid sha256:c66acc3e198c4e80a048e909ab32842dc9bc78f0a07c582366c7a295ae97debf
+size 3512
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Light.png
index 980b2d57aba..50a0a40ca7d 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithFileChangesList/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a189aa2bcce54111a8c078985ca611efde6e10dde26bb227bf1afafa2d065cc0
-size 3250
+oid sha256:057ba5970b621449cca39908ad2ad1451d44308cbaa7daa37b4cafe46909b550
+size 3327
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Dark.png
index 0a497294064..56b2df20542 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c44f892307b93c5bb48b836d47c5c66a318e299ed59ae96ca8107eecb5ad1012
-size 5621
+oid sha256:ed73e9654db907d45f23b763d63fa7bbfed7141e28a0d72df93b09d15954e043
+size 5946
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Light.png
index 86f7c7e3145..8b3a0d35713 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownBadge/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82245981f37c430eab84149196ccc9769fc90347b1b8fc28942dcdd7d3a5357c
-size 5711
+oid sha256:11afe0163951c25415ce22c96fb8b91fca4c386e4ff328a4eac4d1a446558803
+size 5359
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Dark.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Dark.png
index 456cc163ea3..94312b08c74 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b702e865b2a24a3ebf2028662a7aa1f9dc4176e90761aa50627736a65f4a8000
-size 5368
+oid sha256:ea9492fa76b7067a2750a0ba9952e2bb7c90ed781e01947cad7183b284cf5988
+size 5838
diff --git a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Light.png b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Light.png
index efa1d0dbda7..2d7727df428 100644
--- a/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/agentSessionsViewer/WithMarkdownDescription/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cf08481a25b64169c03ee6321326f2108ed37a08b4ade5e75c7b3ff13e63ce7
-size 5393
+oid sha256:eb283eebd9c949a2b219b0ecf6f5e4b120de418395477ea21fb95c643104f308
+size 5312
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Dark.png
index a74b5296d1a..b76b81f3ec2 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b60cfef71eacaad36a4e96f73f5417b62454834c682ea8d5753376730e6bee96
-size 7564
+oid sha256:0296fba7f63e6a159c17070fbaacceadacb11c94385c5669ceede625a7bf43da
+size 6552
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Light.png
index 813f2881117..8dac7be977a 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/ActionBar/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70c958ce1152e12f156e4c4b8621f504c0eaa3fc3fc2917f21d7e41ab9b6a380
-size 7687
+oid sha256:cfe2befb6e478ce4334695ddd953f53c306460bcd9efe365f05652a9289c08dc
+size 6765
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Dark.png
index c1bcd6e1aa3..2a9b7a05f06 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f76c6c4205d17a529e16519b7cbc96008f9c99c1d0f444c849f1e7483c6cd694
-size 6834
+oid sha256:acf2db300158ce2154b12e4cf5db67ff2616f304f0b3c33bf04006e0a27e9d62
+size 7142
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Light.png
index 8ba87df3aa8..b97748e480c 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/ButtonBar/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f7f6aa3b88072a5091f13518d46b52811fddffe928af9451d7e34b60a6d24e0
-size 6827
+oid sha256:ca0b996b3af6e086147230e1524c3b7a0633322777323cd5c966ca6a5a4a6840
+size 7266
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Dark.png
index 0d199f49f95..8bf6178d3c9 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ef5657663669cbf98c1bb45d00f2f80c34a261d63db46aea381b64c0dc0b915
-size 9641
+oid sha256:d411e54737298ae538fdb28003f08f052bf9e751dd377624dde04092647a4a82
+size 9050
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Light.png
index fe6af01eca0..2e33cf75f47 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/Buttons/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29fbbb20bd36eabf1e23a659872b66bcc3ba7ecbec5d2f2f2cfa63ddf46b92b2
-size 9661
+oid sha256:781cc65d8c818c23a4b6122a6439ea144cc8bca2b2f3a9b0a73f52db40dcabce
+size 9124
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Dark.png
index 9dff836eb82..67d4a51208a 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e77fe6e326387bc7013ead48ed9e8c3dc7fd80b795c29e5d4dd48cf6998d3c44
-size 4424
+oid sha256:2f8842572f67432757afbcfcf08a64e4e6270437ff493191b638b40498cbdd16
+size 3167
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Light.png
index d7035b0ed58..0349a3fe691 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/CountBadges/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:769ec6f7ab75359694478e000a407b4497d080e064fd5bbaf13699183aceb2a0
-size 4258
+oid sha256:41cdbf685d4e9157206fe37152efa74b86ccea4f0030e40e04f5381b02436613
+size 3053
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Dark.png
index ee0b9f27b97..e4869ae73e9 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3800748a22233bf6fcd52467bbb0e7bc2e7627625d81910d598bbef3900d9766
-size 18284
+oid sha256:b7c053271845275bcea9706011b1bdcda1d8f0f31bf47d58844196e3623c1c9e
+size 12420
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Light.png
index 3798f28702d..38ba0912461 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/HighlightedLabels/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21952b54f0a4dbf85dcb8e46e3bba9331be8c9068f08fb1fcc28e94562a69b79
-size 17757
+oid sha256:af33528dd520bd936e40d7c4443ea398bab1381d8fe3566c6d44b751f7b5074a
+size 11650
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Dark.png
index 738aea249bc..6a7ee7c8d7b 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb7ed5ba73e484c563806e3e419f688580fe08490efb9883e86144440387997d
-size 7097
+oid sha256:92cb33481db59756768979f9c09ebfdb1be33efcf8d311db72720da6bf618596
+size 5592
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Light.png
index d247eb3f93d..d183c2cf186 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/InputBoxes/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49d5f350123acc511ad93f9710bad4ea02f35e0455249782db854c22b1bb731d
-size 6869
+oid sha256:8fcc51d5e549ff8ded93cb43cfdae31e8871e8e1f6f6574e346256690d05cf13
+size 5411
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Dark.png
index c1901de3f12..7d4d98ddd91 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fde3798f12ed5555c865d8be18ed7648a8229a38630cd74423f026818341ff35
-size 8951
+oid sha256:bb18ac66005d1947438967ab77e8c55cfd55864c25b09594f212290f335786b5
+size 7948
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Light.png
index 94d47c7eb4a..ef77c9443f6 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/ProgressBars/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:609dd0f1d3d2a0a558960f2f83a743570d1b7cd6f53f40e09326fcd7ed83bcd7
-size 9062
+oid sha256:fdf30bcbc30af906b9398396c3c7f952bedd9df0134c1d6f2eacbfe175e1e90d
+size 8019
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Dark.png b/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Dark.png
index 4c155947921..c47018f88db 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:917b0856dd3a96b94166d431d633a0fa5fc32428bb468de9058a56fce31bfe79
-size 7010
+oid sha256:3a000b80bc413322bd1c52aa5c1de9480de55e4d42dbd296a45b3bdaa1596bef
+size 5214
diff --git a/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Light.png b/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Light.png
index 4345d2aa11d..0943f944a72 100644
--- a/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/baseUI/Toggles/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:039a38c6c47e488c24d7fb39516d70655edbdc661491b5175aa49898754ac26b
-size 7030
+oid sha256:689f48259d2530a33385606f0ddfabf234f7be1ca1f9c89e1d95db6ad987817c
+size 5226
diff --git a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Dark.png
index bfe8d842cf7..b30f1c858b0 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0f41bf819fed7de2b99f15776cdb0d353f9bfaa4526dbb857f12be7c1343881
-size 15185
+oid sha256:4548c6c6ff6392627ad501ef934cb1b908aa9b53eadc2caff19e13e20dcb6217
+size 12451
diff --git a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Light.png b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Light.png
index 914374bffd9..24d49dea550 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHover/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50328c742ab8f5d52b66bc5e693277733be6adb62262925c16527e92b52bf47a
-size 14309
+oid sha256:ffd91fd0e12f87bcef876984ed35d4130d2d551dad425ad5f3384741ab35cf56
+size 11664
diff --git a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Dark.png
index 5657241a83e..15274f77cb2 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8387aba7570e867f1b1fb8b6257944f1458e866ceee9c7d81b7547e82c730c66
-size 13527
+oid sha256:3767494b7dcf659368bfe373f7591abe386de46553042aa6e5ea1e5f049cae44
+size 11337
diff --git a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Light.png b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Light.png
index b09c6acc05a..c7f7ebefd61 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/aiStats/AiStatsHoverNoData/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ed5257c12ad2a6d648fdb598748241239409219c8cc318f8be27bf377452b8d
-size 12674
+oid sha256:7553211572af5a5b64d29a51ce002f07ac8bf5084673a857fa423f46ba8d46aa
+size 10675
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Dark.png
index 7093082f758..ad62d35d0fd 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84ff989328d86ec68ab4b2771e8798051794c85c80e830e6061bf7b538dbe342
-size 1998
+oid sha256:7f60d4a23e8184648572e9a80154f05fae6f5e4e341e310dd6387381e1b6b316
+size 1927
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Light.png
index e490a13bc02..4722dd65d3b 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/Completed/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d590d4f26fb679fc1c0be2031660fc0568d0d5512e8f7272c81ad6932cde7079
-size 1994
+oid sha256:757de136addd6e36a327482fb9f33fe7850ded285c4a8f745867f03bd81a94c2
+size 1934
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Dark.png
index 5df4b562cf9..72f4132f4cb 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfc063153b0a031ec15142d02b494acf778323b3f77c2d4a470936c8f52ac481
-size 7895
+oid sha256:35a2d9b3b600981a71cceed2fcc87772ee1b8efc7d16a759162df3910b8e4a98
+size 7788
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Light.png
index 942afa17055..a3cddb712e9 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/LongMessage/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f61d72a6e32d7f82c198c827d999462dbb84f3154220ff9b96b2339b9c2ee4f7
-size 7832
+oid sha256:078f9a3d9b6fd0cea0ea2ee502029bb27d13fe2f4ef90c9cef6f1d195127f6d2
+size 7809
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Dark.png
index 993c9cdea97..da54644eb02 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f4b1725f22fe74e252757ef5e3011112c86831087eb0762518295af64f085da
-size 1604
+oid sha256:16f3bf8a2fcb4f732adf867554ef1d8ad756591fbda8c3a3329111738ba38975
+size 1599
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Light.png
index fa997f05c87..9becbabb0ef 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithCustomIcon/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecf877a05b5bab1f506ef7db0369e535434ef4ec712ae6cfc1e34aa62defd492
-size 1567
+oid sha256:63c0407750358648e89440a66c342924086247733ad73204a3bc30c1b5919abc
+size 1563
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Dark.png
index b09bad6fccd..4ad0ce9fb04 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0ab968d64c65fbd57da2751037b3795dd44edfdb4288e1b8164affce136d694
-size 4924
+oid sha256:86829dbd9060453ae29bc9e022d24c00ca33291dcbcf15430101b87e0290d806
+size 4487
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Light.png
index b55193ca7a0..cf5dd0b343c 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithInlineCode/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:715427f1205744485b04ca1e1c2371116d53cc0078ba7b59b39ce492c64499ae
-size 4901
+oid sha256:c6fd0287c9e957ccb47457fe8ee06b2a35d31917b0c4618398c4407a96a39e2f
+size 4499
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Dark.png
index 4ce32cefd91..a6c594392ae 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5674c1f5e9cfbf497eec8dccb23abb9bace0742e74804ea752b2fd652bdb75a3
-size 3541
+oid sha256:f41bca316a62f9e6b4a45f9ab52004e33a3d7633cf2fe74316c94fad065dfc42
+size 3409
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Light.png
index 65dca4cf368..fd5b914a87e 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatProgressContentPart/WithSpinner/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:857f0f66eac110ae84befc845a8557fd85d64d3c9b3c38fb3f1390b98e5eea47
-size 3567
+oid sha256:8cc2b39a68f97e066c74f53d7f1589033c8b801fc9f20c979a4eb0c9241298a7
+size 3437
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Dark.png
index eed451005b5..1a74c453a7e 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bf0c0deb7567010db027a90da11dbe87b2e0e0e1a19b80bde4ae389363451d3
-size 15762
+oid sha256:9f9491ea389218f646808fc7f11aa25bf9cf9973b48fd2a404f44a781ee021d5
+size 13530
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Light.png
index 5822d248ad9..25a4a3486d1 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultiSelectQuestion/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1aa1238a25cb27637f4e6505dbbdcb2a4d732a45d6238a46f55205bb9db1227f
-size 16001
+oid sha256:838773c4b9f916bf076af9f710fd60f371ec8abeb24e5af8dc363db69079e351
+size 12920
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Dark.png
index 41af30d168d..25a077bdea6 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d37f98e5c7c4534b0500f0ee559fccea0136b53bafd5ae69cd5c5005fd1bbad
-size 9914
+oid sha256:540ecb136760147c8d5d427be8a0445c2020ef5ab366dd1c9e4c0da54372eb5e
+size 5974
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Light.png
index b59acaf8d25..74628bf1a2b 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/MultipleQuestions/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70cb69e09936cfa033136995be7ab2d25ddc73fa4043004953d4c7b685adff1c
-size 9803
+oid sha256:874c880ad7d52b14cb437fdd108d8fe2781cb41b79aecc3008a60ea226ab0999
+size 5714
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Dark.png
index 111aefc0557..fd6ea668206 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1e88af6f572f98d7110e3efd9c7980446aeee5dc46bc30ae033130788da222e
-size 24999
+oid sha256:db20f45257b1dc1321fb9906812d1965e965dfcc096fae4a5ee093af078a5844
+size 21169
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Light.png
index f74bfcb0b0d..6f2e7f7cec2 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/NoSkip/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89e45041078c82051075e4882b4a8beffae1298d3610270c9d95049c5f05c5b9
-size 25094
+oid sha256:276b9280d1a6d9500926b072aaac912ead29b2dfb6f38332b7057817b1be5a5a
+size 20127
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Dark.png
index 55185e54f2a..053ec0fc1f8 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15e7ffe28aa3ddcaf263df3d829825c6941274a67d454c3416ebdfdc56c7b2fb
-size 25463
+oid sha256:47480092c6e46b9af050f664e6156d132252a1d43d3ce241b69b373756485d95
+size 21437
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Light.png
index 1457a5c4359..01d13a8f192 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleSelectQuestion/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f33c81825ee8ebb528dfdc7dacd1689dd28dedf2250faaf38ca21db82f9bd25
-size 25513
+oid sha256:228b6563cb9f0e2cc1efb981ab823f414b25dc06b530070af80dd4e78ecad7ec
+size 20360
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Dark.png
index a4e786b07a0..f66987a37fe 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29edbbb4350570a92063105121d358bb82557d02e297783ac9aa94ca5857db99
-size 10082
+oid sha256:5cd7d7f6c846a23cf34a9d4a2204495923dd2ca1c4fdc5d8f48150b405847b73
+size 7406
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Light.png
index fc33b965edf..58079c76d69 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SingleTextQuestion/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aafbf7aab60ca0474cd01a36192fa4faeab7eeb3b9e7d432121f1ae977c1441e
-size 10033
+oid sha256:9d32a9b6807e8eccf067013ce4cca2a679a2783b9c1d57ee1b171c6e5d1bd89e
+size 7151
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Dark.png
index bd57128f488..358170b8b1b 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:183fd97931b5f9edd0cdf7c6374328f6fa12ac728246c4156b8416f68f9d6960
-size 1954
+oid sha256:21e504fa558a9cdcb756919be7cf39f78b8e3f6e0ef268719d7366dea22f1733
+size 1838
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Light.png
index 3c0dbd6ae6b..a597d6ad4c9 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SkippedSummary/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa5471c7656b76e40d6e7123ee8506aeb9a4b42a7157b9bf24a02e117017b6cc
-size 1918
+oid sha256:64884765b4979723c9c11c865dd9eed8a45f6d8df2da7364cacbbde90d08254a
+size 1737
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Dark.png
index b5cab20b4ff..4187393e741 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e725fcfce7606554463ee6aa335a3530a6e37935b2a163e78d940b3557e58d6
-size 17933
+oid sha256:f082c2f8ff6772febd71d1d04c932ed26c3760799bf6e0b9ed3191aa0a085e49
+size 15746
diff --git a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Light.png b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Light.png
index 12a8743c86e..63b54b3cae3 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/chatQuestionCarousel/SubmittedSummary/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90b08fe37901ea04d0b815f73014168cb2ec0643c4e7f8fa8993783384e884b3
-size 16311
+oid sha256:89588294990c295d22fd45cae3916d4342a1fe26210116d600075cf2452a6a30
+size 14650
diff --git a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Dark.png
index b12335959e1..650755c7e48 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4bf1714a905c76cc16aae7c5b7f20c6418018e0820e946831348797c13bb2a4
-size 27743
+oid sha256:cf787d7ed08805462038075743eccbff95518fd891f5399900a202c202e10f80
+size 20326
diff --git a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Light.png b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Light.png
index 2d24452c304..0bc863e25c7 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/InstructionFilesWithAgentInstructions/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:153095490477eaa37e4a0648c41e30e7ba8d62dd699a6e3cf3ec04399bbfa91a
-size 27090
+oid sha256:4bc43560b510189bae18713e06ed09a9bc2b277ba44c2ef15e1a9295df9f6e0d
+size 19276
diff --git a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Dark.png
index aeab5d11124..66252c9a152 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7b2e11c4f828e0fbf8ca8ef0c7607965aa1b974280851806a038a45f04b9de9
-size 23556
+oid sha256:f02c53ad60359f1b1ae7b3607f0346c4752cc4c5719fd047de1a314c4838fbc8
+size 17921
diff --git a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Light.png b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Light.png
index 6f13702b87e..55ca04e4eaf 100644
--- a/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/chat/promptFilePickers/PromptFiles/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb5027255ce762a6de6990d20d43a0aae0365ce3e2ca69e374b9b8791a4d758e
-size 23201
+oid sha256:967a62b25a0e9dffa793061a4f1a695988c63e984bb7657cac5b730b81507ba8
+size 16991
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - backticks/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - backticks/Dark.png
new file mode 100644
index 00000000000..85c40d12f6b
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - backticks/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ae8dab0fa799afaadf186c93436bca9ac39c36b99b8f9846ed0d7284494be93
+size 2288
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - backticks/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - backticks/Light.png
new file mode 100644
index 00000000000..cfb849214ea
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - backticks/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89f27caedd1e45d22e90243691bcc0153195d121dc2c2bc58be4a1d50ace828f
+size 2229
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - simple command/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - simple command/Dark.png
new file mode 100644
index 00000000000..539388c741b
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - simple command/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:793aa216b116d5b028adf16db5e8780f7b844bfbdd38657f943c6427de3e320b
+size 945
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - simple command/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - simple command/Light.png
new file mode 100644
index 00000000000..e2b960147c1
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - simple command/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6500291e4787ee83dbe70cf44c1b6cb0c5c96f4311cf865cba26ce86a92581b4
+size 938
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - special chars/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - special chars/Dark.png
new file mode 100644
index 00000000000..3b72ed4acaa
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - special chars/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e88d70bf076040be9311a96a39717699e59e2bd86a9b2ca7e32b2424bfbf273
+size 2442
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - special chars/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - special chars/Light.png
new file mode 100644
index 00000000000..0abd61d3e4e
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran - special chars/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f267b5737a1cbfeddd000065fa66735c058cdaa090b60445f583db282eb4787d
+size 2359
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - backticks/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - backticks/Dark.png
new file mode 100644
index 00000000000..a37c755179f
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - backticks/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae563a7c9f939d3fefa4a30e91e1a514ae0de7b881813827110b62def6bd05ef
+size 3061
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - backticks/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - backticks/Light.png
new file mode 100644
index 00000000000..7d27474905c
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - backticks/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d87074216734a0e6a15683060271590bb6ec594dca7ca84c6ae3b0180df2a66
+size 2988
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - powershell backticks/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - powershell backticks/Dark.png
new file mode 100644
index 00000000000..77d8e86be22
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - powershell backticks/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dce5773e95961f082c034816bc63fbf79b8cedecaec9750840fe483d4855f32f
+size 4476
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - powershell backticks/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - powershell backticks/Light.png
new file mode 100644
index 00000000000..04745d73624
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - powershell backticks/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a05a111b62dbdd2f355f31f08a2c5c6d3731a1ce9607d95e66c42e092a1f099
+size 4354
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - simple command/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - simple command/Dark.png
new file mode 100644
index 00000000000..9eb5f8b26b1
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - simple command/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eda8e2a9eeb0b53fee694039861e868d40b711c4f26b95748605f0a14a8a7811
+size 1759
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - simple command/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - simple command/Light.png
new file mode 100644
index 00000000000..8abf08a2728
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - simple command/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d71509185136eced7961758fde339f267f38966a4e35939c8fa11fde64e641e2
+size 1757
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - special chars/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - special chars/Dark.png
new file mode 100644
index 00000000000..975089fc9b6
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - special chars/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2a089a8a290b9ccb52d42cdd987ca8ccccdbb0a47394e82f0d6e40b447663a7
+size 3156
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - special chars/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - special chars/Light.png
new file mode 100644
index 00000000000..71f232f4d62
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Ran sandbox - special chars/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:927527224e48e702d81b44beedc1a2395c638dbaaf952d1a1c926d576d2bf15f
+size 3152
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running - simple command/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running - simple command/Dark.png
new file mode 100644
index 00000000000..263fa55733e
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running - simple command/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3647c8c57337952dd845f9151b3ddfbb074857e4036d76dd6c7d7beda734c676
+size 1170
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running - simple command/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running - simple command/Light.png
new file mode 100644
index 00000000000..04b6944c1a2
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running - simple command/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0008e3885e2e6bf569757ace983c635feb9da86d470f2455e4a6884d7d22b6e
+size 1139
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running sandbox - simple command/Dark.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running sandbox - simple command/Dark.png
new file mode 100644
index 00000000000..760ab24627d
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running sandbox - simple command/Dark.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1f340aaeaa112ab63fa6a6048fc76618097114ffbf9ada8a4e8f7736df5c5dd
+size 1932
diff --git a/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running sandbox - simple command/Light.png b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running sandbox - simple command/Light.png
new file mode 100644
index 00000000000..7f869c9bceb
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/chat/terminalCollapsible/chatTerminalCollapsible/Running sandbox - simple command/Light.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3a5c44027dd8659083344aa7f15acd02d2e59d53913b4ca58e5345204470f0d
+size 1893
diff --git a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Dark.png
index 524b085f8b0..a722a0daf26 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab8379f105e879912a52e2d25c88e26870df79bd220a6789a3f61e010d2f6788
-size 14944
+oid sha256:806cccdfab0052158ba943d3139bf39807d7b6a855d387148a12f07f88a65f1f
+size 14217
diff --git a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Light.png b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Light.png
index cd0c2d36a62..d3bcd4a1eef 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/GroupedCodeActions/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e641aa3e70e91cfbaf2db48fd1a095850a422b55b0acbeef4b2fdd74d07674e
-size 14446
+oid sha256:53d5c9626190a0dbd4eadacd494e3485ea748034feb7b5493ed51987725d4a11
+size 13663
diff --git a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Dark.png
index 7527ac7cf76..c896f0f6d3e 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94aa1fc6a75d1506459f1a0bfe4d29723350a59e3d4c5002a4916461245bcd6b
-size 6517
+oid sha256:95b3400efd3ad39f145f37885869bb2a606a3ebab204a78ceebc3dd9fb846644
+size 5871
diff --git a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Light.png b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Light.png
index 0de7a3d04ab..086e1c16529 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/codeActionList/SimpleQuickFixes/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42e4676c9b49dec849b275057f4e8a06a3acbb7fb54304d9fb9509ff7277459d
-size 6110
+oid sha256:9b1da4121639870beec498d27d3dd6ac3f315670f25af7220b4f14bc2bf2465c
+size 5551
diff --git a/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Dark.png
index 339aeb80c75..6f988de10b1 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e3d8467ca11776454f33e2ec15a411a36c1e4d8777a6cf12f991f70bb33c0f9
-size 38205
+oid sha256:5e2ea376b2b00f3ef7b6a223b97209bcddb9d75503ae1b1c2725ea1aa0d494d6
+size 39168
diff --git a/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Light.png b/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Light.png
index 25a9038c8be..039a6f4c77c 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/codeEditor/CodeEditor/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e216ab674575eb1368649d026b85470d7b2c8b9ba1ebc06d3d7acefa3f246214
-size 36998
+oid sha256:ac71623268edd1c88ba0b968a2782ea5a8c7536378b834cc8bc223b21b59a2d7
+size 38516
diff --git a/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Dark.png
index 48dbd2f491c..cd55ef1b5bb 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9df123fb04b4c6ecd4337bb19af8626b095c3fd5f149c0bcb2d46d216fa392ad
-size 33087
+oid sha256:755c46c3ecbfb04fc0d119b555e6af8c204c6be3e20271e369bbe68382ea739a
+size 34071
diff --git a/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Light.png b/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Light.png
index 2c81c27c782..73cf3dc9ea6 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/findWidget/Find/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:531f9d16ecde8fc7b868eafc0541f04dfa476065095119ef2b02be2ee85a4788
-size 32732
+oid sha256:c983a5f7f517c193193c4b2858c4eea26fe9721e6272a03b3033d1b82fa76ad8
+size 33922
diff --git a/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Dark.png
index 027b13b8042..a99c832f975 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa6ec0238ac1ac4974548b73e205b758e910d0604d1c28e0f26231e1df8129f2
-size 31006
+oid sha256:1d3919a74773f2b31a5ab2cb1e3284f4421a917a8355eea52cf56b68b0f5a4d1
+size 31928
diff --git a/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Light.png b/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Light.png
index 82991aea52e..bbf9c90880a 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/findWidget/FindAndReplace/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:416cf9214bac2a0e275f9cf83c41e656e94de14ee870886f55caae230eb8871d
-size 30907
+oid sha256:6a5190f9b9aaa5efa8591f957d8a7be12f230052c444406e319cff949b275afd
+size 31849
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Dark.png
index d55a1ec7dfc..3f620d66bc2 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e8973161acbdd94816922272fcb0406263e58f624d86c0d7980c329a65a1b24
-size 11278
+oid sha256:ba96e5a35d38cacbbf7b34ef1707079d134d6e0d7b4347e0b6243c320005844a
+size 11295
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Light.png
index 5a87432a3d4..3e9d7899424 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/InsertionView/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6d3166596fd41609c4a622d7f7267fd6f3f9605d893efc34aac65ef7881ad71
-size 11203
+oid sha256:684f0f9eebb9410dcebd7385bc9f8c7cb8b30793beda3234931b6f56f46a88cb
+size 11230
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Dark.png
index 9da6404a655..6912c85f337 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f39335e6fa03078f804f848b634329c9391e4d8fe099d0fa1e0d4808ba4eb3a7
-size 11117
+oid sha256:8f6c831f0f3a01d94ef922827522db7e14b6c98affb37e0dcf277344de3b3a20
+size 11114
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Light.png
index 42acebe80c0..173f683bc87 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/SideBySideView/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c70bb66d053f20dccf9075399a801dceaa92d5830642e8f2afc9f89c81d9315c
-size 11005
+oid sha256:84ceffc2825212d33b4f647dfc6aea6b7bdcd91651b169fc1747d9a7168d0853
+size 11018
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Dark.png
index 4f1806f3f3e..47ef7429fcb 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a54d85c0fcf622977f412e8fc2953c973f1da427c91d319d0708b6e758969f3f
-size 10280
+oid sha256:155a4b0bcfcb919fd56ba0953e0f91299a7899d92b919d5407e7489c03e32a7c
+size 10273
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Light.png
index ad3fa141565..2986af76404 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletions/WordReplacementView/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d494bbb9ebfbf2156c5d7a21f39c52e14313a5218af083cd91f2dbc6199f62da
-size 10195
+oid sha256:5cc8592c7878181b62449b0e2f908e7f625439edbe235495a15baa0fc8494f11
+size 10208
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Dark.png
index 1dbc63aea44..776313e9769 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e4226c71af8ae21a5f0c13ba521b50518afb4a39831e832d725ebe0289344ff
-size 10266
+oid sha256:8714bd5675ec655e37f3599ae9797b4346b1f1f331183f15a3eba3acf14891cd
+size 10508
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Light.png
index 224da35d3dd..c30fcba59ea 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbar/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:518ecbddf013bbc749b62a8a74bad39d7683332ebe0d9f2a4b7b13ad54fcabab
-size 10104
+oid sha256:695f962e05129f1acf7f49f0599d7edfede15ad546ffb928b1da6818c59d5b46
+size 10634
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Dark.png
index 1dbc63aea44..776313e9769 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e4226c71af8ae21a5f0c13ba521b50518afb4a39831e832d725ebe0289344ff
-size 10266
+oid sha256:8714bd5675ec655e37f3599ae9797b4346b1f1f331183f15a3eba3acf14891cd
+size 10508
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Light.png
index 224da35d3dd..c30fcba59ea 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/HintsToolbarHovered/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:518ecbddf013bbc749b62a8a74bad39d7683332ebe0d9f2a4b7b13ad54fcabab
-size 10104
+oid sha256:695f962e05129f1acf7f49f0599d7edfede15ad546ffb928b1da6818c59d5b46
+size 10634
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Dark.png
index 37bbb987300..ab3b6ba6a39 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c3e7be1da3065615074aa5678fd7ca38dd7b3906573fcd555ee9e249d9d645f
-size 15252
+oid sha256:dc5640f9a8dd06f0636af35aec67440d4c69d8ef4dc5d5c4dd160f7cbf1fcba2
+size 15197
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Light.png
index ea8fe1b7068..8e2c5e279d4 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/JumpToHint/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:054c0dcab2a00526f7fe63440a7e782618f03b9396f40e6a31b8e28e7ea59145
-size 14846
+oid sha256:9de4e72712e9c670d9544025018d9922be7cd5c7c7b6b9e288dc948b9c4f93ba
+size 14778
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Dark.png
index 19c633f2edd..ccd9391de5a 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3923f85be8bcdbfcdecfd80b07abdbd71763edc379de4e6a5e946f20f160db5c
-size 55650
+oid sha256:c575354210f36f418e4316d8da6e877a087212d4c0124055f720391f177c6ede
+size 55167
diff --git a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Light.png b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Light.png
index 823489ce7fc..5abbd81b1fb 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/inlineCompletionsExtras/LongDistanceHint/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e81911488f22e9517b9e2f8bd7b8bc7a14d7fff1b2d012c2368b840d4bcb49cf
-size 55028
+oid sha256:f1bbed581cc5ad6622fe4ae67a739ff0ab549b23c78565e637aadab74030888a
+size 54554
diff --git a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Dark.png
index 26eeb8a8751..c8cc1a132e9 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1191cc4ad1b12b31b28e94fa6305b2c91a3ea399580f04cd93b5387c8b58b89d
-size 20408
+oid sha256:4d862c3e93ec28926822c5edd98094413937d25a806e119fe855b8c969969fd7
+size 20387
diff --git a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Light.png b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Light.png
index cd7a92aa849..f95d450b9bd 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameClass/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e18bb8e20cf85b06825dea19140a88a9fd0d9ec844db939d8550956e9049a2f2
-size 19982
+oid sha256:6646a61f0998615948bdc538f5b216fdfc06640bc47d60e9f641ec2462e37e93
+size 19922
diff --git a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Dark.png
index 2b11099af61..f476163487d 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc8f9f9295ae0e9b7f2c9215e788c0a0516d7c667f30f61fbadcfafdb13bb2e6
-size 21470
+oid sha256:ef331243e3846acebf347c2c99ca1ec5f7179c1085cef3f6262d8d1ef67cd23d
+size 21438
diff --git a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Light.png b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Light.png
index 909659b1b5f..7de20ff04a5 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/renameWidget/RenameVariable/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d8a254da836fa81f53516bbc992394aeb91f7297cba4d13a8c5485ab3d46d7e
-size 20862
+oid sha256:2ef30dba70cb58120a1f6e3b99eb052bab3a64bc3e80927fae2e46677e8640ca
+size 20684
diff --git a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Dark.png
index cd464aa178c..2b656165679 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b0b1f65ed8a0963da2b4f7f64b3d06683895a57d8101856f711742954cedc23
-size 23358
+oid sha256:b5894955a9077a4fc8631f7763b51d55b6ed414108b22ae0e2c99aaaabf75521
+size 23441
diff --git a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Light.png b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Light.png
index b293ccc538f..f927d07964a 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MethodCompletions/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2f348cbe0e5d401778f4f532b6254d981f9ac98220b290d8d5401dcd4526410
-size 22475
+oid sha256:3276f547029bcdcdc2a80c7f4b5b62ef4ca42ca2a7b3a11baa2d0369b8a34d20
+size 22785
diff --git a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Dark.png b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Dark.png
index 8d9e892d9e3..444955cc243 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0222974a073f5b12431b1ebc4f498ce8a795b860016520e103a35d6a68401d98
-size 13689
+oid sha256:8c7bf8217becab4b850dc86c1793f2647491221f8309d26b5e2e7b08e5e18d05
+size 13947
diff --git a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Light.png b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Light.png
index 5e93e621faf..5ce407d85b1 100644
--- a/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/editor/suggestWidget/MixedKinds/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:998dde573af3df84cb836248c71f2bc141eb6845a7c407852f1a02969b14dec5
-size 13538
+oid sha256:25072863d5f87822359f4ee4cd3d29a1b23a8a1c03882b7fb4051e31ec4a12a2
+size 13979
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Dark.png
index f6117771773..63489bb2a4f 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19c85e77d0f96df99aee39232dec5ae19f247c22f32664689794e3ca34c6ac4a
-size 3899
+oid sha256:01d1475af7291413c9d2957c58fc5a9991a29f95c4281bf5da5506059baa4d91
+size 4510
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Light.png
index f8d4a437c6f..8ead2afd156 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/AvailableForDownload/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34f56e3559fc17204bd7e7134e8883e31cef957a6bc05780a929cf5a8e23071e
-size 3830
+oid sha256:aa736ba9d464782b1eeeda889a98b6651a9038d57de15d8856952b105f9950c4
+size 4417
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Dark.png
index 586892704bb..4ea83494e4a 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3da890451d346196f63be699e367ad2eccf46091167ac005d4eb5adb8169d12d
-size 3778
+oid sha256:5a825e7835cad227b0ec6cbeae7ee867b10c4c51df7c8ebf99665ff40831f805
+size 4343
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Light.png
index d5f5baa7a48..1c09ee84b88 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/CheckingForUpdatesHidden/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc0b866a49984f2e17b2da44d15fa4525a21519010e4df5a0651ffcc88b594f0
-size 3674
+oid sha256:baa5aca747de294f2afd09d0bb7072172e0c6d8e9c22298046ff94f487c5f52f
+size 4018
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Dark.png
index a628d1aae9c..e223127b8bf 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60be48fef4a63200229dda97c1f8664e9410d76be3a113926355867c8f58c3fa
-size 3815
+oid sha256:06860ace3520e44b62f18aef1fdccd897f5079f81206a1e0f59271d28b19495b
+size 4465
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Light.png
index 0f6db97e2ab..9e2a19441c9 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/DownloadedInstalling/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44d8727fcac81f4669821e279f370cde522e2be40758d2d2975a9331466e6d49
-size 3716
+oid sha256:134c92f9a0e7c6f7d87d9afe81576c6d06c581b8c1cf211047fd541682892af2
+size 4291
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Dark.png
index f6117771773..63489bb2a4f 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19c85e77d0f96df99aee39232dec5ae19f247c22f32664689794e3ca34c6ac4a
-size 3899
+oid sha256:01d1475af7291413c9d2957c58fc5a9991a29f95c4281bf5da5506059baa4d91
+size 4510
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Light.png
index f8d4a437c6f..8ead2afd156 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Downloading30Percent/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34f56e3559fc17204bd7e7134e8883e31cef957a6bc05780a929cf5a8e23071e
-size 3830
+oid sha256:aa736ba9d464782b1eeeda889a98b6651a9038d57de15d8856952b105f9950c4
+size 4417
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Dark.png
index 9c33813aae3..b9e1d379c1b 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c282cd99bdd694629caf8bd310013e3aec0f5b25dd5376ac7c1bb897a1b4388
-size 1593
+oid sha256:1634c9ee9bec76056e5a85932eefed9f89447d38dbae2dcdc36a0a929b696d6f
+size 1408
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Light.png
index 753352cf64f..2e134805689 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/LoadingSignedOutNoUpdate/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1380daf9f875ed2502b0669af7844bae000168bcba00d89ea5d6634f590637c1
-size 1606
+oid sha256:0bad6a456b7520b7eee2a23d7816b69fd66c0b868d45a0e3782f9ff4331ab691
+size 1443
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Dark.png
index f6117771773..63489bb2a4f 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19c85e77d0f96df99aee39232dec5ae19f247c22f32664689794e3ca34c6ac4a
-size 3899
+oid sha256:01d1475af7291413c9d2957c58fc5a9991a29f95c4281bf5da5506059baa4d91
+size 4510
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Light.png
index f8d4a437c6f..8ead2afd156 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Overwriting/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34f56e3559fc17204bd7e7134e8883e31cef957a6bc05780a929cf5a8e23071e
-size 3830
+oid sha256:aa736ba9d464782b1eeeda889a98b6651a9038d57de15d8856952b105f9950c4
+size 4417
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Dark.png
index aa6921a198c..abad162c657 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:263cc0cd0dd5fe9eb7839cd0ff5c1698c26b76fd162c6f20cd9bf048094cb308
-size 4299
+oid sha256:427bcfd7e72eb43ba4d38a324c3da70050aaba9ed7b0f79ad86f5467f8fd5b14
+size 4765
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Light.png
index 7a19687be82..3c7467dd53d 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Ready/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:651452ec039ff26c1fce42ccd541d0ce70f39a993457939be3bcd3f1d67ec4cb
-size 4202
+oid sha256:6ce038b894141fa171eac65aa4f07680e1650d395f26a66761ea694bc2bb862c
+size 4528
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Dark.png
index 586892704bb..4ea83494e4a 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3da890451d346196f63be699e367ad2eccf46091167ac005d4eb5adb8169d12d
-size 3778
+oid sha256:5a825e7835cad227b0ec6cbeae7ee867b10c4c51df7c8ebf99665ff40831f805
+size 4343
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Light.png
index d5f5baa7a48..1c09ee84b88 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedInNoUpdate/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc0b866a49984f2e17b2da44d15fa4525a21519010e4df5a0651ffcc88b594f0
-size 3674
+oid sha256:baa5aca747de294f2afd09d0bb7072172e0c6d8e9c22298046ff94f487c5f52f
+size 4018
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Dark.png
index 3dea19001f2..b0da23e3478 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c6eba3c086a1b7c69b8f1bff63ccd43bbe6bad82a049e8b32230e4ce7ffde07
-size 1367
+oid sha256:2aef300924a82a7d8c3a3d20966735bcb3bb5f2c5c8ee64a25437bf40ef27e1e
+size 1468
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Light.png
index 3e8db51c450..133e883f14f 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/SignedOutNoUpdate/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b782263b3ffed17f79b95444cc6f479e9408ed252f5d1c227b4c7f741858b82
-size 1240
+oid sha256:6837a6e2e9accc5c116a816baea4189a8a23e29b6dbb568126e6e01a0394b259
+size 1336
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Dark.png
index cca6f012d85..55b01d53d82 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa8e4d7c2bffaa4b3fd149ce1316b78ba9ac40ce5878a8867dd6422342c5a18f
-size 3977
+oid sha256:699342ab20e24415ebe5c1fd08377c9cb5414efd21d9aca804bc60e04ae62b4a
+size 4581
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Light.png
index c0152452dbf..5813b4e6204 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/accountWidget/Updating/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13659a984dabca598789efd2b5a3f0753c5d8d8ba705b018c046ee1ebf9d861b
-size 3855
+oid sha256:fd77cb2bccbfa5fdbb2fcdbcc8aa250da2acaccb40636f8336432c3a8bcbab9f
+size 4393
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/FirstOfThree/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/FirstOfThree/Dark.png
new file mode 100644
index 00000000000..de96173bf77
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/FirstOfThree/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a5a33f280f362201bd0b47d0af0201db80578de3467836e2d833138722a2662
+size 2943
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/FirstOfThree/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/FirstOfThree/Light.png
new file mode 100644
index 00000000000..7d731f19048
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/FirstOfThree/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:478534318aa35e1d76fb1ace9de48e1812a477642215bac6776fd8ba73d32085
+size 3240
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/LastOfThree/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/LastOfThree/Dark.png
new file mode 100644
index 00000000000..5abb7698faa
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/LastOfThree/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7a6bd14c478e40d6b525b5e707a881b2cf196d1fac3e6d35e2f8820279b9291
+size 3021
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/LastOfThree/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/LastOfThree/Light.png
new file mode 100644
index 00000000000..317d8e2daa4
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/LastOfThree/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a66b8d7c8034a952c55a9d29589badfc7523d0e6834b32e394574de985cb1e05
+size 3317
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MiddleOfThree/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MiddleOfThree/Dark.png
new file mode 100644
index 00000000000..2928c7703c4
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MiddleOfThree/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:773b90978844edda2e9c46f410a05dbc33dc4df3352132a2e69e8ea98a158283
+size 3003
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MiddleOfThree/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MiddleOfThree/Light.png
new file mode 100644
index 00000000000..f73c2878e0d
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MiddleOfThree/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a69f1e323e95095ae59c534ecf00cd05c781aa48d9489d978364c5782347bba3
+size 3301
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MixedFourComments/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MixedFourComments/Dark.png
new file mode 100644
index 00000000000..705e048acfe
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MixedFourComments/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0eb476b276b44aba0b229fae1e46c7fcd711dfdc394e38e2afb12cf4907f6d5
+size 2966
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MixedFourComments/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MixedFourComments/Light.png
new file mode 100644
index 00000000000..66f5a2083ff
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/MixedFourComments/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:337c0c5757f374533c9ce1d68baaf8dbaec9a87d52693fd0a25b21e65ca936c4
+size 3246
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ReviewOnlyTwoComments/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ReviewOnlyTwoComments/Dark.png
new file mode 100644
index 00000000000..d2ddf405142
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ReviewOnlyTwoComments/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad7ade6d0457628337fd15f7bf2af269b3e7cf847381a0c731373d43e7f1638a
+size 1678
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ReviewOnlyTwoComments/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ReviewOnlyTwoComments/Light.png
new file mode 100644
index 00000000000..4d8f1169e4d
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ReviewOnlyTwoComments/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:995c80c3e0dd4d4b39b1bf3a5ff39f0241808b051c757b7f701398e60ee68454
+size 1927
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/SingleFeedback/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/SingleFeedback/Dark.png
new file mode 100644
index 00000000000..dd639503f61
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/SingleFeedback/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abeabcef4f94e7f813e87473265b897f6670a6e75b6bb8522373af0d75ea5c80
+size 2841
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/SingleFeedback/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/SingleFeedback/Light.png
new file mode 100644
index 00000000000..ce86be68b94
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/SingleFeedback/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79ad5a5603bacb47d19fafbb5faaaa0a8d8dad8dd8dfdbd344d4757b08eb311b
+size 3131
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ZeroOfZero/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ZeroOfZero/Dark.png
new file mode 100644
index 00000000000..f6b8bdf579a
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ZeroOfZero/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03ee9b3c7bb32a4e48fd7668e5bd6363261814553c78e278bacff11919327f82
+size 1731
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ZeroOfZero/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ZeroOfZero/Light.png
new file mode 100644
index 00000000000..80215b1c880
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorOverlayWidget/ZeroOfZero/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92d9237d2185896c69ba039004fab8b13da3da9b96de14c0094ad4bed75da0ce
+size 1997
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Dark.png
new file mode 100644
index 00000000000..b6b68198d16
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f31ed8603c49544a639bf347e4fd5487e759b8c0633c6c5c0132a0bd01d8d3b
+size 21728
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Light.png
new file mode 100644
index 00000000000..34bc9d1d7a6
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:938e0d7793ffc294e9d9cb20a66ea68c7d4e6d80d0cdfd3efabc0f86706ffe8d
+size 21747
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Dark.png
new file mode 100644
index 00000000000..04a0ee89745
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:103cb85f051ef1d6b78bcfc6ae52c2e47d0b02fcc26ec79e043cf659936f3079
+size 21499
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Light.png
new file mode 100644
index 00000000000..d91fc2ba533
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6e3f743ca0db76ed89bf7bae963937a1fe7f80cbe1cfee270fdb9278479ebbc
+size 21511
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Dark.png
new file mode 100644
index 00000000000..8b028accee5
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d68bb0ed9daae712035f7b409755c98c90ae350209c79a5d158c4794c7fb17ee
+size 39273
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Light.png
new file mode 100644
index 00000000000..90fdcb2a79b
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aef346aa29334aa0a913428cf9ae9718b0c48e947699196d35af1fe423ce101a
+size 39484
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Dark.png
new file mode 100644
index 00000000000..37897eab608
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed79dc250ae3a21919868b75e87ddcb5e3541fc8175effb30b75ee1f43f2c747
+size 32493
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Light.png
new file mode 100644
index 00000000000..5b9989573e7
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e81e7cec7d10df749e911c2a820217ca2f9b4e2ad74723a0c34b406a428c845
+size 32556
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Dark.png
new file mode 100644
index 00000000000..d544804d039
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b840c9615892bba45dfad426b8d89fd3bc846b77828202c8268b0afbedc7d99
+size 40832
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Light.png
new file mode 100644
index 00000000000..41140a8fd7f
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90c649d3652033051bae32af21426ab56d396dc6f95c416d68001de389a968d7
+size 40737
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Dark.png
new file mode 100644
index 00000000000..8aa66f35343
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d40696547bef16609fbff1b36fdf88cd242f45b4529de5beb6c235168c3a2f4
+size 32304
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Light.png
new file mode 100644
index 00000000000..9f9555ca732
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f067c3710e82fb33c6884331944ecc054c2db96d05c0f09b27a3433fbb58e918
+size 32420
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Dark.png
new file mode 100644
index 00000000000..fa88d5199a3
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:156060baa8c3ceeb34276bd66364db534ecde67ef874839735bc58fe03412545
+size 31499
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Light.png
new file mode 100644
index 00000000000..0440191de71
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1af58120b25a4356142ef9b658e1937ecfa379bc18b51a82abf707209f9c555f
+size 31651
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Dark.png
new file mode 100644
index 00000000000..fcd00f3e1dd
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:754354efe48cd19db11a23859a7d168b7722ffe7c94a2d1d6a83e860dd1d8bc1
+size 31690
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Light.png
new file mode 100644
index 00000000000..7dd84faba71
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47ccacf1fe7f746aedd45ce7d81135ff7d58ba7924afea1dc1e4e44b36765e36
+size 31961
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Dark.png
new file mode 100644
index 00000000000..539c0edab2f
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8c72535a1d1d8f19519e8a865ffb6bc2a2b3488125ccadc5d0c2958c7c0f1d3
+size 33251
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Light.png
new file mode 100644
index 00000000000..78d20258926
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b91f439c5fc5200cab8bf877ad06573cf923befffd8a9451a87a1f2c10c1cf51
+size 33529
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Dark.png
new file mode 100644
index 00000000000..57c3d4537fa
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf0f8e48d5166f74620046e71d020e565a283e27a6f4ada23007dccd0177c59f
+size 30241
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Light.png
new file mode 100644
index 00000000000..aa7b5af0cb0
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94d176b14582786b122c68a1d6e4760b0a1849f93a1301cfd146b66c441fca23
+size 30543
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Dark.png
new file mode 100644
index 00000000000..9ff5cb97d6c
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8329c6b260e5aed1be14f8b6211b0eb575ac932ac41ee6b1f8ed9309ccc1f203
+size 34533
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Light.png
new file mode 100644
index 00000000000..6dad7fcfeb4
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5694640859e028e0c80d2aaff4c46e05ca4e7a6b65f0ef8da2c32954ca938312
+size 34621
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Dark.png
new file mode 100644
index 00000000000..51753f0276c
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d116e7929903a5ba516208842d47cef6affbec42c1490117a763adb2e8c0a872
+size 24215
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Light.png
new file mode 100644
index 00000000000..a4c463f6da4
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fbcce1ce76886c46077b6a8de3a8a2f2cde7956bc4ae872bfbad6d72ca957e5
+size 24326
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Dark.png
new file mode 100644
index 00000000000..aee5a08426b
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Dark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:513832a1332a89716c33be68569771f5e416a230c02935fa6df44b3f75d7edcc
+size 20061
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Light.png
new file mode 100644
index 00000000000..2b785522258
--- /dev/null
+++ b/test/componentFixtures/.screenshots/baseline/sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Light.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00a56c45837bf2559b1e029a362e87d16faefff17c55a3b332248b8e40d5852a
+size 19760
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Dark.png
index dc686609d7f..f397dfdec23 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6332afcc844f37a800f11ba7b49f8d5ef61f160f9ea285a34fcf08df462c8de
-size 1749
+oid sha256:168b95b9f8ac66d3eb19912c5c79d97688fa4ad56656b84722bd6cf7cd7eec05
+size 1794
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Light.png
index dbca2be966b..63f849c6e3b 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Collapsed/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c567d79fce21467c90bdf833d5d387c1a7e91070fa908d7fdb53595a0adfcb1
-size 1686
+oid sha256:13cd78e9f0f1197cb37ef285e847b7b501a1c2146841a61e39e6bdb01f636343
+size 1756
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Dark.png
index 3c121b4057c..6d9e4cbe59a 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b217c46a4e2cfd993def8baf8e2fb2808a825d0b38fad553ec82a65ee1148e72
-size 1936
+oid sha256:20a6ea07c40832684cd3e5e9ca086fc9603a836054cec26f18fb68f99d93bf89
+size 2004
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Light.png
index 08073d4119a..62077ea01aa 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/CollapsedWithMcpServers/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86dd22c02f0f4d1f4a46ce55f8546dfe70032a199ffa10683a9daa47cecfad59
-size 1889
+oid sha256:cdf33d525b651e9f85dabad808fe35b25584d9e53c9d93967abfb63dae26e02e
+size 1962
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Dark.png
index 162ecbb0952..3adc18ea52d 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bdc6ca3ffa8ea88ed6184379239b81d0ecd90cfc56dc3cecd84be616d3c22c0
-size 8122
+oid sha256:da681012d7da925e334696e43541dad364db36b4607d810a35c823d331358e76
+size 8976
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Light.png
index 03dd01d13f4..8a248678bf7 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/Expanded/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5ff42ad20ea3c0fa7e43d1db6fac737890f149942caff51e3e0e1d041a3c015
-size 7865
+oid sha256:ca2aaf92aaa0c8ab0c1068313ba6bb0922a4ebcfad1ae44828c65aea8ce659a9
+size 8618
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Dark.png
index 2bebcf187a9..1b65bcbfdb4 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2a797c09dcd81f2128eb937eb53f1f7a28131978a7f654dc95092b39172d098
-size 9388
+oid sha256:5e9fa01877aff43ace14d6c03f057cab0fac342d07b3017e8de59fea426ab6b4
+size 10157
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Light.png
index 556520e8b8b..0216382acc0 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithCounts/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a26cc493b80a889baa2495307abd147405ef256c0713a84fcae26cb5918b39e4
-size 9131
+oid sha256:bc66d87503f03fa9a1b6763212fc6a8841d09cb623b72ad138d49c72144811c9
+size 9807
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Dark.png
index 621b8b35147..e439e70fd98 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b835e8c51e723ecb0a11cb167b81a76b4a4938895a1b05291ac5fd609446923
-size 8341
+oid sha256:251b0f2350912e67651fca69af92089dabfd366916b50d87239203d6e0d9d984
+size 9174
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Light.png
index b5d3ff1d64e..8b8010b0966 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/aiCustomizationShortcutsWidget/WithMcpServers/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae32840ac5637faa899f21c94acdc7e2f5c065d705e2a3b103a23a381849dfde
-size 8065
+oid sha256:fc9cf8244298eaea71c646e3a8c09e2bf72ccbb045d85ee65c2eb1a4a7a54c9c
+size 8826
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Dark.png
index d06f5a35857..fa3764a9150 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:125f1d570fdad186e94fc580d44e8560b6ecc3de58e3adc86d23045bdda21a8d
-size 7784
+oid sha256:913b6334d09b4f99fb00e1c5cccb47b74026742119291b4bdf39dca0c3cb099d
+size 8211
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Light.png
index 9ce0500c3ba..c4b93d3705c 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverAvailableForDownload/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afb19ee8b136f65d80f8aa7de11cf983926458999b153568d6fe6303ab5c0236
-size 7692
+oid sha256:372891fecb0ed1ea2fcb60eaadd981f8681b09a6dcf4aad6bab743c28d0cb82e
+size 7707
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Dark.png
index 01d70e70f0a..a4a3caa86d9 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28bdc58d5f8ec2b28df3b6762fddb4dcc9477fd3dfe98af5a7d4c311ebf4e3c1
-size 7218
+oid sha256:97d9a5c1eb6d9b1b37f5eb5f2b30bcbba39101d1ad6cbb1b70acc0269e3e0687
+size 7720
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Light.png
index 4ffae5781dc..b2e00200acc 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverDownloading30Percent/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:977c95e98e10ec21093424a2d4038131b9d95c69d27ef225b501529c4308e497
-size 7076
+oid sha256:cac2963771db45a00f0162ea36d32bf42ea9c887e7f08ae5cf50c65384fa11cc
+size 7181
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Dark.png
index 571d58ad4c3..ec767a77ce1 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:595c42b464f87696ead04be8a367c1ba36dd75ec5115fa00ad7ee2ddc80c7644
-size 6875
+oid sha256:8e53afcae102ac647a2c8fd20de8f68b636d13dfdb9ef9340f1ded2c855e1c68
+size 7141
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Light.png
index 3c0f774ad10..7e991c5d862 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverInstalling/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d393b6215ebc0f299a2a7e21076835c6b3ee9035b94917ddc5a7d298222c1b3
-size 6706
+oid sha256:b94f6af1d6fb348229cc6fcfec55c7218827eb6c62bb7fa0471cbbdd577e0ba9
+size 6659
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Dark.png
index acbc58e86db..4bba36e4a16 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abdf653a0b09dd50655217b4c05e55cbb7a1f53ab8768809125d4eff48cace22
-size 7523
+oid sha256:7db6b80ce8d24c206ee1de9fe5c8a4c0ee210a9cbae3dedaef115c4a1a7656d4
+size 7933
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Light.png
index 7755b21fe51..2d34ffbd691 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverReady/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:269f58f05dd9f4cea1b4f09a92f6f58b2cc55345e9252b05297b7328489dd0bf
-size 7303
+oid sha256:c68d46fd11691453d3a366a63912303eb8f52612751d6f4a208d5fbad724283f
+size 7484
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Dark.png
index a574cc4e101..345dde1c6bb 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:631998b418a3af1a791470fb4b557e2b3fcd35d66d50e6c98e5c70d578b016cb
-size 7367
+oid sha256:1982070f60aa37656afe537df68caa7c995fa56189977fbb79d81ad691d49e2c
+size 7661
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Light.png
index 9f89acdebc1..38af8f9fb1a 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverSameVersion/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f96bd7a669274b547229bce41ffc400983dc4656d97ecf820fc94d65df1a418
-size 7078
+oid sha256:2a4b9a8a19eb9216366b3f5867aa97eb2218889d4e12eb73ab8272791cbae013
+size 7167
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Dark.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Dark.png
index 1b1a0fe693f..bd5e8e87e2e 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Dark.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e15ec5f380f9bc357fc6ddbd02b954930815bbdabd0d86c52b9e05550ad3a21c
-size 7101
+oid sha256:dea8a075eaf748a1e3b00e5f489d67ac610a87f938be2aa0563d2e57c4a6c762
+size 7151
diff --git a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Light.png b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Light.png
index 0fd86f37325..56b4f8c9141 100644
--- a/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Light.png
+++ b/test/componentFixtures/.screenshots/baseline/sessions/updateHoverWidget/UpdateHoverUpdating/Light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f50b8ee6944db9878190b9ec57fa87c4032d6697cb3827db3fa651f25aa38183
-size 6980
+oid sha256:a211dd61eb632e8a55815c392206174150cb5cc37561d95147376fbb75d5c58d
+size 6717
diff --git a/test/componentFixtures/component-explorer-config.schema.json b/test/componentFixtures/component-explorer-config.schema.json
deleted file mode 100644
index 3d129dc3b7e..00000000000
--- a/test/componentFixtures/component-explorer-config.schema.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"type": "object",
-	"properties": {
-		"screenshotDir": {
-			"description": "Directory for storing screenshots (default: .screenshots)",
-			"type": "string"
-		},
-		"sessions": {
-			"minItems": 1,
-			"type": "array",
-			"items": {
-				"type": "object",
-				"properties": {
-					"name": {
-						"type": "string",
-						"description": "Unique session name"
-					},
-					"source": {
-						"anyOf": [
-							{
-								"type": "string",
-								"const": "current"
-							},
-							{
-								"type": "object",
-								"properties": {
-									"worktree": {
-										"type": "object",
-										"properties": {
-											"ref": {
-												"type": "string",
-												"description": "Git ref (branch, tag, or commit) to check out"
-											},
-											"name": {
-												"description": "Directory name for the worktree (default: component-explorer-baseline)",
-												"type": "string"
-											},
-											"install": {
-												"anyOf": [
-													{
-														"type": "string",
-														"const": "auto"
-													},
-													{
-														"type": "string",
-														"const": "npm"
-													},
-													{
-														"type": "string",
-														"const": "pnpm"
-													},
-													{
-														"type": "string",
-														"const": "yarn"
-													},
-													{
-														"type": "object",
-														"properties": {
-															"command": {
-																"type": "string",
-																"description": "Custom install command to run in the worktree"
-															}
-														},
-														"required": [
-															"command"
-														],
-														"additionalProperties": false
-													},
-													{
-														"type": "boolean",
-														"const": false
-													}
-												],
-												"description": "Dependency install strategy for the worktree"
-											}
-										},
-										"required": [
-											"ref"
-										],
-										"additionalProperties": false,
-										"description": "Git worktree configuration for a baseline session"
-									}
-								},
-								"required": [
-									"worktree"
-								],
-								"additionalProperties": false
-							}
-						],
-						"description": "Session source: \"current\" for the working tree, or a worktree config for a baseline"
-					},
-					"viteConfig": {
-						"description": "Path to vite config file, relative to this config (overrides top-level viteConfig)",
-						"type": "string"
-					}
-				},
-				"required": [
-					"name"
-				],
-				"additionalProperties": false,
-				"description": "A component explorer session"
-			},
-			"description": "List of explorer sessions"
-		},
-		"compare": {
-			"type": "object",
-			"properties": {
-				"baseline": {
-					"type": "string",
-					"description": "Session name to use as the baseline for comparisons"
-				},
-				"current": {
-					"type": "string",
-					"description": "Session name to use as the current version for comparisons"
-				}
-			},
-			"required": [
-				"baseline",
-				"current"
-			],
-			"additionalProperties": false,
-			"description": "Screenshot comparison configuration"
-		},
-		"viteConfig": {
-			"description": "Default vite config file path, relative to this config (default: vite.config.ts)",
-			"type": "string"
-		},
-		"vite": {
-			"type": "object",
-			"properties": {
-				"hmr": {
-					"type": "object",
-					"properties": {
-						"allowedPaths": {
-							"type": "array",
-							"items": {
-								"type": "string"
-							},
-							"description": "Glob patterns for files that keep HMR; everything else triggers a full reload"
-						}
-					},
-					"required": [
-						"allowedPaths"
-					],
-					"additionalProperties": false,
-					"description": "Vite HMR configuration"
-				}
-			},
-			"additionalProperties": false,
-			"description": "Vite configuration overrides"
-		},
-		"redirection": {
-			"type": "object",
-			"properties": {
-				"port": {
-					"type": "integer",
-					"minimum": 1,
-					"maximum": 65535,
-					"description": "Port for the redirection HTTP server"
-				},
-				"host": {
-					"description": "Host to bind the redirection server to (default: localhost)",
-					"type": "string"
-				}
-			},
-			"required": [
-				"port"
-			],
-			"additionalProperties": false,
-			"description": "HTTP redirection server that redirects to the session URL"
-		},
-		"$schema": {
-			"type": "string",
-			"description": "URL of the JSON Schema for this config file"
-		}
-	},
-	"required": [
-		"sessions"
-	],
-	"additionalProperties": false,
-	"description": "Component Explorer configuration"
-}
diff --git a/test/componentFixtures/component-explorer.json b/test/componentFixtures/component-explorer.json
index 2f24a100b02..cc0a4596269 100644
--- a/test/componentFixtures/component-explorer.json
+++ b/test/componentFixtures/component-explorer.json
@@ -1,11 +1,17 @@
 {
-	"$schema": "./component-explorer-config.schema.json",
+	"$schema": "../../node_modules/@vscode/component-explorer-cli/dist/component-explorer-config.schema.json",
 	"screenshotDir": ".screenshots",
 	"sessions": [
 		{
 			"name": "current"
 		}
 	],
+	"worktree": {
+		"maxSlots": 1,
+		"setup": {
+			"command": "echo 'test'"
+		}
+	},
 	"redirection": {
 		"port": 5337
 	},
diff --git a/test/mcp/package-lock.json b/test/mcp/package-lock.json
index 311b01f21bf..25b41f55f79 100644
--- a/test/mcp/package-lock.json
+++ b/test/mcp/package-lock.json
@@ -702,9 +702,9 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.5",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.5.tgz",
-      "integrity": "sha512-3qq+FUBtlTHhtYxbxheZgY8NIFnkkC/MR8u5TTsr7YZ3wixryQ3cCwn3iZbg8p8B88iDBBAYSfZDS75t8MN7Vg==",
+      "version": "4.12.7",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.7.tgz",
+      "integrity": "sha512-jq9l1DM0zVIvsm3lv9Nw9nlJnMNPOcAtsbsgiUhWcFzPE99Gvo6yRTlszSLLYacMeQ6quHD6hMfId8crVHvexw==",
       "license": "MIT",
       "engines": {
         "node": ">=16.9.0"
diff --git a/test/monaco/.npmrc b/test/monaco/.npmrc
index a9c57709666..efe233421c4 100644
--- a/test/monaco/.npmrc
+++ b/test/monaco/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps="true"
 timeout=180000
+min-release-age="1"
diff --git a/test/monaco/package-lock.json b/test/monaco/package-lock.json
index 513d33eeb34..3e3df8a1775 100644
--- a/test/monaco/package-lock.json
+++ b/test/monaco/package-lock.json
@@ -8,11 +8,79 @@
       "name": "test-monaco",
       "version": "1.0.0",
       "license": "MIT",
+      "dependencies": {
+        "postcss": "^8.5.6"
+      },
       "devDependencies": {
         "@types/chai": "^4.2.14",
         "axe-playwright": "^2.1.0",
         "chai": "^4.2.0",
-        "warnings-to-errors-webpack-plugin": "^2.3.0"
+        "css-loader": "^6.9.1",
+        "file-loader": "^6.2.0",
+        "style-loader": "^3.3.2",
+        "warnings-to-errors-webpack-plugin": "^2.3.0",
+        "webpack": "^5.105.0",
+        "webpack-cli": "^5.1.4"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@types/chai": {
@@ -21,6 +89,42 @@
       "integrity": "sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==",
       "dev": true
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/junit-report-builder": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/junit-report-builder/-/junit-report-builder-3.0.2.tgz",
@@ -28,6 +132,333 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/node": {
+      "version": "25.4.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.4.0.tgz",
+      "integrity": "sha512-9wLpoeWuBlcbBpOY3XmzSTG3oscB6xjBEEtn+pYXTfhyXhIxC5FsBer2KTopBlvKEiW9l13po9fq+SJY/5lkhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.18.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/assertion-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
@@ -80,6 +511,91 @@
         "playwright": ">1.0.0"
       }
     },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
+      "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001777",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001777.tgz",
+      "integrity": "sha512-tmN+fJxroPndC74efCdp12j+0rk0RHwV5Jwa1zWaFVyw2ZxAuPeG8ZgWC3Wz7uSjT3qMRQ5XHZ4COgQmsCMJAQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
     "node_modules/chai": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
@@ -106,6 +622,122 @@
         "node": "*"
       }
     },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/deep-eql": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
@@ -118,6 +750,220 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.307",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.307.tgz",
+      "integrity": "sha512-5z3uFKBWjiNR44nFcYdkcXjKMbg5KXNdciu7mhTPo9tB7NbqSNP2sSnGR+fqknZSCwKkBN+oxiiajWs4dT6ORg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.0.tgz",
+      "integrity": "sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.21.0.tgz",
+      "integrity": "sha512-Lw7I8Zp5YKHFCXL7+Dz95g4CcbMEpgvqZNNq3AmlT5XAV6CgAAk6gyAMqn2zjw08K9BHfcNuKrMiCPLByGafow==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.9.1"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/get-func-name": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
@@ -128,6 +974,174 @@
         "node": "*"
       }
     },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/junit-report-builder": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/junit-report-builder/-/junit-report-builder-5.1.1.tgz",
@@ -143,6 +1157,58 @@
         "node": ">=16"
       }
     },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.11.5"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/lodash": {
       "version": "4.17.23",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
@@ -166,6 +1232,36 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mustache": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
@@ -176,6 +1272,104 @@
         "mustache": "bin/mustache"
       }
     },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.36.tgz",
+      "integrity": "sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -189,9 +1383,229 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
       "license": "ISC"
     },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.8",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
+      "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -202,6 +1616,242 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.46.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
+      "integrity": "sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.15.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
+      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^4.3.0",
+        "terser": "^5.31.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
@@ -211,6 +1861,61 @@
         "node": ">=4"
       }
     },
+    "node_modules/undici-types": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/warnings-to-errors-webpack-plugin": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/warnings-to-errors-webpack-plugin/-/warnings-to-errors-webpack-plugin-2.3.0.tgz",
@@ -220,6 +1925,230 @@
         "webpack": "^2.2.0-rc || ^3 || ^4 || ^5"
       }
     },
+    "node_modules/watchpack": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
+      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.105.4",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.4.tgz",
+      "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.8",
+        "@types/json-schema": "^7.0.15",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.16.0",
+        "acorn-import-phases": "^1.0.3",
+        "browserslist": "^4.28.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.20.0",
+        "es-module-lexer": "^2.0.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.3.1",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^4.3.3",
+        "tapable": "^2.3.0",
+        "terser-webpack-plugin": "^5.3.17",
+        "watchpack": "^2.5.1",
+        "webpack-sources": "^3.3.4"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^2.1.1",
+        "@webpack-cli/info": "^2.0.2",
+        "@webpack-cli/serve": "^2.0.5",
+        "colorette": "^2.0.14",
+        "commander": "^10.0.1",
+        "cross-spawn": "^7.0.3",
+        "envinfo": "^7.7.3",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^3.1.1",
+        "rechoir": "^0.8.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",
+      "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/webpack/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/xmlbuilder": {
       "version": "15.1.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
diff --git a/test/monaco/package.json b/test/monaco/package.json
index c7373919431..89902f2304f 100644
--- a/test/monaco/package.json
+++ b/test/monaco/package.json
@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "compile": "node ../../node_modules/typescript/bin/tsc",
-    "bundle-webpack": "node ../../node_modules/webpack/bin/webpack --config ./webpack.config.js --bail",
+    "bundle-webpack": "webpack --config ./webpack.config.js --bail",
     "esm-check": "node esm-check/esm-check.js",
     "test": "node runner.js"
   },
@@ -14,6 +14,14 @@
     "@types/chai": "^4.2.14",
     "axe-playwright": "^2.1.0",
     "chai": "^4.2.0",
-    "warnings-to-errors-webpack-plugin": "^2.3.0"
+    "css-loader": "^6.9.1",
+    "file-loader": "^6.2.0",
+    "style-loader": "^3.3.2",
+    "warnings-to-errors-webpack-plugin": "^2.3.0",
+    "webpack": "^5.105.0",
+    "webpack-cli": "^5.1.4"
+  },
+  "dependencies": {
+    "postcss": "^8.5.6"
   }
 }
diff --git a/test/sanity/src/context.ts b/test/sanity/src/context.ts
index 62eee018d06..02d94340375 100644
--- a/test/sanity/src/context.ts
+++ b/test/sanity/src/context.ts
@@ -34,6 +34,7 @@ export class TestContext {
 	private static readonly authenticodeInclude = /^.+\.(exe|dll|sys|cab|cat|msi|jar|ocx|ps1|psm1|psd1|ps1xml|pssc1)$/i;
 	private static readonly versionInfoInclude = /^.+\.(exe|dll|node|msi)$/i;
 	private static readonly versionInfoExclude = /^(dxil\.dll|ffmpeg\.dll|msalruntime\.dll)$/i;
+	private static readonly dpkgLockError = /dpkg frontend lock was locked by another process|unable to acquire the dpkg frontend lock|could not get lock \/var\/lib\/dpkg\/lock-frontend/i;
 
 	private readonly tempDirs = new Set<string>();
 	private readonly wslTempDirs = new Set<string>();
@@ -141,10 +142,27 @@ export class TestContext {
 	public error(message: string): never {
 		const line = `[${new Date().toISOString()}] ERROR: ${message}`;
 		this.consoleOutputs.push(line);
-		console.error(line);
+		console.error(`##vso[task.logissue type=error]${line}`);
 		throw new Error(message);
 	}
 
+	/**
+	 * Logs a warning message with a timestamp.
+	 */
+	public warn(message: string) {
+		const line = `[${new Date().toISOString()}] WARNING: ${message}`;
+		this.consoleOutputs.push(line);
+		console.warn(`##vso[task.logissue type=warning]${line}`);
+	}
+
+	/**
+	 * Returns a promise that resolves after the specified delay in milliseconds.
+	 * @param delay The delay in milliseconds to wait before resolving the promise.
+	 */
+	private timeout(delay: number) {
+		return new Promise(resolve => setTimeout(resolve, delay));
+	}
+
 	/**
 	 * Creates a new temporary directory and returns its path.
 	 */
@@ -220,7 +238,7 @@ export class TestContext {
 				fs.rmSync(dir, { recursive: true, force: true });
 				this.log(`Deleted temp directory: ${dir}`);
 			} catch (error) {
-				this.log(`Failed to delete temp directory: ${dir}: ${error}`);
+				this.warn(`Failed to delete temp directory: ${dir}: ${error}`);
 			}
 		}
 		this.tempDirs.clear();
@@ -229,7 +247,7 @@ export class TestContext {
 			try {
 				this.deleteWslDir(dir);
 			} catch (error) {
-				this.log(`Failed to delete WSL temp directory: ${dir}: ${error}`);
+				this.warn(`Failed to delete WSL temp directory: ${dir}: ${error}`);
 			}
 		}
 		this.wslTempDirs.clear();
@@ -247,8 +265,8 @@ export class TestContext {
 		for (let attempt = 0; attempt < maxRetries; attempt++) {
 			if (attempt > 0) {
 				const delay = Math.pow(2, attempt - 1) * 1000;
-				this.log(`Retrying fetch (attempt ${attempt + 1}/${maxRetries}) after ${delay}ms`);
-				await new Promise(resolve => setTimeout(resolve, delay));
+				this.warn(`Retrying fetch (attempt ${attempt + 1}/${maxRetries}) after ${delay}ms`);
+				await this.timeout(delay);
 			}
 
 			try {
@@ -266,7 +284,7 @@ export class TestContext {
 				return response as Response & { body: NodeJS.ReadableStream };
 			} catch (error) {
 				lastError = error instanceof Error ? error : new Error(String(error));
-				this.log(`Fetch attempt ${attempt + 1} failed: ${lastError.message}`);
+				this.warn(`Fetch attempt ${attempt + 1} failed: ${lastError.message}`);
 			}
 		}
 
@@ -643,6 +661,58 @@ export class TestContext {
 		return result;
 	}
 
+	/**
+	 * Runs a command with sudo if not running as root, and ensures it succeeds.
+	 * @param command The command to run.
+	 * @param args Optional arguments for the command.
+	 * @returns The result of the spawnSync call.
+	 */
+	private runSudoNoErrors(command: string, ...args: string[]): SpawnSyncReturns<string> {
+		if (this.isRootUser) {
+			return this.runNoErrors(command, ...args);
+		} else {
+			return this.runNoErrors('sudo', command, ...args);
+		}
+	}
+
+	/**
+	 * Runs a dpkg command with retries if the frontend lock is busy, and ensures it succeeds.
+	 */
+	private async runDpkgNoErrors(...args: string[]) {
+		const command = this.isRootUser ? 'dpkg' : 'sudo';
+		const commandArgs = this.isRootUser ? args : ['dpkg', ...args];
+		const maxRetries = 5;
+		let lastError: string | undefined;
+
+		for (let attempt = 0; attempt < maxRetries; attempt++) {
+			if (attempt > 0) {
+				const delay = Math.pow(2, attempt - 1) * 1000;
+				this.log(`Retrying dpkg command (attempt ${attempt + 1}/${maxRetries}) after ${delay}ms`);
+				await this.timeout(delay);
+			}
+
+			const result = this.run(command, ...commandArgs);
+			if (result.error !== undefined) {
+				lastError = `Failed to run command: ${result.error.message}`;
+				break;
+			}
+
+			if (result.status === 0) {
+				return;
+			}
+
+			lastError = `Command exited with code ${result.status}: ${result.stderr}`;
+			const output = `${result.stdout}${result.stderr}`;
+			if (!TestContext.dpkgLockError.test(output)) {
+				break;
+			}
+
+			this.log(`dpkg lock is busy, waiting for the other package manager process to finish`);
+		}
+
+		this.error(lastError ?? `Command failed after ${maxRetries} attempts because the dpkg frontend lock remained busy`);
+	}
+
 	/**
 	 * Kills a process and all its child processes.
 	 * @param pid The process ID to kill.
@@ -727,7 +797,7 @@ export class TestContext {
 		this.runNoErrors(uninstallerPath, '/silent');
 		this.log(`Uninstalled VS Code from ${appDir} successfully`);
 
-		await new Promise(resolve => setTimeout(resolve, 2000));
+		await this.timeout(2000);
 		if (fs.existsSync(appDir)) {
 			this.error(`Installation directory still exists after uninstall: ${appDir}`);
 		}
@@ -738,13 +808,9 @@ export class TestContext {
 	 * @param packagePath The path to the DEB file.
 	 * @returns The path to the installed VS Code executable.
 	 */
-	public installDeb(packagePath: string): string {
+	public async installDeb(packagePath: string): Promise<string> {
 		this.log(`Installing ${packagePath} using DEB package manager`);
-		if (this.isRootUser) {
-			this.runNoErrors('dpkg', '-i', packagePath);
-		} else {
-			this.runNoErrors('sudo', 'dpkg', '-i', packagePath);
-		}
+		await this.runDpkgNoErrors('-i', packagePath);
 		this.log(`Installed ${packagePath} successfully`);
 
 		const name = this.getLinuxBinaryName();
@@ -761,14 +827,10 @@ export class TestContext {
 		const packagePath = path.join('/usr/share', name, name);
 
 		this.log(`Uninstalling DEB package ${packagePath}`);
-		if (this.isRootUser) {
-			this.runNoErrors('dpkg', '-r', name);
-		} else {
-			this.runNoErrors('sudo', 'dpkg', '-r', name);
-		}
+		await this.runDpkgNoErrors('-r', name);
 		this.log(`Uninstalled DEB package ${packagePath} successfully`);
 
-		await new Promise(resolve => setTimeout(resolve, 1000));
+		await this.timeout(1000);
 		if (fs.existsSync(packagePath)) {
 			this.error(`Package still exists after uninstall: ${packagePath}`);
 		}
@@ -781,11 +843,7 @@ export class TestContext {
 	 */
 	public installRpm(packagePath: string): string {
 		this.log(`Installing ${packagePath} using RPM package manager`);
-		if (this.isRootUser) {
-			this.runNoErrors('rpm', '-i', packagePath);
-		} else {
-			this.runNoErrors('sudo', 'rpm', '-i', packagePath);
-		}
+		this.runSudoNoErrors('rpm', '-i', packagePath);
 		this.log(`Installed ${packagePath} successfully`);
 
 		const name = this.getLinuxBinaryName();
@@ -802,14 +860,10 @@ export class TestContext {
 		const packagePath = path.join('/usr/bin', name);
 
 		this.log(`Uninstalling RPM package ${packagePath}`);
-		if (this.isRootUser) {
-			this.runNoErrors('rpm', '-e', name);
-		} else {
-			this.runNoErrors('sudo', 'rpm', '-e', name);
-		}
+		this.runSudoNoErrors('rpm', '-e', name);
 		this.log(`Uninstalled RPM package ${packagePath} successfully`);
 
-		await new Promise(resolve => setTimeout(resolve, 1000));
+		await this.timeout(1000);
 		if (fs.existsSync(packagePath)) {
 			this.error(`Package still exists after uninstall: ${packagePath}`);
 		}
@@ -822,11 +876,7 @@ export class TestContext {
 	 */
 	public installSnap(packagePath: string): string {
 		this.log(`Installing ${packagePath} using Snap package manager`);
-		if (this.isRootUser) {
-			this.runNoErrors('snap', 'install', packagePath, '--classic', '--dangerous');
-		} else {
-			this.runNoErrors('sudo', 'snap', 'install', packagePath, '--classic', '--dangerous');
-		}
+		this.runSudoNoErrors('snap', 'install', packagePath, '--classic', '--dangerous');
 		this.log(`Installed ${packagePath} successfully`);
 
 		// Snap wrapper scripts are in /snap/bin, but actual Electron binary is in /snap/<package>/current/usr/share/
@@ -844,14 +894,10 @@ export class TestContext {
 		const packagePath = path.join('/snap/bin', name);
 
 		this.log(`Uninstalling Snap package ${packagePath}`);
-		if (this.isRootUser) {
-			this.runNoErrors('snap', 'remove', name);
-		} else {
-			this.runNoErrors('sudo', 'snap', 'remove', name);
-		}
+		this.runSudoNoErrors('snap', 'remove', name);
 		this.log(`Uninstalled Snap package ${packagePath} successfully`);
 
-		await new Promise(resolve => setTimeout(resolve, 1000));
+		await this.timeout(1000);
 		if (fs.existsSync(packagePath)) {
 			this.error(`Package still exists after uninstall: ${packagePath}`);
 		}
@@ -1091,7 +1137,7 @@ export class TestContext {
 			await page.screenshot({ path: screenshotPath, fullPage: true });
 			this.log(`Screenshot saved to: ${screenshotPath}`);
 		} catch (e) {
-			this.log(`Failed to capture screenshot: ${e instanceof Error ? e.message : String(e)}`);
+			this.warn(`Failed to capture screenshot: ${e instanceof Error ? e.message : String(e)}`);
 		}
 	}
 
diff --git a/test/sanity/src/desktop.test.ts b/test/sanity/src/desktop.test.ts
index c2d65c157db..297a939f19c 100644
--- a/test/sanity/src/desktop.test.ts
+++ b/test/sanity/src/desktop.test.ts
@@ -95,7 +95,7 @@ export function setup(context: TestContext) {
 	context.test('desktop-linux-deb-arm64', ['linux', 'arm64', 'deb', 'desktop'], async () => {
 		const packagePath = await context.downloadTarget('linux-deb-arm64');
 		if (!context.options.downloadOnly) {
-			const entryPoint = context.installDeb(packagePath);
+			const entryPoint = await context.installDeb(packagePath);
 			await testDesktopApp(entryPoint);
 			await context.uninstallDeb();
 		}
@@ -104,7 +104,7 @@ export function setup(context: TestContext) {
 	context.test('desktop-linux-deb-armhf', ['linux', 'arm32', 'deb', 'desktop'], async () => {
 		const packagePath = await context.downloadTarget('linux-deb-armhf');
 		if (!context.options.downloadOnly) {
-			const entryPoint = context.installDeb(packagePath);
+			const entryPoint = await context.installDeb(packagePath);
 			await testDesktopApp(entryPoint);
 			await context.uninstallDeb();
 		}
@@ -113,7 +113,7 @@ export function setup(context: TestContext) {
 	context.test('desktop-linux-deb-x64', ['linux', 'x64', 'deb', 'desktop'], async () => {
 		const packagePath = await context.downloadTarget('linux-deb-x64');
 		if (!context.options.downloadOnly) {
-			const entryPoint = context.installDeb(packagePath);
+			const entryPoint = await context.installDeb(packagePath);
 			await testDesktopApp(entryPoint);
 			await context.uninstallDeb();
 		}
diff --git a/test/sanity/src/uiTest.ts b/test/sanity/src/uiTest.ts
index 65f8b14a49e..96733481e96 100644
--- a/test/sanity/src/uiTest.ts
+++ b/test/sanity/src/uiTest.ts
@@ -138,7 +138,7 @@ export class UITest {
 		const extensionItem = page.locator('.extension-list-item').getByText(/^GitHub Pull Requests$/);
 		const messageContainer = page.locator('.extensions-viewlet .message-container:not(.hidden)').first();
 
-		for (let attempt = 0; attempt < 3; attempt++) {
+		for (let attempt = 0; attempt < 5; attempt++) {
 			const result = await Promise.race([
 				extensionItem.waitFor().then(() => 'found' as const),
 				messageContainer.waitFor().then(() => 'message' as const),
@@ -149,20 +149,33 @@ export class UITest {
 			}
 
 			const message = await messageContainer.locator('.message').innerText();
-			this.context.log(`Marketplace message: ${message} (attempt ${attempt + 1}/3), clicking Refresh`);
+			this.context.log(`Marketplace message: ${message} (attempt ${attempt + 1}/5), clicking Refresh`);
 			await page.getByRole('button', { name: 'Refresh' }).click();
-			await messageContainer.waitFor({ state: 'hidden', timeout: 30_000 });
+			await page.waitForTimeout(5_000);
 		}
 
 		await extensionItem.waitFor();
 
-		this.context.log('Clicking Install on the first extension in the list');
-		const installButton = page.locator('.extension-action:not(.disabled)', { hasText: /Install/ }).first();
-		await installButton.waitFor();
-		await installButton.click();
+		for (let attempt = 0; attempt < 3; attempt++) {
+			try {
+				this.context.log(`Clicking Install on the first extension in the list (attempt ${attempt + 1}/3)`);
+				const installButton = page.locator('.extension-action:not(.disabled)', { hasText: /Install/ }).first();
+				await installButton.click();
 
-		this.context.log('Waiting for extension to be installed');
-		await page.getByRole('button', { name: 'Uninstall' }).first().waitFor({ timeout: 5 * 60_000 });
+				this.context.log('Waiting for extension to be installed');
+				const uninstallButton = page.getByRole('button', { name: 'Uninstall' }).first();
+				const installed = await uninstallButton.waitFor({ timeout: 5 * 60_000 }).then(() => true, () => false);
+				if (installed) {
+					return;
+				}
+			} catch (error) {
+				this.context.log(`Extension install attempt ${attempt + 1}/3 failed: ${error instanceof Error ? error.message : String(error)}`);
+			}
+
+			this.context.log('Extension install may have failed, retrying');
+		}
+
+		throw new Error('Failed to install extension after 3 attempts');
 	}
 
 	/**
diff --git a/test/smoke/extensions/vscode-smoketest-ext-host/extension.js b/test/smoke/extensions/vscode-smoketest-ext-host/extension.js
index e69899a6b29..c1219497701 100644
--- a/test/smoke/extensions/vscode-smoketest-ext-host/extension.js
+++ b/test/smoke/extensions/vscode-smoketest-ext-host/extension.js
@@ -16,6 +16,16 @@ let deactivateMarkerFile;
  * @param {vscode.ExtensionContext} context
  */
 function activate(context) {
+	// Record extension host pid on every activation so smoke tests can validate
+	// that a new extension host process was started after a restart action.
+	try {
+		const pid = String(process.pid);
+		const activationPidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid-on-activate.txt');
+		fs.writeFileSync(activationPidFile, pid, 'utf-8');
+	} catch {
+		// Ignore errors in smoke helper setup.
+	}
+
 	// This is used to verify that the extension host process is properly killed
 	// when window reloads even if the extension host is blocked
 	// Refs: https://github.com/microsoft/vscode/issues/291346
@@ -23,12 +33,9 @@ function activate(context) {
 		vscode.commands.registerCommand('smoketest.getExtensionHostPidAndBlock', (delayMs = 100, durationMs = 60000) => {
 			const pid = process.pid;
 
-			// Write PID file to workspace folder if available, otherwise temp dir
+			// Write PID file to temp dir to avoid polluting workspace search results
 			// Note: filename must match name in extension-host-restart.test.ts
-			const workspaceFolder = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
-			const pidFile = workspaceFolder
-				? path.join(workspaceFolder, 'vscode-ext-host-pid.txt')
-				: path.join(os.tmpdir(), 'vscode-ext-host-pid.txt');
+			const pidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid.txt');
 			setTimeout(() => {
 				fs.writeFileSync(pidFile, String(pid), 'utf-8');
 
@@ -57,13 +64,8 @@ function activate(context) {
 	context.subscriptions.push(
 		vscode.commands.registerCommand('smoketest.setupGracefulDeactivation', () => {
 			const pid = process.pid;
-			const workspaceFolder = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
-			const pidFile = workspaceFolder
-				? path.join(workspaceFolder, 'vscode-ext-host-pid-graceful.txt')
-				: path.join(os.tmpdir(), 'vscode-ext-host-pid-graceful.txt');
-			deactivateMarkerFile = workspaceFolder
-				? path.join(workspaceFolder, 'vscode-ext-host-deactivated.txt')
-				: path.join(os.tmpdir(), 'vscode-ext-host-deactivated.txt');
+			const pidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid-graceful.txt');
+			deactivateMarkerFile = path.join(os.tmpdir(), 'vscode-ext-host-deactivated.txt');
 
 			// Write PID file immediately so test knows the extension is ready
 			fs.writeFileSync(pidFile, String(pid), 'utf-8');
diff --git a/test/smoke/src/areas/extensions/extension-host-restart.test.ts b/test/smoke/src/areas/extensions/extension-host-restart.test.ts
index 6528e61abe3..b26ccad39da 100644
--- a/test/smoke/src/areas/extensions/extension-host-restart.test.ts
+++ b/test/smoke/src/areas/extensions/extension-host-restart.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
+import * as os from 'os';
 import * as path from 'path';
 import { Application, Logger } from '../../../../automation';
 import { installAllHandlers, timeout } from '../../utils';
@@ -30,7 +31,7 @@ export function setup(logger: Logger) {
 			this.timeout(60_000);
 
 			const app = this.app as Application;
-			const pidFile = path.join(app.workspacePathOrFolder, 'vscode-ext-host-pid.txt');
+			const pidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid.txt');
 
 			if (fs.existsSync(pidFile)) {
 				fs.unlinkSync(pidFile);
@@ -78,8 +79,8 @@ export function setup(logger: Logger) {
 			this.timeout(60_000);
 
 			const app = this.app as Application;
-			const pidFile = path.join(app.workspacePathOrFolder, 'vscode-ext-host-pid-graceful.txt');
-			const markerFile = path.join(app.workspacePathOrFolder, 'vscode-ext-host-deactivated.txt');
+			const pidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid-graceful.txt');
+			const markerFile = path.join(os.tmpdir(), 'vscode-ext-host-deactivated.txt');
 
 			// Clean up any existing files
 			if (fs.existsSync(pidFile)) {
@@ -139,5 +140,79 @@ export function setup(logger: Logger) {
 
 			logger.log('Extension host was properly terminated after graceful deactivation');
 		});
+
+		it('kills blocked extension host on restart extension host (issue #296681)', async function () {
+			this.timeout(90_000);
+
+			const app = this.app as Application;
+			const pidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid.txt');
+			const activationPidFile = path.join(os.tmpdir(), 'vscode-ext-host-pid-on-activate.txt');
+
+			if (fs.existsSync(pidFile)) {
+				fs.unlinkSync(pidFile);
+			}
+
+			await app.workbench.quickaccess.runCommand('smoketest.getExtensionHostPidAndBlock');
+
+			let retries = 0;
+			while (!fs.existsSync(pidFile) && retries < 20) {
+				await timeout(500);
+				retries++;
+			}
+
+			if (!fs.existsSync(pidFile)) {
+				throw new Error('PID file was not created - extension may not have activated');
+			}
+
+			const oldPid = parseInt(fs.readFileSync(pidFile, 'utf-8'), 10);
+			logger.log(`Old extension host PID: ${oldPid}`);
+
+			if (fs.existsSync(activationPidFile)) {
+				fs.unlinkSync(activationPidFile);
+			}
+
+			await app.workbench.quickaccess.runCommand('Developer: Restart Extension Host', { keepOpen: true });
+
+			const maxWaitMs = 10_000;
+			const pollIntervalMs = 500;
+			let waitedMs = 0;
+
+			let newPid: number | undefined;
+			while (waitedMs < maxWaitMs) {
+				if (fs.existsSync(activationPidFile)) {
+					const pidText = fs.readFileSync(activationPidFile, 'utf-8').trim();
+					const parsedPid = parseInt(pidText, 10);
+					if (!Number.isNaN(parsedPid) && parsedPid !== oldPid) {
+						newPid = parsedPid;
+						break;
+					}
+				}
+
+				await timeout(pollIntervalMs);
+				waitedMs += pollIntervalMs;
+			}
+
+			if (!newPid) {
+				throw new Error(`New extension host PID was not observed after restart (waited ${maxWaitMs}ms)`);
+			}
+
+			if (newPid === oldPid) {
+				throw new Error(`Extension host PID did not change after restart (pid: ${oldPid})`);
+			}
+
+			logger.log(`New extension host PID observed: ${newPid}`);
+
+			waitedMs = 0;
+			while (processExists(oldPid) && waitedMs < maxWaitMs) {
+				await timeout(pollIntervalMs);
+				waitedMs += pollIntervalMs;
+			}
+
+			if (processExists(oldPid)) {
+				throw new Error(`Old extension host ${oldPid} still running after restart (waited ${maxWaitMs}ms)`);
+			}
+
+			logger.log(`Extension host restarted successfully (old: ${oldPid}, new: ${newPid})`);
+		});
 	});
 }